build: push artifacts to Azure (#10044)

Provider migration

.github/workflows/build-syncthing.yaml

@@ -13,6 +13,8 @@ env:
   GO_VERSION: "~1.24.0"
 
   # Optimize compatibility on the slow archictures.
+  GO386: softfloat
+  GOARM: "5"
   GOMIPS: softfloat
 
   # Avoid hilarious amounts of obscuring log output when running tests.
@@ -22,8 +24,6 @@ env:
   BUILD_USER: builder
   BUILD_HOST: github.syncthing.net
 
-  TAGS: "netgo osusergo sqlite_omit_load_extension"
-
 # A note on actions and third party code... The actions under actions/ (like
 # `uses: actions/checkout`) are maintained by GitHub, and we need to trust
 # GitHub to maintain their code and infrastructure or we're in deep shit in
@@ -85,7 +85,6 @@ jobs:
           LOKI_USER: ${{ secrets.LOKI_USER }}
           LOKI_PASSWORD: ${{ secrets.LOKI_PASSWORD }}
           LOKI_LABELS: "go=${{ matrix.go }},runner=${{ matrix.runner }},repo=${{ github.repository }},ref=${{ github.ref }}"
-          CGO_ENABLED: "1"
 
   #
   # Meta checks for formatting, copyright, etc
@@ -137,8 +136,17 @@ jobs:
 
   package-windows:
     name: Package for Windows
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
+      - name: Set git to use LF
+        # Without this, the checkout will happen with CRLF line endings,
+        # which is fine for the source code but messes up tests that depend
+        # on data on disk being as expected. Ideally, those tests should be
+        # fixed, but not today.
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -150,14 +158,17 @@ jobs:
           cache: false
           check-latest: true
 
-      - uses: mlugg/setup-zig@v1
+      - name: Get actual Go version
+        run: |
+          go version
+          echo "GO_VERSION=$(go version | sed 's#^.*go##;s# .*##')" >> $GITHUB_ENV
 
       - uses: actions/cache@v4
         with:
           path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-package-windows-${{ hashFiles('**/go.sum') }}
+            ~\AppData\Local\go-build
+            ~\go\pkg\mod
+          key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-package-${{ hashFiles('**/go.sum') }}
 
       - name: Install dependencies
         run: |
@@ -165,14 +176,15 @@ jobs:
 
       - name: Create packages
         run: |
-          for tgt in syncthing stdiscosrv strelaysrv ; do
-            go run build.go -tags "${{env.TAGS}}" -goos windows -goarch amd64 -cc "zig cc -target x86_64-windows" zip $tgt
-            go run build.go -tags "${{env.TAGS}}" -goos windows -goarch 386 -cc "zig cc -target x86-windows" zip $tgt
-            go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm64 -cc "zig cc -target aarch64-windows" zip $tgt
-            # go run build.go -tags "${{env.TAGS}}" -goos windows -goarch arm -cc "zig cc -target thumb-windows" zip $tgt # failes with linker errors
-          done
+          $targets = 'syncthing', 'stdiscosrv', 'strelaysrv'
+          $archs = 'amd64', 'arm', 'arm64', '386'
+          foreach ($arch in $archs) {
+            foreach ($tgt in $targets) {
+              go run build.go -goarch $arch zip $tgt
+            }
+          }
         env:
-          CGO_ENABLED: "1"
+          CGO_ENABLED: "0"
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
@@ -182,7 +194,7 @@ jobs:
 
   codesign-windows:
     name: Codesign for Windows
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
     environment: release
     runs-on: windows-latest
     needs:
@@ -257,8 +269,6 @@ jobs:
           go version
           echo "GO_VERSION=$(go version | sed 's#^.*go##;s# .*##')" >> $GITHUB_ENV
 
-      - uses: mlugg/setup-zig@v1
-
       - uses: actions/cache@v4
         with:
           path: |
@@ -268,25 +278,14 @@ jobs:
 
       - name: Create packages
         run: |
-          sudo apt-get install -y gcc-mips64-linux-gnuabi64 gcc-mips64el-linux-gnuabi64
-          for tgt in syncthing stdiscosrv strelaysrv ; do
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch amd64 -cc "zig cc -target x86_64-linux-musl" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch 386 -cc "zig cc -target x86-linux-musl" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch arm -cc "zig cc -target arm-linux-musleabi" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch arm64 -cc "zig cc -target aarch64-linux-musl" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch mips -cc "zig cc -target mips-linux-musleabi" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch mipsle -cc "zig cc -target mipsel-linux-musleabi" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch mips64 -cc mips64-linux-gnuabi64-gcc tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch mips64le -cc mips64el-linux-gnuabi64-gcc tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch riscv64 -cc "zig cc -target riscv64-linux-musl" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch s390x -cc "zig cc -target s390x-linux-musl" tar "$tgt"
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch loong64 -cc "zig cc -target loongarch64-linux-musl" tar "$tgt"
-            # go run build.go -tags "${{env.TAGS}}" -goos linux -goarch ppc64 -cc "zig cc -target powerpc64-linux-musl" tar "$tgt" # fails with linkmode not supported
-            go run build.go -tags "${{env.TAGS}}" -goos linux -goarch ppc64le -cc "zig cc -target powerpc64le-linux-musl" tar "$tgt"
+          archs=$(go tool dist list | grep linux | sed 's#linux/##')
+          for goarch in $archs ; do
+            for tgt in syncthing stdiscosrv strelaysrv ; do
+              go run build.go -goarch "$goarch" tar "$tgt"
+            done
           done
         env:
-          CGO_ENABLED: "1"
-          EXTRA_LDFLAGS: "-linkmode=external -extldflags=-static"
+          CGO_ENABLED: "0"
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
@@ -304,8 +303,6 @@ jobs:
     name: Package for macOS
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
     environment: release
-    env:
-      CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }}
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -332,7 +329,6 @@ jobs:
           key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-package-${{ hashFiles('**/go.sum') }}
 
       - name: Import signing certificate
-        if: env.CODESIGN_IDENTITY != ''
         run: |
           # Set up a run-specific keychain, making it available for the
           # `codesign` tool.
@@ -360,7 +356,7 @@ jobs:
       - name: Create package (amd64)
         run: |
           for tgt in syncthing stdiscosrv strelaysrv ; do
-            go run build.go -tags "${{env.TAGS}}" -goarch amd64 zip "$tgt"
+            go run build.go -goarch amd64 zip "$tgt"
           done
         env:
           CGO_ENABLED: "1"
@@ -376,7 +372,7 @@ jobs:
           EOT
           chmod 755 xgo.sh
           for tgt in syncthing stdiscosrv strelaysrv ; do
-            go run build.go -tags "${{env.TAGS}}" -gocmd ./xgo.sh -goarch arm64 zip "$tgt"
+            go run build.go -gocmd ./xgo.sh -goarch arm64 zip "$tgt"
           done
         env:
           CGO_ENABLED: "1"
@@ -405,7 +401,7 @@ jobs:
 
   notarize-macos:
     name: Notarize for macOS
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
     environment: release
     needs:
       - package-macos
@@ -487,7 +483,7 @@ jobs:
             goarch="${plat#*/}"
             echo "::group ::$plat"
             for tgt in syncthing stdiscosrv strelaysrv ; do
-              if ! go run build.go -goos "$goos" -goarch "$goarch" tar "$tgt" ; then
+              if ! go run build.go -goos "$goos" -goarch "$goarch" tar "$tgt" 2>/dev/null; then
                 echo "::warning ::Failed to build $tgt for $plat"
               fi
             done
@@ -549,7 +545,7 @@ jobs:
 
   sign-for-upgrade:
     name: Sign for upgrade
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-')  || startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-')  || startsWith(github.ref, 'refs/tags/v'))
     environment: release
     needs:
       - codesign-windows
@@ -667,8 +663,6 @@ jobs:
         run: |
           gem install fpm
 
-      - uses: mlugg/setup-zig@v1
-
       - uses: actions/cache@v4
         with:
           path: |
@@ -676,17 +670,15 @@ jobs:
             ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-debian-${{ hashFiles('**/go.sum') }}
 
-      - name: Package for Debian (CGO)
+      - name: Package for Debian
         run: |
-          for tgt in syncthing stdiscosrv strelaysrv ; do
-            go run build.go -no-upgrade -installsuffix=no-upgrade -tags "${{env.TAGS}}" -goos linux -goarch amd64 -cc "zig cc -target x86_64-linux-musl" deb "$tgt"
-            go run build.go -no-upgrade -installsuffix=no-upgrade -tags "${{env.TAGS}}" -goos linux -goarch arm -cc "zig cc -target arm-linux-musleabi" deb "$tgt"
-            go run build.go -no-upgrade -installsuffix=no-upgrade -tags "${{env.TAGS}}" -goos linux -goarch arm64 -cc "zig cc -target aarch64-linux-musl" deb "$tgt"
+          for arch in amd64 i386 armhf armel arm64 ; do
+            for tgt in syncthing stdiscosrv strelaysrv ; do
+              go run build.go -no-upgrade -installsuffix=no-upgrade -goarch "$arch" deb "$tgt"
+            done
           done
         env:
           BUILD_USER: debian
-          CGO_ENABLED: "1"
-          EXTRA_LDFLAGS: "-linkmode=external -extldflags=-static"
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
@@ -700,7 +692,7 @@ jobs:
 
   publish-nightly:
     name: Publish nightly build
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && startsWith(github.ref, 'refs/heads/release-nightly')
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && startsWith(github.ref, 'refs/heads/release-nightly')
     environment: release
     needs:
       - sign-for-upgrade
@@ -747,7 +739,7 @@ jobs:
 
   publish-release-files:
     name: Publish release files
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/v'))
     environment: release
     needs:
       - sign-for-upgrade
@@ -808,7 +800,7 @@ jobs:
 
   publish-apt:
     name: Publish APT
-    if: github.repository_owner == 'syncthing' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
     environment: release
     needs:
       - package-debian
@@ -835,9 +827,7 @@ jobs:
       - name: Prepare packages
         run: |
           kind=stable
-          if [[ $VERSION == v2* ]] ; then
-            kind=v2
-          elif [[ $VERSION == *-rc.[0-9] ]] ; then
+          if [[ $VERSION == *-rc.[0-9] ]] ; then
             kind=candidate
           elif [[ $VERSION == *-* ]] ; then
             kind=nightly
@@ -882,10 +872,8 @@ jobs:
   docker-syncthing:
     name: Build and push Docker images
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' || github.ref == 'refs/heads/infrastructure' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
     environment: docker
-    env:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
     permissions:
       contents: read
       packages: write
@@ -898,13 +886,13 @@ jobs:
         include:
           - pkg: syncthing
             dockerfile: Dockerfile
-            image: syncthing
+            image: syncthing/syncthing
           - pkg: strelaysrv
             dockerfile: Dockerfile.strelaysrv
-            image: relaysrv
+            image: syncthing/relaysrv
           - pkg: stdiscosrv
             dockerfile: Dockerfile.stdiscosrv
-            image: discosrv
+            image: syncthing/discosrv
     steps:
       - uses: actions/checkout@v4
         with:
@@ -922,8 +910,6 @@ jobs:
           go version
           echo "GO_VERSION=$(go version | sed 's#^.*go##;s# .*##')" >> $GITHUB_ENV
 
-      - uses: mlugg/setup-zig@v1
-
       - uses: actions/cache@v4
         with:
           path: |
@@ -931,34 +917,33 @@ jobs:
             ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-docker-${{ matrix.pkg }}-${{ hashFiles('**/go.sum') }}
 
-      - name: Build binaries (CGO)
+      - name: Build binaries
         run: |
-          # amd64
-          go run build.go -goos linux -goarch amd64 -tags "${{env.TAGS}}" -cc "zig cc -target x86_64-linux-musl" -no-upgrade build ${{ matrix.pkg }}
-          mv ${{ matrix.pkg }} ${{ matrix.pkg }}-linux-amd64
-
-          # arm64
-          go run build.go -goos linux -goarch arm64 -tags "${{env.TAGS}}" -cc "zig cc -target aarch64-linux-musl" -no-upgrade build ${{ matrix.pkg }}
-          mv ${{ matrix.pkg }} ${{ matrix.pkg }}-linux-arm64
-
-          # arm
-          go run build.go -goos linux -goarch arm -tags "${{env.TAGS}}" -cc "zig cc -target arm-linux-musleabi" -no-upgrade build ${{ matrix.pkg }}
-          mv ${{ matrix.pkg }} ${{ matrix.pkg }}-linux-arm
+          for arch in amd64 arm64 arm; do
+            go run build.go -goos linux -goarch "$arch" -no-upgrade build ${{ matrix.pkg }}
+            mv ${{ matrix.pkg }} ${{ matrix.pkg }}-linux-"$arch"
+          done
         env:
-          CGO_ENABLED: "1"
+          CGO_ENABLED: "0"
           BUILD_USER: docker
-          EXTRA_LDFLAGS: "-linkmode=external -extldflags=-static"
+
+      - name: Check if we will be able to push images
+        run: |
+          if [[ "${{ secrets.DOCKERHUB_TOKEN }}" != "" ]]; then
+            echo "DOCKER_PUSH=true" >> $GITHUB_ENV;
+          fi
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
-        if: env.DOCKERHUB_USERNAME != ''
+        if: env.DOCKER_PUSH == 'true'
         with:
           registry: docker.io
