Translations update from Hosted Weblate (#4641)

* Translated using Weblate (Finnish)

Currently translated at 73.5% (835 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/fi/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (1136 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/sv/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1136 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/zh_Hans/

* Translated using Weblate (Czech)

Currently translated at 82.9% (942 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/cs/

* Translated using Weblate (Czech)

Currently translated at 90.4% (1027 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/cs/

* Translated using Weblate (Italian)

Currently translated at 78.7% (895 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/it/

* Translated using Weblate (Russian)

Currently translated at 100.0% (1136 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/ru/

* Translated using Weblate (Indonesian)

Currently translated at 43.7% (497 of 1136 strings)

Translation: stashapp/stash
Translate-URL: https://hosted.weblate.org/projects/stashapp/stash/id/

---------

Co-authored-by: gimmeliina <jarruraita@outlook.com>
Co-authored-by: alpacaserious <srhsgsef@gmail.com>
Co-authored-by: wql219 <wanqinglin219@hotmail.com>
Co-authored-by: Nymeria <Tractorb@seznam.cz>
Co-authored-by: its-josh4 <myselftdev@gmail.com>
Co-authored-by: Old gnome <orpgnome@users.noreply.hosted.weblate.org>
Co-authored-by: Tukimin Satrio <k797du3eh@mozmail.com>

.dockerignore

@@ -17,7 +17,7 @@
 
 # GraphQL generated output
 pkg/models/generated_*.go
-ui/v2.5/src/core/generated-*.tsx
+ui/v2.5/src/core/generated-graphql.ts
 
 ####
 # Jetbrains

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: stashapp
 # patreon: # Replace with a single Patreon username
 open_collective: stashapp
 # ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[Bug Report] Short Form Subject (50 Chars or less)"
-labels: help wanted
+labels: bug report
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[Feature] Short Form Title (50 chars or less.)"
-labels: enhancement
+labels: feature request
 assignees: ''
 
 ---

.github/workflows/build.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ develop, master ]
   pull_request:
-    branches: [ develop ]
   release:
     types: [ published ]
 
@@ -13,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:5
+  COMPILER_IMAGE: stashapp/compiler:8
 
 jobs:
   build:
@@ -28,7 +27,7 @@ jobs:
       run: docker pull $COMPILER_IMAGE
 
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-node_modules
       with:
@@ -36,7 +35,7 @@ jobs:
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
 
     - name: Cache UI build
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache-ui
       env:
         cache-name: cache-ui
@@ -45,17 +44,20 @@ jobs:
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
 
     - name: Cache go build
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
-        cache-name: cache-go-cache
+        # increment the number suffix to bump the cache
+        cache-name: cache-go-cache-1
       with:
         path: .go-cache
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('go.mod', '**/go.sum') }}
 
     - name: Start build container
+      env:
+        official-build: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event_name == 'release' && github.ref != 'refs/tags/latest_develop') }}
       run: |
         mkdir -p .go-cache
-        docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated -w /stash $COMPILER_IMAGE tail -f /dev/null
+        docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --env OFFICIAL_BUILD=${{ env.official-build }} -w /stash $COMPILER_IMAGE tail -f /dev/null
 
     - name: Pre-install
       run: docker exec -t build /bin/bash -c "make pre-ui"
@@ -66,17 +68,12 @@ jobs:
     - name: Validate UI
       # skip UI validation for pull requests if UI is unchanged
       if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
-      run: docker exec -t build /bin/bash -c "make validate-frontend"
+      run: docker exec -t build /bin/bash -c "make validate-ui"
 
     # Static validation happens in the linter workflow in parallel to this workflow
     # Run Dynamic validation here, to make sure we pass all the projects integration tests
-    #
-    # create UI file so that the embed doesn't fail
     - name: Test Backend
-      run: |
-        mkdir -p ui/v2.5/build
-        touch ui/v2.5/build/index.html
-        docker exec -t build /bin/bash -c "make it"
+      run: docker exec -t build /bin/bash -c "make it"
 
     - name: Build UI
       # skip UI build for pull requests if UI is unchanged (UI was cached)
@@ -87,13 +84,13 @@ jobs:
 
     - name: Compile for all supported platforms
       run: |
-        docker exec -t build /bin/bash -c "make cross-compile-windows"
-        docker exec -t build /bin/bash -c "make cross-compile-osx-intel"
-        docker exec -t build /bin/bash -c "make cross-compile-osx-applesilicon"
-        docker exec -t build /bin/bash -c "make cross-compile-linux"
-        docker exec -t build /bin/bash -c "make cross-compile-linux-arm64v8"
-        docker exec -t build /bin/bash -c "make cross-compile-linux-arm32v7"
-        docker exec -t build /bin/bash -c "make cross-compile-pi"
+        docker exec -t build /bin/bash -c "make build-cc-windows"
+        docker exec -t build /bin/bash -c "make build-cc-macos"
+        docker exec -t build /bin/bash -c "make build-cc-linux"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm64v8"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v7"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v6"
+        docker exec -t build /bin/bash -c "make build-cc-freebsd"
 
     - name: Cleanup build container
       run: docker rm -f -v build
@@ -101,7 +98,7 @@ jobs:
     - name: Generate checksums
       run: |
         git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-        sha1sum dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
+        sha1sum dist/Stash.app.zip dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
         echo "STASH_VERSION=$(git describe --tags --exclude latest_develop)" >> $GITHUB_ENV
         echo "RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
 
@@ -113,13 +110,13 @@ jobs:
         name: stash-win.exe
         path: dist/stash-win.exe
 
-    - name: Upload OSX binary
+    - name: Upload macOS binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
       uses: actions/upload-artifact@v2
       with:
-        name: stash-osx
-        path: dist/stash-osx
+        name: stash-macos
+        path: dist/stash-macos
 
     - name: Upload Linux binary
       # only upload binaries for pull requests
@@ -142,34 +139,38 @@ jobs:
         automatic_release_tag: latest_develop
         title: "${{ env.STASH_VERSION }}: Latest development build"
         files: |
-          dist/stash-osx
-          dist/stash-osx-applesilicon
+          dist/Stash.app.zip
+          dist/stash-macos
           dist/stash-win.exe
           dist/stash-linux
           dist/stash-linux-arm64v8
           dist/stash-linux-arm32v7
-          dist/stash-pi
+          dist/stash-linux-arm32v6
+          dist/stash-freebsd
           CHECKSUMS_SHA1
 
     - name: Master release
-      if: ${{ github.event_name == 'release' && github.ref != 'refs/tags/latest_develop' }}
-      uses: meeDamian/github-release@2.0
+      # NOTE: this isn't perfect, but should cover most scenarios
+      # DON'T create tag names starting with "v" if they are not stable releases
+      if: ${{ github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') }}
+      uses: WithoutPants/github-release@v2.0.4
       with:
         token: "${{ secrets.GITHUB_TOKEN }}"
         allow_override: true
         files: |
-          dist/stash-osx
-          dist/stash-osx-applesilicon
+          dist/Stash.app.zip
+          dist/stash-macos
           dist/stash-win.exe
           dist/stash-linux
           dist/stash-linux-arm64v8
           dist/stash-linux-arm32v7
-          dist/stash-pi
+          dist/stash-linux-arm32v6
+          dist/stash-freebsd
           CHECKSUMS_SHA1
         gzip: false
 
     - name: Development Docker
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
+      if: ${{ github.repository == 'stashapp/stash' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
       env:
         DOCKER_CLI_EXPERIMENTAL: enabled
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -183,7 +184,9 @@ jobs:
         bash ./docker/ci/x86_64/docker_push.sh development
 
     - name: Release Docker
-      if: ${{ github.event_name == 'release' && github.ref != 'refs/tags/latest_develop' }}
+      # NOTE: this isn't perfect, but should cover most scenarios
+      # DON'T create tag names starting with "v" if they are not stable releases
+      if: ${{ github.repository == 'stashapp/stash' && github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') }}
       env:
         DOCKER_CLI_EXPERIMENTAL: enabled
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/golangci-lint.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:5
+  COMPILER_IMAGE: stashapp/compiler:8
 
 jobs:
   golangci:
@@ -33,28 +33,35 @@ jobs:
         run: docker exec -t build /bin/bash -c "make generate-backend"
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.42.1
+          version: latest
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          args: --modules-download-mode=vendor --timeout=3m
+          #
+          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
+          # The location of the configuration file can be changed by using `--config=`
+          args: --timeout=5m
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 
-          # Optional: if set to true then the action will use pre-installed Go.
-          # skip-go-installation: true
+          # Optional: if set to true, then all caching functionality will be completely disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
 
-          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
           # skip-pkg-cache: true
 
-          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
           # skip-build-cache: true
 
+          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+          # install-mode: "goinstall"
+
       - name: Cleanup build container
         run: docker rm -f -v build

.gitignore

@@ -2,6 +2,9 @@
 # Go
 ####
 
+# Vendored dependencies
+vendor
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -16,12 +19,12 @@
 *.out
 
 # GraphQL generated output
-pkg/models/generated_*.go
-ui/v2.5/src/core/generated-*.tsx
+internal/api/generated_*.go
 
 ####
-# Jetbrains
+# Visual Studio
 ####
+/.vs
 
 # User-specific stuff
 .idea/**/workspace.xml
@@ -30,6 +33,7 @@ ui/v2.5/src/core/generated-*.tsx
 .idea/**/dictionaries
 .idea/**/shelf
 .vscode
+.devcontainer
 
 # Generated files
 .idea/**/contentModel.xml
@@ -43,9 +47,6 @@ ui/v2.5/src/core/generated-*.tsx
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
-# Goland Junk
-pkg/pkg
-
 ####
 # Random
 ####
@@ -54,6 +55,9 @@ node_modules
 
 *.db
 
-stash
+/stash
+/Stash.app
+/phasher
 dist
 .DS_Store
+/.local*

.golangci.yml

@@ -1,46 +1,49 @@
 # options for analysis running
 run:
-  timeout: 3m
-  modules-download-mode: vendor
+  timeout: 5m
 
 linters:
   disable-all: true
   enable:
     # Default set of linters from golangci-lint
-    - deadcode
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
     - unused
-    - varcheck
-    # Linters added by the stash project
-    # - bodyclose
+    # Linters added by the stash project.
+    # - contextcheck
     - dogsled
-    # - errorlint
+    - errchkjson
+    - errorlint
     # - exhaustive
     - exportloopref
-    # - goconst
-    # - gocritic
+    - gocritic
     # - goerr113
     - gofmt
-    # - gosec
+    # - gomnd
     # - ifshort
     - misspell
     # - nakedret
-    # - noctx
-    # - paralleltest
+    - noctx
     - revive
     - rowserrcheck
     - sqlclosecheck
 
+# Project-specific linter overrides
 linters-settings:
   gofmt:
     simplify: false
 
+  errorlint:
+    # Disable errorf because there are false positives, where you don't want to wrap
+    #  an error.
+    errorf: false
+    asserts: true
+    comparison: true
+
   revive:
     ignore-generated-header: true
     severity: error
@@ -79,4 +82,8 @@ linters-settings:
       - name: unused-parameter
         disabled: true
       - name: unreachable-code
-      - name: redefines-builtin-id
+      - name: redefines-builtin-id
+
+  rowserrcheck:
+    packages:
+      - github.com/jmoiron/sqlx

.goreleaser.yml

@@ -1,76 +0,0 @@
-project_name: stash
-before:
-  hooks:
-    - go mod download
-builds:
-  - binary: stash-win
-    ldflags:
-      - "-extldflags '-static'"
-    env:
-      - CGO_ENABLED=1
-      - CC=x86_64-w64-mingw32-gcc
-      - CXX=x86_64-w64-mingw32-g++
-    flags:
-      - -tags
-      - extended
-    goos:
-      - windows
-    goarch:
-      - amd64
-  - binary: stash-osx
-    env:
-      - CGO_ENABLED=1
-      - CC=o64-clang
-      - CXX=o64-clang++
-    flags:
-      - -tags
-      - extended
-    goos:
-      - darwin
-    goarch:
-      - amd64
-  - binary: stash-osx-applesilicon
-    env:
-      - CGO_ENABLED=1
-      - CC=oa64-clang
-      - CXX=oa64-clang++
-    flags:
-      - -tags
-      - extended
-    goos:
-      - darwin
-    goarch:
-      - arm64
-  - binary: stash-linux
-    env:
-      - CGO_ENABLED=1
-    flags:
-      - -tags
-      - extended
-    goos:
-      - linux
-    goarch:
-      - amd64
-archive:
-  format: tar.gz
-  format_overrides:
-    - goos: windows
-      format: zip
-  name_template: "{{.ProjectName}}_{{.Version}}_{{.Os}}-{{.Arch}}"
-  replacements:
-    amd64: 64bit
-    386: 32bit
-    arm: ARM
-    arm64: ARM64
-    darwin: macOS
-    linux: Linux
-    windows: Windows
-    openbsd: OpenBSD
-    netbsd: NetBSD
-    freebsd: FreeBSD
-    dragonfly: DragonFlyBSD
-  files:
-    - README.md
-    - LICENSE
-release:
-  draft: true

.gqlgenc.yml

@@ -1,13 +1,20 @@
 model:
+  package: graphql
   filename: ./pkg/scraper/stashbox/graphql/generated_models.go
 client:
+  package: graphql
   filename: ./pkg/scraper/stashbox/graphql/generated_client.go
 models:
   Date:
     model: github.com/99designs/gqlgen/graphql.String
+  SceneDraftInput:
+    model: github.com/stashapp/stash/pkg/scraper/stashbox/graphql.SceneDraftInput
 endpoint:
   # This points to stashdb.org currently, but can be directed at any stash-box 
   # instance. It is used for generation only.
   url: https://stashdb.org/graphql
 query:  
    - "./graphql/stash-box/*.graphql"
+generate:
+  clientV2: false
+  clientInterfaceName: "StashBoxGraphQLClient"

.mockery.yml

@@ -0,0 +1,4 @@
+dir: ./pkg/models
+name: ".*ReaderWriter"
+outpkg: mocks
+output: ./pkg/models/mocks

.travis.yml.disabled

@@ -1,117 +0,0 @@
-if: tag != latest_develop # dont build for the latest_develop tagged version
-
-dist: xenial
-git:
-  depth: false
-language: go
-go:
-- 1.17.x
-services:
-- docker
-before_install:
-  - set -e
-  # Configure environment so changes are picked up when the Docker daemon is restarted after upgrading
-  - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
-  - export DOCKER_CLI_EXPERIMENTAL=enabled
-  # Upgrade to Docker CE 19.03 for BuildKit support
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  # install binfmt docker container, this container uses qemu to run arm programs transparently allowng docker to build arm 6,7,8 containers.
-  - docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-  # Show info to simplify debugging and create a builder that can build the platforms we need
-  - docker info
-  - docker buildx create --name builder --use
-  - docker buildx inspect --bootstrap
-  - docker buildx ls
-
-install:
-- echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
-- nvm install 12
-- travis_retry make pre-ui
-- make generate
-- CI=false make ui-validate ui-only
-#- go get -v github.com/mgechev/revive
-script:
-# left lint off to avoid getting extra dependency
-#- make lint
-- make fmt-check vet it
-after_success:
-- docker pull stashapp/compiler:5
-- sh ./scripts/cross-compile.sh
-- git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-- sha1sum dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
-- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
-before_deploy:
-# push the latest tag when on the develop branch
-- if [ "$TRAVIS_BRANCH" = "develop" ]; then git tag -f latest_develop; git push -f --tags; fi
-- export RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')
-- export STASH_VERSION=$(git describe --tags --exclude latest_develop)
-# set TRAVIS_TAG explcitly to the version so that it doesn't pick up latest_develop
-- if [ "$TRAVIS_BRANCH" = "master" ]; then export TRAVIS_TAG=${STASH_VERSION}; fi
-deploy:
-  # latest develop release
-  - provider: releases
-    # use the v2 release provider for proper release note setting
-    edge: true
-    api_key:
-      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
-    file:
-      - dist/stash-osx
-      - dist/stash-osx-applesilicon
-      - dist/stash-win.exe
-      - dist/stash-linux
-      - dist/stash-linux-arm64v8
-      - dist/stash-linux-arm32v7
-      - dist/stash-pi
-      - CHECKSUMS_SHA1
-    skip_cleanup: true
-    overwrite: true
-    name: "${STASH_VERSION}: Latest development build"
-    release_notes: "**${RELEASE_DATE}**\n This is always the latest committed version on the develop branch. Use as your own risk!"
-    prerelease: true
-    on:
-      repo: stashapp/stash
-      branch: develop
-  # docker image build for develop release
-  - provider: script
-    skip_cleanup: true
-    script: bash ./docker/ci/x86_64/docker_push.sh development
-    on:
-      repo: stashapp/stash
-      branch: develop
-  # official master release - only build when tagged
-  - provider: releases
-    api_key:
-      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
-    file:
-      - dist/stash-osx
-      - dist/stash-osx-applesilicon
-      - dist/stash-win.exe
-      - dist/stash-linux
-      - dist/stash-linux-arm64v8
-      - dist/stash-linux-arm32v7
-      - dist/stash-pi
-      - CHECKSUMS_SHA1
-    # make the release a draft so the maintainers can confirm before releasing
-    draft: true
-    skip_cleanup: true
-    overwrite: true
-    # don't write the body. To be done manually for now. In future we might
-    # want to generate the changelog or get it from a file
-    name: ${STASH_VERSION}
-    on:
-      repo: stashapp/stash
-      tags: true
-      # make sure we don't release using the latest_develop tag
-      condition: $TRAVIS_TAG != latest_develop
-  # docker image build for master release
-  - provider: script
-    skip_cleanup: true
-    script: bash ./docker/ci/x86_64/docker_push.sh latest
-    on:
-      repo: stashapp/stash
-      tags: true
-      # make sure we don't release using the latest_develop tag
-      condition: $TRAVIS_TAG != latest_develop

Makefile

@@ -1,132 +1,294 @@
-IS_WIN =
+IS_WIN_SHELL =
 ifeq (${SHELL}, sh.exe)
-  IS_WIN = true
+  IS_WIN_SHELL = true
 endif
 ifeq (${SHELL}, cmd)
-  IS_WIN = true
+  IS_WIN_SHELL = true
 endif
 
-ifdef IS_WIN
-  SEPARATOR := &&
-  SET := set
+ifdef IS_WIN_SHELL
+  RM := del /s /q
+  RMDIR := rmdir /s /q
+  NOOP := @@
 else
-  SEPARATOR := ;
-  SET := export
+  RM := rm -f
+  RMDIR := rm -rf
+  NOOP := @:
 endif
 
 # set LDFLAGS environment variable to any extra ldflags required
-# set OUTPUT to generate a specific binary name
-
 LDFLAGS := $(LDFLAGS)
+
+# set OUTPUT environment variable to generate a specific binary name
+# this will apply to both `stash` and `phasher`, so build them separately
+# alternatively use STASH_OUTPUT or PHASHER_OUTPUT to set the value individually
 ifdef OUTPUT
-  OUTPUT := -o $(OUTPUT)
+  STASH_OUTPUT := $(OUTPUT)
+  PHASHER_OUTPUT := $(OUTPUT)
+endif
+ifdef STASH_OUTPUT
+  STASH_OUTPUT := -o $(STASH_OUTPUT)
+endif
+ifdef PHASHER_OUTPUT
+  PHASHER_OUTPUT := -o $(PHASHER_OUTPUT)
 endif
 
-export CGO_ENABLED = 1
+# set GO_BUILD_FLAGS environment variable to any extra build flags required
+GO_BUILD_FLAGS := $(GO_BUILD_FLAGS)
 
-.PHONY: release pre-build
+# set GO_BUILD_TAGS environment variable to any extra build tags required
+GO_BUILD_TAGS := $(GO_BUILD_TAGS)
+GO_BUILD_TAGS += sqlite_stat4 sqlite_math_functions
 
-release: generate ui build-release
+# set STASH_NOLEGACY environment variable or uncomment to disable legacy browser support
+# STASH_NOLEGACY := true
 
-pre-build:
+# set STASH_SOURCEMAPS environment variable or uncomment to enable UI sourcemaps
+# STASH_SOURCEMAPS := true
+
+export CGO_ENABLED := 1
+
+# define COMPILER_IMAGE for cross-compilation docker container
+ifndef COMPILER_IMAGE
+  COMPILER_IMAGE := stashapp/compiler:latest
+endif
+
+.PHONY: release
+release: pre-ui generate ui build-release
+
+# targets to set various build flags
+# use combinations on the make command-line to configure a build, e.g.:
+# for a static-pie release build: `make flags-static-pie flags-release stash`
+# for a static windows debug build: `make flags-static-windows stash`
+
+# $(NOOP) prevents "nothing to be done" warnings
+
+.PHONY: flags-release
+flags-release:
+	$(NOOP)
+	$(eval LDFLAGS += -s -w)
+	$(eval GO_BUILD_FLAGS += -trimpath)
+
+.PHONY: flags-pie
+flags-pie:
+	$(NOOP)
+	$(eval GO_BUILD_FLAGS += -buildmode=pie)
+
+.PHONY: flags-static
+flags-static:
+	$(NOOP)
+	$(eval LDFLAGS += -extldflags=-static)
+	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
+
+.PHONY: flags-static-pie
+flags-static-pie:
+	$(NOOP)
+	$(eval LDFLAGS += -extldflags=-static-pie)
+	$(eval GO_BUILD_FLAGS += -buildmode=pie)
+	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
+
+# identical to flags-static-pie, but excluding netgo, which is not needed on windows
+.PHONY: flags-static-windows
+flags-static-windows:
+	$(NOOP)
+	$(eval LDFLAGS += -extldflags=-static-pie)
+	$(eval GO_BUILD_FLAGS += -buildmode=pie)
+	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo)
+
+.PHONY: build-info
+build-info:
 ifndef BUILD_DATE
-	$(eval BUILD_DATE := $(shell go run -mod=vendor scripts/getDate.go))
+	$(eval BUILD_DATE := $(shell go run scripts/getDate.go))
 endif
-
 ifndef GITHASH
 	$(eval GITHASH := $(shell git rev-parse --short HEAD))
 endif
-
 ifndef STASH_VERSION
 	$(eval STASH_VERSION := $(shell git describe --tags --exclude latest_develop))
 endif
+ifndef OFFICIAL_BUILD
+	$(eval OFFICIAL_BUILD := false)
+endif
 
-build: pre-build
-	$(eval LDFLAGS := $(LDFLAGS) -X 'github.com/stashapp/stash/pkg/api.version=$(STASH_VERSION)' -X 'github.com/stashapp/stash/pkg/api.buildstamp=$(BUILD_DATE)' -X 'github.com/stashapp/stash/pkg/api.githash=$(GITHASH)')
-	go build $(OUTPUT) -mod=vendor -v -tags "sqlite_omit_load_extension osusergo netgo" $(GO_BUILD_FLAGS) -ldflags "$(LDFLAGS) $(EXTRA_LDFLAGS)"
+.PHONY: build-flags
+build-flags: build-info
+	$(eval BUILD_LDFLAGS := $(LDFLAGS))
+	$(eval BUILD_LDFLAGS += -X 'github.com/stashapp/stash/internal/build.buildstamp=$(BUILD_DATE)')
+	$(eval BUILD_LDFLAGS += -X 'github.com/stashapp/stash/internal/build.githash=$(GITHASH)')
+	$(eval BUILD_LDFLAGS += -X 'github.com/stashapp/stash/internal/build.version=$(STASH_VERSION)')
+	$(eval BUILD_LDFLAGS += -X 'github.com/stashapp/stash/internal/build.officialBuild=$(OFFICIAL_BUILD)')
+	$(eval BUILD_FLAGS := -v -tags "$(GO_BUILD_TAGS)" $(GO_BUILD_FLAGS) -ldflags "$(BUILD_LDFLAGS)")
 
-# strips debug symbols from the release build
-build-release: EXTRA_LDFLAGS := -s -w
-build-release: GO_BUILD_FLAGS := -trimpath
-build-release: build
+.PHONY: stash
+stash: build-flags
+	go build $(STASH_OUTPUT) $(BUILD_FLAGS) ./cmd/stash
 
-build-release-static: EXTRA_LDFLAGS := -extldflags=-static -s -w
-build-release-static: GO_BUILD_FLAGS := -trimpath
-build-release-static: build
+.PHONY: phasher
+phasher: build-flags
+	go build $(PHASHER_OUTPUT) $(BUILD_FLAGS) ./cmd/phasher
 
-# cross-compile- targets should be run within the compiler docker container
-cross-compile-windows: export GOOS := windows
-cross-compile-windows: export GOARCH := amd64
-cross-compile-windows: export CC := x86_64-w64-mingw32-gcc
-cross-compile-windows: export CXX := x86_64-w64-mingw32-g++
-cross-compile-windows: OUTPUT := -o dist/stash-win.exe
-cross-compile-windows: build-release-static
+# builds dynamically-linked debug binaries
+.PHONY: build
+build: stash phasher
 
-cross-compile-osx-intel: export GOOS := darwin
-cross-compile-osx-intel: export GOARCH := amd64
-cross-compile-osx-intel: export CC := o64-clang
-cross-compile-osx-intel: export CXX := o64-clang++
-cross-compile-osx-intel: OUTPUT := -o dist/stash-osx
-# can't use static build for OSX
-cross-compile-osx-intel: build-release
+# builds dynamically-linked PIE release binaries
+.PHONY: build-release
+build-release: flags-release flags-pie build
 
-cross-compile-osx-applesilicon: export GOOS := darwin
-cross-compile-osx-applesilicon: export GOARCH := arm64
-cross-compile-osx-applesilicon: export CC := oa64e-clang
-cross-compile-osx-applesilicon: export CXX := oa64e-clang++
-cross-compile-osx-applesilicon: OUTPUT := -o dist/stash-osx-applesilicon
-# can't use static build for OSX
-cross-compile-osx-applesilicon: build-release
+# compile and bundle into Stash.app
+# for when on macOS itself
+.PHONY: stash-macapp
+stash-macapp: STASH_OUTPUT := -o stash
+stash-macapp: flags-release flags-pie stash
+	rm -rf Stash.app
+	cp -R scripts/macos-bundle Stash.app
+	mkdir Stash.app/Contents/MacOS
+	cp stash Stash.app/Contents/MacOS/stash
 
-cross-compile-linux: export GOOS := linux
-cross-compile-linux: export GOARCH := amd64
-cross-compile-linux: OUTPUT := -o dist/stash-linux
-cross-compile-linux: build-release-static
+# build-cc- targets should be run within the compiler docker container
 
-cross-compile-linux-arm64v8: export GOOS := linux
-cross-compile-linux-arm64v8: export GOARCH := arm64
-cross-compile-linux-arm64v8: export CC := aarch64-linux-gnu-gcc
-cross-compile-linux-arm64v8: OUTPUT := -o dist/stash-linux-arm64v8
-cross-compile-linux-arm64v8: build-release-static
+.PHONY: build-cc-windows
+build-cc-windows: export GOOS := windows
+build-cc-windows: export GOARCH := amd64
+build-cc-windows: export CC := x86_64-w64-mingw32-gcc
+build-cc-windows: STASH_OUTPUT := -o dist/stash-win.exe
+build-cc-windows: PHASHER_OUTPUT :=-o dist/phasher-win.exe
+build-cc-windows: flags-release
+build-cc-windows: flags-static-windows
+build-cc-windows: build
 
-cross-compile-linux-arm32v7: export GOOS := linux
-cross-compile-linux-arm32v7: export GOARCH := arm
-cross-compile-linux-arm32v7: export GOARM := 7
-cross-compile-linux-arm32v7: export CC := arm-linux-gnueabihf-gcc
-cross-compile-linux-arm32v7: OUTPUT := -o dist/stash-linux-arm32v7
-cross-compile-linux-arm32v7: build-release-static
+.PHONY: build-cc-macos-intel
+build-cc-macos-intel: export GOOS := darwin
+build-cc-macos-intel: export GOARCH := amd64
+build-cc-macos-intel: export CC := o64-clang
+build-cc-macos-intel: STASH_OUTPUT := -o dist/stash-macos-intel
+build-cc-macos-intel: PHASHER_OUTPUT := -o dist/phasher-macos-intel
+build-cc-macos-intel: flags-release
+# can't use static build for macOS
+build-cc-macos-intel: flags-pie
+build-cc-macos-intel: build
 
-cross-compile-pi: export GOOS := linux
-cross-compile-pi: export GOARCH := arm
-cross-compile-pi: export GOARM := 6
-cross-compile-pi: export CC := arm-linux-gnueabi-gcc
-cross-compile-pi: OUTPUT := -o dist/stash-pi
-cross-compile-pi: build-release-static
+.PHONY: build-cc-macos-arm
+build-cc-macos-arm: export GOOS := darwin
+build-cc-macos-arm: export GOARCH := arm64
+build-cc-macos-arm: export CC := oa64e-clang
+build-cc-macos-arm: STASH_OUTPUT := -o dist/stash-macos-arm
+build-cc-macos-arm: PHASHER_OUTPUT := -o dist/phasher-macos-arm
+build-cc-macos-arm: flags-release
+# can't use static build for macOS
+build-cc-macos-arm: flags-pie
+build-cc-macos-arm: build
 
-cross-compile-all:
-	make cross-compile-windows
-	make cross-compile-osx-intel
-	make cross-compile-osx-applesilicon
-	make cross-compile-linux
-	make cross-compile-linux-arm64v8
-	make cross-compile-linux-arm32v7
-	make cross-compile-pi
+.PHONY: build-cc-macos
+build-cc-macos:
+	make build-cc-macos-arm
+	make build-cc-macos-intel
+
+	# Combine into universal binaries
+	lipo -create -output dist/stash-macos dist/stash-macos-intel dist/stash-macos-arm
+	rm dist/stash-macos-intel dist/stash-macos-arm
+	lipo -create -output dist/phasher-macos dist/phasher-macos-intel dist/phasher-macos-arm
+	rm dist/phasher-macos-intel dist/phasher-macos-arm
+
+	# Place into bundle and zip up
+	rm -rf dist/Stash.app
+	cp -R scripts/macos-bundle dist/Stash.app
+	mkdir dist/Stash.app/Contents/MacOS
+	cp dist/stash-macos dist/Stash.app/Contents/MacOS/stash
+	cd dist && rm -f Stash.app.zip && zip -r Stash.app.zip Stash.app
+	rm -rf dist/Stash.app
+
+.PHONY: build-cc-freebsd
+build-cc-freebsd: export GOOS := freebsd
+build-cc-freebsd: export GOARCH := amd64
+build-cc-freebsd: export CC := clang -target x86_64-unknown-freebsd12.0 --sysroot=/opt/cross-freebsd
+build-cc-freebsd: STASH_OUTPUT := -o dist/stash-freebsd
+build-cc-freebsd: PHASHER_OUTPUT := -o dist/phasher-freebsd
+build-cc-freebsd: flags-release
+build-cc-freebsd: flags-static-pie
+build-cc-freebsd: build
+
+.PHONY: build-cc-linux
+build-cc-linux: export GOOS := linux
+build-cc-linux: export GOARCH := amd64
+build-cc-linux: STASH_OUTPUT := -o dist/stash-linux
+build-cc-linux: PHASHER_OUTPUT := -o dist/phasher-linux
+build-cc-linux: flags-release
+build-cc-linux: flags-static-pie
+build-cc-linux: build
+
+.PHONY: build-cc-linux-arm64v8
+build-cc-linux-arm64v8: export GOOS := linux
+build-cc-linux-arm64v8: export GOARCH := arm64
+build-cc-linux-arm64v8: export CC := aarch64-linux-gnu-gcc
+build-cc-linux-arm64v8: STASH_OUTPUT := -o dist/stash-linux-arm64v8
+build-cc-linux-arm64v8: PHASHER_OUTPUT := -o dist/phasher-linux-arm64v8
+build-cc-linux-arm64v8: flags-release
+build-cc-linux-arm64v8: flags-static-pie
+build-cc-linux-arm64v8: build
+
+.PHONY: build-cc-linux-arm32v7
+build-cc-linux-arm32v7: export GOOS := linux
+build-cc-linux-arm32v7: export GOARCH := arm
+build-cc-linux-arm32v7: export GOARM := 7
+build-cc-linux-arm32v7: export CC := arm-linux-gnueabi-gcc -march=armv7-a
+build-cc-linux-arm32v7: STASH_OUTPUT := -o dist/stash-linux-arm32v7
+build-cc-linux-arm32v7: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v7
+build-cc-linux-arm32v7: flags-release
+build-cc-linux-arm32v7: flags-static
+build-cc-linux-arm32v7: build
+
+.PHONY: build-cc-linux-arm32v6
+build-cc-linux-arm32v6: export GOOS := linux
+build-cc-linux-arm32v6: export GOARCH := arm
+build-cc-linux-arm32v6: export GOARM := 6
+build-cc-linux-arm32v6: export CC := arm-linux-gnueabi-gcc
+build-cc-linux-arm32v6: STASH_OUTPUT := -o dist/stash-linux-arm32v6
+build-cc-linux-arm32v6: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v6
+build-cc-linux-arm32v6: flags-release
+build-cc-linux-arm32v6: flags-static
+build-cc-linux-arm32v6: build
+
+.PHONY: build-cc-all
+build-cc-all:
+	make build-cc-windows
+	make build-cc-macos
+	make build-cc-linux
+	make build-cc-linux-arm64v8
+	make build-cc-linux-arm32v7
+	make build-cc-linux-arm32v6
+	make build-cc-freebsd
+
+.PHONY: touch-ui
+touch-ui:
+ifdef IS_WIN_SHELL
+	@if not exist "ui\\v2.5\\build" mkdir ui\\v2.5\\build
+	@type nul >> ui/v2.5/build/index.html
+else
+	@mkdir -p ui/v2.5/build
+	@touch ui/v2.5/build/index.html
+endif
 
 # Regenerates GraphQL files
-generate: generate-backend generate-frontend
+.PHONY: generate
+generate: generate-backend generate-ui
 
-.PHONY: generate-frontend
-generate-frontend:
+.PHONY: generate-ui
+generate-ui:
 	cd ui/v2.5 && yarn run gqlgen
 
 .PHONY: generate-backend
-generate-backend:
-	go generate -mod=vendor
+generate-backend: touch-ui
+	go generate ./cmd/stash
+
+.PHONY: generate-dataloaders
+generate-dataloaders:
+	go generate ./internal/api/loaders
 
 # Regenerates stash-box client files
 .PHONY: generate-stash-box-client
 generate-stash-box-client:
-	go run -mod=vendor github.com/Yamashou/gqlgenc
+	go run github.com/Yamashou/gqlgenc
 
 # Runs gofmt -w on the project's source code, modifying any files that do not match its style.
 .PHONY: fmt
@@ -140,17 +302,34 @@ lint:
 # runs unit tests - excluding integration tests
 .PHONY: test
 test:
-	go test -mod=vendor ./...
+	go test ./...
 
 # runs all tests - including integration tests
 .PHONY: it
 it:
-	go test -mod=vendor -tags=integration ./...
+	go test -tags=integration ./...
 
 # generates test mocks
 .PHONY: generate-test-mocks
 generate-test-mocks:
-	go run -mod=vendor github.com/vektra/mockery/v2 --dir ./pkg/models --name '.*ReaderWriter' --outpkg mocks --output ./pkg/models/mocks
+	go run github.com/vektra/mockery/v2
+
+# runs server
+# sets the config file to use the local dev config
+.PHONY: server-start
+server-start: export STASH_CONFIG_FILE := config.yml
+server-start: build-flags
+ifdef IS_WIN_SHELL
+	@if not exist ".local" mkdir .local
+else
+	@mkdir -p .local
+endif
+	cd .local && go run $(BUILD_FLAGS) ../cmd/stash
+
+# removes local dev config files
+.PHONY: server-clean
+server-clean:
+	$(RMDIR) .local
 
 # installs UI dependencies. Run when first cloning repository, or if UI
 # dependencies have changed
@@ -158,42 +337,62 @@ generate-test-mocks:
 pre-ui:
 	cd ui/v2.5 && yarn install --frozen-lockfile
 
+.PHONY: ui-env
+ui-env: build-info
+	$(eval export VITE_APP_DATE := $(BUILD_DATE))
+	$(eval export VITE_APP_GITHASH := $(GITHASH))
+	$(eval export VITE_APP_STASH_VERSION := $(STASH_VERSION))
+ifdef STASH_NOLEGACY
+	$(eval export VITE_APP_NOLEGACY := true)
+endif
+ifdef STASH_SOURCEMAPS
+	$(eval export VITE_APP_SOURCEMAPS := true)
+endif
+
 .PHONY: ui
-ui: pre-build
-	$(SET) REACT_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
-	$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
-	$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
+ui: ui-env
 	cd ui/v2.5 && yarn build
 
 .PHONY: ui-start
-ui-start: pre-build
-	$(SET) REACT_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
-	$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
-	$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
-	cd ui/v2.5 && yarn start
+ui-start: ui-env
+	cd ui/v2.5 && yarn start --host
 
 .PHONY: fmt-ui
 fmt-ui:
 	cd ui/v2.5 && yarn format
 
-# runs tests and checks on the UI and builds it
-.PHONY: ui-validate
-ui-validate:
-	cd ui/v2.5 && yarn run validate
-
-# runs all of the tests and checks required for a PR to be accepted
-.PHONY: validate
-validate: validate-frontend validate-backend
-
 # runs all of the frontend PR-acceptance steps
-.PHONY: validate-frontend
-validate-frontend: ui-validate
+.PHONY: validate-ui
+validate-ui:
+	cd ui/v2.5 && yarn run validate
 
 # runs all of the backend PR-acceptance steps
 .PHONY: validate-backend
 validate-backend: lint it
 
+# runs all of the tests and checks required for a PR to be accepted
+.PHONY: validate
+validate: validate-ui validate-backend
+
 # locally builds and tags a 'stash/build' docker image
 .PHONY: docker-build
-docker-build:
-	docker build -t stash/build -f docker/build/x86_64/Dockerfile .
+docker-build: build-info
+	docker build --build-arg GITHASH=$(GITHASH) --build-arg STASH_VERSION=$(STASH_VERSION) -t stash/build -f docker/build/x86_64/Dockerfile .
+
+# locally builds and tags a 'stash/cuda-build' docker image
+.PHONY: docker-cuda-build
+docker-cuda-build: build-info
+	docker build --build-arg GITHASH=$(GITHASH) --build-arg STASH_VERSION=$(STASH_VERSION) -t stash/cuda-build -f docker/build/x86_64/Dockerfile-CUDA .
+
+# start the build container - for cross compilation
+# this is adapted from the github actions build.yml file
+.PHONY: start-compiler-container
+start-compiler-container:
+	docker run -d --name build --mount type=bind,source="$(PWD)",target=/stash,consistency=delegated $(EXTRA_CONTAINER_ARGS) -w /stash $(COMPILER_IMAGE) tail -f /dev/null
+
+# run the cross-compilation using
+# docker exec -t build /bin/bash -c "make build-cc-<platform>"
+
+.PHONY: remove-compiler-container
+remove-compiler-container:
+	docker rm -f -v build

README.md

@@ -1,157 +1,84 @@
 # Stash
 
+[![Build](https://github.com/stashapp/stash/actions/workflows/build.yml/badge.svg?branch=develop&event=push)](https://github.com/stashapp/stash/actions/workflows/build.yml)
+[![Docker pulls](https://img.shields.io/docker/pulls/stashapp/stash.svg)](https://hub.docker.com/r/stashapp/stash 'DockerHub')
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/stashapp?logo=github)](https://github.com/sponsors/stashapp)
+[![Open Collective backers](https://img.shields.io/opencollective/backers/stashapp?logo=opencollective)](https://opencollective.com/stashapp)
 [![Go Report Card](https://goreportcard.com/badge/github.com/stashapp/stash)](https://goreportcard.com/report/github.com/stashapp/stash)
+[![Matrix](https://img.shields.io/matrix/stashapp:unredacted.org?logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#stashapp:unredacted.org)
 [![Discord](https://img.shields.io/discord/559159668438728723.svg?logo=discord)](https://discord.gg/2TsNFKt)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/stashapp/stash?logo=github)](https://github.com/stashapp/stash/releases/latest)
+[![GitHub issues by-label](https://img.shields.io/github/issues-raw/stashapp/stash/bounty)](https://github.com/stashapp/stash/labels/bounty)
 
-https://stashapp.cc
+### **Stash is a self-hosted webapp written in Go which organizes and serves your porn.**
+![demo image](docs/readme_assets/demo_image.png)
 
-**Stash is a locally hosted web-based app written in Go which organizes and serves your porn.**
-
-* It can gather information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers.
-* It supports a wide variety of both video and image formats.
+* Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
+* Stash supports a wide variety of both video and image formats.
 * You can tag videos and find them later.
-* It provides statistics about performers, tags, studios and other things.
+* Stash provides statistics about performers, tags, studios and more.
 
 You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
 
-For further information you can [read the in-app manual](ui/v2.5/src/docs/en).
+For further information you can consult the [documentation](https://docs.stashapp.cc) or [read the in-app manual](ui/v2.5/src/docs/en).
 
-# Installing stash
+# Installing Stash
 
-## via Docker
+<img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
+:---:|:---:|:---:|:---:
+[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe)</sub></sup> | [Latest Release](https://github.com/stashapp/stash/releases/latest/download/Stash.app.zip) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/Stash.app.zip)</sub></sup> | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux) <br /> <sup><sub>[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)</sub></sup> <br /> [More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md) <br /> <sup><sub>[Sample docker-compose.yml](docker/production/docker-compose.yml)</sub></sup>
 
-Follow [this README.md in the docker directory.](docker/production/README.md)
+Download links for other platforms and architectures are available on the [Releases page](https://github.com/stashapp/stash/releases).
 
-## Pre-Compiled Binaries
+## First Run
 
-The Stash server runs on macOS, Windows, and Linux.  Download the [latest release here](https://github.com/stashapp/stash/releases).
+#### Windows/macOS Users: Security Prompt
 
-Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9999 to get started.
+On Windows or macOS, running the app might present a security prompt since the binary isn't yet signed. 
 
-*Note for Windows users:* Running the app might present a security prompt since the binary isn't yet signed.  Bypass this by clicking "more info" and then the "run anyway" button.
+On Windows, bypass this by clicking "more info" and then the "run anyway" button. On macOS, Control+Click the app, click "Open", and then "Open" again.
 
-#### FFMPEG
-
-If stash is unable to find or download FFMPEG then download it yourself from the link for your platform:
-
-* [macOS ffmpeg](https://evermeet.cx/ffmpeg/ffmpeg-4.3.1.zip), [macOS ffprobe](https://evermeet.cx/ffmpeg/ffprobe-4.3.1.zip)
-* [Windows](https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip)
-* [Linux](https://www.johnvansickle.com/ffmpeg/)
-
-The `ffmpeg(.exe)` and `ffprobe(.exe)` files should be placed in `~/.stash` on macOS / Linux or `C:\Users\YourUsername\.stash` on Windows.
+#### FFmpeg
+Stash requires FFmpeg. If you don't have it installed, Stash will download a copy for you. It is recommended that Linux users install `ffmpeg` from their distro's package manager.
 
 # Usage
 
 ## Quickstart Guide
-1) Download and install Stash and its dependencies
-2) Run Stash. It will prompt you for some configuration options and a directory to index (you can also do this step afterward)
-3) After configuration, launch your web browser and navigate to the URL shown within the Stash app.
+Stash is a web-based application. Once the application is running, the interface is available (by default) from http://localhost:9999.
 
-**Note that Stash does not currently retrieve and organize information about your entire library automatically.**  You will need to help it along through the use of [scrapers](blob/develop/ui/v2.5/src/docs/en/Scraping.md).  The Stash community has developed scrapers for many popular data sources which can be downloaded and installed from [this repository](https://github.com/stashapp/CommunityScrapers).
+On first run, Stash will prompt you for some configuration options and media directories to index, called "Scanning" in Stash. After scanning, your media will be available for browsing, curating, editing, and tagging.
 
-The simplest way to tag a large number of files is by using the [Tagger](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/docs/en/Tagger.md) which uses filename keywords to help identify the file and pull in scene and performer information from our stash-box database. Note that this data source is not comprehensive and you may need to use the scrapers to identify some of your media.
+Stash can pull metadata (performers, tags, descriptions, studios, and more) directly from many sites through the use of [scrapers](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en/Scraping.md), which integrate directly into Stash.
 
-## CLI
+Many community-maintained scrapers are available for download from [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers). The community also maintains StashDB, a crowd-sourced repository of scene, studio, and performer information, that can automatically identify much of a typical media collection. Inquire in the Discord for details. Identifying an entire collection will typically require a mix of multiple sources. 
 
-Stash runs as a command-line app and local web server.  There are some command-line options available, which you can see by running `stash --help`.
+<sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
 
-For example, to run stash locally on port 80 run it like this (OSX / Linux) `stash --host 127.0.0.1 --port 80`
+# Translation
+[![Translate](https://hosted.weblate.org/widget/stashapp/stash/svg-badge.svg)](https://hosted.weblate.org/engage/stashapp/)
+🇧🇷 🇨🇳 🇩🇰 🇳🇱 🇬🇧 🇪🇪 🇫🇮 🇫🇷 🇩🇪 🇮🇹 🇯🇵 🇰🇷 🇵🇱 🇷🇺 🇪🇸 🇸🇪 🇹🇼 🇹🇷
 
-## SSL (HTTPS)
+Stash is available in 25 languages (so far!) and it could be in your language too. We use Weblate to coordinate community translations. If you want to help us translate Stash into your language, you can make an account at [Stash's Weblate](https://hosted.weblate.org/projects/stashapp/stash/) to get started contributing new languages or improving existing ones. Thanks!
 
-Stash can run over HTTPS with some additional work.  First you must generate a SSL certificate and key combo.  Here is an example using openssl:
+# Support (FAQ)
 
-`openssl req -x509 -newkey rsa:4096 -sha256 -days 7300 -nodes -keyout stash.key -out stash.crt -extensions san -config <(echo "[req]"; echo distinguished_name=req; echo "[san]"; echo subjectAltName=DNS:stash.server,IP:127.0.0.1) -subj /CN=stash.server`
+Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software, questions, guides, add-ons and more. 
 
-This command would need customizing for your environment.  [This link](https://stackoverflow.com/questions/10175812/how-to-create-a-self-signed-certificate-with-openssl) might be useful.
-
-Once you have a certificate and key file name them `stash.crt` and `stash.key` and place them in the same directory as the `config.yml` file, or the `~/.stash` directory.  Stash detects these and starts up using HTTPS rather than HTTP.
-
-## Basepath rewriting
-
-The basepath defaults to `/`. When running stash via a reverse proxy in a subpath, the basepath can be changed by having the reverse proxy pass `X-Forwarded-Prefix` (and optionally `X-Forwarded-Port`) headers. When detects these headers, it alters the basepath URL of the UI.
+For more help you can:
+* Check the in-app documentation, in the top right corner of the app (it's also mirrored on [Stash-Docs](https://docs.stashapp.cc/in-app-manual))
+* Join the [Matrix space](https://matrix.to/#/#stashapp:unredacted.org)
+* Join the [Discord server](https://discord.gg/2TsNFKt), where the community can offer support.
+* Start a [discussion on GitHub](https://github.com/stashapp/stash/discussions)
 
 # Customization
 
 ## Themes and CSS Customization
-There is a [directory of community-created themes](https://github.com/stashapp/stash/wiki/Themes) on our Wiki, along with instructions on how to install them.
+There is a [directory of community-created themes](https://docs.stashapp.cc/user-interface-ui/themes) on Stash-Docs, along with instructions on how to install them.
 
-You can also make Stash interface fit your desired style with [Custom CSS snippets](https://github.com/stashapp/stash/wiki/Custom-CSS-snippets) and [CSS Tweaks](https://github.com/stashapp/stash/wiki/CSS-Tweaks).
+You can also change the Stash interface to fit your desired style with various snippets from [Custom CSS snippets](https://docs.stashapp.cc/user-interface-ui/custom-css-snippets).
 
-# Support (FAQ)
+# For Developers
 
-Answers to other Frequently Asked Questions can be found [on our Wiki](https://github.com/stashapp/stash/wiki/FAQ)
+Pull requests are welcome! 
 
-For issues not addressed there, there are a few options.
-
-* Read the [Wiki](https://github.com/stashapp/stash/wiki)
-* Check the in-app documentation (also available [here](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en)
-* Join the [Discord server](https://discord.gg/2TsNFKt), where the community can offer support.
-
-# Compiling From Source Code
-
-## Pre-requisites
-
-* [Go](https://golang.org/dl/)
-* [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
-  * To install, follow the [local installation instructions](https://golangci-lint.run/usage/install/#local-installation)
-* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
-  * Run `yarn install --frozen-lockfile` in the `stash/ui/v2.5` folder (before running make generate for first time).
-
-NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
-
-## Environment
-
-### macOS
-
-TODO
-
-### Windows
-
-1. Download and install [Go for Windows](https://golang.org/dl/)
-2. Download and install [MingW](https://sourceforge.net/projects/mingw-w64/)
-3. Search for "advanced system settings" and open the system properties dialog.
-    1. Click the `Environment Variables` button
-    2. Under system variables find the `Path`.  Edit and add `C:\Program Files\mingw-w64\*\mingw64\bin` (replace * with the correct path).
-
-NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
-
-## Commands
-
-* `make generate` - Generate Go and UI GraphQL files
-* `make build` - Builds the binary (make sure to build the UI as well... see below)
-* `make docker-build` - Locally builds and tags a complete 'stash/build' docker image
-* `make pre-ui` - Installs the UI dependencies. Only needs to be run once before building the UI for the first time, or if the dependencies are updated
-* `make fmt-ui` - Formats the UI source code
-* `make ui` - Builds the frontend
-* `make lint` - Run the linter on the backend
-* `make fmt` - Run `go fmt`
-* `make it` - Run the unit and integration tests
-* `make validate` - Run all of the tests and checks required to submit a PR
-* `make ui-start` - Runs the UI in development mode. Requires a running stash server to connect to. Stash port can be changed from the default of `9999` with environment variable `REACT_APP_PLATFORM_PORT`.
-
-## Building a release
-
-1. Run `make generate` to create generated files
-2. Run `make ui` to compile the frontend
-3. Run `make build` to build the executable for your current platform
-
-## Cross compiling
-
-This project uses a modification of the [CI-GoReleaser](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) docker container to create an environment
-where the app can be cross-compiled.  This process is kicked off by CI via the `scripts/cross-compile.sh` script.  Run the following
-command to open a bash shell to the container to poke around:
-
-`docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -i -t stashappdev/compiler:latest /bin/bash`
-
-## Profiling
-
-Stash can be profiled using the `--cpuprofile <output profile filename>` command line flag.
-
-The resulting file can then be used with pprof as follows:
-
-`go tool pprof <path to binary> <path to profile filename>`
-
-With `graphviz` installed and in the path, a call graph can be generated with:
-
-`go tool pprof -svg <path to binary> <path to profile filename> > <output svg file>`
+See [Development](docs/DEVELOPMENT.md) and [Contributing](docs/CONTRIBUTING.md) for information on working with the codebase, getting a local development setup, and contributing changes.

cmd/phasher/main.go

@@ -0,0 +1,82 @@
+// TODO: document in README.md
+package main
+
+import (
+	"fmt"
+	"os"
+
+	flag "github.com/spf13/pflag"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/hash/videophash"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func customUsage() {
+	fmt.Fprintf(os.Stderr, "Usage:\n")
+	fmt.Fprintf(os.Stderr, "%s [OPTIONS] VIDEOFILE...\n\nOptions:\n", os.Args[0])
+	flag.PrintDefaults()
+}
+
+func printPhash(ff *ffmpeg.FFMpeg, ffp ffmpeg.FFProbe, inputfile string, quiet *bool) error {
+	ffvideoFile, err := ffp.NewVideoFile(inputfile)
+	if err != nil {
+		return err
+	}
+
+	// All we need for videophash.Generate() is
+	// videoFile.Path (from BaseFile)
+	// videoFile.Duration
+	// The rest of the struct isn't needed.
+	vf := &models.VideoFile{
+		BaseFile: &models.BaseFile{Path: inputfile},
+		Duration: ffvideoFile.FileDuration,
+	}
+
+	phash, err := videophash.Generate(ff, vf)
+	if err != nil {
+		return err
+	}
+
+	if *quiet {
+		fmt.Printf("%x\n", *phash)
+	} else {
+		fmt.Printf("%x %v\n", *phash, vf.Path)
+	}
+	return nil
+}
+
+func main() {
+	flag.Usage = customUsage
+	quiet := flag.BoolP("quiet", "q", false, "print only the phash")
+	help := flag.BoolP("help", "h", false, "print this help output")
+	flag.Parse()
+
+	if *help {
+		flag.Usage()
+		os.Exit(2)
+	}
+
+	args := flag.Args()
+
+	if len(args) < 1 {
+		fmt.Fprintf(os.Stderr, "Missing VIDEOFILE argument.\n")
+		flag.Usage()
+		os.Exit(2)
+	}
+
+	if len(args) > 1 {
+		fmt.Fprintln(os.Stderr, "Files will be processed sequentially! If required, use e.g. GNU Parallel to run concurrently.")
+		fmt.Fprintf(os.Stderr, "Example: parallel %v ::: *.mp4\n", os.Args[0])
+	}
+
+	ffmpegPath, ffprobePath := ffmpeg.GetPaths(nil)
+	encoder := ffmpeg.NewEncoder(ffmpegPath)
+	// don't need to InitHWSupport, phashing doesn't use hw acceleration
+	ffprobe := ffmpeg.FFProbe(ffprobePath)
+
+	for _, item := range args {
+		if err := printPhash(encoder, ffprobe, item, quiet); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+		}
+	}
+}

cmd/stash/main.go

@@ -0,0 +1,155 @@
+//go:generate go run github.com/99designs/gqlgen
+package main
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"os"
+	"os/signal"
+	"runtime/debug"
+	"runtime/pprof"
+	"syscall"
+
+	"github.com/spf13/pflag"
+
+	"github.com/stashapp/stash/internal/api"
+	"github.com/stashapp/stash/internal/build"
+	"github.com/stashapp/stash/internal/desktop"
+	"github.com/stashapp/stash/internal/log"
+	"github.com/stashapp/stash/internal/manager"
+	"github.com/stashapp/stash/internal/manager/config"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/ui"
+
+	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
+	_ "github.com/golang-migrate/migrate/v4/source/file"
+)
+
+var exitCode = 0
+
+func main() {
+	defer func() {
+		if exitCode != 0 {
+			os.Exit(exitCode)
+		}
+	}()
+
+	defer recoverPanic()
+
+	helpFlag := false
+	pflag.BoolVarP(&helpFlag, "help", "h", false, "show this help text and exit")
+
+	versionFlag := false
+	pflag.BoolVarP(&versionFlag, "version", "v", false, "show version number and exit")
+
+	cpuProfilePath := ""
+	pflag.StringVar(&cpuProfilePath, "cpuprofile", "", "write cpu profile to file")
+
+	pflag.Parse()
+
+	if helpFlag {
+		pflag.Usage()
+		return
+	}
+
+	if versionFlag {
+		fmt.Println(build.VersionString())
+		return
+	}
+
+	cfg, err := config.Initialize()
+	if err != nil {
+		exitError(fmt.Errorf("config initialization error: %w", err))
+		return
+	}
+
+	l := initLog(cfg)
+
+	if cpuProfilePath != "" {
+		if err := initProfiling(cpuProfilePath); err != nil {
+			exitError(err)
+			return
+		}
+		defer pprof.StopCPUProfile()
+	}
+
+	mgr, err := manager.Initialize(cfg, l)
+	if err != nil {
+		exitError(fmt.Errorf("manager initialization error: %w", err))
+		return
+	}
+	defer mgr.Shutdown()
+
+	server, err := api.Initialize()
+	if err != nil {
+		exitError(fmt.Errorf("api initialization error: %w", err))
+		return
+	}
+	defer server.Shutdown()
+
+	exit := make(chan int)
+
+	go func() {
+		err := server.Start()
+		if !errors.Is(err, http.ErrServerClosed) {
+			exitError(fmt.Errorf("http server error: %w", err))
+			exit <- 1
+		}
+	}()
+
+	go handleSignals(exit)
+	desktop.Start(exit, &ui.FaviconProvider)
+
+	exitCode = <-exit
+}
+
+func initLog(cfg *config.Config) *log.Logger {
+	l := log.NewLogger()
+	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel())
+	logger.Logger = l
+
+	return l
+}
+
+func initProfiling(path string) error {
+	f, err := os.Create(path)
+	if err != nil {
+		return fmt.Errorf("unable to create CPU profile file: %v", err)
+	}
+
+	if err = pprof.StartCPUProfile(f); err != nil {
+		return fmt.Errorf("could not start CPU profiling: %v", err)
+	}
+
+	logger.Infof("profiling to %s", path)
+
+	return nil
+}
+
+func recoverPanic() {
+	if err := recover(); err != nil {
+		exitCode = 1
+		logger.Errorf("panic: %v\n%s", err, debug.Stack())
+		if desktop.IsDesktop() {
+			desktop.FatalError(fmt.Errorf("Panic: %v", err))
+		}
+	}
+}
+
+func exitError(err error) {
+	exitCode = 1
+	logger.Error(err)
+	if desktop.IsDesktop() {
+		desktop.FatalError(err)
+	}
+}
+
+func handleSignals(exit chan<- int) {
+	// handle signals
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
+
+	<-signals
+	exit <- 0
+}

docker/build/x86_64/Dockerfile

@@ -1,6 +1,4 @@
-# This dockerfile must be built from the top-level stash directory
-# ie from top-level stash:
-# docker build -t stash/build -f docker/build/x86_64/Dockerfile .
+# This dockerfile should be built with `make docker-build` from the stash root.
 
 # Build Frontend
 FROM node:alpine as frontend
@@ -8,36 +6,34 @@ RUN apk add --no-cache make git
 ## cache node_modules separately
 COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
 WORKDIR /stash
-RUN yarn --cwd ui/v2.5 install --frozen-lockfile.
 COPY Makefile /stash/
-COPY ./.git /stash/.git
 COPY ./graphql /stash/graphql/
 COPY ./ui /stash/ui/
-RUN make generate-frontend
+RUN make pre-ui
+RUN make generate-ui
+ARG GITHASH
+ARG STASH_VERSION
 RUN BUILD_DATE=$(date +"%Y-%m-%d %H:%M:%S") make ui
 
 # Build Backend
-FROM golang:1.17-alpine as backend
-RUN apk add --no-cache xz make alpine-sdk
-## install ffmpeg
-WORKDIR /
-RUN wget -O /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
-    tar xf /ffmpeg.tar.xz && \
-    rm ffmpeg.tar.xz && \
-    mv /ffmpeg*/ /ffmpeg/
+FROM golang:1.19-alpine as backend
+RUN apk add --no-cache make alpine-sdk
 WORKDIR /stash
 COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
 COPY ./scripts /stash/scripts/
-COPY ./vendor /stash/vendor/
 COPY ./pkg /stash/pkg/
+COPY ./cmd /stash/cmd
+COPY ./internal /stash/internal
 COPY --from=frontend /stash /stash/
 RUN make generate-backend
-RUN make build
+ARG GITHASH
+ARG STASH_VERSION
+RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM alpine:latest
-RUN apk add --no-cache ca-certificates vips-tools
-COPY --from=backend /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+RUN apk add --no-cache ca-certificates vips-tools ffmpeg
+COPY --from=backend /stash/stash /usr/bin/
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 EXPOSE 9999
-ENTRYPOINT ["stash"]
+ENTRYPOINT ["stash"]

docker/build/x86_64/Dockerfile-CUDA

@@ -0,0 +1,52 @@
+# This dockerfile should be built with `make docker-cuda-build` from the stash root.
+
+# Build Frontend
+FROM node:alpine as frontend
+RUN apk add --no-cache make git
+## cache node_modules separately
+COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+WORKDIR /stash
+COPY Makefile /stash/
+COPY ./graphql /stash/graphql/
+COPY ./ui /stash/ui/
+RUN make pre-ui
+RUN make generate-ui
+ARG GITHASH
+ARG STASH_VERSION
+RUN BUILD_DATE=$(date +"%Y-%m-%d %H:%M:%S") make ui
+
+# Build Backend
+FROM golang:1.19-bullseye as backend
+RUN apt update && apt install -y build-essential golang
+WORKDIR /stash
+COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
+COPY ./scripts /stash/scripts/
+COPY ./pkg /stash/pkg/
+COPY ./cmd /stash/cmd
+COPY ./internal /stash/internal
+COPY --from=frontend /stash /stash/
+RUN make generate-backend
+ARG GITHASH
+ARG STASH_VERSION
+RUN make flags-release flags-pie stash
+
+# Final Runnable Image
+FROM nvidia/cuda:12.0.1-base-ubuntu22.04
+RUN apt update && apt upgrade -y && apt install -y ca-certificates libvips-tools ffmpeg wget intel-media-va-driver-non-free vainfo
+RUN rm -rf /var/lib/apt/lists/*
+COPY --from=backend /stash/stash /usr/bin/
+
+# NVENC Patch
+RUN mkdir -p /usr/local/bin /patched-lib
+RUN wget https://raw.githubusercontent.com/keylase/nvidia-patch/master/patch.sh -O /usr/local/bin/patch.sh
+RUN wget https://raw.githubusercontent.com/keylase/nvidia-patch/master/docker-entrypoint.sh -O /usr/local/bin/docker-entrypoint.sh
+RUN chmod +x /usr/local/bin/patch.sh /usr/local/bin/docker-entrypoint.sh /usr/bin/stash
+
+ENV LANG C.UTF-8
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES=video,utility
+ENV STASH_CONFIG_FILE=/root/.stash/config.yml
+EXPOSE 9999
+ENTRYPOINT ["docker-entrypoint.sh", "stash"]
+
+# vim: ft=dockerfile

docker/build/x86_64/README.md

@@ -1,13 +1,13 @@
 # Introduction
 
-This dockerfile is used to build a stash docker container using the current source code.
+This dockerfile is used to build a stash docker container using the current source code. This is ideal for testing your current branch in docker. Note that it does not include python, so python-based scrapers will not work in this image. The production docker images distributed by the project contain python and the necessary packages.
 
 # Building the docker container
 
 From the top-level directory (should contain `main.go` file):
 
 ```
-docker build -t stash/build -f ./docker/build/x86_64/Dockerfile .
+make docker-build
 
 ```
 

docker/ci/x86_64/Dockerfile

@@ -1,22 +1,27 @@
-FROM --platform=$BUILDPLATFORM ubuntu:20.04  AS prep
+FROM --platform=$BUILDPLATFORM alpine:latest AS binary
 ARG TARGETPLATFORM
 WORKDIR /
 COPY stash-*  /
-RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-pi; \
+RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
     elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then BIN=stash-linux-arm32v7; \
     elif [ "$TARGETPLATFORM" = "linux/arm64" ];  then BIN=stash-linux-arm64v8; \
     elif [ "$TARGETPLATFORM" = "linux/amd64" ];  then BIN=stash-linux; \
     fi; \
     mv $BIN /stash
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && apt install -y python3 python-is-python3 python3-requests python3-requests-toolbelt python3-lxml python3-pip && pip3 install cloudscraper
-FROM ubuntu:20.04 as app
-run apt update && apt install -y python3 python-is-python3 python3-requests python3-requests-toolbelt python3-lxml python3-mechanicalsoup ffmpeg libvips-tools && rm -rf /var/lib/apt/lists/*
-COPY --from=prep /stash /usr/bin/
-COPY --from=prep /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages
 
+FROM --platform=$TARGETPLATFORM alpine:latest AS app
+COPY --from=binary /stash /usr/bin/
+
+# vips version 8.15.0-r0 breaks thumbnail generation on arm32v6
+# need to use 8.14.3-r0 from alpine 3.18 instead
+
+RUN apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev \
+    && apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata \
+    && apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.18/community vips=8.14.3-r0 vips-tools=8.14.3-r0 \
+    && pip install --user --break-system-packages mechanicalsoup cloudscraper bencoder.pyx \
+    && gem install faraday \
+    && apk del .build-deps
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
 EXPOSE 9999
 CMD ["stash"]
-

docker/ci/x86_64/README.md

@@ -1 +1 @@
-This dockerfile is used by travis to build the stash image. It must be run after cross-compiling - that is, `stash-linux` must exist in the `dist` directory. This image must be built from the `dist` directory.
+This Dockerfile is used by CI to build the `stashapp/stash` Docker image. It must be run after cross-compiling - that is, `stash-linux` must exist in the `dist` directory. This image must be built from the `dist` directory.

docker/ci/x86_64/docker_push.sh

@@ -10,5 +10,5 @@ done
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
 # must build the image from dist directory
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push $DOCKER_TAGS -f docker/ci/x86_64/Dockerfile dist/
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --push $DOCKER_TAGS -f docker/ci/x86_64/Dockerfile dist/
 

docker/compiler/Dockerfile

@@ -1,57 +1,83 @@
-FROM golang:1.17
+FROM golang:1.19
 
 LABEL maintainer="https://discord.gg/2TsNFKt"
 
-# Install tools
-RUN apt-get update && apt-get install -y apt-transport-https
-RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt-get update && apt-get install -y apt-transport-https ca-certificates gnupg
+
+RUN mkdir -p /etc/apt/keyrings
+
+ADD https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key nodesource.gpg.key
+RUN cat nodesource.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && rm nodesource.gpg.key
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
-# prevent caching of the key
 ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
-RUN cat yarn.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    rm yarn.gpg
+RUN cat yarn.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg && rm yarn.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 RUN apt-get update && \
-    apt-get install -y automake autogen cmake \
-    libtool libxml2-dev uuid-dev libssl-dev bash \
-    patch make tar xz-utils bzip2 gzip zlib1g-dev sed cpio \
-	gcc-10-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
-	gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
-    gcc-arm-linux-gnueabihf libc-dev-armhf-cross \
-    gcc-aarch64-linux-gnu libc-dev-arm64-cross \
-	nodejs yarn --no-install-recommends || exit 1; \
-	rm -rf /var/lib/apt/lists/*;
+    apt-get install -y --no-install-recommends \
+        git make tar bash nodejs yarn zip \
+        clang llvm-dev cmake patch libxml2-dev uuid-dev libssl-dev xz-utils \
+        bzip2 gzip sed cpio libbz2-dev zlib1g-dev \
+        gcc-mingw-w64 \
+        gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
+        gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
+    rm -rf /var/lib/apt/lists/*;
 
-# Cross compile setup
-ENV OSX_SDK_VERSION 	11.3
-ENV OSX_SDK_DOWNLOAD_FILE=MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
-ENV OSX_SDK_DOWNLOAD_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
-ENV OSX_SDK_SHA=cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4
-ENV OSX_SDK     		MacOSX$OSX_SDK_VERSION.sdk
-ENV OSX_NDK_X86 		/usr/local/osx-ndk-x86
+# FreeBSD cross-compilation setup
+# https://github.com/smartmontools/docker-build/blob/6b8c92560d17d325310ba02d9f5a4b250cb0764a/Dockerfile#L66
+ENV FREEBSD_VERSION       12.4
+ENV FREEBSD_DOWNLOAD_URL  http://ftp.plusline.de/FreeBSD/releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz
+ENV FREEBSD_SHA           581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8
 
-RUN  wget ${OSX_SDK_DOWNLOAD_URL}
-RUN  echo "$OSX_SDK_SHA $OSX_SDK_DOWNLOAD_FILE" | sha256sum -c - || exit 1; \
-     git clone https://github.com/tpoechtrager/osxcross.git; \
-     mv $OSX_SDK_DOWNLOAD_FILE osxcross/tarballs/
+RUN cd /tmp && \
+    curl -o base.txz $FREEBSD_DOWNLOAD_URL && \
+    echo "$FREEBSD_SHA base.txz" | sha256sum -c - && \
+    mkdir -p /opt/cross-freebsd && \
+    cd /opt/cross-freebsd && \
+    tar -xf /tmp/base.txz ./lib/ ./usr/lib/ ./usr/include/ && \
+    rm -f /tmp/base.txz && \
+    cd /opt/cross-freebsd/usr/lib && \
+    find . -xtype l | xargs ls -l | grep ' /lib/' | awk '{print "ln -sf /opt/cross-freebsd"$11 " " $9}' | /bin/sh && \
+    ln -s libc++.a libstdc++.a && \
+    ln -s libc++.so libstdc++.so
 
-RUN     UNATTENDED=yes SDK_VERSION=${OSX_SDK_VERSION} OSX_VERSION_MIN=10.10 osxcross/build.sh || exit 1;
-RUN     cp osxcross/target/lib/* /usr/lib/ ; \
-        mv osxcross/target $OSX_NDK_X86; \
-        rm -rf osxcross;
+# macOS cross-compilation setup
+ENV OSX_SDK_VERSION 	   11.3
+ENV OSX_SDK_DOWNLOAD_FILE  MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
+ENV OSX_SDK_DOWNLOAD_URL   https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
+ENV OSX_SDK_SHA            cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4
+ENV OSXCROSS_REVISION      5e1b71fcceb23952f3229995edca1b6231525b5b
+ENV OSXCROSS_DOWNLOAD_URL  https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REVISION}
+ENV OSXCROSS_SHA           d3f771bbc20612fea577b18a71be3af2eb5ad2dd44624196cf55de866d008647
 
-ENV PATH $OSX_NDK_X86/bin:$PATH
+RUN cd /tmp && \
+    curl -o osxcross.tar.gz $OSXCROSS_DOWNLOAD_URL && \
+    echo "$OSXCROSS_SHA osxcross.tar.gz" | sha256sum -c - && \
+    mkdir osxcross && \
+    tar --strip=1 -C osxcross -xf osxcross.tar.gz && \
+    rm -f osxcross.tar.gz && \
+    curl -Lo $OSX_SDK_DOWNLOAD_FILE $OSX_SDK_DOWNLOAD_URL && \
+    echo "$OSX_SDK_SHA $OSX_SDK_DOWNLOAD_FILE" | sha256sum -c - && \
+    mv $OSX_SDK_DOWNLOAD_FILE osxcross/tarballs/ && \
+    UNATTENDED=yes SDK_VERSION=$OSX_SDK_VERSION OSX_VERSION_MIN=10.10 osxcross/build.sh && \
+    cp osxcross/target/lib/* /usr/lib/ && \
+    mv osxcross/target /opt/osx-ndk-x86 && \
+    rm -rf /tmp/osxcross
 
-RUN mkdir -p /root/.ssh; \
-    chmod 0700 /root/.ssh; \
-    ssh-keyscan github.com > /root/.ssh/known_hosts;
+ENV PATH /opt/osx-ndk-x86/bin:$PATH
 
-# Notes for self:
-# Windows:
-# GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++  go build -ldflags "-extldflags '-static'" -tags extended
+RUN mkdir -p /root/.ssh && \
+    chmod 0700 /root/.ssh && \
+    ssh-keyscan github.com > /root/.ssh/known_hosts
 
+# ignore "dubious ownership" errors
+RUN git config --global safe.directory '*'
 
-# Darwin
-# CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build -tags extended
-# env goreleaser --config=goreleaser-extended.yml --skip-publish --skip-validate --rm-dist --release-notes=temp/0.48-relnotes-ready.md
+# To test locally:
+# make generate
+# make ui
+# cd docker/compiler
+# make build
+# docker run --rm -v /PATH_TO_STASH:/stash -w /stash -i -t stashapp/compiler:latest make build-cc-all
+# # binaries will show up in /dist

docker/compiler/Makefile

@@ -1,6 +1,6 @@
 user=stashapp
 repo=compiler
-version=5
+version=8
 
 latest:
 	docker build -t ${user}/${repo}:latest .

docker/compiler/README.md

@@ -1,5 +1,3 @@
 Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
 
-When the dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to docker hub. The `scripts/cross-compile.sh` script should also be updated to use the new version number tag, and `.travis.yml` needs to be updated to pull the correct image tag.
-
-A MacOS univeral binary can be created using `lipo -create -output stash-osx-universal stash-osx stash-osx-applesilicon`, available in the image.
+When the Dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to Docker Hub. The GitHub workflow files also need to be updated to pull the correct image tag.

docker/production/README.md

@@ -7,23 +7,13 @@ Only `docker` and `docker-compose` are required. For the most part your understa
 Installation instructions are available below, and if your distrobution's repository ships a current version of docker, you may use that.
 https://docs.docker.com/engine/install/
 
-### Docker
-Docker is effectively a cross-platform software package repository. It allows you to ship an entire environment in what's referred to as a container. Containers are intended to hold everything that is needed to run an application from one place to another, making it easy for everyone along the way to reproduce the environment.
-
-The StashApp docker container ships with everything you need to automatically build and run stash, including ffmpeg.
-
-### docker-compose
-Docker Compose lets you specify how and where to run your containers, and to manage their environment. The docker-compose.yml file in this folder gets you a fully working instance of StashApp exactly as you would need it to have a reasonable instance for testing / developing on. If you are deploying a live instance for production, a reverse proxy (such as NGINX or Traefik) is recommended, but not required.
-
-The latest version is always recommended.
-
 ### Get the docker-compose.yml file
 
-Now you can either navigate to the [docker-compose.yml](https://raw.githubusercontent.com/stashapp/stash/master/docker/production/docker-compose.yml) in the repository, or if you have curl, you can make your Linux console do it for you:
+Now you can either navigate to the [docker-compose.yml](https://raw.githubusercontent.com/stashapp/stash/develop/docker/production/docker-compose.yml) in the repository, or if you have curl, you can make your Linux console do it for you:
 
 ```
 mkdir stashapp && cd stashapp
-curl -o docker-compose.yml https://raw.githubusercontent.com/stashapp/stash/master/docker/production/docker-compose.yml
+curl -o docker-compose.yml https://raw.githubusercontent.com/stashapp/stash/develop/docker/production/docker-compose.yml
 ```
 
 Once you have that file where you want it, modify the settings as you please, and then run:
@@ -35,3 +25,13 @@ docker-compose up -d
 Installing StashApp this way will by default bind stash to port 9999. This is available in your web browser locally at http://localhost:9999 or on your network as http://YOUR-LOCAL-IP:9999
 
 Good luck and have fun!
+
+### Docker
+Docker is effectively a cross-platform software package repository. It allows you to ship an entire environment in what's referred to as a container. Containers are intended to hold everything that is needed to run an application from one place to another, making it easy for everyone along the way to reproduce the environment.
+
+The StashApp docker container ships with everything you need to automatically build and run stash, including ffmpeg.
+
+### docker-compose
+Docker Compose lets you specify how and where to run your containers, and to manage their environment. The docker-compose.yml file in this folder gets you a fully working instance of StashApp exactly as you would need it to have a reasonable instance for testing / developing on. If you are deploying a live instance for production, a reverse proxy (such as NGINX or Traefik) is recommended, but not required.
+
+The latest version is always recommended.

docker/production/docker-compose.yml

@@ -36,5 +36,7 @@ services:
       - ./metadata:/metadata
       ## Any other cache content.
       - ./cache:/cache
+      ## Where to store binary blob data (scene covers, images)
+      - ./blobs:/blobs
       ## Where to store generated content (screenshots,previews,transcodes,sprites)
       - ./generated:/generated

docker/production/x86_64/Dockerfile

@@ -1,27 +0,0 @@
-FROM ubuntu:20.04 as prep
-LABEL MAINTAINER="https://discord.gg/2TsNFKt"
-
-RUN apt-get update && \
-    apt-get -y install curl xz-utils && \
-    apt-get autoclean -y && \
-    rm -rf /var/lib/apt/lists/*
-WORKDIR /
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# added " to end of stash-linux clause so that it doesn't pick up the arm builds
-RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases/latest | awk '/browser_download_url/ && /stash-linux/"' | sed -e 's/.*: "\(.*\)"/\1/') && \
-    chmod +x /stash
-    
-RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
-    tar xf /ffmpeg.tar.xz && \
-    rm ffmpeg.tar.xz && \
-    mv /ffmpeg*/ /ffmpeg/
-
-FROM ubuntu:20.04 as app
-RUN apt-get update && apt-get -y install ca-certificates
-COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
-
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-
-EXPOSE 9999
-CMD ["stash"]

docs/DEVELOPMENT.md

@@ -0,0 +1,144 @@
+# Building from Source
+
+## Pre-requisites
+
+* [Go](https://golang.org/dl/)
+* [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
+  * To install, follow the [local installation instructions](https://golangci-lint.run/usage/install/#local-installation)
+* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
+
+## Environment
+
+### Windows
+
+1. Download and install [Go for Windows](https://golang.org/dl/)
+2. Download and extract [MinGW64](https://sourceforge.net/projects/mingw-w64/files/) (scroll down and select x86_64-posix-seh, don't use the autoinstaller, it doesn't work)
+3. Search for "Advanced System Settings" and open the System Properties dialog.
+    1. Click the `Environment Variables` button
+    2. Under System Variables find `Path`. Edit and add `C:\MinGW\bin` (replace with the correct path to where you extracted MingW64).
+
+NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For example, `make pre-ui` will be `mingw32-make pre-ui`.
+
+### macOS
+
+1. If you don't have it already, install the [Homebrew package manager](https://brew.sh).
+2. Install dependencies: `brew install go git yarn gcc make node ffmpeg`
+
+### Linux
+
+#### Arch Linux
+
+1. Install dependencies: `sudo pacman -S go git yarn gcc make nodejs ffmpeg --needed`
+
+#### Ubuntu
+
+1. Install dependencies: `sudo apt-get install golang git yarnpkg gcc nodejs ffmpeg -y`
+
+### OpenBSD
+
+1. Install dependencies `doas pkg_add gmake go git yarn node cmake`
+2. Compile a custom ffmpeg from ports. The default ffmpeg in OpenBSD's packages is not compiled with WebP support, which is required by Stash.
+   - If you've already installed ffmpeg, uninstall it: `doas pkg_delete ffmpeg`
+   - If you haven't already, [fetch the ports tree and verify](https://www.openbsd.org/faq/ports/ports.html#PortsFetch).
+   - Find the ffmpeg port in `/usr/ports/graphics/ffmpeg`, and patch the Makefile to include libwebp
+     - Add `webp` to `WANTLIB`
+     - Add `graphics/libwebp` to the list in `LIB_DEPENDS`
+     - Add `-lwebp -lwebpdecoder -lwebpdemux -lwebpmux` to `LIBavcodec_EXTRALIBS`
+     - Add `--enable-libweb` to the list in `CONFIGURE_ARGS`
+     - If you've already built ffmpeg from ports before, you may need to also increment `REVISION`
+     - Run `doas make install`
+   - Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
+
+NOTE: The `make` command in OpenBSD will be `gmake`. For example, `make pre-ui` will be `gmake pre-ui`.
+
+## Commands
+
+* `make pre-ui` - Installs the UI dependencies. This only needs to be run once after cloning the repository, or if the dependencies are updated.
+* `make generate` - Generates Go and UI GraphQL files. Requires `make pre-ui` to have been run.
+* `make generate-stash-box-client` - Generate Go files for the Stash-box client code.
+* `make ui` - Builds the UI. Requires `make pre-ui` to have been run.
+* `make stash` - Builds the `stash` binary (make sure to build the UI as well... see below)
+* `make stash-macapp` - Builds the `Stash.app` macOS app (only works when on macOS, for cross-compilation see below)
+* `make phasher` - Builds the `phasher` binary
+* `make build` - Builds both the `stash` and `phasher` binaries, alias for `make stash phasher`
+* `make build-release` - Builds release versions (debug information removed) of both the `stash` and `phasher` binaries, alias for `make flags-release flags-pie build`
+* `make docker-build` - Locally builds and tags a complete 'stash/build' docker image
+* `make docker-cuda-build` - Locally builds and tags a complete 'stash/cuda-build' docker image
+* `make validate` - Runs all of the tests and checks required to submit a PR
+* `make lint` - Runs `golangci-lint` on the backend
+* `make it` - Runs all unit and integration tests
+* `make fmt` - Formats the Go source code
+* `make fmt-ui` - Formats the UI source code
+* `make server-start` - Runs a development stash server in the `.local` directory
+* `make server-clean` - Removes the `.local` directory and all of its contents
+* `make ui-start` - Runs the UI in development mode. Requires a running Stash server to connect to - the server URL can be changed from the default of `http://localhost:9999` using the environment variable `VITE_APP_PLATFORM_URL`, but keep in mind that authentication cannot be used since the session authorization cookie cannot be sent cross-origin. The UI runs on port `3000` or the next available port.
+
+When building, you can optionally prepend `flags-*` targets to the target list in your `make` command to use different build flags:
+
+* `flags-release` (e.g. `make flags-release stash`) - Remove debug information from the binary.
+* `flags-pie` (e.g. `make flags-pie build`) - Build a PIE (Position Independent Executable) binary. This provides increased security, but it is unsupported on some systems (notably 32-bit ARM and OpenBSD).
+* `flags-static` (e.g. `make flags-static phasher`) - Build a statically linked binary (the default is a dynamically linked binary).
+* `flags-static-pie` (e.g. `make flags-static-pie stash`) - Build a statically linked PIE binary (using `flags-static` and `flags-pie` separately will not work).
+* `flags-static-windows` (e.g. `make flags-static-windows build`) - Identical to `flags-static-pie`, but does not enable the `netgo` build tag, which is not needed for static builds on Windows.
+
+## Local development quickstart
+
+1. Run `make pre-ui` to install UI dependencies
+2. Run `make generate` to create generated files
+3. In one terminal, run `make server-start` to run the server code
+4. In a separate terminal, run `make ui-start` to run the UI in development mode
+5. Open the UI in a browser: `http://localhost:3000/`
+
+Changes to the UI code can be seen by reloading the browser page.
+
+Changes to the backend code require a server restart (`CTRL-C` in the server terminal, followed by `make server-start` again) to be seen.
+
+On first launch:
+
+1. On the "Stash Setup Wizard" screen, choose a directory with some files to test with
+2. Press "Next" to use the default locations for the database and generated content
+3. Press the "Confirm" and "Finish" buttons to get into the UI
+4. On the side menu, navigate to "Tasks -> Library -> Scan" and press the "Scan" button
+5. You're all set! Set any other configurations you'd like and test your code changes.
+
+To start fresh with new configuration:
+
+1. Stop the server (`CTRL-C` in the server terminal)
+2. Run `make server-clean` to clear all config, database, and generated files (under `.local`)
+3. Run `make server-start` to restart the server
+4. Follow the "On first launch" steps above
+
+## Building a release
+
+Simply run `make` or `make release`, or equivalently:
+
+1. Run `make pre-ui` to install UI dependencies
+2. Run `make generate` to create generated files
+3. Run `make ui` to build the frontend
+4. Run `make build-release` to build a release executable for your current platform
+
+## Cross-compiling
+
+This project uses a modification of the [CI-GoReleaser](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) Docker container for cross-compilation, defined in `docker/compiler/Dockerfile`.
+
+To cross-compile the app yourself:
+
+1. Run `make pre-ui`, `make generate` and `make ui` outside the container, to generate files and build the UI.
+2. Pull the latest compiler image from Docker Hub: `docker pull stashapp/compiler`
+3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it stashapp/compiler /bin/bash` to open a shell inside the container.
+4. From inside the container, run `make build-cc-all` to build for all platforms, or run `make build-cc-{platform}` to build for a specific platform (have a look at the `Makefile` for the list of targets).
+5. You will find the compiled binaries in `dist/`.
+
+NOTE: Since the container is run as UID 0 (root), the resulting binaries (and the `dist/` folder itself, if it had to be created) will be owned by root.
+
+## Profiling
+
+Stash can be profiled using the `--cpuprofile <output profile filename>` command line flag.
+
+The resulting file can then be used with pprof as follows:
+
+`go tool pprof <path to binary> <path to profile filename>`
+
+With `graphviz` installed and in the path, a call graph can be generated with:
+
+`go tool pprof -svg <path to binary> <path to profile filename> > <output svg file>`

docs/readme_assets/docker_logo.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="185px" viewBox="0 0 256 185" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M250.715745,70.4971666 C244.951102,66.4973277 231.740464,64.997388 221.412146,66.9973071 C220.211179,56.9977092 214.68673,48.2480609 205.078993,40.4983724 L199.554544,36.4985331 L195.711449,42.248302 C190.90758,49.7480006 188.505646,60.2475786 189.226226,70.2471769 C189.46642,73.7470364 190.667387,79.9967847 194.270289,85.496564 C190.90758,87.4964838 183.941971,89.996383 174.814621,89.996383 L1.15476998,89.996383 L0.674383104,91.9963028 C-1.00697093,101.9959 -1.00697093,133.244645 18.6888904,157.243681 C33.5808831,175.492947 55.6786788,184.742575 84.7420842,184.742575 C147.672763,184.742575 194.270289,154.493791 216.127891,99.7459909 C224.774854,99.9959813 243.269748,99.7459909 252.637292,80.996745 C252.877486,80.4967649 253.357872,79.4968046 255.039227,75.7469554 L256,73.7470364 L250.715745,70.4971666 L250.715745,70.4971666 Z M139.986573,0 L113.565295,0 L113.565295,24.9989952 L139.986573,24.9989952 L139.986573,0 L139.986573,0 Z M139.986573,29.9987943 L113.565295,29.9987943 L113.565295,54.9977896 L139.986573,54.9977896 L139.986573,29.9987943 L139.986573,29.9987943 Z M108.761427,29.9987943 L82.3401495,29.9987943 L82.3401495,54.9977896 L108.761427,54.9977896 L108.761427,29.9987943 L108.761427,29.9987943 Z M77.5362814,29.9987943 L51.1150037,29.9987943 L51.1150037,54.9977896 L77.5362814,54.9977896 L77.5362814,29.9987943 L77.5362814,29.9987943 Z M46.311135,59.9975886 L19.8898576,59.9975886 L19.8898576,84.9965839 L46.311135,84.9965839 L46.311135,59.9975886 L46.311135,59.9975886 Z M77.5362814,59.9975886 L51.1150037,59.9975886 L51.1150037,84.9965839 L77.5362814,84.9965839 L77.5362814,59.9975886 L77.5362814,59.9975886 Z M108.761427,59.9975886 L82.3401495,59.9975886 L82.3401495,84.9965839 L108.761427,84.9965839 L108.761427,59.9975886 L108.761427,59.9975886 Z M139.986573,59.9975886 L113.565295,59.9975886 L113.565295,84.9965839 L139.986573,84.9965839 L139.986573,59.9975886 L139.986573,59.9975886 Z M171.211719,59.9975886 L144.790441,59.9975886 L144.790441,84.9965839 L171.211719,84.9965839 L171.211719,59.9975886 L171.211719,59.9975886 Z" fill="#2396ED" fill-rule="nonzero"/>
+    </g>
+</svg>

docs/readme_assets/linux_logo.svg

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="295px" viewBox="0 0 256 295" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <defs>
+        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="6.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+        </filter>
+        <linearGradient x1="48.5477412%" y1="115.276174%" x2="51.0473804%" y2="41.3637237%" id="linearGradient-2">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="54.4065463%" y1="2.40410545%" x2="46.1753957%" y2="90.5422349%" id="linearGradient-3">
+            <stop stop-color="#FFFFFF" stop-opacity="0.8" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="51.859653%" y1="88.2477484%" x2="47.9469396%" y2="9.74782136%" id="linearGradient-4">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9251097%" y1="85.4900173%" x2="49.9236843%" y2="13.8109272%" id="linearGradient-5">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.9014071%" y1="3.10177585%" x2="45.9555354%" y2="93.8949571%" id="linearGradient-6">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="45.5928761%" y1="5.47459052%" x2="54.811359%" y2="93.5235162%" id="linearGradient-7">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9844987%" y1="89.8452442%" x2="49.9844987%" y2="40.6316864%" id="linearGradient-8">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.5047131%" y1="99.97524%" x2="42.7455968%" y2="23.5451715%" id="linearGradient-9">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8413363%" y1="13.2289558%" x2="50.2412612%" y2="94.6729694%" id="linearGradient-10">
+            <stop stop-color="#FFFFFF" stop-opacity="0.8" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9272298%" y1="37.3270337%" x2="50.7270446%" y2="92.7824735%" id="linearGradient-11">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8755597%" y1="2.29900584%" x2="49.8755597%" y2="81.203617%" id="linearGradient-12">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8334391%" y1="2.27189065%" x2="49.8240398%" y2="71.7989617%" id="linearGradient-13">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.4670683%" y1="48.9213861%" x2="38.9488708%" y2="98.0999776%" id="linearGradient-14">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="52.3731508%" y1="143.008909%" x2="47.57909%" y2="-64.6215389%" id="linearGradient-15">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="30.580815%" y1="34.0241079%" x2="65.8867024%" y2="89.175349%" id="linearGradient-16">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="59.5715091%" y1="-17.2155207%" x2="48.3608522%" y2="66.1184465%" id="linearGradient-17">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="47.7689553%" y1="1.56481301%" x2="51.3733028%" y2="104.312856%" id="linearGradient-18">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="43.5495626%" y1="4.5334861%" x2="57.1143288%" y2="92.8267174%" id="linearGradient-19">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.7328042%" y1="17.6085216%" x2="50.5582487%" y2="99.3854667%" id="linearGradient-20">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.1697217%" y1="2.89048531%" x2="49.6802359%" y2="94.1704279%" id="linearGradient-21">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g fill="none">
+        <g transform="translate(10.000000, 0.000000)">
+            <path d="M235.125423,249.358628 C235.125423,266.714271 182.507524,280.855905 117.584567,280.855905 C52.6616093,280.855905 0.0437105058,266.806099 0.0437105058,249.358628 L0.0437105058,249.358628 C0.0437105058,232.002986 52.6616093,217.861352 117.584567,217.861352 C182.507524,217.861352 235.033594,232.002986 235.125423,249.358628 L235.125423,249.358628 L235.125423,249.358628 Z" fill="#000" fill-opacity="0.2" filter="url(#filter-1)"></path>
+            <path d="M53.2125821,215.473804 C41.8258117,199.128278 39.6219206,145.867578 66.160442,113.084699 C79.2919595,97.3819748 82.6896249,86.4543483 83.6997416,71.6699125 C84.434372,54.8652433 71.8538272,4.81855066 119.237485,1.05357012 C167.263944,-2.80323922 164.600909,44.5804184 164.325423,69.6496791 C164.141765,90.7703016 179.844489,102.799874 190.680286,119.329056 C210.607135,149.632558 208.954216,201.791313 186.915306,230.074582 C158.999353,265.428667 135.123866,250.093259 119.237485,251.378862 C89.4849556,253.123609 88.4748389,268.918162 53.2125821,215.473804 L53.2125821,215.473804 Z" fill="#000000"></path>
+            <path d="M169.10052,122.451235 C177.365111,130.073025 198.76122,164.141508 164.876395,185.445788 C152.938652,192.88392 175.528535,221.167189 186.364333,207.484699 C205.556551,182.874582 193.343321,143.571858 181.772893,129.522053 C174.059275,119.604543 162.121532,115.747734 169.10052,122.451235 L169.10052,122.451235 Z" fill="url(#linearGradient-2)"></path>
+            <path d="M166.8048,117.859796 C180.395461,128.879251 205.097407,167.447344 169.008691,192.608434 C157.162777,200.413881 179.477174,225.115827 192.057718,212.535282 C235.676395,168.641119 190.955773,118.227111 175.528535,100.871469 C161.754216,85.719718 149.540987,104.360963 166.8048,117.859796 L166.8048,117.859796 Z" stroke="#000000" stroke-width="0.9773" fill="#000000"></path>
+            <path d="M147.245267,25.0208853 C146.786123,37.60143 132.919975,48.5290565 116.298963,49.5391732 C99.6779518,50.54929 86.638263,40.9990954 87.097407,28.4185507 L87.097407,28.4185507 C87.556551,15.8380059 101.422699,4.91037946 118.043711,3.90026272 C134.664722,2.98197479 147.704411,12.4403405 147.245267,25.0208853 L147.245267,25.0208853 L147.245267,25.0208853 Z" fill="url(#linearGradient-3)"></path>
+            <path d="M107.483399,54.9570721 C107.942543,63.1298347 104.085734,70.0169942 98.7596638,70.2924806 C93.4335938,70.567967 88.7503253,64.2317802 88.2911813,56.0590176 L88.2911813,56.0590176 C87.8320374,47.8862549 91.6888467,40.9990954 97.0149167,40.723609 C102.340987,40.4481226 107.024255,46.7843094 107.483399,54.9570721 L107.483399,54.9570721 L107.483399,54.9570721 Z" fill="url(#linearGradient-4)"></path>
+            <path d="M117.125423,55.5998736 C117.30908,65.0582394 123.461609,72.5882005 130.807913,72.4045429 C138.154216,72.2208853 143.93943,64.4154378 143.755773,54.8652433 L143.755773,54.8652433 C143.572115,45.4068775 137.419586,37.8769164 130.073282,38.060574 C122.726979,38.2442316 116.849936,46.1415079 117.125423,55.5998736 L117.125423,55.5998736 L117.125423,55.5998736 Z" fill="url(#linearGradient-5)"></path>
+            <path d="M123.186123,57.7119359 C123.094294,62.9461771 125.6655,67.1703016 129.063166,67.1703016 C132.369002,67.1703016 135.215695,62.9461771 135.307524,57.8037647 L135.307524,57.8037647 C135.399353,52.5695234 132.828146,48.3453989 129.430481,48.3453989 C126.032816,48.3453989 123.277952,52.5695234 123.186123,57.7119359 L123.186123,57.7119359 L123.186123,57.7119359 Z" fill="#000000"></path>
+            <path d="M101.973672,57.8037647 C102.432816,62.119718 100.779897,65.7928697 98.3923486,66.1601849 C96.0048,66.4356713 93.7090802,63.2216635 93.2499362,58.9057102 L93.2499362,58.9057102 C92.7907922,54.5897569 94.4437105,50.9166051 96.8312591,50.54929 C99.2188078,50.2738036 101.514528,53.4878114 101.973672,57.8037647 L101.973672,57.8037647 L101.973672,57.8037647 Z" fill="#000000"></path>
+            <path d="M124.563555,54.7734145 C124.288068,57.7119359 125.6655,60.0994845 127.593905,60.2831421 C129.52231,60.4667997 131.358886,58.1710798 131.634372,55.3243872 L131.634372,55.3243872 C131.909858,52.3858658 130.532426,49.9983172 128.604022,49.8146596 C126.675617,49.631002 124.839041,51.9267219 124.563555,54.7734145 L124.563555,54.7734145 L124.563555,54.7734145 Z" fill="url(#linearGradient-6)"></path>
+            <path d="M99.9534381,55.5080448 C100.228925,57.8955935 99.2188078,60.0076557 97.7495471,60.1913133 C96.2802864,60.3749709 94.9028545,58.538395 94.6273681,56.0590176 L94.6273681,56.0590176 C94.3518817,53.6714689 95.3619984,51.5594067 96.8312591,51.3757491 C98.3005198,51.1920915 99.6779518,53.1204962 99.9534381,55.5080448 L99.9534381,55.5080448 L99.9534381,55.5080448 Z" fill="url(#linearGradient-7)"></path>
+            <path d="M71.0273681,145.68392 C77.5472125,130.899485 91.4133603,104.911936 91.6888467,84.80143 C91.6888467,68.8232199 139.531648,64.9664106 143.388458,80.9446207 C147.245267,96.9228308 156.979119,120.798317 163.223477,132.368745 C169.467835,143.847344 187.558107,180.487033 168.274061,212.443453 C150.918419,240.726722 98.3005198,263.132948 70.2009089,208.586644 C60.6507144,189.669913 62.3954615,166.25357 71.0273681,145.68392 L71.0273681,145.68392 Z" fill="url(#linearGradient-8)"></path>
+            <path d="M65.1503253,134.664465 C59.5487689,145.224776 47.9783409,172.957072 76.2616093,188.108823 C106.65694,204.270691 106.565111,237.420885 70.0172514,221.626333 C36.5915704,207.39287 51.3760062,149.724387 60.7425432,135.950068 C66.8032436,126.308045 75.986123,114.46213 65.1503253,134.664465 L65.1503253,134.664465 Z" fill="url(#linearGradient-9)"></path>
+            <path d="M69.9254226,122.726722 C61.0180296,137.235671 39.7137494,171.395983 68.2725043,189.210769 C106.65694,212.810769 95.8211424,236.31894 60.7425432,215.106488 C11.3386521,185.537617 54.7736716,125.848901 74.5168623,103.07536 C97.1067455,77.5469553 78.8328156,107.758628 69.9254226,122.726722 L69.9254226,122.726722 Z" stroke="#000000" stroke-width="1.25" fill="#000000"></path>
+            <path d="M156.428146,151.285477 C156.428146,167.447344 140.90908,188.384309 114.27873,188.200652 C86.8219206,188.384309 75.1596638,167.447344 75.1596638,151.285477 C75.1596638,135.123609 93.341765,121.992092 115.747991,121.992092 C138.246045,122.08392 156.428146,135.123609 156.428146,151.285477 L156.428146,151.285477 Z" fill="url(#linearGradient-10)"></path>
+            <path d="M141.919197,100.504154 C141.643711,117.216994 130.716084,121.165632 116.941765,121.165632 C103.167446,121.165632 93.1581074,118.686255 91.9643331,100.504154 C91.9643331,89.1173833 103.167446,82.5057102 116.941765,82.5057102 C130.716084,82.4138814 141.919197,89.0255546 141.919197,100.504154 L141.919197,100.504154 Z" fill="url(#linearGradient-11)"></path>
+            <path d="M58.6304809,126.216216 C67.6297027,112.533726 86.638263,91.504932 62.2118039,129.154737 C42.3767844,160.19287 54.8655004,180.119718 61.293516,185.629446 C79.8429323,202.158628 79.1083019,213.269913 64.5075237,204.546177 C33.1939051,185.904932 39.7137494,154.499485 58.6304809,126.216216 L58.6304809,126.216216 Z" fill="url(#linearGradient-12)"></path>
+            <path d="M188.935539,131.817772 C181.130092,115.747734 156.336318,74.9757491 190.129314,122.359407 C220.89196,165.243453 199.312193,195.087811 195.455384,198.026333 C191.598574,200.964854 178.650714,206.933726 182.415695,196.557072 C186.272504,186.180418 205.372893,166.529056 188.935539,131.817772 L188.935539,131.817772 Z" fill="url(#linearGradient-13)"></path>
+            <path d="M51.8351502,258.541508 C31.2655004,247.613881 1.42114241,260.65357 12.2569401,231.084699 C14.4608311,224.381197 9.0429323,214.280029 12.5324265,207.760185 C16.6647222,199.77108 25.5721152,201.515827 30.8981852,196.189757 C36.1324265,190.680029 39.438263,181.129835 49.263944,182.599095 C58.9977961,184.068356 65.5176405,196.006099 72.3129712,210.698706 C77.3635549,221.167189 95.1783409,235.951625 93.9845665,247.70571 C92.5153058,265.704154 72.0374848,269.101819 51.8351502,258.541508 L51.8351502,258.541508 Z" stroke="#E68C3F" stroke-width="6.25" fill="url(#linearGradient-14)"></path>
+            <path d="M201.607913,189.11894 C198.485734,194.995983 185.446045,204.454348 176.72231,201.974971 C167.906746,199.587422 163.866279,186.180418 165.611026,175.987422 C167.263944,164.600652 176.72231,163.95785 188.660053,169.651235 C201.516084,175.987422 205.372893,181.313492 201.607913,189.11894 L201.607913,189.11894 Z" fill="url(#linearGradient-15)"></path>
+            <path d="M194.445267,253.490924 C209.505189,235.216994 243.022699,238.981975 220.432816,213.912714 C215.657718,208.494815 217.126979,196.924387 211.249936,191.965632 C204.362777,185.904932 196.740987,190.863687 189.761998,187.741508 C182.78301,184.343842 175.436707,177.823998 166.896629,182.415438 C158.356551,187.098706 157.438263,199.220107 156.611804,215.198317 C155.877174,226.676916 145.408691,245.869134 151.010247,256.429446 C159.091181,272.774971 180.119975,270.57108 194.445267,253.490924 L194.445267,253.490924 Z" stroke="#E68C3F" stroke-width="6.2507" fill="url(#linearGradient-16)"></path>
+            <path d="M187.925423,229.064465 C211.249936,194.628667 193.894294,194.904154 188.017251,192.241119 C182.140209,189.486255 175.987679,184.068356 169.10052,187.833337 C162.21336,191.690146 161.846045,201.607656 161.662388,214.647344 C161.386901,224.013881 153.581454,239.716605 158.264722,248.440341 C163.958107,258.633337 177.732426,243.848901 187.925423,229.064465 L187.925423,229.064465 Z" fill="url(#linearGradient-17)"></path>
+            <path d="M47.0600529,234.02322 C12.1651113,211.433337 28.5106366,203.719718 33.7448778,200.138395 C40.0810646,195.546955 40.1728934,186.731391 47.9783409,187.55785 C55.7837883,188.384309 60.375228,198.026333 65.6094693,209.964076 C69.4662786,218.504154 82.8732825,229.890924 81.8631658,239.716605 C80.5775626,251.287033 62.1199751,243.665243 47.0600529,234.02322 L47.0600529,234.02322 Z" fill="url(#linearGradient-18)"></path>
+            <path d="M199.587679,188.843453 C196.832816,193.618551 185.629703,201.148512 178.19157,199.128278 C170.569781,197.199874 167.080286,186.455905 168.641376,178.374971 C170.018808,169.192092 178.19157,168.732948 188.476395,173.324387 C199.404022,178.283142 202.801687,182.507267 199.587679,188.843453 L199.587679,188.843453 Z" fill="#000000"></path>
+            <path d="M192.057718,186.180418 C190.312971,189.486255 182.966668,194.720496 177.824255,193.343064 C172.681843,191.965632 170.110637,184.5275 170.937096,178.925944 C171.671726,172.589757 177.181454,172.222442 184.160442,175.344621 C191.690403,178.834115 194.077952,181.772636 192.057718,186.180418 L192.057718,186.180418 Z" fill="url(#linearGradient-19)"></path>
+            <path d="M97.1067455,66.3438425 C100.779897,62.9461771 109.68729,52.5695234 126.583788,63.4053211 C129.705967,65.4255546 132.277174,65.6092121 138.246045,68.1804184 C150.275617,73.1391732 144.582232,85.0769164 131.726201,89.1173833 C126.216473,90.8621304 121.257718,97.5656324 111.340209,96.9228308 C102.800131,96.4636868 100.59624,90.8621304 95.3619984,87.8317802 C86.0872903,82.597539 84.7098584,75.5267219 89.760442,71.7617413 C94.8110257,67.9967608 96.7394304,66.6193289 97.1067455,66.3438425 L97.1067455,66.3438425 Z" stroke="#E68C3F" stroke-width="3.75" fill="url(#linearGradient-20)"></path>
+            <path d="M138.429703,75.9858658 C133.379119,76.2613522 122.451493,87.1889787 110.972893,87.1889787 C99.4942942,87.1889787 92.6071346,76.5368386 90.8623875,76.5368386" stroke="#E68C3F" stroke-width="2.5"></path>
+            <path d="M102.800131,65.4255546 C104.636707,63.7726363 110.421921,59.2730254 118.043711,63.8644651 C119.696629,64.782753 121.349547,65.7928697 123.737096,67.1703016 C128.604022,70.0169942 126.216473,74.14929 120.33943,76.7204962 C117.676395,77.8224417 113.268613,80.2099904 109.962777,80.0263328 C106.289625,79.6590176 103.810247,77.2714689 101.422699,75.7103795 C96.9230879,72.7718581 97.1985743,70.2924806 99.3106366,68.364076 C100.871726,66.8948153 102.616473,65.5173833 102.800131,65.4255546 L102.800131,65.4255546 Z" fill="url(#linearGradient-21)"></path>
+        </g>
+    </g>
+</svg>

docs/readme_assets/mac_logo.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg"><path d="m23.091 14.018v-0.342l-1.063 0.073c-0.301 0.019-0.527 0.083-0.679 0.191-0.152 0.109-0.228 0.26-0.228 0.453 0 0.188 0.075 0.338 0.226 0.449 0.15 0.112 0.352 0.167 0.604 0.167 0.161 0 0.312-0.025 0.451-0.074s0.261-0.118 0.363-0.206c0.102-0.087 0.182-0.191 0.239-0.312 0.058-0.121 0.087-0.254 0.087-0.399zm-2.091-13.768c-11.579 0-20.75 9.171-20.75 20.75 0 11.58 9.171 20.75 20.75 20.75s20.75-9.17 20.75-20.75c0-11.579-9.17-20.75-20.75-20.75zm4.028 12.299c0.098-0.275 0.236-0.511 0.415-0.707s0.394-0.347 0.646-0.453 0.533-0.159 0.842-0.159c0.279 0 0.531 0.042 0.755 0.125 0.225 0.083 0.417 0.195 0.578 0.336s0.289 0.305 0.383 0.493 0.15 0.387 0.169 0.596h-0.833c-0.021-0.115-0.059-0.223-0.113-0.322s-0.125-0.185-0.213-0.258c-0.089-0.073-0.193-0.13-0.312-0.171-0.12-0.042-0.254-0.062-0.405-0.062-0.177 0-0.338 0.036-0.481 0.107-0.144 0.071-0.267 0.172-0.369 0.302s-0.181 0.289-0.237 0.475c-0.057 0.187-0.085 0.394-0.085 0.622 0 0.236 0.028 0.448 0.085 0.634 0.056 0.187 0.136 0.344 0.24 0.473 0.103 0.129 0.228 0.228 0.373 0.296s0.305 0.103 0.479 0.103c0.285 0 0.517-0.067 0.697-0.201s0.296-0.33 0.35-0.588h0.834c-0.024 0.228-0.087 0.436-0.189 0.624s-0.234 0.348-0.396 0.481c-0.163 0.133-0.354 0.236-0.574 0.308s-0.462 0.109-0.725 0.109c-0.312 0-0.593-0.052-0.846-0.155-0.252-0.103-0.469-0.252-0.649-0.445s-0.319-0.428-0.417-0.705-0.147-0.588-0.147-0.935c-2e-3 -0.339 0.047-0.647 0.145-0.923zm-11.853-1.262h0.834v0.741h0.016c0.051-0.123 0.118-0.234 0.2-0.33 0.082-0.097 0.176-0.179 0.284-0.248 0.107-0.069 0.226-0.121 0.354-0.157 0.129-0.036 0.265-0.054 0.407-0.054 0.306 0 0.565 0.073 0.775 0.219 0.211 0.146 0.361 0.356 0.449 0.63h0.021c0.056-0.132 0.13-0.25 0.221-0.354s0.196-0.194 0.314-0.268 0.248-0.13 0.389-0.169 0.289-0.058 0.445-0.058c0.215 0 0.41 0.034 0.586 0.103s0.326 0.165 0.451 0.29 0.221 0.277 0.288 0.455 0.101 0.376 0.101 0.594v2.981h-0.87v-2.772c0-0.287-0.074-0.51-0.222-0.667-0.147-0.157-0.358-0.236-0.632-0.236-0.134 0-0.257 0.024-0.369 0.071-0.111 0.047-0.208 0.113-0.288 0.198-0.081 0.084-0.144 0.186-0.189 0.304-0.046 0.118-0.069 0.247-0.069 0.387v2.715h-0.858v-2.844c0-0.126-0.02-0.24-0.059-0.342s-0.094-0.189-0.167-0.262c-0.072-0.073-0.161-0.128-0.264-0.167-0.104-0.039-0.22-0.059-0.349-0.059-0.134 0-0.258 0.025-0.373 0.075-0.114 0.05-0.212 0.119-0.294 0.207-0.082 0.089-0.146 0.193-0.191 0.314-0.044 0.12-0.116 0.252-0.116 0.394v2.683h-0.825v-4.374zm1.893 20.939c-3.825 0-6.224-2.658-6.224-6.9s2.399-6.909 6.224-6.909 6.215 2.667 6.215 6.909c0 4.241-2.39 6.9-6.215 6.9zm7.082-16.575c-0.141 0.036-0.285 0.054-0.433 0.054-0.218 0-0.417-0.031-0.598-0.093-0.182-0.062-0.337-0.149-0.467-0.262s-0.232-0.249-0.304-0.409c-0.073-0.16-0.109-0.338-0.109-0.534 0-0.384 0.143-0.684 0.429-0.9s0.7-0.342 1.243-0.377l1.18-0.068v-0.338c0-0.252-0.08-0.445-0.24-0.576s-0.386-0.197-0.679-0.197c-0.118 0-0.229 0.015-0.331 0.044-0.102 0.03-0.192 0.072-0.27 0.127s-0.143 0.121-0.193 0.198c-0.051 0.076-0.086 0.162-0.105 0.256h-0.818c5e-3 -0.193 0.053-0.372 0.143-0.536s0.212-0.306 0.367-0.427 0.336-0.215 0.546-0.282 0.438-0.101 0.685-0.101c0.266 0 0.507 0.033 0.723 0.101s0.401 0.163 0.554 0.288 0.271 0.275 0.354 0.451 0.125 0.373 0.125 0.59v3.001h-0.833v-0.729h-0.021c-0.062 0.118-0.14 0.225-0.235 0.32-0.096 0.095-0.203 0.177-0.322 0.244-0.12 0.067-0.25 0.119-0.391 0.155zm5.503 16.575c-2.917 0-4.9-1.528-5.038-3.927h1.899c0.148 1.371 1.473 2.279 3.288 2.279 1.741 0 2.992-0.908 2.992-2.149 0-1.074-0.76-1.723-2.519-2.167l-1.714-0.426c-2.464-0.611-3.584-1.732-3.584-3.575 0-2.269 1.982-3.844 4.807-3.844 2.76 0 4.686 1.584 4.76 3.862h-1.88c-0.13-1.371-1.25-2.214-2.918-2.214-1.658 0-2.806 0.852-2.806 2.084 0 0.972 0.722 1.547 2.482 1.991l1.445 0.361c2.751 0.667 3.881 1.751 3.881 3.696-1e-3 2.482-1.964 4.029-5.095 4.029zm-12.585-12.106c-2.621 0-4.26 2.01-4.26 5.205 0 3.186 1.639 5.196 4.26 5.196 2.612 0 4.26-2.01 4.26-5.196 1e-3 -3.195-1.648-5.205-4.26-5.205z"/></svg>

docs/readme_assets/windows_logo.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="257px" viewBox="0 0 256 257" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M0,36.3573818 L104.619084,22.1093454 L104.664817,123.02292 L0.0955693151,123.618411 L0,36.3573818 Z M104.569248,134.650129 L104.650452,235.651651 L0.0812046021,221.274919 L0.0753414539,133.972642 L104.569248,134.650129 Z M117.25153,20.2454506 L255.967753,6.21724894e-15 L255.967753,121.739477 L117.25153,122.840723 L117.25153,20.2454506 Z M256,135.599959 L255.96746,256.791232 L117.251237,237.213007 L117.056874,135.373055 L256,135.599959 Z" fill="#00ADEF"/>
+    </g>
+</svg>

go.mod

@@ -1,97 +1,112 @@
 module github.com/stashapp/stash
 
+go 1.19
+
 require (
-	github.com/99designs/gqlgen v0.12.2
-	github.com/Yamashou/gqlgenc v0.0.0-20200902035953-4dbef3551953
+	github.com/99designs/gqlgen v0.17.2
+	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
+	github.com/Yamashou/gqlgenc v0.0.6
 	github.com/anacrolix/dms v1.2.2
-	github.com/antchfx/htmlquery v1.2.3
-	github.com/chromedp/cdproto v0.0.0-20210622022015-fe1827b46b84
-	github.com/chromedp/chromedp v0.7.3
-	github.com/corona10/goimagehash v1.0.3
-	github.com/disintegration/imaging v1.6.0
-	github.com/fvbommel/sortorder v1.0.2
-	github.com/go-chi/chi v4.0.2+incompatible
-	github.com/golang-jwt/jwt/v4 v4.0.0
-	github.com/golang-migrate/migrate/v4 v4.15.0-beta.1
+	github.com/antchfx/htmlquery v1.3.0
+	github.com/asticode/go-astisub v0.26.0
+	github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617
+	github.com/chromedp/chromedp v0.9.2
+	github.com/corona10/goimagehash v1.1.0
+	github.com/disintegration/imaging v1.6.2
+	github.com/doug-martin/goqu/v9 v9.18.0
+	github.com/go-chi/chi/v5 v5.0.10
+	github.com/go-chi/cors v1.2.1
+	github.com/go-chi/httplog v0.3.1
+	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
+	github.com/gofrs/uuid/v5 v5.0.0
+	github.com/golang-jwt/jwt/v4 v4.5.0
+	github.com/golang-migrate/migrate/v4 v4.16.2
 	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v1.2.0
-	github.com/gorilla/websocket v1.4.2
-	github.com/h2non/filetype v1.0.8
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/jmoiron/sqlx v1.3.1
-	github.com/json-iterator/go v1.1.9
-	github.com/mattn/go-sqlite3 v1.14.6
+	github.com/gorilla/sessions v1.2.1
+	github.com/gorilla/websocket v1.5.0
+	github.com/hashicorp/golang-lru/v2 v2.0.6
+	github.com/jinzhu/copier v0.4.0
+	github.com/jmoiron/sqlx v1.3.5
+	github.com/json-iterator/go v1.1.12
+	github.com/kermieisinthehouse/gosx-notifier v0.1.2
+	github.com/kermieisinthehouse/systray v1.2.4
+	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
-	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.2.0 // indirect
-	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.6.1
-	github.com/tidwall/gjson v1.8.1
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/vektah/gqlparser/v2 v2.0.1
-	github.com/vektra/mockery/v2 v2.2.1
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
-	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/tools v0.1.0 // indirect
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cast v1.5.1
+	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.16.0
+	github.com/stretchr/testify v1.8.4
+	github.com/tidwall/gjson v1.16.0
+	github.com/vearutop/statigz v1.4.0
+	github.com/vektah/dataloaden v0.3.0
+	github.com/vektah/gqlparser/v2 v2.4.2
+	github.com/vektra/mockery/v2 v2.10.0
+	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
+	github.com/zencoder/go-dash/v3 v3.0.2
+	golang.org/x/crypto v0.17.0
+	golang.org/x/image v0.12.0
+	golang.org/x/net v0.17.0
+	golang.org/x/sys v0.15.0
+	golang.org/x/term v0.15.0
+	golang.org/x/text v0.14.0
+	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/agnivade/levenshtein v1.1.0 // indirect
-	github.com/antchfx/xpath v1.1.6 // indirect
+	github.com/agnivade/levenshtein v1.1.1 // indirect
+	github.com/antchfx/xpath v1.2.3 // indirect
+	github.com/asticode/go-astikit v0.20.0 // indirect
+	github.com/asticode/go-astits v1.8.0 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.1.0-rc.5 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/gobwas/ws v1.3.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007 // indirect
+	github.com/matryer/moq v0.2.3 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/pelletier/go-toml v1.7.0 // indirect
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rs/zerolog v1.18.0 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/spf13/cast v1.3.0 // indirect
-	github.com/spf13/cobra v1.0.0 // indirect
-	github.com/spf13/jwalterweatherman v1.0.0 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tidwall/match v1.0.3 // indirect
-	github.com/urfave/cli/v2 v2.1.1 // indirect
-	github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e // indirect
-	go.uber.org/atomic v1.6.0 // indirect
-	golang.org/x/mod v0.4.1 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/ini.v1 v1.51.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	github.com/rs/zerolog v1.30.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cobra v1.7.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/urfave/cli/v2 v2.8.1 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/sourcemap.v1 v1.0.5 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
-
-go 1.17

gqlgen.yml

@@ -4,39 +4,145 @@ schema:
   - "graphql/schema/types/*.graphql"
   - "graphql/schema/*.graphql"
 exec:
-  filename: pkg/models/generated_exec.go
+  filename: internal/api/generated_exec.go
 model:
-  filename: pkg/models/generated_models.go
+  filename: internal/api/generated_models.go
 resolver:
-  filename: pkg/api/resolver.go
+  filename: internal/api/resolver.go
   type: Resolver
 
 struct_tag: gqlgen
 
+autobind:
+  - github.com/stashapp/stash/internal/api
+  - github.com/stashapp/stash/pkg/models
+  - github.com/stashapp/stash/pkg/plugin
+  - github.com/stashapp/stash/pkg/scraper
+  - github.com/stashapp/stash/internal/identify
+  - github.com/stashapp/stash/internal/dlna
+  - github.com/stashapp/stash/pkg/scraper/stashbox
+
 models:
-  Gallery:
-    model: github.com/stashapp/stash/pkg/models.Gallery
+  # Scalars
+  ID:
+    model:
+      - github.com/99designs/gqlgen/graphql.ID
+      - github.com/99designs/gqlgen/graphql.IntID
+      - github.com/stashapp/stash/pkg/models.FileID
+      - github.com/stashapp/stash/pkg/models.FolderID
+  Int64:
+    model: github.com/99designs/gqlgen/graphql.Int64
+  Timestamp:
+    model: github.com/stashapp/stash/internal/api.Timestamp
+  BoolMap:
+    model: github.com/stashapp/stash/internal/api.BoolMap
+  PluginConfigMap:
+    model: github.com/stashapp/stash/internal/api.PluginConfigMap
+  # define to force resolvers
   Image:
     model: github.com/stashapp/stash/pkg/models.Image
-  ImageFileType:
-    model: github.com/stashapp/stash/pkg/models.ImageFileType
-  Performer:
-    model: github.com/stashapp/stash/pkg/models.Performer
-  Scene:
-    model: github.com/stashapp/stash/pkg/models.Scene
-  SceneMarker:
-    model: github.com/stashapp/stash/pkg/models.SceneMarker
-  ScrapedItem:
-    model: github.com/stashapp/stash/pkg/models.ScrapedItem
-  Studio:
-    model: github.com/stashapp/stash/pkg/models.Studio
-  Movie:
-    model: github.com/stashapp/stash/pkg/models.Movie
-  Tag:
-    model: github.com/stashapp/stash/pkg/models.Tag
-  SceneFileType:
-    model: github.com/stashapp/stash/pkg/models.SceneFileType
-  SavedFilter:
-    model: github.com/stashapp/stash/pkg/models.SavedFilter
-  StashID:
+    fields:
+      title:
+        resolver: true
+  VideoFile:
+    fields:
+      # override float fields - #1572
+      duration:
+        fieldName: DurationFinite
+      frame_rate:
+        fieldName: FrameRateFinite
+  # autobind on config causes generation issues
+  BlobsStorageType:
+    model: github.com/stashapp/stash/internal/manager/config.BlobsStorageType
+  StashConfig:
+    model: github.com/stashapp/stash/internal/manager/config.StashConfig
+  StashConfigInput:
+    model: github.com/stashapp/stash/internal/manager/config.StashConfigInput
+  StashBoxInput:
+    model: github.com/stashapp/stash/internal/manager/config.StashBoxInput
+  ConfigImageLightboxResult:
+    model: github.com/stashapp/stash/internal/manager/config.ConfigImageLightboxResult
+  ImageLightboxDisplayMode:
+    model: github.com/stashapp/stash/internal/manager/config.ImageLightboxDisplayMode
+  ImageLightboxScrollMode:
+    model: github.com/stashapp/stash/internal/manager/config.ImageLightboxScrollMode
+  ConfigDisableDropdownCreate:
+    model: github.com/stashapp/stash/internal/manager/config.ConfigDisableDropdownCreate
+  ScanMetadataOptions:
+    model:  github.com/stashapp/stash/internal/manager/config.ScanMetadataOptions
+  CleanGeneratedInput:
+    model: github.com/stashapp/stash/internal/manager/task.CleanGeneratedOptions
+  AutoTagMetadataOptions:
+    model: github.com/stashapp/stash/internal/manager/config.AutoTagMetadataOptions
+  SystemStatus:
+    model: github.com/stashapp/stash/internal/manager.SystemStatus
+  SystemStatusEnum:
+    model: github.com/stashapp/stash/internal/manager.SystemStatusEnum
+  ImportDuplicateEnum:
+    model: github.com/stashapp/stash/internal/manager.ImportDuplicateEnum
+  SetupInput:
+    model: github.com/stashapp/stash/internal/manager.SetupInput
+  MigrateInput:
+    model: github.com/stashapp/stash/internal/manager.MigrateInput
+  ScanMetadataInput:
+    model: github.com/stashapp/stash/internal/manager.ScanMetadataInput
+  GenerateMetadataInput:
+    model: github.com/stashapp/stash/internal/manager.GenerateMetadataInput
+  GeneratePreviewOptionsInput:
+    model: github.com/stashapp/stash/internal/manager.GeneratePreviewOptionsInput
+  AutoTagMetadataInput:
+    model: github.com/stashapp/stash/internal/manager.AutoTagMetadataInput
+  CleanMetadataInput:
+    model: github.com/stashapp/stash/internal/manager.CleanMetadataInput
+  StashBoxBatchTagInput:
+    model: github.com/stashapp/stash/internal/manager.StashBoxBatchTagInput
+  SceneStreamEndpoint:
+    model: github.com/stashapp/stash/internal/manager.SceneStreamEndpoint
+  ExportObjectTypeInput:
+    model: github.com/stashapp/stash/internal/manager.ExportObjectTypeInput
+  ExportObjectsInput:
+    model: github.com/stashapp/stash/internal/manager.ExportObjectsInput
+  ImportObjectsInput:
+    model: github.com/stashapp/stash/internal/manager.ImportObjectsInput
+  ScanMetaDataFilterInput:
+    model: github.com/stashapp/stash/internal/manager.ScanMetaDataFilterInput
+  # renamed types
+  BulkUpdateIdMode:
+    model: github.com/stashapp/stash/pkg/models.RelationshipUpdateMode
+  DLNAStatus:
+    model: github.com/stashapp/stash/internal/dlna.Status
+  DLNAIP:
+    model: github.com/stashapp/stash/internal/dlna.Dlnaip
+  IdentifySource:
+    model: github.com/stashapp/stash/internal/identify.Source
+  IdentifyMetadataTaskOptions:
+    model: github.com/stashapp/stash/internal/identify.Options
+  IdentifyMetadataInput:
+    model: github.com/stashapp/stash/internal/identify.Options
+  IdentifyMetadataOptions:
+    model: github.com/stashapp/stash/internal/identify.MetadataOptions
+  IdentifyFieldOptions:
+    model: github.com/stashapp/stash/internal/identify.FieldOptions
+  IdentifyFieldStrategy:
+    model: github.com/stashapp/stash/internal/identify.FieldStrategy
+  ScraperSource:
+    model: github.com/stashapp/stash/pkg/scraper.Source
+  # rebind inputs to types
+  StashIDInput:
     model: github.com/stashapp/stash/pkg/models.StashID
+  IdentifySourceInput:
+    model: github.com/stashapp/stash/internal/identify.Source
+  IdentifyFieldOptionsInput:
+    model: github.com/stashapp/stash/internal/identify.FieldOptions
+  IdentifyMetadataOptionsInput:
+    model: github.com/stashapp/stash/internal/identify.MetadataOptions
+  ScraperSourceInput:
+    model: github.com/stashapp/stash/pkg/scraper.Source
+  SavedFindFilterType:
+    model: github.com/stashapp/stash/pkg/models.FindFilterType
+  # force resolvers
+  ConfigResult:
+    fields:
+      plugins:
+        resolver: true
+  

graphql/documents/data/config.graphql

@@ -1,92 +0,0 @@
-fragment ConfigGeneralData on ConfigGeneralResult {
-  stashes {
-    path
-    excludeVideo
-    excludeImage
-  }
-  databasePath
-  generatedPath
-  metadataPath
-  cachePath
-  calculateMD5
-  videoFileNamingAlgorithm
-  parallelTasks
-  previewAudio
-  previewSegments
-  previewSegmentDuration
-  previewExcludeStart
-  previewExcludeEnd
-  previewPreset
-  maxTranscodeSize
-  maxStreamingTranscodeSize
-  writeImageThumbnails
-  apiKey
-  username
-  password
-  maxSessionAge
-  trustedProxies
-  logFile
-  logOut
-  logLevel
-  logAccess
-  createGalleriesFromFolders
-  videoExtensions
-  imageExtensions
-  galleryExtensions
-  excludes
-  imageExcludes
-  customPerformerImageLocation
-  scraperUserAgent
-  scraperCertCheck
-  scraperCDPPath
-  stashBoxes {
-    name
-    endpoint
-    api_key
-  }
-}
-
-fragment ConfigInterfaceData on ConfigInterfaceResult {
-  menuItems
-  soundOnPreview
-  wallShowTitle
-  wallPlayback
-  maximumLoopDuration
-  autostartVideo
-  showStudioAsText
-  css
-  cssEnabled
-  language
-  slideshowDelay
-  handyKey
-  funscriptOffset
-}
-
-fragment ConfigDLNAData on ConfigDLNAResult {
-  serverName
-  enabled
-  whitelistedIPs
-  interfaces
-}
-
-fragment ConfigScrapingData on ConfigScrapingResult {
-  scraperUserAgent
-  scraperCertCheck
-  scraperCDPPath
-  excludeTagPatterns
-}
-
-fragment ConfigData on ConfigResult {
-  general {
-    ...ConfigGeneralData
-  }
-  interface {
-    ...ConfigInterfaceData
-  }
-  dlna {
-    ...ConfigDLNAData
-  }
-  scraping {
-    ...ConfigScrapingData
-  }
-}

graphql/documents/data/filter.graphql

@@ -1,6 +0,0 @@
-fragment SavedFilterData on SavedFilter {
-  id
-  mode
-  name
-  filter
-}

graphql/documents/data/gallery-slim.graphql

@@ -1,44 +0,0 @@
-fragment SlimGalleryData on Gallery {
-  id
-  checksum
-  path
-  title
-  date
-  url
-  details
-  rating
-  organized
-  image_count
-  cover {
-    file {
-      size
-      width
-      height
-    }
-    
-    paths {
-      thumbnail
-    }
-  }
-  studio {
-    id
-    name
-    image_path
-  }
-  tags {
-    id
-    name
-  }
-  performers {
-    id
-    name
-    gender
-    favorite
-    image_path
-  }
-  scenes {
-    id
-    title
-    path
-  }
-}

graphql/documents/data/gallery.graphql

@@ -1,30 +0,0 @@
-fragment GalleryData on Gallery {
-  id
-  checksum
-  path
-  title
-  date
-  url
-  details
-  rating
-  organized
-  images {
-    ...SlimImageData
-  }
-  cover {
-    ...SlimImageData
-  }
-  studio {
-    ...SlimStudioData
-  }
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-  scenes {
-    ...SlimSceneData
-  }
-}

graphql/documents/data/image-slim.graphql

@@ -1,45 +0,0 @@
-fragment SlimImageData on Image {
-  id
-  checksum
-  title
-  rating
-  organized
-  o_counter
-  path
-
-  file {
-    size
-    width
-    height
-  }
-
-  paths {
-    thumbnail
-    image
-  }
-
-  galleries {
-    id
-    path
-    title
-  }
-
-  studio {
-    id
-    name
-    image_path
-  }
-
-  tags {
-    id
-    name
-  }
-
-  performers {
-    id
-    name
-    gender
-    favorite
-    image_path
-  }
-}

graphql/documents/data/image.graphql

@@ -1,36 +0,0 @@
-fragment ImageData on Image {
-  id
-  checksum
-  title
-  rating
-  organized
-  o_counter
-  path
-
-  file {
-    size
-    width
-    height
-  }
-
-  paths {
-    thumbnail
-    image
-  }
-
-  galleries {
-    ...GalleryData
-  }
-
-  studio {
-    ...SlimStudioData
-  }
-  
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-}

graphql/documents/data/job.graphql

@@ -1,10 +0,0 @@
-fragment JobData on Job {
-  id
-  status
-  subTasks
-  description
-  progress
-  startTime
-  endTime
-  addTime
-}

graphql/documents/data/movie-slim.graphql

@@ -1,5 +0,0 @@
-fragment SlimMovieData on Movie {
-  id
-  name
-  front_image_path
-}

graphql/documents/data/movie.graphql

@@ -1,26 +0,0 @@
-fragment MovieData on Movie {
-  id
-  checksum
-  name
-  aliases
-  duration
-  date
-  rating
-  director
-
-  studio {
-    ...SlimStudioData
-  }
-  
-  synopsis
-  url
-  front_image_path
-  back_image_path
-  scene_count
-
-  scenes {
-    id
-    title
-    path
-  }
-}

graphql/documents/data/performer-slim.graphql

@@ -1,16 +0,0 @@
-fragment SlimPerformerData on Performer {
-  id
-  name
-  gender
-  image_path
-  favorite
-  tags {
-    id
-    name
-  }
-  stash_ids {
-    endpoint
-    stash_id
-  }
-  rating
-}

graphql/documents/data/performer.graphql

@@ -1,40 +0,0 @@
-fragment PerformerData on Performer {
-  id
-  checksum
-  name
-  url
-  gender
-  twitter
-  instagram
-  birthdate
-  ethnicity
-  country
-  eye_color
-  height
-  measurements
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  aliases
-  favorite
-  image_path
-  scene_count
-  image_count
-  gallery_count
-  movie_count
-
-  tags {
-    ...SlimTagData
-  }
-
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  rating
-  details
-  death_date
-  hair_color
-  weight
-}

graphql/documents/data/scene-marker.graphql

@@ -1,24 +0,0 @@
-fragment SceneMarkerData on SceneMarker {
-  id
-  title
-  seconds
-  stream
-  preview
-  screenshot
-
-  scene {
-    id
-  }
-
-  primary_tag {
-    id
-    name
-    aliases
-  }
-
-  tags {
-    id
-    name
-    aliases
-  }
-}

graphql/documents/data/scene-slim.graphql

@@ -1,82 +0,0 @@
-fragment SlimSceneData on Scene {
-  id
-  checksum
-  oshash
-  title
-  details
-  url
-  date
-  rating
-  o_counter
-  organized
-  path
-  phash
-  interactive
-
-  file {
-    size
-    duration
-    video_codec
-    audio_codec
-    width
-    height
-    framerate
-    bitrate
-  }
-
-  paths {
-    screenshot
-    preview
-    stream
-    webp
-    vtt
-    chapters_vtt
-    sprite
-    funscript
-  }
-
-  scene_markers {
-    id
-    title
-    seconds
-  }
-
-  galleries {
-    id
-    path
-    title
-  }
-
-  studio {
-    id
-    name
-    image_path
-  }
-
-  movies {
-    movie {
-      id
-      name
-      front_image_path
-    }
-    scene_index
-  }
-
-  tags {
-    id
-    name
-  }
-
-  performers {
-    id
-    name
-    gender
-    favorite
-    image_path
-  }
-
-  stash_ids {
-    endpoint
-    stash_id
-  }
-}

graphql/documents/data/scene.graphql

@@ -1,69 +0,0 @@
-fragment SceneData on Scene {
-  id
-  checksum
-  oshash
-  title
-  details
-  url
-  date
-  rating
-  o_counter
-  organized
-  path
-  phash
-  interactive
-
-  file {
-    size
-    duration
-    video_codec
-    audio_codec
-    width
-    height
-    framerate
-    bitrate
-  }
-
-  paths {
-    screenshot
-    preview
-    stream
-    webp
-    vtt
-    chapters_vtt
-    sprite
-    funscript
-  }
-
-  scene_markers {
-    ...SceneMarkerData
-  }
-
-  galleries {
-    ...SlimGalleryData
-  }
-
-  studio {
-    ...SlimStudioData
-  }
-  
-  movies {
-    movie {
-      ...MovieData
-    }
-    scene_index
-  }
-
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-
-  stash_ids {
-    endpoint
-    stash_id
-  }
-}

graphql/documents/data/scrapers.graphql

@@ -1,215 +0,0 @@
-fragment ScrapedPerformerData on ScrapedPerformer {
-  stored_id
-  name
-  gender
-  url
-  twitter
-  instagram
-  birthdate
-  ethnicity
-  country
-  eye_color
-  height
-  measurements
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  aliases
-  tags {
-    ...ScrapedSceneTagData
-  }
-  images
-  details
-  death_date
-  hair_color
-  weight
-  remote_site_id
-}
-
-fragment ScrapedScenePerformerData on ScrapedPerformer {
-  stored_id
-  name
-  gender
-  url
-  twitter
-  instagram
-  birthdate
-  ethnicity
-  country
-  eye_color
-  height
-  measurements
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  aliases
-  tags {
-    ...ScrapedSceneTagData
-  }
-  remote_site_id
-  images
-  details
-  death_date
-  hair_color
-  weight
-}
-
-fragment ScrapedMovieStudioData on ScrapedStudio {
-  stored_id
-  name
-  url
-}
-
-fragment ScrapedMovieData on ScrapedMovie {
-  name
-  aliases
-  duration
-  date
-  rating
-  director
-  url
-  synopsis
-  front_image
-  back_image
-
-  studio {
-    ...ScrapedMovieStudioData
-  }
-}
-
-fragment ScrapedSceneMovieData on ScrapedMovie {
-  stored_id
-  name
-  aliases
-  duration
-  date
-  rating
-  director
-  url
-  synopsis
-}
-
-fragment ScrapedSceneStudioData on ScrapedStudio {
-  stored_id
-  name
-  url
-  remote_site_id
-}
-
-fragment ScrapedSceneTagData on ScrapedTag {
-  stored_id
-  name
-}
-
-fragment ScrapedSceneData on ScrapedScene {
-  title
-  details
-  url
-  date
-  image
-  remote_site_id
-
-  file {
-    size
-    duration
-    video_codec
-    audio_codec
-    width
-    height
-    framerate
-    bitrate
-  }
-
-  studio {
-    ...ScrapedSceneStudioData
-  }
-
-  tags {
-    ...ScrapedSceneTagData
-  }
-
-  performers {
-    ...ScrapedScenePerformerData
-  }
-
-  movies {
-    ...ScrapedSceneMovieData
-  }
-
-  fingerprints {
-    hash
-    algorithm
-    duration
-  }
-}
-
-fragment ScrapedGalleryData on ScrapedGallery {
-  title
-  details
-  url
-  date
-
-  studio {
-    ...ScrapedSceneStudioData
-  }
-
-  tags {
-    ...ScrapedSceneTagData
-  }
-
-  performers {
-    ...ScrapedScenePerformerData
-  }
-}
-
-fragment ScrapedStashBoxSceneData on ScrapedScene {
-  title
-  details
-  url
-  date
-  image
-  remote_site_id
-  duration
-
-  file {
-    size
-    duration
-    video_codec
-    audio_codec
-    width
-    height
-    framerate
-    bitrate
-  }
-
-  fingerprints {
-    hash
-    algorithm
-    duration
-  }
-
-  studio {
-    ...ScrapedSceneStudioData
-  }
-
-  tags {
-    ...ScrapedSceneTagData
-  }
-
-  performers {
-    ...ScrapedScenePerformerData
-  }
-
-  movies {
-    ...ScrapedSceneMovieData
-  }
-}
-
-fragment ScrapedStashBoxPerformerData on StashBoxPerformerQueryResult {
-  query
-  results {
-    ...ScrapedScenePerformerData
-  }
-}

graphql/documents/data/studio.graphql

@@ -1,29 +0,0 @@
-fragment StudioData on Studio {
-  id
-  checksum
-  name
-  url
-  parent_studio {
-    id
-    name
-    url
-    image_path
-  }
-  child_studios {
-    id
-    name
-    image_path
-  }
-  image_path
-  scene_count
-  image_count
-  gallery_count
-  movie_count
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  details
-  rating
-  aliases
-}

graphql/documents/data/tag-slim.graphql

@@ -1,6 +0,0 @@
-fragment SlimTagData on Tag {
-  id
-  name
-  aliases
-  image_path
-}

graphql/documents/data/tag.graphql

@@ -1,19 +0,0 @@
-fragment TagData on Tag {
-  id
-  name
-  aliases
-  image_path
-  scene_count
-  scene_marker_count
-  image_count
-  gallery_count
-  performer_count
-
-  parents {
-    ...SlimTagData
-  }
-
-  children {
-    ...SlimTagData
-  }
-}

graphql/documents/mutations/config.graphql

@@ -1,35 +0,0 @@
-mutation Setup($input: SetupInput!) {
-  setup(input: $input)
-}
-
-mutation Migrate($input: MigrateInput!) {
-  migrate(input: $input)
-}
-
-mutation ConfigureGeneral($input: ConfigGeneralInput!) {
-  configureGeneral(input: $input) {
-    ...ConfigGeneralData
-  }
-}
-
-mutation ConfigureInterface($input: ConfigInterfaceInput!) {
-  configureInterface(input: $input) {
-    ...ConfigInterfaceData
-  }
-}
-
-mutation ConfigureDLNA($input: ConfigDLNAInput!) {
-  configureDLNA(input: $input) {
-    ...ConfigDLNAData
-  }
-}
-
-mutation ConfigureScraping($input: ConfigScrapingInput!) {
-  configureScraping(input: $input) {
-    ...ConfigScrapingData
-  }
-}
-
-mutation GenerateAPIKey($input: GenerateAPIKeyInput!) {
-  generateAPIKey(input: $input)
-}

graphql/documents/mutations/filter.graphql

@@ -1,13 +0,0 @@
-mutation SaveFilter($input: SaveFilterInput!) {
-  saveFilter(input: $input) {
-    ...SavedFilterData
-  }
-} 
-
-mutation DestroySavedFilter($input: DestroyFilterInput!) {
-  destroySavedFilter(input: $input)
-}
-
-mutation SetDefaultFilter($input: SetDefaultFilterInput!) {
-  setDefaultFilter(input: $input)
-}

graphql/documents/mutations/gallery.graphql

@@ -1,41 +0,0 @@
-mutation GalleryCreate(
-  $input: GalleryCreateInput!) {
-
-  galleryCreate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation GalleryUpdate(
-  $input: GalleryUpdateInput!) {
-
-  galleryUpdate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation BulkGalleryUpdate(
-  $input: BulkGalleryUpdateInput!) {
-
-  bulkGalleryUpdate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation GalleriesUpdate($input : [GalleryUpdateInput!]!) {
-  galleriesUpdate(input: $input) {
-    ...GalleryData
-  }
-}
-
-mutation GalleryDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  galleryDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation AddGalleryImages($gallery_id: ID!, $image_ids: [ID!]!) {
-  addGalleryImages(input: {gallery_id: $gallery_id, image_ids: $image_ids})
-}
-
-mutation RemoveGalleryImages($gallery_id: ID!, $image_ids: [ID!]!) {
-  removeGalleryImages(input: {gallery_id: $gallery_id, image_ids: $image_ids})
-}

graphql/documents/mutations/image.graphql

@@ -1,41 +0,0 @@
-mutation ImageUpdate(
-  $input: ImageUpdateInput!) {
-
-  imageUpdate(input: $input) {
-      ...SlimImageData
-  }
-}
-
-mutation BulkImageUpdate(
-  $input: BulkImageUpdateInput!) {
-
-  bulkImageUpdate(input: $input) {
-      ...SlimImageData
-  }
-}
-
-mutation ImagesUpdate($input : [ImageUpdateInput!]!) {
-  imagesUpdate(input: $input) {
-    ...SlimImageData
-  }
-}
-
-mutation ImageIncrementO($id: ID!) {
-  imageIncrementO(id: $id) 
-}
-
-mutation ImageDecrementO($id: ID!) {
-  imageDecrementO(id: $id)
-}
-
-mutation ImageResetO($id: ID!) {
-  imageResetO(id: $id)
-}
-
-mutation ImageDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
-  imageDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation ImagesDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  imagesDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}

graphql/documents/mutations/job.graphql

@@ -1,7 +0,0 @@
-mutation StopJob($job_id: ID!) {
-  stopJob(job_id: $job_id)
-}
-
-mutation StopAllJobs {
-    stopAllJobs
-}

graphql/documents/mutations/metadata.graphql

@@ -1,39 +0,0 @@
-mutation MetadataImport {
-  metadataImport
-}
-
-mutation MetadataExport {
-  metadataExport
-}
-
-mutation ExportObjects($input: ExportObjectsInput!) {
-  exportObjects(input: $input)
-}
-
-mutation ImportObjects($input: ImportObjectsInput!) {
-  importObjects(input: $input)
-}
-
-mutation MetadataScan($input: ScanMetadataInput!) {
-  metadataScan(input: $input)
-}
-
-mutation MetadataGenerate($input: GenerateMetadataInput!) {
-  metadataGenerate(input: $input)
-}
-
-mutation MetadataAutoTag($input: AutoTagMetadataInput!) {
-  metadataAutoTag(input: $input)
-}
-
-mutation MetadataClean($input: CleanMetadataInput!) {
-  metadataClean(input: $input)
-}
-
-mutation MigrateHashNaming {
-  migrateHashNaming
-}
-
-mutation BackupDatabase($input: BackupDatabaseInput!) {
-  backupDatabase(input: $input)
-}

graphql/documents/mutations/movie.graphql

@@ -1,31 +0,0 @@
-mutation MovieCreate(
-  $name: String!,
-  $aliases: String,
-  $duration: Int,
-  $date: String,
-  $rating: Int,
-  $studio_id: ID,
-  $director: String,
-  $synopsis: String,
-  $url: String,
-  $front_image: String,
-  $back_image: String) {
-
-  movieCreate(input: { name: $name, aliases: $aliases, duration: $duration, date: $date, rating: $rating, studio_id: $studio_id, director: $director, synopsis: $synopsis, url: $url, front_image: $front_image, back_image: $back_image }) {
-    ...MovieData
-  }
-}
-
-mutation MovieUpdate($input: MovieUpdateInput!) {
-  movieUpdate(input: $input) {
-    ...MovieData
-  }
-}
-
-mutation MovieDestroy($id: ID!) {
-  movieDestroy(input: { id: $id })
-}
-
-mutation MoviesDestroy($ids: [ID!]!) {
-  moviesDestroy(ids: $ids)
-}

graphql/documents/mutations/performer.graphql

@@ -1,31 +0,0 @@
-mutation PerformerCreate(
-  $input: PerformerCreateInput!) {
-
-  performerCreate(input: $input) {
-      ...PerformerData
-  }
-}
-
-mutation PerformerUpdate(
-  $input: PerformerUpdateInput!) {
-
-  performerUpdate(input: $input) {
-    ...PerformerData
-  }
-}
-
-mutation BulkPerformerUpdate(
-  $input: BulkPerformerUpdateInput!) {
-
-  bulkPerformerUpdate(input: $input) {
-    ...PerformerData
-  }
-}
-
-mutation PerformerDestroy($id: ID!) {
-  performerDestroy(input: { id: $id })
-}
-
-mutation PerformersDestroy($ids: [ID!]!) {
-  performersDestroy(ids: $ids)
-}

graphql/documents/mutations/plugins.graphql

@@ -1,7 +0,0 @@
-mutation ReloadPlugins {
-  reloadPlugins
-}
-
-mutation RunPluginTask($plugin_id: ID!, $task_name: String!, $args: [PluginArgInput!]) {
-  runPluginTask(plugin_id: $plugin_id, task_name: $task_name, args: $args)
-}

graphql/documents/mutations/scene-marker.graphql

@@ -1,41 +0,0 @@
-mutation SceneMarkerCreate(
-  $title: String!,
-  $seconds: Float!,
-  $scene_id: ID!,
-  $primary_tag_id: ID!,
-  $tag_ids: [ID!] = []) {
-
-  sceneMarkerCreate(input: {
-                              title: $title,
-                              seconds: $seconds,
-                              scene_id: $scene_id,
-                              primary_tag_id: $primary_tag_id,
-                              tag_ids: $tag_ids
-                            }) {
-    ...SceneMarkerData
-  }
-}
-
-mutation SceneMarkerUpdate(
-  $id: ID!,
-  $title: String!,
-  $seconds: Float!,
-  $scene_id: ID!,
-  $primary_tag_id: ID!,
-  $tag_ids: [ID!] = []) {
-
-  sceneMarkerUpdate(input: {
-                              id: $id,
-                              title: $title,
-                              seconds: $seconds,
-                              scene_id: $scene_id,
-                              primary_tag_id: $primary_tag_id,
-                              tag_ids: $tag_ids
-                            }) {
-    ...SceneMarkerData
-  }
-}
-
-mutation SceneMarkerDestroy($id: ID!) {
-  sceneMarkerDestroy(id: $id)
-}

graphql/documents/mutations/scene.graphql

@@ -1,45 +0,0 @@
-mutation SceneUpdate(
-  $input: SceneUpdateInput!) {
-
-  sceneUpdate(input: $input) {
-    ...SceneData
-  }
-}
-
-mutation BulkSceneUpdate(
-  $input: BulkSceneUpdateInput!) {
-
-  bulkSceneUpdate(input: $input) {
-    ...SceneData
-  }
-}
-
-mutation ScenesUpdate($input : [SceneUpdateInput!]!) {
-  scenesUpdate(input: $input) {
-    ...SceneData
-  }
-}
-
-mutation SceneIncrementO($id: ID!) {
-  sceneIncrementO(id: $id) 
-}
-
-mutation SceneDecrementO($id: ID!) {
-  sceneDecrementO(id: $id)
-}
-
-mutation SceneResetO($id: ID!) {
-  sceneResetO(id: $id)
-}
-
-mutation SceneDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
-  sceneDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation ScenesDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  scenesDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation SceneGenerateScreenshot($id: ID!, $at: Float) {
-  sceneGenerateScreenshot(id: $id, at: $at)
-}

graphql/documents/mutations/scrapers.graphql

@@ -1,3 +0,0 @@
-mutation ReloadScrapers {
-  reloadScrapers
-}

graphql/documents/mutations/stash-box.graphql

@@ -1,7 +0,0 @@
-mutation SubmitStashBoxFingerprints($input: StashBoxFingerprintSubmissionInput!) {
-  submitStashBoxFingerprints(input: $input)
-}
-
-mutation StashBoxBatchPerformerTag($input: StashBoxBatchPerformerTagInput!) {
-  stashBoxBatchPerformerTag(input: $input)
-}

graphql/documents/queries/filter.graphql

@@ -1,11 +0,0 @@
-query FindSavedFilters($mode: FilterMode!) {
-  findSavedFilters(mode: $mode) {
-    ...SavedFilterData
-  }
-}
-
-query FindDefaultFilter($mode: FilterMode!) {
-  findDefaultFilter(mode: $mode) {
-    ...SavedFilterData
-  }
-}

graphql/documents/queries/gallery.graphql

@@ -1,14 +0,0 @@
-query FindGalleries($filter: FindFilterType, $gallery_filter: GalleryFilterType) {
-  findGalleries(gallery_filter: $gallery_filter, filter: $filter) {
-    count
-    galleries {
-      ...SlimGalleryData
-    }
-  }
-}
-
-query FindGallery($id: ID!) {
-  findGallery(id: $id) {
-    ...GalleryData
-  }
-}

graphql/documents/queries/image.graphql

@@ -1,14 +0,0 @@
-query FindImages($filter: FindFilterType, $image_filter: ImageFilterType, $image_ids: [Int!]) {
-  findImages(filter: $filter, image_filter: $image_filter, image_ids: $image_ids) {
-    count
-    images {
-      ...SlimImageData
-    }
-  }
-}
-
-query FindImage($id: ID!, $checksum: String) {
-  findImage(id: $id, checksum: $checksum) {
-    ...ImageData
-  }
-}

graphql/documents/queries/job.graphql

@@ -1,11 +0,0 @@
-query JobQueue {
-  jobQueue {
-    ...JobData
-  }
-}
-
-query FindJob($input: FindJobInput!) {
-    findJob(input: $input) {
-        ...JobData
-    }
-}

graphql/documents/queries/misc.graphql

@@ -1,73 +0,0 @@
-query MarkerStrings($q: String, $sort: String) {
-  markerStrings(q: $q, sort: $sort) {
-    id
-    count
-    title
-  }
-}
-
-query AllTags {
-  allTags {
-    ...TagData
-  }
-}
-
-query AllPerformersForFilter {
-  allPerformers {
-    ...SlimPerformerData
-  }
-}
-
-query AllStudiosForFilter {
-  allStudios {
-    ...SlimStudioData
-  }
-}
-query AllMoviesForFilter {
-  allMovies {
-    ...SlimMovieData
-  }
-}
-
-query AllTagsForFilter {
-  allTags {
-    id
-    name
-    aliases
-  }
-}
-
-query Stats {
-  stats {
-    scene_count,
-    scenes_size,
-    scenes_duration,
-    image_count,
-    images_size,
-    gallery_count,
-    performer_count,
-    studio_count,
-    movie_count,
-    tag_count
-  }
-}
-
-query Logs {
-  logs {
-    ...LogEntryData
-  }
-}
-query Version {
-  version {
-    version
-    hash
-    build_time
-  }
-}
-
-query LatestVersion {
-  latestversion {
-    shorthash
-    url
-  }
-}

graphql/documents/queries/movie.graphql

@@ -1,14 +0,0 @@
-query FindMovies($filter: FindFilterType, $movie_filter: MovieFilterType) {
-  findMovies(filter: $filter, movie_filter: $movie_filter) {
-    count
-    movies {
-      ...MovieData
-    }
-  }
-}
-
-query FindMovie($id: ID!) {
-  findMovie(id: $id) {
-    ...MovieData
-  }
-}

graphql/documents/queries/performer.graphql

@@ -1,14 +0,0 @@
-query FindPerformers($filter: FindFilterType, $performer_filter: PerformerFilterType) {
-  findPerformers(filter: $filter, performer_filter: $performer_filter) {
-    count
-    performers {
-      ...PerformerData
-    }
-  }
-}
-
-query FindPerformer($id: ID!) {
-  findPerformer(id: $id) {
-    ...PerformerData
-  }
-}

graphql/documents/queries/plugins.graphql

@@ -1,31 +0,0 @@
-query Plugins {
-  plugins {
-    id
-    name
-    description
-    url
-    version
-
-    tasks {
-      name
-      description
-    }
-
-    hooks {
-      name
-      description
-      hooks
-    }
-  }
-}
-
-query PluginTasks {
-  pluginTasks {
-    name
-    description
-    plugin {
-      id
-      name
-    }
-  }
-}

graphql/documents/queries/scene-marker.graphql

@@ -1,8 +0,0 @@
-query FindSceneMarkers($filter: FindFilterType, $scene_marker_filter: SceneMarkerFilterType) {
-  findSceneMarkers(filter: $filter, scene_marker_filter: $scene_marker_filter) {
-    count
-    scene_markers {
-      ...SceneMarkerData
-    }
-  }
-}

graphql/documents/queries/scene.graphql

@@ -1,70 +0,0 @@
-query FindScenes($filter: FindFilterType, $scene_filter: SceneFilterType, $scene_ids: [Int!]) {
-  findScenes(filter: $filter, scene_filter: $scene_filter, scene_ids: $scene_ids) {
-    count
-    scenes {
-      ...SlimSceneData
-    }
-  }
-}
-
-query FindScenesByPathRegex($filter: FindFilterType) {
-  findScenesByPathRegex(filter: $filter) {
-    count
-    scenes {
-      ...SlimSceneData
-    }
-  }
-}
-
-query FindDuplicateScenes($distance: Int) {
-  findDuplicateScenes(distance: $distance) {
-    ...SlimSceneData
-  }
-}
-
-query FindScene($id: ID!, $checksum: String) {
-  findScene(id: $id, checksum: $checksum) {
-    ...SceneData
-  }
-
-  sceneMarkerTags(scene_id: $id) {
-    tag {
-      id
-      name
-    }
-    scene_markers {
-      ...SceneMarkerData
-    }
-  }
-}
-
-query ParseSceneFilenames($filter: FindFilterType!, $config: SceneParserInput!) {
-  parseSceneFilenames(filter: $filter, config: $config) {
-    count
-    results {
-      scene {
-        ...SlimSceneData
-      }
-      title
-      details
-      url
-      date
-      rating
-      studio_id
-      gallery_ids
-      movies {
-        movie_id
-      }
-      performer_ids
-      tag_ids
-    }
-  }
-}
-
-query SceneStreams($id: ID!) {
-  sceneStreams(id: $id) {
-    url
-    mime_type
-    label
-  }
-}

graphql/documents/queries/scrapers/freeones.graphql

@@ -1,27 +0,0 @@
-query ScrapeFreeones($performer_name: String!) {
-  scrapeFreeones(performer_name: $performer_name) {
-    name
-    url
-    twitter
-    instagram
-    birthdate
-    ethnicity
-    country
-    eye_color
-    height
-    measurements
-    fake_tits
-    career_length
-    tattoos
-    piercings
-    aliases
-    details
-    death_date
-    hair_color
-    weight
-  }
-}
-
-query ScrapeFreeonesPerformers($q: String!) {
-  scrapeFreeonesPerformerList(query: $q)
-}

graphql/documents/queries/scrapers/scrapers.graphql

@@ -1,97 +0,0 @@
-query ListPerformerScrapers {
-  listPerformerScrapers {
-    id
-    name
-    performer {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
-query ListSceneScrapers {
-  listSceneScrapers {
-    id
-    name
-    scene {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
-query ListGalleryScrapers {
-  listGalleryScrapers {
-    id
-    name
-    gallery {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
-query ListMovieScrapers {
-  listMovieScrapers {
-    id
-    name
-    movie {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
-query ScrapeSinglePerformer($source: ScraperSourceInput!, $input: ScrapeSinglePerformerInput!) {
-  scrapeSinglePerformer(source: $source, input: $input) {
-    ...ScrapedPerformerData
-  }
-}
-
-query ScrapeMultiPerformers($source: ScraperSourceInput!, $input: ScrapeMultiPerformersInput!) {
-  scrapeMultiPerformers(source: $source, input: $input) {
-    ...ScrapedPerformerData
-  }
-}
-
-query ScrapePerformerURL($url: String!) {
-  scrapePerformerURL(url: $url) {
-    ...ScrapedPerformerData
-  }
-}
-
-query ScrapeSingleScene($source: ScraperSourceInput!, $input: ScrapeSingleSceneInput!) {
-  scrapeSingleScene(source: $source, input: $input) {
-    ...ScrapedSceneData
-  }
-}
-
-query ScrapeMultiScenes($source: ScraperSourceInput!, $input: ScrapeMultiScenesInput!) {
-  scrapeMultiScenes(source: $source, input: $input) {
-    ...ScrapedSceneData
-  }
-}
-
-query ScrapeSceneURL($url: String!) {
-  scrapeSceneURL(url: $url) {
-    ...ScrapedSceneData
-  }
-}
-
-query ScrapeSingleGallery($source: ScraperSourceInput!, $input: ScrapeSingleGalleryInput!) {
-  scrapeSingleGallery(source: $source, input: $input) {
-    ...ScrapedGalleryData
-  }
-}
-
-query ScrapeGalleryURL($url: String!) {
-  scrapeGalleryURL(url: $url) {
-    ...ScrapedGalleryData
-  }
-}
-
-query ScrapeMovieURL($url: String!) {
-  scrapeMovieURL(url: $url) {
-    ...ScrapedMovieData
-  }
-}

graphql/documents/queries/settings/config.graphql

@@ -1,13 +0,0 @@
-query Configuration {
-  configuration {
-    ...ConfigData
-  }
-}
-
-query Directory($path: String) {
-  directory(path: $path) {
-      path
-      parent
-      directories
-  }
-}

graphql/documents/queries/settings/metadata.graphql

@@ -1,9 +0,0 @@
-query SystemStatus {
-  systemStatus {
-    databaseSchema
-    databasePath
-    appSchema
-    status
-    configPath
-  }
-}

graphql/documents/queries/studio.graphql

@@ -1,14 +0,0 @@
-query FindStudios($filter: FindFilterType, $studio_filter: StudioFilterType ) {
-  findStudios(filter: $filter, studio_filter: $studio_filter) {
-    count
-    studios {
-      ...StudioData
-    }
-  }
-}
-
-query FindStudio($id: ID!) {
-  findStudio(id: $id) {
-    ...StudioData
-  }
-}

graphql/documents/queries/tag.graphql

@@ -1,14 +0,0 @@
-query FindTags($filter: FindFilterType, $tag_filter: TagFilterType ) {
-  findTags(filter: $filter, tag_filter: $tag_filter) {
-    count
-    tags {
-      ...TagData
-    }
-  }
-}
-
-query FindTag($id: ID!) {
-  findTag(id: $id) {
-    ...TagData
-  }
-}

graphql/schema/schema.graphql

@@ -1,133 +1,197 @@
-"""The query root for this schema"""
+"The query root for this schema"
 type Query {
   # Filters
-  findSavedFilters(mode: FilterMode!): [SavedFilter!]!
+  findSavedFilter(id: ID!): SavedFilter
+  findSavedFilters(mode: FilterMode): [SavedFilter!]!
   findDefaultFilter(mode: FilterMode!): SavedFilter
 
-  """Find a scene by ID or Checksum"""
+  "Find a scene by ID or Checksum"
   findScene(id: ID, checksum: String): Scene
   findSceneByHash(input: SceneHashInput!): Scene
-  
-  """A function which queries Scene objects"""
-  findScenes(scene_filter: SceneFilterType, scene_ids: [Int!], filter: FindFilterType): FindScenesResultType!
+
+  "A function which queries Scene objects"
+  findScenes(
+    scene_filter: SceneFilterType
+    scene_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
+    filter: FindFilterType
+  ): FindScenesResultType!
 
   findScenesByPathRegex(filter: FindFilterType): FindScenesResultType!
 
-  """ Returns any groups of scenes that are perceptual duplicates within the queried distance """
-  findDuplicateScenes(distance: Int): [[Scene!]!]!
+  """
+  Returns any groups of scenes that are perceptual duplicates within the queried distance
+  and the difference between their duration is smaller than durationDiff
+  """
+  findDuplicateScenes(
+    distance: Int
+    """
+    Max difference in seconds between files in order to be considered for similarity matching.
+    Fractional seconds are ok: 0.5 will mean only files that have durations within 0.5 seconds between them will be matched based on PHash distance.
+    """
+    duration_diff: Float
+  ): [[Scene!]!]!
 
-  """Return valid stream paths"""
+  "Return valid stream paths"
   sceneStreams(id: ID): [SceneStreamEndpoint!]!
 
-  parseSceneFilenames(filter: FindFilterType, config: SceneParserInput!): SceneParserResultType!
+  parseSceneFilenames(
+    filter: FindFilterType
+    config: SceneParserInput!
+  ): SceneParserResultType!
 
-  """A function which queries SceneMarker objects"""
-  findSceneMarkers(scene_marker_filter: SceneMarkerFilterType filter: FindFilterType): FindSceneMarkersResultType!
+  "A function which queries SceneMarker objects"
+  findSceneMarkers(
+    scene_marker_filter: SceneMarkerFilterType
+    filter: FindFilterType
+  ): FindSceneMarkersResultType!
 
   findImage(id: ID, checksum: String): Image
-  
-  """A function which queries Scene objects"""
-  findImages(image_filter: ImageFilterType, image_ids: [Int!], filter: FindFilterType): FindImagesResultType!
 
-  """Find a performer by ID"""
+  "A function which queries Scene objects"
+  findImages(
+    image_filter: ImageFilterType
+    image_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
+    filter: FindFilterType
+  ): FindImagesResultType!
+
+  "Find a performer by ID"
   findPerformer(id: ID!): Performer
-  """A function which queries Performer objects"""
-  findPerformers(performer_filter: PerformerFilterType, filter: FindFilterType): FindPerformersResultType!
+  "A function which queries Performer objects"
+  findPerformers(
+    performer_filter: PerformerFilterType
+    filter: FindFilterType
+    performer_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
+  ): FindPerformersResultType!
 
-  """Find a studio by ID"""
+  "Find a studio by ID"
   findStudio(id: ID!): Studio
-  """A function which queries Studio objects"""
-  findStudios(studio_filter: StudioFilterType, filter: FindFilterType): FindStudiosResultType!
+  "A function which queries Studio objects"
+  findStudios(
+    studio_filter: StudioFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindStudiosResultType!
 
-   """Find a movie by ID"""
+  "Find a movie by ID"
   findMovie(id: ID!): Movie
-  """A function which queries Movie objects"""
-  findMovies(movie_filter: MovieFilterType, filter: FindFilterType): FindMoviesResultType!
+  "A function which queries Movie objects"
+  findMovies(
+    movie_filter: MovieFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindMoviesResultType!
 
   findGallery(id: ID!): Gallery
-  findGalleries(gallery_filter: GalleryFilterType, filter: FindFilterType): FindGalleriesResultType!
+  findGalleries(
+    gallery_filter: GalleryFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindGalleriesResultType!
 
   findTag(id: ID!): Tag
-  findTags(tag_filter: TagFilterType, filter: FindFilterType): FindTagsResultType!
+  findTags(
+    tag_filter: TagFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindTagsResultType!
 
-  """Retrieve random scene markers for the wall"""
+  "Retrieve random scene markers for the wall"
   markerWall(q: String): [SceneMarker!]!
-  """Retrieve random scenes for the wall"""
+  "Retrieve random scenes for the wall"
   sceneWall(q: String): [Scene!]!
 
-  """Get marker strings"""
+  "Get marker strings"
   markerStrings(q: String, sort: String): [MarkerStringsResultType]!
-  """Get stats"""
+  "Get stats"
   stats: StatsResultType!
-  """Organize scene markers by tag for a given scene ID"""
+  "Organize scene markers by tag for a given scene ID"
   sceneMarkerTags(scene_id: ID!): [SceneMarkerTag!]!
 
   logs: [LogEntry!]!
 
   # Scrapers
 
-  """List available scrapers"""
-  listPerformerScrapers: [Scraper!]!
-  listSceneScrapers: [Scraper!]!
-  listGalleryScrapers: [Scraper!]!
-  listMovieScrapers: [Scraper!]!
+  "List available scrapers"
+  listScrapers(types: [ScrapeContentType!]!): [Scraper!]!
 
-  """Scrape for a single scene"""
-  scrapeSingleScene(source: ScraperSourceInput!, input: ScrapeSingleSceneInput!): [ScrapedScene!]!
-  """Scrape for multiple scenes"""
-  scrapeMultiScenes(source: ScraperSourceInput!, input: ScrapeMultiScenesInput!): [[ScrapedScene!]!]!
+  "Scrape for a single scene"
+  scrapeSingleScene(
+    source: ScraperSourceInput!
+    input: ScrapeSingleSceneInput!
+  ): [ScrapedScene!]!
+  "Scrape for multiple scenes"
+  scrapeMultiScenes(
+    source: ScraperSourceInput!
+    input: ScrapeMultiScenesInput!
+  ): [[ScrapedScene!]!]!
 
-  """Scrape for a single performer"""
-  scrapeSinglePerformer(source: ScraperSourceInput!, input: ScrapeSinglePerformerInput!): [ScrapedPerformer!]!
-  """Scrape for multiple performers"""
-  scrapeMultiPerformers(source: ScraperSourceInput!, input: ScrapeMultiPerformersInput!): [[ScrapedPerformer!]!]!
+  "Scrape for a single studio"
+  scrapeSingleStudio(
+    source: ScraperSourceInput!
+    input: ScrapeSingleStudioInput!
+  ): [ScrapedStudio!]!
 
-  """Scrape for a single gallery"""
-  scrapeSingleGallery(source: ScraperSourceInput!, input: ScrapeSingleGalleryInput!): [ScrapedGallery!]!
+  "Scrape for a single performer"
+  scrapeSinglePerformer(
+    source: ScraperSourceInput!
+    input: ScrapeSinglePerformerInput!
+  ): [ScrapedPerformer!]!
+  "Scrape for multiple performers"
+  scrapeMultiPerformers(
+    source: ScraperSourceInput!
+    input: ScrapeMultiPerformersInput!
+  ): [[ScrapedPerformer!]!]!
 
-  """Scrape for a single movie"""
-  scrapeSingleMovie(source: ScraperSourceInput!, input: ScrapeSingleMovieInput!): [ScrapedMovie!]!
+  "Scrape for a single gallery"
+  scrapeSingleGallery(
+    source: ScraperSourceInput!
+    input: ScrapeSingleGalleryInput!
+  ): [ScrapedGallery!]!
 
-  """Scrapes a complete performer record based on a URL"""
+  "Scrape for a single movie"
+  scrapeSingleMovie(
+    source: ScraperSourceInput!
+    input: ScrapeSingleMovieInput!
+  ): [ScrapedMovie!]!
+
+  "Scrapes content based on a URL"
+  scrapeURL(url: String!, ty: ScrapeContentType!): ScrapedContent
+
+  "Scrapes a complete performer record based on a URL"
   scrapePerformerURL(url: String!): ScrapedPerformer
-  """Scrapes a complete performer record based on a URL"""
+  "Scrapes a complete scene record based on a URL"
   scrapeSceneURL(url: String!): ScrapedScene
-  """Scrapes a complete gallery record based on a URL"""
+  "Scrapes a complete gallery record based on a URL"
   scrapeGalleryURL(url: String!): ScrapedGallery
-  """Scrapes a complete movie record based on a URL"""
+  "Scrapes a complete movie record based on a URL"
   scrapeMovieURL(url: String!): ScrapedMovie
 
-  """Scrape a list of performers based on name"""
-  scrapePerformerList(scraper_id: ID!, query: String!): [ScrapedPerformer!]! @deprecated(reason: "use scrapeSinglePerformer")
-  """Scrapes a complete performer record based on a scrapePerformerList result"""
-  scrapePerformer(scraper_id: ID!, scraped_performer: ScrapedPerformerInput!): ScrapedPerformer @deprecated(reason: "use scrapeSinglePerformer")
-  """Scrapes a complete scene record based on an existing scene"""
-  scrapeScene(scraper_id: ID!, scene: SceneUpdateInput!): ScrapedScene @deprecated(reason: "use scrapeSingleScene")
-  """Scrapes a complete gallery record based on an existing gallery"""
-  scrapeGallery(scraper_id: ID!, gallery: GalleryUpdateInput!): ScrapedGallery @deprecated(reason: "use scrapeSingleGallery")
-
-  """Scrape a performer using Freeones"""
-  scrapeFreeones(performer_name: String!): ScrapedPerformer @deprecated(reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones")
-  """Scrape a list of performers from a query"""
-  scrapeFreeonesPerformerList(query: String!): [String!]! @deprecated(reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones")
-
-  """Query StashBox for scenes"""
-  queryStashBoxScene(input: StashBoxSceneQueryInput!): [ScrapedScene!]! @deprecated(reason: "use scrapeSingleScene or scrapeMultiScenes")
-  """Query StashBox for performers"""
-  queryStashBoxPerformer(input: StashBoxPerformerQueryInput!): [StashBoxPerformerQueryResult!]! @deprecated(reason: "use scrapeSinglePerformer or scrapeMultiPerformers")
-  # === end deprecated methods ===
-
   # Plugins
-  """List loaded plugins"""
+  "List loaded plugins"
   plugins: [Plugin!]
-  """List available plugin operations"""
+  "List available plugin operations"
   pluginTasks: [PluginTask!]
 
+  # Packages
+  "List installed packages"
+  installedPackages(type: PackageType!): [Package!]!
+  "List available packages"
+  availablePackages(type: PackageType!, source: String!): [Package!]!
+
   # Config
-  """Returns the current, complete configuration"""
+  "Returns the current, complete configuration"
   configuration: ConfigResult!
-  """Returns an array of paths for the given path"""
-  directory(path: String): Directory!
+  "Returns an array of paths for the given path"
+  directory(
+    "The directory path to list"
+    path: String
+    "Desired collation locale. Determines the order of the directory result. eg. 'en-US', 'pt-BR', ..."
+    locale: String = "en"
+  ): Directory!
+  validateStashBoxCredentials(input: StashBoxInput!): StashBoxValidationResult!
 
   # System status
   systemStatus: SystemStatus!
@@ -140,55 +204,85 @@ type Query {
 
   # Get everything
 
+  allScenes: [Scene!]! @deprecated(reason: "Use findScenes instead")
+  allSceneMarkers: [SceneMarker!]!
+    @deprecated(reason: "Use findSceneMarkers instead")
+  allImages: [Image!]! @deprecated(reason: "Use findImages instead")
+  allGalleries: [Gallery!]! @deprecated(reason: "Use findGalleries instead")
+
   allPerformers: [Performer!]!
-  allStudios: [Studio!]!
-  allMovies: [Movie!]!
-  allTags: [Tag!]!
+  allTags: [Tag!]! @deprecated(reason: "Use findTags instead")
+  allStudios: [Studio!]! @deprecated(reason: "Use findStudios instead")
+  allMovies: [Movie!]! @deprecated(reason: "Use findMovies instead")
 
   # Get everything with minimal metadata
 
   # Version
   version: Version!
-  
+
   # LatestVersion
-  latestversion: ShortVersion!
+  latestversion: LatestVersion!
 }
 
 type Mutation {
   setup(input: SetupInput!): Boolean!
   migrate(input: MigrateInput!): Boolean!
 
+  sceneCreate(input: SceneCreateInput!): Scene
   sceneUpdate(input: SceneUpdateInput!): Scene
+  sceneMerge(input: SceneMergeInput!): Scene
   bulkSceneUpdate(input: BulkSceneUpdateInput!): [Scene!]
   sceneDestroy(input: SceneDestroyInput!): Boolean!
   scenesDestroy(input: ScenesDestroyInput!): Boolean!
   scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
 
-  """Increments the o-counter for a scene. Returns the new value"""
-  sceneIncrementO(id: ID!): Int!
-  """Decrements the o-counter for a scene. Returns the new value"""
-  sceneDecrementO(id: ID!): Int!
-  """Resets the o-counter for a scene to 0. Returns the new value"""
+  "Increments the o-counter for a scene. Returns the new value"
+  sceneIncrementO(id: ID!): Int! @deprecated(reason: "Use sceneAddO instead")
+  "Decrements the o-counter for a scene. Returns the new value"
+  sceneDecrementO(id: ID!): Int! @deprecated(reason: "Use sceneRemoveO instead")
+
+  "Increments the o-counter for a scene. Uses the current time if none provided."
+  sceneAddO(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Decrements the o-counter for a scene, removing the last recorded time if specific time not provided. Returns the new value"
+  sceneDeleteO(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+
+  "Resets the o-counter for a scene to 0. Returns the new value"
   sceneResetO(id: ID!): Int!
 
-  """Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"""
+  "Sets the resume time point (if provided) and adds the provided duration to the scene's play duration"
+  sceneSaveActivity(id: ID!, resume_time: Float, playDuration: Float): Boolean!
+
+  "Increments the play count for the scene. Returns the new play count value."
+  sceneIncrementPlayCount(id: ID!): Int!
+    @deprecated(reason: "Use sceneAddPlay instead")
+
+  "Increments the play count for the scene. Uses the current time if none provided."
+  sceneAddPlay(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Decrements the play count for the scene, removing the specific times or the last recorded time if not provided."
+  sceneDeletePlay(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Resets the play count for a scene to 0. Returns the new play count value."
+  sceneResetPlayCount(id: ID!): Int!
+
+  "Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"
   sceneGenerateScreenshot(id: ID!, at: Float): String!
 
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
   sceneMarkerDestroy(id: ID!): Boolean!
 
+  sceneAssignFile(input: AssignSceneFileInput!): Boolean!
+
   imageUpdate(input: ImageUpdateInput!): Image
   bulkImageUpdate(input: BulkImageUpdateInput!): [Image!]
   imageDestroy(input: ImageDestroyInput!): Boolean!
   imagesDestroy(input: ImagesDestroyInput!): Boolean!
   imagesUpdate(input: [ImageUpdateInput!]!): [Image]
 
-  """Increments the o-counter for an image. Returns the new value"""
+  "Increments the o-counter for an image. Returns the new value"
   imageIncrementO(id: ID!): Int!
-  """Decrements the o-counter for an image. Returns the new value"""
+  "Decrements the o-counter for an image. Returns the new value"
   imageDecrementO(id: ID!): Int!
-  """Resets the o-counter for a image to 0. Returns the new value"""
+  "Resets the o-counter for a image to 0. Returns the new value"
   imageResetO(id: ID!): Int!
 
   galleryCreate(input: GalleryCreateInput!): Gallery
@@ -200,6 +294,10 @@ type Mutation {
   addGalleryImages(input: GalleryAddInput!): Boolean!
   removeGalleryImages(input: GalleryRemoveInput!): Boolean!
 
+  galleryChapterCreate(input: GalleryChapterCreateInput!): GalleryChapter
+  galleryChapterUpdate(input: GalleryChapterUpdateInput!): GalleryChapter
+  galleryChapterDestroy(id: ID!): Boolean!
+
   performerCreate(input: PerformerCreateInput!): Performer
   performerUpdate(input: PerformerUpdateInput!): Performer
   performerDestroy(input: PerformerDestroyInput!): Boolean!
@@ -215,6 +313,7 @@ type Mutation {
   movieUpdate(input: MovieUpdateInput!): Movie
   movieDestroy(input: MovieDestroyInput!): Boolean!
   moviesDestroy(ids: [ID!]!): Boolean!
+  bulkMovieUpdate(input: BulkMovieUpdateInput!): [Movie!]
 
   tagCreate(input: TagCreateInput!): Tag
   tagUpdate(input: TagUpdateInput!): Tag
@@ -222,72 +321,177 @@ type Mutation {
   tagsDestroy(ids: [ID!]!): Boolean!
   tagsMerge(input: TagsMergeInput!): Tag
 
+  """
+  Moves the given files to the given destination. Returns true if successful.
+  Either the destination_folder or destination_folder_id must be provided.
+  If both are provided, the destination_folder_id takes precedence.
+  Destination folder must be a subfolder of one of the stash library paths.
+  If provided, destination_basename must be a valid filename with an extension that
+  matches one of the media extensions.
+  Creates folder hierarchy if needed.
+  """
+  moveFiles(input: MoveFilesInput!): Boolean!
+  deleteFiles(ids: [ID!]!): Boolean!
+
+  fileSetFingerprints(input: FileSetFingerprintsInput!): Boolean!
+
   # Saved filters
   saveFilter(input: SaveFilterInput!): SavedFilter!
   destroySavedFilter(input: DestroyFilterInput!): Boolean!
   setDefaultFilter(input: SetDefaultFilterInput!): Boolean!
 
-  """Change general configuration options"""
+  "Change general configuration options"
   configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
   configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
   configureDLNA(input: ConfigDLNAInput!): ConfigDLNAResult!
   configureScraping(input: ConfigScrapingInput!): ConfigScrapingResult!
+  configureDefaults(
+    input: ConfigDefaultSettingsInput!
+  ): ConfigDefaultSettingsResult!
 
-  """Generate and set (or clear) API key"""
+  # overwrites the entire plugin configuration for the given plugin
+  configurePlugin(plugin_id: ID!, input: Map!): Map!
+
+  # overwrites the entire UI configuration
+  configureUI(input: Map!): Map!
+  # sets a single UI key value
+  configureUISetting(key: String!, value: Any): Map!
+
+  "Generate and set (or clear) API key"
   generateAPIKey(input: GenerateAPIKeyInput!): String!
 
-  """Returns a link to download the result"""
+  "Returns a link to download the result"
   exportObjects(input: ExportObjectsInput!): String
 
-  """Performs an incremental import. Returns the job ID"""
+  "Performs an incremental import. Returns the job ID"
   importObjects(input: ImportObjectsInput!): ID!
 
-  """Start an full import. Completely wipes the database and imports from the metadata directory. Returns the job ID"""
+  "Start an full import. Completely wipes the database and imports from the metadata directory. Returns the job ID"
   metadataImport: ID!
-  """Start a full export. Outputs to the metadata directory. Returns the job ID"""
+  "Start a full export. Outputs to the metadata directory. Returns the job ID"
   metadataExport: ID!
-  """Start a scan. Returns the job ID"""
+  "Start a scan. Returns the job ID"
   metadataScan(input: ScanMetadataInput!): ID!
-  """Start generating content. Returns the job ID"""
+  "Start generating content. Returns the job ID"
   metadataGenerate(input: GenerateMetadataInput!): ID!
-  """Start auto-tagging. Returns the job ID"""
+  "Start auto-tagging. Returns the job ID"
   metadataAutoTag(input: AutoTagMetadataInput!): ID!
-  """Clean metadata. Returns the job ID"""
+  "Clean metadata. Returns the job ID"
   metadataClean(input: CleanMetadataInput!): ID!
-  """Migrate generated files for the current hash naming"""
-  migrateHashNaming: ID!
+  "Clean generated files. Returns the job ID"
+  metadataCleanGenerated(input: CleanGeneratedInput!): ID!
+  "Identifies scenes using scrapers. Returns the job ID"
+  metadataIdentify(input: IdentifyMetadataInput!): ID!
 
-  """Reload scrapers"""
+  "Migrate generated files for the current hash naming"
+  migrateHashNaming: ID!
+  "Migrates legacy scene screenshot files into the blob storage"
+  migrateSceneScreenshots(input: MigrateSceneScreenshotsInput!): ID!
+  "Migrates blobs from the old storage system to the current one"
+  migrateBlobs(input: MigrateBlobsInput!): ID!
+
+  "Anonymise the database in a separate file. Optionally returns a link to download the database file"
+  anonymiseDatabase(input: AnonymiseDatabaseInput!): String
+
+  "Optimises the database. Returns the job ID"
+  optimiseDatabase: ID!
+
+  "Reload scrapers"
   reloadScrapers: Boolean!
 
-  """Run plugin task. Returns the job ID"""
-  runPluginTask(plugin_id: ID!, task_name: String!, args: [PluginArgInput!]): ID!
+  """
+  Enable/disable plugins - enabledMap is a map of plugin IDs to enabled booleans.
+  Plugins not in the map are not affected.
+  """
+  setPluginsEnabled(enabledMap: BoolMap!): Boolean!
+
+  """
+  Run a plugin task.
+  If task_name is provided, then the task must exist in the plugin config and the tasks configuration
+  will be used to run the plugin.
+  If no task_name is provided, then the plugin will be executed with the arguments provided only.
+  Returns the job ID
+  """
+  runPluginTask(
+    plugin_id: ID!
+    "if provided, then the default args will be applied"
+    task_name: String
+    "displayed in the task queue"
+    description: String
+    args: [PluginArgInput!] @deprecated(reason: "Use args_map instead")
+    args_map: Map
+  ): ID!
+
+  """
+  Runs a plugin operation. The operation is run immediately and does not use the job queue.
+  Returns a map of the result.
+  """
+  runPluginOperation(plugin_id: ID!, args: Map): Any
+
   reloadPlugins: Boolean!
 
+  """
+  Installs the given packages.
+  If a package is already installed, it will be updated if needed..
+  If an error occurs when installing a package, the job will continue to install the remaining packages.
+  Returns the job ID
+  """
+  installPackages(type: PackageType!, packages: [PackageSpecInput!]!): ID!
+  """
+  Updates the given packages.
+  If a package is not installed, it will not be installed.
+  If a package does not need to be updated, it will not be updated.
+  If no packages are provided, all packages of the given type will be updated.
+  If an error occurs when updating a package, the job will continue to update the remaining packages.
+  Returns the job ID.
+  """
+  updatePackages(type: PackageType!, packages: [PackageSpecInput!]): ID!
+  """
+  Uninstalls the given packages.
+  If an error occurs when uninstalling a package, the job will continue to uninstall the remaining packages.
+  Returns the job ID
+  """
+  uninstallPackages(type: PackageType!, packages: [PackageSpecInput!]!): ID!
+
   stopJob(job_id: ID!): Boolean!
   stopAllJobs: Boolean!
 
-  """Submit fingerprints to stash-box instance"""
-  submitStashBoxFingerprints(input: StashBoxFingerprintSubmissionInput!): Boolean!
+  "Submit fingerprints to stash-box instance"
+  submitStashBoxFingerprints(
+    input: StashBoxFingerprintSubmissionInput!
+  ): Boolean!
 
-  """Backup the database. Optionally returns a link to download the database file"""
+  "Submit scene as draft to stash-box instance"
+  submitStashBoxSceneDraft(input: StashBoxDraftSubmissionInput!): ID
+  "Submit performer as draft to stash-box instance"
+  submitStashBoxPerformerDraft(input: StashBoxDraftSubmissionInput!): ID
+
+  "Backup the database. Optionally returns a link to download the database file"
   backupDatabase(input: BackupDatabaseInput!): String
 
-  """Run batch performer tag task. Returns the job ID."""
-  stashBoxBatchPerformerTag(input: StashBoxBatchPerformerTagInput!): String!
-  
-  """Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"""
+  "DANGEROUS: Execute an arbitrary SQL statement that returns rows."
+  querySQL(sql: String!, args: [Any]): SQLQueryResult!
+
+  "DANGEROUS: Execute an arbitrary SQL statement without returning any rows."
+  execSQL(sql: String!, args: [Any]): SQLExecResult!
+
+  "Run batch performer tag task. Returns the job ID."
+  stashBoxBatchPerformerTag(input: StashBoxBatchTagInput!): String!
+  "Run batch studio tag task. Returns the job ID."
+  stashBoxBatchStudioTag(input: StashBoxBatchTagInput!): String!
+
+  "Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"
   enableDLNA(input: EnableDLNAInput!): Boolean!
-  """Disables DLNA for an optional duration. Has no effect if DLNA is disabled by default"""
+  "Disables DLNA for an optional duration. Has no effect if DLNA is disabled by default"
   disableDLNA(input: DisableDLNAInput!): Boolean!
-  """Enables an IP address for DLNA for an optional duration"""
+  "Enables an IP address for DLNA for an optional duration"
   addTempDLNAIP(input: AddTempDLNAIPInput!): Boolean!
-  """Removes an IP address from the temporary DLNA whitelist"""
+  "Removes an IP address from the temporary DLNA whitelist"
   removeTempDLNAIP(input: RemoveTempDLNAIPInput!): Boolean!
 }
 
 type Subscription {
-  """Update from the metadata manager"""
+  "Update from the metadata manager"
   jobsSubscribe: JobStatusUpdate!
 
   loggingSubscribe: [LogEntry!]!

graphql/schema/types/config.graphql

@@ -1,307 +1,551 @@
 input SetupInput {
-  """Empty to indicate $HOME/.stash/config.yml default"""
+  "Empty to indicate $HOME/.stash/config.yml default"
   configLocation: String!
   stashes: [StashConfigInput!]!
-  """Empty to indicate default"""
+  "Empty to indicate default"
   databaseFile: String!
-  """Empty to indicate default"""
+  "Empty to indicate default"
   generatedLocation: String!
+  "Empty to indicate default"
+  cacheLocation: String!
+  storeBlobsInDatabase: Boolean!
+  "Empty to indicate default - only applicable if storeBlobsInDatabase is false"
+  blobsLocation: String!
 }
 
 enum StreamingResolutionEnum {
-  "240p", LOW
-  "480p", STANDARD
-  "720p", STANDARD_HD
-  "1080p", FULL_HD
-  "4k", FOUR_K
-  "Original", ORIGINAL
+  "240p"
+  LOW
+  "480p"
+  STANDARD
+  "720p"
+  STANDARD_HD
+  "1080p"
+  FULL_HD
+  "4k"
+  FOUR_K
+  "Original"
+  ORIGINAL
 }
 
 enum PreviewPreset {
-  "X264_ULTRAFAST", ultrafast
-  "X264_VERYFAST", veryfast
-  "X264_FAST", fast
-  "X264_MEDIUM", medium
-  "X264_SLOW", slow
-  "X264_SLOWER", slower
-  "X264_VERYSLOW", veryslow
+  "X264_ULTRAFAST"
+  ultrafast
+  "X264_VERYFAST"
+  veryfast
+  "X264_FAST"
+  fast
+  "X264_MEDIUM"
+  medium
+  "X264_SLOW"
+  slow
+  "X264_SLOWER"
+  slower
+  "X264_VERYSLOW"
+  veryslow
 }
 
 enum HashAlgorithm {
   MD5
-  "oshash", OSHASH
+  "oshash"
+  OSHASH
+}
+
+enum BlobsStorageType {
+  # blobs are stored in the database
+  "Database"
+  DATABASE
+  # blobs are stored in the filesystem under the configured blobs directory
+  "Filesystem"
+  FILESYSTEM
 }
 
 input ConfigGeneralInput {
-  """Array of file paths to content"""
+  "Array of file paths to content"
   stashes: [StashConfigInput!]
-  """Path to the SQLite database"""
+  "Path to the SQLite database"
   databasePath: String
-  """Path to generated files"""
+  "Path to backup directory"
+  backupDirectoryPath: String
+  "Path to generated files"
   generatedPath: String
-  """Path to import/export files"""
+  "Path to import/export files"
   metadataPath: String
-  """Path to cache"""
+  "Path to scrapers"
+  scrapersPath: String
+  "Path to plugins"
+  pluginsPath: String
+  "Path to cache"
   cachePath: String
-  """Whether to calculate MD5 checksums for scene video files"""
-  calculateMD5: Boolean!
-  """Hash algorithm to use for generated file naming"""
-  videoFileNamingAlgorithm: HashAlgorithm!
-  """Number of parallel tasks to start during scan/generate"""
+  "Path to blobs - required for filesystem blob storage"
+  blobsPath: String
+  "Where to store blobs"
+  blobsStorage: BlobsStorageType
+  "Whether to calculate MD5 checksums for scene video files"
+  calculateMD5: Boolean
+  "Hash algorithm to use for generated file naming"
+  videoFileNamingAlgorithm: HashAlgorithm
+  "Number of parallel tasks to start during scan/generate"
   parallelTasks: Int
-  """Include audio stream in previews"""
-  previewAudio: Boolean!
-  """Number of segments in a preview file"""
+  "Include audio stream in previews"
+  previewAudio: Boolean
+  "Number of segments in a preview file"
   previewSegments: Int
-  """Preview segment duration, in seconds"""
+  "Preview segment duration, in seconds"
   previewSegmentDuration: Float
-  """Duration of start of video to exclude when generating previews"""
+  "Duration of start of video to exclude when generating previews"
   previewExcludeStart: String
-  """Duration of end of video to exclude when generating previews"""
+  "Duration of end of video to exclude when generating previews"
   previewExcludeEnd: String
-  """Preset when generating preview"""
+  "Preset when generating preview"
   previewPreset: PreviewPreset
-  """Max generated transcode size"""
+  "Transcode Hardware Acceleration"
+  transcodeHardwareAcceleration: Boolean
+  "Max generated transcode size"
   maxTranscodeSize: StreamingResolutionEnum
-  """Max streaming transcode size"""
+  "Max streaming transcode size"
   maxStreamingTranscodeSize: StreamingResolutionEnum
-  """Write image thumbnails to disk when generating on the fly"""
+
+  """
+  ffmpeg transcode input args - injected before input file
+  These are applied to generated transcodes (previews and transcodes)
+  """
+  transcodeInputArgs: [String!]
+  """
+  ffmpeg transcode output args - injected before output file
+  These are applied to generated transcodes (previews and transcodes)
+  """
+  transcodeOutputArgs: [String!]
+
+  """
+  ffmpeg stream input args - injected before input file
+  These are applied when live transcoding
+  """
+  liveTranscodeInputArgs: [String!]
+  """
+  ffmpeg stream output args - injected before output file
+  These are applied when live transcoding
+  """
+  liveTranscodeOutputArgs: [String!]
+
+  "whether to include range in generated funscript heatmaps"
+  drawFunscriptHeatmapRange: Boolean
+
+  "Write image thumbnails to disk when generating on the fly"
   writeImageThumbnails: Boolean
-  """Username"""
+  "Create Image Clips from Video extensions when Videos are disabled in Library"
+  createImageClipsFromVideos: Boolean
+  "Username"
   username: String
-  """Password"""
+  "Password"
   password: String
-  """Maximum session cookie age"""
+  "Maximum session cookie age"
   maxSessionAge: Int
-  """Comma separated list of proxies to allow traffic from"""
-  trustedProxies: [String!]
-  """Name of the log file"""
+  "Name of the log file"
   logFile: String
-  """Whether to also output to stderr"""
-  logOut: Boolean!
-  """Minimum log level"""
-  logLevel: String!
-  """Whether to log http access"""
-  logAccess: Boolean!
-  """True if galleries should be created from folders with images"""
-  createGalleriesFromFolders: Boolean!
-  """Array of video file extensions"""
+  "Whether to also output to stderr"
+  logOut: Boolean
+  "Minimum log level"
+  logLevel: String
+  "Whether to log http access"
+  logAccess: Boolean
+  "True if galleries should be created from folders with images"
+  createGalleriesFromFolders: Boolean
+  "Regex used to identify images as gallery covers"
+  galleryCoverRegex: String
+  "Array of video file extensions"
   videoExtensions: [String!]
-  """Array of image file extensions"""
+  "Array of image file extensions"
   imageExtensions: [String!]
-  """Array of gallery zip file extensions"""
+  "Array of gallery zip file extensions"
   galleryExtensions: [String!]
-  """Array of file regexp to exclude from Video Scans"""
+  "Array of file regexp to exclude from Video Scans"
   excludes: [String!]
-  """Array of file regexp to exclude from Image Scans"""
+  "Array of file regexp to exclude from Image Scans"
   imageExcludes: [String!]
-  """Custom Performer Image Location"""
+  "Custom Performer Image Location"
   customPerformerImageLocation: String
-  """Scraper user agent string"""
-  scraperUserAgent: String @deprecated(reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead")
-  """Scraper CDP path. Path to chrome executable or remote address"""
-  scraperCDPPath: String @deprecated(reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead")
-  """Whether the scraper should check for invalid certificates"""
-  scraperCertCheck: Boolean @deprecated(reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead")
-  """Stash-box instances used for tagging"""
-  stashBoxes: [StashBoxInput!]!
+  "Stash-box instances used for tagging"
+  stashBoxes: [StashBoxInput!]
+  "Python path - resolved using path if unset"
+  pythonPath: String
+
+  "Source of scraper packages"
+  scraperPackageSources: [PackageSourceInput!]
+  "Source of plugin packages"
+  pluginPackageSources: [PackageSourceInput!]
 }
 
 type ConfigGeneralResult {
-  """Array of file paths to content"""
+  "Array of file paths to content"
   stashes: [StashConfig!]!
-  """Path to the SQLite database"""
+  "Path to the SQLite database"
   databasePath: String!
-  """Path to generated files"""
+  "Path to backup directory"
+  backupDirectoryPath: String!
+  "Path to generated files"
   generatedPath: String!
-  """Path to import/export files"""
+  "Path to import/export files"
   metadataPath: String!
-  """Path to the config file used"""
+  "Path to the config file used"
   configFilePath: String!
-  """Path to scrapers"""
+  "Path to scrapers"
   scrapersPath: String!
-  """Path to cache"""
+  "Path to plugins"
+  pluginsPath: String!
+  "Path to cache"
   cachePath: String!
-  """Whether to calculate MD5 checksums for scene video files"""
+  "Path to blobs - required for filesystem blob storage"
+  blobsPath: String!
+  "Where to store blobs"
+  blobsStorage: BlobsStorageType!
+  "Whether to calculate MD5 checksums for scene video files"
   calculateMD5: Boolean!
-  """Hash algorithm to use for generated file naming"""
+  "Hash algorithm to use for generated file naming"
   videoFileNamingAlgorithm: HashAlgorithm!
-  """Number of parallel tasks to start during scan/generate"""
+  "Number of parallel tasks to start during scan/generate"
   parallelTasks: Int!
-  """Include audio stream in previews"""
+  "Include audio stream in previews"
   previewAudio: Boolean!
-  """Number of segments in a preview file"""
+  "Number of segments in a preview file"
   previewSegments: Int!
-  """Preview segment duration, in seconds"""
+  "Preview segment duration, in seconds"
   previewSegmentDuration: Float!
-  """Duration of start of video to exclude when generating previews"""
+  "Duration of start of video to exclude when generating previews"
   previewExcludeStart: String!
-  """Duration of end of video to exclude when generating previews"""
+  "Duration of end of video to exclude when generating previews"
   previewExcludeEnd: String!
-  """Preset when generating preview"""
+  "Preset when generating preview"
   previewPreset: PreviewPreset!
-  """Max generated transcode size"""
+  "Transcode Hardware Acceleration"
+  transcodeHardwareAcceleration: Boolean!
+  "Max generated transcode size"
   maxTranscodeSize: StreamingResolutionEnum
-  """Max streaming transcode size"""
+  "Max streaming transcode size"
   maxStreamingTranscodeSize: StreamingResolutionEnum
-  """Write image thumbnails to disk when generating on the fly"""
+
+  """
+  ffmpeg transcode input args - injected before input file
+  These are applied to generated transcodes (previews and transcodes)
+  """
+  transcodeInputArgs: [String!]!
+  """
+  ffmpeg transcode output args - injected before output file
+  These are applied to generated transcodes (previews and transcodes)
+  """
+  transcodeOutputArgs: [String!]!
+
+  """
+  ffmpeg stream input args - injected before input file
+  These are applied when live transcoding
+  """
+  liveTranscodeInputArgs: [String!]!
+  """
+  ffmpeg stream output args - injected before output file
+  These are applied when live transcoding
+  """
+  liveTranscodeOutputArgs: [String!]!
+
+  "whether to include range in generated funscript heatmaps"
+  drawFunscriptHeatmapRange: Boolean!
+
+  "Write image thumbnails to disk when generating on the fly"
   writeImageThumbnails: Boolean!
-  """API Key"""
+  "Create Image Clips from Video extensions when Videos are disabled in Library"
+  createImageClipsFromVideos: Boolean!
+  "API Key"
   apiKey: String!
-  """Username"""
+  "Username"
   username: String!
-  """Password"""
+  "Password"
   password: String!
-  """Maximum session cookie age"""
+  "Maximum session cookie age"
   maxSessionAge: Int!
-  """Comma separated list of proxies to allow traffic from"""
-  trustedProxies: [String!]!
-  """Name of the log file"""
+  "Name of the log file"
   logFile: String
-  """Whether to also output to stderr"""
+  "Whether to also output to stderr"
   logOut: Boolean!
-  """Minimum log level"""
+  "Minimum log level"
   logLevel: String!
-  """Whether to log http access"""
+  "Whether to log http access"
   logAccess: Boolean!
-  """Array of video file extensions"""
+  "Array of video file extensions"
   videoExtensions: [String!]!
-  """Array of image file extensions"""
+  "Array of image file extensions"
   imageExtensions: [String!]!
-  """Array of gallery zip file extensions"""
+  "Array of gallery zip file extensions"
   galleryExtensions: [String!]!
-  """True if galleries should be created from folders with images"""
+  "True if galleries should be created from folders with images"
   createGalleriesFromFolders: Boolean!
-  """Array of file regexp to exclude from Video Scans"""
+  "Regex used to identify images as gallery covers"
+  galleryCoverRegex: String!
+  "Array of file regexp to exclude from Video Scans"
   excludes: [String!]!
-  """Array of file regexp to exclude from Image Scans"""
+  "Array of file regexp to exclude from Image Scans"
   imageExcludes: [String!]!
-  """Custom Performer Image Location"""
+  "Custom Performer Image Location"
   customPerformerImageLocation: String
-  """Scraper user agent string"""
-  scraperUserAgent: String @deprecated(reason: "use ConfigResult.scraping instead")
-  """Scraper CDP path. Path to chrome executable or remote address"""
-  scraperCDPPath: String @deprecated(reason: "use ConfigResult.scraping instead")
-  """Whether the scraper should check for invalid certificates"""
-  scraperCertCheck: Boolean! @deprecated(reason: "use ConfigResult.scraping instead")
-  """Stash-box instances used for tagging"""
+  "Stash-box instances used for tagging"
   stashBoxes: [StashBox!]!
+  "Python path - resolved using path if unset"
+  pythonPath: String!
+
+  "Source of scraper packages"
+  scraperPackageSources: [PackageSource!]!
+  "Source of plugin packages"
+  pluginPackageSources: [PackageSource!]!
+}
+
+input ConfigDisableDropdownCreateInput {
+  performer: Boolean
+  tag: Boolean
+  studio: Boolean
+  movie: Boolean
+}
+
+enum ImageLightboxDisplayMode {
+  ORIGINAL
+  FIT_XY
+  FIT_X
+}
+
+enum ImageLightboxScrollMode {
+  ZOOM
+  PAN_Y
+}
+
+input ConfigImageLightboxInput {
+  slideshowDelay: Int
+  displayMode: ImageLightboxDisplayMode
+  scaleUp: Boolean
+  resetZoomOnNav: Boolean
+  scrollMode: ImageLightboxScrollMode
+  scrollAttemptsBeforeChange: Int
+}
+
+type ConfigImageLightboxResult {
+  slideshowDelay: Int
+  displayMode: ImageLightboxDisplayMode
+  scaleUp: Boolean
+  resetZoomOnNav: Boolean
+  scrollMode: ImageLightboxScrollMode
+  scrollAttemptsBeforeChange: Int!
 }
 
 input ConfigInterfaceInput {
-  """Ordered list of items that should be shown in the menu"""
+  "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
-  """Enable sound on mouseover previews"""
+
+  "Enable sound on mouseover previews"
   soundOnPreview: Boolean
-  """Show title and tags in wall view"""
+
+  "Show title and tags in wall view"
   wallShowTitle: Boolean
-  """Wall playback type"""
+  "Wall playback type"
   wallPlayback: String
-  """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
+
+  "Show scene scrubber by default"
+  showScrubber: Boolean
+
+  "Maximum duration (in seconds) in which a scene video will loop in the scene player"
   maximumLoopDuration: Int
-  """If true, video will autostart on load in the scene player"""
+  "If true, video will autostart on load in the scene player"
   autostartVideo: Boolean
-  """If true, studio overlays will be shown as text instead of logo images"""
+  "If true, video will autostart when loading from play random or play selected"
+  autostartVideoOnPlaySelected: Boolean
+  "If true, next scene in playlist will be played at video end by default"
+  continuePlaylistDefault: Boolean
+
+  "If true, studio overlays will be shown as text instead of logo images"
   showStudioAsText: Boolean
-  """Custom CSS"""
+
+  "Custom CSS"
   css: String
   cssEnabled: Boolean
-  """Interface language"""
+
+  "Custom Javascript"
+  javascript: String
+  javascriptEnabled: Boolean
+
+  "Custom Locales"
+  customLocales: String
+  customLocalesEnabled: Boolean
+
+  "Interface language"
   language: String
-  """Slideshow Delay"""
-  slideshowDelay: Int
-  """Handy Connection Key"""
+
+  imageLightbox: ConfigImageLightboxInput
+
+  "Set to true to disable creating new objects via the dropdown menus"
+  disableDropdownCreate: ConfigDisableDropdownCreateInput
+
+  "Handy Connection Key"
   handyKey: String
-  """Funscript Time Offset"""
+  "Funscript Time Offset"
   funscriptOffset: Int
+  "Whether to use Stash Hosted Funscript"
+  useStashHostedFunscript: Boolean
+  "True if we should not auto-open a browser window on startup"
+  noBrowser: Boolean
+  "True if we should send notifications to the desktop"
+  notificationsEnabled: Boolean
+}
+
+type ConfigDisableDropdownCreate {
+  performer: Boolean!
+  tag: Boolean!
+  studio: Boolean!
+  movie: Boolean!
 }
 
 type ConfigInterfaceResult {
-  """Ordered list of items that should be shown in the menu"""
+  "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
-  """Enable sound on mouseover previews"""
+
+  "Enable sound on mouseover previews"
   soundOnPreview: Boolean
-  """Show title and tags in wall view"""
+
+  "Show title and tags in wall view"
   wallShowTitle: Boolean
-  """Wall playback type"""
+  "Wall playback type"
   wallPlayback: String
-  """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
+
+  "Show scene scrubber by default"
+  showScrubber: Boolean
+
+  "Maximum duration (in seconds) in which a scene video will loop in the scene player"
   maximumLoopDuration: Int
-  """If true, video will autostart on load in the scene player"""
+  "True if we should not auto-open a browser window on startup"
+  noBrowser: Boolean
+  "True if we should send desktop notifications"
+  notificationsEnabled: Boolean
+  "If true, video will autostart on load in the scene player"
   autostartVideo: Boolean
-  """If true, studio overlays will be shown as text instead of logo images"""
+  "If true, video will autostart when loading from play random or play selected"
+  autostartVideoOnPlaySelected: Boolean
+  "If true, next scene in playlist will be played at video end by default"
+  continuePlaylistDefault: Boolean
+
+  "If true, studio overlays will be shown as text instead of logo images"
   showStudioAsText: Boolean
-  """Custom CSS"""
+
+  "Custom CSS"
   css: String
   cssEnabled: Boolean
-  """Interface language"""
+
+  "Custom Javascript"
+  javascript: String
+  javascriptEnabled: Boolean
+
+  "Custom Locales"
+  customLocales: String
+  customLocalesEnabled: Boolean
+
+  "Interface language"
   language: String
-  """Slideshow Delay"""
-  slideshowDelay: Int
-  """Handy Connection Key"""
+
+  imageLightbox: ConfigImageLightboxResult!
+
+  "Fields are true if creating via dropdown menus are disabled"
+  disableDropdownCreate: ConfigDisableDropdownCreate!
+
+  "Handy Connection Key"
   handyKey: String
-  """Funscript Time Offset"""
+  "Funscript Time Offset"
   funscriptOffset: Int
+  "Whether to use Stash Hosted Funscript"
+  useStashHostedFunscript: Boolean
 }
 
 input ConfigDLNAInput {
   serverName: String
-  """True if DLNA service should be enabled by default"""
+  "True if DLNA service should be enabled by default"
   enabled: Boolean
-  """List of IPs whitelisted for DLNA service"""
+  "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]
-  """List of interfaces to run DLNA on. Empty for all"""
+  "List of interfaces to run DLNA on. Empty for all"
   interfaces: [String!]
+  "Order to sort videos"
+  videoSortOrder: String
 }
 
 type ConfigDLNAResult {
   serverName: String!
-  """True if DLNA service should be enabled by default"""
+  "True if DLNA service should be enabled by default"
   enabled: Boolean!
-  """List of IPs whitelisted for DLNA service"""
+  "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]!
-  """List of interfaces to run DLNA on. Empty for all"""
+  "List of interfaces to run DLNA on. Empty for all"
   interfaces: [String!]!
+  "Order to sort videos"
+  videoSortOrder: String!
 }
 
 input ConfigScrapingInput {
-  """Scraper user agent string"""
+  "Scraper user agent string"
   scraperUserAgent: String
-  """Scraper CDP path. Path to chrome executable or remote address"""
+  "Scraper CDP path. Path to chrome executable or remote address"
   scraperCDPPath: String
-  """Whether the scraper should check for invalid certificates"""
-  scraperCertCheck: Boolean!
-  """Tags blacklist during scraping"""
+  "Whether the scraper should check for invalid certificates"
+  scraperCertCheck: Boolean
+  "Tags blacklist during scraping"
   excludeTagPatterns: [String!]
 }
 
 type ConfigScrapingResult {
-  """Scraper user agent string"""
+  "Scraper user agent string"
   scraperUserAgent: String
-  """Scraper CDP path. Path to chrome executable or remote address"""
+  "Scraper CDP path. Path to chrome executable or remote address"
   scraperCDPPath: String
-  """Whether the scraper should check for invalid certificates"""
+  "Whether the scraper should check for invalid certificates"
   scraperCertCheck: Boolean!
-  """Tags blacklist during scraping"""
+  "Tags blacklist during scraping"
   excludeTagPatterns: [String!]!
 }
 
-"""All configuration settings"""
+type ConfigDefaultSettingsResult {
+  scan: ScanMetadataOptions
+  identify: IdentifyMetadataTaskOptions
+  autoTag: AutoTagMetadataOptions
+  generate: GenerateMetadataOptions
+
+  "If true, delete file checkbox will be checked by default"
+  deleteFile: Boolean
+  "If true, delete generated supporting files checkbox will be checked by default"
+  deleteGenerated: Boolean
+}
+
+input ConfigDefaultSettingsInput {
+  scan: ScanMetadataInput
+  identify: IdentifyMetadataInput
+  autoTag: AutoTagMetadataInput
+  generate: GenerateMetadataInput
+
+  "If true, delete file checkbox will be checked by default"
+  deleteFile: Boolean
+  "If true, delete generated files checkbox will be checked by default"
+  deleteGenerated: Boolean
+}
+
+"All configuration settings"
 type ConfigResult {
   general: ConfigGeneralResult!
   interface: ConfigInterfaceResult!
   dlna: ConfigDLNAResult!
   scraping: ConfigScrapingResult!
+  defaults: ConfigDefaultSettingsResult!
+  ui: Map!
+  plugins(include: [ID!]): PluginConfigMap!
 }
 
-"""Directory structure of a path"""
+"Directory structure of a path"
 type Directory {
-    path: String!
-    parent: String
-    directories: [String!]!
+  path: String!
+  parent: String
+  directories: [String!]!
 }
 
-"""Stash configuration details"""
+"Stash configuration details"
 input StashConfigInput {
   path: String!
   excludeVideo: Boolean!
@@ -317,3 +561,8 @@ type StashConfig {
 input GenerateAPIKeyInput {
   clear: Boolean
 }
+
+type StashBoxValidationResult {
+  valid: Boolean!
+  status: String!
+}

graphql/schema/types/dlna.graphql

@@ -1,35 +1,33 @@
-
-
 type DLNAIP {
-    ipAddress: String!
-    """Time until IP will be no longer allowed/disallowed"""
-    until: Time
+  ipAddress: String!
+  "Time until IP will be no longer allowed/disallowed"
+  until: Time
 }
 
 type DLNAStatus {
-    running: Boolean!
-    """If not currently running, time until it will be started. If running, time until it will be stopped"""
-    until: Time
-    recentIPAddresses: [String!]!
-    allowedIPAddresses: [DLNAIP!]!
+  running: Boolean!
+  "If not currently running, time until it will be started. If running, time until it will be stopped"
+  until: Time
+  recentIPAddresses: [String!]!
+  allowedIPAddresses: [DLNAIP!]!
 }
 
 input EnableDLNAInput {
-    """Duration to enable, in minutes. 0 or null for indefinite."""
-    duration: Int
+  "Duration to enable, in minutes. 0 or null for indefinite."
+  duration: Int
 }
- 
+
 input DisableDLNAInput {
-    """Duration to enable, in minutes. 0 or null for indefinite."""
-    duration: Int
+  "Duration to enable, in minutes. 0 or null for indefinite."
+  duration: Int
 }
 
 input AddTempDLNAIPInput {
-    address: String!
-    """Duration to enable, in minutes. 0 or null for indefinite."""
-    duration: Int
+  address: String!
+  "Duration to enable, in minutes. 0 or null for indefinite."
+  duration: Int
 }
 
 input RemoveTempDLNAIPInput {
-    address: String!
-}
+  address: String!
+}

graphql/schema/types/file.graphql

@@ -0,0 +1,127 @@
+type Fingerprint {
+  type: String!
+  value: String!
+}
+
+type Folder {
+  id: ID!
+  path: String!
+
+  parent_folder_id: ID
+  zip_file_id: ID
+
+  mod_time: Time!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+interface BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID!
+  zip_file_id: ID
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+type VideoFile implements BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID!
+  zip_file_id: ID
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  format: String!
+  width: Int!
+  height: Int!
+  duration: Float!
+  video_codec: String!
+  audio_codec: String!
+  frame_rate: Float!
+  bit_rate: Int!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+type ImageFile implements BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID!
+  zip_file_id: ID
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  width: Int!
+  height: Int!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+union VisualFile = VideoFile | ImageFile
+
+type GalleryFile implements BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID!
+  zip_file_id: ID
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+input MoveFilesInput {
+  ids: [ID!]!
+  "valid for single or multiple file ids"
+  destination_folder: String
+
+  "valid for single or multiple file ids"
+  destination_folder_id: ID
+
+  "valid only for single file id. If empty, existing basename is used"
+  destination_basename: String
+}
+
+input SetFingerprintsInput {
+  type: String!
+  "an null value will remove the fingerprint"
+  value: String
+}
+
+input FileSetFingerprintsInput {
+  id: ID!
+  "only supplied fingerprint types will be modified"
+  fingerprints: [SetFingerprintsInput!]!
+}

graphql/schema/types/filters.graphql

@@ -6,26 +6,54 @@ enum SortDirectionEnum {
 input FindFilterType {
   q: String
   page: Int
-  """use per_page = -1 to indicate all results. Defaults to 25."""
+  "use per_page = -1 to indicate all results. Defaults to 25."
+  per_page: Int
+  sort: String
+  direction: SortDirectionEnum
+}
+
+type SavedFindFilterType {
+  q: String
+  page: Int
+  """
+  use per_page = -1 to indicate all results. Defaults to 25.
+  """
   per_page: Int
   sort: String
   direction: SortDirectionEnum
 }
 
 enum ResolutionEnum {
-  "144p", VERY_LOW
-  "240p", LOW
-  "360p", R360P
-  "480p", STANDARD
-  "540p", WEB_HD
-  "720p", STANDARD_HD
-  "1080p", FULL_HD
-  "1440p", QUAD_HD
-  "1920p", VR_HD
-  "4k", FOUR_K
-  "5k", FIVE_K
-  "6k", SIX_K
-  "8k", EIGHT_K
+  "144p"
+  VERY_LOW
+  "240p"
+  LOW
+  "360p"
+  R360P
+  "480p"
+  STANDARD
+  "540p"
+  WEB_HD
+  "720p"
+  STANDARD_HD
+  "1080p"
+  FULL_HD
+  "1440p"
+  QUAD_HD
+  "1920p"
+  VR_HD @deprecated(reason: "Use 4K instead")
+  "4K"
+  FOUR_K
+  "5K"
+  FIVE_K
+  "6K"
+  SIX_K
+  "7K"
+  SEVEN_K
+  "8K"
+  EIGHT_K
+  "8K+"
+  HUGE
 }
 
 input ResolutionCriterionInput {
@@ -33,79 +61,135 @@ input ResolutionCriterionInput {
   modifier: CriterionModifier!
 }
 
+enum OrientationEnum {
+  "Landscape"
+  LANDSCAPE
+  "Portrait"
+  PORTRAIT
+  "Square"
+  SQUARE
+}
+
+input OrientationCriterionInput {
+  value: [OrientationEnum!]!
+}
+
+input PHashDuplicationCriterionInput {
+  duplicated: Boolean
+  "Currently unimplemented"
+  distance: Int
+}
+
+input StashIDCriterionInput {
+  """
+  If present, this value is treated as a predicate.
+  That is, it will filter based on stash_ids with the matching endpoint
+  """
+  endpoint: String
+  stash_id: String
+  modifier: CriterionModifier!
+}
+
 input PerformerFilterType {
   AND: PerformerFilterType
   OR: PerformerFilterType
   NOT: PerformerFilterType
 
   name: StringCriterionInput
+  disambiguation: StringCriterionInput
   details: StringCriterionInput
 
-  """Filter by favorite"""
+  "Filter by favorite"
   filter_favorites: Boolean
-  """Filter by birth year"""
+  "Filter by birth year"
   birth_year: IntCriterionInput
-  """Filter by age"""
+  "Filter by age"
   age: IntCriterionInput
-  """Filter by ethnicity"""
+  "Filter by ethnicity"
   ethnicity: StringCriterionInput
-  """Filter by country"""
+  "Filter by country"
   country: StringCriterionInput
-  """Filter by eye color"""
+  "Filter by eye color"
   eye_color: StringCriterionInput
-  """Filter by height"""
-  height: StringCriterionInput
-  """Filter by measurements"""
+  "Filter by height in cm"
+  height_cm: IntCriterionInput
+  "Filter by measurements"
   measurements: StringCriterionInput
-  """Filter by fake tits value"""
+  "Filter by fake tits value"
   fake_tits: StringCriterionInput
-  """Filter by career length"""
+  "Filter by penis length value"
+  penis_length: FloatCriterionInput
+  "Filter by ciricumcision"
+  circumcised: CircumcisionCriterionInput
+  "Filter by career length"
   career_length: StringCriterionInput
-  """Filter by tattoos"""
+  "Filter by tattoos"
   tattoos: StringCriterionInput
-  """Filter by piercings"""
+  "Filter by piercings"
   piercings: StringCriterionInput
-  """Filter by aliases"""
+  "Filter by aliases"
   aliases: StringCriterionInput
-  """Filter by gender"""
+  "Filter by gender"
   gender: GenderCriterionInput
-  """Filter to only include performers missing this property"""
+  "Filter to only include performers missing this property"
   is_missing: String
-  """Filter to only include performers with these tags"""
+  "Filter to only include performers with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter by tag count"""
+  "Filter by tag count"
   tag_count: IntCriterionInput
-  """Filter by scene count"""
+  "Filter by scene count"
   scene_count: IntCriterionInput
-  """Filter by image count"""
+  "Filter by image count"
   image_count: IntCriterionInput
-  """Filter by gallery count"""
+  "Filter by gallery count"
   gallery_count: IntCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by url"""
+  "Filter by o count"
+  o_counter: IntCriterionInput
+  "Filter by StashID"
+  stash_id_endpoint: StashIDCriterionInput
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by hair color"""
+  "Filter by hair color"
   hair_color: StringCriterionInput
-  """Filter by weight"""
+  "Filter by weight"
   weight: IntCriterionInput
-  """Filter by death year"""
+  "Filter by death year"
   death_year: IntCriterionInput
-  """Filter by studios where performer appears in scene/image/gallery"""
+  "Filter by studios where performer appears in scene/image/gallery"
   studios: HierarchicalMultiCriterionInput
+  "Filter by performers where performer appears with another performer in scene/image/gallery"
+  performers: MultiCriterionInput
+  "Filter by autotag ignore value"
+  ignore_auto_tag: Boolean
+  "Filter by birthdate"
+  birthdate: DateCriterionInput
+  "Filter by death date"
+  death_date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
 }
 
 input SceneMarkerFilterType {
-  """Filter to only include scene markers with this tag"""
-  tag_id: ID @deprecated(reason: "use tags filter instead")
-  """Filter to only include scene markers with these tags"""
+  "Filter to only include scene markers with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter to only include scene markers attached to a scene with these tags"""
+  "Filter to only include scene markers attached to a scene with these tags"
   scene_tags: HierarchicalMultiCriterionInput
-  """Filter to only include scene markers with these performers"""
+  "Filter to only include scene markers with these performers"
   performers: MultiCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+  "Filter by scene date"
+  scene_date: DateCriterionInput
+  "Filter by cscene reation time"
+  scene_created_at: TimestampCriterionInput
+  "Filter by lscene ast update time"
+  scene_updated_at: TimestampCriterionInput
 }
 
 input SceneFilterType {
@@ -113,71 +197,113 @@ input SceneFilterType {
   OR: SceneFilterType
   NOT: SceneFilterType
 
+  id: IntCriterionInput
   title: StringCriterionInput
+  code: StringCriterionInput
   details: StringCriterionInput
+  director: StringCriterionInput
 
-  """Filter by file oshash"""
+  "Filter by file oshash"
   oshash: StringCriterionInput
-  """Filter by file checksum"""
+  "Filter by file checksum"
   checksum: StringCriterionInput
-  """Filter by file phash"""
-  phash: StringCriterionInput
-  """Filter by path"""
+  "Filter by file phash"
+  phash: StringCriterionInput @deprecated(reason: "Use phash_distance instead")
+  "Filter by file phash distance"
+  phash_distance: PhashDistanceCriterionInput
+  "Filter by path"
   path: StringCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by organized"""
+  "Filter by file count"
+  file_count: IntCriterionInput
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter by organized"
   organized: Boolean
-  """Filter by o-counter"""
+  "Filter by o-counter"
   o_counter: IntCriterionInput
-  """Filter by resolution"""
+  "Filter Scenes that have an exact phash match available"
+  duplicated: PHashDuplicationCriterionInput
+  "Filter by resolution"
   resolution: ResolutionCriterionInput
-  """Filter by duration (in seconds)"""
+  "Filter by orientation"
+  orientation: OrientationCriterionInput
+  "Filter by frame rate"
+  framerate: IntCriterionInput
+  "Filter by video codec"
+  video_codec: StringCriterionInput
+  "Filter by audio codec"
+  audio_codec: StringCriterionInput
+  "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  """Filter to only include scenes which have markers. `true` or `false`"""
+  "Filter to only include scenes which have markers. `true` or `false`"
   has_markers: String
-  """Filter to only include scenes missing this property"""
+  "Filter to only include scenes missing this property"
   is_missing: String
-  """Filter to only include scenes with this studio"""
+  "Filter to only include scenes with this studio"
   studios: HierarchicalMultiCriterionInput
-  """Filter to only include scenes with this movie"""
+  "Filter to only include scenes with this movie"
   movies: MultiCriterionInput
-  """Filter to only include scenes with these tags"""
+  "Filter to only include scenes with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter by tag count"""
+  "Filter by tag count"
   tag_count: IntCriterionInput
-  """Filter to only include scenes with performers with these tags"""
+  "Filter to only include scenes with performers with these tags"
   performer_tags: HierarchicalMultiCriterionInput
-  """Filter to only include scenes with these performers"""
+  "Filter scenes that have performers that have been favorited"
+  performer_favorite: Boolean
+  "Filter scenes by performer age at time of scene"
+  performer_age: IntCriterionInput
+  "Filter to only include scenes with these performers"
   performers: MultiCriterionInput
-  """Filter by performer count"""
+  "Filter by performer count"
   performer_count: IntCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter by url"""
+  "Filter by StashID"
+  stash_id_endpoint: StashIDCriterionInput
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by interactive"""
+  "Filter by interactive"
   interactive: Boolean
+  "Filter by InteractiveSpeed"
+  interactive_speed: IntCriterionInput
+  "Filter by captions"
+  captions: StringCriterionInput
+  "Filter by resume time"
+  resume_time: IntCriterionInput
+  "Filter by play count"
+  play_count: IntCriterionInput
+  "Filter by play duration (in seconds)"
+  play_duration: IntCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
 }
 
 input MovieFilterType {
-
   name: StringCriterionInput
   director: StringCriterionInput
   synopsis: StringCriterionInput
 
-  """Filter by duration (in seconds)"""
+  "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter to only include movies with this studio"""
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter to only include movies with this studio"
   studios: HierarchicalMultiCriterionInput
-  """Filter to only include movies missing this property"""
+  "Filter to only include movies missing this property"
   is_missing: String
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter to only include movies where performer appears in a scene"""
+  "Filter to only include movies where performer appears in a scene"
   performers: MultiCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
 }
 
 input StudioFilterType {
@@ -187,24 +313,32 @@ input StudioFilterType {
 
   name: StringCriterionInput
   details: StringCriterionInput
-  """Filter to only include studios with this parent studio"""
+  "Filter to only include studios with this parent studio"
   parents: MultiCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter to only include studios missing this property"""
+  "Filter by StashID"
+  stash_id_endpoint: StashIDCriterionInput
+  "Filter to only include studios missing this property"
   is_missing: String
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by scene count"""
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter by scene count"
   scene_count: IntCriterionInput
-  """Filter by image count"""
+  "Filter by image count"
   image_count: IntCriterionInput
-  """Filter by gallery count"""
+  "Filter by gallery count"
   gallery_count: IntCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by studio aliases"""
+  "Filter by studio aliases"
   aliases: StringCriterionInput
+  "Filter by subsidiary studio count"
+  child_count: IntCriterionInput
+  "Filter by autotag ignore value"
+  ignore_auto_tag: Boolean
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
 }
 
 input GalleryFilterType {
@@ -212,39 +346,58 @@ input GalleryFilterType {
   OR: GalleryFilterType
   NOT: GalleryFilterType
 
+  id: IntCriterionInput
   title: StringCriterionInput
   details: StringCriterionInput
 
-  """Filter by file checksum"""
+  "Filter by file checksum"
   checksum: StringCriterionInput
-  """Filter by path"""
+  "Filter by path"
   path: StringCriterionInput
-  """Filter to only include galleries missing this property"""
+  "Filter by zip-file count"
+  file_count: IntCriterionInput
+  "Filter to only include galleries missing this property"
   is_missing: String
-  """Filter to include/exclude galleries that were created from zip"""
+  "Filter to include/exclude galleries that were created from zip"
   is_zip: Boolean
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by organized"""
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter by organized"
   organized: Boolean
-  """Filter by average image resolution"""
+  "Filter by average image resolution"
   average_resolution: ResolutionCriterionInput
-  """Filter to only include galleries with this studio"""
+  "Filter to only include galleries that have chapters. `true` or `false`"
+  has_chapters: String
+  "Filter to only include galleries with this studio"
   studios: HierarchicalMultiCriterionInput
-  """Filter to only include galleries with these tags"""
+  "Filter to only include galleries with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter by tag count"""
+  "Filter by tag count"
   tag_count: IntCriterionInput
-  """Filter to only include galleries with performers with these tags"""
+  "Filter to only include galleries with performers with these tags"
   performer_tags: HierarchicalMultiCriterionInput
-  """Filter to only include galleries with these performers"""
+  "Filter to only include galleries with these performers"
   performers: MultiCriterionInput
-  """Filter by performer count"""
+  "Filter by performer count"
   performer_count: IntCriterionInput
-  """Filter by number of images in this gallery"""
+  "Filter galleries that have performers that have been favorited"
+  performer_favorite: Boolean
+  "Filter galleries by performer age at time of gallery"
+  performer_age: IntCriterionInput
+  "Filter by number of images in this gallery"
   image_count: IntCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
 }
 
 input TagFilterType {
@@ -252,41 +405,53 @@ input TagFilterType {
   OR: TagFilterType
   NOT: TagFilterType
 
-  """Filter by tag name"""
+  "Filter by tag name"
   name: StringCriterionInput
 
-  """Filter by tag aliases"""
+  "Filter by tag aliases"
   aliases: StringCriterionInput
 
-  """Filter to only include tags missing this property"""
+  "Filter by tag description"
+  description: StringCriterionInput
+
+  "Filter to only include tags missing this property"
   is_missing: String
 
-  """Filter by number of scenes with this tag"""
+  "Filter by number of scenes with this tag"
   scene_count: IntCriterionInput
 
-  """Filter by number of images with this tag"""
+  "Filter by number of images with this tag"
   image_count: IntCriterionInput
 
-  """Filter by number of galleries with this tag"""
+  "Filter by number of galleries with this tag"
   gallery_count: IntCriterionInput
 
-  """Filter by number of performers with this tag"""
+  "Filter by number of performers with this tag"
   performer_count: IntCriterionInput
 
-  """Filter by number of markers with this tag"""
+  "Filter by number of markers with this tag"
   marker_count: IntCriterionInput
 
-  """Filter by parent tags"""
+  "Filter by parent tags"
   parents: HierarchicalMultiCriterionInput
 
-  """Filter by child tags"""
+  "Filter by child tags"
   children: HierarchicalMultiCriterionInput
 
-  """Filter by number of parent tags the tag has"""
+  "Filter by number of parent tags the tag has"
   parent_count: IntCriterionInput
 
-  """Filter by number f child tags the tag has"""
+  "Filter by number f child tags the tag has"
   child_count: IntCriterionInput
+
+  "Filter by autotag ignore value"
+  ignore_auto_tag: Boolean
+
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
 }
 
 input ImageFilterType {
@@ -295,62 +460,85 @@ input ImageFilterType {
   NOT: ImageFilterType
 
   title: StringCriterionInput
+  details: StringCriterionInput
 
-  """Filter by file checksum"""
+  " Filter by image id"
+  id: IntCriterionInput
+  "Filter by file checksum"
   checksum: StringCriterionInput
-  """Filter by path"""
+  "Filter by path"
   path: StringCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by organized"""
+  "Filter by file count"
+  file_count: IntCriterionInput
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by url"
+  url: StringCriterionInput
+  "Filter by organized"
   organized: Boolean
-  """Filter by o-counter"""
+  "Filter by o-counter"
   o_counter: IntCriterionInput
-  """Filter by resolution"""
+  "Filter by resolution"
   resolution: ResolutionCriterionInput
-  """Filter to only include images missing this property"""
+  "Filter by orientation"
+  orientation: OrientationCriterionInput
+  "Filter to only include images missing this property"
   is_missing: String
-  """Filter to only include images with this studio"""
+  "Filter to only include images with this studio"
   studios: HierarchicalMultiCriterionInput
-  """Filter to only include images with these tags"""
+  "Filter to only include images with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter by tag count"""
+  "Filter by tag count"
   tag_count: IntCriterionInput
-  """Filter to only include images with performers with these tags"""
+  "Filter to only include images with performers with these tags"
   performer_tags: HierarchicalMultiCriterionInput
-  """Filter to only include images with these performers"""
+  "Filter to only include images with these performers"
   performers: MultiCriterionInput
-  """Filter by performer count"""
+  "Filter by performer count"
   performer_count: IntCriterionInput
-  """Filter to only include images with these galleries"""
+  "Filter images that have performers that have been favorited"
+  performer_favorite: Boolean
+  "Filter images by performer age at time of image"
+  performer_age: IntCriterionInput
+  "Filter to only include images with these galleries"
   galleries: MultiCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
 }
 
 enum CriterionModifier {
-  """="""
-  EQUALS,
-  """!="""
-  NOT_EQUALS,
-  """>"""
-  GREATER_THAN,
-  """<"""
-  LESS_THAN,
-  """IS NULL"""
-  IS_NULL,
-  """IS NOT NULL"""
-  NOT_NULL,
-  """INCLUDES ALL"""
-  INCLUDES_ALL,
-  INCLUDES,
-  EXCLUDES,
-  """MATCHES REGEX"""
-  MATCHES_REGEX,
-  """NOT MATCHES REGEX"""
-  NOT_MATCHES_REGEX,
-  """>= AND <="""
-  BETWEEN,
-  """< OR >"""
-  NOT_BETWEEN,
+  "="
+  EQUALS
+  "!="
+  NOT_EQUALS
+  ">"
+  GREATER_THAN
+  "<"
+  LESS_THAN
+  "IS NULL"
+  IS_NULL
+  "IS NOT NULL"
+  NOT_NULL
+  "INCLUDES ALL"
+  INCLUDES_ALL
+  INCLUDES
+  EXCLUDES
+  "MATCHES REGEX"
+  MATCHES_REGEX
+  "NOT MATCHES REGEX"
+  NOT_MATCHES_REGEX
+  ">= AND <="
+  BETWEEN
+  "< OR >"
+  NOT_BETWEEN
 }
 
 input StringCriterionInput {
@@ -364,13 +552,26 @@ input IntCriterionInput {
   modifier: CriterionModifier!
 }
 
+input FloatCriterionInput {
+  value: Float!
+  value2: Float
+  modifier: CriterionModifier!
+}
+
 input MultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
+  excludes: [ID!]
 }
 
 input GenderCriterionInput {
   value: GenderEnum
+  value_list: [GenderEnum!]
+  modifier: CriterionModifier!
+}
+
+input CircumcisionCriterionInput {
+  value: [CircumisedEnum!]
   modifier: CriterionModifier!
 }
 
@@ -378,34 +579,62 @@ input HierarchicalMultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
   depth: Int
+  excludes: [ID!]
+}
+
+input DateCriterionInput {
+  value: String!
+  value2: String
+  modifier: CriterionModifier!
+}
+
+input TimestampCriterionInput {
+  value: String!
+  value2: String
+  modifier: CriterionModifier!
+}
+
+input PhashDistanceCriterionInput {
+  value: String!
+  modifier: CriterionModifier!
+  distance: Int
 }
 
 enum FilterMode {
-  SCENES,
-  PERFORMERS,
-  STUDIOS,
-  GALLERIES,
-  SCENE_MARKERS,
-  MOVIES,
-  TAGS,
-  IMAGES,
+  SCENES
+  PERFORMERS
+  STUDIOS
+  GALLERIES
+  SCENE_MARKERS
+  MOVIES
+  TAGS
+  IMAGES
 }
 
 type SavedFilter {
   id: ID!
   mode: FilterMode!
   name: String!
-  """JSON-encoded filter string"""
+  "JSON-encoded filter string"
   filter: String!
+    @deprecated(reason: "use find_filter and object_filter instead")
+  find_filter: SavedFindFilterType
+  # maps to any of the AnyFilterInput types
+  # using a generic Map instead of creating and maintaining match types for inputs
+  object_filter: Map
+  # generic map for ui options
+  ui_options: Map
 }
 
 input SaveFilterInput {
-  """provide ID to overwrite existing filter"""
+  "provide ID to overwrite existing filter"
   id: ID
   mode: FilterMode!
   name: String!
-  """JSON-encoded filter string"""
-  filter: String!
+  find_filter: FindFilterType
+  object_filter: Map
+  # generic map for ui options
+  ui_options: Map
 }
 
 input DestroyFilterInput {
@@ -414,6 +643,9 @@ input DestroyFilterInput {
 
 input SetDefaultFilterInput {
   mode: FilterMode!
-  """JSON-encoded filter string - null to clear"""
-  filter: String
+  "null to clear"
+  find_filter: FindFilterType
+  object_filter: Map
+  # generic map for ui options
+  ui_options: Map
 }

graphql/schema/types/gallery-chapter.graphql

@@ -0,0 +1,26 @@
+type GalleryChapter {
+  id: ID!
+  gallery: Gallery!
+  title: String!
+  image_index: Int!
+  created_at: Time!
+  updated_at: Time!
+}
+
+input GalleryChapterCreateInput {
+  gallery_id: ID!
+  title: String!
+  image_index: Int!
+}
+
+input GalleryChapterUpdateInput {
+  id: ID!
+  gallery_id: ID
+  title: String
+  image_index: Int
+}
+
+type FindGalleryChaptersResultType {
+  count: Int!
+  chapters: [GalleryChapter!]!
+}

graphql/schema/types/gallery.graphql

@@ -1,41 +1,42 @@
-"""Gallery type"""
+"Gallery type"
 type Gallery {
   id: ID!
-  checksum: String!
-  path: String
   title: String
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   date: String
   details: String
-  rating: Int
+  photographer: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean!
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time
 
+  files: [GalleryFile!]!
+  folder: Folder
+
+  chapters: [GalleryChapter!]!
   scenes: [Scene!]!
   studio: Studio
   image_count: Int!
   tags: [Tag!]!
   performers: [Performer!]!
 
-  """The images in the gallery"""
-  images: [Image!]! # Resolver
   cover: Image
 }
 
-type GalleryFilesType {
-  index: Int!
-  name: String
-  path: String
-}
-
 input GalleryCreateInput {
   title: String!
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
   details: String
-  rating: Int
+  photographer: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean
   scene_ids: [ID!]
   studio_id: ID
@@ -47,24 +48,34 @@ input GalleryUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
   details: String
-  rating: Int
+  photographer: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean
   scene_ids: [ID!]
   studio_id: ID
   tag_ids: [ID!]
   performer_ids: [ID!]
+
+  primary_file_id: ID
 }
 
 input BulkGalleryUpdateInput {
   clientMutationId: String
   ids: [ID!]
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   date: String
   details: String
-  rating: Int
+  photographer: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean
   scene_ids: BulkUpdateIds
   studio_id: ID
@@ -74,6 +85,11 @@ input BulkGalleryUpdateInput {
 
 input GalleryDestroyInput {
   ids: [ID!]!
+  """
+  If true, then the zip file will be deleted if the gallery is zip-file-based.
+  If gallery is folder-based, then any files not associated with other
+  galleries will be deleted, along with the folder, if it is not empty.
+  """
   delete_file: Boolean
   delete_generated: Boolean
 }

graphql/schema/types/image.graphql

@@ -1,18 +1,22 @@
 type Image {
   id: ID!
-  checksum: String
   title: String
-  rating: Int
+  code: String
+  # rating expressed as 1-100
+  rating100: Int
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
+  date: String
+  details: String
+  photographer: String
   o_counter: Int
   organized: Boolean!
-  path: String!
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time
 
-  file: ImageFileType! # Resolver
+  files: [ImageFile!]! @deprecated(reason: "Use visual_files")
+  visual_files: [VisualFile!]!
   paths: ImagePathsType! # Resolver
-
   galleries: [Gallery!]!
   studio: Studio
   tags: [Tag!]!
@@ -20,13 +24,15 @@ type Image {
 }
 
 type ImageFileType {
-  size: Int
-  width: Int
-  height: Int
+  mod_time: Time!
+  size: Int!
+  width: Int!
+  height: Int!
 }
 
 type ImagePathsType {
   thumbnail: String # Resolver
+  preview: String # Resolver
   image: String # Resolver
 }
 
@@ -34,22 +40,38 @@ input ImageUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
-  rating: Int
+  code: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean
-  
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
+  date: String
+  details: String
+  photographer: String
+
   studio_id: ID
   performer_ids: [ID!]
   tag_ids: [ID!]
   gallery_ids: [ID!]
+
+  primary_file_id: ID
 }
 
 input BulkImageUpdateInput {
   clientMutationId: String
   ids: [ID!]
   title: String
-  rating: Int
+  code: String
+  # rating expressed as 1-100
+  rating100: Int
   organized: Boolean
-  
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
+  date: String
+  details: String
+  photographer: String
+
   studio_id: ID
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
@@ -70,5 +92,9 @@ input ImagesDestroyInput {
 
 type FindImagesResultType {
   count: Int!
+  "Total megapixels of the images"
+  megapixels: Float!
+  "Total file size in bytes"
+  filesize: Float!
   images: [Image!]!
-}
+}

graphql/schema/types/logging.graphql

@@ -1,16 +1,14 @@
-"""Log entries"""
-scalar Time
-
 enum LogLevel {
-    Debug
-    Info
-    Progress
-    Warning
-    Error
+  Trace
+  Debug
+  Info
+  Progress
+  Warning
+  Error
 }
 
 type LogEntry {
   time: Time!
   level: LogLevel!
   message: String!
-}
+}

graphql/schema/types/metadata.graphql

@@ -1,6 +1,5 @@
-scalar Upload
-
 input GenerateMetadataInput {
+  covers: Boolean
   sprites: Boolean
   previews: Boolean
   imagePreviews: Boolean
@@ -9,64 +8,267 @@ input GenerateMetadataInput {
   markerImagePreviews: Boolean
   markerScreenshots: Boolean
   transcodes: Boolean
+  "Generate transcodes even if not required"
+  forceTranscodes: Boolean
   phashes: Boolean
+  interactiveHeatmapsSpeeds: Boolean
+  imageThumbnails: Boolean
+  clipPreviews: Boolean
 
-  """scene ids to generate for"""
+  "scene ids to generate for"
   sceneIDs: [ID!]
-  """marker ids to generate for"""
+  "marker ids to generate for"
   markerIDs: [ID!]
 
-  """overwrite existing media"""
+  "overwrite existing media"
   overwrite: Boolean
 }
 
 input GeneratePreviewOptionsInput {
-  """Number of segments in a preview file"""
+  "Number of segments in a preview file"
   previewSegments: Int
-  """Preview segment duration, in seconds"""
+  "Preview segment duration, in seconds"
   previewSegmentDuration: Float
-  """Duration of start of video to exclude when generating previews"""
+  "Duration of start of video to exclude when generating previews"
   previewExcludeStart: String
-  """Duration of end of video to exclude when generating previews"""
+  "Duration of end of video to exclude when generating previews"
   previewExcludeEnd: String
-  """Preset when generating preview"""
+  "Preset when generating preview"
   previewPreset: PreviewPreset
 }
 
+type GenerateMetadataOptions {
+  covers: Boolean
+  sprites: Boolean
+  previews: Boolean
+  imagePreviews: Boolean
+  previewOptions: GeneratePreviewOptions
+  markers: Boolean
+  markerImagePreviews: Boolean
+  markerScreenshots: Boolean
+  transcodes: Boolean
+  phashes: Boolean
+  interactiveHeatmapsSpeeds: Boolean
+  imageThumbnails: Boolean
+  clipPreviews: Boolean
+}
+
+type GeneratePreviewOptions {
+  "Number of segments in a preview file"
+  previewSegments: Int
+  "Preview segment duration, in seconds"
+  previewSegmentDuration: Float
+  "Duration of start of video to exclude when generating previews"
+  previewExcludeStart: String
+  "Duration of end of video to exclude when generating previews"
+  previewExcludeEnd: String
+  "Preset when generating preview"
+  previewPreset: PreviewPreset
+}
+
+"Filter options for meta data scannning"
+input ScanMetaDataFilterInput {
+  "If set, files with a modification time before this time point are ignored by the scan"
+  minModTime: Timestamp
+}
+
 input ScanMetadataInput {
   paths: [String!]
-  """Set name, date, details from metadata (if present)"""
-  useFileMetadata: Boolean
-  """Strip file extension from title"""
-  stripFileExtension: Boolean
-  """Generate previews during scan"""
+
+  "Generate covers during scan"
+  scanGenerateCovers: Boolean
+  "Generate previews during scan"
   scanGeneratePreviews: Boolean
-  """Generate image previews during scan"""
+  "Generate image previews during scan"
   scanGenerateImagePreviews: Boolean
-  """Generate sprites during scan"""
+  "Generate sprites during scan"
   scanGenerateSprites: Boolean
-  """Generate phashes during scan"""
+  "Generate phashes during scan"
   scanGeneratePhashes: Boolean
-  """Generate image thumbnails during scan"""
+  "Generate image thumbnails during scan"
   scanGenerateThumbnails: Boolean
+  "Generate image clip previews during scan"
+  scanGenerateClipPreviews: Boolean
+
+  "Filter options for the scan"
+  filter: ScanMetaDataFilterInput
+}
+
+type ScanMetadataOptions {
+  "Generate covers during scan"
+  scanGenerateCovers: Boolean!
+  "Generate previews during scan"
+  scanGeneratePreviews: Boolean!
+  "Generate image previews during scan"
+  scanGenerateImagePreviews: Boolean!
+  "Generate sprites during scan"
+  scanGenerateSprites: Boolean!
+  "Generate phashes during scan"
+  scanGeneratePhashes: Boolean!
+  "Generate image thumbnails during scan"
+  scanGenerateThumbnails: Boolean!
+  "Generate image clip previews during scan"
+  scanGenerateClipPreviews: Boolean!
 }
 
 input CleanMetadataInput {
-  """Do a dry run. Don't delete any files"""
+  paths: [String!]
+
+  "Do a dry run. Don't delete any files"
   dryRun: Boolean!
 }
 
+input CleanGeneratedInput {
+  "Clean blob files without blob entries"
+  blobFiles: Boolean
+  "Clean sprite and vtt files without scene entries"
+  sprites: Boolean
+  "Clean preview files without scene entries"
+  screenshots: Boolean
+  "Clean scene transcodes without scene entries"
+  transcodes: Boolean
+
+  "Clean marker files without marker entries"
+  markers: Boolean
+
+  "Clean image thumbnails/clips without image entries"
+  imageThumbnails: Boolean
+
+  "Do a dry run. Don't delete any files"
+  dryRun: Boolean
+}
+
 input AutoTagMetadataInput {
-  """Paths to tag, null for all files"""
+  "Paths to tag, null for all files"
   paths: [String!]
-  """IDs of performers to tag files with, or "*" for all"""
+  """
+  IDs of performers to tag files with, or "*" for all
+  """
   performers: [String!]
-  """IDs of studios to tag files with, or "*" for all"""
+  """
+  IDs of studios to tag files with, or "*" for all
+  """
   studios: [String!]
-  """IDs of tags to tag files with, or "*" for all"""
+  """
+  IDs of tags to tag files with, or "*" for all
+  """
   tags: [String!]
 }
 
+type AutoTagMetadataOptions {
+  """
+  IDs of performers to tag files with, or "*" for all
+  """
+  performers: [String!]
+  """
+  IDs of studios to tag files with, or "*" for all
+  """
+  studios: [String!]
+  """
+  IDs of tags to tag files with, or "*" for all
+  """
+  tags: [String!]
+}
+
+enum IdentifyFieldStrategy {
+  "Never sets the field value"
+  IGNORE
+  """
+  For multi-value fields, merge with existing.
+  For single-value fields, ignore if already set
+  """
+  MERGE
+  """
+  Always replaces the value if a value is found.
+  For multi-value fields, any existing values are removed and replaced with the
+  scraped values.
+  """
+  OVERWRITE
+}
+
+input IdentifyFieldOptionsInput {
+  field: String!
+  strategy: IdentifyFieldStrategy!
+  "creates missing objects if needed - only applicable for performers, tags and studios"
+  createMissing: Boolean
+}
+
+input IdentifyMetadataOptionsInput {
+  "any fields missing from here are defaulted to MERGE and createMissing false"
+  fieldOptions: [IdentifyFieldOptionsInput!]
+  "defaults to true if not provided"
+  setCoverImage: Boolean
+  setOrganized: Boolean
+  "defaults to true if not provided"
+  includeMalePerformers: Boolean
+  "defaults to true if not provided"
+  skipMultipleMatches: Boolean
+  "tag to tag skipped multiple matches with"
+  skipMultipleMatchTag: String
+  "defaults to true if not provided"
+  skipSingleNamePerformers: Boolean
+  "tag to tag skipped single name performers with"
+  skipSingleNamePerformerTag: String
+}
+
+input IdentifySourceInput {
+  source: ScraperSourceInput!
+  "Options defined for a source override the defaults"
+  options: IdentifyMetadataOptionsInput
+}
+
+input IdentifyMetadataInput {
+  "An ordered list of sources to identify items with. Only the first source that finds a match is used."
+  sources: [IdentifySourceInput!]!
+  "Options defined here override the configured defaults"
+  options: IdentifyMetadataOptionsInput
+
+  "scene ids to identify"
+  sceneIDs: [ID!]
+
+  "paths of scenes to identify - ignored if scene ids are set"
+  paths: [String!]
+}
+
+# types for default options
+type IdentifyFieldOptions {
+  field: String!
+  strategy: IdentifyFieldStrategy!
+  "creates missing objects if needed - only applicable for performers, tags and studios"
+  createMissing: Boolean
+}
+
+type IdentifyMetadataOptions {
+  "any fields missing from here are defaulted to MERGE and createMissing false"
+  fieldOptions: [IdentifyFieldOptions!]
+  "defaults to true if not provided"
+  setCoverImage: Boolean
+  setOrganized: Boolean
+  "defaults to true if not provided"
+  includeMalePerformers: Boolean
+  "defaults to true if not provided"
+  skipMultipleMatches: Boolean
+  "tag to tag skipped multiple matches with"
+  skipMultipleMatchTag: String
+  "defaults to true if not provided"
+  skipSingleNamePerformers: Boolean
+  "tag to tag skipped single name performers with"
+  skipSingleNamePerformerTag: String
+}
+
+type IdentifySource {
+  source: ScraperSource!
+  "Options defined for a source override the defaults"
+  options: IdentifyMetadataOptions
+}
+
+type IdentifyMetadataTaskOptions {
+  "An ordered list of sources to identify items with. Only the first source that finds a match is used."
+  sources: [IdentifySource!]!
+  "Options defined here override the configured defaults"
+  options: IdentifyMetadataOptions
+}
+
 input ExportObjectTypeInput {
   ids: [String!]
   all: Boolean
@@ -105,6 +307,10 @@ input BackupDatabaseInput {
   download: Boolean
 }
 
+input AnonymiseDatabaseInput {
+  download: Boolean
+}
+
 enum SystemStatusEnum {
   SETUP
   NEEDS_MIGRATION
@@ -117,6 +323,9 @@ type SystemStatus {
   configPath: String
   appSchema: Int!
   status: SystemStatusEnum!
+  os: String!
+  workingDir: String!
+  homeDir: String!
 }
 
 input MigrateInput {

graphql/schema/types/migration.graphql

@@ -0,0 +1,11 @@
+input MigrateSceneScreenshotsInput {
+  # if true, delete screenshot files after migrating
+  deleteFiles: Boolean
+  # if true, overwrite existing covers with the covers from the screenshots directory
+  overwriteExisting: Boolean
+}
+
+input MigrateBlobsInput {
+  # if true, delete blob data from old storage system
+  deleteOld: Boolean
+}

graphql/schema/types/movie.graphql

@@ -1,12 +1,12 @@
 type Movie {
   id: ID!
-  checksum: String!
   name: String!
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   studio: Studio
   director: String
   synopsis: String
@@ -16,24 +16,25 @@ type Movie {
 
   front_image_path: String # Resolver
   back_image_path: String # Resolver
-  scene_count: Int # Resolver
+  scene_count: Int! # Resolver
   scenes: [Scene!]!
 }
 
 input MovieCreateInput {
   name: String!
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   studio_id: ID
   director: String
   synopsis: String
   url: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   front_image: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   back_image: String
 }
 
@@ -43,17 +44,27 @@ input MovieUpdateInput {
   aliases: String
   duration: Int
   date: String
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   studio_id: ID
   director: String
   synopsis: String
   url: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   front_image: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   back_image: String
 }
 
+input BulkMovieUpdateInput {
+  clientMutationId: String
+  ids: [ID!]
+  # rating expressed as 1-100
+  rating100: Int
+  studio_id: ID
+  director: String
+}
+
 input MovieDestroyInput {
   id: ID!
 }

graphql/schema/types/package.graphql

@@ -0,0 +1,36 @@
+enum PackageType {
+  Scraper
+  Plugin
+}
+
+type Package {
+  package_id: String!
+  name: String!
+  version: String
+  date: Timestamp
+  requires: [Package!]!
+
+  sourceURL: String!
+
+  "The version of this package currently available from the remote source"
+  source_package: Package
+
+  metadata: Map!
+}
+
+input PackageSpecInput {
+  id: String!
+  sourceURL: String!
+}
+
+type PackageSource {
+  name: String
+  url: String!
+  local_path: String
+}
+
+input PackageSourceInput {
+  name: String
+  url: String!
+  local_path: String
+}

graphql/schema/types/performer.graphql

@@ -7,10 +7,15 @@ enum GenderEnum {
   NON_BINARY
 }
 
+enum CircumisedEnum {
+  CUT
+  UNCUT
+}
+
 type Performer {
   id: ID!
-  checksum: String!
-  name: String
+  name: String!
+  disambiguation: String
   url: String
   gender: GenderEnum
   twitter: String
@@ -19,117 +24,143 @@ type Performer {
   ethnicity: String
   country: String
   eye_color: String
-  height: String
+  height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  alias_list: [String!]!
   favorite: Boolean!
   tags: [Tag!]!
+  ignore_auto_tag: Boolean!
 
   image_path: String # Resolver
-  scene_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
+  scene_count: Int! # Resolver
+  image_count: Int! # Resolver
+  gallery_count: Int! # Resolver
+  movie_count: Int! # Resolver
+  performer_count: Int! # Resolver
+  o_counter: Int # Resolver
   scenes: [Scene!]!
   stash_ids: [StashID!]!
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   details: String
   death_date: String
   hair_color: String
   weight: Int
   created_at: Time!
   updated_at: Time!
-  movie_count: Int
   movies: [Movie!]!
 }
 
 input PerformerCreateInput {
   name: String!
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  height: String
+  height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  alias_list: [String!]
   twitter: String
   instagram: String
   favorite: Boolean
   tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   details: String
   death_date: String
   hair_color: String
   weight: Int
+  ignore_auto_tag: Boolean
 }
 
 input PerformerUpdateInput {
   id: ID!
   name: String
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  height: String
+  height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  alias_list: [String!]
   twitter: String
   instagram: String
   favorite: Boolean
   tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   details: String
   death_date: String
   hair_color: String
   weight: Int
+  ignore_auto_tag: Boolean
+}
+
+input BulkUpdateStrings {
+  values: [String!]
+  mode: BulkUpdateIdMode!
 }
 
 input BulkPerformerUpdateInput {
   clientMutationId: String
   ids: [ID!]
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  height: String
+  height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  alias_list: BulkUpdateStrings
   twitter: String
   instagram: String
   favorite: Boolean
   tag_ids: BulkUpdateIds
-  rating: Int
+  # rating expressed as 1-100
+  rating100: Int
   details: String
   death_date: String
   hair_color: String
   weight: Int
+  ignore_auto_tag: Boolean
 }
 
 input PerformerDestroyInput {

graphql/schema/types/plugin.graphql

@@ -1,43 +1,73 @@
+type PluginPaths {
+  # path to javascript files
+  javascript: [String!]
+  # path to css files
+  css: [String!]
+}
 
 type Plugin {
-    id: ID!
-    name: String!
-    description: String
-    url: String
-    version: String
+  id: ID!
+  name: String!
+  description: String
+  url: String
+  version: String
 
-    tasks: [PluginTask!]
-    hooks: [PluginHook!]
+  enabled: Boolean!
+
+  tasks: [PluginTask!]
+  hooks: [PluginHook!]
+  settings: [PluginSetting!]
+
+  """
+  Plugin IDs of plugins that this plugin depends on.
+  Applies only for UI plugins to indicate css/javascript load order.
+  """
+  requires: [ID!]
+
+  paths: PluginPaths!
 }
 
 type PluginTask {
-    name: String!
-    description: String
-    plugin: Plugin!
+  name: String!
+  description: String
+  plugin: Plugin!
 }
 
 type PluginHook {
-    name: String!
-    description: String
-    hooks: [String!]
-    plugin: Plugin!
+  name: String!
+  description: String
+  hooks: [String!]
+  plugin: Plugin!
 }
 
 type PluginResult {
-    error: String
-    result: String
+  error: String
+  result: String
 }
 
 input PluginArgInput {
-    key: String!
-    value: PluginValueInput
+  key: String!
+  value: PluginValueInput
 }
 
 input PluginValueInput {
-    str: String
-    i: Int
-    b: Boolean
-    f: Float
-    o: [PluginArgInput!]
-    a: [PluginValueInput!]
+  str: String
+  i: Int
+  b: Boolean
+  f: Float
+  o: [PluginArgInput!]
+  a: [PluginValueInput!]
+}
+
+enum PluginSettingTypeEnum {
+  STRING
+  NUMBER
+  BOOLEAN
+}
+
+type PluginSetting {
+  name: String!
+  display_name: String
+  description: String
+  type: PluginSettingTypeEnum!
 }