Update changelog for patch

* Translated using Weblate (Korean)

Currently translated at 100.0% (1174 of 1174 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/ko/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1174 of 1174 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1174 of 1174 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (Hungarian)

Currently translated at 41.9% (493 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/hu/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1175 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/fr/

* Translated using Weblate (Hungarian)

Currently translated at 43.7% (514 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/hu/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/cs/

* Translated using Weblate (German)

Currently translated at 87.2% (1025 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/de/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 18.7% (220 of 1175 strings)

Translation: stash/stash
Translate-URL: https://translate.codeberg.org/projects/stash/stash/nb_NO/

---------

Co-authored-by: yec <yec@users.noreply.translate.codeberg.org>
Co-authored-by: wql219 <wanqinglin219@hotmail.com>
Co-authored-by: tozoktala <tozoktala@users.noreply.translate.codeberg.org>
Co-authored-by: zdh <zdh@users.noreply.translate.codeberg.org>
Co-authored-by: doodoo <doodoo@users.noreply.translate.codeberg.org>
Co-authored-by: NymeriaCZ <NymeriaCZ@users.noreply.translate.codeberg.org>
Co-authored-by: augeee <augeee@users.noreply.translate.codeberg.org>
Co-authored-by: noTranslator <noTranslator@users.noreply.translate.codeberg.org>

.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,12 +0,0 @@
-# These are supported funding model platforms
-
-# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-# patreon: # Replace with a single Patreon username
-open_collective: stashapp
-# ko_fi: # Replace with a single Ko-fi username
-# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-# liberapay: StashApp
-# issuehunt: # Replace with a single IssueHunt username
-# otechie: # Replace with a single Otechie username
-# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/build.yml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:7
+  COMPILER_IMAGE: stashapp/compiler:9
 
 jobs:
   build:
@@ -23,6 +23,11 @@ jobs:
     - name: Checkout
       run: git fetch --prune --unshallow --tags
 
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+
     - name: Pull compiler image
       run: docker pull $COMPILER_IMAGE
 
@@ -68,7 +73,7 @@ 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
@@ -84,13 +89,16 @@ 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-macos-intel"
-        docker exec -t build /bin/bash -c "make cross-compile-macos-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-linux-arm32v6"
+        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: Zip UI
+      run: docker exec -t build /bin/bash -c "make zip-ui"
 
     - name: Cleanup build container
       run: docker rm -f -v build
@@ -98,34 +106,42 @@ 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-* dist/stash-ui.zip | 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
 
     - name: Upload Windows 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
+      uses: actions/upload-artifact@v4
       with:
         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
+      uses: actions/upload-artifact@v4
       with:
-        name: stash-macos-intel
-        path: dist/stash-macos-intel
+        name: stash-macos
+        path: dist/stash-macos
 
     - name: Upload Linux 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
+      uses: actions/upload-artifact@v4
       with:
         name: stash-linux
         path: dist/stash-linux
 
+    - name: Upload UI
+      # only upload 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@v4
+      with:
+        name: stash-ui.zip
+        path: dist/stash-ui.zip
+
     - name: Update latest_develop tag
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
       run : git tag -f latest_develop; git push -f --tags
@@ -139,13 +155,15 @@ jobs:
         automatic_release_tag: latest_develop
         title: "${{ env.STASH_VERSION }}: Latest development build"
         files: |
-          dist/stash-macos-intel
-          dist/stash-macos-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-linux-arm32v6
+          dist/stash-freebsd
+          dist/stash-ui.zip
           CHECKSUMS_SHA1
 
     - name: Master release
@@ -157,13 +175,15 @@ jobs:
         token: "${{ secrets.GITHUB_TOKEN }}"
         allow_override: true
         files: |
-          dist/stash-macos-intel
-          dist/stash-macos-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-linux-arm32v6
+          dist/stash-freebsd
+          dist/stash-ui.zip
           CHECKSUMS_SHA1
         gzip: false
 

.github/workflows/golangci-lint.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:7
+  COMPILER_IMAGE: stashapp/compiler:9
 
 jobs:
   golangci:
@@ -21,6 +21,11 @@ jobs:
       - name: Checkout
         run: git fetch --prune --unshallow --tags
 
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+
       - name: Pull compiler image
         run: docker pull $COMPILER_IMAGE
 
@@ -33,7 +38,7 @@ 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: latest
@@ -42,19 +47,26 @@ jobs:
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          args: --modules-download-mode=vendor --timeout=5m
+          #
+          # 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.
-          skip-pkg-cache: true
+          # 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.
-          skip-build-cache: true
+          # 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~
@@ -18,11 +21,6 @@
 # GraphQL generated output
 internal/api/generated_*.go
 
-####
-# Jetbrains
-####
-
-
 ####
 # Visual Studio
 ####
@@ -49,9 +47,6 @@ internal/api/generated_*.go
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
-# Goland Junk
-pkg/pkg
-
 ####
 # Random
 ####
@@ -61,6 +56,8 @@ node_modules
 *.db
 
 /stash
+/Stash.app
+/phasher
 dist
 .DS_Store
-/.local
+/.local*

.golangci.yml

@@ -1,7 +1,6 @@
 # options for analysis running
 run:
   timeout: 5m
-  modules-download-mode: vendor
 
 linters:
   disable-all: true
@@ -16,11 +15,11 @@ linters:
     - unused
     # Linters added by the stash project.
     # - contextcheck
+    - copyloopvar
     - dogsled
     - errchkjson
     - errorlint
     # - exhaustive
-    - exportloopref
     - gocritic
     # - goerr113
     - gofmt

.mockery.yml

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

Makefile

@@ -7,190 +7,288 @@ ifeq (${SHELL}, cmd)
 endif
 
 ifdef IS_WIN_SHELL
-  SEPARATOR := &&
-  SET := set
   RM := del /s /q
   RMDIR := rmdir /s /q
-  PWD := $(shell echo %cd%)
+  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)
 
-# including netgo causes name resolution to go through the Go resolver
-# and isn't necessary for static builds on Windows
-GO_BUILD_TAGS_WINDOWS := sqlite_omit_load_extension sqlite_stat4 osusergo
-GO_BUILD_TAGS_DEFAULT = $(GO_BUILD_TAGS_WINDOWS) netgo
+# 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
 
-.PHONY: release pre-build
+# set STASH_NOLEGACY environment variable or uncomment to disable legacy browser support
+# STASH_NOLEGACY := true
 
+# 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
 
-pre-build:
-ifndef BUILD_DATE
-	$(eval BUILD_DATE := $(shell go run -mod=vendor scripts/getDate.go))
-endif
+# 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 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
 
-ifndef GO_BUILD_TAGS
-	$(eval GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT))
-endif
+.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)")
 
+.PHONY: stash
+stash: build-flags
+	go build $(STASH_OUTPUT) $(BUILD_FLAGS) ./cmd/stash
 
-# NOTE: the build target still includes netgo because we cannot detect
-# Windows easily from the Makefile.
-build: pre-build
-build:
-	$(eval LDFLAGS := $(LDFLAGS) -X 'github.com/stashapp/stash/internal/api.version=$(STASH_VERSION)' -X 'github.com/stashapp/stash/internal/api.buildstamp=$(BUILD_DATE)' -X 'github.com/stashapp/stash/internal/api.githash=$(GITHASH)')
-	$(eval LDFLAGS := $(LDFLAGS) -X 'github.com/stashapp/stash/internal/manager/config.officialBuild=$(OFFICIAL_BUILD)')
-	go build $(OUTPUT) -mod=vendor -v -tags "$(GO_BUILD_TAGS)" $(GO_BUILD_FLAGS) -ldflags "$(LDFLAGS) $(EXTRA_LDFLAGS) $(PLATFORM_SPECIFIC_LDFLAGS)" ./cmd/stash
+.PHONY: phasher
+phasher: build-flags
+	go build $(PHASHER_OUTPUT) $(BUILD_FLAGS) ./cmd/phasher
 
-# strips debug symbols from the release build
-build-release: EXTRA_LDFLAGS := -s -w
-build-release: GO_BUILD_FLAGS := -trimpath
-build-release: build
+# builds dynamically-linked debug binaries
+.PHONY: build
+build: stash phasher
 
-build-release-static: EXTRA_LDFLAGS := -extldflags=-static -s -w
-build-release-static: GO_BUILD_FLAGS := -trimpath
-build-release-static: build
+# builds dynamically-linked PIE release binaries
+.PHONY: build-release
+build-release: flags-release flags-pie build
 
-# 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: GO_BUILD_TAGS := $(GO_BUILD_TAGS_WINDOWS)
-cross-compile-windows: build-release-static
+# 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-macos-intel: export GOOS := darwin
-cross-compile-macos-intel: export GOARCH := amd64
-cross-compile-macos-intel: export CC := o64-clang
-cross-compile-macos-intel: export CXX := o64-clang++
-cross-compile-macos-intel: OUTPUT := -o dist/stash-macos-intel
-cross-compile-macos-intel: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-# can't use static build for OSX
-cross-compile-macos-intel: build-release
+# build-cc- targets should be run within the compiler docker container
 
-cross-compile-macos-applesilicon: export GOOS := darwin
-cross-compile-macos-applesilicon: export GOARCH := arm64
-cross-compile-macos-applesilicon: export CC := oa64e-clang
-cross-compile-macos-applesilicon: export CXX := oa64e-clang++
-cross-compile-macos-applesilicon: OUTPUT := -o dist/stash-macos-applesilicon
-cross-compile-macos-applesilicon: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-# can't use static build for OSX
-cross-compile-macos-applesilicon: build-release
+.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
+
+.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
+
+.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
+
+.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
 
-cross-compile-macos:
-	rm -rf dist/Stash.app dist/Stash-macos.zip
-	make cross-compile-macos-applesilicon
-	make cross-compile-macos-intel
-	# Combine into one universal binary
-	lipo -create -output dist/stash-macos-universal dist/stash-macos-intel dist/stash-macos-applesilicon
-	rm dist/stash-macos-intel dist/stash-macos-applesilicon
 	# 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
-	mv dist/stash-macos-universal dist/Stash.app/Contents/MacOS/stash
-	cd dist && zip -r Stash-macos.zip Stash.app && cd ..
+	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
 
-cross-compile-freebsd: export GOOS := freebsd
-cross-compile-freebsd: export GOARCH := amd64
-cross-compile-freebsd: OUTPUT := -o dist/stash-freebsd
-cross-compile-freebsd: GO_BUILD_TAGS += netgo
-cross-compile-freebsd: build-release-static
+.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
 
-cross-compile-linux: export GOOS := linux
-cross-compile-linux: export GOARCH := amd64
-cross-compile-linux: OUTPUT := -o dist/stash-linux
-cross-compile-linux: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-cross-compile-linux: build-release-static
+.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
 
-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: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-cross-compile-linux-arm64v8: build-release-static
+.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
 
-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: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-cross-compile-linux-arm32v7: build-release-static
+.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
 
-cross-compile-linux-arm32v6: export GOOS := linux
-cross-compile-linux-arm32v6: export GOARCH := arm
-cross-compile-linux-arm32v6: export GOARM := 6
-cross-compile-linux-arm32v6: export CC := arm-linux-gnueabi-gcc
-cross-compile-linux-arm32v6: OUTPUT := -o dist/stash-linux-arm32v6
-cross-compile-linux-arm32v6: GO_BUILD_TAGS := $(GO_BUILD_TAGS_DEFAULT)
-cross-compile-linux-arm32v6: build-release-static
+.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
 
-cross-compile-all:
-	make cross-compile-windows
-	make cross-compile-macos-intel
-	make cross-compile-macos-applesilicon
-	make cross-compile-linux
-	make cross-compile-linux-arm64v8
-	make cross-compile-linux-arm32v7
-	make cross-compile-linux-arm32v6
+.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:
-ifndef IS_WIN_SHELL
-	@mkdir -p ui/v2.5/build
-	@touch ui/v2.5/build/index.html
-else
+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: touch-ui
-	go generate -mod=vendor ./cmd/stash
+	go generate ./cmd/stash
 
 .PHONY: generate-dataloaders
 generate-dataloaders:
-	go generate -mod=vendor ./internal/api/loaders
+	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
@@ -204,29 +302,30 @@ 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 ./...
+	$(eval GO_BUILD_TAGS += integration)
+	go test -tags "$(GO_BUILD_TAGS)" ./...
 
 # 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:
-ifndef IS_WIN_SHELL
-	@mkdir -p .local
-else
+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 ../cmd/stash
+	cd .local && go run $(BUILD_FLAGS) ../cmd/stash
 
 # removes local dev config files
 .PHONY: server-clean
@@ -239,47 +338,81 @@ server-clean:
 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) VITE_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
-	$(SET) VITE_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
-	$(SET) VITE_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
+ui: ui-env
 	cd ui/v2.5 && yarn build
 
+.PHONY: zip-ui
+zip-ui:
+	rm -f dist/stash-ui.zip
+	cd ui/v2.5/build && zip -r ../../../dist/stash-ui.zip .
+
 .PHONY: ui-start
-ui-start: pre-build
-	$(SET) VITE_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
-	$(SET) VITE_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
-	$(SET) VITE_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
+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:
+# runs all of the frontend PR-acceptance steps
+.PHONY: validate-ui
+validate-ui:
 	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
+# these targets run the same steps as fmt-ui and validate-ui, but only on files that have changed
+fmt-ui-quick:
+	cd ui/v2.5 && yarn run prettier --write $$(git diff --name-only --relative --diff-filter d . ../../graphql)
 
-# runs all of the frontend PR-acceptance steps
-.PHONY: validate-frontend
-validate-frontend: ui-validate
+# does not run tsc checks, as they are slow
+validate-ui-quick:
+	cd ui/v2.5 && \
+	tsfiles=$$(git diff --name-only --relative --diff-filter d src | grep -e "\.tsx\?\$$"); \
+	scssfiles=$$(git diff --name-only --relative --diff-filter d src | grep "\.scss"); \
+	prettyfiles=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
+	if [ -n "$$tsfiles" ]; then yarn run eslint $$tsfiles; fi && \
+	if [ -n "$$scssfiles" ]; then yarn run stylelint $$scssfiles; fi && \
+	if [ -n "$$prettyfiles" ]; then yarn run prettier --check $$prettyfiles; fi
 
 # 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: pre-build
+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: pre-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,10 +1,11 @@
 # Stash