-          username: ${{ env.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GHCR
         uses: docker/login-action@v3
+        if: env.DOCKER_PUSH == 'true'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -971,31 +956,18 @@ jobs:
         run: |
           version=$(go run build.go version)
           version=${version#v}
-          repo=ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}
-          ref="${{github.ref_name}}"
-          ref=${ref//\//-} # slashes to dashes
-
-          # List of tags for ghcr.io
           if [[ $version == @([0-9]|[0-9][0-9]).@([0-9]|[0-9][0-9]).@([0-9]|[0-9][0-9]) ]] ; then
+            echo Release version, pushing to :latest and version tags
             major=${version%.*.*}
             minor=${version%.*}
-            tags=$repo:$version,$repo:$major,$repo:$minor,$repo:latest
+            tags=docker.io/${{ matrix.image }}:$version,ghcr.io/${{ matrix.image }}:$version,docker.io/${{ matrix.image }}:$major,ghcr.io/${{ matrix.image }}:$major,docker.io/${{ matrix.image }}:$minor,ghcr.io/${{ matrix.image }}:$minor,docker.io/${{ matrix.image }}:latest,ghcr.io/${{ matrix.image }}:latest
           elif [[ $version == *-rc.@([0-9]|[0-9][0-9]) ]] ; then
-            tags=$repo:$version,$repo:rc
-          elif [[ $ref == "main" ]] ; then
-            tags=$repo:edge
+            echo Release candidate, pushing to :rc and version tags
+            tags=docker.io/${{ matrix.image }}:$version,ghcr.io/${{ matrix.image }}:$version,docker.io/${{ matrix.image }}:rc,ghcr.io/${{ matrix.image }}:rc
           else
-            tags=$repo:$ref
+            echo Development version, pushing to :edge
+            tags=docker.io/${{ matrix.image }}:edge,ghcr.io/${{ matrix.image }}:edge
           fi
-
-          # If we have a Docker Hub secret, also push to there.
-          if [[ $DOCKERHUB_USERNAME != "" ]] ; then
-            dockerhubtags="${tags//ghcr.io\/syncthing/docker.io\/syncthing}"
-            tags="$tags,$dockerhubtags"
-          fi
-
-          echo Pushing to $tags
-
           echo "DOCKER_TAGS=$tags" >> $GITHUB_ENV
           echo "VERSION=$version" >> $GITHUB_ENV
 
@@ -1005,8 +977,8 @@ jobs:
           context: .
           file: ${{ matrix.dockerfile }}
           platforms: linux/amd64,linux/arm64,linux/arm/7
+          push: ${{ env.DOCKER_PUSH == 'true' }}
           tags: ${{ env.DOCKER_TAGS }}
-          push: true
           labels: |
             org.opencontainers.image.version=${{ env.VERSION }}
             org.opencontainers.image.revision=${{ github.sha }}

.gitignore

@@ -17,4 +17,5 @@ deb
 *.bz2
 /repos
 /proto/scripts/protoc-gen-gosyncthing
+/gui/next-gen-gui
 /compat.json

.golangci.yml

@@ -3,7 +3,6 @@ linters:
   disable:
     - cyclop
     - depguard
-    - err113
     - exhaustive
     - exhaustruct
     - funlen
@@ -13,7 +12,6 @@ linters:
     - gocognit
     - goconst
     - gocyclo
-    - godot
     - godox
     - gofmt
     - goimports
@@ -23,19 +21,15 @@ linters:
     - ireturn
     - lll
     - maintidx
-    - musttag
     - nestif
-    - nlreturn
     - nonamedreturns
     - paralleltest
-    - prealloc
     - protogetter
     - scopelint
     - tagalign
     - tagliatelle
     - testpackage
     - varnamelen
-    - wrapcheck
     - wsl
 
 issues:

AUTHORS

@@ -223,7 +223,6 @@ Marc Laporte (marclaporte) <marc@marclaporte.com> <marc@laporte.name>
 Marc Pujol (kilburn) <kilburn@la3.org>
 Marcin Dziadus (marcindziadus) <dziadus.marcin@gmail.com>
 marco-m <marco.molteni@laposte.net>
-Marcus B Spencer <marcus@marcusspencer.xyz>
 Marcus Legendre <marcus.legendre@gmail.com>
 Mario Majila <mariustshipichik@gmail.com>
 Mark Pulford (mpx) <mark@kyne.com.au>
@@ -324,7 +323,6 @@ Suhas Gundimeda (snugghash) <suhas.gundimeda@gmail.com> <snugghash@gmail.com>
 Sven Bachmann <dev@mcbachmann.de>
 Syncthing Automation <automation@syncthing.net>
 Syncthing Release Automation <release@syncthing.net>
-Sébastien WENSKE <sebastien@wenske.fr>
 Taylor Khan (nelsonkhan) <nelsonkhan@gmail.com>
 Terrance <git@terrance.allofti.me>
 Thomas <9749173+uhthomas@users.noreply.github.com>

build.go

@@ -38,26 +38,27 @@ import (
 )
 
 var (
-	goarch        string
-	goos          string
-	noupgrade     bool
-	version       string
-	goCmd         string
-	race          bool
-	debug         = os.Getenv("BUILDDEBUG") != ""
-	extraTags     string
-	installSuffix string
-	pkgdir        string
-	cc            string
-	run           string
-	benchRun      string
-	buildOut      string
-	debugBinary   bool
-	coverage      bool
-	long          bool
-	timeout       = "120s"
-	longTimeout   = "600s"
-	numVersions   = 5
+	goarch         string
+	goos           string
+	noupgrade      bool
+	version        string
+	goCmd          string
+	race           bool
+	debug          = os.Getenv("BUILDDEBUG") != ""
+	extraTags      string
+	installSuffix  string
+	pkgdir         string
+	cc             string
+	run            string
+	benchRun       string
+	buildOut       string
+	debugBinary    bool
+	coverage       bool
+	long           bool
+	timeout        = "120s"
+	longTimeout    = "600s"
+	numVersions    = 5
+	withNextGenGUI = os.Getenv("BUILD_NEXT_GEN_GUI") != ""
 )
 
 type target struct {
@@ -288,10 +289,10 @@ func runCommand(cmd string, target target) {
 		build(target, tags)
 
 	case "test":
-		test(strings.Fields(extraTags), "github.com/syncthing/syncthing/internal/...", "github.com/syncthing/syncthing/lib/...", "github.com/syncthing/syncthing/cmd/...")
+		test(strings.Fields(extraTags), "github.com/syncthing/syncthing/lib/...", "github.com/syncthing/syncthing/cmd/...")
 
 	case "bench":
-		bench(strings.Fields(extraTags), "github.com/syncthing/syncthing/internal/...", "github.com/syncthing/syncthing/lib/...", "github.com/syncthing/syncthing/cmd/...")
+		bench(strings.Fields(extraTags), "github.com/syncthing/syncthing/lib/...", "github.com/syncthing/syncthing/cmd/...")
 
 	case "integration":
 		integration(false)
@@ -379,6 +380,7 @@ func parseFlags() {
 	flag.IntVar(&numVersions, "num-versions", numVersions, "Number of versions for changelog command")
 	flag.StringVar(&run, "run", "", "Specify which tests to run")
 	flag.StringVar(&benchRun, "bench", "", "Specify which benchmarks to run")
+	flag.BoolVar(&withNextGenGUI, "with-next-gen-gui", withNextGenGUI, "Also build 'newgui'")
 	flag.StringVar(&buildOut, "build-out", "", "Set the '-o' value for 'go build'")
 	flag.Parse()
 }
@@ -451,6 +453,10 @@ func benchArgs() []string {
 }
 
 func install(target target, tags []string) {
+	if (target.name == "syncthing" || target.name == "") && !withNextGenGUI {
+		log.Println("Notice: Next generation GUI will not be built; see --with-next-gen-gui.")
+	}
+
 	lazyRebuildAssets()
 
 	tags = append(target.tags, tags...)
@@ -474,12 +480,16 @@ func install(target target, tags []string) {
 		defer shouldCleanupSyso(sysoPath)
 	}
 
-	args := []string{"install"}
+	args := []string{"install", "-v"}
 	args = appendParameters(args, tags, target.buildPkgs...)
 	runPrint(goCmd, args...)
 }
 
 func build(target target, tags []string) {
+	if (target.name == "syncthing" || target.name == "") && !withNextGenGUI {
+		log.Println("Notice: Next generation GUI will not be built; see --with-next-gen-gui.")
+	}
+
 	lazyRebuildAssets()
 	tags = append(target.tags, tags...)
 
@@ -502,7 +512,7 @@ func build(target target, tags []string) {
 		defer shouldCleanupSyso(sysoPath)
 	}
 
-	args := []string{"build"}
+	args := []string{"build", "-v"}
 	if buildOut != "" {
 		args = append(args, "-o", buildOut)
 	}
@@ -514,6 +524,13 @@ func setBuildEnvVars() {
 	os.Setenv("GOOS", goos)
 	os.Setenv("GOARCH", goarch)
 	os.Setenv("CC", cc)
+	if os.Getenv("CGO_ENABLED") == "" {
+		switch goos {
+		case "darwin", "solaris":
+		default:
+			os.Setenv("CGO_ENABLED", "0")
+		}
+	}
 }
 
 func appendParameters(args []string, tags []string, pkgs ...string) []string {
@@ -628,9 +645,6 @@ func buildDeb(target target) {
 		// than just 0.14.26. This rectifies that.
 		debver = strings.Replace(debver, "-", "~", -1)
 	}
-	if strings.Contains(debver, "_") {
-		debver = strings.Replace(debver, "_", "~", -1)
-	}
 	args := []string{
 		"-t", "deb",
 		"-s", "dir",
@@ -732,9 +746,12 @@ func shouldBuildSyso(dir string) (string, error) {
 	sysoPath := filepath.Join(dir, "cmd", "syncthing", "resource.syso")
 
 	// See https://github.com/josephspurrier/goversioninfo#command-line-flags
-	arm := strings.HasPrefix(goarch, "arm")
-	a64 := strings.Contains(goarch, "64")
-	if _, err := runError("goversioninfo", "-o", sysoPath, fmt.Sprintf("-arm=%v", arm), fmt.Sprintf("-64=%v", a64)); err != nil {
+	armOption := ""
+	if strings.Contains(goarch, "arm") {
+		armOption = "-arm=true"
+	}
+
+	if _, err := runError("goversioninfo", "-o", sysoPath, armOption); err != nil {
 		return "", errors.New("failed to create " + sysoPath + ": " + err.Error())
 	}
 
@@ -806,11 +823,43 @@ func lazyRebuildAssets() {
 	shouldRebuild := shouldRebuildAssets("lib/api/auto/gui.files.go", "gui") ||
 		shouldRebuildAssets("cmd/infra/strelaypoolsrv/auto/gui.files.go", "cmd/infra/strelaypoolsrv/gui")
 
+	if withNextGenGUI {
+		shouldRebuild = buildNextGenGUI() || shouldRebuild
+	}
+
 	if shouldRebuild {
 		rebuildAssets()
 	}
 }
 
+func buildNextGenGUI() bool {
+	// Check if we need to run the npm process, and if so also set the flag
+	// to rebuild Go assets afterwards. The index.html is regenerated every
+	// time by the build process. This assumes the new GUI ends up in
+	// next-gen-gui/dist/next-gen-gui.
+
+	if !shouldRebuildAssets("gui/next-gen-gui/index.html", "next-gen-gui") {
+		// The GUI is up to date.
+		return false
+	}
+
+	runPrintInDir("next-gen-gui", "npm", "install")
+	runPrintInDir("next-gen-gui", "npm", "run", "build", "--", "--prod", "--subresource-integrity")
+
+	rmr("gui/tech-ui")
+
+	for _, src := range listFiles("next-gen-gui/dist") {
+		rel, _ := filepath.Rel("next-gen-gui/dist", src)
+		dst := filepath.Join("gui", rel)
+		if err := copyFile(src, dst, 0o644); err != nil {
+			fmt.Println("copy:", err)
+			os.Exit(1)
+		}
+	}
+
+	return true
+}
+
 func shouldRebuildAssets(target, srcdir string) bool {
 	info, err := os.Stat(target)
 	if err != nil {

cmd/dev/stfileinfo/main.go

@@ -72,7 +72,7 @@ func main() {
 		if *standardBlocks || blockSize < protocol.MinBlockSize {
 			blockSize = protocol.BlockSize(fi.Size())
 		}
-		bs, err := scanner.Blocks(context.TODO(), fd, blockSize, fi.Size(), nil)
+		bs, err := scanner.Blocks(context.TODO(), fd, blockSize, fi.Size(), nil, true)
 		if err != nil {
 			log.Fatal(err)
 		}

cmd/infra/strelaypoolsrv/README.md

@@ -10,7 +10,7 @@ to NAT or firewall issues.
 
 There is very little reason why you'd want to run this yourself, as
 `relaypoolsrv` is just used for announcement and lookup of public relay
-servers. If you are looking to set up a private or a public relay, please
+servers. If you are looking to setup a private or a public relay, please
 check the documentation for
 [relaysrv](https://github.com/syncthing/relaysrv), which also explains how
 to join the default public pool.

cmd/syncthing/cli/debug.go

@@ -41,4 +41,5 @@ func (p *profileCommand) Run(ctx Context) error {
 type debugCommand struct {
 	File    fileCommand    `cmd:"" help:"Show information about a file (or directory/symlink)"`
 	Profile profileCommand `cmd:"" help:"Save a profile to help figuring out what Syncthing does"`
+	Index   indexCommand   `cmd:"" help:"Show information about the index (database)"`
 }

cmd/syncthing/cli/index.go

@@ -0,0 +1,32 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"github.com/alecthomas/kong"
+)
+
+type indexCommand struct {
+	Dump     struct{} `cmd:"" help:"Print the entire db"`
+	DumpSize struct{} `cmd:"" help:"Print the db size of different categories of information"`
+	Check    struct{} `cmd:"" help:"Check the database for inconsistencies"`
+	Account  struct{} `cmd:"" help:"Print key and value size statistics per key type"`
+}
+
+func (*indexCommand) Run(kongCtx *kong.Context) error {
+	switch kongCtx.Selected().Name {
+	case "dump":
+		return indexDump()
+	case "dump-size":
+		return indexDumpSize()
+	case "check":
+		return indexCheck()
+	case "account":
+		return indexAccount()
+	}
+	return nil
+}

cmd/syncthing/cli/index_accounting.go

@@ -0,0 +1,62 @@
+// Copyright (C) 2020 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"fmt"
+	"os"
+	"text/tabwriter"
+)
+
+// indexAccount prints key and data size statistics per class
+func indexAccount() error {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+
+	it, err := ldb.NewPrefixIterator(nil)
+	if err != nil {
+		return err
+	}
+
+	var ksizes [256]int
+	var dsizes [256]int
+	var counts [256]int
+	var max [256]int
+
+	for it.Next() {
+		key := it.Key()
+		t := key[0]
+		ds := len(it.Value())
+		ks := len(key)
+		s := ks + ds
+
+		counts[t]++
+		ksizes[t] += ks
+		dsizes[t] += ds
+		if s > max[t] {
+			max[t] = s
+		}
+	}
+
+	tw := tabwriter.NewWriter(os.Stdout, 1, 1, 1, ' ', tabwriter.AlignRight)
+	toti, totds, totks := 0, 0, 0
+	for t := range ksizes {
+		if ksizes[t] > 0 {
+			// yes metric kilobytes 🤘
+			fmt.Fprintf(tw, "0x%02x:\t%d items,\t%d KB keys +\t%d KB data,\t%d B +\t%d B avg,\t%d B max\t\n", t, counts[t], ksizes[t]/1000, dsizes[t]/1000, ksizes[t]/counts[t], dsizes[t]/counts[t], max[t])
+			toti += counts[t]
+			totds += dsizes[t]
+			totks += ksizes[t]
+		}
+	}
+	fmt.Fprintf(tw, "Total\t%d items,\t%d KB keys +\t%d KB data.\t\n", toti, totks/1000, totds/1000)
+	tw.Flush()
+
+	return nil
+}

cmd/syncthing/cli/index_dump.go

@@ -0,0 +1,162 @@
+// Copyright (C) 2015 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"encoding/binary"
+	"fmt"
+	"time"
+
+	"google.golang.org/protobuf/proto"
+
+	"github.com/syncthing/syncthing/internal/gen/bep"
+	"github.com/syncthing/syncthing/internal/gen/dbproto"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
+
+func indexDump() error {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+	it, err := ldb.NewPrefixIterator(nil)
+	if err != nil {
+		return err
+	}
+	for it.Next() {
+		key := it.Key()
+		switch key[0] {
+		case db.KeyTypeDevice:
+			folder := binary.BigEndian.Uint32(key[1:])
+			device := binary.BigEndian.Uint32(key[1+4:])
+			name := nulString(key[1+4+4:])
+			fmt.Printf("[device] F:%d D:%d N:%q", folder, device, name)
+
+			var f bep.FileInfo
+			err := proto.Unmarshal(it.Value(), &f)
+			if err != nil {
+				return err
+			}
+			fmt.Printf(" V:%v\n", &f)
+
+		case db.KeyTypeGlobal:
+			folder := binary.BigEndian.Uint32(key[1:])
+			name := nulString(key[1+4:])
+			var flv dbproto.VersionList
+			proto.Unmarshal(it.Value(), &flv)
+			fmt.Printf("[global] F:%d N:%q V:%s\n", folder, name, &flv)
+
+		case db.KeyTypeBlock:
+			folder := binary.BigEndian.Uint32(key[1:])
+			hash := key[1+4 : 1+4+32]
+			name := nulString(key[1+4+32:])
+			fmt.Printf("[block] F:%d H:%x N:%q I:%d\n", folder, hash, name, binary.BigEndian.Uint32(it.Value()))
+
+		case db.KeyTypeDeviceStatistic:
+			fmt.Printf("[dstat] K:%x V:%x\n", key, it.Value())
+
+		case db.KeyTypeFolderStatistic:
+			fmt.Printf("[fstat] K:%x V:%x\n", key, it.Value())
+
+		case db.KeyTypeVirtualMtime:
+			folder := binary.BigEndian.Uint32(key[1:])
+			name := nulString(key[1+4:])
+			val := it.Value()
+			var realTime, virtualTime time.Time
+			realTime.UnmarshalBinary(val[:len(val)/2])
+			virtualTime.UnmarshalBinary(val[len(val)/2:])
+			fmt.Printf("[mtime] F:%d N:%q R:%v V:%v\n", folder, name, realTime, virtualTime)
+
+		case db.KeyTypeFolderIdx:
+			key := binary.BigEndian.Uint32(key[1:])
+			fmt.Printf("[folderidx] K:%d V:%q\n", key, it.Value())
+
+		case db.KeyTypeDeviceIdx:
+			key := binary.BigEndian.Uint32(key[1:])
+			val := it.Value()
+			device := "<nil>"
+			if len(val) > 0 {
+				dev, err := protocol.DeviceIDFromBytes(val)
+				if err != nil {
+					device = fmt.Sprintf("<invalid %d bytes>", len(val))
+				} else {
+					device = dev.String()
+				}
+			}
+			fmt.Printf("[deviceidx] K:%d V:%s\n", key, device)
+
+		case db.KeyTypeIndexID:
+			device := binary.BigEndian.Uint32(key[1:])
+			folder := binary.BigEndian.Uint32(key[5:])
+			fmt.Printf("[indexid] D:%d F:%d I:%x\n", device, folder, it.Value())
+
+		case db.KeyTypeFolderMeta:
+			folder := binary.BigEndian.Uint32(key[1:])
+			fmt.Printf("[foldermeta] F:%d", folder)
+			var cs dbproto.CountsSet
+			if err := proto.Unmarshal(it.Value(), &cs); err != nil {
+				fmt.Printf(" (invalid)\n")
+			} else {
+				fmt.Printf(" V:%v\n", &cs)
+			}
+
+		case db.KeyTypeMiscData:
+			fmt.Printf("[miscdata] K:%q V:%q\n", key[1:], it.Value())
+
+		case db.KeyTypeSequence:
+			folder := binary.BigEndian.Uint32(key[1:])
+			seq := binary.BigEndian.Uint64(key[5:])
+			fmt.Printf("[sequence] F:%d S:%d V:%q\n", folder, seq, it.Value())
+
+		case db.KeyTypeNeed:
+			folder := binary.BigEndian.Uint32(key[1:])
+			file := string(key[5:])
+			fmt.Printf("[need] F:%d V:%q\n", folder, file)
+
+		case db.KeyTypeBlockList:
+			fmt.Printf("[blocklist] H:%x\n", key[1:])
+
+		case db.KeyTypeBlockListMap:
+			folder := binary.BigEndian.Uint32(key[1:])
+			hash := key[5:37]
+			fileName := string(key[37:])
+			fmt.Printf("[blocklistmap] F:%d H:%x N:%s\n", folder, hash, fileName)
+
+		case db.KeyTypeVersion:
+			fmt.Printf("[version] H:%x", key[1:])
+			var v bep.Vector
+			err := proto.Unmarshal(it.Value(), &v)
+			if err != nil {
+				fmt.Printf(" (invalid)\n")
+			} else {
+				fmt.Printf(" V:%v\n", &v)
+			}
+
+		case db.KeyTypePendingFolder:
+			device := binary.BigEndian.Uint32(key[1:])
+			folder := string(key[5:])
+			var of dbproto.ObservedFolder
+			proto.Unmarshal(it.Value(), &of)
+			fmt.Printf("[pendingFolder] D:%d F:%s V:%v\n", device, folder, &of)
+
+		case db.KeyTypePendingDevice:
+			device := "<invalid>"
+			dev, err := protocol.DeviceIDFromBytes(key[1:])
+			if err == nil {
+				device = dev.String()
+			}
+			var od dbproto.ObservedDevice
+			proto.Unmarshal(it.Value(), &od)
+			fmt.Printf("[pendingDevice] D:%v V:%v\n", device, &od)
+
+		default:
+			fmt.Printf("[??? %d]\n  %x\n  %x\n", key[0], key, it.Value())
+		}
+	}
+	return nil
+}

cmd/syncthing/cli/index_dumpsize.go

@@ -0,0 +1,88 @@
+// Copyright (C) 2015 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"encoding/binary"
+	"fmt"
+	"sort"
+
+	"github.com/syncthing/syncthing/lib/db"
+)
+
+func indexDumpSize() error {
+	type sizedElement struct {
+		key  string
+		size int
+	}
+
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+
+	it, err := ldb.NewPrefixIterator(nil)
+	if err != nil {
+		return err
+	}
+
+	var elems []sizedElement
+	for it.Next() {
+		var ele sizedElement
+
+		key := it.Key()
+		switch key[0] {
+		case db.KeyTypeDevice:
+			folder := binary.BigEndian.Uint32(key[1:])
+			device := binary.BigEndian.Uint32(key[1+4:])
+			name := nulString(key[1+4+4:])
+			ele.key = fmt.Sprintf("DEVICE:%d:%d:%s", folder, device, name)
+
+		case db.KeyTypeGlobal:
+			folder := binary.BigEndian.Uint32(key[1:])
+			name := nulString(key[1+4:])
+			ele.key = fmt.Sprintf("GLOBAL:%d:%s", folder, name)
+
+		case db.KeyTypeBlock:
+			folder := binary.BigEndian.Uint32(key[1:])
+			hash := key[1+4 : 1+4+32]
+			name := nulString(key[1+4+32:])
+			ele.key = fmt.Sprintf("BLOCK:%d:%x:%s", folder, hash, name)
+
+		case db.KeyTypeDeviceStatistic:
+			ele.key = fmt.Sprintf("DEVICESTATS:%s", key[1:])
+
+		case db.KeyTypeFolderStatistic:
+			ele.key = fmt.Sprintf("FOLDERSTATS:%s", key[1:])
+
+		case db.KeyTypeVirtualMtime:
+			ele.key = fmt.Sprintf("MTIME:%s", key[1:])
+
+		case db.KeyTypeFolderIdx:
+			id := binary.BigEndian.Uint32(key[1:])
+			ele.key = fmt.Sprintf("FOLDERIDX:%d", id)
+
+		case db.KeyTypeDeviceIdx:
+			id := binary.BigEndian.Uint32(key[1:])
+			ele.key = fmt.Sprintf("DEVICEIDX:%d", id)
+
+		default:
+			ele.key = fmt.Sprintf("UNKNOWN:%x", key)
+		}
+		ele.size = len(it.Value())
+		elems = append(elems, ele)
+	}
+
+	sort.Slice(elems, func(i, j int) bool {
+		return elems[i].size > elems[j].size
+	})
+	for _, ele := range elems {
+		fmt.Println(ele.key, ele.size)
+	}
+
+	return nil
+}

cmd/syncthing/cli/index_idxck.go

@@ -0,0 +1,434 @@
+// Copyright (C) 2018 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"sort"
+
+	"google.golang.org/protobuf/proto"
+
+	"github.com/syncthing/syncthing/internal/gen/bep"
+	"github.com/syncthing/syncthing/internal/gen/dbproto"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
+
+type fileInfoKey struct {
+	folder uint32
+	device uint32
+	name   string
+}
+
+type globalKey struct {
+	folder uint32
+	name   string
+}
+
+type sequenceKey struct {
+	folder   uint32
+	sequence uint64
+}
+
+func indexCheck() (err error) {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+
+	folders := make(map[uint32]string)
+	devices := make(map[uint32]string)
+	deviceToIDs := make(map[string]uint32)
+	fileInfos := make(map[fileInfoKey]*bep.FileInfo)
+	globals := make(map[globalKey]*dbproto.VersionList)
+	sequences := make(map[sequenceKey]string)
+	needs := make(map[globalKey]struct{})
+	blocklists := make(map[string]struct{})
+	versions := make(map[string]*bep.Vector)
+	usedBlocklists := make(map[string]struct{})
+	usedVersions := make(map[string]struct{})
+	var localDeviceKey uint32
+	success := true
+	defer func() {
+		if err == nil {
+			if success {
+				fmt.Println("Index check completed successfully.")
+			} else {
+				err = errors.New("Inconsistencies found in the index")
+			}
+		}
+	}()
+
+	it, err := ldb.NewPrefixIterator(nil)
+	if err != nil {
+		return err
+	}
+	for it.Next() {
+		key := it.Key()
+		switch key[0] {
+		case db.KeyTypeDevice:
+			folder := binary.BigEndian.Uint32(key[1:])
+			device := binary.BigEndian.Uint32(key[1+4:])
+			name := nulString(key[1+4+4:])
+
+			var f bep.FileInfo
+			err := proto.Unmarshal(it.Value(), &f)
+			if err != nil {
+				fmt.Println("Unable to unmarshal FileInfo:", err)
+				success = false
+				continue
+			}
+
+			fileInfos[fileInfoKey{folder, device, name}] = &f
+
+		case db.KeyTypeGlobal:
+			folder := binary.BigEndian.Uint32(key[1:])
+			name := nulString(key[1+4:])
+			var flv dbproto.VersionList
+			if err := proto.Unmarshal(it.Value(), &flv); err != nil {
+				fmt.Println("Unable to unmarshal VersionList:", err)
+				success = false
+				continue
+			}
+			globals[globalKey{folder, name}] = &flv
+
+		case db.KeyTypeFolderIdx:
+			key := binary.BigEndian.Uint32(it.Key()[1:])
+			folders[key] = string(it.Value())
+
+		case db.KeyTypeDeviceIdx:
+			key := binary.BigEndian.Uint32(it.Key()[1:])
+			devices[key] = string(it.Value())
+			deviceToIDs[string(it.Value())] = key
+			if bytes.Equal(it.Value(), protocol.LocalDeviceID[:]) {
+				localDeviceKey = key
+			}
+
+		case db.KeyTypeSequence:
+			folder := binary.BigEndian.Uint32(key[1:])
+			seq := binary.BigEndian.Uint64(key[5:])
+			val := it.Value()
+			sequences[sequenceKey{folder, seq}] = string(val[9:])
+
+		case db.KeyTypeNeed:
+			folder := binary.BigEndian.Uint32(key[1:])
+			name := nulString(key[1+4:])
+			needs[globalKey{folder, name}] = struct{}{}
+
+		case db.KeyTypeBlockList:
+			hash := string(key[1:])
+			blocklists[hash] = struct{}{}
+
+		case db.KeyTypeVersion:
+			hash := string(key[1:])
+			var v bep.Vector
+			if err := proto.Unmarshal(it.Value(), &v); err != nil {
+				fmt.Println("Unable to unmarshal Vector:", err)
+				success = false
+				continue
+			}
+			versions[hash] = &v
+		}
+	}
+
+	if localDeviceKey == 0 {
+		fmt.Println("Missing key for local device in device index (bailing out)")
+		success = false
+		return
+	}
+
+	var missingSeq []sequenceKey
+	for fk, fi := range fileInfos {
+		if fk.name != fi.Name {
+			fmt.Printf("Mismatching FileInfo name, %q (key) != %q (actual)\n", fk.name, fi.Name)
+			success = false
+		}
+
+		folder := folders[fk.folder]
+		if folder == "" {
+			fmt.Printf("Unknown folder ID %d for FileInfo %q\n", fk.folder, fk.name)
+			success = false
+			continue
+		}
+		if devices[fk.device] == "" {
+			fmt.Printf("Unknown device ID %d for FileInfo %q, folder %q\n", fk.folder, fk.name, folder)
+			success = false
+		}
+
+		if fk.device == localDeviceKey {
+			sk := sequenceKey{fk.folder, uint64(fi.Sequence)}
+			name, ok := sequences[sk]
+			if !ok {
+				fmt.Printf("Sequence entry missing for FileInfo %q, folder %q, seq %d\n", fi.Name, folder, fi.Sequence)
+				missingSeq = append(missingSeq, sk)
+				success = false
+				continue
+			}
+			if name != fi.Name {
+				fmt.Printf("Sequence entry refers to wrong name, %q (seq) != %q (FileInfo), folder %q, seq %d\n", name, fi.Name, folder, fi.Sequence)
+				success = false
+			}
+		}
+
+		if len(fi.Blocks) == 0 && len(fi.BlocksHash) != 0 {
+			key := string(fi.BlocksHash)
+			if _, ok := blocklists[key]; !ok {
+				fmt.Printf("Missing block list for file %q, block list hash %x\n", fi.Name, fi.BlocksHash)
+				success = false
+			} else {
+				usedBlocklists[key] = struct{}{}
+			}
+		}
+
+		if fi.VersionHash != nil {
+			key := string(fi.VersionHash)
+			if _, ok := versions[key]; !ok {
+				fmt.Printf("Missing version vector for file %q, version hash %x\n", fi.Name, fi.VersionHash)
+				success = false
+			} else {
+				usedVersions[key] = struct{}{}
+			}
+		}
+
+		_, ok := globals[globalKey{fk.folder, fk.name}]
+		if !ok {
+			fmt.Printf("Missing global for file %q\n", fi.Name)
+			success = false
+			continue
+		}
+	}
+
+	// Aggregate the ranges of missing sequence entries, print them
+
+	sort.Slice(missingSeq, func(a, b int) bool {
+		if missingSeq[a].folder != missingSeq[b].folder {
+			return missingSeq[a].folder < missingSeq[b].folder
+		}
+		return missingSeq[a].sequence < missingSeq[b].sequence
+	})
+
+	var folder uint32
+	var startSeq, prevSeq uint64
+	for _, sk := range missingSeq {
+		if folder != sk.folder || sk.sequence != prevSeq+1 {
+			if folder != 0 {
+				fmt.Printf("Folder %d missing %d sequence entries: #%d - #%d\n", folder, prevSeq-startSeq+1, startSeq, prevSeq)
+			}
+			startSeq = sk.sequence
+			folder = sk.folder
+		}
+		prevSeq = sk.sequence
+	}
+	if folder != 0 {
+		fmt.Printf("Folder %d missing %d sequence entries: #%d - #%d\n", folder, prevSeq-startSeq+1, startSeq, prevSeq)
+	}
+
+	for gk, vl := range globals {
+		folder := folders[gk.folder]
+		if folder == "" {
+			fmt.Printf("Unknown folder ID %d for VersionList %q\n", gk.folder, gk.name)
+			success = false
+		}
+		checkGlobal := func(i int, device []byte, version protocol.Vector, invalid, deleted bool) {
+			dev, ok := deviceToIDs[string(device)]
+			if !ok {
+				fmt.Printf("VersionList %q, folder %q refers to unknown device %q\n", gk.name, folder, device)
+				success = false
+			}
+			fi, ok := fileInfos[fileInfoKey{gk.folder, dev, gk.name}]
+			if !ok {
+				fmt.Printf("VersionList %q, folder %q, entry %d refers to unknown FileInfo\n", gk.name, folder, i)
+				success = false
+			}
+
+			fiv := fi.Version
+			if fi.VersionHash != nil {
+				fiv = versions[string(fi.VersionHash)]
+			}
+			if !protocol.VectorFromWire(fiv).Equal(version) {
+				fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo version mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, version, fi.Version)
+				success = false
+			}
+			ffi := protocol.FileInfoFromDB(fi)
+			if ffi.IsInvalid() != invalid {
+				fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo invalid mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, invalid, ffi.IsInvalid())
+				success = false
+			}
+			if ffi.IsDeleted() != deleted {
+				fmt.Printf("VersionList %q, folder %q, entry %d, FileInfo deleted mismatch, %v (VersionList) != %v (FileInfo)\n", gk.name, folder, i, deleted, ffi.IsDeleted())
+				success = false
+			}
+		}
+		for i, fv := range vl.Versions {
+			ver := protocol.VectorFromWire(fv.Version)
+			for _, device := range fv.Devices {
+				checkGlobal(i, device, ver, false, fv.Deleted)
+			}
+			for _, device := range fv.InvalidDevices {
+				checkGlobal(i, device, ver, true, fv.Deleted)
+			}
+		}
+
+		// If we need this file we should have a need entry for it. False
+		// positives from needsLocally for deleted files, where we might
+		// legitimately lack an entry if we never had it, and ignored files.
+		if needsLocally(vl) {
+			_, ok := needs[gk]
+			if !ok {
+				fv, _ := vlGetGlobal(vl)
+				devB, _ := fvFirstDevice(fv)
+				dev := deviceToIDs[string(devB)]
+				fi := protocol.FileInfoFromDB(fileInfos[fileInfoKey{gk.folder, dev, gk.name}])
+				if !fi.IsDeleted() && !fi.IsIgnored() {
+					fmt.Printf("Missing need entry for needed file %q, folder %q\n", gk.name, folder)
+				}
+			}
+		}
+	}
+
+	seenSeq := make(map[fileInfoKey]uint64)
+	for sk, name := range sequences {
+		folder := folders[sk.folder]
+		if folder == "" {
+			fmt.Printf("Unknown folder ID %d for sequence entry %d, %q\n", sk.folder, sk.sequence, name)
+			success = false
+			continue
+		}
+
+		if prev, ok := seenSeq[fileInfoKey{folder: sk.folder, name: name}]; ok {
+			fmt.Printf("Duplicate sequence entry for %q, folder %q, seq %d (prev %d)\n", name, folder, sk.sequence, prev)
+			success = false
+		}
+		seenSeq[fileInfoKey{folder: sk.folder, name: name}] = sk.sequence
+
+		fi, ok := fileInfos[fileInfoKey{sk.folder, localDeviceKey, name}]
+		if !ok {
+			fmt.Printf("Missing FileInfo for sequence entry %d, folder %q, %q\n", sk.sequence, folder, name)
+			success = false
+			continue
+		}
+		if fi.Sequence != int64(sk.sequence) {
+			fmt.Printf("Sequence mismatch for %q, folder %q, %d (key) != %d (FileInfo)\n", name, folder, sk.sequence, fi.Sequence)
+			success = false
+		}
+	}
+
+	for nk := range needs {
+		folder := folders[nk.folder]
+		if folder == "" {
+			fmt.Printf("Unknown folder ID %d for need entry %q\n", nk.folder, nk.name)
+			success = false
+			continue
+		}
+
+		vl, ok := globals[nk]
+		if !ok {
+			fmt.Printf("Missing global for need entry %q, folder %q\n", nk.name, folder)
+			success = false
+			continue
+		}
+
+		if !needsLocally(vl) {
+			fmt.Printf("Need entry for file we don't need, %q, folder %q\n", nk.name, folder)
+			success = false
+		}
+	}
+
+	if d := len(blocklists) - len(usedBlocklists); d > 0 {
+		fmt.Printf("%d block list entries out of %d needs GC\n", d, len(blocklists))
+	}
+	if d := len(versions) - len(usedVersions); d > 0 {
+		fmt.Printf("%d version entries out of %d needs GC\n", d, len(versions))
+	}
+
+	return nil
+}
+
+func needsLocally(vl *dbproto.VersionList) bool {
+	gfv, gok := vlGetGlobal(vl)
+	if !gok { // That's weird, but we hardly need something non-existent
+		return false
+	}
+	fv, ok := vlGet(vl, protocol.LocalDeviceID[:])
+	return db.Need(gfv, ok, protocol.VectorFromWire(fv.Version))
+}
+
+// Get returns a FileVersion that contains the given device and whether it has
+// been found at all.
+func vlGet(vl *dbproto.VersionList, device []byte) (*dbproto.FileVersion, bool) {
+	_, i, _, ok := vlFindDevice(vl, device)
+	if !ok {
+		return &dbproto.FileVersion{}, false
+	}
+	return vl.Versions[i], true
+}
+
+// GetGlobal returns the current global FileVersion. The returned FileVersion
+// may be invalid, if all FileVersions are invalid. Returns false only if
+// VersionList is empty.
+func vlGetGlobal(vl *dbproto.VersionList) (*dbproto.FileVersion, bool) {
+	i := vlFindGlobal(vl)
+	if i == -1 {
+		return nil, false
+	}
+	return vl.Versions[i], true
+}
+
+// findGlobal returns the first version that isn't invalid, or if all versions are
+// invalid just the first version (i.e. 0) or -1, if there's no versions at all.
+func vlFindGlobal(vl *dbproto.VersionList) int {
+	for i := range vl.Versions {
+		if !fvIsInvalid(vl.Versions[i]) {
+			return i
+		}
+	}
+	if len(vl.Versions) == 0 {
+		return -1
+	}
+	return 0
+}
+
+// findDevice returns whether the device is in InvalidVersions or Versions and
+// in InvalidDevices or Devices (true for invalid), the positions in the version
+// and device slices and whether it has been found at all.
+func vlFindDevice(vl *dbproto.VersionList, device []byte) (bool, int, int, bool) {
+	for i, v := range vl.Versions {
+		if j := deviceIndex(v.Devices, device); j != -1 {
+			return false, i, j, true
+		}
+		if j := deviceIndex(v.InvalidDevices, device); j != -1 {
+			return true, i, j, true
+		}
+	}
+	return false, -1, -1, false
+}
+
+func deviceIndex(devices [][]byte, device []byte) int {
+	for i, dev := range devices {
+		if bytes.Equal(device, dev) {
+			return i
+		}
+	}
+	return -1
+}
+
+func fvFirstDevice(fv *dbproto.FileVersion) ([]byte, bool) {
+	if len(fv.Devices) != 0 {
+		return fv.Devices[0], true
+	}
+	if len(fv.InvalidDevices) != 0 {
+		return fv.InvalidDevices[0], true
+	}
+	return nil, false
+}
+
+func fvIsInvalid(fv *dbproto.FileVersion) bool {
+	return fv == nil || len(fv.Devices) == 0
+}

cmd/syncthing/cli/main.go

@@ -14,12 +14,15 @@ import (
 	"github.com/alecthomas/kong"
 	"github.com/kballard/go-shellquote"
 
+	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
 	"github.com/syncthing/syncthing/lib/config"
 )
 
 type CLI struct {
-	GUIAddress string `name:"gui-address" env:"STGUIADDRESS"`
-	GUIAPIKey  string `name:"gui-apikey" env:"STGUIAPIKEY"`
+	cmdutil.CommonOptions
+	DataDir    string `name:"data" placeholder:"PATH" env:"STDATADIR" help:"Set data directory (database and logs)"`
+	GUIAddress string `name:"gui-address"`
+	GUIAPIKey  string `name:"gui-apikey"`
 
 	Show       showCommand      `cmd:"" help:"Show command group"`
 	Debug      debugCommand     `cmd:"" help:"Debug command group"`
@@ -34,6 +37,11 @@ type Context struct {
 }
 
 func (cli CLI) AfterApply(kongCtx *kong.Context) error {
+	err := cmdutil.SetConfigDataLocationsFromFlags(cli.HomeDir, cli.ConfDir, cli.DataDir)
+	if err != nil {
+		return fmt.Errorf("command line options: %w", err)
+	}
+
 	clientFactory := &apiClientFactory{
 		cfg: config.GUIConfiguration{
 			RawAddress: cli.GUIAddress,

cmd/syncthing/cli/utils.go

@@ -17,6 +17,8 @@ import (
 	"path/filepath"
 
 	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db/backend"
+	"github.com/syncthing/syncthing/lib/locations"
 )
 
 func responseToBArray(response *http.Response) ([]byte, error) {
@@ -131,6 +133,10 @@ func prettyPrintResponse(response *http.Response) error {
 	return prettyPrintJSON(data)
 }
 
+func getDB() (backend.Backend, error) {
+	return backend.OpenLevelDBRO(locations.Get(locations.Database))
+}
+
 func nulString(bs []byte) string {
 	for i := range bs {
 		if bs[i] == 0 {

cmd/syncthing/cmdutil/options_common.go

@@ -0,0 +1,16 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cmdutil
+
+// CommonOptions are reused among several subcommands
+type CommonOptions struct {
+	buildCommonOptions
+	ConfDir         string `name:"config" placeholder:"PATH" env:"STCONFDIR" help:"Set configuration directory (config and keys)"`
+	HomeDir         string `name:"home" placeholder:"PATH" env:"STHOMEDIR" help:"Set configuration and data directory"`
+	NoDefaultFolder bool   `env:"STNODEFAULTFOLDER" help:"Don't create the \"default\" folder on first startup"`
+	SkipPortProbing bool   `help:"Don't try to find free ports for GUI and listen addresses on first startup"`
+}

cmd/syncthing/cmdutil/options_others.go

@@ -7,8 +7,8 @@
 //go:build !windows
 // +build !windows
 
-package main
+package cmdutil
 
-type buildSpecificOptions struct {
+type buildCommonOptions struct {
 	HideConsole bool `hidden:""`
 }

cmd/syncthing/cmdutil/options_windows.go

@@ -4,8 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-package main
+package cmdutil
 
-type buildSpecificOptions struct {
-	HideConsole bool `name:"no-console" help:"Hide console window" env:"STHIDECONSOLE"`
+type buildCommonOptions struct {
+	HideConsole bool `name:"no-console" help:"Hide console window"`
 }

cmd/syncthing/cmdutil/util.go

@@ -0,0 +1,35 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cmdutil
+
+import (
+	"errors"
+
+	"github.com/syncthing/syncthing/lib/locations"
+)
+
+func SetConfigDataLocationsFromFlags(homeDir, confDir, dataDir string) error {
+	homeSet := homeDir != ""
+	confSet := confDir != ""
+	dataSet := dataDir != ""
+	switch {
+	case dataSet != confSet:
+		return errors.New("either both or none of --config and --data must be given, use --home to set both at once")
+	case homeSet && dataSet:
+		return errors.New("--home must not be used together with --config and --data")
+	case homeSet:
+		confDir = homeDir
+		dataDir = homeDir
+		fallthrough
+	case dataSet:
+		if err := locations.SetBaseDir(locations.ConfigBaseDir, confDir); err != nil {
+			return err
+		}
+		return locations.SetBaseDir(locations.DataBaseDir, dataDir)
+	}
+	return nil
+}

cmd/syncthing/decrypt/decrypt.go

@@ -238,7 +238,7 @@ func (c *CLI) decryptFile(encFi *protocol.FileInfo, plainFi *protocol.FileInfo,
 		}
 
 		// Verify the hash against the plaintext block info
-		if !scanner.Validate(dec, plainBlock.Hash) {
+		if !scanner.Validate(dec, plainBlock.Hash, 0) {
 			// The block decrypted correctly but fails the hash check. This
 			// is odd and unexpected, but it it's still a valid block from
 			// the source. The file might have changed while we pulled it?

cmd/syncthing/generate/generate.go

@@ -11,26 +11,42 @@ import (
 	"bufio"
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"os"
 
+	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/locations"
 	"github.com/syncthing/syncthing/lib/logger"
+	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/syncthing"
 )
 
 type CLI struct {
-	GUIUser         string `placeholder:"STRING" help:"Specify new GUI authentication user name"`
-	GUIPassword     string `placeholder:"STRING" help:"Specify new GUI authentication password (use - to read from standard input)"`
-	NoDefaultFolder bool   `help:"Don't create the \"default\" folder on first startup" env:"STNODEFAULTFOLDER"`
-	NoPortProbing   bool   `help:"Don't try to find free ports for GUI and listen addresses on first startup" env:"STNOPORTPROBING"`
+	cmdutil.CommonOptions
+	GUIUser     string `placeholder:"STRING" help:"Specify new GUI authentication user name"`
+	GUIPassword string `placeholder:"STRING" help:"Specify new GUI authentication password (use - to read from standard input)"`
 }
 
 func (c *CLI) Run(l logger.Logger) error {
+	if c.HideConsole {
+		osutil.HideConsole()
+	}
+
+	if c.HomeDir != "" {
+		if c.ConfDir != "" {
+			return errors.New("--home must not be used together with --config")
+		}
+		c.ConfDir = c.HomeDir
+	}
+	if c.ConfDir == "" {
+		c.ConfDir = locations.GetBaseDir(locations.ConfigBaseDir)
+	}
+
 	// Support reading the password from a pipe or similar
 	if c.GUIPassword == "-" {
 		reader := bufio.NewReader(os.Stdin)
@@ -41,7 +57,7 @@ func (c *CLI) Run(l logger.Logger) error {
 		c.GUIPassword = string(password)
 	}
 
-	if err := Generate(l, locations.GetBaseDir(locations.ConfigBaseDir), c.GUIUser, c.GUIPassword, c.NoDefaultFolder, c.NoPortProbing); err != nil {
+	if err := Generate(l, c.ConfDir, c.GUIUser, c.GUIPassword, c.NoDefaultFolder, c.SkipPortProbing); err != nil {
 		return fmt.Errorf("failed to generate config and keys: %w", err)
 	}
 	return nil

cmd/syncthing/main.go

@@ -22,10 +22,10 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"runtime/pprof"
 	"sort"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -35,12 +35,13 @@ import (
 	"github.com/willabides/kongplete"
 
 	"github.com/syncthing/syncthing/cmd/syncthing/cli"
+	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
 	"github.com/syncthing/syncthing/cmd/syncthing/decrypt"
 	"github.com/syncthing/syncthing/cmd/syncthing/generate"
-	"github.com/syncthing/syncthing/internal/db"
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
 	"github.com/syncthing/syncthing/lib/build"
 	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/dialer"
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/fs"
@@ -127,68 +128,53 @@ var (
 // The entrypoint struct is the main entry point for the command line parser. The
 // commands and options here are top level commands to syncthing.
 // Cli is just a placeholder for the help text (see main).
-type CLI struct {
-	// The directory options are defined at top level and available for all
-	// subcommands. Their settings take effect on the `locations` package by
-	// way of the command line parser, so anything using `locations.Get` etc
-	// will be doing the right thing.
-	ConfDir string `name:"config" short:"C" placeholder:"PATH" env:"STCONFDIR" help:"Set configuration directory (config and keys)"`
-	DataDir string `name:"data" short:"D" placeholder:"PATH" env:"STDATADIR" help:"Set data directory (database and logs)"`
-	HomeDir string `name:"home" short:"H" placeholder:"PATH" env:"STHOMEDIR" help:"Set configuration and data directory"`
-
-	Serve serveCmd `cmd:"" help:"Run Syncthing (default)" default:"withargs"`
-	CLI   cli.CLI  `cmd:"" help:"Command line interface for Syncthing"`
-
-	Browser  browserCmd   `cmd:"" help:"Open GUI in browser, then exit"`
-	Decrypt  decrypt.CLI  `cmd:"" help:"Decrypt or verify an encrypted folder"`
-	DeviceID deviceIDCmd  `cmd:"" help:"Show device ID, then exit"`
-	Generate generate.CLI `cmd:"" help:"Generate key and config, then exit"`
-	Paths    pathsCmd     `cmd:"" help:"Show configuration paths, then exit"`
-	Upgrade  upgradeCmd   `cmd:"" help:"Perform or check for upgrade, then exit"`
-	Version  versionCmd   `cmd:"" help:"Show current version, then exit"`
-	Debug    debugCmd     `cmd:"" help:"Various debugging commands"`
-
+var entrypoint struct {
+	Serve              serveOptions                 `cmd:"" help:"Run Syncthing"`
+	Generate           generate.CLI                 `cmd:"" help:"Generate key and config, then exit"`
+	Decrypt            decrypt.CLI                  `cmd:"" help:"Decrypt or verify an encrypted folder"`
+	Cli                cli.CLI                      `cmd:"" help:"Command line interface for Syncthing"`
 	InstallCompletions kongplete.InstallCompletions `cmd:"" help:"Print commands to install shell completions"`
 }
 
-func (c *CLI) AfterApply() error {
-	// Executed after parsing command line options but before running actual
-	// subcommands
-	return setConfigDataLocationsFromFlags(c.HomeDir, c.ConfDir, c.DataDir)
-}
-
-// serveCmd are the options for the `syncthing serve` command.
-type serveCmd struct {
-	buildSpecificOptions
-
-	AllowNewerConfig          bool          `help:"Allow loading newer than current config version" env:"STALLOWNEWERCONFIG"`
-	Audit                     bool          `help:"Write events to audit file" env:"STAUDIT"`
-	AuditFile                 string        `name:"auditfile" help:"Specify audit file (use \"-\" for stdout, \"--\" for stderr)" placeholder:"PATH" env:"STAUDITFILE"`
-	DBMaintenanceInterval     time.Duration `help:"Database maintenance interval" default:"8h" env:"STDBMAINTENANCEINTERVAL"`
-	DBDeleteRetentionInterval time.Duration `help:"Database deleted item retention interval" default:"4320h" env:"STDBDELETERETENTIONINTERVAL"`
-	GUIAddress                string        `name:"gui-address" help:"Override GUI address (e.g. \"http://192.0.2.42:8443\")" placeholder:"URL" env:"STGUIADDRESS"`
-	GUIAPIKey                 string        `name:"gui-apikey" help:"Override GUI API key" placeholder:"API-KEY" env:"STGUIAPIKEY"`
-	LogFile                   string        `name:"logfile" help:"Log file name (see below)" default:"${logFile}" placeholder:"PATH" env:"STLOGFILE"`
-	LogFlags                  int           `name:"logflags" help:"Select information in log line prefix (see below)" default:"${logFlags}" placeholder:"BITS" env:"STLOGFLAGS"`
-	LogMaxFiles               int           `name:"log-max-old-files" help:"Number of old files to keep (zero to keep only current)" default:"${logMaxFiles}" placeholder:"N" env:"STLOGMAXOLDFILES"`
-	LogMaxSize                int           `help:"Maximum size of any file (zero to disable log rotation)" default:"${logMaxSize}" placeholder:"BYTES" env:"STLOGMAXSIZE"`
-	NoBrowser                 bool          `help:"Do not start browser" env:"STNOBROWSER"`
-	NoDefaultFolder           bool          `help:"Don't create the \"default\" folder on first startup" env:"STNODEFAULTFOLDER"`
-	NoPortProbing             bool          `help:"Don't try to find free ports for GUI and listen addresses on first startup" env:"STNOPORTPROBING"`
-	NoRestart                 bool          `help:"Do not restart Syncthing when exiting due to API/GUI command, upgrade, or crash" env:"STNORESTART"`
-	NoUpgrade                 bool          `help:"Disable automatic upgrades" env:"STNOUPGRADE"`
-	Paused                    bool          `help:"Start with all devices and folders paused" env:"STPAUSED"`
-	Unpaused                  bool          `help:"Start with all devices and folders unpaused" env:"STUNPAUSED"`
-	Verbose                   bool          `help:"Print verbose log output" env:"STVERBOSE"`
+// serveOptions are the options for the `syncthing serve` command.
+type serveOptions struct {
+	cmdutil.CommonOptions
+	AllowNewerConfig bool   `help:"Allow loading newer than current config version"`
+	Audit            bool   `help:"Write events to audit file"`
+	AuditFile        string `name:"auditfile" placeholder:"PATH" help:"Specify audit file (use \"-\" for stdout, \"--\" for stderr)"`
+	BrowserOnly      bool   `help:"Open GUI in browser"`
+	DataDir          string `name:"data" placeholder:"PATH" env:"STDATADIR" help:"Set data directory (database and logs)"`
+	DeviceID         bool   `help:"Show the device ID"`
+	GenerateDir      string `name:"generate" placeholder:"PATH" help:"Generate key and config in specified dir, then exit"` // DEPRECATED: replaced by subcommand!
+	GUIAddress       string `name:"gui-address" placeholder:"URL" help:"Override GUI address (e.g. \"http://192.0.2.42:8443\")"`
+	GUIAPIKey        string `name:"gui-apikey" placeholder:"API-KEY" help:"Override GUI API key"`
+	LogFile          string `name:"logfile" default:"${logFile}" placeholder:"PATH" help:"Log file name (see below)"`
+	LogFlags         int    `name:"logflags" default:"${logFlags}" placeholder:"BITS" help:"Select information in log line prefix (see below)"`
+	LogMaxFiles      int    `placeholder:"N" default:"${logMaxFiles}" name:"log-max-old-files" help:"Number of old files to keep (zero to keep only current)"`
+	LogMaxSize       int    `placeholder:"BYTES" default:"${logMaxSize}" help:"Maximum size of any file (zero to disable log rotation)"`
+	NoBrowser        bool   `help:"Do not start browser"`
+	NoRestart        bool   `env:"STNORESTART" help:"Do not restart Syncthing when exiting due to API/GUI command, upgrade, or crash"`
+	NoUpgrade        bool   `env:"STNOUPGRADE" help:"Disable automatic upgrades"`
+	Paths            bool   `help:"Show configuration paths"`
+	Paused           bool   `help:"Start with all devices and folders paused"`
+	Unpaused         bool   `help:"Start with all devices and folders unpaused"`
+	Upgrade          bool   `help:"Perform upgrade"`
+	UpgradeCheck     bool   `help:"Check for available upgrade"`
+	UpgradeTo        string `placeholder:"URL" help:"Force upgrade directly from specified URL"`
+	Verbose          bool   `help:"Print verbose log output"`
+	Version          bool   `help:"Show version"`
 
 	// Debug options below
-	DebugGUIAssetsDir   string `help:"Directory to load GUI assets from" placeholder:"PATH" env:"STGUIASSETS"`
-	DebugPerfStats      bool   `help:"Write running performance statistics to perf-$pid.csv (Unix only)" env:"STPERFSTATS"`
-	DebugProfileBlock   bool   `help:"Write block profiles to block-$pid-$timestamp.pprof every 20 seconds" env:"STBLOCKPROFILE"`
-	DebugProfileCPU     bool   `help:"Write a CPU profile to cpu-$pid.pprof on exit" env:"STCPUPROFILE"`
-	DebugProfileHeap    bool   `help:"Write heap profiles to heap-$pid-$timestamp.pprof each time heap usage increases" env:"STHEAPPROFILE"`
-	DebugProfilerListen string `help:"Network profiler listen address" placeholder:"ADDR" env:"STPROFILER" `
-	DebugResetDeltaIdxs bool   `help:"Reset delta index IDs, forcing a full index exchange"`
+	DebugDBIndirectGCInterval time.Duration `env:"STGCINDIRECTEVERY" help:"Database indirection GC interval"`
+	DebugDBRecheckInterval    time.Duration `env:"STRECHECKDBEVERY" help:"Database metadata recalculation interval"`
+	DebugGUIAssetsDir         string        `placeholder:"PATH" help:"Directory to load GUI assets from" env:"STGUIASSETS"`
+	DebugPerfStats            bool          `env:"STPERFSTATS" help:"Write running performance statistics to perf-$pid.csv (Unix only)"`
+	DebugProfileBlock         bool          `env:"STBLOCKPROFILE" help:"Write block profiles to block-$pid-$timestamp.pprof every 20 seconds"`
+	DebugProfileCPU           bool          `help:"Write a CPU profile to cpu-$pid.pprof on exit" env:"STCPUPROFILE"`
+	DebugProfileHeap          bool          `env:"STHEAPPROFILE" help:"Write heap profiles to heap-$pid-$timestamp.pprof each time heap usage increases"`
+	DebugProfilerListen       string        `placeholder:"ADDR" env:"STPROFILER" help:"Network profiler listen address"`
+	DebugResetDatabase        bool          `name:"reset-database" help:"Reset the database, forcing a full rescan and resync"`
+	DebugResetDeltaIdxs       bool          `name:"reset-deltas" help:"Reset delta index IDs, forcing a full index exchange"`
 
 	// Internal options, not shown to users
 	InternalRestarting   bool `env:"STRESTART" hidden:"1"`
@@ -220,9 +206,31 @@ func defaultVars() kong.Vars {
 }
 
 func main() {
+	// First some massaging of the raw command line to fit the new model.
+	// Basically this means adding the default command at the front, and
+	// converting -options to --options.
+
+	args := os.Args[1:]
+	switch {
+	case len(args) == 0:
+		// Empty command line is equivalent to just calling serve
+		args = []string{"serve"}
+	case args[0] == "-help":
+		// For consistency, we consider this equivalent with --help even
+		// though kong would otherwise consider it a bad flag.
+		args[0] = "--help"
+	case args[0] == "-h", args[0] == "--help":
+		// Top level request for help, let it pass as-is to be handled by
+		// kong to list commands.
+	case strings.HasPrefix(args[0], "-"):
+		// There are flags not preceded by a command, so we tack on the
+		// "serve" command and convert the old style arguments (single dash)
+		// to new style (double dash).
+		args = append([]string{"serve"}, convertLegacyArgs(args)...)
+	}
+
 	// Create a parser with an overridden help function to print our extra
 	// help info.
-	var entrypoint CLI
 	parser, err := kong.New(
 		&entrypoint,
 		kong.ConfigureHelp(kong.HelpOptions{
@@ -237,7 +245,7 @@ func main() {
 	}
 
 	kongplete.Complete(parser)
-	ctx, err := parser.Parse(os.Args[1:])
+	ctx, err := parser.Parse(args)
 	parser.FatalIfErrorf(err)
 	ctx.BindTo(l, (*logger.Logger)(nil)) // main logger available to subcommands
 	err = ctx.Run()
@@ -256,54 +264,152 @@ func helpHandler(options kong.HelpOptions, ctx *kong.Context) error {
 	return nil
 }
 
-// serveCmd.Run() is the entrypoint for `syncthing serve`
-func (c *serveCmd) Run() error {
-	l.SetFlags(c.LogFlags)
+// serveOptions.Run() is the entrypoint for `syncthing serve`
+func (options serveOptions) Run() error {
+	l.SetFlags(options.LogFlags)
 
-	if c.GUIAddress != "" {
+	if options.GUIAddress != "" {
 		// The config picks this up from the environment.
-		os.Setenv("STGUIADDRESS", c.GUIAddress)
+		os.Setenv("STGUIADDRESS", options.GUIAddress)
 	}
-	if c.GUIAPIKey != "" {
+	if options.GUIAPIKey != "" {
 		// The config picks this up from the environment.
-		os.Setenv("STGUIAPIKEY", c.GUIAPIKey)
+		os.Setenv("STGUIAPIKEY", options.GUIAPIKey)
 	}
 
-	if c.HideConsole {
+	if options.HideConsole {
 		osutil.HideConsole()
 	}
 
-	// Treat an explicitly empty log file name as no log file
-	if c.LogFile == "" {
-		c.LogFile = "-"
+	// Not set as default above because the strings can be really long.
+	err := cmdutil.SetConfigDataLocationsFromFlags(options.HomeDir, options.ConfDir, options.DataDir)
+	if err != nil {
+		l.Warnln("Command line options:", err)
+		os.Exit(svcutil.ExitError.AsInt())
 	}
-	if c.LogFile != "default" {
+
+	// Treat an explicitly empty log file name as no log file
+	if options.LogFile == "" {
+		options.LogFile = "-"
+	}
+	if options.LogFile != "default" {
 		// We must set this *after* expandLocations above.
-		if err := locations.Set(locations.LogFile, c.LogFile); err != nil {
+		if err := locations.Set(locations.LogFile, options.LogFile); err != nil {
 			l.Warnln("Setting log file path:", err)
 			os.Exit(svcutil.ExitError.AsInt())
 		}
 	}
 
-	if c.DebugGUIAssetsDir != "" {
+	if options.DebugGUIAssetsDir != "" {
 		// The asset dir is blank if STGUIASSETS wasn't set, in which case we
 		// should look for extra assets in the default place.
-		if err := locations.Set(locations.GUIAssets, c.DebugGUIAssetsDir); err != nil {
+		if err := locations.Set(locations.GUIAssets, options.DebugGUIAssetsDir); err != nil {
 			l.Warnln("Setting GUI assets path:", err)
 			os.Exit(svcutil.ExitError.AsInt())
 		}
 	}
 
+	if options.Version {
+		fmt.Println(build.LongVersion)
+		return nil
+	}
+
+	if options.Paths {
+		fmt.Print(locations.PrettyPaths())
+		return nil
+	}
+
+	if options.DeviceID {
+		cert, err := tls.LoadX509KeyPair(
+			locations.Get(locations.CertFile),
+			locations.Get(locations.KeyFile),
+		)
+		if err != nil {
+			l.Warnln("Error reading device ID:", err)
+			os.Exit(svcutil.ExitError.AsInt())
+		}
+
+		fmt.Println(protocol.NewDeviceID(cert.Certificate[0]))
+		return nil
+	}
+
+	if options.BrowserOnly {
+		if err := openGUI(); err != nil {
+			l.Warnln("Failed to open web UI:", err)
+			os.Exit(svcutil.ExitError.AsInt())
+		}
+		return nil
+	}
+
+	if options.GenerateDir != "" {
+		if err := generate.Generate(l, options.GenerateDir, "", "", options.NoDefaultFolder, options.SkipPortProbing); err != nil {
+			l.Warnln("Failed to generate config and keys:", err)
+			os.Exit(svcutil.ExitError.AsInt())
+		}
+		return nil
+	}
+
 	// Ensure that our home directory exists.
 	if err := syncthing.EnsureDir(locations.GetBaseDir(locations.ConfigBaseDir), 0o700); err != nil {
 		l.Warnln("Failure on home directory:", err)
 		os.Exit(svcutil.ExitError.AsInt())
 	}
 
-	if c.InternalInnerProcess {
-		c.syncthingMain()
+	if options.UpgradeTo != "" {
+		err := upgrade.ToURL(options.UpgradeTo)
+		if err != nil {
+			l.Warnln("Error while Upgrading:", err)
+			os.Exit(svcutil.ExitError.AsInt())
+		}
+		l.Infoln("Upgraded from", options.UpgradeTo)
+		return nil
+	}
+
+	if options.UpgradeCheck {
+		if _, err := checkUpgrade(); err != nil {
+			l.Warnln("Checking for upgrade:", err)
+			os.Exit(exitCodeForUpgrade(err))
+		}
+		return nil
+	}
+
+	if options.Upgrade {
+		release, err := checkUpgrade()
+		if err == nil {
+			lf := flock.New(locations.Get(locations.LockFile))
+			locked, err := lf.TryLock()
+			if err != nil {
+				l.Warnln("Upgrade:", err)
+				os.Exit(1)
+			} else if locked {
+				err = upgradeViaRest()
+			} else {
+				err = upgrade.To(release)
+			}
+			_ = lf.Unlock()
+			_ = os.Remove(locations.Get(locations.LockFile))
+		}
+		if err != nil {
+			l.Warnln("Upgrade:", err)
+			os.Exit(exitCodeForUpgrade(err))
+		}
+		l.Infof("Upgraded to %q", release.Tag)
+		os.Exit(svcutil.ExitUpgrade.AsInt())
+	}
+
+	if options.DebugResetDatabase {
+		if err := resetDB(); err != nil {
+			l.Warnln("Resetting database:", err)
+			os.Exit(svcutil.ExitError.AsInt())
+		}
+		l.Infoln("Successfully reset database - it will be rebuilt after next start.")
+		return nil
+	}
+
+	if options.InternalInnerProcess {
+		syncthingMain(options)
 	} else {
-		c.monitorMain()
+		monitorMain(options)
 	}
 	return nil
 }
@@ -412,14 +518,14 @@ func upgradeViaRest() error {
 	return err
 }
 
-func (c *serveCmd) syncthingMain() {
-	if c.DebugProfileBlock {
+func syncthingMain(options serveOptions) {
+	if options.DebugProfileBlock {
 		startBlockProfiler()
 	}
-	if c.DebugProfileHeap {
+	if options.DebugProfileHeap {
 		startHeapProfiler()
 	}
-	if c.DebugPerfStats {
+	if options.DebugPerfStats {
 		startPerfStats()
 	}
 
@@ -442,7 +548,7 @@ func (c *serveCmd) syncthingMain() {
 	}
 
 	// Ensure we are the only running instance
-	lf := flock.New(locations.Get(locations.CertFile))
+	lf := flock.New(locations.Get(locations.LockFile))
 	locked, err := lf.TryLock()
 	if err != nil {
 		l.Warnln("Failed to acquire lock:", err)
@@ -464,7 +570,7 @@ func (c *serveCmd) syncthingMain() {
 	evLogger := events.NewLogger()
 	earlyService.Add(evLogger)
 
-	cfgWrapper, err := syncthing.LoadConfigAtStartup(locations.Get(locations.ConfigFile), cert, evLogger, c.AllowNewerConfig, c.NoDefaultFolder, c.NoPortProbing)
+	cfgWrapper, err := syncthing.LoadConfigAtStartup(locations.Get(locations.ConfigFile), cert, evLogger, options.AllowNewerConfig, options.NoDefaultFolder, options.SkipPortProbing)
 	if err != nil {
 		l.Warnln("Failed to initialize config:", err)
 		os.Exit(svcutil.ExitError.AsInt())
@@ -475,7 +581,7 @@ func (c *serveCmd) syncthingMain() {
 	// unless we are in a build where it's disabled or the STNOUPGRADE
 	// environment variable is set.
 
-	if build.IsCandidate && !upgrade.DisabledByCompilation && !c.NoUpgrade {
+	if build.IsCandidate && !upgrade.DisabledByCompilation && !options.NoUpgrade {
 		cfgWrapper.Modify(func(cfg *config.Configuration) {
 			l.Infoln("Automatic upgrade is always enabled for candidate releases.")
 			if cfg.Options.AutoUpgradeIntervalH == 0 || cfg.Options.AutoUpgradeIntervalH > 24 {
@@ -488,12 +594,8 @@ func (c *serveCmd) syncthingMain() {
 		})
 	}
 
-	if err := syncthing.TryMigrateDatabase(c.DBDeleteRetentionInterval); err != nil {
-		l.Warnln("Failed to migrate old-style database:", err)
-		os.Exit(1)
-	}
-
-	sdb, err := syncthing.OpenDatabase(locations.Get(locations.Database), c.DBDeleteRetentionInterval)
+	dbFile := locations.Get(locations.Database)
+	ldb, err := syncthing.OpenDBBackend(dbFile, cfgWrapper.Options().DatabaseTuning)
 	if err != nil {
 		l.Warnln("Error opening database:", err)
 		os.Exit(1)
@@ -502,11 +604,11 @@ func (c *serveCmd) syncthingMain() {
 	// Check if auto-upgrades is possible, and if yes, and it's enabled do an initial
 	// upgrade immediately. The auto-upgrade routine can only be started
 	// later after App is initialised.
-	autoUpgradePossible := c.autoUpgradePossible()
+
+	autoUpgradePossible := autoUpgradePossible(options)
 	if autoUpgradePossible && cfgWrapper.Options().AutoUpgradeEnabled() {
 		// try to do upgrade directly and log the error if relevant.
-		miscDB := db.NewMiscDB(sdb)
-		release, err := initialAutoUpgradeCheck(miscDB)
+		release, err := initialAutoUpgradeCheck(db.NewMiscDataNamespace(ldb))
 		if err == nil {
 			err = upgrade.To(release)
 		}
@@ -517,29 +619,36 @@ func (c *serveCmd) syncthingMain() {
 				l.Infoln("Initial automatic upgrade:", err)
 			}
 		} else {
-			l.Infof("Upgraded to %q, should exit now.", release.Tag)
+			l.Infof("Upgraded to %q, exiting now.", release.Tag)
 			os.Exit(svcutil.ExitUpgrade.AsInt())
 		}
 	}
 
-	if c.Unpaused {
+	if options.Unpaused {
 		setPauseState(cfgWrapper, false)
-	} else if c.Paused {
+	} else if options.Paused {
 		setPauseState(cfgWrapper, true)
 	}
 
 	appOpts := syncthing.Options{
-		NoUpgrade:             c.NoUpgrade,
-		ProfilerAddr:          c.DebugProfilerListen,
-		ResetDeltaIdxs:        c.DebugResetDeltaIdxs,
-		Verbose:               c.Verbose,
-		DBMaintenanceInterval: c.DBMaintenanceInterval,
+		NoUpgrade:            options.NoUpgrade,
+		ProfilerAddr:         options.DebugProfilerListen,
+		ResetDeltaIdxs:       options.DebugResetDeltaIdxs,
+		Verbose:              options.Verbose,
+		DBRecheckInterval:    options.DebugDBRecheckInterval,
+		DBIndirectGCInterval: options.DebugDBIndirectGCInterval,
 	}
-	if c.Audit {
-		appOpts.AuditWriter = auditWriter(c.AuditFile)
+	if options.Audit {
+		appOpts.AuditWriter = auditWriter(options.AuditFile)
+	}
+	if dur, err := time.ParseDuration(os.Getenv("STRECHECKDBEVERY")); err == nil {
+		appOpts.DBRecheckInterval = dur
+	}
+	if dur, err := time.ParseDuration(os.Getenv("STGCINDIRECTEVERY")); err == nil {
+		appOpts.DBIndirectGCInterval = dur
 	}
 
-	app, err := syncthing.New(cfgWrapper, sdb, evLogger, cert, appOpts)
+	app, err := syncthing.New(cfgWrapper, ldb, evLogger, cert, appOpts)
 	if err != nil {
 		l.Warnln("Failed to start Syncthing:", err)
 		os.Exit(svcutil.ExitError.AsInt())
@@ -551,7 +660,7 @@ func (c *serveCmd) syncthingMain() {
 
 	setupSignalHandling(app)
 
-	if c.DebugProfileCPU {
+	if options.DebugProfileCPU {
 		f, err := os.Create(fmt.Sprintf("cpu-%d.pprof", os.Getpid()))
 		if err != nil {
 			l.Warnln("Creating profile:", err)
@@ -569,7 +678,7 @@ func (c *serveCmd) syncthingMain() {
 
 	cleanConfigDirectory()
 
-	if cfgWrapper.Options().StartBrowser && !c.NoBrowser && !c.InternalRestarting {
+	if cfgWrapper.Options().StartBrowser && !options.NoBrowser && !options.InternalRestarting {
 		// Can potentially block if the utility we are invoking doesn't
 		// fork, and just execs, hence keep it in its own routine.
 		go func() { _ = openURL(cfgWrapper.GUI().URL()) }()
@@ -581,11 +690,14 @@ func (c *serveCmd) syncthingMain() {
 		l.Warnln("Syncthing stopped with error:", app.Error())
 	}
 
-	if c.DebugProfileCPU {
+	if options.DebugProfileCPU {
 		pprof.StopCPUProfile()
 	}
 
-	runtime.KeepAlive(lf) // ensure lock is still held to this point
+	// Best effort remove lockfile, doesn't matter if it succeeds
+	_ = lf.Unlock()
+	_ = os.Remove(locations.Get(locations.LockFile))
+
 	os.Exit(int(status))
 }
 
@@ -655,11 +767,15 @@ func auditWriter(auditFile string) io.Writer {
 	return fd
 }
 
-func (c *serveCmd) autoUpgradePossible() bool {
+func resetDB() error {
+	return os.RemoveAll(locations.Get(locations.Database))
+}
+
+func autoUpgradePossible(options serveOptions) bool {
 	if upgrade.DisabledByCompilation {
 		return false
 	}
-	if c.NoUpgrade {
+	if options.NoUpgrade {
 		l.Infof("No automatic upgrades; STNOUPGRADE environment variable defined.")
 		return false
 	}
@@ -723,7 +839,7 @@ func autoUpgrade(cfg config.Wrapper, app *syncthing.App, evLogger events.Logger)
 	}
 }
 
-func initialAutoUpgradeCheck(misc *db.Typed) (upgrade.Release, error) {
+func initialAutoUpgradeCheck(misc *db.NamespacedKV) (upgrade.Release, error) {
 	if last, ok, err := misc.Time(upgradeCheckKey); err == nil && ok && time.Since(last) < upgradeCheckInterval {
 		return upgrade.Release{}, errTooEarlyUpgradeCheck
 	}
@@ -830,127 +946,3 @@ func convertLegacyArgs(args []string) []string {
 
 	return res
 }
-
-type versionCmd struct{}
-
-func (versionCmd) Run() error {
-	fmt.Println(build.LongVersion)
-	return nil
-}
-
-type deviceIDCmd struct{}
-
-func (deviceIDCmd) Run() error {
-	cert, err := tls.LoadX509KeyPair(
-		locations.Get(locations.CertFile),
-		locations.Get(locations.KeyFile),
-	)
-	if err != nil {
-		l.Warnln("Error reading device ID:", err)
-		os.Exit(svcutil.ExitError.AsInt())
-	}
-
-	fmt.Println(protocol.NewDeviceID(cert.Certificate[0]))
-	return nil
-}
-
-type pathsCmd struct{}
-
-func (pathsCmd) Run() error {
-	fmt.Print(locations.PrettyPaths())
-	return nil
-}
-
-type upgradeCmd struct {
-	CheckOnly bool   `short:"c" help:"Check for available upgrade, then exit"`
-	From      string `short:"u" placeholder:"URL" help:"Force upgrade directly from specified URL"`
-}
-
-func (u upgradeCmd) Run() error {
-	if u.CheckOnly {
-		if _, err := checkUpgrade(); err != nil {
-			l.Warnln("Checking for upgrade:", err)
-			os.Exit(exitCodeForUpgrade(err))
-		}
-		return nil
-	}
-
-	if u.From != "" {
-		err := upgrade.ToURL(u.From)
-		if err != nil {
-			l.Warnln("Error while Upgrading:", err)
-			os.Exit(svcutil.ExitError.AsInt())
-		}
-		l.Infoln("Upgraded from", u.From)
-		return nil
-	}
-
-	release, err := checkUpgrade()
-	if err == nil {
-		lf := flock.New(locations.Get(locations.CertFile))
-		locked, err := lf.TryLock()
-		if err != nil {
-			l.Warnln("Upgrade:", err)
-			os.Exit(1)
-		} else if locked {
-			err = upgradeViaRest()
-		} else {
-			err = upgrade.To(release)
-		}
-	}
-	if err != nil {
-		l.Warnln("Upgrade:", err)
-		os.Exit(exitCodeForUpgrade(err))
-	}
-	l.Infof("Upgraded to %q", release.Tag)
-	os.Exit(svcutil.ExitUpgrade.AsInt())
-	return nil
-}
-
-type browserCmd struct{}
-
-func (browserCmd) Run() error {
-	if err := openGUI(); err != nil {
-		l.Warnln("Failed to open web UI:", err)
-		os.Exit(svcutil.ExitError.AsInt())
-	}
-	return nil
-}
-
-type debugCmd struct {
-	ResetDatabase resetDatabaseCmd `cmd:"" help:"Reset the database, forcing a full rescan and resync"`
-}
-
-type resetDatabaseCmd struct{}
-
-func (resetDatabaseCmd) Run() error {
-	l.Infoln("Removing database in", locations.Get(locations.Database))
-	if err := os.RemoveAll(locations.Get(locations.Database)); err != nil {
-		l.Warnln("Resetting database:", err)
-		os.Exit(svcutil.ExitError.AsInt())
-	}
-	l.Infoln("Successfully reset database - it will be rebuilt after next start.")
-	return nil
-}
-
-func setConfigDataLocationsFromFlags(homeDir, confDir, dataDir string) error {
-	homeSet := homeDir != ""
-	confSet := confDir != ""
-	dataSet := dataDir != ""
-	switch {
-	case dataSet != confSet:
-		return errors.New("either both or none of --config and --data must be given, use --home to set both at once")
-	case homeSet && dataSet:
-		return errors.New("--home must not be used together with --config and --data")
-	case homeSet:
-		confDir = homeDir
-		dataDir = homeDir
-		fallthrough
-	case dataSet:
-		if err := locations.SetBaseDir(locations.ConfigBaseDir, confDir); err != nil {
-			return err
-		}
-		return locations.SetBaseDir(locations.DataBaseDir, dataDir)
-	}
-	return nil
-}

cmd/syncthing/monitor.go

@@ -43,7 +43,7 @@ const (
 	panicUploadNoticeWait = 10 * time.Second
 )
 
-func (c *serveCmd) monitorMain() {
+func monitorMain(options serveOptions) {
 	l.SetPrefix("[monitor] ")
 
 	var dst io.Writer = os.Stdout
@@ -58,13 +58,13 @@ func (c *serveCmd) monitorMain() {
 		open := func(name string) (io.WriteCloser, error) {
 			return newAutoclosedFile(name, logFileAutoCloseDelay, logFileMaxOpenTime)
 		}
-		if c.LogMaxSize > 0 {
-			fileDst, err = newRotatedFile(logFile, open, int64(c.LogMaxSize), c.LogMaxFiles)
+		if options.LogMaxSize > 0 {
+			fileDst, err = newRotatedFile(logFile, open, int64(options.LogMaxSize), options.LogMaxFiles)
 		} else {
 			fileDst, err = open(logFile)
 		}
 		if err != nil {
-			l.Warnln("Failed to set up logging to file, proceeding with logging to stdout only:", err)
+			l.Warnln("Failed to setup logging to file, proceeding with logging to stdout only:", err)
 		} else {
 			if build.IsWindows {
 				// Translate line breaks to Windows standard
@@ -178,7 +178,7 @@ func (c *serveCmd) monitorMain() {
 
 		if exiterr, ok := err.(*exec.ExitError); ok {
 			exitCode := exiterr.ExitCode()
-			if stopped || c.NoRestart {
+			if stopped || options.NoRestart {
 				os.Exit(exitCode)
 			}
 			if exitCode == svcutil.ExitUpgrade.AsInt() {
@@ -192,7 +192,7 @@ func (c *serveCmd) monitorMain() {
 			}
 		}
 
-		if c.NoRestart {
+		if options.NoRestart {
 			os.Exit(svcutil.ExitError.AsInt())
 		}
 

cmd/syncthing/perfstats_unix.go

@@ -16,9 +16,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/syncthing/syncthing/lib/locations"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"golang.org/x/exp/constraints"
 )
 
 func startPerfStats() {
@@ -31,68 +29,37 @@ func savePerfStats(file string) {
 		panic(err)
 	}
 
-	var prevTime time.Time
-	var curRus, prevRus syscall.Rusage
-	var curMem, prevMem runtime.MemStats
+	var prevUsage int64
+	var prevTime int64
+	var rusage syscall.Rusage
+	var memstats runtime.MemStats
 	var prevIn, prevOut int64
 
 	t0 := time.Now()
-	syscall.Getrusage(syscall.RUSAGE_SELF, &prevRus)
-	runtime.ReadMemStats(&prevMem)
-
-	fmt.Fprintf(fd, "TIME_S\tCPU_S\tHEAP_KIB\tRSS_KIB\tNETIN_KBPS\tNETOUT_KBPS\tDBSIZE_KIB\n")
-
 	for t := range time.NewTicker(250 * time.Millisecond).C {
-		syscall.Getrusage(syscall.RUSAGE_SELF, &curRus)
-		runtime.ReadMemStats(&curMem)
-		in, out := protocol.TotalInOut()
-		timeDiff := t.Sub(prevTime)
-
-		fmt.Fprintf(fd, "%.03f\t%f\t%d\t%d\t%.0f\t%.0f\t%d\n",
-			t.Sub(t0).Seconds(),
-			rate(cpusec(&prevRus), cpusec(&curRus), timeDiff, 1),
-			(curMem.Sys-curMem.HeapReleased)/1024,
-			curRus.Maxrss/1024,
-			rate(prevIn, in, timeDiff, 1e3),
-			rate(prevOut, out, timeDiff, 1e3),
-			dirsize(locations.Get(locations.Database))/1024,
-		)
-
-		prevTime = t
-		prevRus = curRus
-		prevMem = curMem
-		prevIn, prevOut = in, out
-	}
-}
-
-func cpusec(r *syscall.Rusage) float64 {
-	return float64(r.Utime.Nano()+r.Stime.Nano()) / float64(time.Second)
-}
-
-type number interface {
-	constraints.Float | constraints.Integer
-}
-
-func rate[T number](prev, cur T, d time.Duration, div float64) float64 {
-	diff := cur - prev
-	rate := float64(diff) / d.Seconds() / div
-	return rate
-}
-
-func dirsize(location string) int64 {
-	entries, err := os.ReadDir(location)
-	if err != nil {
-		return 0
-	}
-
-	var size int64
-	for _, entry := range entries {
-		fi, err := entry.Info()
-		if err != nil {
+		if err := syscall.Getrusage(syscall.RUSAGE_SELF, &rusage); err != nil {
 			continue
 		}
-		size += fi.Size()
-	}
 
-	return size
+		curTime := time.Now().UnixNano()
+		timeDiff := curTime - prevTime
+		curUsage := rusage.Utime.Nano() + rusage.Stime.Nano()
+		usageDiff := curUsage - prevUsage
+		cpuUsagePercent := 100 * float64(usageDiff) / float64(timeDiff)
+		prevTime = curTime
+		prevUsage = curUsage
+		in, out := protocol.TotalInOut()
+		var inRate, outRate float64
+		if timeDiff > 0 {
+			inRate = float64(in-prevIn) / (float64(timeDiff) / 1e9)    // bytes per second
+			outRate = float64(out-prevOut) / (float64(timeDiff) / 1e9) // bytes per second
+		}
+		prevIn, prevOut = in, out
+
+		runtime.ReadMemStats(&memstats)
+
+		startms := int(t.Sub(t0).Seconds() * 1000)
+
+		fmt.Fprintf(fd, "%d\t%f\t%d\t%d\t%.0f\t%.0f\n", startms, cpuUsagePercent, memstats.Alloc, memstats.Sys-memstats.HeapReleased, inRate, outRate)
+	}
 }

go.mod

@@ -4,24 +4,24 @@ go 1.23.0
 
 require (
 	github.com/AudriusButkevicius/recli v0.0.7-0.20220911121932-d000ce8fbf0f
-	github.com/alecthomas/kong v1.10.0
+	github.com/alecthomas/kong v1.9.0
 	github.com/aws/aws-sdk-go v1.55.6
 	github.com/calmh/incontainer v1.0.0
 	github.com/calmh/xdr v1.2.0
 	github.com/ccding/go-stun v0.1.5
+	github.com/chmduquesne/rollinghash v4.0.0+incompatible
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/getsentry/raven-go v0.2.0
 	github.com/go-ldap/ldap/v3 v3.4.10
 	github.com/gobwas/glob v0.2.3
 	github.com/gofrs/flock v0.12.1
+	github.com/greatroar/blobloom v0.8.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/jackpal/gateway v1.0.16
 	github.com/jackpal/go-nat-pmp v1.0.2
-	github.com/jmoiron/sqlx v1.4.0
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/maruel/panicparse/v2 v2.5.0
-	github.com/mattn/go-sqlite3 v1.14.27
+	github.com/maruel/panicparse/v2 v2.4.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
 	github.com/maxmind/geoipupdate/v6 v6.1.0
 	github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
@@ -29,10 +29,10 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.22
 	github.com/prometheus/client_golang v1.21.1
 	github.com/puzpuzpuz/xsync/v3 v3.5.1
-	github.com/quic-go/quic-go v0.50.1
+	github.com/quic-go/quic-go v0.50.0
 	github.com/rabbitmq/amqp091-go v1.10.0
-	github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9
-	github.com/shirou/gopsutil/v4 v4.25.3
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
+	github.com/shirou/gopsutil/v4 v4.25.2
 	github.com/syncthing/notify v0.0.0-20250207082249-f0fa8f99c2bc
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
 	github.com/thejerf/suture/v4 v4.0.6
@@ -41,13 +41,12 @@ require (
 	github.com/willabides/kongplete v0.4.0
 	go.uber.org/automaxprocs v1.6.0
 	golang.org/x/crypto v0.36.0
-	golang.org/x/net v0.38.0
+	golang.org/x/net v0.37.0
 	golang.org/x/sys v0.31.0
 	golang.org/x/text v0.23.0
 	golang.org/x/time v0.11.0
 	golang.org/x/tools v0.31.0
-	google.golang.org/protobuf v1.36.6
-	modernc.org/sqlite v1.37.0
+	google.golang.org/protobuf v1.36.5
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -59,23 +58,20 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
+	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/oschwald/maxminddb-golang v1.13.1 // indirect
@@ -86,7 +82,6 @@ require (
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
@@ -95,13 +90,10 @@ require (
 	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.5.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.62.1 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.9.1 // indirect
 )
 
 // https://github.com/gobwas/glob/pull/55

go.sum

@@ -1,5 +1,3 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/AudriusButkevicius/recli v0.0.7-0.20220911121932-d000ce8fbf0f h1:GmH5lT+moM7PbAJFBq57nH9WJ+wRnBXr/tyaYWbSAx8=
 github.com/AudriusButkevicius/recli v0.0.7-0.20220911121932-d000ce8fbf0f/go.mod h1:Nhfib1j/VFnLrXL9cHgA+/n2O6P5THuWelOnbfPNd78=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
@@ -7,8 +5,8 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzS
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw=
-github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
+github.com/alecthomas/kong v1.9.0 h1:Wgg0ll5Ys7xDnpgYBuBn/wPeLGAuK0NvYmEcisJgrIs=
+github.com/alecthomas/kong v1.9.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
 github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
@@ -31,6 +29,8 @@ github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV
 github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chmduquesne/rollinghash v4.0.0+incompatible h1:hnREQO+DXjqIw3rUTzWN7/+Dpw+N5Um8zpKV0JOEgbo=
+github.com/chmduquesne/rollinghash v4.0.0+incompatible/go.mod h1:Uc2I36RRfTAf7Dge82bi3RU0OQUmXT9iweIcPqvr8A0=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -41,8 +41,6 @@ github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkE
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
 github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -62,8 +60,6 @@ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
@@ -89,12 +85,14 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/greatroar/blobloom v0.8.0 h1:I9RlEkfqK9/6f1v9mFmDYegDQ/x0mISCpiNpAm23Pt4=
+github.com/greatroar/blobloom v0.8.0/go.mod h1:mjMJ1hh1wjGVfr93QIHJ6FfDNVrA0IELv8OvMHJxHKs=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -130,8 +128,6 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
-github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -144,17 +140,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
 github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
-github.com/maruel/panicparse/v2 v2.5.0 h1:yCtuS0FWjfd0RTYMXGpDvWcb0kINm8xJGu18/xMUh00=
-github.com/maruel/panicparse/v2 v2.5.0/go.mod h1:DA2fDiBk63bKfBf4CVZP9gb4fuvzdPbLDsSI873hweQ=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/mattn/go-sqlite3 v1.14.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
-github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/maruel/panicparse/v2 v2.4.0 h1:yQKMIbQ0DKfinzVkTkcUzQyQ60UCiNnYfR7PWwTs2VI=
+github.com/maruel/panicparse/v2 v2.4.0/go.mod h1:nOY2OKe8csO3F3SA5+hsxot05JLgukrF54B9x88fVp4=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 h1:yVCLo4+ACVroOEr4iFU1iH46Ldlzz2rTuu18Ra7M8sU=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2/go.mod h1:VzB2VoMh1Y32/QqDfg9ZJYHj99oM4LiGtqPZydTiQSQ=
 github.com/maxmind/geoipupdate/v6 v6.1.0 h1:sdtTHzzQNJlXF5+fd/EoPTucRHyMonYt/Cok8xzzfqA=
@@ -163,8 +152,6 @@ github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75 h1:cUVxyR+U
 github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod h1:pBbZyGwC5i16IBkjVKoy/sznA8jPD/K9iedwe1ESE6w=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
@@ -210,14 +197,12 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
-github.com/quic-go/quic-go v0.50.1 h1:unsgjFIUqW8a2oopkY7YNONpV1gYND6Nt9hnt1PN94Q=
-github.com/quic-go/quic-go v0.50.1/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
+github.com/quic-go/quic-go v0.50.0 h1:3H/ld1pa3CYhkcc20TPIyG1bNsdhn9qZBGN3b9/UyUo=
+github.com/quic-go/quic-go v0.50.0/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
 github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
 github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
-github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg=
-github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab h1:ZjX6I48eZSFetPb41dHudEyVr5v953N15TsNZXlkcWY=
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab/go.mod h1:/PfPXh0EntGc3QAAyUaviy4S9tzy4Zp0e2ilq4voC6E=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -226,8 +211,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
-github.com/shirou/gopsutil/v4 v4.25.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
-github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
+github.com/shirou/gopsutil/v4 v4.25.2 h1:NMscG3l2CqtWFS86kj3vP7soOczqrQYIEhO/pMvvQkk=
+github.com/shirou/gopsutil/v4 v4.25.2/go.mod h1:34gBYJzyqCDT11b6bMHP0XCvWeU3J61XRT7a2EmCRTA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -281,8 +266,8 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -309,8 +294,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -345,7 +330,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -398,8 +382,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -415,29 +399,5 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/cc/v4 v4.25.2 h1:T2oH7sZdGvTaie0BRNFbIYsabzCxUQg8nLqCdQ2i0ic=
-modernc.org/cc/v4 v4.25.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.25.1 h1:TFSzPrAGmDsdnhT9X2UrcPMI3N/mJ9/X9ykKXwLhDsU=
-modernc.org/ccgo/v4 v4.25.1/go.mod h1:njjuAYiPflywOOrm3B7kCB444ONP5pAVr8PIEoE0uDw=
-modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
-modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
-modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s=
-modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g=
-modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
-modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
-modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

gui/default/assets/lang/lang-ar.json

@@ -154,7 +154,7 @@
     "Failed Items": "العناصر الفاشلة",
     "Failed to load file versions.": "لم يُتَوَصَّل لنسخة الملف.",
     "Failed to load ignore patterns.": "فشل التَّوَصُّل إلى مُرَشِّحات التجاهل.",
-    "Failed to set up, retrying": "فشل الإعداد، تجري المحاولة مرة أخرى",
+    "Failed to setup, retrying": "فشل الإعداد، تجري المحاولة مرة أخرى",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "يُتوقع فشل الاتصال بخوادم IPv6، إذا لم يكن IPv6 متاحا.",
     "File Pull Order": "ترتيب استيراد الملفات",
     "File Versioning": "إصدارات الملف",

gui/default/assets/lang/lang-bg.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Разрешени мрежи",
     "Alphabetic": "Азбучен ред",
     "Altered by ignoring deletes.": "Промяна чрез пренебрегване на премахваните елементи.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Винаги включено, когато вида на папката е „{{foldertype}}“.",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Външна команда управлява версиите. Тя трябва да премахне файла от синхронизираната папка. Ако в пътя до приложението има интервали, то той трябва да бъде поставен в кавички.",
     "Anonymous Usage Reporting": "Анонимно отчитане на употреба",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Форматът на данните за анонимно отчитане на употреба е променен. Желаете ли да използвате него вместо стария?",
@@ -53,7 +52,6 @@
     "Body:": "Съдържание:",
     "Bugs": "Дефекти",
     "Cancel": "Отказ",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Не мож да бъде включено, ако вида на папката е „{{foldertype}}“.",
     "Changelog": "Дневник на промените",
     "Clean out after": "Почистване след",
     "Cleaning Versions": "Почистване на версии",
@@ -156,7 +154,7 @@
     "Failed Items": "Елементи с грешка",
     "Failed to load file versions.": "Грешка при зареждане на версии.",
     "Failed to load ignore patterns.": "Грешка при зареждане на шаблони за пренебрегване.",
-    "Failed to set up, retrying": "Грешка при настройване, извършва се повторен опит",
+    "Failed to setup, retrying": "Грешка при настройване, извършва се повторен опит",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към сървъри по IPv6 може да се очаква ако няма свързаност по IPv6.",
     "File Pull Order": "Ред на изтегляне",
     "File Versioning": "Версии на файловете",

gui/default/assets/lang/lang-ca.json

@@ -154,7 +154,7 @@
     "Failed Items": "Elements fallats",
     "Failed to load file versions.": "No s'han pogut carregar les versions dels fitxers.",
     "Failed to load ignore patterns.": "No s'han pogut carregar els patrons ignorats.",
-    "Failed to set up, retrying": "No s'ha pogut configurar, s'està tornant a provar",
+    "Failed to setup, retrying": "No s'ha pogut configurar, s'està tornant a provar",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "S'espera que no es pugui connectar als servidors IPv6 si no hi ha connectivitat IPv6.",
     "File Pull Order": "Ordre d'agafar fitxers",
     "File Versioning": "Versionat de Fitxers",

gui/default/assets/lang/lang-ca@valencia.json

@@ -150,7 +150,7 @@
     "Failed Items": "Objectes fallits",
     "Failed to load file versions.": "No s'han pogut carregar les versions dels fitxers.",
     "Failed to load ignore patterns.": "No s'han pogut carregar els patrons ignorats.",
-    "Failed to set up, retrying": "Errada en la configuració, reintentant",
+    "Failed to setup, retrying": "Errada en la configuració, reintentant",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "És possible que es produïsca una fallada al connectar als servidors IPv6 si no hi ha connectivitat IPv6.",
     "File Pull Order": "Ordre de fitxers del pull",
     "File Versioning": "Versionat de fitxer",

gui/default/assets/lang/lang-cs.json

@@ -154,7 +154,7 @@
     "Failed Items": "Nezdařené položky",
     "Failed to load file versions.": "Nepodařilo se nahrát verze souboru.",
     "Failed to load ignore patterns.": "Načtení vzorů ignorovaného se nezdařilo.",
-    "Failed to set up, retrying": "Nastavování se nezdařilo, zkouší se znovu",
+    "Failed to setup, retrying": "Nastavování se nezdařilo, zkouší se znovu",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když se připojení k IPv6 serverům nezdaří, pokud není k dispozici IPv6 konektivita.",
     "File Pull Order": "Pořadí stahování souborů",
     "File Versioning": "Správa verzí souborů",

gui/default/assets/lang/lang-da.json

@@ -154,7 +154,7 @@
     "Failed Items": "Mislykkede filer",
     "Failed to load file versions.": "Fil versioner kunne ikke indlæses.",
     "Failed to load ignore patterns.": "Ignorerings-mønstre kunne ikke indlæses.",
-    "Failed to set up, retrying": "Opsætning mislykkedes; prøver igen",
+    "Failed to setup, retrying": "Opsætning mislykkedes; prøver igen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Fejl i forbindelse med opkobling til IPv6-servere skal forventes, hvis der ikke er IPv6-forbindelse.",
     "File Pull Order": "Hentningsrækkefølge for filer",
     "File Versioning": "Filversionering",

gui/default/assets/lang/lang-de.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Erlaubte Netzwerke",
     "Alphabetic": "Alphabetisch",
     "Altered by ignoring deletes.": "Weicht ab, weil Löschungen ignoriert werden.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Immer eingeschaltet, wenn der Ordnertyp „{{foldertype}}“ ist.",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Die Versionierung erfolgt über einen externen Befehl. Er muss die Datei aus dem geteilten Ordner entfernen. Wenn der Pfad zur Anwendung Leerzeichen enthält, sollte er in Anführungszeichen gesetzt werden.",
     "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Das Format des anonymen Nutzungsberichts hat sich geändert. Möchten Sie auf das neue Format umsteigen?",
@@ -53,7 +52,6 @@
     "Body:": "Nachrichtentext:",
     "Bugs": "Fehler",
     "Cancel": "Abbrechen",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Kann nicht aktiviert werden, wenn der Ordnertyp „{{foldertype}}“ ist.",
     "Changelog": "Änderungsprotokoll",
     "Clean out after": "Löschen nach",
     "Cleaning Versions": "Versionen bereinigen",
@@ -156,7 +154,7 @@
     "Failed Items": "Fehlgeschlagene Elemente",
     "Failed to load file versions.": "Fehler beim Laden der Dateiversionen.",
     "Failed to load ignore patterns.": "Fehler beim Laden der Ignoriermuster.",
-    "Failed to set up, retrying": "Fehler beim Einrichten, erneuter Versuch",
+    "Failed to setup, retrying": "Fehler beim Einrichten, erneuter Versuch",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Ein Verbindungsfehler zu IPv6-Servern ist zu erwarten, wenn es keine IPv6-Konnektivität gibt.",
     "File Pull Order": "Dateiübertragungsreihenfolge",
     "File Versioning": "Dateiversionierung",

gui/default/assets/lang/lang-el.json

@@ -154,7 +154,7 @@
     "Failed Items": "Αρχεία που απέτυχαν",
     "Failed to load file versions.": "Η φόρτωση των εκδόσεων αρχείων απέτυχε.",
     "Failed to load ignore patterns.": "Αποτυχία φόρτωσης μοτίβων παράβλεψης.",
-    "Failed to set up, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια",
+    "Failed to setup, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Είναι φυσιολογική η αποτυχία σύνδεσης σε εξυπηρετητές IPv6 όταν δεν υπάρχει συνδεσιμότητα IPv6.",
     "File Pull Order": "Σειρά με την οποία θα κατεβαίνουν τα αρχεία",
     "File Versioning": "Τήρηση εκδόσεων αρχείων",

gui/default/assets/lang/lang-en-AU.json

@@ -150,7 +150,7 @@
     "Failed Items": "Failed Items",
     "Failed to load file versions.": "Failed to load file versions.",
     "Failed to load ignore patterns.": "Failed to load ignore patterns.",
-    "Failed to set up, retrying": "Failed to set up, retrying",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "File Pull Order",
     "File Versioning": "File Versioning",

gui/default/assets/lang/lang-en-GB.json

@@ -154,7 +154,7 @@
     "Failed Items": "Failed Items",
     "Failed to load file versions.": "Failed to load file versions.",
     "Failed to load ignore patterns.": "Failed to load ignore patterns.",
-    "Failed to set up, retrying": "Failed to set up, retrying",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "File Pull Order",
     "File Versioning": "File Versioning",

gui/default/assets/lang/lang-en.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Allowed Networks",
     "Alphabetic": "Alphabetic",
     "Altered by ignoring deletes.": "Altered by ignoring deletes.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Always turned on when the folder type is \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
     "Anonymous Usage Reporting": "Anonymous Usage Reporting",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
@@ -53,7 +52,6 @@
     "Body:": "Body:",
     "Bugs": "Bugs",
     "Cancel": "Cancel",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Cannot be enabled when the folder type is \"{{foldertype}}\".",
     "Changelog": "Changelog",
     "Clean out after": "Clean out after",
     "Cleaning Versions": "Cleaning Versions",
@@ -156,7 +154,7 @@
     "Failed Items": "Failed Items",
     "Failed to load file versions.": "Failed to load file versions.",
     "Failed to load ignore patterns.": "Failed to load ignore patterns.",
-    "Failed to set up, retrying": "Failed to set up, retrying",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "File Pull Order",
     "File Versioning": "File Versioning",

gui/default/assets/lang/lang-eo.json

@@ -106,7 +106,7 @@
     "Error": "Eraro",
     "External File Versioning": "Ekstera Versionado de Dosiero",
     "Failed Items": "Malsukcesaj Eroj",
-    "Failed to set up, retrying": "Malsukcesis agordi, provante denove",
+    "Failed to setup, retrying": "Malsukcesis agordi, provante denove",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Malsukceso por konekti al IPv6 serviloj atendante se ekzistas neniu IPv6 konektebleco.",
     "File Pull Order": "Ordo por Tiri Dosieron",
     "File Versioning": "Versionado de Dosieroj",

gui/default/assets/lang/lang-es.json

@@ -154,7 +154,7 @@
     "Failed Items": "Elementos fallidos",
     "Failed to load file versions.": "Error al cargar las versiones de los archivos.",
     "Failed to load ignore patterns.": "No se pudieron cargar los patrones de ignorar.",
-    "Failed to set up, retrying": "Fallo en la configuración, reintentando",
+    "Failed to setup, retrying": "Fallo en la configuración, reintentando",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
     "File Pull Order": "Orden de Obtención de los Archivos",
     "File Versioning": "Versionado de ficheros",

gui/default/assets/lang/lang-eu.json

@@ -130,7 +130,7 @@
     "External File Versioning": "Fitxategi bertsioen kanpoko kudeaketa",
     "Failed Items": "Huts egin duten fitxategiak",
     "Failed to load ignore patterns.": "Huts egin du baztertze ereduak kargatzean.",
-    "Failed to set up, retrying": "Konfigurazioan huts egitea, berriro saiatuz",
+    "Failed to setup, retrying": "Konfigurazioan huts egitea, berriro saiatuz",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 zerbitzariei buruzko konexioak huts eginen du, IPv6 konektibitaterik ez bada",
     "File Pull Order": "Fitxategiak berreskuratzeko ordena",
     "File Versioning": "Fitxategiak zaintzeko metodoa",

gui/default/assets/lang/lang-fi.json

@@ -122,7 +122,7 @@
     "External": "Ulkoinen",
     "External File Versioning": "Ulkoinen tiedostoversionti",
     "Failed Items": "Epäonnistuneet kohteet",
-    "Failed to set up, retrying": "Käyttöönotto epäonnistui, Yritetään uudelleen",
+    "Failed to setup, retrying": "Käyttöönotto epäonnistui, Yritetään uudelleen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Yhteys IPv6-palvelimiin todennäköisesti epäonnistuu, koska IPv6-yhteyksiä ei ole.",
     "File Pull Order": "Tiedostojen noutojärjestys",
     "File Versioning": "Tiedostoversiointi",

gui/default/assets/lang/lang-fil.json

@@ -154,7 +154,7 @@
     "Failed Items": "Mga Nabigong Item",
     "Failed to load file versions.": "Nabigong i-load ang mga bersyon ng file.",
     "Failed to load ignore patterns.": "Nabigong i-load ang mga ignore pattern.",
-    "Failed to set up, retrying": "Nabigong i-set up, sinusubukan muli",
+    "Failed to setup, retrying": "Nabigong i-set up, sinusubukan muli",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Inaasahan ang pagbigo sa pagkonekta sa mga IPv6 na server kapag walang konektibidad sa IPv6.",
     "File Pull Order": "Order ng Pagkuha ng File",
     "File Versioning": "File Versioning",

gui/default/assets/lang/lang-fr.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Réseaux autorisés",
     "Alphabetic": "Alphabétique",
     "Altered by ignoring deletes.": "Protégé par \"Ignore Delete\".",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Toujours activé pour le type de partage \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers du répertoire partagé. Si le chemin contient des espaces, il doit être spécifié entre guillemets.",
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Le format du rapport anonyme d'utilisation a changé. Voulez-vous passer au nouveau format ?",
@@ -53,7 +52,6 @@
     "Body:": "Corps du message :",
     "Bugs": "Bogues",
     "Cancel": "Annuler",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Ne peut être activé pour le type de partage \"{{foldertype}}\".",
     "Changelog": "Historique des versions",
     "Clean out after": "Conserver pendant",
     "Cleaning Versions": "Purge des versions",
@@ -156,7 +154,7 @@
     "Failed Items": "Éléments en échec",
     "Failed to load file versions.": "Échec de chargement des versions de fichiers.",
     "Failed to load ignore patterns.": "Échec du chargement des masques d'exclusions.",
-    "Failed to set up, retrying": "Échec, nouvel essai",
+    "Failed to setup, retrying": "Échec, nouvel essai",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connexion aux serveurs en IPv6 va échouer s'il n'y a pas de connectivité IPv6.",
     "File Pull Order": "Ordre de récupération des fichiers",
     "File Versioning": "Préservation des fichiers",

gui/default/assets/lang/lang-fy.json

@@ -146,7 +146,7 @@
     "Error": "Flater",
     "External File Versioning": "Ekstern ferzjebehear foar triemen",
     "Failed Items": "Mislearre items",
-    "Failed to set up, retrying": "Ynskeakeljen mislearre, wurd no opnij besocht",
+    "Failed to setup, retrying": "Ynskeakeljen mislearre, wurd no opnij besocht",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Mislearjen fan it ferbinen mei IPv6-tsjinners wurd ferwachte as der gjin stipe foar IPv6-ferbinings is.",
     "File Pull Order": "Triemlûkfolchoarder",
     "File Versioning": "Triemferzjebehear",

gui/default/assets/lang/lang-ga.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Líonraí Ceadaithe",
     "Alphabetic": "Aibítreach",
     "Altered by ignoring deletes.": "Athraithe trí neamhaird a dhéanamh ar scriosadh.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Cuirtear ar siúl i gcónaí é nuair is é \"{{foldertype}}\" an cineál fillteáin.",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Láimhseálann ordú seachtrach an leagan. Caithfidh sé an comhad a bhaint den fhillteán comhroinnte. Má tá spásanna sa chosán chuig an bhfeidhmchlár, ba chóir é a lua.",
     "Anonymous Usage Reporting": "Tuairisciú Úsáide Gan Ainm",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Tá athrú tagtha ar fhormáid na tuarascála úsáide gan ainm. Ar mhaith leat bogadh go dtí an fhormáid nua?",
@@ -53,7 +52,6 @@
     "Body:": "Comhlacht:",
     "Bugs": "Fabhtanna",
     "Cancel": "Cuir ar ceal",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Ní féidir é a chumasú nuair is é \"{{foldertype}}\" an cineál fillteáin.",
     "Changelog": "ChangelogName",
     "Clean out after": "Glan amach tar éis",
     "Cleaning Versions": "Leaganacha Glantacháin",
@@ -156,7 +154,7 @@
     "Failed Items": "Míreanna Teipthe",
     "Failed to load file versions.": "Theip ar luchtú leaganacha comhaid.",
     "Failed to load ignore patterns.": "Theip ar phatrúin neamhairde a luchtú.",
-    "Failed to set up, retrying": "Theip ar thus, ag triail arís",
+    "Failed to setup, retrying": "Theip ar thus, ag triail arís",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Táthar ag súil le mainneachtain ceangal le freastalaithe IPv6 mura bhfuil nascacht IPv6 ann.",
     "File Pull Order": "Ordú Tarraingthe Comhad",
     "File Versioning": "Leagan Comhaid",

gui/default/assets/lang/lang-gl.json

@@ -153,7 +153,7 @@
     "Failed Items": "Elmentos fallados",
     "Failed to load file versions.": "Fallou a carga das versións dos ficheiros.",
     "Failed to load ignore patterns.": "Fallou a carga de patróns ignorados.",
-    "Failed to set up, retrying": "Fallou a configuración, reintentando",
+    "Failed to setup, retrying": "Fallou a configuración, reintentando",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "É de agardar o fallo ao conectar con servidores IPv6 se non hai conexión por IPv6.",
     "File Pull Order": "Orde de Obtención de Arquivos",
     "File Versioning": "Versionado de Ficheiros",

gui/default/assets/lang/lang-he-IL.json

@@ -154,7 +154,7 @@
     "Failed Items": "פריטים שנכשלו",
     "Failed to load file versions.": "טעינת גרסאות קבצים נכשלה.",
     "Failed to load ignore patterns.": "טעינת דפוסי התעלמות נכשלה.",
-    "Failed to set up, retrying": "ההגדרה נכשלה, מנסה שוב",
+    "Failed to setup, retrying": "ההגדרה נכשלה, מנסה שוב",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "צפוי כשל בהתחברות לשרתי IPv6 אם אין קישוריות IPv6.",
     "File Pull Order": "סדר משיכת קבצים",
     "File Versioning": "ניהול גרסאות קבצים",

gui/default/assets/lang/lang-hi.json

@@ -154,7 +154,7 @@
     "Failed Items": "विफल वस्तुएं",
     "Failed to load file versions.": "फाइल संस्करण लोड करने में विफल।",
     "Failed to load ignore patterns.": "नजरअंदाज प्रतिमान लोड करने में विफल।",
-    "Failed to set up, retrying": "स्थापना करने में विफल, पुनः प्रयास किया जा रहा है",
+    "Failed to setup, retrying": "स्थापना करने में विफल, पुनः प्रयास किया जा रहा है",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "यदि IPv6 संयोजकता नहीं है तो IPv6 सर्वर से जुड़ने में विफलता अपेक्षित है।",
     "File Pull Order": "फाइल खींचने का क्रम",
     "File Versioning": "फाइल संस्करणीकरण",

gui/default/assets/lang/lang-hu.json

@@ -146,7 +146,7 @@
     "Failed Items": "Hibás elemek",
     "Failed to load file versions.": "Nem sikerült betölteni a fájlverziókat.",
     "Failed to load ignore patterns.": "Nem sikerült betölteni a mellőzési mintákat.",
-    "Failed to set up, retrying": "Telepítés nem sikerült, újrapróbálkozás",
+    "Failed to setup, retrying": "Telepítés nem sikerült, újrapróbálkozás",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Mivel nincs IPv6 kapcsolat, ezért várhatóan nem fog sikerülni IPv6-os szerverekhez csatlakozni.",
     "File Pull Order": "Fájlküldési sorrend",
     "File Versioning": "Fájlverzió-követés",

gui/default/assets/lang/lang-id.json

@@ -146,7 +146,7 @@
     "Failed Items": "Berkas yang gagal",
     "Failed to load file versions.": "Gagal memuat versi berkas.",
     "Failed to load ignore patterns.": "Gagal memuat pola pengabaian.",
-    "Failed to set up, retrying": "Gagal menyiapkan, mengulang",
+    "Failed to setup, retrying": "Gagal menyiapkan, mengulang",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Gagal untuk menyambung ke server IPv6 itu disangka apabila tidak ada konektivitas IPv6.",
     "File Pull Order": "Urutan Penarikan Berkas",
     "File Versioning": "Pemversian Berkas",

gui/default/assets/lang/lang-it.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Reti Consentite",
     "Alphabetic": "Alfabetico",
     "Altered by ignoring deletes.": "Modificato ignorando le eliminazioni.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Sempre attivato quando il tipo di cartella è \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Il controllo versione è gestito da un comando esterno. Quest'ultimo deve rimuovere il file dalla cartella condivisa. Se il percorso dell'applicazione contiene spazi, deve essere indicato tra virgolette.",
     "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Il formato delle statistiche anonime di utilizzo è cambiato. Vuoi passare al nuovo formato?",
@@ -53,7 +52,6 @@
     "Body:": "Corpo:",
     "Bugs": "Bug",
     "Cancel": "Annulla",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Non può essere abilitato se il tipo di cartella è \"{{foldertype}}\".",
     "Changelog": "Registro modifiche",
     "Clean out after": "Svuota dopo",
     "Cleaning Versions": "Pulizia Versioni",
@@ -156,7 +154,7 @@
     "Failed Items": "Elementi Errati",
     "Failed to load file versions.": "Impossibile caricare le versioni dei file.",
     "Failed to load ignore patterns.": "Impossibile caricare gli schemi di esclusione.",
-    "Failed to set up, retrying": "Configurazione fallita, riprovo",
+    "Failed to setup, retrying": "Configurazione fallita, riprovo",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connessione a server IPv6 fallisce se non c'è connettività IPv6.",
     "File Pull Order": "Ordine Prelievo File",
     "File Versioning": "Controllo Versione File",

gui/default/assets/lang/lang-ko-KR.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "허가된 망",
     "Alphabetic": "가나다순",
     "Altered by ignoring deletes.": "삭제 항목 무시로 변경됨",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "{{foldertype}} 폴더 유형일 때는 항상 활성화되어 있습니다.",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "외부 명령이 파일 버전을 관리합니다. 공유 폴더에서 파일을 삭제해야 합니다. 응용 프로그램의 경로에 공백이 있으면 따옴표로 묶어야 합니다.",
     "Anonymous Usage Reporting": "익명 사용 보고",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "익명 사용 보고의 형식이 변경되었습니다. 새 형식으로 설정을 변경하시겠습니까?",
@@ -53,7 +52,6 @@
     "Body:": "내용:",
     "Bugs": "버그",
     "Cancel": "취소",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "{{foldertype}} 폴더 유형일 때는 활성화할 수 없습니다.",
     "Changelog": "변경 기록",
     "Clean out after": "보관 기간",
     "Cleaning Versions": "버전 정리",
@@ -156,7 +154,7 @@
     "Failed Items": "실패 항목",
     "Failed to load file versions.": "파일 버전을 불러오기에 실패했습니다.",
     "Failed to load ignore patterns.": "무시 양식을 불러오기에 실패했습니다.",
-    "Failed to set up, retrying": "설정 적용 실패; 재시도 중",
+    "Failed to setup, retrying": "설정 적용 실패; 재시도 중",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6에 연결되어 있지 않을 때는 IPv6 서버에 접속하지 못하는 것이 정상입니다.",
     "File Pull Order": "파일 수신 순서",
     "File Versioning": "파일 버전 관리",

gui/default/assets/lang/lang-lt.json

@@ -144,7 +144,7 @@
     "Failed Items": "Nepavykę siuntimai",
     "Failed to load file versions.": "Nepavyko įkelti failo versijų.",
     "Failed to load ignore patterns.": "Nepavyko įkelti nepaisymo šablonų.",
-    "Failed to set up, retrying": "Nepavyko nustatyti, bandoma iš naujo",
+    "Failed to setup, retrying": "Nepavyko nustatyti, bandoma iš naujo",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Nesėkmė prisijungti prie IPv6 serverių yra tikėtina, jei nėra IPv6 ryšio.",
     "File Pull Order": "Failų siuntimo tvarka",
     "File Versioning": "Versijų valdymas",

gui/default/assets/lang/lang-nb.json

@@ -154,7 +154,7 @@
     "Failed Items": "Elementsynkronisering som har mislyktes",
     "Failed to load file versions.": "Lasting av fil-versjoner feilet.",
     "Failed to load ignore patterns.": "Lasting av ignorer mønstre feilet.",
-    "Failed to set up, retrying": "Klarte ikke å utføre oppsett, prøver igjen",
+    "Failed to setup, retrying": "Klarte ikke å utføre oppsett, prøver igjen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Å ikke klare å koble til IPv6-tjenere er forventet hvis det ikke er noen IPv6-tilknytning.",
     "File Pull Order": "Filenes henterekkefølge",
     "File Versioning": "Versjonskontroll",

gui/default/assets/lang/lang-nl.json

@@ -154,7 +154,7 @@
     "Failed Items": "Mislukte items",
     "Failed to load file versions.": "Laden van bestandsversies mislukt.",
     "Failed to load ignore patterns.": "Laden van negeerpatronen mislukt.",
-    "Failed to set up, retrying": "Instellen mislukt, opnieuw proberen",
+    "Failed to setup, retrying": "Instellen mislukt, opnieuw proberen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Als er geen IPv6-connectiviteit is worden problemen bij verbinden met IPv6-servers verwacht.",
     "File Pull Order": "Volgorde voor binnenhalen van bestanden",
     "File Versioning": "Versiebeheer",

gui/default/assets/lang/lang-pl.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Dozwolone sieci",
     "Alphabetic": "Alfabetycznie",
     "Altered by ignoring deletes.": "Zmieniono przez ignorowanie usuniętych",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Zawsze włączone, gdy typ folderu to \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Zewnętrzne polecenie odpowiedzialne jest za wersjonowanie. Musi ono usunąć plik ze współdzielonego folderu. Jeżeli ścieżka do aplikacji zawiera spacje, to powinna ona być zamknięta w cudzysłowie.",
     "Anonymous Usage Reporting": "Anonimowe statystyki użycia",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Format anonimowych statystyk użycia uległ zmianie. Czy chcesz przejść na nowy format?",
@@ -53,7 +52,6 @@
     "Body:": "Treść:",
     "Bugs": "Błędy",
     "Cancel": "Anuluj",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Nie można włączyć, jeśli typem folderu jest \"{{foldertype}}\".",
     "Changelog": "Historia zmian",
     "Clean out after": "Opróżnij po",
     "Cleaning Versions": "Czyszczenie wersji",
@@ -156,7 +154,7 @@
     "Failed Items": "Elementy zakończone niepowodzeniem",
     "Failed to load file versions.": "Nie udało się załadować wersji plików.",
     "Failed to load ignore patterns.": "Nie udało się załadować wzorców ignorowania.",
-    "Failed to set up, retrying": "Nie udało się ustawić; ponawiam próbę",
+    "Failed to setup, retrying": "Nie udało się ustawić; ponawiam próbę",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Błąd połączenia do serwerów IPv6 może wystąpić, gdy w ogóle nie ma połączenia po IPv6.",
     "File Pull Order": "Kolejność pobierania plików",
     "File Versioning": "Wersjonowanie plików",

gui/default/assets/lang/lang-pt-BR.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Redes permitidas",
     "Alphabetic": "Alfabética",
     "Altered by ignoring deletes.": "Alterado ignorando exclusões.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Sempre ativado quando o tipo de pasta for \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Um comando externo controla o controle de versão. Tem que remover o arquivo da pasta compartilhada. Se o caminho para o aplicativo contiver espaços, ele deve ser colocado entre aspas.",
     "Anonymous Usage Reporting": "Relatórios anônimos de uso",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anônimo de uso mudou. Gostaria de usar o formato novo?",
@@ -53,7 +52,6 @@
     "Body:": "Corpo:",
     "Bugs": "Erros",
     "Cancel": "Cancelar",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Não pode ser ativado se o tipo de pasta for \"{{foldertype}}\".",
     "Changelog": "Registro de alterações",
     "Clean out after": "Limpar depois de",
     "Cleaning Versions": "Limpando Versões",
@@ -156,7 +154,7 @@
     "Failed Items": "Itens com falha",
     "Failed to load file versions.": "Falha ao carregar versões do arquivo.",
     "Failed to load ignore patterns.": "Falha ao carregar os padrões para ignorar.",
-    "Failed to set up, retrying": "Não foi possível configurar, tentando novamente",
+    "Failed to setup, retrying": "Não foi possível configurar, tentando novamente",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Falhas na conexão a servidores IPv6 são esperadas caso não haja conectividade IPv6.",
     "File Pull Order": "Ordem de retirada do arquivo",
     "File Versioning": "Versionamento de arquivos",

gui/default/assets/lang/lang-pt-PT.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Redes permitidas",
     "Alphabetic": "Alfabética",
     "Altered by ignoring deletes.": "Alterada por terem sido ignoradas as eliminações.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Sempre ligado quando o tipo de pasta é \"{{foldertype}}\".",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Um comando externo gere as versões. Esse comando tem que remover o ficheiro da pasta partilhada. Se o caminho para a aplicação contiver espaços, então terá de o escrever entre aspas.",
     "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anónimo de utilização foi alterado. Gostaria de mudar para o novo formato?",
@@ -53,7 +52,6 @@
     "Body:": "Corpo:",
     "Bugs": "Erros",
     "Cancel": "Cancelar",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Não pode ser habilitado quando o tipo de pasta é \"{{foldertype}}\".",
     "Changelog": "Registo de alterações",
     "Clean out after": "Esvaziar ao fim de",
     "Cleaning Versions": "Limpando versões",
@@ -156,7 +154,7 @@
     "Failed Items": "Itens que falharam",
     "Failed to load file versions.": "Falha ao carregar as versões do ficheiro.",
     "Failed to load ignore patterns.": "Falha ao carregar os padrões de exclusão.",
-    "Failed to set up, retrying": "A preparação falhou, a tentar novamente",
+    "Failed to setup, retrying": "A preparação falhou, a tentar novamente",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "São esperadas falhas na ligação a servidores IPv6 se não existir conectividade IPv6.",
     "File Pull Order": "Ordem de obtenção de ficheiros",
     "File Versioning": "Gestão de versões de ficheiros",

gui/default/assets/lang/lang-ro-RO.json

@@ -143,6 +143,7 @@
     "Error": "Eroare",
     "External File Versioning": "Administrare externă a versiunilor documentului",
     "Failed Items": "Failed Items",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "File Pull Order",
     "File Versioning": "Versiune Fișier",

gui/default/assets/lang/lang-ru.json

@@ -154,7 +154,7 @@
     "Failed Items": "Сбойные объекты",
     "Failed to load file versions.": "Не удалось загрузить версии файлов.",
     "Failed to load ignore patterns.": "Не удалось загрузить шаблоны игнорирования.",
-    "Failed to set up, retrying": "Не удалось настроить, пробуем ещё",
+    "Failed to setup, retrying": "Не удалось настроить, пробуем ещё",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Если нет IPv6-соединений, при подключении к IPv6-серверам произойдёт ошибка.",
     "File Pull Order": "Порядок получения файлов",
     "File Versioning": "Управление версиями",

gui/default/assets/lang/lang-si.json

@@ -143,7 +143,7 @@
     "Failed Items": "අසාර්ථක අයිතම",
     "Failed to load file versions.": "ගොනු අනුවාද පූරණය කිරීමට අසමත් විය.",
     "Failed to load ignore patterns.": "නොසලකා හැරීමේ රටා පූරණය කිරීමට අසමත් විය.",
-    "Failed to set up, retrying": "පිහිටුවීමට අසමත් විය, උත්සාහ කරමින්",
+    "Failed to setup, retrying": "පිහිටුවීමට අසමත් විය, උත්සාහ කරමින්",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 සම්බන්ධතාවක් නොමැති නම් IPv6 සේවාදායක වෙත සම්බන්ධ වීමට අසමත් වීම අපේක්ෂා කෙරේ.",
     "File Pull Order": "ගොනු ඇදීමේ නියෝගය",
     "File Versioning": "ගොනු අනුවාදය",

gui/default/assets/lang/lang-sk.json

@@ -153,7 +153,7 @@
     "Failed Items": "Zlyhané položky",
     "Failed to load file versions.": "Nepodarilo sa načítať verzie súborov.",
     "Failed to load ignore patterns.": "Nepodarilo sa načítať ignorované vzory.",
-    "Failed to set up, retrying": "Nepodarilo sa nastaviť, opakujem",
+    "Failed to setup, retrying": "Nepodarilo sa nastaviť, opakujem",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Zlyhanie pripojenia k IPv6 serverom je očakávané ak neexistujú žiadne IPv6 pripojenia.",
     "File Pull Order": "Poradie sťahovania súborov",
     "File Versioning": "Verzie súborov",

gui/default/assets/lang/lang-sl.json

@@ -131,7 +131,7 @@
     "External File Versioning": "Zunanje beleženje različic datotek",
     "Failed Items": "Neuspeli predmeti",
     "Failed to load ignore patterns.": "Prezrih vzorcev ni bilo mogoče naložiti.",
-    "Failed to set up, retrying": "Nastavitev ni uspela, ponovni poskus",
+    "Failed to setup, retrying": "Nastavitev ni uspela, ponovni poskus",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Neuspeh povezav z IPv6 strežniki je pričakovan, če ni IPv6 povezljivost.",
     "File Pull Order": "Vrstni red prenosa datotek",
     "File Versioning": "Beleženje različic datotek",

gui/default/assets/lang/lang-sv.json

@@ -154,7 +154,7 @@
     "Failed Items": "Misslyckade objekt",
     "Failed to load file versions.": "Det gick inte att läsa in filversioner.",
     "Failed to load ignore patterns.": "Det gick inte att läsa in ignoreringsmönster.",
-    "Failed to set up, retrying": "Det gick inte att ställa in, försöker igen",
+    "Failed to setup, retrying": "Det gick inte att ställa in, försöker igen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Det går inte att ansluta till IPv6-servrar om det inte finns någon IPv6-anslutning.",
     "File Pull Order": "Filhämtningsprioritering",
     "File Versioning": "Filversionshantering",

gui/default/assets/lang/lang-tr.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "İzin Verilen Ağlar",
     "Alphabetic": "Alfabetik",
     "Altered by ignoring deletes.": "Silmeler yoksayılarak değiştirildi.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Klasör türü \"{{foldertype}}\" olduğunda her zaman açıktır.",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Harici bir komut sürümlendirmeyi gerçekleştirir. Dosyayı paylaşılan klasörden kaldırmak zorundadır. Eğer uygulama yolu boşluklar içeriyorsa, tırnak içine alınmalıdır.",
     "Anonymous Usage Reporting": "İsimsiz Kullanım Bildirme",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "İsimsiz kullanım raporu biçimi değişti. Yeni biçime geçmek ister misiniz?",
@@ -53,7 +52,6 @@
     "Body:": "Gövde:",
     "Bugs": "Hatalar",
     "Cancel": "İptal",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Klasör türü \"{{foldertype}}\" olduğunda etkinleştirilemez.",
     "Changelog": "Değişiklik Günlüğü",
     "Clean out after": "Şundan sonra temizle",
     "Cleaning Versions": "Sürümleri Temizleme",
@@ -156,7 +154,7 @@
     "Failed Items": "Başarısız Olan Öğeler",
     "Failed to load file versions.": "Dosya sürümlerini yükleme başarısız.",
     "Failed to load ignore patterns.": "Yoksayma şekillerini yükleme başarısız.",
-    "Failed to set up, retrying": "Ayarlama başarısız, yeniden deneniyor",
+    "Failed to setup, retrying": "Ayarlama başarısız, yeniden deneniyor",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 bağlanabilirliği yoksa IPv6 sunucularına bağlanma hatası beklenmekte.",
     "File Pull Order": "Dosya Çekme Sırası",
     "File Versioning": "Dosya Sürümlendirme",

gui/default/assets/lang/lang-uk.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "Дозволені мережі",
     "Alphabetic": "За абеткою",
     "Altered by ignoring deletes.": "Змінено, ігноруючи видалення.",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "Завжди вмикається, якщо тип теки «{{foldertype}}».",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Зовнішня команда керує версіями. Вона повинна видалити файл із спільної теки. Якщо шлях до застосунку містить пробіли, його слід взяти в лапки.",
     "Anonymous Usage Reporting": "Анонімне звітування про використання",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Формат анонімного звітування про використання змінився. Бажаєте перейти на новий формат?",
@@ -53,7 +52,6 @@
     "Body:": "Повідомлення:",
     "Bugs": "Помилки",
     "Cancel": "Скасувати",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "Неможливо ввімкнути, якщо тип теки «{{foldertype}}».",
     "Changelog": "Журнал змін",
     "Clean out after": "Очистити після",
     "Cleaning Versions": "Очищення версій",
@@ -156,7 +154,7 @@
     "Failed Items": "Невдалі",
     "Failed to load file versions.": "Не вдалося завантажити версії файлів.",
     "Failed to load ignore patterns.": "Не вдалося завантажити шаблони ігнорування.",
-    "Failed to set up, retrying": "Не вдалося налаштувати, повторна спроба",
+    "Failed to setup, retrying": "Не вдалося налаштувати, повторна спроба",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "За відсутності з'єднання IPv6 очікується неможливість під'єднання до серверів IPv6.",
     "File Pull Order": "Порядок витягнення файлів",
     "File Versioning": "Версіонування файлів",
@@ -552,6 +550,6 @@
     },
     "unknown device": "невідомий пристрій",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хоче поділитися папкою \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хоче поділитися текою \"{{folderlabel}}\" ({{folder}}).",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хоче поділитися папкою \"{{folderLabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} може повторно порекомендувати цей пристрій."
 }

gui/default/assets/lang/lang-zh-CN.json

@@ -27,7 +27,6 @@
     "Allowed Networks": "允许的网络",
     "Alphabetic": "字母顺序",
     "Altered by ignoring deletes.": "通过忽略删除进行更改。",
-    "Always turned on when the folder type is \"{%foldertype%}\".": "当文件夹类型为“{{foldertype}}”时始终启用。",
     "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "外部命令处理版本控制。必须从共享文件夹中移除文件。如果应用程序的路径包含空格，应用半角引号括起来。",
     "Anonymous Usage Reporting": "匿名使用报告",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "匿名使用报告格式已更改。是否要切换到新格式？",
@@ -53,7 +52,6 @@
     "Body:": "正文：",
     "Bugs": "问题反馈",
     "Cancel": "取消",
-    "Cannot be enabled when the folder type is \"{%foldertype%}\".": "当文件夹类型为“{{foldertype}}”时无法启用。",
     "Changelog": "更新日志",
     "Clean out after": "在该时间后清除",
     "Cleaning Versions": "清理版本中",
@@ -156,7 +154,7 @@
     "Failed Items": "失败的项目",
     "Failed to load file versions.": "加载文件版本失败。",
     "Failed to load ignore patterns.": "加载忽略模式失败。",
-    "Failed to set up, retrying": "设置失败，正在重试",
+    "Failed to setup, retrying": "设置失败，正在重试",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本机没有配置 IPv6，则无法连接 IPv6 服务器是正常的。",
     "File Pull Order": "文件拉取顺序",
     "File Versioning": "文件版本控制",
@@ -230,12 +228,12 @@
     "Listener Failures": "监听程序失败",
     "Listener Status": "监听程序状态",
     "Listeners": "监听程序",
-    "Loading data...": "正在加载数据…",
-    "Loading...": "正在加载…",
+    "Loading data...": "正在载入数据…",
+    "Loading...": "正在载入…",
     "Local Additions": "本地添加",
     "Local Discovery": "本地发现",
     "Local State": "本地状态",
-    "Local State (Total)": "本地状态（总计）",
+    "Local State (Total)": "本地状态汇总",
     "Locally Changed Items": "本地更改的项目",
     "Log": "日志",
     "Log File": "日志文件",
@@ -483,11 +481,11 @@
     "Untrusted": "不受信任",
     "Up to Date": "最新",
     "Updated {%file%}": "已更新 {{file}}",
-    "Upgrade": "升级",
-    "Upgrade To {%version%}": "升级到 {{version}}",
+    "Upgrade": "更新",
+    "Upgrade To {%version%}": "升级至版本 {{version}}",
     "Upgrading": "升级中",
     "Upload Rate": "上传速率",
-    "Uptime": "运行时间",
+    "Uptime": "启动时间",
     "Usage reporting is always enabled for candidate releases.": "发布候选版始终启用使用报告。",
     "Use HTTPS for GUI": "使用 HTTPS 连接到 GUI",
     "Use notifications from the filesystem to detect changed items.": "使用来自文件系统的通知来检测更改的项目。",

gui/default/assets/lang/lang-zh-HK.json

@@ -145,7 +145,7 @@
     "Failed Items": "失敗的項目",
     "Failed to load file versions.": "無法加載文件版本。",
     "Failed to load ignore patterns.": "無法加載忽略模式。",
-    "Failed to set up, retrying": "設置失敗，正在重試。",
+    "Failed to setup, retrying": "設置失敗，正在重試。",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本機沒有配置IPv6，則無法連接IPv6服務器是正常的。",
     "File Pull Order": "文件拉取順序",
     "File Versioning": "版本控制",

gui/default/assets/lang/lang-zh-TW.json

@@ -154,7 +154,7 @@
     "Failed Items": "失敗的項目",
     "Failed to load file versions.": "無法載入檔案版本。",
     "Failed to load ignore patterns.": "無法載入忽略模式。",
-    "Failed to set up, retrying": "無法設定，正在重試",
+    "Failed to setup, retrying": "無法設定，正在重試",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "若沒有 IPv6 連線能力，則無法連接 IPv6 伺服器為正常現象。",
     "File Pull Order": "提取檔案的順序",
     "File Versioning": "檔案版本控制",

gui/default/index.html

@@ -521,7 +521,7 @@
                             </span>
                             <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
                               <span class="far fa-clock"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to set up, retrying</span>
+                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
                             </span>
                           </div>
                           <div ng-if="folder.rescanIntervalS <= 0">
@@ -535,7 +535,7 @@
                             </span>
                             <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
                               <span class="far fa-clock"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to set up, retrying</span>
+                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
                             </span>
                           </div>
                         </td>

gui/default/syncthing/core/aboutModalView.html

@@ -30,7 +30,7 @@
         <h4 class="text-center" translate>The Syncthing Authors</h4>
         <div class="row">
           <div class="col-md-12" id="contributor-list">
-Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Tomasz Wilczyński, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Emil Lundberg, Eric P, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ross Smith II, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Wulf Weich, bt90, greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Aleksey Vasenev, Alessandro G., Alex Ionescu, Alex Lindeman, Alex Xu, Alexander Seiler, Alexandre Alves, Aman Gupta, Anatoli Babenia, Andreas Sommer, Andrew Dunham, Andrew Meyer, Andrew Rabert, Andrey D, Anjan Momi, Anthony Goeckner, Antoine Lamielle, Anur, Aranjedeath, Arkadiusz Tymiński, Aroun, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Beat Reichenbach, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benjamin Nater, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Catfriend1, Cathryne Linenweaver, Cedric Staniewski, Chih-Hsuan Yen, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Kujau, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Barczyk, Daniel Bergmann, Daniel Martí, Daniel Padrta, Darshil Chanpura, David Rimmer, DeflateAwning, Denis A., Dennis Wilson, DerRockWolf, Devon G. Redekopp, Dimitri Papadopoulos Orfanos, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eng Zer Jun, Eric Lesiuta, Erik Meitner, Evan Spensley, Federico Castagnini, Felix, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gahl Saraf, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Greg, Gusted, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hireworks, Hugo Locurcio, Iain Barnett, Ian Johnson, Ikko Ashimine, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James O'Beirne, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaspitta, Jauder Ho, Jaya Chithra, Jaya Kumar, Jeffery To, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jonta, Jose Manuel Delicado, Julian Lehrhuber, Jörg Thalheim, Jędrzej Kula, K.B.Dharun Krishna, Kalle Laine, Kapil Sareen, Karol Różycki, Kebin Liu, Keith Harrison, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, LSmithx2, Lars Lehtonen, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Luke Hamburg, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus B Spencer, Marcus Legendre, Mario Majila, Mark Pulford, Martchus, Martin Polehla, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max, Max Schulze, MaximAL, Maxime Thirouin, Maximilian, MichaIng, Michael Jephcote, Michael Rienstra, Michael Tilli, Migelo, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Naveen, Nicholas Rishel, Nick Busey, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ruslan Yevdokymov, Ryan Qian, Sacheendra Talluri, Scott Klupfel, Sertonix, Severin von Wnuck-Lipinski, Shaarad Dalvi, Simon Mwepu, Simon Pickup, Sly_tom_cat, Sonu Kumar Saw, Stefan Kuntz, Steven Eckhoff, Suhas Gundimeda, Sven Bachmann, Sébastien WENSKE, Taylor Khan, Terrance, Thomas, Thomas Hipp, Tim Abell, Tim Howes, Tim Nordenfur, Tobias Frölich, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tommy van der Vorst, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vik, Vil Brekin, Vladimir Rusinov, WangXi, Will Rouesnel, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, cjc7373, cui fliter, d-volution, dashangcun, derekriemer, desbma, diemade, digital, entity0xfe, georgespatton, ghjklw, guangwu, gudvinr, ignacy123, janost, jaseg, jelle van der Waa, jtagcat, klemens, kylosus, luchenhan, luzpaz, marco-m, mathias4833, maxice8, mclang, mv1005, nf, orangekame3, otbutz, overkill, perewa, polyfloyd, red_led, rubenbe, sec65, vapatel2, villekalliomaki, wangguoliang, wouter bolsterlee, xarx00, xjtdy888, 佛跳墙, 落心
+Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Tomasz Wilczyński, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Emil Lundberg, Eric P, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Wulf Weich, bt90, greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Aleksey Vasenev, Alessandro G., Alex Ionescu, Alex Lindeman, Alex Xu, Alexander Seiler, Alexandre Alves, Aman Gupta, Anatoli Babenia, Andreas Sommer, Andrew Dunham, Andrew Meyer, Andrew Rabert, Andrey D, Anjan Momi, Anthony Goeckner, Antoine Lamielle, Anur, Aranjedeath, Arkadiusz Tymiński, Aroun, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Beat Reichenbach, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benjamin Nater, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Catfriend1, Cathryne Linenweaver, Cedric Staniewski, Chih-Hsuan Yen, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Kujau, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Barczyk, Daniel Bergmann, Daniel Martí, Daniel Padrta, Darshil Chanpura, David Rimmer, DeflateAwning, Denis A., Dennis Wilson, DerRockWolf, Devon G. Redekopp, Dimitri Papadopoulos Orfanos, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eng Zer Jun, Eric Lesiuta, Erik Meitner, Evan Spensley, Federico Castagnini, Felix, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gahl Saraf, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Greg, Gusted, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hireworks, Hugo Locurcio, Iain Barnett, Ian Johnson, Ikko Ashimine, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James O'Beirne, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaspitta, Jauder Ho, Jaya Chithra, Jaya Kumar, Jeffery To, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jonta, Jose Manuel Delicado, Julian Lehrhuber, Jörg Thalheim, Jędrzej Kula, K.B.Dharun Krishna, Kalle Laine, Kapil Sareen, Karol Różycki, Kebin Liu, Keith Harrison, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, LSmithx2, Lars Lehtonen, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Luke Hamburg, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Martchus, Martin Polehla, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max, Max Schulze, MaximAL, Maxime Thirouin, Maximilian, MichaIng, Michael Jephcote, Michael Rienstra, Michael Tilli, Migelo, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Naveen, Nicholas Rishel, Nick Busey, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Ryan Qian, Sacheendra Talluri, Scott Klupfel, Sertonix, Severin von Wnuck-Lipinski, Shaarad Dalvi, Simon Mwepu, Simon Pickup, Sly_tom_cat, Sonu Kumar Saw, Stefan Kuntz, Steven Eckhoff, Suhas Gundimeda, Sven Bachmann, Taylor Khan, Terrance, Thomas, Thomas Hipp, Tim Abell, Tim Howes, Tim Nordenfur, Tobias Frölich, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tommy van der Vorst, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vik, Vil Brekin, Vladimir Rusinov, WangXi, Will Rouesnel, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, cjc7373, cui fliter, d-volution, dashangcun, derekriemer, desbma, diemade, digital, entity0xfe, georgespatton, ghjklw, guangwu, gudvinr, ignacy123, janost, jaseg, jelle van der Waa, jtagcat, klemens, kylosus, luchenhan, luzpaz, marco-m, mathias4833, maxice8, mclang, mv1005, nf, orangekame3, otbutz, overkill, perewa, polyfloyd, red_led, rubenbe, sec65, vapatel2, villekalliomaki, wangguoliang, wouter bolsterlee, xarx00, xjtdy888, 佛跳墙, 落心
           </div>
         </div>
       </div>
@@ -59,12 +59,9 @@ Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Tomasz Wilczyński, Al
           <li><a href="https://github.com/golang/protobuf">golang/protobuf</a>, Copyright &copy; 2010 The Go Authors.</li>
           <li><a href="https://github.com/golang/snappy">golang/snappy</a>, Copyright &copy; 2011 The Snappy-Go Authors.</li>
           <li><a href="https://github.com/jackpal/gateway">jackpal/gateway</a>, Copyright &copy; 2010 Jack Palevich.</li>
-          <li><a href="https://github.com/jmoiron/sqlx">jmoiron/sqlx</a>, Copyright &copy; 2013 Jason Moiron.</li>
           <li><a href="https://github.com/kballard/go-shellquote">kballard/go-shellquote</a>, Copyright &copy; 2014 Kevin Ballard.</li>
           <li><a href="https://github.com/mattn/go-isatty">mattn/go-isatty</a>, Copyright &copy; Yasuhiro MATSUMOTO.</li>
-          <li><a href="https://github.com/mattn/go-sqlite3">mattn/go-sqlite3</a>, Copyright &copy; 2014 Yasuhiro Matsumoto</li>
           <li><a href="https://github.com/matttproud/golang_protobuf_extensions">matttproud/golang_protobuf_extensions</a>, Copyright &copy; 2012 Matt T. Proud.</li>
-          <li><a href="https://modernc.org/sqlite">modernc.org/sqlite</a>, Copyright &copy; 2017 The Sqlite Authors</li>
           <li><a href="https://github.com/oschwald/geoip2-golang">oschwald/geoip2-golang</a>, Copyright &copy; 2015, Gregory J. Oschwald.</li>
           <li><a href="https://github.com/oschwald/maxminddb-golang">oschwald/maxminddb-golang</a>, Copyright &copy; 2015, Gregory J. Oschwald.</li>
           <li><a href="https://github.com/petermattis/goid">petermattis/goid</a>, Copyright &copy; 2015-2016 Peter Mattis.</li>

gui/default/syncthing/core/syncthingController.js

@@ -1165,7 +1165,7 @@ angular.module('syncthing.core')
             }
 
             // Disconnected
-            if (!unused && $scope.deviceStats[deviceCfg.deviceID] && (!$scope.deviceStats[deviceCfg.deviceID].lastSeenDays || $scope.deviceStats[deviceCfg.deviceID].lastSeenDays >= 7)) {
+            if (!unused && $scope.deviceStats[deviceCfg.deviceID] && $scope.deviceStats[deviceCfg.deviceID].lastSeenDays && $scope.deviceStats[deviceCfg.deviceID].lastSeenDays >= 7) {
                 return status + 'disconnected-inactive';
             } else {
                 return status + 'disconnected';

gui/default/syncthing/core/validDeviceidDirective.js

@@ -5,12 +5,18 @@ angular.module('syncthing.core')
             link: function (scope, elm, attrs, ctrl) {
                 ctrl.$parsers.unshift(function (viewValue) {
                     $http.get(urlbase + '/svc/deviceid?id=' + viewValue).success(function (resp) {
-                        let isValid = !resp.error;
-                        let isUnique = !isValid || !scope.devices.hasOwnProperty(resp.id);
-
-                        ctrl.$setValidity('validDeviceid', isValid);
-                        ctrl.$setValidity('unique', isUnique);
+                        if (resp.error) {
+                            ctrl.$setValidity('validDeviceid', false);
+                        } else {
+                            ctrl.$setValidity('validDeviceid', true);
+                        }
                     });
+                    //Prevents user from adding a duplicate ID
+                    if (scope.devices.hasOwnProperty(viewValue)) {
+                        ctrl.$setValidity('unique', false);
+                    } else {
+                        ctrl.$setValidity('unique', true);
+                    }
                     return viewValue;
                 });
             }

gui/default/syncthing/folder/editFolderModalView.html

@@ -251,9 +251,6 @@
               <select class="form-control" ng-if="currentFolder.type == 'sendonly'" disabled>
                 <option value="disabled" translate>Disabled</option>
               </select>
-              <p class="help-block" ng-if="currentFolder.type === 'sendonly'" translate translate-value-foldertype="{{'Send Only' | translate}}">
-                Cannot be enabled when the folder type is "{%foldertype%}".
-              </p>
             </div>
           </div>
 
@@ -285,9 +282,6 @@
               <p translate class="help-block">
                 Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).
               </p>
-              <p class="help-block" ng-if="currentFolder._recvEnc" translate translate-value-foldertype="{{'Receive Encrypted' | translate}}">
-                Always turned on when the folder type is "{%foldertype%}".
-              </p>
             </div>
           </div>
 
@@ -303,18 +297,12 @@
               <p translate class="help-block">
                 Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.
               </p>
-              <p class="help-block" ng-if="has(['sendonly', 'receiveencrypted'], currentFolder.type)" translate translate-value-foldertype="{{currentFolder.type === 'sendonly' ? ('Send Only' | translate) : currentFolder.type === 'receiveencrypted' ? ('Receive Encrypted' | translate) : ''}}">
-                Cannot be enabled when the folder type is "{%foldertype%}".
-              </p>
               <label>
                 <input type="checkbox" ng-disabled="currentFolder.type == 'receiveonly' || currentFolder.type == 'receiveencrypted' || currentFolder.syncOwnership" ng-checked="currentFolder.sendOwnership || currentFolder.syncOwnership" ng-model="currentFolder.sendOwnership" /> <span translate>Send Ownership</span>
               </label>
               <p translate class="help-block">
                 Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when "Sync Ownership" is enabled.
               </p>
-              <p class="help-block" ng-if="has(['receiveonly', 'receiveencrypted'], currentFolder.type)" translate translate-value-foldertype="{{currentFolder.type === 'receiveonly' ? ('Receive Only' | translate) : currentFolder.type === 'receiveencrypted' ? ('Receive Encrypted' | translate) : ''}}">
-                Cannot be enabled when the folder type is "{%foldertype%}".
-              </p>
             </div>
             <div class="col-md-6 form-group">
               <p>
@@ -327,18 +315,12 @@
               <p translate class="help-block">
                 Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.
               </p>
-              <p class="help-block" ng-if="has(['sendonly', 'receiveencrypted'], currentFolder.type)" translate translate-value-foldertype="{{currentFolder.type === 'sendonly' ? ('Send Only' | translate) : currentFolder.type === 'receiveencrypted' ? ('Receive Encrypted' | translate) : ''}}">
-                Cannot be enabled when the folder type is "{%foldertype%}".
-              </p>
               <label>
                 <input type="checkbox" ng-disabled="currentFolder.type == 'receiveonly' || currentFolder.type == 'receiveencrypted' || currentFolder.syncXattrs" ng-checked="currentFolder.sendXattrs || currentFolder.syncXattrs" ng-model="currentFolder.sendXattrs" /> <span translate>Send Extended Attributes</span>
               </label>
               <p translate class="help-block">
                 Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when "Sync Extended Attributes" is enabled.
               </p>
-              <p class="help-block" ng-if="has(['receiveonly', 'receiveencrypted'], currentFolder.type)" translate translate-value-foldertype="{{currentFolder.type === 'receiveonly' ? ('Receive Only' | translate) : currentFolder.type === 'receiveencrypted' ? ('Receive Encrypted' | translate) : ''}}">
-                Cannot be enabled when the folder type is "{%foldertype%}".
-              </p>
             </div>
           </div>
 

internal/db/counts.go

@@ -1,73 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package db
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-type Counts struct {
-	Files       int
-	Directories int
-	Symlinks    int
-	Deleted     int
-	Bytes       int64
-	Sequence    int64             // zero for the global state
-	DeviceID    protocol.DeviceID // device ID for remote devices, or special values for local/global
-	LocalFlags  uint32            // the local flag for this count bucket
-}
-
-func (c Counts) Add(other Counts) Counts {
-	return Counts{
-		Files:       c.Files + other.Files,
-		Directories: c.Directories + other.Directories,
-		Symlinks:    c.Symlinks + other.Symlinks,
-		Deleted:     c.Deleted + other.Deleted,
-		Bytes:       c.Bytes + other.Bytes,
-		Sequence:    c.Sequence + other.Sequence,
-		DeviceID:    protocol.EmptyDeviceID,
-		LocalFlags:  c.LocalFlags | other.LocalFlags,
-	}
-}
-
-func (c Counts) TotalItems() int {
-	return c.Files + c.Directories + c.Symlinks + c.Deleted
-}
-
-func (c Counts) String() string {
-	var flags strings.Builder
-	if c.LocalFlags&protocol.FlagLocalNeeded != 0 {
-		flags.WriteString("Need")
-	}
-	if c.LocalFlags&protocol.FlagLocalIgnored != 0 {
-		flags.WriteString("Ignored")
-	}
-	if c.LocalFlags&protocol.FlagLocalMustRescan != 0 {
-		flags.WriteString("Rescan")
-	}
-	if c.LocalFlags&protocol.FlagLocalReceiveOnly != 0 {
-		flags.WriteString("Recvonly")
-	}
-	if c.LocalFlags&protocol.FlagLocalUnsupported != 0 {
-		flags.WriteString("Unsupported")
-	}
-	if c.LocalFlags != 0 {
-		flags.WriteString(fmt.Sprintf("(%x)", c.LocalFlags))
-	}
-	if flags.Len() == 0 {
-		flags.WriteString("---")
-	}
-	return fmt.Sprintf("{Device:%v, Files:%d, Dirs:%d, Symlinks:%d, Del:%d, Bytes:%d, Seq:%d, Flags:%s}", c.DeviceID, c.Files, c.Directories, c.Symlinks, c.Deleted, c.Bytes, c.Sequence, flags.String())
-}
-
-// Equal compares the numbers only, not sequence/dev/flags.
-func (c Counts) Equal(o Counts) bool {
-	return c.Files == o.Files && c.Directories == o.Directories && c.Symlinks == o.Symlinks && c.Deleted == o.Deleted && c.Bytes == o.Bytes
-}

internal/db/interface.go

@@ -1,123 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package db // import "github.com/syncthing/syncthing/internal/db/sqlite"
-
-import (
-	"iter"
-	"time"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/thejerf/suture/v4"
-)
-
-type DB interface {
-	Service(maintenanceInterval time.Duration) suture.Service
-
-	// Basics
-	Update(folder string, device protocol.DeviceID, fs []protocol.FileInfo) error
-	Close() error
-
-	// Single files
-	GetDeviceFile(folder string, device protocol.DeviceID, file string) (protocol.FileInfo, bool, error)
-	GetGlobalAvailability(folder, file string) ([]protocol.DeviceID, error)
-	GetGlobalFile(folder string, file string) (protocol.FileInfo, bool, error)
-
-	// File iterators
-	//
-	// n.b. there is a slight inconsistency in the return types where some
-	// return a FileInfo iterator and some a FileMetadata iterator. The
-	// latter is more lightweight, and the discrepancy depends on how the
-	// functions tend to be used. We can introduce more variations as
-	// required.
-	AllGlobalFiles(folder string) (iter.Seq[FileMetadata], func() error)
-	AllGlobalFilesPrefix(folder string, prefix string) (iter.Seq[FileMetadata], func() error)
-	AllLocalFiles(folder string, device protocol.DeviceID) (iter.Seq[protocol.FileInfo], func() error)
-	AllLocalFilesBySequence(folder string, device protocol.DeviceID, startSeq int64, limit int) (iter.Seq[protocol.FileInfo], func() error)
-	AllLocalFilesWithPrefix(folder string, device protocol.DeviceID, prefix string) (iter.Seq[protocol.FileInfo], func() error)
-	AllLocalFilesWithBlocksHash(folder string, h []byte) (iter.Seq[FileMetadata], func() error)
-	AllNeededGlobalFiles(folder string, device protocol.DeviceID, order config.PullOrder, limit, offset int) (iter.Seq[protocol.FileInfo], func() error)
-	AllLocalBlocksWithHash(hash []byte) ([]BlockMapEntry, error)
-	AllLocalFilesWithBlocksHashAnyFolder(hash []byte) (map[string][]FileMetadata, error)
-
-	// Cleanup
-	DropAllFiles(folder string, device protocol.DeviceID) error
-	DropDevice(device protocol.DeviceID) error
-	DropFilesNamed(folder string, device protocol.DeviceID, names []string) error
-	DropFolder(folder string) error
-
-	// Various metadata
-	GetDeviceSequence(folder string, device protocol.DeviceID) (int64, error)
-	ListFolders() ([]string, error)
-	ListDevicesForFolder(folder string) ([]protocol.DeviceID, error)
-	RemoteSequences(folder string) (map[protocol.DeviceID]int64, error)
-
-	// Counts
-	CountGlobal(folder string) (Counts, error)
-	CountLocal(folder string, device protocol.DeviceID) (Counts, error)
-	CountNeed(folder string, device protocol.DeviceID) (Counts, error)
-	CountReceiveOnlyChanged(folder string) (Counts, error)
-
-	// Index IDs
-	DropAllIndexIDs() error
-	GetIndexID(folder string, device protocol.DeviceID) (protocol.IndexID, error)
-	SetIndexID(folder string, device protocol.DeviceID, id protocol.IndexID) error
-
-	// MtimeFS
-	DeleteMtime(folder, name string) error
-	GetMtime(folder, name string) (ondisk, virtual time.Time)
-	PutMtime(folder, name string, ondisk, virtual time.Time) error
-
-	KV
-}
-
-// Generic KV store
-type KV interface {
-	GetKV(key string) ([]byte, error)
-	PutKV(key string, val []byte) error
-	DeleteKV(key string) error
-	PrefixKV(prefix string) (iter.Seq[KeyValue], func() error)
-}
-
-type BlockMapEntry struct {
-	BlocklistHash []byte
-	Offset        int64
-	BlockIndex    int
-	Size          int
-}
-
-type KeyValue struct {
-	Key   string
-	Value []byte
-}
-
-type FileMetadata struct {
-	Name       string
-	Sequence   int64
-	ModNanos   int64
-	Size       int64
-	LocalFlags int64
-	Type       protocol.FileInfoType
-	Deleted    bool
-	Invalid    bool
-}
-
-func (f *FileMetadata) ModTime() time.Time {
-	return time.Unix(0, f.ModNanos)
-}
-
-func (f *FileMetadata) IsReceiveOnlyChanged() bool {
-	return f.LocalFlags&protocol.FlagLocalReceiveOnly != 0
-}
-
-func (f *FileMetadata) IsDirectory() bool {
-	return f.Type == protocol.FileInfoTypeDirectory
-}
-
-func (f *FileMetadata) ShouldConflict() bool {
-	return f.LocalFlags&protocol.LocalConflictFlags != 0
-}

internal/db/metrics.go

@@ -1,229 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package db
-
-import (
-	"iter"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-var (
-	metricCurrentOperations = promauto.NewGaugeVec(prometheus.GaugeOpts{
-		Namespace: "syncthing",
-		Subsystem: "db",
-		Name:      "operations_current",
-	}, []string{"folder", "operation"})
-	metricTotalOperationSeconds = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: "syncthing",
-		Subsystem: "db",
-		Name:      "operation_seconds_total",
-		Help:      "Total time spent in database operations, per folder and operation",
-	}, []string{"folder", "operation"})
-	metricTotalOperationsCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: "syncthing",
-		Subsystem: "db",
-		Name:      "operations_total",
-		Help:      "Total number of database operations, per folder and operation",
-	}, []string{"folder", "operation"})
-	metricTotalFilesUpdatedCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Namespace: "syncthing",
-		Subsystem: "db",
-		Name:      "files_updated_total",
-		Help:      "Total number of files updated",
-	}, []string{"folder"})
-)
-
-func MetricsWrap(db DB) DB {
-	return metricsDB{db}
-}
-
-type metricsDB struct {
-	DB
-}
-
-func (m metricsDB) account(folder, op string) func() {
-	t0 := time.Now()
-	metricCurrentOperations.WithLabelValues(folder, op).Inc()
-	return func() {
-		if dur := time.Since(t0).Seconds(); dur > 0 {
-			metricTotalOperationSeconds.WithLabelValues(folder, op).Add(dur)
-		}
-		metricTotalOperationsCount.WithLabelValues(folder, op).Inc()
-		metricCurrentOperations.WithLabelValues(folder, op).Dec()
-	}
-}
-
-func (m metricsDB) AllLocalFilesWithBlocksHash(folder string, h []byte) (iter.Seq[FileMetadata], func() error) {
-	defer m.account(folder, "AllLocalFilesWithBlocksHash")()
-	return m.DB.AllLocalFilesWithBlocksHash(folder, h)
-}
-
-func (m metricsDB) AllLocalFilesWithBlocksHashAnyFolder(hash []byte) (map[string][]FileMetadata, error) {
-	defer m.account("-", "AllLocalFilesWithBlocksHashAnyFolder")()
-	return m.DB.AllLocalFilesWithBlocksHashAnyFolder(hash)
-}
-
-func (m metricsDB) AllGlobalFiles(folder string) (iter.Seq[FileMetadata], func() error) {
-	defer m.account(folder, "AllGlobalFiles")()
-	return m.DB.AllGlobalFiles(folder)
-}
-
-func (m metricsDB) AllGlobalFilesPrefix(folder string, prefix string) (iter.Seq[FileMetadata], func() error) {
-	defer m.account(folder, "AllGlobalFilesPrefix")()
-	return m.DB.AllGlobalFilesPrefix(folder, prefix)
-}
-
-func (m metricsDB) AllLocalFiles(folder string, device protocol.DeviceID) (iter.Seq[protocol.FileInfo], func() error) {
-	defer m.account(folder, "AllLocalFiles")()
-	return m.DB.AllLocalFiles(folder, device)
-}
-
-func (m metricsDB) AllLocalFilesWithPrefix(folder string, device protocol.DeviceID, prefix string) (iter.Seq[protocol.FileInfo], func() error) {
-	defer m.account(folder, "AllLocalFilesPrefix")()
-	return m.DB.AllLocalFilesWithPrefix(folder, device, prefix)
-}
-
-func (m metricsDB) AllLocalFilesBySequence(folder string, device protocol.DeviceID, startSeq int64, limit int) (iter.Seq[protocol.FileInfo], func() error) {
-	defer m.account(folder, "AllLocalFilesBySequence")()
-	return m.DB.AllLocalFilesBySequence(folder, device, startSeq, limit)
-}
-
-func (m metricsDB) AllNeededGlobalFiles(folder string, device protocol.DeviceID, order config.PullOrder, limit, offset int) (iter.Seq[protocol.FileInfo], func() error) {
-	defer m.account(folder, "AllNeededGlobalFiles")()
-	return m.DB.AllNeededGlobalFiles(folder, device, order, limit, offset)
-}
-
-func (m metricsDB) GetGlobalAvailability(folder, file string) ([]protocol.DeviceID, error) {
-	defer m.account(folder, "GetGlobalAvailability")()
-	return m.DB.GetGlobalAvailability(folder, file)
-}
-
-func (m metricsDB) AllLocalBlocksWithHash(hash []byte) ([]BlockMapEntry, error) {
-	defer m.account("-", "AllLocalBlocksWithHash")()
-	return m.DB.AllLocalBlocksWithHash(hash)
-}
-
-func (m metricsDB) Close() error {
-	defer m.account("-", "Close")()
-	return m.DB.Close()
-}
-
-func (m metricsDB) ListDevicesForFolder(folder string) ([]protocol.DeviceID, error) {
-	defer m.account(folder, "ListDevicesForFolder")()
-	return m.DB.ListDevicesForFolder(folder)
-}
-
-func (m metricsDB) RemoteSequences(folder string) (map[protocol.DeviceID]int64, error) {
-	defer m.account(folder, "RemoteSequences")()
-	return m.DB.RemoteSequences(folder)
-}
-
-func (m metricsDB) DropAllFiles(folder string, device protocol.DeviceID) error {
-	defer m.account(folder, "DropAllFiles")()
-	return m.DB.DropAllFiles(folder, device)
-}
-
-func (m metricsDB) DropDevice(device protocol.DeviceID) error {
-	defer m.account("-", "DropDevice")()
-	return m.DB.DropDevice(device)
-}
-
-func (m metricsDB) DropFilesNamed(folder string, device protocol.DeviceID, names []string) error {
-	defer m.account(folder, "DropFilesNamed")()
-	return m.DB.DropFilesNamed(folder, device, names)
-}
-
-func (m metricsDB) DropFolder(folder string) error {
-	defer m.account(folder, "DropFolder")()
-	return m.DB.DropFolder(folder)
-}
-
-func (m metricsDB) DropAllIndexIDs() error {
-	defer m.account("-", "IndexIDDropAll")()
-	return m.DB.DropAllIndexIDs()
-}
-
-func (m metricsDB) ListFolders() ([]string, error) {
-	defer m.account("-", "ListFolders")()
-	return m.DB.ListFolders()
-}
-
-func (m metricsDB) GetGlobalFile(folder string, file string) (protocol.FileInfo, bool, error) {
-	defer m.account(folder, "GetGlobalFile")()
-	return m.DB.GetGlobalFile(folder, file)
-}
-
-func (m metricsDB) CountGlobal(folder string) (Counts, error) {
-	defer m.account(folder, "CountGlobal")()
-	return m.DB.CountGlobal(folder)
-}
-
-func (m metricsDB) GetIndexID(folder string, device protocol.DeviceID) (protocol.IndexID, error) {
-	defer m.account(folder, "IndexIDGet")()
-	return m.DB.GetIndexID(folder, device)
-}
-
-func (m metricsDB) GetDeviceFile(folder string, device protocol.DeviceID, file string) (protocol.FileInfo, bool, error) {
-	defer m.account(folder, "GetDeviceFile")()
-	return m.DB.GetDeviceFile(folder, device, file)
-}
-
-func (m metricsDB) CountLocal(folder string, device protocol.DeviceID) (Counts, error) {
-	defer m.account(folder, "CountLocal")()
-	return m.DB.CountLocal(folder, device)
-}
-
-func (m metricsDB) CountNeed(folder string, device protocol.DeviceID) (Counts, error) {
-	defer m.account(folder, "CountNeed")()
-	return m.DB.CountNeed(folder, device)
-}
-
-func (m metricsDB) CountReceiveOnlyChanged(folder string) (Counts, error) {
-	defer m.account(folder, "CountReceiveOnlyChanged")()
-	return m.DB.CountReceiveOnlyChanged(folder)
-}
-
-func (m metricsDB) GetDeviceSequence(folder string, device protocol.DeviceID) (int64, error) {
-	defer m.account(folder, "GetDeviceSequence")()
-	return m.DB.GetDeviceSequence(folder, device)
-}
-
-func (m metricsDB) SetIndexID(folder string, device protocol.DeviceID, id protocol.IndexID) error {
-	defer m.account(folder, "IndexIDSet")()
-	return m.DB.SetIndexID(folder, device, id)
-}
-
-func (m metricsDB) Update(folder string, device protocol.DeviceID, fs []protocol.FileInfo) error {
-	defer m.account(folder, "Update")()
-	defer metricTotalFilesUpdatedCount.WithLabelValues(folder).Add(float64(len(fs)))
-	return m.DB.Update(folder, device, fs)
-}
-
-func (m metricsDB) GetKV(key string) ([]byte, error) {
-	defer m.account("-", "GetKV")()
-	return m.DB.GetKV(key)
-}
-
-func (m metricsDB) PutKV(key string, val []byte) error {
-	defer m.account("-", "PutKV")()
-	return m.DB.PutKV(key, val)
-}
-
-func (m metricsDB) DeleteKV(key string) error {
-	defer m.account("-", "DeleteKV")()
-	return m.DB.DeleteKV(key)
-}
-
-func (m metricsDB) PrefixKV(prefix string) (iter.Seq[KeyValue], func() error) {
-	defer m.account("-", "PrefixKV")()
-	return m.DB.PrefixKV(prefix)
-}

internal/db/olddb/backend/leveldb_backend.go

@@ -1,113 +0,0 @@
-// Copyright (C) 2018 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package backend
-
-import (
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// leveldbBackend implements Backend on top of a leveldb
-type leveldbBackend struct {
-	ldb      *leveldb.DB
-	closeWG  *closeWaitGroup
-	location string
-}
-
-func newLeveldbBackend(ldb *leveldb.DB, location string) *leveldbBackend {
-	return &leveldbBackend{
-		ldb:      ldb,
-		closeWG:  &closeWaitGroup{},
-		location: location,
-	}
-}
-
-func (b *leveldbBackend) NewReadTransaction() (ReadTransaction, error) {
-	return b.newSnapshot()
-}
-
-func (b *leveldbBackend) newSnapshot() (leveldbSnapshot, error) {
-	rel, err := newReleaser(b.closeWG)
-	if err != nil {
-		return leveldbSnapshot{}, err
-	}
-	snap, err := b.ldb.GetSnapshot()
-	if err != nil {
-		rel.Release()
-		return leveldbSnapshot{}, wrapLeveldbErr(err)
-	}
-	return leveldbSnapshot{
-		snap: snap,
-		rel:  rel,
-	}, nil
-}
-
-func (b *leveldbBackend) Close() error {
-	b.closeWG.CloseWait()
-	return wrapLeveldbErr(b.ldb.Close())
-}
-
-func (b *leveldbBackend) Get(key []byte) ([]byte, error) {
-	val, err := b.ldb.Get(key, nil)
-	return val, wrapLeveldbErr(err)
-}
-
-func (b *leveldbBackend) NewPrefixIterator(prefix []byte) (Iterator, error) {
-	return &leveldbIterator{b.ldb.NewIterator(util.BytesPrefix(prefix), nil)}, nil
-}
-
-func (b *leveldbBackend) NewRangeIterator(first, last []byte) (Iterator, error) {
-	return &leveldbIterator{b.ldb.NewIterator(&util.Range{Start: first, Limit: last}, nil)}, nil
-}
-
-func (b *leveldbBackend) Location() string {
-	return b.location
-}
-
-// leveldbSnapshot implements backend.ReadTransaction
-type leveldbSnapshot struct {
-	snap *leveldb.Snapshot
-	rel  *releaser
-}
-
-func (l leveldbSnapshot) Get(key []byte) ([]byte, error) {
-	val, err := l.snap.Get(key, nil)
-	return val, wrapLeveldbErr(err)
-}
-
-func (l leveldbSnapshot) NewPrefixIterator(prefix []byte) (Iterator, error) {
-	return l.snap.NewIterator(util.BytesPrefix(prefix), nil), nil
-}
-
-func (l leveldbSnapshot) NewRangeIterator(first, last []byte) (Iterator, error) {
-	return l.snap.NewIterator(&util.Range{Start: first, Limit: last}, nil), nil
-}
-
-func (l leveldbSnapshot) Release() {
-	l.snap.Release()
-	l.rel.Release()
-}
-
-type leveldbIterator struct {
-	iterator.Iterator
-}
-
-func (it *leveldbIterator) Error() error {
-	return wrapLeveldbErr(it.Iterator.Error())
-}
-
-// wrapLeveldbErr wraps errors so that the backend package can recognize them
-func wrapLeveldbErr(err error) error {
-	switch err {
-	case leveldb.ErrClosed:
-		return errClosed
-	case leveldb.ErrNotFound:
-		return errNotFound
-	}
-	return err
-}

internal/db/olddb/backend/leveldb_open.go

@@ -1,32 +0,0 @@
-// Copyright (C) 2018 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package backend
-
-import (
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-)
-
-const dbMaxOpenFiles = 100
-
-// OpenLevelDBRO attempts to open the database at the given location, read
-// only.
-func OpenLevelDBRO(location string) (Backend, error) {
-	opts := &opt.Options{
-		OpenFilesCacheCapacity: dbMaxOpenFiles,
-		ReadOnly:               true,
-	}
-	ldb, err := open(location, opts)
-	if err != nil {
-		return nil, err
-	}
-	return newLeveldbBackend(ldb, location), nil
-}
-
-func open(location string, opts *opt.Options) (*leveldb.DB, error) {
-	return leveldb.OpenFile(location, opts)
-}

internal/db/olddb/lowlevel.go

@@ -1,70 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package olddb
-
-import (
-	"encoding/binary"
-	"time"
-
-	"github.com/syncthing/syncthing/internal/db/olddb/backend"
-)
-
-// deprecatedLowlevel is the lowest level database interface. It has a very simple
-// purpose: hold the actual backend database, and the in-memory state
-// that belong to that database. In the same way that a single on disk
-// database can only be opened once, there should be only one deprecatedLowlevel for
-// any given backend.
-type deprecatedLowlevel struct {
-	backend.Backend
-	folderIdx *smallIndex
-	deviceIdx *smallIndex
-	keyer     keyer
-}
-
-func NewLowlevel(backend backend.Backend) (*deprecatedLowlevel, error) {
-	// Only log restarts in debug mode.
-	db := &deprecatedLowlevel{
-		Backend:   backend,
-		folderIdx: newSmallIndex(backend, []byte{KeyTypeFolderIdx}),
-		deviceIdx: newSmallIndex(backend, []byte{KeyTypeDeviceIdx}),
-	}
-	db.keyer = newDefaultKeyer(db.folderIdx, db.deviceIdx)
-	return db, nil
-}
-
-// ListFolders returns the list of folders currently in the database
-func (db *deprecatedLowlevel) ListFolders() []string {
-	return db.folderIdx.Values()
-}
-
-func (db *deprecatedLowlevel) IterateMtimes(fn func(folder, name string, ondisk, virtual time.Time) error) error {
-	it, err := db.NewPrefixIterator([]byte{KeyTypeVirtualMtime})
-	if err != nil {
-		return err
-	}
-	defer it.Release()
-	for it.Next() {
-		key := it.Key()[1:]
-		folderID, ok := db.folderIdx.Val(binary.BigEndian.Uint32(key))
-		if !ok {
-			continue
-		}
-		name := key[4:]
-		val := it.Value()
-		var ondisk, virtual time.Time
-		if err := ondisk.UnmarshalBinary(val[:len(val)/2]); err != nil {
-			continue
-		}
-		if err := virtual.UnmarshalBinary(val[len(val)/2:]); err != nil {
-			continue
-		}
-		if err := fn(string(folderID), string(name), ondisk, virtual); err != nil {
-			return err
-		}
-	}
-	return it.Error()
-}

internal/db/olddb/set.go

@@ -1,67 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-// Package db provides a set type to track local/remote files with newness
-// checks. We must do a certain amount of normalization in here. We will get
-// fed paths with either native or wire-format separators and encodings
-// depending on who calls us. We transform paths to wire-format (NFC and
-// slashes) on the way to the database, and transform to native format
-// (varying separator and encoding) on the way back out.
-package olddb
-
-import (
-	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-type deprecatedFileSet struct {
-	folder string
-	db     *deprecatedLowlevel
-}
-
-// The Iterator is called with either a protocol.FileInfo or a
-// FileInfoTruncated (depending on the method) and returns true to
-// continue iteration, false to stop.
-type Iterator func(f protocol.FileInfo) bool
-
-func NewFileSet(folder string, db *deprecatedLowlevel) (*deprecatedFileSet, error) {
-	s := &deprecatedFileSet{
-		folder: folder,
-		db:     db,
-	}
-	return s, nil
-}
-
-type Snapshot struct {
-	folder string
-	t      readOnlyTransaction
-}
-
-func (s *deprecatedFileSet) Snapshot() (*Snapshot, error) {
-	t, err := s.db.newReadOnlyTransaction()
-	if err != nil {
-		return nil, err
-	}
-	return &Snapshot{
-		folder: s.folder,
-		t:      t,
-	}, nil
-}
-
-func (s *Snapshot) Release() {
-	s.t.close()
-}
-
-func (s *Snapshot) WithHaveSequence(startSeq int64, fn Iterator) error {
-	return s.t.withHaveSequence([]byte(s.folder), startSeq, nativeFileIterator(fn))
-}
-
-func nativeFileIterator(fn Iterator) Iterator {
-	return func(fi protocol.FileInfo) bool {
-		fi.Name = osutil.NativeFilename(fi.Name)
-		return fn(fi)
-	}
-}

internal/db/olddb/transactions.go

@@ -1,193 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package olddb
-
-import (
-	"fmt"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/syncthing/syncthing/internal/db/olddb/backend"
-	"github.com/syncthing/syncthing/internal/gen/bep"
-	"github.com/syncthing/syncthing/internal/gen/dbproto"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-// A readOnlyTransaction represents a database snapshot.
-type readOnlyTransaction struct {
-	backend.ReadTransaction
-	keyer keyer
-}
-
-func (db *deprecatedLowlevel) newReadOnlyTransaction() (readOnlyTransaction, error) {
-	tran, err := db.NewReadTransaction()
-	if err != nil {
-		return readOnlyTransaction{}, err
-	}
-	return db.readOnlyTransactionFromBackendTransaction(tran), nil
-}
-
-func (db *deprecatedLowlevel) readOnlyTransactionFromBackendTransaction(tran backend.ReadTransaction) readOnlyTransaction {
-	return readOnlyTransaction{
-		ReadTransaction: tran,
-		keyer:           db.keyer,
-	}
-}
-
-func (t readOnlyTransaction) close() {
-	t.Release()
-}
-
-func (t readOnlyTransaction) getFileByKey(key []byte) (protocol.FileInfo, bool, error) {
-	f, ok, err := t.getFileTrunc(key, false)
-	if err != nil || !ok {
-		return protocol.FileInfo{}, false, err
-	}
-	return f, true, nil
-}
-
-func (t readOnlyTransaction) getFileTrunc(key []byte, trunc bool) (protocol.FileInfo, bool, error) {
-	bs, err := t.Get(key)
-	if backend.IsNotFound(err) {
-		return protocol.FileInfo{}, false, nil
-	}
-	if err != nil {
-		return protocol.FileInfo{}, false, err
-	}
-	f, err := t.unmarshalTrunc(bs, trunc)
-	if backend.IsNotFound(err) {
-		return protocol.FileInfo{}, false, nil
-	}
-	if err != nil {
-		return protocol.FileInfo{}, false, err
-	}
-	return f, true, nil
-}
-
-func (t readOnlyTransaction) unmarshalTrunc(bs []byte, trunc bool) (protocol.FileInfo, error) {
-	if trunc {
-		var bfi dbproto.FileInfoTruncated
-		err := proto.Unmarshal(bs, &bfi)
-		if err != nil {
-			return protocol.FileInfo{}, err
-		}
-		if err := t.fillTruncated(&bfi); err != nil {
-			return protocol.FileInfo{}, err
-		}
-		return protocol.FileInfoFromDBTruncated(&bfi), nil
-	}
-
-	var bfi bep.FileInfo
-	err := proto.Unmarshal(bs, &bfi)
-	if err != nil {
-		return protocol.FileInfo{}, err
-	}
-	if err := t.fillFileInfo(&bfi); err != nil {
-		return protocol.FileInfo{}, err
-	}
-	return protocol.FileInfoFromDB(&bfi), nil
-}
-
-type blocksIndirectionError struct {
-	err error
-}
-
-func (e *blocksIndirectionError) Error() string {
-	return fmt.Sprintf("filling Blocks: %v", e.err)
-}
-
-func (e *blocksIndirectionError) Unwrap() error {
-	return e.err
-}
-
-// fillFileInfo follows the (possible) indirection of blocks and version
-// vector and fills it out.
-func (t readOnlyTransaction) fillFileInfo(fi *bep.FileInfo) error {
-	var key []byte
-
-	if len(fi.Blocks) == 0 && len(fi.BlocksHash) != 0 {
-		// The blocks list is indirected and we need to load it.
-		key = t.keyer.GenerateBlockListKey(key, fi.BlocksHash)
-		bs, err := t.Get(key)
-		if err != nil {
-			return &blocksIndirectionError{err}
-		}
-		var bl dbproto.BlockList
-		if err := proto.Unmarshal(bs, &bl); err != nil {
-			return err
-		}
-		fi.Blocks = bl.Blocks
-	}
-
-	if len(fi.VersionHash) != 0 {
-		key = t.keyer.GenerateVersionKey(key, fi.VersionHash)
-		bs, err := t.Get(key)
-		if err != nil {
-			return fmt.Errorf("filling Version: %w", err)
-		}
-		var v bep.Vector
-		if err := proto.Unmarshal(bs, &v); err != nil {
-			return err
-		}
-		fi.Version = &v
-	}
-
-	return nil
-}
-
-// fillTruncated follows the (possible) indirection of version vector and
-// fills it.
-func (t readOnlyTransaction) fillTruncated(fi *dbproto.FileInfoTruncated) error {
-	var key []byte
-
-	if len(fi.VersionHash) == 0 {
-		return nil
-	}
-
-	key = t.keyer.GenerateVersionKey(key, fi.VersionHash)
-	bs, err := t.Get(key)
-	if err != nil {
-		return err
-	}
-	var v bep.Vector
-	if err := proto.Unmarshal(bs, &v); err != nil {
-		return err
-	}
-	fi.Version = &v
-	return nil
-}
-
-func (t *readOnlyTransaction) withHaveSequence(folder []byte, startSeq int64, fn Iterator) error {
-	first, err := t.keyer.GenerateSequenceKey(nil, folder, startSeq)
-	if err != nil {
-		return err
-	}
-	last, err := t.keyer.GenerateSequenceKey(nil, folder, maxInt64)
-	if err != nil {
-		return err
-	}
-	dbi, err := t.NewRangeIterator(first, last)
-	if err != nil {
-		return err
-	}
-	defer dbi.Release()
-
-	for dbi.Next() {
-		f, ok, err := t.getFileByKey(dbi.Value())
-		if err != nil {
-			return err
-		}
-		if !ok {
-			continue
-		}
-
-		if !fn(f) {
-			return nil
-		}
-	}
-	return dbi.Error()
-}

internal/db/sqlite/basedb.go

@@ -1,249 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"database/sql"
-	"embed"
-	"io/fs"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"text/template"
-	"time"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/syncthing/syncthing/lib/build"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-const currentSchemaVersion = 1
-
-//go:embed sql/**
-var embedded embed.FS
-
-type baseDB struct {
-	path     string
-	baseName string
-	sql      *sqlx.DB
-
-	updateLock       sync.Mutex
-	updatePoints     int
-	checkpointsCount int
-
-	statementsMut sync.RWMutex
-	statements    map[string]*sqlx.Stmt
-	tplInput      map[string]any
-}
-
-func openBase(path string, maxConns int, pragmas, schemaScripts, migrationScripts []string) (*baseDB, error) {
-	// Open the database with options to enable foreign keys and recursive
-	// triggers (needed for the delete+insert triggers on row replace).
-	sqlDB, err := sqlx.Open(dbDriver, "file:"+path+"?"+commonOptions)
-	if err != nil {
-		return nil, wrap(err)
-	}
-
-	sqlDB.SetMaxOpenConns(maxConns)
-
-	for _, pragma := range pragmas {
-		if _, err := sqlDB.Exec("PRAGMA " + pragma); err != nil {
-			return nil, wrap(err, "PRAGMA "+pragma)
-		}
-	}
-
-	db := &baseDB{
-		path:       path,
-		baseName:   filepath.Base(path),
-		sql:        sqlDB,
-		statements: make(map[string]*sqlx.Stmt),
-	}
-
-	for _, script := range schemaScripts {
-		if err := db.runScripts(script); err != nil {
-			return nil, wrap(err)
-		}
-	}
-
-	ver, _ := db.getAppliedSchemaVersion()
-	if ver.SchemaVersion > 0 {
-		filter := func(scr string) bool {
-			scr = filepath.Base(scr)
-			nstr, _, ok := strings.Cut(scr, "-")
-			if !ok {
-				return false
-			}
-			n, err := strconv.ParseInt(nstr, 10, 32)
-			if err != nil {
-				return false
-			}
-			return int(n) > ver.SchemaVersion
-		}
-		for _, script := range migrationScripts {
-			if err := db.runScripts(script, filter); err != nil {
-				return nil, wrap(err)
-			}
-		}
-	}
-
-	// Set the current schema version, if not already set
-	if err := db.setAppliedSchemaVersion(currentSchemaVersion); err != nil {
-		return nil, wrap(err)
-	}
-
-	db.tplInput = map[string]any{
-		"FlagLocalUnsupported": protocol.FlagLocalUnsupported,
-		"FlagLocalIgnored":     protocol.FlagLocalIgnored,
-		"FlagLocalMustRescan":  protocol.FlagLocalMustRescan,
-		"FlagLocalReceiveOnly": protocol.FlagLocalReceiveOnly,
-		"FlagLocalGlobal":      protocol.FlagLocalGlobal,
-		"FlagLocalNeeded":      protocol.FlagLocalNeeded,
-		"SyncthingVersion":     build.LongVersion,
-	}
-
-	return db, nil
-}
-
-func (s *baseDB) Close() error {
-	s.updateLock.Lock()
-	s.statementsMut.Lock()
-	defer s.updateLock.Unlock()
-	defer s.statementsMut.Unlock()
-	for _, stmt := range s.statements {
-		stmt.Close()
-	}
-	return wrap(s.sql.Close())
-}
-
-var tplFuncs = template.FuncMap{
-	"or": func(vs ...int) int {
-		v := vs[0]
-		for _, ov := range vs[1:] {
-			v |= ov
-		}
-		return v
-	},
-}
-
-// stmt returns a prepared statement for the given SQL string, after
-// applying local template expansions. The statement is cached.
-func (s *baseDB) stmt(tpl string) stmt {
-	tpl = strings.TrimSpace(tpl)
-
-	// Fast concurrent lookup of cached statement
-	s.statementsMut.RLock()
-	stmt, ok := s.statements[tpl]
-	s.statementsMut.RUnlock()
-	if ok {
-		return stmt
-	}
-
-	// On miss, take the full lock, check again
-	s.statementsMut.Lock()
-	defer s.statementsMut.Unlock()
-	stmt, ok = s.statements[tpl]
-	if ok {
-		return stmt
-	}
-
-	// Apply template expansions
-	var sb strings.Builder
-	compTpl := template.Must(template.New("tpl").Funcs(tplFuncs).Parse(tpl))
-	if err := compTpl.Execute(&sb, s.tplInput); err != nil {
-		panic("bug: bad template: " + err.Error())
-	}
-
-	// Prepare and cache
-	stmt, err := s.sql.Preparex(sb.String())
-	if err != nil {
-		return failedStmt{err}
-	}
-	s.statements[tpl] = stmt
-	return stmt
-}
-
-type stmt interface {
-	Exec(args ...any) (sql.Result, error)
-	Get(dest any, args ...any) error
-	Queryx(args ...any) (*sqlx.Rows, error)
-	Select(dest any, args ...any) error
-}
-
-type failedStmt struct {
-	err error
-}
-
-func (f failedStmt) Exec(_ ...any) (sql.Result, error)   { return nil, f.err }
-func (f failedStmt) Get(_ any, _ ...any) error           { return f.err }
-func (f failedStmt) Queryx(_ ...any) (*sqlx.Rows, error) { return nil, f.err }
-func (f failedStmt) Select(_ any, _ ...any) error        { return f.err }
-
-func (s *baseDB) runScripts(glob string, filter ...func(s string) bool) error {
-	scripts, err := fs.Glob(embedded, glob)
-	if err != nil {
-		return wrap(err)
-	}
-
-	tx, err := s.sql.Begin()
-	if err != nil {
-		return wrap(err)
-	}
-	defer tx.Rollback() //nolint:errcheck
-
-nextScript:
-	for _, scr := range scripts {
-		for _, fn := range filter {
-			if !fn(scr) {
-				continue nextScript
-			}
-		}
-		bs, err := fs.ReadFile(embedded, scr)
-		if err != nil {
-			return wrap(err, scr)
-		}
-		// SQLite requires one statement per exec, so we split the init
-		// files on lines containing only a semicolon and execute them
-		// separately. We require it on a separate line because there are
-		// also statement-internal semicolons in the triggers.
-		for _, stmt := range strings.Split(string(bs), "\n;") {
-			if _, err := tx.Exec(stmt); err != nil {
-				return wrap(err, stmt)
-			}
-		}
-	}
-
-	return wrap(tx.Commit())
-}
-
-type schemaVersion struct {
-	SchemaVersion    int
-	AppliedAt        int64
-	SyncthingVersion string
-}
-
-func (s *schemaVersion) AppliedTime() time.Time {
-	return time.Unix(0, s.AppliedAt)
-}
-
-func (s *baseDB) setAppliedSchemaVersion(ver int) error {
-	_, err := s.stmt(`
-		INSERT OR IGNORE INTO schemamigrations (schema_version, applied_at, syncthing_version)
-		VALUES (?, ?, ?)
-	`).Exec(ver, time.Now().UnixNano(), build.LongVersion)
-	return wrap(err)
-}
-
-func (s *baseDB) getAppliedSchemaVersion() (schemaVersion, error) {
-	var v schemaVersion
-	err := s.stmt(`
-		SELECT schema_version as schemaversion, applied_at as appliedat, syncthing_version as syncthingversion FROM schemamigrations
-		ORDER BY schema_version DESC
-		LIMIT 1
-	`).Get(&v)
-	return v, wrap(err)
-}

internal/db/sqlite/db_bench_test.go

@@ -1,243 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/syncthing/syncthing/internal/timeutil"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
-)
-
-var globalFi protocol.FileInfo
-
-func BenchmarkUpdate(b *testing.B) {
-	db, err := OpenTemp()
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			b.Fatal(err)
-		}
-	})
-	svc := db.Service(time.Hour).(*Service)
-
-	fs := make([]protocol.FileInfo, 100)
-	seed := 0
-
-	size := 10000
-	for size < 200_000 {
-		t0 := time.Now()
-		if err := svc.periodic(context.Background()); err != nil {
-			b.Fatal(err)
-		}
-		b.Log("garbage collect in", time.Since(t0))
-
-		for {
-			local, err := db.CountLocal(folderID, protocol.LocalDeviceID)
-			if err != nil {
-				b.Fatal(err)
-			}
-			if local.Files >= size {
-				break
-			}
-			fs := make([]protocol.FileInfo, 1000)
-			for i := range fs {
-				fs[i] = genFile(rand.String(24), 64, 0)
-			}
-			if err := db.Update(folderID, protocol.LocalDeviceID, fs); err != nil {
-				b.Fatal(err)
-			}
-		}
-
-		b.Run(fmt.Sprintf("Insert100Loc@%d", size), func(b *testing.B) {
-			for range b.N {
-				for i := range fs {
-					fs[i] = genFile(rand.String(24), 64, 0)
-				}
-				if err := db.Update(folderID, protocol.LocalDeviceID, fs); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(b.N)*100.0/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("RepBlocks100@%d", size), func(b *testing.B) {
-			for range b.N {
-				for i := range fs {
-					fs[i].Blocks = genBlocks(fs[i].Name, seed, 64)
-					fs[i].Version = fs[i].Version.Update(42)
-				}
-				seed++
-				if err := db.Update(folderID, protocol.LocalDeviceID, fs); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(b.N)*100.0/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("RepSame100@%d", size), func(b *testing.B) {
-			for range b.N {
-				for i := range fs {
-					fs[i].Version = fs[i].Version.Update(42)
-				}
-				if err := db.Update(folderID, protocol.LocalDeviceID, fs); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(b.N)*100.0/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("Insert100Rem@%d", size), func(b *testing.B) {
-			for range b.N {
-				for i := range fs {
-					fs[i].Blocks = genBlocks(fs[i].Name, seed, 64)
-					fs[i].Version = fs[i].Version.Update(42)
-					fs[i].Sequence = timeutil.StrictlyMonotonicNanos()
-				}
-				if err := db.Update(folderID, protocol.DeviceID{42}, fs); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(b.N)*100.0/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("GetGlobal100@%d", size), func(b *testing.B) {
-			for range b.N {
-				for i := range fs {
-					_, ok, err := db.GetGlobalFile(folderID, fs[i].Name)
-					if err != nil {
-						b.Fatal(err)
-					}
-					if !ok {
-						b.Fatal("should exist")
-					}
-				}
-			}
-			b.ReportMetric(float64(b.N)*100.0/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("LocalSequenced@%d", size), func(b *testing.B) {
-			count := 0
-			for range b.N {
-				cur, err := db.GetDeviceSequence(folderID, protocol.LocalDeviceID)
-				if err != nil {
-					b.Fatal(err)
-				}
-				it, errFn := db.AllLocalFilesBySequence(folderID, protocol.LocalDeviceID, cur-100, 0)
-				for f := range it {
-					count++
-					globalFi = f
-				}
-				if err := errFn(); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(count)/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("GetDeviceSequenceLoc@%d", size), func(b *testing.B) {
-			for range b.N {
-				_, err := db.GetDeviceSequence(folderID, protocol.LocalDeviceID)
-				if err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run(fmt.Sprintf("GetDeviceSequenceRem@%d", size), func(b *testing.B) {
-			for range b.N {
-				_, err := db.GetDeviceSequence(folderID, protocol.DeviceID{42})
-				if err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-
-		b.Run(fmt.Sprintf("RemoteNeed@%d", size), func(b *testing.B) {
-			count := 0
-			for range b.N {
-				it, errFn := db.AllNeededGlobalFiles(folderID, protocol.DeviceID{42}, config.PullOrderAlphabetic, 0, 0)
-				for f := range it {
-					count++
-					globalFi = f
-				}
-				if err := errFn(); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(count)/b.Elapsed().Seconds(), "files/s")
-		})
-
-		b.Run(fmt.Sprintf("LocalNeed100Largest@%d", size), func(b *testing.B) {
-			count := 0
-			for range b.N {
-				it, errFn := db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderLargestFirst, 100, 0)
-				for f := range it {
-					globalFi = f
-					count++
-				}
-				if err := errFn(); err != nil {
-					b.Fatal(err)
-				}
-			}
-			b.ReportMetric(float64(count)/b.Elapsed().Seconds(), "files/s")
-		})
-
-		size <<= 1
-	}
-}
-
-func TestBenchmarkDropAllRemote(t *testing.T) {
-	if testing.Short() {
-		t.Skip("slow test")
-	}
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	fs := make([]protocol.FileInfo, 1000)
-	seq := 0
-	for {
-		local, err := db.CountLocal(folderID, protocol.LocalDeviceID)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if local.Files >= 15_000 {
-			break
-		}
-		for i := range fs {
-			seq++
-			fs[i] = genFile(rand.String(24), 64, seq)
-		}
-		if err := db.Update(folderID, protocol.DeviceID{42}, fs); err != nil {
-			t.Fatal(err)
-		}
-		if err := db.Update(folderID, protocol.LocalDeviceID, fs); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	t0 := time.Now()
-	if err := db.DropAllFiles(folderID, protocol.DeviceID{42}); err != nil {
-		t.Fatal(err)
-	}
-	d := time.Since(t0)
-	t.Log("drop all took", d)
-}

internal/db/sqlite/db_folderdb.go

@@ -1,402 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"database/sql"
-	"errors"
-	"fmt"
-	"iter"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/internal/itererr"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
-)
-
-var errNoSuchFolder = errors.New("no such folder")
-
-func (s *DB) getFolderDB(folder string, create bool) (*folderDB, error) {
-	// Check for an already open database
-	s.folderDBsMut.RLock()
-	fdb, ok := s.folderDBs[folder]
-	s.folderDBsMut.RUnlock()
-	if ok {
-		return fdb, nil
-	}
-
-	// Check for an existing database. If we're not supposed to create the
-	// folder, we don't move on if it doesn't already have a database name.
-	var dbName string
-	if err := s.stmt(`
-		SELECT database_name FROM folders
-		WHERE folder_id = ?
-	`).Get(&dbName, folder); err != nil && !errors.Is(err, sql.ErrNoRows) {
-		return nil, wrap(err)
-	}
-	if dbName == "" && !create {
-		return nil, errNoSuchFolder
-	}
-
-	// Create a folder ID and database if it does not already exist
-	s.folderDBsMut.Lock()
-	defer s.folderDBsMut.Unlock()
-	if fdb, ok := s.folderDBs[folder]; ok {
-		return fdb, nil
-	}
-
-	if dbName == "" {
-		// First time we want to access this folder, need to create a new
-		// folder ID
-		idx, err := s.folderIdxLocked(folder)
-		if err != nil {
-			return nil, wrap(err)
-		}
-
-		// The database name is the folder index ID and a random slug.
-		slug := strings.ToLower(rand.String(8))
-		dbName = fmt.Sprintf("folder.%04x-%s.db", idx, slug)
-		if _, err := s.stmt(`UPDATE folders SET database_name = ? WHERE idx = ?`).Exec(dbName, idx); err != nil {
-			return nil, wrap(err, "set name")
-		}
-	}
-
-	l.Debugf("Folder %s in database %s", folder, dbName)
-	path := dbName
-	if !filepath.IsAbs(path) {
-		path = filepath.Join(s.pathBase, dbName)
-	}
-	fdb, err := s.folderDBOpener(folder, path, s.deleteRetention)
-	if err != nil {
-		return nil, wrap(err)
-	}
-	s.folderDBs[folder] = fdb
-	return fdb, nil
-}
-
-func (s *DB) Update(folder string, device protocol.DeviceID, fs []protocol.FileInfo) error {
-	fdb, err := s.getFolderDB(folder, true)
-	if err != nil {
-		return err
-	}
-	return fdb.Update(device, fs)
-}
-
-func (s *DB) GetDeviceFile(folder string, device protocol.DeviceID, file string) (protocol.FileInfo, bool, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return protocol.FileInfo{}, false, nil
-	}
-	if err != nil {
-		return protocol.FileInfo{}, false, err
-	}
-	return fdb.GetDeviceFile(device, file)
-}
-
-func (s *DB) GetGlobalAvailability(folder, file string) ([]protocol.DeviceID, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return fdb.GetGlobalAvailability(file)
-}
-
-func (s *DB) GetGlobalFile(folder string, file string) (protocol.FileInfo, bool, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return protocol.FileInfo{}, false, nil
-	}
-	if err != nil {
-		return protocol.FileInfo{}, false, err
-	}
-	return fdb.GetGlobalFile(file)
-}
-
-func (s *DB) AllGlobalFiles(folder string) (iter.Seq[db.FileMetadata], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return err }
-	}
-	return fdb.AllGlobalFiles()
-}
-
-func (s *DB) AllGlobalFilesPrefix(folder string, prefix string) (iter.Seq[db.FileMetadata], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return err }
-	}
-	return fdb.AllGlobalFilesPrefix(prefix)
-}
-
-func (s *DB) AllLocalBlocksWithHash(hash []byte) ([]db.BlockMapEntry, error) {
-	var entries []db.BlockMapEntry
-	err := s.forEachFolder(func(fdb *folderDB) error {
-		es, err := itererr.Collect(fdb.AllLocalBlocksWithHash(hash))
-		entries = append(entries, es...)
-		return err
-	})
-	return entries, err
-}
-
-func (s *DB) AllLocalFilesWithBlocksHashAnyFolder(hash []byte) (map[string][]db.FileMetadata, error) {
-	res := make(map[string][]db.FileMetadata)
-	err := s.forEachFolder(func(fdb *folderDB) error {
-		files, err := itererr.Collect(fdb.AllLocalFilesWithBlocksHash(hash))
-		res[fdb.folderID] = files
-		return err
-	})
-	return res, err
-}
-
-func (s *DB) AllLocalFiles(folder string, device protocol.DeviceID) (iter.Seq[protocol.FileInfo], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return err }
-	}
-	return fdb.AllLocalFiles(device)
-}
-
-func (s *DB) AllLocalFilesBySequence(folder string, device protocol.DeviceID, startSeq int64, limit int) (iter.Seq[protocol.FileInfo], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return err }
-	}
-	return fdb.AllLocalFilesBySequence(device, startSeq, limit)
-}
-
-func (s *DB) AllLocalFilesWithPrefix(folder string, device protocol.DeviceID, prefix string) (iter.Seq[protocol.FileInfo], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return err }
-	}
-	return fdb.AllLocalFilesWithPrefix(device, prefix)
-}
-
-func (s *DB) AllLocalFilesWithBlocksHash(folder string, h []byte) (iter.Seq[db.FileMetadata], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(db.FileMetadata) bool) {}, func() error { return err }
-	}
-	return fdb.AllLocalFilesWithBlocksHash(h)
-}
-
-func (s *DB) AllNeededGlobalFiles(folder string, device protocol.DeviceID, order config.PullOrder, limit, offset int) (iter.Seq[protocol.FileInfo], func() error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return nil }
-	}
-	if err != nil {
-		return func(yield func(protocol.FileInfo) bool) {}, func() error { return err }
-	}
-	return fdb.AllNeededGlobalFiles(device, order, limit, offset)
-}
-
-func (s *DB) DropAllFiles(folder string, device protocol.DeviceID) error {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	return fdb.DropAllFiles(device)
-}
-
-func (s *DB) DropFilesNamed(folder string, device protocol.DeviceID, names []string) error {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	return fdb.DropFilesNamed(device, names)
-}
-
-func (s *DB) ListDevicesForFolder(folder string) ([]protocol.DeviceID, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return fdb.ListDevicesForFolder()
-}
-
-func (s *DB) RemoteSequences(folder string) (map[protocol.DeviceID]int64, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return fdb.RemoteSequences()
-}
-
-func (s *DB) CountGlobal(folder string) (db.Counts, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return db.Counts{}, nil
-	}
-	if err != nil {
-		return db.Counts{}, err
-	}
-	return fdb.CountGlobal()
-}
-
-func (s *DB) CountLocal(folder string, device protocol.DeviceID) (db.Counts, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return db.Counts{}, nil
-	}
-	if err != nil {
-		return db.Counts{}, err
-	}
-	return fdb.CountLocal(device)
-}
-
-func (s *DB) CountNeed(folder string, device protocol.DeviceID) (db.Counts, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return db.Counts{}, nil
-	}
-	if err != nil {
-		return db.Counts{}, err
-	}
-	return fdb.CountNeed(device)
-}
-
-func (s *DB) CountReceiveOnlyChanged(folder string) (db.Counts, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return db.Counts{}, nil
-	}
-	if err != nil {
-		return db.Counts{}, err
-	}
-	return fdb.CountReceiveOnlyChanged()
-}
-
-func (s *DB) DropAllIndexIDs() error {
-	return s.forEachFolder(func(fdb *folderDB) error {
-		return fdb.DropAllIndexIDs()
-	})
-}
-
-func (s *DB) GetIndexID(folder string, device protocol.DeviceID) (protocol.IndexID, error) {
-	fdb, err := s.getFolderDB(folder, true)
-	if err != nil {
-		return 0, err
-	}
-	return fdb.GetIndexID(device)
-}
-
-func (s *DB) SetIndexID(folder string, device protocol.DeviceID, id protocol.IndexID) error {
-	fdb, err := s.getFolderDB(folder, true)
-	if err != nil {
-		return err
-	}
-	return fdb.SetIndexID(device, id)
-}
-
-func (s *DB) GetDeviceSequence(folder string, device protocol.DeviceID) (int64, error) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return 0, nil
-	}
-	if err != nil {
-		return 0, err
-	}
-	return fdb.GetDeviceSequence(device)
-}
-
-func (s *DB) DeleteMtime(folder, name string) error {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	return fdb.DeleteMtime(name)
-}
-
-func (s *DB) GetMtime(folder, name string) (ondisk, virtual time.Time) {
-	fdb, err := s.getFolderDB(folder, false)
-	if errors.Is(err, errNoSuchFolder) {
-		return time.Time{}, time.Time{}
-	}
-	if err != nil {
-		return time.Time{}, time.Time{}
-	}
-	return fdb.GetMtime(name)
-}
-
-func (s *DB) PutMtime(folder, name string, ondisk, virtual time.Time) error {
-	fdb, err := s.getFolderDB(folder, true)
-	if err != nil {
-		return err
-	}
-	return fdb.PutMtime(name, ondisk, virtual)
-}
-
-func (s *DB) DropDevice(device protocol.DeviceID) error {
-	return s.forEachFolder(func(fdb *folderDB) error {
-		return fdb.DropDevice(device)
-	})
-}
-
-// forEachFolder runs the function for each currently open folderDB,
-// returning the first error that was encountered.
-func (s *DB) forEachFolder(fn func(fdb *folderDB) error) error {
-	folders, err := s.ListFolders()
-	if err != nil {
-		return err
-	}
-
-	var firstError error
-	for _, folder := range folders {
-		fdb, err := s.getFolderDB(folder, false)
-		if err != nil {
-			if firstError == nil {
-				firstError = err
-			}
-			continue
-		}
-		if err := fn(fdb); err != nil && firstError == nil {
-			firstError = err
-		}
-	}
-	return firstError
-}

internal/db/sqlite/db_global_test.go

@@ -1,493 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"slices"
-	"testing"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-func TestNeed(t *testing.T) {
-	t.Helper()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Some local files
-	var v protocol.Vector
-	baseV := v.Update(1)
-	newerV := baseV.Update(42)
-	files := []protocol.FileInfo{
-		genFile("test1", 1, 0), // remote need
-		genFile("test2", 2, 0), // local need
-		genFile("test3", 3, 0), // global
-	}
-	files[0].Version = baseV
-	files[1].Version = baseV
-	files[2].Version = newerV
-	err = db.Update(folderID, protocol.LocalDeviceID, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Some remote files
-	remote := []protocol.FileInfo{
-		genFile("test2", 2, 100), // global
-		genFile("test3", 3, 101), // remote need
-		genFile("test4", 4, 102), // local need
-	}
-	remote[0].Version = newerV
-	remote[1].Version = baseV
-	remote[2].Version = newerV
-	err = db.Update(folderID, protocol.DeviceID{42}, remote)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// A couple are needed locally
-	localNeed := fiNames(mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 0, 0)))
-	if !slices.Equal(localNeed, []string{"test2", "test4"}) {
-		t.Log(localNeed)
-		t.Fatal("bad local need")
-	}
-
-	// Another couple are needed remotely
-	remoteNeed := fiNames(mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.DeviceID{42}, config.PullOrderAlphabetic, 0, 0)))
-	if !slices.Equal(remoteNeed, []string{"test1", "test3"}) {
-		t.Log(remoteNeed)
-		t.Fatal("bad remote need")
-	}
-}
-
-func TestDropRecalcsGlobal(t *testing.T) {
-	// When we drop a device we may get a new global
-
-	t.Parallel()
-
-	t.Run("DropAllFiles", func(t *testing.T) {
-		t.Parallel()
-
-		testDropWithDropper(t, func(t *testing.T, db *DB) {
-			t.Helper()
-			if err := db.DropAllFiles(folderID, protocol.DeviceID{42}); err != nil {
-				t.Fatal(err)
-			}
-		})
-	})
-
-	t.Run("DropDevice", func(t *testing.T) {
-		t.Parallel()
-
-		testDropWithDropper(t, func(t *testing.T, db *DB) {
-			t.Helper()
-			if err := db.DropDevice(protocol.DeviceID{42}); err != nil {
-				t.Fatal(err)
-			}
-		})
-	})
-
-	t.Run("DropFilesNamed", func(t *testing.T) {
-		t.Parallel()
-
-		testDropWithDropper(t, func(t *testing.T, db *DB) {
-			t.Helper()
-			if err := db.DropFilesNamed(folderID, protocol.DeviceID{42}, []string{"test1", "test42"}); err != nil {
-				t.Fatal(err)
-			}
-		})
-	})
-}
-
-func testDropWithDropper(t *testing.T, dropper func(t *testing.T, db *DB)) {
-	t.Helper()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Some local files
-	err = db.Update(folderID, protocol.LocalDeviceID, []protocol.FileInfo{
-		genFile("test1", 1, 0),
-		genFile("test2", 2, 0),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Some remote files
-	remote := []protocol.FileInfo{
-		genFile("test1", 3, 0),
-	}
-	remote[0].Version = remote[0].Version.Update(42)
-	err = db.Update(folderID, protocol.DeviceID{42}, remote)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Remote test1 wins as the global, verify.
-	count, err := db.CountGlobal(folderID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if count.Bytes != (2+3)*128<<10 {
-		t.Log(count)
-		t.Fatal("bad global size to begin with")
-	}
-	if g, ok, err := db.GetGlobalFile(folderID, "test1"); err != nil || !ok {
-		t.Fatal("missing global to begin with")
-	} else if g.Size != 3*128<<10 {
-		t.Fatal("remote test1 should be the global")
-	}
-
-	// Now remove that remote device
-	dropper(t, db)
-
-	// Our test1 should now be the global
-	count, err = db.CountGlobal(folderID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if count.Bytes != (1+2)*128<<10 {
-		t.Log(count)
-		t.Fatal("bad global size after drop")
-	}
-	if g, ok, err := db.GetGlobalFile(folderID, "test1"); err != nil || !ok {
-		t.Fatal("missing global after drop")
-	} else if g.Size != 1*128<<10 {
-		t.Fatal("local test1 should be the global")
-	}
-}
-
-func TestNeedDeleted(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Some local files
-	err = db.Update(folderID, protocol.LocalDeviceID, []protocol.FileInfo{
-		genFile("test1", 1, 0),
-		genFile("test2", 2, 0),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// A remote deleted file
-	remote := []protocol.FileInfo{
-		genFile("test1", 1, 101),
-	}
-	remote[0].SetDeleted(42)
-	err = db.Update(folderID, protocol.DeviceID{42}, remote)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// We need the one deleted file
-	s, err := db.CountNeed(folderID, protocol.LocalDeviceID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Bytes != 0 || s.Deleted != 1 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-}
-
-func TestDontNeedIgnored(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// A remote file
-	files := []protocol.FileInfo{
-		genFile("test1", 1, 103),
-	}
-	err = db.Update(folderID, protocol.DeviceID{42}, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Which we've ignored locally
-	files[0].SetIgnored()
-	err = db.Update(folderID, protocol.LocalDeviceID, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// We don't need it
-	s, err := db.CountNeed(folderID, protocol.LocalDeviceID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Bytes != 0 || s.Files != 0 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-
-	// It shouldn't show up in the need list
-	names := mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 0, 0))
-	if len(names) != 0 {
-		t.Log(names)
-		t.Error("need no files")
-	}
-}
-
-func TestRemoveDontNeedLocalIgnored(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// A local ignored file
-	file := genFile("test1", 1, 103)
-	file.SetIgnored()
-	files := []protocol.FileInfo{file}
-	err = db.Update(folderID, protocol.LocalDeviceID, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Which the remote doesn't have (no update)
-
-	// They don't need it
-	s, err := db.CountNeed(folderID, protocol.DeviceID{42})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Bytes != 0 || s.Files != 0 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-
-	// It shouldn't show up in their need list
-	names := mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.DeviceID{42}, config.PullOrderAlphabetic, 0, 0))
-	if len(names) != 0 {
-		t.Log(names)
-		t.Error("need no files")
-	}
-}
-
-func TestLocalDontNeedDeletedMissing(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// A remote deleted file
-	file := genFile("test1", 1, 103)
-	file.SetDeleted(42)
-	files := []protocol.FileInfo{file}
-	err = db.Update(folderID, protocol.DeviceID{42}, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Which we don't have (no local update)
-
-	// We don't need it
-	s, err := db.CountNeed(folderID, protocol.LocalDeviceID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Bytes != 0 || s.Files != 0 || s.Deleted != 0 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-
-	// It shouldn't show up in the need list
-	names := mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 0, 0))
-	if len(names) != 0 {
-		t.Log(names)
-		t.Error("need no files")
-	}
-}
-
-func TestRemoteDontNeedDeletedMissing(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// A local deleted file
-	file := genFile("test1", 1, 103)
-	file.SetDeleted(42)
-	files := []protocol.FileInfo{file}
-	err = db.Update(folderID, protocol.LocalDeviceID, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Which the remote doesn't have (no local update)
-
-	// They don't need it
-	s, err := db.CountNeed(folderID, protocol.DeviceID{42})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Bytes != 0 || s.Files != 0 || s.Deleted != 0 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-
-	// It shouldn't show up in their need list
-	names := mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.DeviceID{42}, config.PullOrderAlphabetic, 0, 0))
-	if len(names) != 0 {
-		t.Log(names)
-		t.Error("need no files")
-	}
-}
-
-func TestNeedRemoteSymlinkAndDir(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Two remote "specials", a symlink and a directory
-	var v protocol.Vector
-	v.Update(1)
-	files := []protocol.FileInfo{
-		{Name: "sym", Type: protocol.FileInfoTypeSymlink, Sequence: 100, Version: v, Blocks: genBlocks("symlink", 0, 1)},
-		{Name: "dir", Type: protocol.FileInfoTypeDirectory, Sequence: 101, Version: v},
-	}
-	err = db.Update(folderID, protocol.DeviceID{42}, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// We need them
-	s, err := db.CountNeed(folderID, protocol.LocalDeviceID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s.Directories != 1 || s.Symlinks != 1 {
-		t.Log(s)
-		t.Error("bad need")
-	}
-
-	// They should be in the need list
-	names := mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 0, 0))
-	if len(names) != 2 {
-		t.Log(names)
-		t.Error("bad need")
-	}
-}
-
-func TestNeedPagination(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Several remote files
-	var v protocol.Vector
-	v.Update(1)
-	files := []protocol.FileInfo{
-		genFile("test0", 1, 100),
-		genFile("test1", 1, 101),
-		genFile("test2", 1, 102),
-		genFile("test3", 1, 103),
-		genFile("test4", 1, 104),
-		genFile("test5", 1, 105),
-		genFile("test6", 1, 106),
-		genFile("test7", 1, 107),
-		genFile("test8", 1, 108),
-		genFile("test9", 1, 109),
-	}
-	err = db.Update(folderID, protocol.DeviceID{42}, files)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// We should get the first two
-	names := fiNames(mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 2, 0)))
-	if !slices.Equal(names, []string{"test0", "test1"}) {
-		t.Log(names)
-		t.Error("bad need")
-	}
-
-	// We should get the next three
-	names = fiNames(mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 3, 2)))
-	if !slices.Equal(names, []string{"test2", "test3", "test4"}) {
-		t.Log(names)
-		t.Error("bad need")
-	}
-
-	// We should get the last five
-	names = fiNames(mustCollect[protocol.FileInfo](t)(db.AllNeededGlobalFiles(folderID, protocol.LocalDeviceID, config.PullOrderAlphabetic, 5, 5)))
-	if !slices.Equal(names, []string{"test5", "test6", "test7", "test8", "test9"}) {
-		t.Log(names)
-		t.Error("bad need")
-	}
-}

internal/db/sqlite/db_indexid_test.go

@@ -1,81 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"testing"
-
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-func TestIndexIDs(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal()
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t.Run("LocalDeviceID", func(t *testing.T) {
-		t.Parallel()
-
-		localID, err := db.GetIndexID("foo", protocol.LocalDeviceID)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if localID == 0 {
-			t.Fatal("should have been generated")
-		}
-
-		again, err := db.GetIndexID("foo", protocol.LocalDeviceID)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if again != localID {
-			t.Fatal("should get same again")
-		}
-
-		other, err := db.GetIndexID("bar", protocol.LocalDeviceID)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if other == localID {
-			t.Fatal("should not get same for other folder")
-		}
-	})
-
-	t.Run("OtherDeviceID", func(t *testing.T) {
-		t.Parallel()
-
-		localID, err := db.GetIndexID("foo", protocol.DeviceID{42})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if localID != 0 {
-			t.Fatal("should have been zero")
-		}
-
-		newID := protocol.NewIndexID()
-		if err := db.SetIndexID("foo", protocol.DeviceID{42}, newID); err != nil {
-			t.Fatal(err)
-		}
-
-		again, err := db.GetIndexID("foo", protocol.DeviceID{42})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if again != newID {
-			t.Log(again, newID)
-			t.Fatal("should get the ID we set")
-		}
-	})
-}

internal/db/sqlite/db_kv.go

@@ -1,78 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"iter"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/syncthing/syncthing/internal/db"
-)
-
-func (s *baseDB) GetKV(key string) ([]byte, error) {
-	var val []byte
-	if err := s.stmt(`
-		SELECT value FROM kv
-		WHERE key = ?
-	`).Get(&val, key); err != nil {
-		return nil, wrap(err)
-	}
-	return val, nil
-}
-
-func (s *baseDB) PutKV(key string, val []byte) error {
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-	_, err := s.stmt(`
-		INSERT OR REPLACE INTO kv (key, value)
-		VALUES (?, ?)
-	`).Exec(key, val)
-	return wrap(err)
-}
-
-func (s *baseDB) DeleteKV(key string) error {
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-	_, err := s.stmt(`
-		DELETE FROM kv WHERE key = ?
-	`).Exec(key)
-	return wrap(err)
-}
-
-func (s *baseDB) PrefixKV(prefix string) (iter.Seq[db.KeyValue], func() error) {
-	var rows *sqlx.Rows
-	var err error
-	if prefix == "" {
-		rows, err = s.stmt(`SELECT key, value FROM kv`).Queryx()
-	} else {
-		end := prefixEnd(prefix)
-		rows, err = s.stmt(`
-			SELECT key, value FROM kv
-			WHERE key >= ? AND key < ?
-		`).Queryx(prefix, end)
-	}
-	if err != nil {
-		return func(_ func(db.KeyValue) bool) {}, func() error { return err }
-	}
-
-	return func(yield func(db.KeyValue) bool) {
-			defer rows.Close()
-			for rows.Next() {
-				var key string
-				var val []byte
-				if err = rows.Scan(&key, &val); err != nil {
-					return
-				}
-				if !yield(db.KeyValue{Key: key, Value: val}) {
-					return
-				}
-			}
-			err = rows.Err()
-		}, func() error {
-			return err
-		}
-}

internal/db/sqlite/db_local_test.go

@@ -1,203 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"testing"
-
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-func TestBlocks(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal()
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	files := []protocol.FileInfo{
-		{
-			Name: "file1",
-			Blocks: []protocol.BlockInfo{
-				{Hash: []byte{1, 2, 3}, Offset: 0, Size: 42},
-				{Hash: []byte{2, 3, 4}, Offset: 42, Size: 42},
-				{Hash: []byte{3, 4, 5}, Offset: 84, Size: 42},
-			},
-		},
-		{
-			Name: "file2",
-			Blocks: []protocol.BlockInfo{
-				{Hash: []byte{2, 3, 4}, Offset: 0, Size: 42},
-				{Hash: []byte{3, 4, 5}, Offset: 42, Size: 42},
-				{Hash: []byte{4, 5, 6}, Offset: 84, Size: 42},
-			},
-		},
-	}
-
-	if err := db.Update("test", protocol.LocalDeviceID, files); err != nil {
-		t.Fatal(err)
-	}
-
-	// Search for blocks
-
-	vals, err := db.AllLocalBlocksWithHash([]byte{1, 2, 3})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(vals) != 1 {
-		t.Log(vals)
-		t.Fatal("expected one hit")
-	} else if vals[0].BlockIndex != 0 || vals[0].Offset != 0 || vals[0].Size != 42 {
-		t.Log(vals[0])
-		t.Fatal("bad entry")
-	}
-
-	// Get FileInfos for those blocks
-
-	res, err := db.AllLocalFilesWithBlocksHashAnyFolder(vals[0].BlocklistHash)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(res) != 1 {
-		t.Fatal("should return one folder")
-	}
-	if len(res[folderID]) != 1 {
-		t.Fatal("should find one file")
-	}
-	if res[folderID][0].Name != "file1" {
-		t.Fatal("should be file1")
-	}
-
-	// Get the other blocks
-
-	vals, err = db.AllLocalBlocksWithHash([]byte{3, 4, 5})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(vals) != 2 {
-		t.Log(vals)
-		t.Fatal("expected two hits")
-	}
-	// if vals[0].Index != 2 || vals[0].Offset != 84 || vals[0].Size != 42 {
-	// 	t.Log(vals[0])
-	// 	t.Fatal("bad entry 1")
-	// }
-	// if vals[1].Index != 1 || vals[1].Offset != 42 || vals[1].Size != 42 {
-	// 	t.Log(vals[1])
-	// 	t.Fatal("bad entry 2")
-	// }
-}
-
-func TestBlocksDeleted(t *testing.T) {
-	t.Parallel()
-
-	sdb, err := OpenTemp()
-	if err != nil {
-		t.Fatal()
-	}
-	t.Cleanup(func() {
-		if err := sdb.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Insert a file
-	file := genFile("foo", 1, 0)
-	if err := sdb.Update(folderID, protocol.LocalDeviceID, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-
-	// We should find one entry for the block hash
-	search := file.Blocks[0].Hash
-	es, err := sdb.AllLocalBlocksWithHash(search)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(es) != 1 {
-		t.Fatal("expected one hit")
-	}
-
-	// Update the file with a new block hash
-	file.Blocks = genBlocks("foo", 42, 1)
-	if err := sdb.Update(folderID, protocol.LocalDeviceID, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-
-	// Searching for the old hash should yield no hits
-	if hits, err := sdb.AllLocalBlocksWithHash(search); err != nil {
-		t.Fatal(err)
-	} else if len(hits) != 0 {
-		t.Log(hits)
-		t.Error("expected no hits")
-	}
-
-	// Searching for the new hash should yield one hits
-	if hits, err := sdb.AllLocalBlocksWithHash(file.Blocks[0].Hash); err != nil {
-		t.Fatal(err)
-	} else if len(hits) != 1 {
-		t.Log(hits)
-		t.Error("expected one hit")
-	}
-}
-
-func TestRemoteSequence(t *testing.T) {
-	t.Parallel()
-
-	sdb, err := OpenTemp()
-	if err != nil {
-		t.Fatal()
-	}
-	t.Cleanup(func() {
-		if err := sdb.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	// Insert a local file
-	file := genFile("foo", 1, 0)
-	if err := sdb.Update(folderID, protocol.LocalDeviceID, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-
-	// Insert several remote files
-	file = genFile("foo1", 1, 42)
-	if err := sdb.Update(folderID, protocol.DeviceID{42}, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-	if err := sdb.Update(folderID, protocol.DeviceID{43}, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-	file = genFile("foo2", 1, 43)
-	if err := sdb.Update(folderID, protocol.DeviceID{43}, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-	if err := sdb.Update(folderID, protocol.DeviceID{44}, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-	file = genFile("foo3", 1, 44)
-	if err := sdb.Update(folderID, protocol.DeviceID{44}, []protocol.FileInfo{file}); err != nil {
-		t.Fatal()
-	}
-
-	// Verify remote sequences
-	seqs, err := sdb.RemoteSequences(folderID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(seqs) != 3 || seqs[protocol.DeviceID{42}] != 42 ||
-		seqs[protocol.DeviceID{43}] != 43 ||
-		seqs[protocol.DeviceID{44}] != 44 {
-		t.Log(seqs)
-		t.Error("bad seqs")
-	}
-}

internal/db/sqlite/db_mtimes_test.go

@@ -1,54 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"testing"
-	"time"
-)
-
-func TestMtimePairs(t *testing.T) {
-	t.Parallel()
-
-	db, err := OpenTemp()
-	if err != nil {
-		t.Fatal()
-	}
-	t.Cleanup(func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-	})
-
-	t0 := time.Now().Truncate(time.Second)
-	t1 := t0.Add(1234567890)
-
-	// Set a pair
-	if err := db.PutMtime("foo", "bar", t0, t1); err != nil {
-		t.Fatal(err)
-	}
-
-	// Check it
-	gt0, gt1 := db.GetMtime("foo", "bar")
-	if !gt0.Equal(t0) || !gt1.Equal(t1) {
-		t.Log(t0, gt0)
-		t.Log(t1, gt1)
-		t.Log("bad times")
-	}
-
-	// Delete it
-	if err := db.DeleteMtime("foo", "bar"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Check it
-	gt0, gt1 = db.GetMtime("foo", "bar")
-	if !gt0.IsZero() || !gt1.IsZero() {
-		t.Log(gt0, gt1)
-		t.Log("bad times")
-	}
-}

internal/db/sqlite/db_open.go

@@ -1,135 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/syncthing/syncthing/internal/db"
-)
-
-const maxDBConns = 16
-
-type DB struct {
-	pathBase        string
-	deleteRetention time.Duration
-
-	*baseDB
-
-	folderDBsMut   sync.RWMutex
-	folderDBs      map[string]*folderDB
-	folderDBOpener func(folder, path string, deleteRetention time.Duration) (*folderDB, error)
-}
-
-var _ db.DB = (*DB)(nil)
-
-type Option func(*DB)
-
-func WithDeleteRetention(d time.Duration) Option {
-	return func(s *DB) {
-		s.deleteRetention = d
-	}
-}
-
-func Open(path string, opts ...Option) (*DB, error) {
-	pragmas := []string{
-		"journal_mode = WAL",
-		"optimize = 0x10002",
-		"auto_vacuum = INCREMENTAL",
-		"default_temp_store = MEMORY",
-		"temp_store = MEMORY",
-	}
-	schemas := []string{
-		"sql/schema/common/*",
-		"sql/schema/main/*",
-	}
-
-	os.MkdirAll(path, 0o700)
-	mainPath := filepath.Join(path, "main.db")
-	mainBase, err := openBase(mainPath, maxDBConns, pragmas, schemas, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	db := &DB{
-		pathBase:       path,
-		baseDB:         mainBase,
-		folderDBs:      make(map[string]*folderDB),
-		folderDBOpener: openFolderDB,
-	}
-
-	for _, opt := range opts {
-		opt(db)
-	}
-
-	return db, nil
-}
-
-// Open the database with options suitable for the migration inserts. This
-// is not a safe mode of operation for normal processing, use only for bulk
-// inserts with a close afterwards.
-func OpenForMigration(path string) (*DB, error) {
-	pragmas := []string{
-		"journal_mode = OFF",
-		"default_temp_store = MEMORY",
-		"temp_store = MEMORY",
-		"foreign_keys = 0",
-		"synchronous = 0",
-		"locking_mode = EXCLUSIVE",
-	}
-	schemas := []string{
-		"sql/schema/common/*",
-		"sql/schema/main/*",
-	}
-
-	os.MkdirAll(path, 0o700)
-	mainPath := filepath.Join(path, "main.db")
-	mainBase, err := openBase(mainPath, 1, pragmas, schemas, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	db := &DB{
-		pathBase:       path,
-		baseDB:         mainBase,
-		folderDBs:      make(map[string]*folderDB),
-		folderDBOpener: openFolderDBForMigration,
-	}
-
-	// // Touch device IDs that should always exist and have a low index
-	// // numbers, and will never change
-	// db.localDeviceIdx, _ = db.deviceIdxLocked(protocol.LocalDeviceID)
-	// db.tplInput["LocalDeviceIdx"] = db.localDeviceIdx
-
-	return db, nil
-}
-
-func OpenTemp() (*DB, error) {
-	// SQLite has a memory mode, but it works differently with concurrency
-	// compared to what we need with the WAL mode. So, no memory databases
-	// for now.
-	dir, err := os.MkdirTemp("", "syncthing-db")
-	if err != nil {
-		return nil, wrap(err)
-	}
-	path := filepath.Join(dir, "db")
-	l.Debugln("Test DB in", path)
-	return Open(path)
-}
-
-func (s *DB) Close() error {
-	s.folderDBsMut.Lock()
-	defer s.folderDBsMut.Unlock()
-	for folder, fdb := range s.folderDBs {
-		fdb.Close()
-		delete(s.folderDBs, folder)
-	}
-	return wrap(s.baseDB.Close())
-}

internal/db/sqlite/db_open_cgo.go

@@ -1,18 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-//go:build cgo
-
-package sqlite
-
-import (
-	_ "github.com/mattn/go-sqlite3" // register sqlite3 database driver
-)
-
-const (
-	dbDriver      = "sqlite3"
-	commonOptions = "_fk=true&_rt=true&_cache_size=-65536&_sync=1&_txlock=immediate"
-)

internal/db/sqlite/db_open_nocgo.go

@@ -1,23 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-//go:build !cgo && !wazero
-
-package sqlite
-
-import (
-	"github.com/syncthing/syncthing/lib/build"
-	_ "modernc.org/sqlite" // register sqlite database driver
-)
-
-const (
-	dbDriver      = "sqlite"
-	commonOptions = "_pragma=foreign_keys(1)&_pragma=recursive_triggers(1)&_pragma=cache_size(-65536)&_pragma=synchronous(1)"
-)
-
-func init() {
-	build.AddTag("modernc-sqlite")
-}

internal/db/sqlite/db_prepared.go

@@ -1,44 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import "github.com/jmoiron/sqlx"
-
-type txPreparedStmts struct {
-	*sqlx.Tx
-	stmts map[string]*sqlx.Stmt
-}
-
-func (p *txPreparedStmts) Preparex(query string) (*sqlx.Stmt, error) {
-	if p.stmts == nil {
-		p.stmts = make(map[string]*sqlx.Stmt)
-	}
-	stmt, ok := p.stmts[query]
-	if ok {
-		return stmt, nil
-	}
-	stmt, err := p.Tx.Preparex(query)
-	if err != nil {
-		return nil, wrap(err)
-	}
-	p.stmts[query] = stmt
-	return stmt, nil
-}
-
-func (p *txPreparedStmts) Commit() error {
-	for _, s := range p.stmts {
-		s.Close()
-	}
-	return p.Tx.Commit()
-}
-
-func (p *txPreparedStmts) Rollback() error {
-	for _, s := range p.stmts {
-		s.Close()
-	}
-	return p.Tx.Rollback()
-}

internal/db/sqlite/db_service.go

@@ -1,195 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/thejerf/suture/v4"
-)
-
-const (
-	internalMetaPrefix     = "dbsvc"
-	lastMaintKey           = "lastMaint"
-	defaultDeleteRetention = 180 * 24 * time.Hour
-	minDeleteRetention     = 24 * time.Hour
-)
-
-func (s *DB) Service(maintenanceInterval time.Duration) suture.Service {
-	return newService(s, maintenanceInterval)
-}
-
-type Service struct {
-	sdb                 *DB
-	maintenanceInterval time.Duration
-	internalMeta        *db.Typed
-}
-
-func (s *Service) String() string {
-	return fmt.Sprintf("sqlite.service@%p", s)
-}
-
-func newService(sdb *DB, maintenanceInterval time.Duration) *Service {
-	return &Service{
-		sdb:                 sdb,
-		maintenanceInterval: maintenanceInterval,
-		internalMeta:        db.NewTyped(sdb, internalMetaPrefix),
-	}
-}
-
-func (s *Service) Serve(ctx context.Context) error {
-	// Run periodic maintenance
-
-	// Figure out when we last ran maintenance and schedule accordingly. If
-	// it was never, do it now.
-	lastMaint, _, _ := s.internalMeta.Time(lastMaintKey)
-	nextMaint := lastMaint.Add(s.maintenanceInterval)
-	wait := time.Until(nextMaint)
-	if wait < 0 {
-		wait = time.Minute
-	}
-	l.Debugln("Next periodic run in", wait)
-
-	timer := time.NewTimer(wait)
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-timer.C:
-		}
-
-		if err := s.periodic(ctx); err != nil {
-			return wrap(err)
-		}
-
-		timer.Reset(s.maintenanceInterval)
-		l.Debugln("Next periodic run in", s.maintenanceInterval)
-		_ = s.internalMeta.PutTime(lastMaintKey, time.Now())
-	}
-}
-
-func (s *Service) periodic(ctx context.Context) error {
-	t0 := time.Now()
-	l.Debugln("Periodic start")
-
-	s.sdb.updateLock.Lock()
-	defer s.sdb.updateLock.Unlock()
-
-	t1 := time.Now()
-	defer func() { l.Debugln("Periodic done in", time.Since(t1), "+", t1.Sub(t0)) }()
-
-	tidy(ctx, s.sdb.sql)
-
-	return wrap(s.sdb.forEachFolder(func(fdb *folderDB) error {
-		fdb.updateLock.Lock()
-		defer fdb.updateLock.Unlock()
-
-		if err := garbageCollectOldDeletedLocked(fdb); err != nil {
-			return wrap(err)
-		}
-		if err := garbageCollectBlocklistsAndBlocksLocked(ctx, fdb); err != nil {
-			return wrap(err)
-		}
-		tidy(ctx, fdb.sql)
-		return nil
-	}))
-}
-
-func tidy(ctx context.Context, db *sqlx.DB) error {
-	conn, err := db.Conn(ctx)
-	if err != nil {
-		return wrap(err)
-	}
-	defer conn.Close()
-	_, _ = conn.ExecContext(ctx, `ANALYZE`)
-	_, _ = conn.ExecContext(ctx, `PRAGMA optimize`)
-	_, _ = conn.ExecContext(ctx, `PRAGMA incremental_vacuum`)
-	_, _ = conn.ExecContext(ctx, `PRAGMA journal_size_limit = 8388608`)
-	_, _ = conn.ExecContext(ctx, `PRAGMA wal_checkpoint(TRUNCATE)`)
-	return nil
-}
-
-func garbageCollectOldDeletedLocked(fdb *folderDB) error {
-	if fdb.deleteRetention <= 0 {
-		l.Debugln(fdb.baseName, "delete retention is infinite, skipping cleanup")
-		return nil
-	}
-
-	// Remove deleted files that are marked as not needed (we have processed
-	// them) and they were deleted more than MaxDeletedFileAge ago.
-	l.Debugln(fdb.baseName, "forgetting deleted files older than", fdb.deleteRetention)
-	res, err := fdb.stmt(`
-		DELETE FROM files
-		WHERE deleted AND modified < ? AND local_flags & {{.FlagLocalNeeded}} == 0
-	`).Exec(time.Now().Add(-fdb.deleteRetention).UnixNano())
-	if err != nil {
-		return wrap(err)
-	}
-	if aff, err := res.RowsAffected(); err == nil {
-		l.Debugln(fdb.baseName, "removed old deleted file records:", aff)
-	}
-	return nil
-}
-
-func garbageCollectBlocklistsAndBlocksLocked(ctx context.Context, fdb *folderDB) error {
-	// Remove all blocklists not referred to by any files and, by extension,
-	// any blocks not referred to by a blocklist. This is an expensive
-	// operation when run normally, especially if there are a lot of blocks
-	// to collect.
-	//
-	// We make this orders of magnitude faster by disabling foreign keys for
-	// the transaction and doing the cleanup manually. This requires using
-	// an explicit connection and disabling foreign keys before starting the
-	// transaction. We make sure to clean up on the way out.
-
-	conn, err := fdb.sql.Connx(ctx)
-	if err != nil {
-		return wrap(err)
-	}
-	defer conn.Close()
-
-	if _, err := conn.ExecContext(ctx, `PRAGMA foreign_keys = 0`); err != nil {
-		return wrap(err)
-	}
-	defer func() { //nolint:contextcheck
-		_, _ = conn.ExecContext(context.Background(), `PRAGMA foreign_keys = 1`)
-	}()
-
-	tx, err := conn.BeginTxx(ctx, nil)
-	if err != nil {
-		return wrap(err)
-	}
-	defer tx.Rollback() //nolint:errcheck
-
-	if res, err := tx.ExecContext(ctx, `
-		DELETE FROM blocklists
-		WHERE NOT EXISTS (
-			SELECT 1 FROM files WHERE files.blocklist_hash = blocklists.blocklist_hash
-		)`); err != nil {
-		return wrap(err, "delete blocklists")
-	} else if shouldDebug() {
-		rows, err := res.RowsAffected()
-		l.Debugln(fdb.baseName, "blocklist GC:", rows, err)
-	}
-
-	if res, err := tx.ExecContext(ctx, `
-		DELETE FROM blocks
-		WHERE NOT EXISTS (
-			SELECT 1 FROM blocklists WHERE blocklists.blocklist_hash = blocks.blocklist_hash
-		)`); err != nil {
-		return wrap(err, "delete blocks")
-	} else if shouldDebug() {
-		rows, err := res.RowsAffected()
-		l.Debugln(fdb.baseName, "blocks GC:", rows, err)
-	}
-
-	return wrap(tx.Commit())
-}

internal/db/sqlite/db_update.go

@@ -1,70 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"strings"
-)
-
-func (s *DB) DropFolder(folder string) error {
-	s.folderDBsMut.Lock()
-	defer s.folderDBsMut.Unlock()
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-	_, err := s.stmt(`
-		DELETE FROM folders
-		WHERE folder_id = ?
-	`).Exec(folder)
-	if fdb, ok := s.folderDBs[folder]; ok {
-		fdb.Close()
-		_ = os.Remove(fdb.path)
-		_ = os.Remove(fdb.path + "-wal")
-		_ = os.Remove(fdb.path + "-shm")
-		delete(s.folderDBs, folder)
-	}
-	return wrap(err)
-}
-
-func (s *DB) ListFolders() ([]string, error) {
-	var res []string
-	err := s.stmt(`
-		SELECT folder_id FROM folders
-		ORDER BY folder_id
-	`).Select(&res)
-	return res, wrap(err)
-}
-
-// wrap returns the error wrapped with the calling function name and
-// optional extra context strings as prefix. A nil error wraps to nil.
-func wrap(err error, context ...string) error {
-	if err == nil {
-		return nil
-	}
-
-	prefix := "error"
-	pc, _, _, ok := runtime.Caller(1)
-	details := runtime.FuncForPC(pc)
-	if ok && details != nil {
-		prefix = strings.ToLower(details.Name())
-		if dotIdx := strings.LastIndex(prefix, "."); dotIdx > 0 {
-			prefix = prefix[dotIdx+1:]
-		}
-	}
-
-	if len(context) > 0 {
-		for i := range context {
-			context[i] = strings.TrimSpace(context[i])
-		}
-		extra := strings.Join(context, ", ")
-		return fmt.Errorf("%s (%s): %w", prefix, extra, err)
-	}
-
-	return fmt.Errorf("%s: %w", prefix, err)
-}

internal/db/sqlite/folderdb_counts.go

@@ -1,131 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-type countsRow struct {
-	Type       protocol.FileInfoType
-	Count      int
-	Size       int64
-	Deleted    bool
-	LocalFlags int64 `db:"local_flags"`
-}
-
-func (s *folderDB) CountLocal(device protocol.DeviceID) (db.Counts, error) {
-	var res []countsRow
-	if err := s.stmt(`
-		SELECT s.type, s.count, s.size, s.local_flags, s.deleted FROM counts s
-		INNER JOIN devices d ON d.idx = s.device_idx
-		WHERE d.device_id = ? AND s.local_flags & {{.FlagLocalIgnored}} = 0
-	`).Select(&res, device.String()); err != nil {
-		return db.Counts{}, wrap(err)
-	}
-	return summarizeCounts(res), nil
-}
-
-func (s *folderDB) CountNeed(device protocol.DeviceID) (db.Counts, error) {
-	if device == protocol.LocalDeviceID {
-		return s.needSizeLocal()
-	}
-	return s.needSizeRemote(device)
-}
-
-func (s *folderDB) CountGlobal() (db.Counts, error) {
-	// Exclude ignored and receive-only changed files from the global count
-	// (legacy expectation? it's a bit weird since those files can in fact
-	// be global and you can get them with GetGlobal etc.)
-	var res []countsRow
-	err := s.stmt(`
-		SELECT s.type, s.count, s.size, s.local_flags, s.deleted FROM counts s
-		WHERE s.local_flags & {{.FlagLocalGlobal}} != 0 AND s.local_flags & {{or .FlagLocalReceiveOnly .FlagLocalIgnored}} = 0
-	`).Select(&res)
-	if err != nil {
-		return db.Counts{}, wrap(err)
-	}
-	return summarizeCounts(res), nil
-}
-
-func (s *folderDB) CountReceiveOnlyChanged() (db.Counts, error) {
-	var res []countsRow
-	err := s.stmt(`
-		SELECT s.type, s.count, s.size, s.local_flags, s.deleted FROM counts s
-		WHERE local_flags & {{.FlagLocalReceiveOnly}} != 0
-	`).Select(&res)
-	if err != nil {
-		return db.Counts{}, wrap(err)
-	}
-	return summarizeCounts(res), nil
-}
-
-func (s *folderDB) needSizeLocal() (db.Counts, error) {
-	// The need size for the local device is the sum of entries with the
-	// need bit set.
-	var res []countsRow
-	err := s.stmt(`
-		SELECT s.type, s.count, s.size, s.local_flags, s.deleted FROM counts s
-		WHERE s.local_flags & {{.FlagLocalNeeded}} != 0
-	`).Select(&res)
-	if err != nil {
-		return db.Counts{}, wrap(err)
-	}
-	return summarizeCounts(res), nil
-}
-
-func (s *folderDB) needSizeRemote(device protocol.DeviceID) (db.Counts, error) {
-	var res []countsRow
-	// See neededGlobalFilesRemote for commentary as that is the same query without summing
-	if err := s.stmt(`
-		SELECT g.type, count(*) as count, sum(g.size) as size, g.local_flags, g.deleted FROM files g
-		WHERE g.local_flags & {{.FlagLocalGlobal}} != 0 AND NOT g.deleted AND NOT g.invalid AND NOT EXISTS (
-			SELECT 1 FROM FILES f
-			INNER JOIN devices d ON d.idx = f.device_idx
-			WHERE f.name = g.name AND f.version = g.version AND d.device_id = ?
-		)
-		GROUP BY g.type, g.local_flags, g.deleted
-
-		UNION ALL
-
-		SELECT g.type, count(*) as count, sum(g.size) as size, g.local_flags, g.deleted FROM files g
-		WHERE g.local_flags & {{.FlagLocalGlobal}} != 0 AND g.deleted AND NOT g.invalid AND EXISTS (
-			SELECT 1 FROM FILES f
-			INNER JOIN devices d ON d.idx = f.device_idx
-			WHERE f.name = g.name AND d.device_id = ? AND NOT f.deleted
-		)
-		GROUP BY g.type, g.local_flags, g.deleted
-	`).Select(&res, device.String(),
-		device.String()); err != nil {
-		return db.Counts{}, wrap(err)
-	}
-
-	return summarizeCounts(res), nil
-}
-
-func summarizeCounts(res []countsRow) db.Counts {
-	c := db.Counts{
-		DeviceID: protocol.LocalDeviceID,
-	}
-	for _, r := range res {
-		switch {
-		case r.Deleted:
-			c.Deleted += r.Count
-		case r.Type == protocol.FileInfoTypeFile:
-			c.Files += r.Count
-			c.Bytes += r.Size
-		case r.Type == protocol.FileInfoTypeDirectory:
-			c.Directories += r.Count
-			c.Bytes += r.Size
-		case r.Type == protocol.FileInfoTypeSymlink:
-			c.Symlinks += r.Count
-			c.Bytes += r.Size
-		}
-	}
-	return c
-}

internal/db/sqlite/folderdb_global.go

@@ -1,182 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"database/sql"
-	"errors"
-	"fmt"
-	"iter"
-
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/internal/itererr"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-func (s *folderDB) GetGlobalFile(file string) (protocol.FileInfo, bool, error) {
-	file = osutil.NormalizedFilename(file)
-
-	var ind indirectFI
-	err := s.stmt(`
-		SELECT fi.fiprotobuf, bl.blprotobuf FROM fileinfos fi
-		INNER JOIN files f on fi.sequence = f.sequence
-		LEFT JOIN blocklists bl ON bl.blocklist_hash = f.blocklist_hash
-		WHERE f.name = ? AND f.local_flags & {{.FlagLocalGlobal}} != 0
-	`).Get(&ind, file)
-	if errors.Is(err, sql.ErrNoRows) {
-		return protocol.FileInfo{}, false, nil
-	}
-	if err != nil {
-		return protocol.FileInfo{}, false, wrap(err)
-	}
-	fi, err := ind.FileInfo()
-	if err != nil {
-		return protocol.FileInfo{}, false, wrap(err)
-	}
-	return fi, true, nil
-}
-
-func (s *folderDB) GetGlobalAvailability(file string) ([]protocol.DeviceID, error) {
-	file = osutil.NormalizedFilename(file)
-
-	var devStrs []string
-	err := s.stmt(`
-		SELECT d.device_id FROM files f
-		INNER JOIN devices d ON d.idx = f.device_idx
-		INNER JOIN files g ON g.version = f.version AND g.name = f.name
-		WHERE g.name = ? AND g.local_flags & {{.FlagLocalGlobal}} != 0 AND f.device_idx != {{.LocalDeviceIdx}}
-		ORDER BY d.device_id
-	`).Select(&devStrs, file)
-	if errors.Is(err, sql.ErrNoRows) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, wrap(err)
-	}
-
-	devs := make([]protocol.DeviceID, 0, len(devStrs))
-	for _, s := range devStrs {
-		d, err := protocol.DeviceIDFromString(s)
-		if err != nil {
-			return nil, wrap(err)
-		}
-		devs = append(devs, d)
-	}
-
-	return devs, nil
-}
-
-func (s *folderDB) AllGlobalFiles() (iter.Seq[db.FileMetadata], func() error) {
-	it, errFn := iterStructs[db.FileMetadata](s.stmt(`
-		SELECT f.sequence, f.name, f.type, f.modified as modnanos, f.size, f.deleted, f.invalid, f.local_flags as localflags FROM files f
-		WHERE f.local_flags & {{.FlagLocalGlobal}} != 0
-		ORDER BY f.name
-	`).Queryx())
-	return itererr.Map(it, errFn, func(m db.FileMetadata) (db.FileMetadata, error) {
-		m.Name = osutil.NativeFilename(m.Name)
-		return m, nil
-	})
-}
-
-func (s *folderDB) AllGlobalFilesPrefix(prefix string) (iter.Seq[db.FileMetadata], func() error) {
-	if prefix == "" {
-		return s.AllGlobalFiles()
-	}
-
-	prefix = osutil.NormalizedFilename(prefix)
-	end := prefixEnd(prefix)
-
-	it, errFn := iterStructs[db.FileMetadata](s.stmt(`
-		SELECT f.sequence, f.name, f.type, f.modified as modnanos, f.size, f.deleted, f.invalid, f.local_flags as localflags FROM files f
-		WHERE f.name >= ? AND f.name < ? AND f.local_flags & {{.FlagLocalGlobal}} != 0
-		ORDER BY f.name
-	`).Queryx(prefix, end))
-	return itererr.Map(it, errFn, func(m db.FileMetadata) (db.FileMetadata, error) {
-		m.Name = osutil.NativeFilename(m.Name)
-		return m, nil
-	})
-}
-
-func (s *folderDB) AllNeededGlobalFiles(device protocol.DeviceID, order config.PullOrder, limit, offset int) (iter.Seq[protocol.FileInfo], func() error) {
-	var selectOpts string
-	switch order {
-	case config.PullOrderRandom:
-		selectOpts = "ORDER BY RANDOM()"
-	case config.PullOrderAlphabetic:
-		selectOpts = "ORDER BY g.name ASC"
-	case config.PullOrderSmallestFirst:
-		selectOpts = "ORDER BY g.size ASC"
-	case config.PullOrderLargestFirst:
-		selectOpts = "ORDER BY g.size DESC"
-	case config.PullOrderOldestFirst:
-		selectOpts = "ORDER BY g.modified ASC"
-	case config.PullOrderNewestFirst:
-		selectOpts = "ORDER BY g.modified DESC"
-	}
-
-	if limit > 0 {
-		selectOpts += fmt.Sprintf(" LIMIT %d", limit)
-	}
-	if offset > 0 {
-		selectOpts += fmt.Sprintf(" OFFSET %d", offset)
-	}
-
-	if device == protocol.LocalDeviceID {
-		return s.neededGlobalFilesLocal(selectOpts)
-	}
-
-	return s.neededGlobalFilesRemote(device, selectOpts)
-}
-
-func (s *folderDB) neededGlobalFilesLocal(selectOpts string) (iter.Seq[protocol.FileInfo], func() error) {
-	// Select all the non-ignored files with the need bit set.
-	it, errFn := iterStructs[indirectFI](s.stmt(`
-		SELECT fi.fiprotobuf, bl.blprotobuf, g.name, g.size, g.modified FROM fileinfos fi
-		INNER JOIN files g on fi.sequence = g.sequence
-		LEFT JOIN blocklists bl ON bl.blocklist_hash = g.blocklist_hash
-		WHERE g.local_flags & {{.FlagLocalIgnored}} = 0 AND g.local_flags & {{.FlagLocalNeeded}} != 0
-	` + selectOpts).Queryx())
-	return itererr.Map(it, errFn, indirectFI.FileInfo)
-}
-
-func (s *folderDB) neededGlobalFilesRemote(device protocol.DeviceID, selectOpts string) (iter.Seq[protocol.FileInfo], func() error) {
-	// Select:
-	//
-	// - all the valid, non-deleted global files that don't have a corresponding
-	//   remote file with the same version.
-	//
-	// - all the valid, deleted global files that have a corresponding non-deleted
-	//   remote file (of any version)
-
-	it, errFn := iterStructs[indirectFI](s.stmt(`
-		SELECT fi.fiprotobuf, bl.blprotobuf, g.name, g.size, g.modified FROM fileinfos fi
-		INNER JOIN files g on fi.sequence = g.sequence
-		LEFT JOIN blocklists bl ON bl.blocklist_hash = g.blocklist_hash
-		WHERE g.local_flags & {{.FlagLocalGlobal}} != 0 AND NOT g.deleted AND NOT g.invalid AND NOT EXISTS (
-			SELECT 1 FROM FILES f
-			INNER JOIN devices d ON d.idx = f.device_idx
-			WHERE f.name = g.name AND f.version = g.version AND d.device_id = ?
-		)
-
-		UNION ALL
-
-		SELECT fi.fiprotobuf, bl.blprotobuf, g.name, g.size, g.modified FROM fileinfos fi
-		INNER JOIN files g on fi.sequence = g.sequence
-		LEFT JOIN blocklists bl ON bl.blocklist_hash = g.blocklist_hash
-		WHERE g.local_flags & {{.FlagLocalGlobal}} != 0 AND g.deleted AND NOT g.invalid AND EXISTS (
-			SELECT 1 FROM FILES f
-			INNER JOIN devices d ON d.idx = f.device_idx
-			WHERE f.name = g.name AND d.device_id = ? AND NOT f.deleted
-		)
-	`+selectOpts).Queryx(
-		device.String(),
-		device.String(),
-	))
-	return itererr.Map(it, errFn, indirectFI.FileInfo)
-}

internal/db/sqlite/folderdb_indexid.go

@@ -1,151 +0,0 @@
-// Copyright (C) 2025 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package sqlite
-
-import (
-	"database/sql"
-	"encoding/hex"
-	"errors"
-	"fmt"
-
-	"github.com/syncthing/syncthing/internal/itererr"
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-func (s *folderDB) GetIndexID(device protocol.DeviceID) (protocol.IndexID, error) {
-	// Try a fast read-only query to begin with. If it does not find the ID
-	// we'll do the full thing under a lock.
-	var indexID string
-	if err := s.stmt(`
-		SELECT i.index_id FROM indexids i
-		INNER JOIN devices d ON d.idx  = i.device_idx
-		WHERE d.device_id = ?
-	`).Get(&indexID, device.String()); err == nil && indexID != "" {
-		idx, err := indexIDFromHex(indexID)
-		return idx, wrap(err, "select")
-	}
-	if device != protocol.LocalDeviceID {
-		// For non-local devices we do not create the index ID, so return
-		// zero anyway if we don't have one.
-		return 0, nil
-	}
-
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-
-	// We are now operating only for the local device ID
-
-	if err := s.stmt(`
-		SELECT index_id FROM indexids WHERE device_idx = {{.LocalDeviceIdx}}
-	`).Get(&indexID); err != nil && !errors.Is(err, sql.ErrNoRows) {
-		return 0, wrap(err, "select local")
-	}
-
-	if indexID == "" {
-		// Generate a new index ID. Some trickiness in the query as we need
-		// to find the max sequence of local files if there already exist
-		// any.
-		id := protocol.NewIndexID()
-		if _, err := s.stmt(`
-			INSERT INTO indexids (device_idx, index_id, sequence)
-				SELECT {{.LocalDeviceIdx}}, ?, COALESCE(MAX(sequence), 0) FROM files
-				WHERE device_idx = {{.LocalDeviceIdx}}
-			ON CONFLICT DO UPDATE SET index_id = ?
-		`).Exec(indexIDToHex(id), indexIDToHex(id)); err != nil {
-			return 0, wrap(err, "insert")
-		}
-		return id, nil
-	}
-
-	return indexIDFromHex(indexID)
-}
-
-func (s *folderDB) SetIndexID(device protocol.DeviceID, id protocol.IndexID) error {
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-
-	deviceIdx, err := s.deviceIdxLocked(device)
-	if err != nil {
-		return wrap(err, "device idx")
-	}
-
-	if _, err := s.stmt(`
-		INSERT OR REPLACE INTO indexids (device_idx, index_id, sequence) values (?, ?, 0)
-	`).Exec(deviceIdx, indexIDToHex(id)); err != nil {
-		return wrap(err, "insert")
-	}
-	return nil
-}
-
-func (s *folderDB) DropAllIndexIDs() error {
-	s.updateLock.Lock()
-	defer s.updateLock.Unlock()
-	_, err := s.stmt(`DELETE FROM indexids`).Exec()
-	return wrap(err)
-}
-
-func (s *folderDB) GetDeviceSequence(device protocol.DeviceID) (int64, error) {
-	var res sql.NullInt64
-	err := s.stmt(`
-		SELECT sequence FROM indexids i
-		INNER JOIN devices d ON d.idx = i.device_idx
-		WHERE d.device_id = ?
-	`).Get(&res, device.String())
-	if errors.Is(err, sql.ErrNoRows) {
-		return 0, nil
-	}
-	if err != nil {
-		return 0, wrap(err)
-	}
-	if !res.Valid {
-		return 0, nil
-	}
-	return res.Int64, nil
-}
-
-func (s *folderDB) RemoteSequences() (map[protocol.DeviceID]int64, error) {
-	type row struct {
-		Device string
-		Seq    int64
-	}
-
-	it, errFn := iterStructs[row](s.stmt(`
-		SELECT d.device_id AS device, i.sequence AS seq FROM indexids i
-		INNER JOIN devices d ON d.idx = i.device_idx
-		WHERE i.device_idx != {{.LocalDeviceIdx}}
-	`).Queryx())
-
-	res := make(map[protocol.DeviceID]int64)
-	for row, err := range itererr.Zip(it, errFn) {
-		if err != nil {
-			return nil, wrap(err)
-		}
-		dev, err := protocol.DeviceIDFromString(row.Device)
-		if err != nil {
-			return nil, wrap(err, "device ID")
-		}
-		res[dev] = row.Seq
-	}
-	return res, nil
-}
-
-func indexIDFromHex(s string) (protocol.IndexID, error) {
-	bs, err := hex.DecodeString(s)
-	if err != nil {
-		return 0, fmt.Errorf("indexIDFromHex: %q: %w", s, err)
-	}
-	var id protocol.IndexID
-	if err := id.Unmarshal(bs); err != nil {
-		return 0, fmt.Errorf("indexIDFromHex: %q: %w", s, err)
-	}
-	return id, nil
-}
-
-func indexIDToHex(i protocol.IndexID) string {
-	bs, _ := i.Marshal()
-	return hex.EncodeToString(bs)
-}