-https://stashapp.cc
 
 [![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)
@@ -19,19 +20,31 @@ https://stashapp.cc
 
 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
 
-<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
+#### Windows Users:
+
+As of version 0.27.0, Stash doesn't support anymore _Windows 7, 8, Server 2008 and Server 2012._  
+Windows 10 or Server 2016 are at least required.
+
+<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 (Apple Silicon)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-applesilicon) <br /> <sup><sub>[Development Preview (Apple Silicon)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-applesilicon)</sub></sup> <br />[Latest Release (Intel)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-intel) <br /> <sup><sub>[Development Preview (Intel)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-intel)</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>
+[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>
+
+Download links for other platforms and architectures are available on the [Releases page](https://github.com/stashapp/stash/releases).
 
 ## First Run
-#### Windows Users: Security Prompt
-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.
-#### 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.
+
+#### Windows/macOS Users: Security Prompt
+
+On Windows or macOS, running the app might present a security prompt since the binary isn't yet signed. 
+
+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
+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
 
@@ -40,17 +53,20 @@ Stash is a web-based application. Once the application is running, the interface
 
 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.
 
-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.
-
-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 can pull metadata (performers, tags, descriptions, studios, and more) directly from many sites through the use of [scrapers](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/docs/en/Manual/Scraping.md), which integrate directly into Stash. Identifying an entire collection will typically require a mix of multiple sources:
+- The project maintains [StashDB](https://stashdb.org/), a crowd-sourced repository of scene, studio, and performer information. Connecting it to Stash will allow you to automatically identify much of a typical media collection. It runs on our stash-box software and is primarily focused on mainstream digital scenes and studios. Instructions, invite codes, and more can be found in this guide to [Accessing StashDB](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stashdb/).
+- Several community-managed stash-box databases can also be connected to Stash in a similar manner. Each one serves a slightly different niche and follows their own methodology. A rundown of each stash-box, their differences, and the information you need to sign up can be found in this guide to [Accessing Stash-Boxes](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stash-boxes/).
+- Many community-maintained scrapers can also be downloaded, installed, and updated from within Stash, allowing you to pull data from a wide range of other websites and databases. They can be found by navigating to Settings -> Metadata Providers -> Available Scrapers -> Community (stable). These can be trickier to use than a stash-box because every scraper works a little differently. For more information, please visit the [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers).
+- All of the above methods of scraping data into Stash are also covered in more detail in our [Guide to Scraping](https://docs.stashapp.cc/beginner-guides/guide-to-scraping/).
 
 <sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
 
 # Translation
-[![Translate](https://translate.stashapp.cc/widgets/stash/-/stash-desktop-client/svg-badge.svg)](https://translate.stashapp.cc/engage/stash/)
-🇧🇷 🇨🇳 🇩🇰 🇳🇱 🇬🇧 🇪🇪 🇫🇮 🇫🇷 🇩🇪 🇮🇹 🇯🇵 🇰🇷 🇵🇱 🇷🇺 🇪🇸 🇸🇪 🇹🇼 🇹🇷
+[![Translate](https://translate.codeberg.org/widget/stash/stash/svg-badge.svg)](https://translate.codeberg.org/engage/stash/)
 
-Stash is available in 25 languages (so far!) and it could be in your language too. If you want to help us translate Stash into your language, you can make an account at [translate.stashapp.cc](https://translate.stashapp.cc/projects/stash/stash-desktop-client/) to get started contributing new languages or improving existing ones. Thanks!
+Stash is available in 32 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 [Codeberg's Weblate](https://translate.codeberg.org/projects/stash/stash/) to get started contributing new languages or improving existing ones. Thanks!
+
+[![Translation status](https://translate.codeberg.org/widget/stash/stash/multi-auto.svg)](https://translate.codeberg.org/engage/stash/)
 
 # Support (FAQ)
 
@@ -58,6 +74,7 @@ Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for inform
 
 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)
 

cmd/phasher/main.go

@@ -0,0 +1,90 @@
+// TODO: document in README.md
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+
+	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 getPaths() (string, string) {
+	ffmpegPath, _ := exec.LookPath("ffmpeg")
+	ffprobePath, _ := exec.LookPath("ffprobe")
+
+	return ffmpegPath, ffprobePath
+}
+
+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 := getPaths()
+	encoder := ffmpeg.NewEncoder(ffmpegPath)
+	// don't need to InitHWSupport, phashing doesn't use hw acceleration
+	ffprobe := ffmpeg.NewFFProbe(ffprobePath)
+
+	for _, item := range args {
+		if err := printPhash(encoder, ffprobe, item, quiet); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+		}
+	}
+}

cmd/stash/main.go

@@ -1,68 +1,167 @@
-//go:generate go run -mod=vendor github.com/99designs/gqlgen
+//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 recoverPanic()
-
-	_, err := manager.Initialize()
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		defer recoverPanic()
-		if err := api.Start(); err != nil {
-			handleError(err)
-		} else {
-			manager.GetInstance().Shutdown(0)
+	defer func() {
+		if exitCode != 0 {
+			os.Exit(exitCode)
 		}
 	}()
 
-	go handleSignals()
-	desktop.Start(manager.GetInstance(), &manager.FaviconProvider{UIBox: ui.UIBox})
+	defer recoverPanic()
 
-	blockForever()
+	initLogTemp()
+
+	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
+}
+
+// initLogTemp initializes a temporary logger for use before the config is loaded.
+// Logs only error level message to stderr.
+func initLogTemp() *log.Logger {
+	l := log.NewLogger()
+	l.Init("", true, "Error")
+	logger.Logger = l
+
+	return l
+}
+
+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 p := recover(); p != nil {
-		handleError(fmt.Errorf("Panic: %v", p))
+	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 handleError(err error) {
+func exitError(err error) {
+	exitCode = 1
+	logger.Error(err)
 	if desktop.IsDesktop() {
 		desktop.FatalError(err)
-		manager.GetInstance().Shutdown(0)
-	} else {
-		panic(err)
 	}
 }
 
-func handleSignals() {
+func handleSignals(exit chan<- int) {
 	// handle signals
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
 
 	<-signals
-	manager.GetInstance().Shutdown(0)
-}
-
-func blockForever() {
-	select {}
+	exit <- 0
 }

docker/build/x86_64/Dockerfile

@@ -2,26 +2,25 @@
 
 # Build Frontend
 FROM node:alpine as frontend
-RUN apk add --no-cache make
+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 ./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.19-alpine as backend
+FROM golang:1.22-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
@@ -29,7 +28,7 @@ COPY --from=frontend /stash /stash/
 RUN make generate-backend
 ARG GITHASH
 ARG STASH_VERSION
-RUN make build
+RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM alpine:latest

docker/build/x86_64/Dockerfile-CUDA

@@ -2,26 +2,25 @@
 
 # Build Frontend
 FROM node:alpine as frontend
-RUN apk add --no-cache make
+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 ./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.19-bullseye as backend
+FROM golang:1.22-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 ./vendor /stash/vendor/
 COPY ./pkg /stash/pkg/
 COPY ./cmd /stash/cmd
 COPY ./internal /stash/internal
@@ -29,7 +28,7 @@ COPY --from=frontend /stash /stash/
 RUN make generate-backend
 ARG GITHASH
 ARG STASH_VERSION
-RUN make build
+RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM nvidia/cuda:12.0.1-base-ubuntu22.04
@@ -49,3 +48,5 @@ 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/ci/x86_64/Dockerfile

@@ -11,12 +11,25 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
 
 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 vips-tools ruby tzdata \
-    && pip install mechanicalsoup cloudscraper bencoder.pyx \
+    && 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 stashapp-tools \
     && gem install faraday \
     && apk del .build-deps
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
+# Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL org.opencontainers.image.title="Stash" \
+    org.opencontainers.image.description="An organizer for your porn, written in Go." \
+    org.opencontainers.image.url="https://stashapp.cc" \
+    org.opencontainers.image.documentation="https://docs.stashapp.cc" \
+    org.opencontainers.image.source="https://github.com/stashapp/stash" \
+    org.opencontainers.image.licenses="AGPL-3.0"
+
 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/compiler/Dockerfile

@@ -1,67 +1,83 @@
-FROM golang:1.19
+FROM golang:1.22
 
 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 zip --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:
+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 '*'
 
 # To test locally:
 # make generate
 # make ui
 # cd docker/compiler
 # make build
-# docker run -it -v /PATH_TO_STASH:/go/stash stashapp/compiler:latest /bin/bash
-# cd stash
-# make cross-compile-all
+# 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
-
-# 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
-
-# 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

docker/compiler/Makefile

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

docker/compiler/README.md

@@ -1,3 +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 the github workflow files need to be updated to pull the correct image tag.
+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

@@ -9,11 +9,11 @@ https://docs.docker.com/engine/install/
 
 ### 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:

docs/CONTRIBUTING.md

@@ -1,3 +1,24 @@
+## Goals and design vision
+
+The goal of stash is to be:
+- an application for organising and viewing adult content - currently this is videos and images, in future this will be extended to include audio and text content
+  - organising includes scraping of metadata from websites and metadata repositories
+- free and open-source
+- portable and offline - can be run on a USB stick without needing to install dependencies (with the exception of ffmpeg)
+- minimal, but highly extensible. The core feature set should be the minimum required to achieve the primary goal, while being extensible enough to extend via plugins
+- easy to learn and use, with minimal technical knowledge required
+
+The core stash system is not intended for:
+- managing downloading of content
+- managing content on external websites
+- publically sharing content
+
+Other requirements:
+- support as many video and image formats as possible
+- interfaces with external systems (for example stash-box) should be made as generic as possible. 
+
+Design considerations:
+- features are easy to add and difficult to remove. Large superfluous features should be scrutinised and avoided where possible (eg DLNA, filename parser). Such features should be considered for third-party plugins instead.
 
 ## Technical Debt
 Please be sure to consider how heavily your contribution impacts the maintainability of the project long term, sometimes less is more.  We don't want to merge collossal pull requests with hundreds of dependencies by a driveby contributor.

docs/DEVELOPMENT.md

@@ -4,23 +4,20 @@
 
 * [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)
+  * To install, follow the [local installation instructions](https://golangci-lint.run/welcome/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
 
 ### 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, dont use the autoinstaller it doesnt work)
-3. Search for "advanced system settings" and open the system properties dialog.
+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 the `Path`.  Edit and add `C:\MinGW\bin` (replace with the correct path to where you extracted MingW64).
+    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`
+NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For example, `make pre-ui` will be `mingw32-make pre-ui`.
 
 ### macOS
 
@@ -30,28 +27,62 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW. For examp
 ### 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 gcc nodejs ffmpeg -y`
-2. Enable corepack in Node.js: `corepack enable`
-3. Install yarn: `corepack prepare yarn@stable --activate`
+
+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. Only needs to be run once before building the UI for the first time, or if the dependencies are updated
-* `make generate` - Generate Go and UI GraphQL files
-* `make fmt-ui` - Formats the UI source code
-* `make ui` - Builds the frontend
-* `make build` - Builds the binary (make sure to build the UI as well... see below)
+* `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 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 server-start` - Runs an instance of the 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. Stash server port can be changed from the default of `9999` using environment variable `VITE_APP_PLATFORM_PORT`. UI runs on port `3000` or the next available port.
+* `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 validate-ui` - Runs tests and checks for the UI only
+* `make fmt-ui-quick` - (experimental) Formats only changed UI source code
+* `make validate-ui-quick` - (experimental) Runs tests and checks of changed UI 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
 
@@ -59,13 +90,14 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW. For examp
 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/`
+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 server code requires a restart (`CTRL-C` in the server terminal).
+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
@@ -73,25 +105,34 @@ On first launch:
 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/`)
+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 compile the frontend
-4. Run `make build` to build the executable for your current platform
+3. Run `make ui` to build the frontend
+4. Run `make build-release` to build a release executable for your current platform
 
-## Cross compiling
+## 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:
+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`.
 
-`docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -i -t stashapp/compiler:latest /bin/bash`
+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
 

go.mod

@@ -1,114 +1,119 @@
 module github.com/stashapp/stash
 
+go 1.22
+
 require (
-	github.com/99designs/gqlgen v0.17.2
+	github.com/99designs/gqlgen v0.17.49
+	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.5-0.20211125074323-810ee8082758
-	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.25.1
+	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/dop251/goja v0.0.0-20231027120936-b396bb4c349d
+	github.com/doug-martin/goqu/v9 v9.18.0
+	github.com/go-chi/chi/v5 v5.0.12
+	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.1.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/sessions v1.2.1
 	github.com/gorilla/websocket v1.5.0
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/jmoiron/sqlx v1.3.1
+	github.com/hashicorp/golang-lru/v2 v2.0.7
+	github.com/jinzhu/copier v0.4.0
+	github.com/jmoiron/sqlx v1.4.0
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.7
+	github.com/kermieisinthehouse/gosx-notifier v0.1.2
+	github.com/kermieisinthehouse/systray v1.2.4
+	github.com/knadh/koanf v1.5.0
+	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/mattn/go-sqlite3 v1.14.22
+	github.com/mitchellh/mapstructure v1.5.0
 	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/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.8.2 // indirect
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cast v1.6.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.10.1
-	github.com/stretchr/testify v1.7.1
-	github.com/tidwall/gjson v1.9.3
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/stretchr/testify v1.9.0
+	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.5.16
 	github.com/vektra/mockery/v2 v2.10.0
-	golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
-	golang.org/x/image v0.5.0
-	golang.org/x/net v0.7.0
-	golang.org/x/sys v0.5.0
-	golang.org/x/term v0.5.0
-	golang.org/x/text v0.7.0
-	golang.org/x/tools v0.1.12 // indirect
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
+	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
+	github.com/zencoder/go-dash/v3 v3.0.2
+	golang.org/x/crypto v0.24.0
+	golang.org/x/image v0.18.0
+	golang.org/x/net v0.26.0
+	golang.org/x/sys v0.21.0
+	golang.org/x/term v0.21.0
+	golang.org/x/text v0.16.0
+	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require (
-	github.com/asticode/go-astisub v0.20.0
-	github.com/doug-martin/goqu/v9 v9.18.0
-	github.com/go-chi/httplog v0.2.1
-	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
-	github.com/hashicorp/golang-lru v0.5.4
-	github.com/kermieisinthehouse/gosx-notifier v0.1.1
-	github.com/kermieisinthehouse/systray v1.2.4
-	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/spf13/cast v1.4.1
-	github.com/vearutop/statigz v1.1.6
-	github.com/vektah/dataloaden v0.3.0
-	github.com/vektah/gqlparser/v2 v2.4.2
-	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
-	github.com/zencoder/go-dash/v3 v3.0.2
-	gopkg.in/guregu/null.v4 v4.0.0
-)
-
 require (
 	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/antchfx/xpath v1.2.0 // 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.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-chi/chi/v5 v5.0.0 // indirect
+	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // 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/gobwas/ws v1.3.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/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.6 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // 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.20 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
-	github.com/pelletier/go-toml v1.9.4 // 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.26.1 // indirect
+	github.com/rs/zerolog v1.30.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/cobra v1.4.0 // indirect
+	github.com/sosodev/duration v1.3.1 // 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.2.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/spf13/viper v1.16.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.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.7.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	gopkg.in/ini.v1 v1.66.4 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/urfave/cli/v2 v2.27.2 // indirect
+	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // 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.19

gqlgen.yml

@@ -14,6 +14,7 @@ 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
@@ -23,16 +24,38 @@ autobind:
 
 models:
   # Scalars
-  Timestamp:
-    model: github.com/stashapp/stash/pkg/models.Timestamp
+  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/stashapp/stash/pkg/models.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
     fields:
       title:
         resolver: true
+  VideoFile:
+    fields:
+      # override float fields - #1572
+      duration:
+        fieldName: DurationFinite
+      frame_rate:
+        fieldName: FrameRateFinite
+  # movie is group under the hood
+  Movie:
+    model: github.com/stashapp/stash/pkg/models.Group
+  MovieFilterType:
+    model: github.com/stashapp/stash/pkg/models.GroupFilterType
   # autobind on config causes generation issues
   BlobsStorageType:
     model: github.com/stashapp/stash/internal/manager/config.BlobsStorageType
@@ -52,14 +75,10 @@ models:
     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
-  SceneParserInput:
-    model: github.com/stashapp/stash/internal/manager.SceneParserInput
-  SceneParserResult:
-    model: github.com/stashapp/stash/internal/manager.SceneParserResult
-  SceneMovieID:
-    model: github.com/stashapp/stash/internal/manager.SceneMovieID
   SystemStatus:
     model: github.com/stashapp/stash/internal/manager.SystemStatus
   SystemStatusEnum:
@@ -80,8 +99,8 @@ models:
     model: github.com/stashapp/stash/internal/manager.AutoTagMetadataInput
   CleanMetadataInput:
     model: github.com/stashapp/stash/internal/manager.CleanMetadataInput
-  StashBoxBatchPerformerTagInput:
-    model: github.com/stashapp/stash/internal/manager.StashBoxBatchPerformerTagInput
+  StashBoxBatchTagInput:
+    model: github.com/stashapp/stash/internal/manager.StashBoxBatchTagInput
   SceneStreamEndpoint:
     model: github.com/stashapp/stash/internal/manager.SceneStreamEndpoint
   ExportObjectTypeInput:
@@ -124,4 +143,11 @@ models:
     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,205 +0,0 @@
-fragment ConfigGeneralData on ConfigGeneralResult {
-  stashes {
-    path
-    excludeVideo
-    excludeImage
-  }
-  databasePath
-  backupDirectoryPath
-  generatedPath
-  metadataPath
-  scrapersPath
-  cachePath
-  blobsPath
-  blobsStorage
-  calculateMD5
-  videoFileNamingAlgorithm
-  parallelTasks
-  previewAudio
-  previewSegments
-  previewSegmentDuration
-  previewExcludeStart
-  previewExcludeEnd
-  previewPreset
-  transcodeHardwareAcceleration
-  maxTranscodeSize
-  maxStreamingTranscodeSize
-  writeImageThumbnails
-  apiKey
-  username
-  password
-  maxSessionAge
-  logFile
-  logOut
-  logLevel
-  logAccess
-  createGalleriesFromFolders
-  galleryCoverRegex
-  videoExtensions
-  imageExtensions
-  galleryExtensions
-  excludes
-  imageExcludes
-  customPerformerImageLocation
-  scraperUserAgent
-  scraperCertCheck
-  scraperCDPPath
-  stashBoxes {
-    name
-    endpoint
-    api_key
-  }
-  pythonPath
-  transcodeInputArgs
-  transcodeOutputArgs
-  liveTranscodeInputArgs
-  liveTranscodeOutputArgs
-  drawFunscriptHeatmapRange
-}
-
-fragment ConfigInterfaceData on ConfigInterfaceResult {
-  menuItems
-  soundOnPreview
-  wallShowTitle
-  wallPlayback
-  showScrubber
-  maximumLoopDuration
-  noBrowser
-  notificationsEnabled
-  autostartVideo
-  autostartVideoOnPlaySelected
-  continuePlaylistDefault
-  showStudioAsText
-  css
-  cssEnabled
-  javascript
-  javascriptEnabled
-  customLocales
-  customLocalesEnabled
-  language
-  imageLightbox {
-    slideshowDelay
-    displayMode
-    scaleUp
-    resetZoomOnNav
-    scrollMode
-    scrollAttemptsBeforeChange
-  }
-  disableDropdownCreate {
-    performer
-    tag
-    studio
-  }
-  handyKey
-  funscriptOffset
-}
-
-fragment ConfigDLNAData on ConfigDLNAResult {
-  serverName
-  enabled
-  whitelistedIPs
-  interfaces
-}
-
-fragment ConfigScrapingData on ConfigScrapingResult {
-  scraperUserAgent
-  scraperCertCheck
-  scraperCDPPath
-  excludeTagPatterns
-}
-
-fragment IdentifyFieldOptionsData on IdentifyFieldOptions {
-  field
-  strategy
-  createMissing
-}
-
-fragment IdentifyMetadataOptionsData on IdentifyMetadataOptions {
-  fieldOptions {
-    ...IdentifyFieldOptionsData
-  }
-  setCoverImage
-  setOrganized
-  includeMalePerformers
-}
-
-fragment ScraperSourceData on ScraperSource {
-  stash_box_index
-  stash_box_endpoint
-  scraper_id
-}
-
-fragment ConfigDefaultSettingsData on ConfigDefaultSettingsResult {
-  scan {
-    useFileMetadata
-    stripFileExtension
-    scanGenerateCovers
-    scanGeneratePreviews
-    scanGenerateImagePreviews
-    scanGenerateSprites
-    scanGeneratePhashes
-    scanGenerateThumbnails
-  }
-  
-  identify {
-    sources {
-      source {
-        ...ScraperSourceData
-      }
-      options {
-        ...IdentifyMetadataOptionsData
-      }
-    }
-    options {
-      ...IdentifyMetadataOptionsData
-    }
-  }
-
-  autoTag {
-    performers
-    studios
-    tags
-  }
-
-  generate {
-    covers
-    sprites
-    previews
-    imagePreviews
-    previewOptions {
-      previewSegments
-      previewSegmentDuration
-      previewExcludeStart
-      previewExcludeEnd
-      previewPreset
-    }
-    markers
-    markerImagePreviews
-    markerScreenshots
-    transcodes
-    phashes
-    interactiveHeatmapsSpeeds
-  }
-
-  deleteFile
-  deleteGenerated
-}
-
-fragment ConfigData on ConfigResult {
-  general {
-    ...ConfigGeneralData
-  }
-  interface {
-    ...ConfigInterfaceData
-  }
-  dlna {
-    ...ConfigDLNAData
-  }
-  scraping {
-    ...ConfigScrapingData
-  }
-  defaults {
-    ...ConfigDefaultSettingsData
-  }
-  ui
-}

graphql/documents/data/file.graphql

@@ -1,46 +0,0 @@
-fragment FolderData on Folder {
-  id
-  path
-}
-
-fragment VideoFileData on VideoFile {
-  id
-  path
-  size
-  mod_time
-  duration
-  video_codec
-  audio_codec
-  width
-  height
-  frame_rate
-  bit_rate
-  fingerprints {
-    type
-    value
-  }
-}
-
-fragment ImageFileData on ImageFile {
-  id
-  path
-  size
-  mod_time
-  width
-  height
-  fingerprints {
-    type
-    value
-  }
-}
-
-fragment GalleryFileData on GalleryFile {
-  id
-  path
-  size
-  mod_time
-  fingerprints {
-    type
-    value
-  }
-}

graphql/documents/data/filter.graphql

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

graphql/documents/data/gallery.graphql

@@ -1,38 +0,0 @@
-fragment GalleryData on Gallery {
-  id
-  created_at
-  updated_at
-  title
-  date
-  url
-  details
-  rating100
-  organized
-
-  files {
-    ...GalleryFileData
-  }
-  folder {
-    ...FolderData
-  }
-
-  chapters {
-    ...GalleryChapterData
-  }
-  cover {
-    ...SlimImageData
-  }
-  studio {
-    ...SlimStudioData
-  }
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-  scenes {
-    ...SlimSceneData
-  }
-}

graphql/documents/data/image.graphql

@@ -1,36 +0,0 @@
-fragment ImageData on Image {
-  id
-  title
-  rating100
-  date
-  url
-  organized
-  o_counter
-  created_at
-  updated_at
-
-  files {
-    ...ImageFileData
-  }
-
-  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,6 +0,0 @@
-fragment SlimMovieData on Movie {
-  id
-  name
-  front_image_path
-  rating100
-}

graphql/documents/data/movie.graphql

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

graphql/documents/data/performer-slim.graphql

@@ -1,34 +0,0 @@
-fragment SlimPerformerData on Performer {
-  id
-  name
-  disambiguation
-  gender
-  url
-  twitter
-  instagram
-  image_path
-  favorite
-  ignore_auto_tag
-  country
-  birthdate
-  ethnicity
-  hair_color
-  eye_color
-  height_cm
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  alias_list
-  tags {
-    id
-    name
-  }
-  stash_ids {
-    endpoint
-    stash_id
-  }
-  rating100
-  death_date
-  weight
-}

graphql/documents/data/performer.graphql

@@ -1,42 +0,0 @@
-fragment PerformerData on Performer {
-  id
-  checksum
-  name
-  disambiguation
-  url
-  gender
-  twitter
-  instagram
-  birthdate
-  ethnicity
-  country
-  eye_color
-  height_cm
-  measurements
-  fake_tits
-  career_length
-  tattoos
-  piercings
-  alias_list
-  favorite
-  ignore_auto_tag
-  image_path
-  scene_count
-  image_count
-  gallery_count
-  movie_count
-
-  tags {
-    ...SlimTagData
-  }
-
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  rating100
-  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.graphql

@@ -1,78 +0,0 @@
-fragment SceneData on Scene {
-  id
-  title
-  code
-  details
-  director
-  url
-  date
-  rating100
-  o_counter
-  organized
-  interactive
-  interactive_speed
-  captions {
-    language_code
-    caption_type
-  }
-  created_at
-  updated_at
-  resume_time
-  last_played_at
-  play_duration
-  play_count
-
-  files {
-    ...VideoFileData
-  }
-
-  paths {
-    screenshot
-    preview
-    stream
-    webp
-    vtt
-    sprite
-    funscript
-    interactive_heatmap
-    caption
-  }
-
-  scene_markers {
-    ...SceneMarkerData
-  }
-
-  galleries {
-    ...SlimGalleryData
-  }
-
-  studio {
-    ...SlimStudioData
-  }
-  
-  movies {
-    movie {
-      ...MovieData
-    }
-    scene_index
-  }
-
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-
-  stash_ids {
-    endpoint
-    stash_id
-  }
-
-  sceneStreams {
-    url
-    mime_type
-    label
-  }
-}

graphql/documents/data/scrapers.graphql

@@ -1,221 +0,0 @@
-fragment ScrapedPerformerData on ScrapedPerformer {
-  stored_id
-  name
-  disambiguation
-  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
-  disambiguation
-  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
-  code
-  details
-  director
-  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
-  code
-  details
-  director
-  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,31 +0,0 @@
-fragment StudioData on Studio {
-  id
-  checksum
-  name
-  url
-  parent_studio {
-    id
-    name
-    url
-    image_path
-  }
-  child_studios {
-    id
-    name
-    image_path
-  }
-  ignore_auto_tag
-  image_path
-  scene_count
-  image_count
-  gallery_count
-  performer_count
-  movie_count
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  details
-  rating100
-  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,21 +0,0 @@
-fragment TagData on Tag {
-  id
-  name
-  description
-  aliases
-  ignore_auto_tag
-  image_path
-  scene_count
-  scene_marker_count
-  image_count
-  gallery_count
-  performer_count
-
-  parents {
-    ...SlimTagData
-  }
-
-  children {
-    ...SlimTagData
-  }
-}

graphql/documents/mutations/config.graphql

@@ -1,45 +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 ConfigureDefaults($input: ConfigDefaultSettingsInput!) {
-  configureDefaults(input: $input) {
-    ...ConfigDefaultSettingsData
-  }
-}
-
-mutation ConfigureUI($input: Map!) {
-  configureUI(input: $input)
-}
-
-mutation GenerateAPIKey($input: GenerateAPIKeyInput!) {
-  generateAPIKey(input: $input)
-}

graphql/documents/mutations/file.graphql

@@ -1,3 +0,0 @@
-mutation DeleteFiles($ids: [ID!]!) {
-  deleteFiles(ids: $ids)
-}

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-chapter.graphql

@@ -1,31 +0,0 @@
-mutation GalleryChapterCreate(
-  $title: String!,
-  $image_index: Int!,
-  $gallery_id: ID!) {
-  galleryChapterCreate(input: {
-                              title: $title,
-                              image_index: $image_index,
-                              gallery_id: $gallery_id,
-                            }) {
-    ...GalleryChapterData
-  }
-}
-
-mutation GalleryChapterUpdate(
-  $id: ID!,
-  $title: String!,
-  $image_index: Int!,
-  $gallery_id: ID!) {
-  galleryChapterUpdate(input: {
-                              id: $id,
-                              title: $title,
-                              image_index: $image_index,
-                              gallery_id: $gallery_id,
-                            }) {
-    ...GalleryChapterData
-  }
-}
-
-mutation GalleryChapterDestroy($id: ID!) {
-  galleryChapterDestroy(id: $id)
-}

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,47 +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 MetadataIdentify($input: IdentifyMetadataInput!) {
-  metadataIdentify(input: $input)
-}
-
-mutation MetadataClean($input: CleanMetadataInput!) {
-  metadataClean(input: $input)
-}
-
-mutation MigrateHashNaming {
-  migrateHashNaming
-}
-
-mutation BackupDatabase($input: BackupDatabaseInput!) {
-  backupDatabase(input: $input)
-}
-
-mutation AnonymiseDatabase($input: AnonymiseDatabaseInput!) {
-  anonymiseDatabase(input: $input)
-}

graphql/documents/mutations/movie.graphql

@@ -1,37 +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 BulkMovieUpdate($input: BulkMovieUpdateInput!) {
-  bulkMovieUpdate(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,71 +0,0 @@
-mutation SceneCreate(
-  $input: SceneCreateInput!) {
-
-  sceneCreate(input: $input) {
-    ...SceneData
-  }
-}
-
-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 SceneSaveActivity($id: ID!, $resume_time: Float, $playDuration: Float) {
-  sceneSaveActivity(id: $id, resume_time: $resume_time, playDuration: $playDuration) 
-}
-
-mutation SceneIncrementPlayCount($id: ID!) {
-  sceneIncrementPlayCount(id: $id) 
-}
-
-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)
-}
-
-mutation SceneAssignFile($input: AssignSceneFileInput!) {
-  sceneAssignFile(input: $input)
-}
-
-mutation SceneMerge($input: SceneMergeInput!) {
-  sceneMerge(input: $input) {
-    id
-  }
-}

graphql/documents/mutations/scrapers.graphql

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

graphql/documents/mutations/stash-box.graphql

@@ -1,15 +0,0 @@
-mutation SubmitStashBoxFingerprints($input: StashBoxFingerprintSubmissionInput!) {
-  submitStashBoxFingerprints(input: $input)
-}
-
-mutation StashBoxBatchPerformerTag($input: StashBoxBatchPerformerTagInput!) {
-  stashBoxBatchPerformerTag(input: $input)
-}
-
-mutation SubmitStashBoxSceneDraft($input: StashBoxDraftSubmissionInput!) {
-  submitStashBoxSceneDraft(input: $input)
-}
-
-mutation SubmitStashBoxPerformerDraft($input: StashBoxDraftSubmissionInput!) {
-  submitStashBoxPerformerDraft(input: $input)
-}

graphql/documents/mutations/tag.graphql

@@ -1,25 +0,0 @@
-mutation TagCreate($input: TagCreateInput!) {
-  tagCreate(input: $input) {
-    ...TagData
-  }
-}
-
-mutation TagDestroy($id: ID!) {
-  tagDestroy(input: { id: $id })
-}
-
-mutation TagsDestroy($ids: [ID!]!) {
-  tagsDestroy(ids: $ids)
-}
-
-mutation TagUpdate($input: TagUpdateInput!) {
-  tagUpdate(input: $input) {
-    ...TagData
-  }
-}
-
-mutation TagsMerge($source: [ID!]!, $destination: ID!) {
-  tagsMerge(input: { source: $source, destination: $destination }) {
-    ...TagData
-  }
-}

graphql/documents/queries/filter.graphql

@@ -1,17 +0,0 @@
-query FindSavedFilter($id: ID!) {
-  findSavedFilter(id: $id) {
-    ...SavedFilterData
-  }
-}
-
-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,16 +0,0 @@
-query FindImages($filter: FindFilterType, $image_filter: ImageFilterType, $image_ids: [Int!]) {
-  findImages(filter: $filter, image_filter: $image_filter, image_ids: $image_ids) {
-    count
-    megapixels
-    filesize
-    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,76 +0,0 @@
-query MarkerStrings($q: String, $sort: String) {
-  markerStrings(q: $q, sort: $sort) {
-    id
-    count
-    title
-  }
-}
-
-query AllPerformersForFilter {
-  allPerformers {
-    id
-    name
-    disambiguation
-    alias_list
-  }
-}
-
-query AllStudiosForFilter {
-  allStudios {
-    id
-    name
-    aliases
-  }
-}
-
-query AllMoviesForFilter {
-  allMovies {
-    id
-    name
-  }
-}
-
-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 {
-    version
-    shorthash
-    release_date
-    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,80 +0,0 @@
-query FindScenes($filter: FindFilterType, $scene_filter: SceneFilterType, $scene_ids: [Int!]) {
-  findScenes(filter: $filter, scene_filter: $scene_filter, scene_ids: $scene_ids) {
-    count
-    filesize
-    duration
-    scenes {
-      ...SlimSceneData
-    }
-  }
-}
-
-query FindScenesByPathRegex($filter: FindFilterType) {
-  findScenesByPathRegex(filter: $filter) {
-    count
-    filesize
-    duration
-    scenes {
-      ...SlimSceneData
-    }
-  }
-}
-
-query FindDuplicateScenes($distance: Int) {
-  findDuplicateScenes(distance: $distance) {
-    ...SlimSceneData
-  }
-}
-
-query FindScene($id: ID!, $checksum: String) {
-  findScene(id: $id, checksum: $checksum) {
-    ...SceneData
-  }
-}
-
-query FindSceneMarkerTags($id: ID!) {
-  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
-      code
-      details
-      director
-      url
-      date
-      rating
-      studio_id
-      gallery_ids
-      movies {
-        movie_id
-      }
-      performer_ids
-      tag_ids
-    }
-  }
-}
-
-query SceneStreams($id: ID!) {
-  findScene(id: $id) {
-    sceneStreams {
-      url
-      mime_type
-      label
-    }
-  }
-}

graphql/documents/queries/scrapers/freeones.graphql

@@ -1,3 +0,0 @@
-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,20 +0,0 @@
-query Configuration {
-  configuration {
-    ...ConfigData
-  }
-}
-
-query Directory($path: String) {
-  directory(path: $path) {
-      path
-      parent
-      directories
-  }
-}
-
-query ValidateStashBox($input: StashBoxInput!) {
-  validateStashBoxCredentials(input: $input) {
-    valid
-    status
-  }
-}

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,212 @@
-"""The query root for this schema"""
+"The query root for this schema"
 type Query {
   # Filters
   findSavedFilter(id: ID!): SavedFilter
   findSavedFilters(mode: FilterMode): [SavedFilter!]!
   findDefaultFilter(mode: FilterMode!): SavedFilter
+    @deprecated(reason: "default filter now stored in UI config")
 
-  """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!
+  "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"""
+  "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"""
-  findMovie(id: ID!): Movie
-  """A function which queries Movie objects"""
-  findMovies(movie_filter: MovieFilterType, filter: FindFilterType): FindMoviesResultType!
+  "Find a movie by ID"
+  findMovie(id: ID!): Movie @deprecated(reason: "Use findGroup instead")
+  "A function which queries Movie objects"
+  findMovies(
+    movie_filter: MovieFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindMoviesResultType! @deprecated(reason: "Use findGroups instead")
+
+  "Find a group by ID"
+  findGroup(id: ID!): Group
+  "A function which queries Group objects"
+  findGroups(
+    group_filter: GroupFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindGroupsResultType!
 
   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"""
+  "List available scrapers"
   listScrapers(types: [ScrapeContentType!]!): [Scraper!]!
-  listPerformerScrapers: [Scraper!]! @deprecated(reason: "Use listScrapers(types: [PERFORMER])")
-  listSceneScrapers: [Scraper!]! @deprecated(reason: "Use listScrapers(types: [SCENE])")
-  listGalleryScrapers: [Scraper!]! @deprecated(reason: "Use listScrapers(types: [GALLERY])")
-  listMovieScrapers: [Scraper!]! @deprecated(reason: "Use listScrapers(types: [MOVIE])")
 
+  "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 studio"
+  scrapeSingleStudio(
+    source: ScraperSourceInput!
+    input: ScrapeSingleStudioInput!
+  ): [ScrapedStudio!]!
 
-  """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 performer"
+  scrapeSinglePerformer(
+    source: ScraperSourceInput!
+    input: ScrapeSinglePerformerInput!
+  ): [ScrapedPerformer!]!
+  "Scrape for multiple performers"
+  scrapeMultiPerformers(
+    source: ScraperSourceInput!
+    input: ScrapeMultiPerformersInput!
+  ): [[ScrapedPerformer!]!]!
 
-  """Scrape for a single gallery"""
-  scrapeSingleGallery(source: ScraperSourceInput!, input: ScrapeSingleGalleryInput!): [ScrapedGallery!]!
+  "Scrape for a single gallery"
+  scrapeSingleGallery(
+    source: ScraperSourceInput!
+    input: ScrapeSingleGalleryInput!
+  ): [ScrapedGallery!]!
 
-  """Scrape for a single movie"""
-  scrapeSingleMovie(source: ScraperSourceInput!, input: ScrapeSingleMovieInput!): [ScrapedMovie!]!
+  "Scrape for a single movie"
+  scrapeSingleMovie(
+    source: ScraperSourceInput!
+    input: ScrapeSingleMovieInput!
+  ): [ScrapedMovie!]! @deprecated(reason: "Use scrapeSingleGroup instead")
+
+  "Scrape for a single group"
+  scrapeSingleGroup(
+    source: ScraperSourceInput!
+    input: ScrapeSingleGroupInput!
+  ): [ScrapedGroup!]!
 
   "Scrapes content based on a URL"
   scrapeURL(url: String!, ty: ScrapeContentType!): ScrapedContent
 
-  """Scrapes a complete performer record based on a URL"""
+  "Scrapes a complete performer record based on a URL"
   scrapePerformerURL(url: String!): ScrapedPerformer
-  """Scrapes a complete scene 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 list of performers from a query"""
-  scrapeFreeonesPerformerList(query: String!): [String!]! @deprecated(reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones")
+    @deprecated(reason: "Use scrapeGroupURL instead")
+  "Scrapes a complete group record based on a URL"
+  scrapeGroupURL(url: String!): ScrapedGroup
 
   # 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"""
+  "Returns an array of paths for the given path"
   directory(
     "The directory path to list"
-    path: String,
+    path: String
     "Desired collation locale. Determines the order of the directory result. eg. 'en-US', 'pt-BR', ..."
     locale: String = "en"
   ): Directory!
@@ -144,14 +223,16 @@ type Query {
 
   # Get everything
 
-  allScenes: [Scene!]!
+  allScenes: [Scene!]! @deprecated(reason: "Use findScenes instead")
   allSceneMarkers: [SceneMarker!]!
-  allImages: [Image!]!
-  allGalleries: [Gallery!]!
+    @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 findGroups instead")
 
   # Get everything with minimal metadata
 
@@ -164,7 +245,12 @@ type Query {
 
 type Mutation {
   setup(input: SetupInput!): Boolean!
-  migrate(input: MigrateInput!): Boolean!
+
+  "Migrates the schema to the required version. Returns the job ID"
+  migrate(input: MigrateInput!): ID!
+
+  "Downloads and installs ffmpeg and ffprobe binaries into the configuration directory. Returns the job ID."
+  downloadFFMpeg: ID!
 
   sceneCreate(input: SceneCreateInput!): Scene
   sceneUpdate(input: SceneUpdateInput!): Scene
@@ -174,20 +260,41 @@ type Mutation {
   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!
 
-  """Sets the resume time point (if provided) and adds the provided duration to the scene's play duration"""
+  "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!
+  "Resets the resume time point and play duration"
+  sceneResetActivity(
+    id: ID!
+    reset_resume: Boolean
+    reset_duration: Boolean
+  ): Boolean!
 
-  """Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"""
+  "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
@@ -202,11 +309,11 @@ type Mutation {
   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
@@ -217,6 +324,8 @@ type Mutation {
 
   addGalleryImages(input: GalleryAddInput!): Boolean!
   removeGalleryImages(input: GalleryRemoveInput!): Boolean!
+  setGalleryCover(input: GallerySetCoverInput!): Boolean!
+  resetGalleryCover(input: GalleryResetCoverInput!): Boolean!
 
   galleryChapterCreate(input: GalleryChapterCreateInput!): GalleryChapter
   galleryChapterUpdate(input: GalleryChapterUpdateInput!): GalleryChapter
@@ -234,19 +343,39 @@ type Mutation {
   studiosDestroy(ids: [ID!]!): Boolean!
 
   movieCreate(input: MovieCreateInput!): Movie
+    @deprecated(reason: "Use groupCreate instead")
   movieUpdate(input: MovieUpdateInput!): Movie
+    @deprecated(reason: "Use groupUpdate instead")
   movieDestroy(input: MovieDestroyInput!): Boolean!
+    @deprecated(reason: "Use groupDestroy instead")
   moviesDestroy(ids: [ID!]!): Boolean!
+    @deprecated(reason: "Use groupsDestroy instead")
   bulkMovieUpdate(input: BulkMovieUpdateInput!): [Movie!]
+    @deprecated(reason: "Use bulkGroupUpdate instead")
+
+  groupCreate(input: GroupCreateInput!): Group
+  groupUpdate(input: GroupUpdateInput!): Group
+  groupDestroy(input: GroupDestroyInput!): Boolean!
+  groupsDestroy(ids: [ID!]!): Boolean!
+  bulkGroupUpdate(input: BulkGroupUpdateInput!): [Group!]
+
+  addGroupSubGroups(input: GroupSubGroupAddInput!): Boolean!
+  removeGroupSubGroups(input: GroupSubGroupRemoveInput!): Boolean!
+
+  "Reorder sub groups within a group. Returns true if successful."
+  reorderSubGroups(input: ReorderSubGroupsInput!): Boolean!
 
   tagCreate(input: TagCreateInput!): Tag
   tagUpdate(input: TagUpdateInput!): Tag
   tagDestroy(input: TagDestroyInput!): Boolean!
   tagsDestroy(ids: [ID!]!): Boolean!
   tagsMerge(input: TagsMergeInput!): Tag
+  bulkTagUpdate(input: BulkTagUpdateInput!): [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.
+  """
+  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.
@@ -255,93 +384,173 @@ type Mutation {
   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!
+    @deprecated(reason: "now uses UI config")
 
-  """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!
+  configureDefaults(
+    input: ConfigDefaultSettingsInput!
+  ): ConfigDefaultSettingsResult!
 
-  # overwrites the entire UI configuration
-  configureUI(input: Map!): Map!
-  # sets a single UI key value
+  "overwrites the entire plugin configuration for the given plugin"
+  configurePlugin(plugin_id: ID!, input: Map!): Map!
+
+  """
+  overwrites the UI configuration
+  if input is provided, then the entire UI configuration is replaced
+  if partial is provided, then the partial UI configuration is merged into the existing UI configuration
+  """
+  configureUI(input: Map, partial: Map): Map!
+  """
+  sets a single UI key value
+  key is a dot separated path to the value
+  """
   configureUISetting(key: String!, value: Any): Map!
 
-  """Generate and set (or clear) API key"""
+  "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!
-  """Identifies scenes using scrapers. Returns the job ID"""
+  "Clean generated files. Returns the job ID"
+  metadataCleanGenerated(input: CleanGeneratedInput!): ID!
+  "Identifies scenes using scrapers. Returns the job ID"
   metadataIdentify(input: IdentifyMetadataInput!): ID!
-  
-  """Migrate generated files for the current hash naming"""
+
+  "Migrate generated files for the current hash naming"
   migrateHashNaming: ID!
-  """Migrates legacy scene screenshot files into the blob storage"""
+  "Migrates legacy scene screenshot files into the blob storage"
   migrateSceneScreenshots(input: MigrateSceneScreenshotsInput!): ID!
-  """Migrates blobs from the old storage system to the current one"""
+  "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"""
+
+  "Anonymise the database in a separate file. Optionally returns a link to download the database file"
   anonymiseDatabase(input: AnonymiseDatabaseInput!): String
 
-  """Reload scrapers"""
+  "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!
 
-  """Submit scene as draft to stash-box instance"""
+  "Submit scene as draft to stash-box instance"
   submitStashBoxSceneDraft(input: StashBoxDraftSubmissionInput!): ID
-  """Submit performer as draft to stash-box instance"""
+  "Submit performer as draft to stash-box instance"
   submitStashBoxPerformerDraft(input: StashBoxDraftSubmissionInput!): ID
 
-  """Backup the database. Optionally returns a link to download the database file"""
+  "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!
+  "DANGEROUS: Execute an arbitrary SQL statement that returns rows."
+  querySQL(sql: String!, args: [Any]): SQLQueryResult!
 
-  """Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"""
+  "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,270 +1,314 @@
 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"""
+  "Empty to indicate default"
   cacheLocation: String!
-  """Empty to indicate database storage for blobs"""
+  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
+  "Database"
+  DATABASE
   # blobs are stored in the filesystem under the configured blobs directory
-  "Filesystem", FILESYSTEM
+  "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 backup directory"""
+  "Path to backup directory"
   backupDirectoryPath: String
-  """Path to generated files"""
+  "Path to generated files"
   generatedPath: String
-  """Path to import/export files"""
+  "Path to import/export files"
   metadataPath: String
-  """Path to scrapers"""
+  "Path to scrapers"
   scrapersPath: String
-  """Path to cache"""
+  "Path to plugins"
+  pluginsPath: String
+  "Path to cache"
   cachePath: String
-  """Path to blobs - required for filesystem blob storage"""
+  "Path to blobs - required for filesystem blob storage"
   blobsPath: String
-  """Where to store blobs"""
+  "Where to store blobs"
   blobsStorage: BlobsStorageType
-  """Whether to calculate MD5 checksums for scene video files"""
+  "Path to the ffmpeg binary. If empty, stash will attempt to find it in the path or config directory"
+  ffmpegPath: String
+  "Path to the ffprobe binary. If empty, stash will attempt to find it in the path or config directory"
+  ffprobePath: String
+  "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
-  """Transcode Hardware Acceleration"""
+  "Transcode Hardware Acceleration"
   transcodeHardwareAcceleration: Boolean
-  """Max generated transcode size"""
+  "Max generated transcode size"
   maxTranscodeSize: StreamingResolutionEnum
-  """Max streaming transcode size"""
+  "Max streaming transcode size"
   maxStreamingTranscodeSize: StreamingResolutionEnum
-  
-  """ffmpeg transcode input args - injected before input file
-  These are applied to generated transcodes (previews and transcodes)"""
+
+  """
+  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)"""
+  """
+  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"""
+  """
+  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"""
+  """
+  ffmpeg stream output args - injected before output file
+  These are applied when live transcoding
+  """
   liveTranscodeOutputArgs: [String!]
 
-  """whether to include range in generated funscript heatmaps"""
+  "whether to include range in generated funscript heatmaps"
   drawFunscriptHeatmapRange: Boolean
 
-  """Write image thumbnails to disk when generating on the fly"""
+  "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!] @deprecated(reason: "no longer supported")
-  """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
-  """True if galleries should be created from folders with images"""
+  "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"""
+  "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"""
+  "Stash-box instances used for tagging"
   stashBoxes: [StashBoxInput!]
-  """Python path - resolved using path if unset"""
+  "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 backup directory"""
+  "Path to backup directory"
   backupDirectoryPath: String!
-  """Path to generated files"""
+  "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!
-  """Path to blobs - required for filesystem blob storage"""
+  "Path to blobs - required for filesystem blob storage"
   blobsPath: String!
-  """Where to store blobs"""
+  "Where to store blobs"
   blobsStorage: BlobsStorageType!
-  """Whether to calculate MD5 checksums for scene video files"""
+  "Path to the ffmpeg binary. If empty, stash will attempt to find it in the path or config directory"
+  ffmpegPath: String!
+  "Path to the ffprobe binary. If empty, stash will attempt to find it in the path or config directory"
+  ffprobePath: String!
+  "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!
-  """Transcode Hardware Acceleration"""
+  "Transcode Hardware Acceleration"
   transcodeHardwareAcceleration: Boolean!
-  """Max generated transcode size"""
+  "Max generated transcode size"
   maxTranscodeSize: StreamingResolutionEnum
-  """Max streaming transcode size"""
+  "Max streaming transcode size"
   maxStreamingTranscodeSize: StreamingResolutionEnum
 
-  """ffmpeg transcode input args - injected before input file
-  These are applied to generated transcodes (previews and transcodes)"""
+  """
+  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)"""
+  """
+  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"""
+  """
+  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"""
+  """
+  ffmpeg stream output args - injected before output file
+  These are applied when live transcoding
+  """
   liveTranscodeOutputArgs: [String!]!
 
-  """whether to include range in generated funscript heatmaps"""
+  "whether to include range in generated funscript heatmaps"
   drawFunscriptHeatmapRange: Boolean!
 
-  """Write image thumbnails to disk when generating on the fly"""
+  "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!] @deprecated(reason: "no longer supported")
-  """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!
-  """Regex used to identify images as gallery covers"""
+  "Regex used to identify images as gallery covers"
   galleryCoverRegex: 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 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"""
+  "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 {
@@ -297,62 +341,61 @@ type ConfigImageLightboxResult {
 }
 
 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
 
-  """Show scene scrubber by default"""
+  "Show scene scrubber by default"
   showScrubber: Boolean
-  
-  """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
+
+  "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, video will autostart when loading from play random or play selected"""
+  "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"""
+  "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"""
+
+  "If true, studio overlays will be shown as text instead of logo images"
   showStudioAsText: Boolean
-  
-  """Custom CSS"""
+
+  "Custom CSS"
   css: String
   cssEnabled: Boolean
 
-  """Custom Javascript"""
+  "Custom Javascript"
   javascript: String
   javascriptEnabled: Boolean
 
-  """Custom Locales"""
+  "Custom Locales"
   customLocales: String
   customLocalesEnabled: Boolean
-  
-  """Interface language"""
+
+  "Interface language"
   language: String
 
-  """Slideshow Delay"""
-  slideshowDelay: Int @deprecated(reason: "Use imageLightbox.slideshowDelay")
-  
   imageLightbox: ConfigImageLightboxInput
-  
-  """Set to true to disable creating new objects via the dropdown menus"""
+
+  "Set to true to disable creating new objects via the dropdown menus"
   disableDropdownCreate: ConfigDisableDropdownCreateInput
-  
-  """Handy Connection Key"""
+
+  "Handy Connection Key"
   handyKey: String
-  """Funscript Time Offset"""
+  "Funscript Time Offset"
   funscriptOffset: Int
-  """True if we should not auto-open a browser window on startup"""
+  "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"""
+  "True if we should send notifications to the desktop"
   notificationsEnabled: Boolean
 }
 
@@ -360,108 +403,115 @@ 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
 
-  """Show scene scrubber by default"""
+  "Show scene scrubber by default"
   showScrubber: Boolean
 
-  """Maximum duration (in seconds) in which a scene video will loop in the scene player"""
+  "Maximum duration (in seconds) in which a scene video will loop in the scene player"
   maximumLoopDuration: Int
-  """True if we should not auto-open a browser window on startup"""
+  "True if we should not auto-open a browser window on startup"
   noBrowser: Boolean
-  """True if we should send desktop notifications"""
+  "True if we should send desktop notifications"
   notificationsEnabled: Boolean
-  """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, video will autostart when loading from play random or play selected"""
+  "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"""
+  "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"""
+  "If true, studio overlays will be shown as text instead of logo images"
   showStudioAsText: Boolean
 
-  """Custom CSS"""
+  "Custom CSS"
   css: String
   cssEnabled: Boolean
 
-  """Custom Javascript"""
+  "Custom Javascript"
   javascript: String
   javascriptEnabled: Boolean
 
-  """Custom Locales"""
+  "Custom Locales"
   customLocales: String
   customLocalesEnabled: Boolean
-  
-  """Interface language"""
-  language: String
 
-  """Slideshow Delay"""
-  slideshowDelay: Int @deprecated(reason: "Use imageLightbox.slideshowDelay")
+  "Interface language"
+  language: String
 
   imageLightbox: ConfigImageLightboxResult!
 
-  """Fields are true if creating via dropdown menus are disabled"""
+  "Fields are true if creating via dropdown menus are disabled"
   disableDropdownCreate: ConfigDisableDropdownCreate!
-  disabledDropdownCreate: ConfigDisableDropdownCreate! @deprecated(reason: "Use disableDropdownCreate")
 
-  """Handy Connection Key"""
+  "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"""
+  "Defaults to 1338"
+  port: Int
+  "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"""
+  "Defaults to 1338"
+  port: Int!
+  "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"""
+  "Whether the scraper should check for invalid certificates"
   scraperCertCheck: Boolean
-  """Tags blacklist during scraping"""
+  "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!]!
 }
 
@@ -470,10 +520,10 @@ type ConfigDefaultSettingsResult {
   identify: IdentifyMetadataTaskOptions
   autoTag: AutoTagMetadataOptions
   generate: GenerateMetadataOptions
-  
-  """If true, delete file checkbox will be checked by default"""
+
+  "If true, delete file checkbox will be checked by default"
   deleteFile: Boolean
-  """If true, delete generated supporting files checkbox will be checked by default"""
+  "If true, delete generated supporting files checkbox will be checked by default"
   deleteGenerated: Boolean
 }
 
@@ -483,13 +533,13 @@ input ConfigDefaultSettingsInput {
   autoTag: AutoTagMetadataInput
   generate: GenerateMetadataInput
 
-  """If true, delete file checkbox will be checked by default"""
+  "If true, delete file checkbox will be checked by default"
   deleteFile: Boolean
-  """If true, delete generated files checkbox will be checked by default"""
+  "If true, delete generated files checkbox will be checked by default"
   deleteGenerated: Boolean
 }
 
-"""All configuration settings"""
+"All configuration settings"
 type ConfigResult {
   general: ConfigGeneralResult!
   interface: ConfigInterfaceResult!
@@ -497,16 +547,17 @@ type ConfigResult {
   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!

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

@@ -1,109 +1,127 @@
 type Fingerprint {
-    type: String!
-    value: String!
+  type: String!
+  value: String!
 }
 
 type Folder {
-    id: ID!
-    path: String!
+  id: ID!
+  path: String!
 
-    parent_folder_id: ID
-    zip_file_id: ID
+  parent_folder_id: ID
+  zip_file_id: ID
 
-    mod_time: Time!
+  mod_time: Time!
 
-    created_at: Time!
-    updated_at: Time!
+  created_at: Time!
+  updated_at: Time!
 }
 
 interface BaseFile {
-    id: ID!
-    path: String!
-    basename: String!
+  id: ID!
+  path: String!
+  basename: String!
 
-    parent_folder_id: ID!
-    zip_file_id: ID
+  parent_folder_id: ID!
+  zip_file_id: ID
 
-    mod_time: Time!
-    size: Int64!
+  mod_time: Time!
+  size: Int64!
 
-    fingerprints: [Fingerprint!]!
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
 
-    created_at: Time!
-    updated_at: Time!
+  created_at: Time!
+  updated_at: Time!
 }
 
 type VideoFile implements BaseFile {
-    id: ID!
-    path: String!
-    basename: String!
+  id: ID!
+  path: String!
+  basename: String!
 
-    parent_folder_id: ID!
-    zip_file_id: ID
+  parent_folder_id: ID!
+  zip_file_id: ID
 
-    mod_time: Time!
-    size: Int64!
+  mod_time: Time!
+  size: Int64!
 
-    fingerprints: [Fingerprint!]!
+  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!
+  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!
+  created_at: Time!
+  updated_at: Time!
 }
 
 type ImageFile implements BaseFile {
-    id: ID!
-    path: String!
-    basename: String!
+  id: ID!
+  path: String!
+  basename: String!
 
-    parent_folder_id: ID!
-    zip_file_id: ID
+  parent_folder_id: ID!
+  zip_file_id: ID
 
-    mod_time: Time!
-    size: Int64!
+  mod_time: Time!
+  size: Int64!
 
-    fingerprints: [Fingerprint!]!
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
 
-    width: Int!
-	height: Int!
+  width: Int!
+  height: Int!
 
-    created_at: Time!
-    updated_at: Time!
+  created_at: Time!
+  updated_at: Time!
 }
 
+union VisualFile = VideoFile | ImageFile
+
 type GalleryFile implements BaseFile {
-    id: ID!
-    path: String!
-    basename: String!
+  id: ID!
+  path: String!
+  basename: String!
 
-    parent_folder_id: ID!
-    zip_file_id: ID
+  parent_folder_id: ID!
+  zip_file_id: ID
 
-    mod_time: Time!
-    size: Int64!
+  mod_time: Time!
+  size: Int64!
 
-    fingerprints: [Fingerprint!]!
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
 
-    created_at: Time!
-    updated_at: Time!
+  created_at: Time!
+  updated_at: Time!
 }
 
 input MoveFilesInput {
-    ids: [ID!]!
-    """valid for single or multiple file ids"""
-    destination_folder: String
+  ids: [ID!]!
+  "valid for single or multiple file ids"
+  destination_folder: String
 
-    """valid for single or multiple file ids"""
-    destination_folder_id: ID
+  "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
+  "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,55 @@ 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
+  # TODO - this should be refactored to not use a string
+  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,15 +62,30 @@ input ResolutionCriterionInput {
   modifier: CriterionModifier!
 }
 
+enum OrientationEnum {
+  "Landscape"
+  LANDSCAPE
+  "Portrait"
+  PORTRAIT
+  "Square"
+  SQUARE
+}
+
+input OrientationCriterionInput {
+  value: [OrientationEnum!]!
+}
+
 input PHashDuplicationCriterionInput {
   duplicated: Boolean
-  """Currently unimplemented"""
+  "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"""
+  """
+  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!
@@ -56,97 +100,111 @@ input PerformerFilterType {
   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 @deprecated(reason: "Use height_cm instead") 
-  """Filter by height in cm""" 
+  "Filter by height in cm"
   height_cm: IntCriterionInput
-  """Filter by measurements"""
+  "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 @deprecated(reason: "Use stash_id_endpoint instead") 
-  """Filter by StashID"""
+  "Filter by play count"
+  play_count: IntCriterionInput
+  "Filter by o count"
+  o_counter: IntCriterionInput
+  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter by url"""
+  "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 autotag ignore value"""
+  "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"""
+  "Filter by birthdate"
   birthdate: DateCriterionInput
-  """Filter by death date"""
+  "Filter by death date"
   death_date: DateCriterionInput
-  """Filter by creation time"""
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "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"""
+  "Filter to only include scene markers from these scenes"
+  scenes: MultiCriterionInput
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
-  """Filter by scene date"""
+  "Filter by scene date"
   scene_date: DateCriterionInput
-  """Filter by cscene reation time"""
+  "Filter by cscene reation time"
   scene_created_at: TimestampCriterionInput
-  """Filter by lscene ast update time"""
+  "Filter by lscene ast update time"
   scene_updated_at: TimestampCriterionInput
+  "Filter by related scenes that meet this criteria"
+  scene_filter: SceneFilterType
 }
 
 input SceneFilterType {
@@ -160,104 +218,191 @@ input SceneFilterType {
   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 file count"""
+  "Filter by file count"
   file_count: IntCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter by organized"""
+  "Filter by organized"
   organized: Boolean
-  """Filter by o-counter"""
+  "Filter by o-counter"
   o_counter: IntCriterionInput
-  """Filter Scenes that have an exact phash match available"""
+  "Filter Scenes that have an exact phash match available"
   duplicated: PHashDuplicationCriterionInput
-  """Filter by resolution"""
+  "Filter by resolution"
   resolution: ResolutionCriterionInput
-  """Filter by duration (in seconds)"""
+  "Filter by orientation"
+  orientation: OrientationCriterionInput
+  "Filter by frame rate"
+  framerate: IntCriterionInput
+  "Filter by bit rate"
+  bitrate: 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"""
-  movies: MultiCriterionInput
-  """Filter to only include scenes with these tags"""
+  "Filter to only include scenes with this movie"
+  movies: MultiCriterionInput @deprecated(reason: "use groups instead")
+  "Filter to only include scenes with this group"
+  groups: HierarchicalMultiCriterionInput
+  "Filter to only include scenes with this gallery"
+  galleries: MultiCriterionInput
+  "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 scenes that have performers that have been favorited"""
+  "Filter scenes that have performers that have been favorited"
   performer_favorite: Boolean
-  """Filter scenes by performer age at time of scene"""
+  "Filter scenes by performer age at time of scene"
   performer_age: IntCriterionInput
-  """Filter to only include scenes with these performers"""
+  "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 @deprecated(reason: "Use stash_id_endpoint instead") 
-  """Filter by StashID"""
+  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by interactive"""
+  "Filter by interactive"
   interactive: Boolean
-  """Filter by InteractiveSpeed"""
+  "Filter by InteractiveSpeed"
   interactive_speed: IntCriterionInput
-  """Filter by captions"""
+  "Filter by captions"
   captions: StringCriterionInput
-  """Filter by resume time"""
+  "Filter by resume time"
   resume_time: IntCriterionInput
-  """Filter by play count"""
+  "Filter by play count"
   play_count: IntCriterionInput
-  """Filter by play duration (in seconds)"""
+  "Filter by play duration (in seconds)"
   play_duration: IntCriterionInput
-  """Filter by date"""
+  "Filter by scene last played time"
+  last_played_at: TimestampCriterionInput
+  "Filter by date"
   date: DateCriterionInput
-  """Filter by creation time"""
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
+  "Filter by related movies that meet this criteria"
+  movies_filter: MovieFilterType
+    @deprecated(reason: "use groups_filter instead")
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
+  "Filter by related markers that meet this criteria"
+  markers_filter: SceneMarkerFilterType
 }
 
 input MovieFilterType {
+  AND: MovieFilterType
+  OR: MovieFilterType
+  NOT: MovieFilterType
 
   name: StringCriterionInput
   director: StringCriterionInput
   synopsis: StringCriterionInput
 
-  """Filter by duration (in seconds)"""
+  "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter to only include movies with this studio"""
+  "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"""
+  "Filter to only include movies with these tags"
+  tags: HierarchicalMultiCriterionInput
+  "Filter by tag count"
+  tag_count: IntCriterionInput
+  "Filter by date"
   date: DateCriterionInput
-  """Filter by creation time"""
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+}
+
+input GroupFilterType {
+  AND: GroupFilterType
+  OR: GroupFilterType
+  NOT: GroupFilterType
+
+  name: StringCriterionInput
+  director: StringCriterionInput
+  synopsis: StringCriterionInput
+
+  "Filter by duration (in seconds)"
+  duration: IntCriterionInput
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter to only include groups with this studio"
+  studios: HierarchicalMultiCriterionInput
+  "Filter to only include groups missing this property"
+  is_missing: String
+  "Filter by url"
+  url: StringCriterionInput
+  "Filter to only include groups where performer appears in a scene"
+  performers: MultiCriterionInput
+  "Filter to only include groups with these tags"
+  tags: HierarchicalMultiCriterionInput
+  "Filter by tag count"
+  tag_count: IntCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+
+  "Filter by containing groups"
+  containing_groups: HierarchicalMultiCriterionInput
+  "Filter by sub groups"
+  sub_groups: HierarchicalMultiCriterionInput
+  "Filter by number of containing groups the group has"
+  containing_group_count: IntCriterionInput
+  "Filter by number of sub-groups the group has"
+  sub_group_count: IntCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
 }
 
 input StudioFilterType {
@@ -267,33 +412,43 @@ 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 @deprecated(reason: "Use stash_id_endpoint instead") 
-  """Filter by StashID"""
+  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
-  """Filter to only include studios missing this property"""
+  "Filter to only include studios with these tags"
+  tags: HierarchicalMultiCriterionInput
+  "Filter to only include studios missing this property"
   is_missing: String
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter by scene count"""
+  "Filter by favorite"
+  favorite: Boolean
+  "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 tag count"
+  tag_count: IntCriterionInput
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by studio aliases"""
+  "Filter by studio aliases"
   aliases: StringCriterionInput
-  """Filter by autotag ignore value"""
+  "Filter by subsidiary studio count"
+  child_count: IntCriterionInput
+  "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
-  """Filter by creation time"""
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
 }
 
@@ -306,52 +461,67 @@ input GalleryFilterType {
   title: StringCriterionInput
   details: StringCriterionInput
 
-  """Filter by file checksum"""
+  "Filter by file checksum"
   checksum: StringCriterionInput
-  """Filter by path"""
+  "Filter by path"
   path: StringCriterionInput
-  """Filter by zip-file count"""
+  "Filter by zip-file count"
   file_count: IntCriterionInput
-  """Filter to only include galleries missing this property"""
+  "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 @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter by organized"""
+  "Filter by organized"
   organized: Boolean
-  """Filter by average image resolution"""
+  "Filter by average image resolution"
   average_resolution: ResolutionCriterionInput
-  """Filter to only include galleries that have chapters. `true` or `false`"""
+  "Filter to only include galleries that have chapters. `true` or `false`"
   has_chapters: String
-  """Filter to only include galleries with this studio"""
+  "Filter to only include galleries with these scenes"
+  scenes: MultiCriterionInput
+  "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 galleries that have performers that have been favorited"""
+  "Filter galleries that have performers that have been favorited"
   performer_favorite: Boolean
-  """Filter galleries by performer age at time of gallery"""
+  "Filter galleries by performer age at time of gallery"
   performer_age: IntCriterionInput
-  """Filter by number of images in this gallery"""
+  "Filter by number of images in this gallery"
   image_count: IntCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by date"""
+  "Filter by date"
   date: DateCriterionInput
-  """Filter by creation time"""
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
 }
 
 input TagFilterType {
@@ -359,52 +529,71 @@ 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 by tag description"""
+  "Filter by favorite"
+  favorite: Boolean
+
+  "Filter by tag description"
   description: StringCriterionInput
 
-  """Filter to only include tags missing this property"""
+  "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 studios with this tag"
+  studio_count: IntCriterionInput
+
+  "Filter by number of movies with this tag"
+  movie_count: IntCriterionInput
+
+  "Filter by number of group with this tag"
+  group_count: IntCriterionInput
+
+  "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"""
+  "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
 
-  """Filter by creation time"""
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+
+  "Filter by creation time"
   created_at: TimestampCriterionInput
 
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
 }
 
@@ -414,78 +603,94 @@ input ImageFilterType {
   NOT: ImageFilterType
 
   title: StringCriterionInput
+  details: StringCriterionInput
 
-  """ Filter by image id"""
+  " Filter by image id"
   id: IntCriterionInput
-  """Filter by file checksum"""
+  "Filter by file checksum"
   checksum: StringCriterionInput
-  """Filter by path"""
+  "Filter by path"
   path: StringCriterionInput
-  """Filter by file count"""
+  "Filter by file count"
   file_count: IntCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
-  """Filter by date"""
+  "Filter by date"
   date: DateCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by organized"""
+  "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 images that have performers that have been favorited"""
+  "Filter images that have performers that have been favorited"
   performer_favorite: Boolean
-  """Filter to only include images with these galleries"""
+  "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"""
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
+
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
 }
 
 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 {
@@ -499,13 +704,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!
 }
 
@@ -513,6 +731,7 @@ input HierarchicalMultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
   depth: Int
+  excludes: [ID!]
 }
 
 input DateCriterionInput {
@@ -527,32 +746,48 @@ input TimestampCriterionInput {
   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
+  GROUPS
+  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 {
@@ -561,6 +796,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

@@ -15,9 +15,9 @@ input GalleryChapterCreateInput {
 
 input GalleryChapterUpdateInput {
   id: ID!
-  gallery_id: ID!
-  title: String!
-  image_index: Int!
+  gallery_id: ID
+  title: String
+  image_index: Int
 }
 
 type FindGalleryChaptersResultType {

graphql/schema/types/gallery.graphql

@@ -1,20 +1,23 @@
-"""Gallery type"""
+type GalleryPathsType {
+  cover: String!
+  preview: String! # Resolver
+}
+
+"Gallery type"
 type Gallery {
   id: ID!
-  checksum: String! @deprecated(reason: "Use files.fingerprints")
-  path: String @deprecated(reason: "Use files.path")
   title: String
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean!
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time @deprecated(reason: "Use files.mod_time")
 
   files: [GalleryFile!]!
   folder: Folder
@@ -26,18 +29,20 @@ type Gallery {
   tags: [Tag!]!
   performers: [Performer!]!
 
-  """The images in the gallery"""
-  images: [Image!]! @deprecated(reason: "Use findImages")
   cover: Image
+
+  paths: GalleryPathsType! # Resolver
+  image(index: Int!): Image!
 }
 
 input GalleryCreateInput {
   title: String!
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -51,11 +56,12 @@ 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 expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -70,11 +76,12 @@ input GalleryUpdateInput {
 input BulkGalleryUpdateInput {
   clientMutationId: String
   ids: [ID!]
-  url: String
+  code: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -87,7 +94,7 @@ input BulkGalleryUpdateInput {
 input GalleryDestroyInput {
   ids: [ID!]!
   """
-  If true, then the zip file will be deleted if the gallery is zip-file-based. 
+  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.
   """
@@ -109,3 +116,12 @@ input GalleryRemoveInput {
   gallery_id: ID!
   image_ids: [ID!]!
 }
+
+input GallerySetCoverInput {
+  gallery_id: ID!
+  cover_image_id: ID!
+}
+
+input GalleryResetCoverInput {
+  gallery_id: ID!
+}

graphql/schema/types/group.graphql

@@ -0,0 +1,137 @@
+"GroupDescription represents a relationship to a group with a description of the relationship"
+type GroupDescription {
+  group: Group!
+  description: String
+}
+
+type Group {
+  id: ID!
+  name: String!
+  aliases: String
+  "Duration in seconds"
+  duration: Int
+  date: String
+  # rating expressed as 1-100
+  rating100: Int
+  studio: Studio
+  director: String
+  synopsis: String
+  urls: [String!]!
+  tags: [Tag!]!
+  created_at: Time!
+  updated_at: Time!
+
+  containing_groups: [GroupDescription!]!
+  sub_groups: [GroupDescription!]!
+
+  front_image_path: String # Resolver
+  back_image_path: String # Resolver
+  scene_count(depth: Int): Int! # Resolver
+  sub_group_count(depth: Int): Int! # Resolver
+  scenes: [Scene!]!
+}
+
+input GroupDescriptionInput {
+  group_id: ID!
+  description: String
+}
+
+input GroupCreateInput {
+  name: String!
+  aliases: String
+  "Duration in seconds"
+  duration: Int
+  date: String
+  # rating expressed as 1-100
+  rating100: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  urls: [String!]
+  tag_ids: [ID!]
+
+  containing_groups: [GroupDescriptionInput!]
+  sub_groups: [GroupDescriptionInput!]
+
+  "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"
+  back_image: String
+}
+
+input GroupUpdateInput {
+  id: ID!
+  name: String
+  aliases: String
+  duration: Int
+  date: String
+  # rating expressed as 1-100
+  rating100: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  urls: [String!]
+  tag_ids: [ID!]
+
+  containing_groups: [GroupDescriptionInput!]
+  sub_groups: [GroupDescriptionInput!]
+
+  "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"
+  back_image: String
+}
+
+input BulkUpdateGroupDescriptionsInput {
+  groups: [GroupDescriptionInput!]!
+  mode: BulkUpdateIdMode!
+}
+
+input BulkGroupUpdateInput {
+  clientMutationId: String
+  ids: [ID!]
+  # rating expressed as 1-100
+  rating100: Int
+  studio_id: ID
+  director: String
+  urls: BulkUpdateStrings
+  tag_ids: BulkUpdateIds
+
+  containing_groups: BulkUpdateGroupDescriptionsInput
+  sub_groups: BulkUpdateGroupDescriptionsInput
+}
+
+input GroupDestroyInput {
+  id: ID!
+}
+
+input ReorderSubGroupsInput {
+  "ID of the group to reorder sub groups for"
+  group_id: ID!
+  """
+  IDs of the sub groups to reorder. These must be a subset of the current sub groups.
+  Sub groups will be inserted in this order at the insert_index
+  """
+  sub_group_ids: [ID!]!
+  "The sub-group ID at which to insert the sub groups"
+  insert_at_id: ID!
+  "If true, the sub groups will be inserted after the insert_index, otherwise they will be inserted before"
+  insert_after: Boolean
+}
+
+type FindGroupsResultType {
+  count: Int!
+  groups: [Group!]!
+}
+
+input GroupSubGroupAddInput {
+  containing_group_id: ID!
+  sub_groups: [GroupDescriptionInput!]!
+  "The index at which to insert the sub groups. If not provided, the sub groups will be appended to the end"
+  insert_index: Int
+}
+
+input GroupSubGroupRemoveInput {
+  containing_group_id: ID!
+  sub_group_ids: [ID!]!
+}

graphql/schema/types/image.graphql

@@ -1,25 +1,22 @@
 type Image {
   id: ID!
-  checksum: String @deprecated(reason: "Use files.fingerprints")
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   date: String
+  details: String
+  photographer: String
   o_counter: Int
   organized: Boolean!
-  path: String! @deprecated(reason: "Use files.path")
   created_at: Time!
   updated_at: Time!
-  
-  file_mod_time: Time @deprecated(reason: "Use files.mod_time")
 
-  file: ImageFileType! @deprecated(reason: "Use files.mod_time")
-  files: [ImageFile!]!
+  files: [ImageFile!]! @deprecated(reason: "Use visual_files")
+  visual_files: [VisualFile!]!
   paths: ImagePathsType! # Resolver
-
   galleries: [Gallery!]!
   studio: Studio
   tags: [Tag!]!
@@ -35,6 +32,7 @@ type ImageFileType {
 
 type ImagePathsType {
   thumbnail: String # Resolver
+  preview: String # Resolver
   image: String # Resolver
 }
 
@@ -42,14 +40,16 @@ input ImageUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
-  
+  details: String
+  photographer: String
+
   studio_id: ID
   performer_ids: [ID!]
   tag_ids: [ID!]
@@ -62,14 +62,16 @@ input BulkImageUpdateInput {
   clientMutationId: String
   ids: [ID!]
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   date: String
-  
+  details: String
+  photographer: String
+
   studio_id: ID
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
@@ -90,9 +92,9 @@ input ImagesDestroyInput {
 
 type FindImagesResultType {
   count: Int!
-  """Total megapixels of the images"""
+  "Total megapixels of the images"
   megapixels: Float!
-  """Total file size in bytes"""
+  "Total file size in bytes"
   filesize: Float!
   images: [Image!]!
-}
+}

graphql/schema/types/job.graphql

@@ -4,6 +4,7 @@ enum JobStatus {
   FINISHED
   STOPPING
   CANCELLED
+  FAILED
 }
 
 type Job {
@@ -15,6 +16,7 @@ type Job {
   startTime: Time
   endTime: Time
   addTime: Time!
+  error: String
 }
 
 input FindJobInput {

graphql/schema/types/logging.graphql

@@ -1,17 +1,14 @@
-"""Log entries"""
-scalar Time
-
 enum LogLevel {
-    Trace
-    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,5 +1,3 @@
-scalar Upload
-
 input GenerateMetadataInput {
   covers: Boolean
   sprites: Boolean
@@ -10,30 +8,32 @@ input GenerateMetadataInput {
   markerImagePreviews: Boolean
   markerScreenshots: Boolean
   transcodes: Boolean
-  """Generate transcodes even if not required"""
+  "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
 }
 
@@ -49,18 +49,20 @@ type GenerateMetadataOptions {
   transcodes: Boolean
   phashes: Boolean
   interactiveHeatmapsSpeeds: Boolean
+  imageThumbnails: Boolean
+  clipPreviews: Boolean
 }
 
 type GeneratePreviewOptions {
-  """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
 }
 
@@ -73,91 +75,115 @@ input ScanMetaDataFilterInput {
 input ScanMetadataInput {
   paths: [String!]
 
-  # useFileMetadata is deprecated with the new file management system
-  # if this functionality is desired, then we can make a built in scraper instead.
-
-  """Set name, date, details from metadata (if present)"""
-  useFileMetadata: Boolean @deprecated(reason: "Not implemented")
-
-  # stripFileExtension is deprecated since we no longer set the title from the 
-  # filename - it is automatically returned if the object has no title. If this
-  # functionality is desired, then we could make this an option to not include
-  # the extension in the auto-generated title.
-
-  """Strip file extension from title"""
-  stripFileExtension: Boolean @deprecated(reason: "Not implemented")
-  """Generate covers during scan"""
+  "Forces a rescan on files even if modification time is unchanged"
+  rescan: Boolean
+  "Generate covers during scan"
   scanGenerateCovers: Boolean
-  """Generate previews during scan"""
+  "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 {
-  """Set name, date, details from metadata (if present)"""
-  useFileMetadata: Boolean! @deprecated(reason: "Not implemented")
-  """Strip file extension from title"""
-  stripFileExtension: Boolean! @deprecated(reason: "Not implemented")
-  """Generate covers during scan"""
+  "Forces a rescan on files even if modification time is unchanged"
+  rescan: Boolean!
+  "Generate covers during scan"
   scanGenerateCovers: Boolean!
-  """Generate previews during scan"""
+  "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!
 }
 
 input CleanMetadataInput {
   paths: [String!]
-  
-  """Do a dry run. Don't delete any files"""
+
+  "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"""
+  """
+  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!]
 }
 
 enum IdentifyFieldStrategy {
-  """Never sets the field value"""
+  "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.
+  """
+  Always replaces the value if a value is found.
   For multi-value fields, any existing values are removed and replaced with the
   scraped values.
   """
@@ -167,36 +193,44 @@ enum IdentifyFieldStrategy {
 input IdentifyFieldOptionsInput {
   field: String!
   strategy: IdentifyFieldStrategy!
-  """creates missing objects if needed - only applicable for performers, tags and studios"""
+  "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"""
+  "any fields missing from here are defaulted to MERGE and createMissing false"
   fieldOptions: [IdentifyFieldOptionsInput!]
-  """defaults to true if not provided"""
+  "defaults to true if not provided"
   setCoverImage: Boolean
   setOrganized: Boolean
-  """defaults to true if not provided"""
+  "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 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."""
+  "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 defined here override the configured defaults"
   options: IdentifyMetadataOptionsInput
 
-  """scene ids to identify"""
+  "scene ids to identify"
   sceneIDs: [ID!]
 
-  """paths of scenes to identify - ignored if scene ids are set"""
+  "paths of scenes to identify - ignored if scene ids are set"
   paths: [String!]
 }
 
@@ -204,30 +238,38 @@ input IdentifyMetadataInput {
 type IdentifyFieldOptions {
   field: String!
   strategy: IdentifyFieldStrategy!
-  """creates missing objects if needed - only applicable for performers, tags and studios"""
+  "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"""
+  "any fields missing from here are defaulted to MERGE and createMissing false"
   fieldOptions: [IdentifyFieldOptions!]
-  """defaults to true if not provided"""
+  "defaults to true if not provided"
   setCoverImage: Boolean
   setOrganized: Boolean
-  """defaults to true if not provided"""
+  "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 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."""
+  "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 defined here override the configured defaults"
   options: IdentifyMetadataOptions
 }
 
@@ -242,7 +284,8 @@ input ExportObjectsInput {
   studios: ExportObjectTypeInput
   performers: ExportObjectTypeInput
   tags: ExportObjectTypeInput
-  movies: ExportObjectTypeInput
+  groups: ExportObjectTypeInput
+  movies: ExportObjectTypeInput @deprecated(reason: "Use groups instead")
   galleries: ExportObjectTypeInput
   includeDependencies: Boolean
 }
@@ -285,6 +328,11 @@ type SystemStatus {
   configPath: String
   appSchema: Int!
   status: SystemStatusEnum!
+  os: String!
+  workingDir: String!
+  homeDir: String!
+  ffmpegPath: String
+  ffprobePath: String
 }
 
 input MigrateInput {

graphql/schema/types/movie.graphql

@@ -1,45 +1,44 @@
 type Movie {
   id: ID!
-  checksum: String!
   name: String!
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio: Studio
   director: String
   synopsis: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
+  tags: [Tag!]!
   created_at: Time!
   updated_at: Time!
 
   front_image_path: String # Resolver
   back_image_path: String # Resolver
-  scene_count: Int # Resolver
+  scene_count(depth: Int): Int! # Resolver
   scenes: [Scene!]!
 }
 
 input MovieCreateInput {
   name: String!
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # 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"""
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
+  tag_ids: [ID!]
+  "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
 }
 
@@ -49,29 +48,29 @@ input MovieUpdateInput {
   aliases: String
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # 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"""
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
+  tag_ids: [ID!]
+  "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-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio_id: ID
   director: String
+  urls: BulkUpdateStrings
+  tag_ids: BulkUpdateIds
 }
 
 input MovieDestroyInput {

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,40 +7,47 @@ enum GenderEnum {
   NON_BINARY
 }
 
+enum CircumisedEnum {
+  CUT
+  UNCUT
+}
+
 type Performer {
   id: ID!
-  checksum: String @deprecated(reason: "Not used") 
   name: String!
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
   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
+  group_count: Int! # Resolver
+  movie_count: Int! @deprecated(reason: "use group_count instead") # Resolver
+  performer_count: Int! # Resolver
+  o_counter: Int # Resolver
   scenes: [Scene!]!
   stash_ids: [StashID!]!
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -49,38 +56,36 @@ type Performer {
   weight: Int
   created_at: Time!
   updated_at: Time!
-  movie_count: Int
-  movies: [Movie!]!
+  groups: [Group!]!
+  movies: [Movie!]! @deprecated(reason: "use groups instead")
 }
 
 input PerformerCreateInput {
   name: String!
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
   alias_list: [String!]
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   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 expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -94,31 +99,29 @@ input PerformerUpdateInput {
   id: ID!
   name: String
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
   alias_list: [String!]
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   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 expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -137,28 +140,26 @@ input BulkPerformerUpdateInput {
   clientMutationId: String
   ids: [ID!]
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
   alias_list: BulkUpdateStrings
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   favorite: Boolean
   tag_ids: BulkUpdateIds
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String

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!
 }

graphql/schema/types/scalars.graphql

@@ -1,3 +1,5 @@
+"An RFC3339 timestamp"
+scalar Time
 
 """
 Timestamp is a point in time. It is always output as RFC3339-compatible time points.
@@ -6,9 +8,18 @@ for "5 minutes in the future"
 """
 scalar Timestamp
 
-# generic JSON object
+"A String -> Any map"
 scalar Map
 
+"A String -> Boolean map"
+scalar BoolMap
+
+"A plugin ID -> Map (String -> Any map) map"
+scalar PluginConfigMap
+
 scalar Any
 
-scalar Int64
+scalar Int64
+
+"A multipart file upload"
+scalar Upload

graphql/schema/types/scene-marker-tag.graphql

@@ -1,4 +1,4 @@
 type SceneMarkerTag {
   tag: Tag!
   scene_markers: [SceneMarker!]!
-}
+}

graphql/schema/types/scene-marker.graphql

@@ -8,11 +8,11 @@ type SceneMarker {
   created_at: Time!
   updated_at: Time!
 
-  """The path to stream this marker"""
+  "The path to stream this marker"
   stream: String! # Resolver
-  """The path to the preview image for this marker"""
+  "The path to the preview image for this marker"
   preview: String! # Resolver
-  """The path to the screenshot image for this marker"""
+  "The path to the screenshot image for this marker"
   screenshot: String! # Resolver
 }
 
@@ -26,10 +26,10 @@ input SceneMarkerCreateInput {
 
 input SceneMarkerUpdateInput {
   id: ID!
-  title: String!
-  seconds: Float!
-  scene_id: ID!
-  primary_tag_id: ID!
+  title: String
+  seconds: Float
+  scene_id: ID
+  primary_tag_id: ID
   tag_ids: [ID!]
 }
 
@@ -42,4 +42,4 @@ type MarkerStringsResultType {
   count: Int!
   id: ID!
   title: String!
-}
+}

graphql/schema/types/scene.graphql

@@ -15,7 +15,6 @@ type ScenePathsType {
   stream: String # Resolver
   webp: String # Resolver
   vtt: String # Resolver
-  chapters_vtt: String @deprecated
   sprite: String # Resolver
   funscript: String # Resolver
   interactive_heatmap: String # Resolver
@@ -27,6 +26,11 @@ type SceneMovie {
   scene_index: Int
 }
 
+type SceneGroup {
+  group: Group!
+  scene_index: Int
+}
+
 type VideoCaption {
   language_code: String!
   caption_type: String!
@@ -34,50 +38,48 @@ type VideoCaption {
 
 type Scene {
   id: ID!
-  checksum: String @deprecated(reason: "Use files.fingerprints")
-  oshash: String @deprecated(reason: "Use files.fingerprints")
   title: String
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean!
   o_counter: Int
-  path: String! @deprecated(reason: "Use files.path")
-  phash: String @deprecated(reason: "Use files.fingerprints")
   interactive: Boolean!
   interactive_speed: Int
   captions: [VideoCaption!]
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time
-  """The last time play count was updated"""
+  "The last time play count was updated"
   last_played_at: Time
-  """The time index a scene was left at"""
+  "The time index a scene was left at"
   resume_time: Float
-  """The total time a scene has spent playing"""
+  "The total time a scene has spent playing"
   play_duration: Float
-  """The number ot times a scene has been played"""
+  "The number ot times a scene has been played"
   play_count: Int
 
-  file: SceneFileType! @deprecated(reason: "Use files")
+  "Times a scene was played"
+  play_history: [Time!]!
+  "Times the o counter was incremented"
+  o_history: [Time!]!
+
   files: [VideoFile!]!
   paths: ScenePathsType! # Resolver
-
   scene_markers: [SceneMarker!]!
   galleries: [Gallery!]!
   studio: Studio
-  movies: [SceneMovie!]!
+  groups: [SceneGroup!]!
+  movies: [SceneMovie!]! @deprecated(reason: "Use groups")
   tags: [Tag!]!
   performers: [Performer!]!
   stash_ids: [StashID!]!
 
-  """Return valid stream paths"""
+  "Return valid stream paths"
   sceneStreams: [SceneStreamEndpoint!]!
 }
 
@@ -86,29 +88,37 @@ input SceneMovieInput {
   scene_index: Int
 }
 
+input SceneGroupInput {
+  group_id: ID!
+  scene_index: Int
+}
+
 input SceneCreateInput {
   title: String
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   studio_id: ID
   gallery_ids: [ID!]
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
+  groups: [SceneGroupInput!]
+  movies: [SceneMovieInput!] @deprecated(reason: "Use groups")
   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"
   cover_image: String
   stash_ids: [StashIDInput!]
 
-  """The first id will be assigned as primary. Files will be reassigned from
-  existing scenes if applicable. Files must not already be primary for another scene"""
+  """
+  The first id will be assigned as primary.
+  Files will be reassigned from existing scenes if applicable.
+  Files must not already be primary for another scene.
+  """
   file_ids: [ID!]
 }
 
@@ -119,29 +129,33 @@ input SceneUpdateInput {
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   o_counter: Int
+    @deprecated(reason: "Unsupported - Use sceneIncrementO/sceneDecrementO")
   organized: Boolean
   studio_id: ID
   gallery_ids: [ID!]
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
+  groups: [SceneGroupInput!]
+  movies: [SceneMovieInput!] @deprecated(reason: "Use groups")
   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"
   cover_image: String
   stash_ids: [StashIDInput!]
 
-  """The time index a scene was left at"""
+  "The time index a scene was left at"
   resume_time: Float
-  """The total time a scene has spent playing"""
+  "The total time a scene has spent playing"
   play_duration: Float
-  """The number ot times a scene has been played"""
+  "The number ot times a scene has been played"
   play_count: Int
+    @deprecated(
+      reason: "Unsupported - Use sceneIncrementPlayCount/sceneDecrementPlayCount"
+    )
 
   primary_file_id: ID
 }
@@ -164,10 +178,9 @@ input BulkSceneUpdateInput {
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -175,7 +188,8 @@ input BulkSceneUpdateInput {
   gallery_ids: BulkUpdateIds
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
-  movie_ids:  BulkUpdateIds
+  group_ids: BulkUpdateIds
+  movie_ids: BulkUpdateIds @deprecated(reason: "Use group_ids")
 }
 
 input SceneDestroyInput {
@@ -192,17 +206,17 @@ input ScenesDestroyInput {
 
 type FindScenesResultType {
   count: Int!
-  """Total duration in seconds"""
+  "Total duration in seconds"
   duration: Float!
-  """Total file size in bytes"""
+  "Total file size in bytes"
   filesize: Float!
   scenes: [Scene!]!
 }
 
 input SceneParserInput {
-  ignoreWords: [String!],
-  whitespaceCharacters: String,
-  capitalizeTitle: Boolean,
+  ignoreWords: [String!]
+  whitespaceCharacters: String
+  capitalizeTitle: Boolean
   ignoreOrganized: Boolean
 }
 
@@ -252,10 +266,21 @@ input AssignSceneFileInput {
 }
 
 input SceneMergeInput {
-  """If destination scene has no files, then the primary file of the
-  first source scene will be assigned as primary"""
+  """
+  If destination scene has no files, then the primary file of the
+  first source scene will be assigned as primary
+  """
   source: [ID!]!
   destination: ID!
   # values defined here will override values in the destination
   values: SceneUpdateInput
+
+  # if true, the source history will be combined with the destination
+  play_history: Boolean
+  o_history: Boolean
+}
+
+type HistoryMutationResult {
+  count: Int!
+  history: [Time!]!
 }

graphql/schema/types/scraped-group.graphql

@@ -0,0 +1,65 @@
+"A movie from a scraping operation..."
+type ScrapedMovie {
+  stored_id: ID
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  synopsis: String
+  studio: ScrapedStudio
+  tags: [ScrapedTag!]
+
+  "This should be a base64 encoded data URL"
+  front_image: String
+  "This should be a base64 encoded data URL"
+  back_image: String
+}
+
+input ScrapedMovieInput {
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  synopsis: String
+  # not including tags for the input
+}
+
+"A group from a scraping operation..."
+type ScrapedGroup {
+  stored_id: ID
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  urls: [String!]
+  synopsis: String
+  studio: ScrapedStudio
+  tags: [ScrapedTag!]
+
+  "This should be a base64 encoded data URL"
+  front_image: String
+  "This should be a base64 encoded data URL"
+  back_image: String
+}
+
+input ScrapedGroupInput {
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  urls: [String!]
+  synopsis: String
+  # not including tags for the input
+}

graphql/schema/types/scraped-movie.graphql

@@ -1,29 +0,0 @@
-"""A movie from a scraping operation..."""
-type ScrapedMovie {
-  stored_id: ID
-  name: String
-  aliases: String
-  duration: String
-  date: String
-  rating: String
-  director: String
-  url: String
-  synopsis: String
-  studio: ScrapedStudio
-
-  """This should be a base64 encoded data URL"""
-  front_image: String
-  """This should be a base64 encoded data URL"""
-  back_image: String
-}
-
-input ScrapedMovieInput {
-  name: String
-  aliases: String
-  duration: String
-  date: String
-  rating: String
-  director: String
-  url: String
-  synopsis: String
-}

graphql/schema/types/scraped-performer.graphql

@@ -1,13 +1,14 @@
-"""A performer from a scraping operation..."""
+"A performer from a scraping operation..."
 type ScrapedPerformer {
-  """Set if performer matched"""
+  "Set if performer matched"
   stored_id: ID
   name: String
   disambiguation: String
   gender: String
-  url: String
-  twitter: String
-  instagram: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  twitter: String @deprecated(reason: "use urls")
+  instagram: String @deprecated(reason: "use urls")
   birthdate: String
   ethnicity: String
   country: String
@@ -15,6 +16,8 @@ type ScrapedPerformer {
   height: String
   measurements: String
   fake_tits: String
+  penis_length: String
+  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
@@ -22,7 +25,7 @@ type ScrapedPerformer {
   aliases: String
   tags: [ScrapedTag!]
 
-  """This should be a base64 encoded data URL"""
+  "This should be a base64 encoded data URL"
   image: String @deprecated(reason: "use images instead")
   images: [String!]
   details: String
@@ -33,14 +36,15 @@ type ScrapedPerformer {
 }
 
 input ScrapedPerformerInput {
-  """Set if performer matched"""
+  "Set if performer matched"
   stored_id: ID
   name: String
   disambiguation: String
   gender: String
-  url: String
-  twitter: String
-  instagram: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  twitter: String @deprecated(reason: "use urls")
+  instagram: String @deprecated(reason: "use urls")
   birthdate: String
   ethnicity: String
   country: String
@@ -48,6 +52,8 @@ input ScrapedPerformerInput {
   height: String
   measurements: String
   fake_tits: String
+  penis_length: String
+  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
@@ -60,4 +66,4 @@ input ScrapedPerformerInput {
   hair_color: String
   weight: String
   remote_site_id: String
-}
+}

graphql/schema/types/scraper.graphql

@@ -1,9 +1,9 @@
 enum ScrapeType {
-  """From text query"""
+  "From text query"
   NAME
-  """From existing object"""
+  "From existing object"
   FRAGMENT
-  """From URL"""
+  "From URL"
   URL
 }
 
@@ -11,50 +11,55 @@ enum ScrapeType {
 enum ScrapeContentType {
   GALLERY
   MOVIE
+  GROUP
   PERFORMER
   SCENE
 }
 
 "Scraped Content is the forming union over the different scrapers"
-union ScrapedContent = ScrapedStudio
-                     | ScrapedTag
-                     | ScrapedScene
-                     | ScrapedGallery
-                     | ScrapedMovie
-                     | ScrapedPerformer
+union ScrapedContent =
+    ScrapedStudio
+  | ScrapedTag
+  | ScrapedScene
+  | ScrapedGallery
+  | ScrapedMovie
+  | ScrapedGroup
+  | ScrapedPerformer
 
 type ScraperSpec {
-    """URLs matching these can be scraped with"""
-    urls: [String!]
-    supported_scrapes: [ScrapeType!]!
+  "URLs matching these can be scraped with"
+  urls: [String!]
+  supported_scrapes: [ScrapeType!]!
 }
 
 type Scraper {
-    id: ID!
-    name: String!
-    """Details for performer scraper"""
-    performer: ScraperSpec
-    """Details for scene scraper"""
-    scene: ScraperSpec
-    """Details for gallery scraper"""
-    gallery: ScraperSpec
-    """Details for movie scraper"""
-    movie: ScraperSpec
+  id: ID!
+  name: String!
+  "Details for performer scraper"
+  performer: ScraperSpec
+  "Details for scene scraper"
+  scene: ScraperSpec
+  "Details for gallery scraper"
+  gallery: ScraperSpec
+  "Details for movie scraper"
+  movie: ScraperSpec @deprecated(reason: "use group")
+  "Details for group scraper"
+  group: ScraperSpec
 }
 
-
 type ScrapedStudio {
-  """Set if studio matched"""
+  "Set if studio matched"
   stored_id: ID
   name: String!
   url: String
+  parent: ScrapedStudio
   image: String
 
   remote_site_id: String
 }
 
 type ScrapedTag {
-  """Set if tag matched"""
+  "Set if tag matched"
   stored_id: ID
   name: String!
 }
@@ -64,18 +69,19 @@ type ScrapedScene {
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   date: String
 
-  """This should be a base64 encoded data URL"""
+  "This should be a base64 encoded data URL"
   image: String
 
   file: SceneFileType # Resolver
-
   studio: ScrapedStudio
   tags: [ScrapedTag!]
   performers: [ScrapedPerformer!]
-  movies: [ScrapedMovie!]
+  movies: [ScrapedMovie!] @deprecated(reason: "use groups")
+  groups: [ScrapedGroup!]
 
   remote_site_id: String
   duration: Int
@@ -87,7 +93,8 @@ input ScrapedSceneInput {
   code: String
   details: String
   director: String
-  url: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   date: String
 
   # no image, file, duration or relationships
@@ -97,8 +104,11 @@ input ScrapedSceneInput {
 
 type ScrapedGallery {
   title: String
+  code: String
   details: String
-  url: String
+  photographer: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   date: String
 
   studio: ScrapedStudio
@@ -108,92 +118,115 @@ type ScrapedGallery {
 
 input ScrapedGalleryInput {
   title: String
+  code: String
   details: String
-  url: String
+  photographer: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   date: String
 
   # no studio, tags or performers
 }
 
 input ScraperSourceInput {
-  """Index of the configured stash-box instance to use. Should be unset if scraper_id is set"""
+  "Index of the configured stash-box instance to use. Should be unset if scraper_id is set"
   stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
-  """Stash-box endpoint"""
+  "Stash-box endpoint"
   stash_box_endpoint: String
-  """Scraper ID to scrape with. Should be unset if stash_box_index is set"""
+  "Scraper ID to scrape with. Should be unset if stash_box_endpoint/stash_box_index is set"
   scraper_id: ID
 }
 
 type ScraperSource {
-  """Index of the configured stash-box instance to use. Should be unset if scraper_id is set"""
+  "Index of the configured stash-box instance to use. Should be unset if scraper_id is set"
   stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
-  """Stash-box endpoint"""
+  "Stash-box endpoint"
   stash_box_endpoint: String
-  """Scraper ID to scrape with. Should be unset if stash_box_index is set"""
+  "Scraper ID to scrape with. Should be unset if stash_box_endpoint/stash_box_index is set"
   scraper_id: ID
 }
 
 input ScrapeSingleSceneInput {
-  """Instructs to query by string"""
+  "Instructs to query by string"
   query: String
-  """Instructs to query by scene fingerprints"""
+  "Instructs to query by scene fingerprints"
   scene_id: ID
-  """Instructs to query by scene fragment"""
+  "Instructs to query by scene fragment"
   scene_input: ScrapedSceneInput
 }
 
 input ScrapeMultiScenesInput {
-  """Instructs to query by scene fingerprints"""
+  "Instructs to query by scene fingerprints"
   scene_ids: [ID!]
 }
 
-input ScrapeSinglePerformerInput {
-  """Instructs to query by string"""
+input ScrapeSingleStudioInput {
+  """
+  Query can be either a name or a Stash ID
+  """
   query: String
-  """Instructs to query by performer id"""
+}
+
+input ScrapeSinglePerformerInput {
+  "Instructs to query by string"
+  query: String
+  "Instructs to query by performer id"
   performer_id: ID
-  """Instructs to query by performer fragment"""
+  "Instructs to query by performer fragment"
   performer_input: ScrapedPerformerInput
 }
 
 input ScrapeMultiPerformersInput {
-  """Instructs to query by scene fingerprints"""
+  "Instructs to query by scene fingerprints"
   performer_ids: [ID!]
 }
 
 input ScrapeSingleGalleryInput {
-  """Instructs to query by string"""
+  "Instructs to query by string"
   query: String
-  """Instructs to query by gallery id"""
+  "Instructs to query by gallery id"
   gallery_id: ID
-  """Instructs to query by gallery fragment"""
+  "Instructs to query by gallery fragment"
   gallery_input: ScrapedGalleryInput
 }
 
 input ScrapeSingleMovieInput {
-  """Instructs to query by string"""
+  "Instructs to query by string"
   query: String
-  """Instructs to query by movie id"""
+  "Instructs to query by movie id"
   movie_id: ID
-  """Instructs to query by gallery fragment"""
+  "Instructs to query by movie fragment"
   movie_input: ScrapedMovieInput
 }
 
+input ScrapeSingleGroupInput {
+  "Instructs to query by string"
+  query: String
+  "Instructs to query by group id"
+  group_id: ID
+  "Instructs to query by group fragment"
+  group_input: ScrapedGroupInput
+}
+
 input StashBoxSceneQueryInput {
-  """Index of the configured stash-box instance to use"""
-  stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
+  "Index of the configured stash-box instance to use"
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
+  "Instructs query by scene fingerprints"
   scene_ids: [ID!]
-  """Query by query string"""
+  "Query by query string"
   q: String
 }
 
 input StashBoxPerformerQueryInput {
-  """Index of the configured stash-box instance to use"""
-  stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
+  "Index of the configured stash-box instance to use"
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
+  "Instructs query by scene fingerprints"
   performer_ids: [ID!]
-  """Query by query string"""
+  "Query by query string"
   q: String
 }
 
@@ -208,16 +241,24 @@ type StashBoxFingerprint {
   duration: Int!
 }
 
-"""If neither performer_ids nor performer_names are set, tag all performers"""
-input StashBoxBatchPerformerTagInput {
-  "Stash endpoint to use for the performer tagging"
-  endpoint: Int!
-  "Fields to exclude when executing the performer tagging"
+"If neither ids nor names are set, tag all items"
+input StashBoxBatchTagInput {
+  "Stash endpoint to use for the tagging"
+  endpoint: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
+  "Fields to exclude when executing the tagging"
   exclude_fields: [String!]
-  "Refresh performers already tagged by StashBox if true. Only tag performers with no StashBox tagging if false"
+  "Refresh items already tagged by StashBox if true. Only tag items with no StashBox tagging if false"
   refresh: Boolean!
+  "If batch adding studios, should their parent studios also be created?"
+  createParent: Boolean!
+  "If set, only tag these ids"
+  ids: [ID!]
+  "If set, only tag these names"
+  names: [String!]
   "If set, only tag these performer ids"
-  performer_ids: [ID!]
+  performer_ids: [ID!] @deprecated(reason: "use ids")
   "If set, only tag these performer names"
-  performer_names: [String!]
+  performer_names: [String!] @deprecated(reason: "use names")
 }

graphql/schema/types/sql.graphql

@@ -0,0 +1,20 @@
+type SQLQueryResult {
+  "The column names, in the order they appear in the result set."
+  columns: [String!]!
+  "The returned rows."
+  rows: [[Any]!]!
+}
+
+type SQLExecResult {
+  """
+  The number of rows affected by the query, usually an UPDATE, INSERT, or DELETE.
+  Not all queries or databases support this feature.
+  """
+  rows_affected: Int64
+  """
+  The integer generated by the database in response to a command.
+  Typically this will be from an "auto increment" column when inserting a new row.
+  Not all databases support this feature, and the syntax of such statements varies.
+  """
+  last_insert_id: Int64
+}

graphql/schema/types/stash-box.graphql

@@ -1,13 +1,13 @@
 type StashBox {
-    endpoint: String!
-    api_key: String!
-    name: String!
+  endpoint: String!
+  api_key: String!
+  name: String!
 }
 
 input StashBoxInput {
-    endpoint: String!
-    api_key: String!
-    name: String!
+  endpoint: String!
+  api_key: String!
+  name: String!
 }
 
 type StashID {
@@ -22,10 +22,12 @@ input StashIDInput {
 
 input StashBoxFingerprintSubmissionInput {
   scene_ids: [String!]!
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  stash_box_endpoint: String
 }
 
 input StashBoxDraftSubmissionInput {
   id: String!
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  stash_box_endpoint: String
 }

graphql/schema/types/stats.graphql

@@ -7,6 +7,11 @@ type StatsResultType {
   gallery_count: Int!
   performer_count: Int!
   studio_count: Int!
-  movie_count: Int!
+  group_count: Int!
+  movie_count: Int! @deprecated(reason: "use group_count instead")
   tag_count: Int!
+  total_o_count: Int!
+  total_play_duration: Float!
+  total_play_count: Int!
+  scenes_played: Int!
 }

graphql/schema/types/studio.graphql

@@ -1,43 +1,44 @@
 type Studio {
   id: ID!
-  checksum: String!
   name: String!
   url: String
   parent_studio: Studio
   child_studios: [Studio!]!
   aliases: [String!]!
+  tags: [Tag!]!
   ignore_auto_tag: Boolean!
 
   image_path: String # Resolver
-  scene_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
-  performer_count: Int # Resolver
+  scene_count(depth: Int): Int! # Resolver
+  image_count(depth: Int): Int! # Resolver
+  gallery_count(depth: Int): Int! # Resolver
+  performer_count(depth: Int): Int! # Resolver
+  group_count(depth: Int): Int! # Resolver
+  movie_count(depth: Int): Int! @deprecated(reason: "use group_count instead") # Resolver
   stash_ids: [StashID!]!
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean!
   details: String
   created_at: Time!
   updated_at: Time!
-  movie_count: Int
-  movies: [Movie!]!
+  groups: [Group!]!
+  movies: [Movie!]! @deprecated(reason: "use groups instead")
 }
 
 input StudioCreateInput {
   name: String!
   url: String
   parent_id: 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 expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean
   details: String
   aliases: [String!]
+  tag_ids: [ID!]
   ignore_auto_tag: Boolean
 }
 
@@ -45,16 +46,16 @@ input StudioUpdateInput {
   id: ID!
   name: String
   url: String
-  parent_id: ID,
-  """This should be a URL or a base64 encoded data URL"""
+  parent_id: ID
+  "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean
   details: String
   aliases: [String!]
+  tag_ids: [ID!]
   ignore_auto_tag: Boolean
 }