Update changelog for bugfix release

* Fix tagger modal checkboxes
* Fix UNIQUE constraint detection
* Performer tagger cache invalidation
* Fix batch performer tagger
* Use ToPerformer in identify
* Add missing excluded fields
* Internationalize excluded fields
* Replace deprecated substr()
* Check RemoteSiteID nil

.github/FUNDING.yml

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

.github/workflows/build.yml

@@ -68,7 +68,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

.gitignore

@@ -61,6 +61,7 @@ node_modules
 *.db
 
 /stash
+/phasher
 dist
 .DS_Store
-/.local
+/.local*

Makefile

@@ -7,103 +7,191 @@ ifeq (${SHELL}, cmd)
 endif
 
 ifdef IS_WIN_SHELL
-  SEPARATOR := &&
-  SET := set
   RM := del /s /q
   RMDIR := rmdir /s /q
-  PWD := $(shell echo %cd%)
 else
-  SEPARATOR := ;
-  SET := export
   RM := rm -f
   RMDIR := rm -rf
 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
 
-.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
+
+.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
 
+.PHONY: flags-release
+flags-release: 
+	$(eval LDFLAGS += -s -w)
+	$(eval GO_BUILD_FLAGS += -trimpath)
+
+.PHONY: flags-pie
+flags-pie:
+	$(eval GO_BUILD_FLAGS += -buildmode=pie)
+
+.PHONY: flags-static
+flags-static: 
+	$(eval LDFLAGS += -extldflags=-static)
+	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
+
+.PHONY: flags-static-pie
+flags-static-pie: 
+	$(eval LDFLAGS += -extldflags=-static-pie)
+	$(eval GO_BUILD_FLAGS += -buildmode=pie)
+	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
+
+.PHONY: flags-static-windows
+flags-static-windows:
+	$(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: stash-release
+stash-release: flags-release
+stash-release: flags-pie
+stash-release: stash
 
-# strips debug symbols from the release build
-build-release: EXTRA_LDFLAGS := -s -w
-build-release: GO_BUILD_FLAGS := -trimpath
-build-release: build
+.PHONY: stash-release-static
+stash-release-static: flags-release
+stash-release-static: flags-static-pie
+stash-release-static: stash
 
-build-release-static: EXTRA_LDFLAGS := -extldflags=-static -s -w
-build-release-static: GO_BUILD_FLAGS := -trimpath
-build-release-static: build
+.PHONY: stash-release-static-windows
+stash-release-static-windows: flags-release
+stash-release-static-windows: flags-static-windows
+stash-release-static-windows: stash
+
+.PHONY: phasher
+phasher: build-flags
+	go build $(PHASHER_OUTPUT) $(BUILD_FLAGS) ./cmd/phasher
+
+.PHONY: phasher-release
+phasher-release: flags-release
+phasher-release: flags-pie
+phasher-release: phasher
+
+.PHONY: phasher-release-static
+phasher-release-static: flags-release
+phasher-release-static: flags-static-pie
+phasher-release-static: phasher
+
+.PHONY: phasher-release-static-windows
+phasher-release-static-windows: flags-release
+phasher-release-static-windows: flags-static-windows
+phasher-release-static-windows: phasher
+
+# builds dynamically-linked debug binaries
+.PHONY: build
+build: stash phasher
+
+# builds dynamically-linked release binaries
+.PHONY: build-release
+build-release: stash-release phasher-release
+
+# builds statically-linked release binaries
+.PHONY: build-release-static
+build-release-static: stash-release-static phasher-release-static
+
+# build-release-static, but excluding netgo, which is not needed on windows
+.PHONY: build-release-static-windows
+build-release-static-windows: stash-release-static-windows phasher-release-static-windows
 
 # cross-compile- targets should be run within the compiler docker container
+.PHONY: cross-compile-windows
 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
+cross-compile-windows: STASH_OUTPUT := -o dist/stash-win.exe
+cross-compile-windows: PHASHER_OUTPUT := -o dist/phasher-win.exe
+cross-compile-windows: flags-release
+cross-compile-windows: flags-static-windows
+cross-compile-windows: build
 
+.PHONY: cross-compile-macos-intel
 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)
+cross-compile-macos-intel: STASH_OUTPUT := -o dist/stash-macos-intel
+cross-compile-macos-intel: PHASHER_OUTPUT := -o dist/phasher-macos-intel
+cross-compile-macos-intel: flags-release
 # can't use static build for OSX
-cross-compile-macos-intel: build-release
+cross-compile-macos-intel: flags-pie
+cross-compile-macos-intel: build
 
+.PHONY: cross-compile-macos-applesilicon
 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)
+cross-compile-macos-applesilicon: STASH_OUTPUT := -o dist/stash-macos-applesilicon
+cross-compile-macos-applesilicon: PHASHER_OUTPUT := -o dist/phasher-macos-applesilicon
+cross-compile-macos-applesilicon: flags-release
 # can't use static build for OSX
-cross-compile-macos-applesilicon: build-release
+cross-compile-macos-applesilicon: flags-pie
+cross-compile-macos-applesilicon: build
 
+.PHONY: cross-compile-macos
 cross-compile-macos:
 	rm -rf dist/Stash.app dist/Stash-macos.zip
 	make cross-compile-macos-applesilicon
@@ -118,41 +206,57 @@ cross-compile-macos:
 	cd dist && zip -r Stash-macos.zip Stash.app && cd ..
 	rm -rf dist/Stash.app
 
+.PHONY: cross-compile-freebsd
 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
+cross-compile-freebsd: STASH_OUTPUT := -o dist/stash-freebsd
+cross-compile-freebsd: PHASHER_OUTPUT := -o dist/phasher-freebsd
+cross-compile-freebsd: flags-release
+cross-compile-freebsd: flags-static-pie
+cross-compile-freebsd: build
 
+.PHONY: cross-compile-linux
 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
+cross-compile-linux: STASH_OUTPUT := -o dist/stash-linux
+cross-compile-linux: PHASHER_OUTPUT := -o dist/phasher-linux
+cross-compile-linux: flags-release
+cross-compile-linux: flags-static-pie
+cross-compile-linux: build
 
+.PHONY: cross-compile-linux-arm64v8
 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
+cross-compile-linux-arm64v8: STASH_OUTPUT := -o dist/stash-linux-arm64v8
+cross-compile-linux-arm64v8: PHASHER_OUTPUT := -o dist/phasher-linux-arm64v8
+cross-compile-linux-arm64v8: flags-release
+cross-compile-linux-arm64v8: flags-static-pie
+cross-compile-linux-arm64v8: build
 
+.PHONY: cross-compile-linux-arm32v7
 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
+cross-compile-linux-arm32v7: STASH_OUTPUT := -o dist/stash-linux-arm32v7
+cross-compile-linux-arm32v7: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v7
+cross-compile-linux-arm32v7: flags-release
+cross-compile-linux-arm32v7: flags-static
+cross-compile-linux-arm32v7: build
 
+.PHONY: cross-compile-linux-arm32v6
 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
+cross-compile-linux-arm32v6: STASH_OUTPUT := -o dist/stash-linux-arm32v6
+cross-compile-linux-arm32v6: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v6
+cross-compile-linux-arm32v6: flags-release
+cross-compile-linux-arm32v6: flags-static
+cross-compile-linux-arm32v6: build
 
+.PHONY: cross-compile-all
 cross-compile-all:
 	make cross-compile-windows
 	make cross-compile-macos-intel
@@ -164,33 +268,34 @@ cross-compile-all:
 
 .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 +309,29 @@ lint:
 # runs unit tests - excluding integration tests
 .PHONY: test
 test:
-	go test -mod=vendor ./...
+	go test ./...
 
 # runs all tests - including integration tests
 .PHONY: it
 it:
-	go test -mod=vendor -tags=integration ./...
+	go test -tags=integration ./...
 
 # generates test mocks
 .PHONY: generate-test-mocks
 generate-test-mocks:
-	go run -mod=vendor github.com/vektra/mockery/v2 --dir ./pkg/models --name '.*ReaderWriter' --outpkg mocks --output ./pkg/models/mocks
+	go run github.com/vektra/mockery/v2 --dir ./pkg/models --name '.*ReaderWriter' --outpkg mocks --output ./pkg/models/mocks
 
 # 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 +344,57 @@ 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: ui-nolegacy
+ui-nolegacy: STASH_NOLEGACY := true
+ui-nolegacy: ui
+
+.PHONY: ui-sourcemaps
+ui-sourcemaps: STASH_SOURCEMAPS := true
+ui-sourcemaps: ui
+
 .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:
-	cd ui/v2.5 && yarn run validate
-
-# runs all of the tests and checks required for a PR to be accepted
-.PHONY: validate
-validate: validate-frontend validate-backend
-
 # runs all of the frontend PR-acceptance steps
-.PHONY: validate-frontend
-validate-frontend: ui-validate
+.PHONY: validate-ui
+validate-ui:
+	cd ui/v2.5 && yarn run validate
 
 # runs all of the backend PR-acceptance steps
 .PHONY: validate-backend
 validate-backend: lint it
 
+# runs all of the tests and checks required for a PR to be accepted
+.PHONY: validate
+validate: validate-ui validate-backend
+
 # locally builds and tags a 'stash/build' docker image
 .PHONY: docker-build
-docker-build: 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 .

README.md

@@ -3,8 +3,10 @@ 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)
@@ -58,6 +60,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,83 @@
+// TODO: document in README.md
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	flag "github.com/spf13/pflag"
+	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/file"
+	"github.com/stashapp/stash/pkg/hash/videophash"
+)
+
+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 := &file.VideoFile{
+		BaseFile: &file.BaseFile{Path: inputfile},
+		Duration: ffvideoFile.FileDuration,
+	}
+
+	phash, err := videophash.Generate(ff, vf)
+	if err != nil {
+		return err
+	}
+
+	if *quiet {
+		fmt.Printf("%x\n", *phash)
+	} else {
+		fmt.Printf("%x %v\n", *phash, vf.Path)
+	}
+	return nil
+}
+
+func main() {
+	flag.Usage = customUsage
+	quiet := flag.BoolP("quiet", "q", false, "print only the phash")
+	help := flag.BoolP("help", "h", false, "print this help output")
+	flag.Parse()
+
+	if *help {
+		flag.Usage()
+		os.Exit(2)
+	}
+
+	args := flag.Args()
+
+	if len(args) < 1 {
+		fmt.Fprintf(os.Stderr, "Missing VIDEOFILE argument.\n")
+		flag.Usage()
+		os.Exit(2)
+	}
+
+	if len(args) > 1 {
+		fmt.Fprintln(os.Stderr, "Files will be processed sequentially! Consier using GNU Parallel.")
+		fmt.Fprintf(os.Stderr, "Example: parallel %v ::: *.mp4\n", os.Args[0])
+	}
+
+	ffmpegPath, ffprobePath := ffmpeg.GetPaths(nil)
+	encoder := ffmpeg.NewEncoder(ffmpegPath)
+	encoder.InitHWSupport(context.TODO())
+	ffprobe := ffmpeg.FFProbe(ffprobePath)
+
+	for _, item := range args {
+		if err := printPhash(encoder, ffprobe, item, quiet); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+		}
+	}
+}

cmd/stash/main.go

@@ -34,7 +34,7 @@ func main() {
 	}()
 
 	go handleSignals()
-	desktop.Start(manager.GetInstance(), &manager.FaviconProvider{UIBox: ui.UIBox})
+	desktop.Start(manager.GetInstance(), &ui.FaviconProvider)
 
 	blockForever()
 }

docker/build/x86_64/Dockerfile

@@ -2,15 +2,15 @@
 
 # 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
@@ -29,7 +29,7 @@ COPY --from=frontend /stash /stash/
 RUN make generate-backend
 ARG GITHASH
 ARG STASH_VERSION
-RUN make build
+RUN make stash-release
 
 # Final Runnable Image
 FROM alpine:latest

docker/build/x86_64/Dockerfile-CUDA

@@ -2,15 +2,15 @@
 
 # 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
@@ -29,7 +29,7 @@ COPY --from=frontend /stash /stash/
 RUN make generate-backend
 ARG GITHASH
 ARG STASH_VERSION
-RUN make build
+RUN make stash-release
 
 # Final Runnable Image
 FROM nvidia/cuda:12.0.1-base-ubuntu22.04

docker/production/docker-compose.yml

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

docs/DEVELOPMENT.md

@@ -6,21 +6,18 @@
 * [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
   * To install, follow the [local installation instructions](https://golangci-lint.run/usage/install/#local-installation)
 * [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
-  * Run `yarn install --frozen-lockfile` in the `stash/ui/v2.5` folder (before running make generate for first time).
-
-NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
 
 ## Environment
 
 ### 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,37 @@ 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`
 
 ## 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-release` - Builds a release version the `stash` binary, with debug information removed
+* `make phasher` - Builds the `phasher` binary
+* `make phasher-release` - Builds a release version the `phasher` binary, with debug information removed
+* `make build` - Builds both the `stash` and `phasher` binaries
+* `make build-release` - Builds release versions of both the `stash` and `phasher` binaries
 * `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 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 port can be changed from the default of `9999` using the environment variable `VITE_APP_PLATFORM_PORT`. The UI runs on port `3000` or the next available port.
 
 ## Local development quickstart
 
@@ -59,13 +65,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,17 +80,20 @@ 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
 

go.mod

@@ -9,8 +9,8 @@ require (
 	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/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.0.0
 	github.com/golang-migrate/migrate/v4 v4.15.0-beta.1
 	github.com/gorilla/securecookie v1.1.1
@@ -24,7 +24,6 @@ require (
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
-	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.8.2 // indirect
@@ -46,8 +45,10 @@ require (
 )
 
 require (
+	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
 	github.com/asticode/go-astisub v0.20.0
 	github.com/doug-martin/goqu/v9 v9.18.0
+	github.com/go-chi/cors v1.2.1
 	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

go.sum

@@ -71,6 +71,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
+github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552 h1:eukVk+mGmbSZppLw8WJGpEUgMC570eb32y7FOsPW4Kc=
+github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552/go.mod h1:LKbO1i6L1lSlwWx4NHWVECxubHNKFz2YQoEMGXAFVy8=
 github.com/Yamashou/gqlgenc v0.0.6 h1:wfMTtuVSrX2N1z5/ssecxx+E7l1fa0FOq5mwFW47oY4=
 github.com/Yamashou/gqlgenc v0.0.6/go.mod h1:WOXjogecRGpD1WKgxnnyHJo0/Dxn44p/LNRoE6mtFQo=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
@@ -233,8 +235,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw=
-github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
-github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
@@ -242,6 +242,8 @@ github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAU
 github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi/v5 v5.0.0 h1:DBPx88FjZJH3FsICfDAfIfnb7XxKIYVGG6lOPlhENAg=
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
+github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
+github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/httplog v0.2.1 h1:KgCtIUkYNlfIsUPzE3utxd1KDKOvCrnAKaqdo0rmrh0=
 github.com/go-chi/httplog v0.2.1/go.mod h1:JyHOFO9twSfGoTin/RoP25Lx2a9Btq10ug+sgxe0+bo=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -293,6 +295,8 @@ github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhD
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
@@ -668,8 +672,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
-github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=

gqlgen.yml

@@ -23,10 +23,10 @@ autobind:
 
 models:
   # Scalars
-  Timestamp:
-    model: github.com/stashapp/stash/pkg/models.Timestamp
   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
   # define to force resolvers
   Image:
     model: github.com/stashapp/stash/pkg/models.Image
@@ -54,12 +54,6 @@ models:
     model:  github.com/stashapp/stash/internal/manager/config.ScanMetadataOptions
   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 +74,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:

graphql/documents/data/config.graphql

@@ -25,6 +25,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   maxTranscodeSize
   maxStreamingTranscodeSize
   writeImageThumbnails
+  createImageClipsFromVideos
   apiKey
   username
   password
@@ -89,9 +90,11 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
     performer
     tag
     studio
+    movie
   }
   handyKey
   funscriptOffset
+  useStashHostedFunscript
 }
 
 fragment ConfigDLNAData on ConfigDLNAResult {
@@ -99,6 +102,7 @@ fragment ConfigDLNAData on ConfigDLNAResult {
   enabled
   whitelistedIPs
   interfaces
+  videoSortOrder
 }
 
 fragment ConfigScrapingData on ConfigScrapingResult {
@@ -121,6 +125,10 @@ fragment IdentifyMetadataOptionsData on IdentifyMetadataOptions {
   setCoverImage
   setOrganized
   includeMalePerformers
+  skipMultipleMatches
+  skipMultipleMatchTag
+  skipSingleNamePerformers
+  skipSingleNamePerformerTag
 }
 
 fragment ScraperSourceData on ScraperSource {
@@ -139,8 +147,9 @@ fragment ConfigDefaultSettingsData on ConfigDefaultSettingsResult {
     scanGenerateSprites
     scanGeneratePhashes
     scanGenerateThumbnails
+    scanGenerateClipPreviews
   }
-  
+
   identify {
     sources {
       source {
@@ -179,6 +188,7 @@ fragment ConfigDefaultSettingsData on ConfigDefaultSettingsResult {
     transcodes
     phashes
     interactiveHeatmapsSpeeds
+    clipPreviews
   }
 
   deleteFile

graphql/documents/data/file.graphql

@@ -43,4 +43,46 @@ fragment GalleryFileData on GalleryFile {
     type
     value
   }
-}
+}
+
+fragment VisualFileData on VisualFile {
+  ... on BaseFile {
+    id
+    path
+    size
+    mod_time
+    fingerprints {
+      type
+      value
+    }
+  }
+  ... on ImageFile {
+    id
+    path
+    size
+    mod_time
+    width
+    height
+    fingerprints {
+      type
+      value
+    }
+  }
+  ... on VideoFile {
+    id
+    path
+    size
+    mod_time
+    duration
+    video_codec
+    audio_codec
+    width
+    height
+    frame_rate
+    bit_rate
+    fingerprints {
+      type
+      value
+    }
+  }
+}

graphql/documents/data/filter.graphql

@@ -3,4 +3,4 @@ fragment SavedFilterData on SavedFilter {
   mode
   name
   filter
-}
+}

graphql/documents/data/gallery-slim.graphql

@@ -14,10 +14,10 @@ fragment SlimGalleryData on Gallery {
   }
   image_count
   cover {
+    id
     files {
       ...ImageFileData
     }
-    
     paths {
       thumbnail
     }

graphql/documents/data/image-slim.graphql

@@ -13,6 +13,7 @@ fragment SlimImageData on Image {
 
   paths {
     thumbnail
+    preview
     image
   }
 
@@ -45,4 +46,8 @@ fragment SlimImageData on Image {
     favorite
     image_path
   }
+
+  visual_files {
+    ...VisualFileData
+  }
 }

graphql/documents/data/image.graphql

@@ -15,6 +15,7 @@ fragment ImageData on Image {
 
   paths {
     thumbnail
+    preview
     image
   }
 
@@ -25,7 +26,7 @@ fragment ImageData on Image {
   studio {
     ...SlimStudioData
   }
-  
+
   tags {
     ...SlimTagData
   }
@@ -33,4 +34,8 @@ fragment ImageData on Image {
   performers {
     ...PerformerData
   }
+
+  visual_files {
+    ...VisualFileData
+  }
 }

graphql/documents/data/job.graphql

@@ -7,4 +7,4 @@ fragment JobData on Job {
   startTime
   endTime
   addTime
-}
+}

graphql/documents/data/movie.graphql

@@ -1,6 +1,5 @@
 fragment MovieData on Movie {
   id
-  checksum
   name
   aliases
   duration
@@ -11,7 +10,7 @@ fragment MovieData on Movie {
   studio {
     ...SlimStudioData
   }
-  
+
   synopsis
   url
   front_image_path

graphql/documents/data/performer-slim.graphql

@@ -16,6 +16,8 @@ fragment SlimPerformerData on Performer {
   eye_color
   height_cm
   fake_tits
+  penis_length
+  circumcised
   career_length
   tattoos
   piercings

graphql/documents/data/performer.graphql

@@ -14,6 +14,8 @@ fragment PerformerData on Performer {
   height_cm
   measurements
   fake_tits
+  penis_length
+  circumcised
   career_length
   tattoos
   piercings
@@ -25,6 +27,8 @@ fragment PerformerData on Performer {
   image_count
   gallery_count
   movie_count
+  performer_count
+  o_counter
 
   tags {
     ...SlimTagData

graphql/documents/data/scene-slim.graphql

@@ -4,7 +4,7 @@ fragment SlimSceneData on Scene {
   code
   details
   director
-  url
+  urls
   date
   rating100
   o_counter

graphql/documents/data/scene.graphql

@@ -4,7 +4,7 @@ fragment SceneData on Scene {
   code
   details
   director
-  url
+  urls
   date
   rating100
   o_counter
@@ -49,7 +49,7 @@ fragment SceneData on Scene {
   studio {
     ...SlimStudioData
   }
-  
+
   movies {
     movie {
       ...MovieData

graphql/documents/data/scrapers.graphql

@@ -1,3 +1,18 @@
+fragment ScrapedStudioData on ScrapedStudio {
+  stored_id
+  name
+  url
+  parent {
+    stored_id
+    name
+    url
+    image
+    remote_site_id
+  }
+  image
+  remote_site_id
+}
+
 fragment ScrapedPerformerData on ScrapedPerformer {
   stored_id
   name
@@ -13,6 +28,8 @@ fragment ScrapedPerformerData on ScrapedPerformer {
   height
   measurements
   fake_tits
+  penis_length
+  circumcised
   career_length
   tattoos
   piercings
@@ -43,6 +60,8 @@ fragment ScrapedScenePerformerData on ScrapedPerformer {
   height
   measurements
   fake_tits
+  penis_length
+  circumcised
   career_length
   tattoos
   piercings
@@ -97,6 +116,14 @@ fragment ScrapedSceneStudioData on ScrapedStudio {
   stored_id
   name
   url
+  parent {
+    stored_id
+    name
+    url
+    image
+    remote_site_id
+  }
+  image
   remote_site_id
 }
 
@@ -110,7 +137,7 @@ fragment ScrapedSceneData on ScrapedScene {
   code
   details
   director
-  url
+  urls
   date
   image
   remote_site_id

graphql/documents/data/studio.graphql

@@ -1,6 +1,5 @@
 fragment StudioData on Studio {
   id
-  checksum
   name
   url
   parent_studio {
@@ -17,10 +16,15 @@ fragment StudioData on Studio {
   ignore_auto_tag
   image_path
   scene_count
+  scene_count_all: scene_count(depth: -1)
   image_count
+  image_count_all: image_count(depth: -1)
   gallery_count
+  gallery_count_all: gallery_count(depth: -1)
   performer_count
+  performer_count_all: performer_count(depth: -1)
   movie_count
+  movie_count_all: movie_count(depth: -1)
   stash_ids {
     stash_id
     endpoint

graphql/documents/data/tag.graphql

@@ -6,10 +6,15 @@ fragment TagData on Tag {
   ignore_auto_tag
   image_path
   scene_count
+  scene_count_all: scene_count(depth: -1)
   scene_marker_count
+  scene_marker_count_all: scene_marker_count(depth: -1)
   image_count
+  image_count_all: image_count(depth: -1)
   gallery_count
+  gallery_count_all: gallery_count(depth: -1)
   performer_count
+  performer_count_all: performer_count(depth: -1)
 
   parents {
     ...SlimTagData

graphql/documents/mutations/file.graphql

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

graphql/documents/mutations/filter.graphql

@@ -2,7 +2,7 @@ mutation SaveFilter($input: SaveFilterInput!) {
   saveFilter(input: $input) {
     ...SavedFilterData
   }
-} 
+}
 
 mutation DestroySavedFilter($input: DestroyFilterInput!) {
   destroySavedFilter(input: $input)

graphql/documents/mutations/gallery-chapter.graphql

@@ -1,27 +1,29 @@
 mutation GalleryChapterCreate(
-  $title: String!,
-  $image_index: Int!,
-  $gallery_id: ID!) {
-  galleryChapterCreate(input: {
-                              title: $title,
-                              image_index: $image_index,
-                              gallery_id: $gallery_id,
-                            }) {
+  $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,
-                            }) {
+  $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
   }
 }

graphql/documents/mutations/gallery.graphql

@@ -1,41 +1,45 @@
-mutation GalleryCreate(
-  $input: GalleryCreateInput!) {
-
+mutation GalleryCreate($input: GalleryCreateInput!) {
   galleryCreate(input: $input) {
-      ...GalleryData
+    ...GalleryData
   }
 }
 
-mutation GalleryUpdate(
-  $input: GalleryUpdateInput!) {
-
+mutation GalleryUpdate($input: GalleryUpdateInput!) {
   galleryUpdate(input: $input) {
-      ...GalleryData
+    ...GalleryData
   }
 }
 
-mutation BulkGalleryUpdate(
-  $input: BulkGalleryUpdateInput!) {
-
+mutation BulkGalleryUpdate($input: BulkGalleryUpdateInput!) {
   bulkGalleryUpdate(input: $input) {
-      ...GalleryData
+    ...GalleryData
   }
 }
 
-mutation GalleriesUpdate($input : [GalleryUpdateInput!]!) {
+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 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})
+  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})
+  removeGalleryImages(input: { gallery_id: $gallery_id, image_ids: $image_ids })
 }

graphql/documents/mutations/image.graphql

@@ -1,27 +1,23 @@
-mutation ImageUpdate(
-  $input: ImageUpdateInput!) {
-
+mutation ImageUpdate($input: ImageUpdateInput!) {
   imageUpdate(input: $input) {
-      ...SlimImageData
+    ...SlimImageData
   }
 }
 
-mutation BulkImageUpdate(
-  $input: BulkImageUpdateInput!) {
-
+mutation BulkImageUpdate($input: BulkImageUpdateInput!) {
   bulkImageUpdate(input: $input) {
-      ...SlimImageData
+    ...SlimImageData
   }
 }
 
-mutation ImagesUpdate($input : [ImageUpdateInput!]!) {
+mutation ImagesUpdate($input: [ImageUpdateInput!]!) {
   imagesUpdate(input: $input) {
     ...SlimImageData
   }
 }
 
 mutation ImageIncrementO($id: ID!) {
-  imageIncrementO(id: $id) 
+  imageIncrementO(id: $id)
 }
 
 mutation ImageDecrementO($id: ID!) {
@@ -32,10 +28,30 @@ 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 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})
+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

@@ -3,5 +3,5 @@ mutation StopJob($job_id: ID!) {
 }
 
 mutation StopAllJobs {
-    stopAllJobs
-}
+  stopAllJobs
+}

graphql/documents/mutations/metadata.graphql

@@ -45,3 +45,7 @@ mutation BackupDatabase($input: BackupDatabaseInput!) {
 mutation AnonymiseDatabase($input: AnonymiseDatabaseInput!) {
   anonymiseDatabase(input: $input)
 }
+
+mutation OptimiseDatabase {
+  optimiseDatabase
+}

graphql/documents/mutations/migration.graphql

@@ -4,4 +4,4 @@ mutation MigrateSceneScreenshots($input: MigrateSceneScreenshotsInput!) {
 
 mutation MigrateBlobs($input: MigrateBlobsInput!) {
   migrateBlobs(input: $input)
-}
+}

graphql/documents/mutations/movie.graphql

@@ -1,17 +1,5 @@
-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 }) {
+mutation MovieCreate($input: MovieCreateInput!) {
+  movieCreate(input: $input) {
     ...MovieData
   }
 }

graphql/documents/mutations/performer.graphql

@@ -1,22 +1,16 @@
-mutation PerformerCreate(
-  $input: PerformerCreateInput!) {
-
+mutation PerformerCreate($input: PerformerCreateInput!) {
   performerCreate(input: $input) {
-      ...PerformerData
+    ...PerformerData
   }
 }
 
-mutation PerformerUpdate(
-  $input: PerformerUpdateInput!) {
-
+mutation PerformerUpdate($input: PerformerUpdateInput!) {
   performerUpdate(input: $input) {
     ...PerformerData
   }
 }
 
-mutation BulkPerformerUpdate(
-  $input: BulkPerformerUpdateInput!) {
-
+mutation BulkPerformerUpdate($input: BulkPerformerUpdateInput!) {
   bulkPerformerUpdate(input: $input) {
     ...PerformerData
   }

graphql/documents/mutations/plugins.graphql

@@ -2,6 +2,10 @@ mutation ReloadPlugins {
   reloadPlugins
 }
 
-mutation RunPluginTask($plugin_id: ID!, $task_name: String!, $args: [PluginArgInput!]) {
+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 +1,45 @@
 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
-                            }) {
+  $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
-                            }) {
+  $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,43 +1,45 @@
-mutation SceneCreate(
-  $input: SceneCreateInput!) {
-
+mutation SceneCreate($input: SceneCreateInput!) {
   sceneCreate(input: $input) {
     ...SceneData
   }
 }
 
-mutation SceneUpdate(
-  $input: SceneUpdateInput!) {
-
+mutation SceneUpdate($input: SceneUpdateInput!) {
   sceneUpdate(input: $input) {
     ...SceneData
   }
 }
 
-mutation BulkSceneUpdate(
-  $input: BulkSceneUpdateInput!) {
-
+mutation BulkSceneUpdate($input: BulkSceneUpdateInput!) {
   bulkSceneUpdate(input: $input) {
     ...SceneData
   }
 }
 
-mutation ScenesUpdate($input : [SceneUpdateInput!]!) {
+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 SceneSaveActivity(
+  $id: ID!
+  $resume_time: Float
+  $playDuration: Float
+) {
+  sceneSaveActivity(
+    id: $id
+    resume_time: $resume_time
+    playDuration: $playDuration
+  )
 }
 
 mutation SceneIncrementPlayCount($id: ID!) {
-  sceneIncrementPlayCount(id: $id) 
+  sceneIncrementPlayCount(id: $id)
 }
 
 mutation SceneIncrementO($id: ID!) {
-  sceneIncrementO(id: $id) 
+  sceneIncrementO(id: $id)
 }
 
 mutation SceneDecrementO($id: ID!) {
@@ -48,12 +50,32 @@ 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 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 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) {
@@ -68,4 +90,4 @@ mutation SceneMerge($input: SceneMergeInput!) {
   sceneMerge(input: $input) {
     id
   }
-}
+}

graphql/documents/mutations/stash-box.graphql

@@ -1,11 +1,17 @@
-mutation SubmitStashBoxFingerprints($input: StashBoxFingerprintSubmissionInput!) {
+mutation SubmitStashBoxFingerprints(
+  $input: StashBoxFingerprintSubmissionInput!
+) {
   submitStashBoxFingerprints(input: $input)
 }
 
-mutation StashBoxBatchPerformerTag($input: StashBoxBatchPerformerTagInput!) {
+mutation StashBoxBatchPerformerTag($input: StashBoxBatchTagInput!) {
   stashBoxBatchPerformerTag(input: $input)
 }
 
+mutation StashBoxBatchStudioTag($input: StashBoxBatchTagInput!) {
+  stashBoxBatchStudioTag(input: $input)
+}
+
 mutation SubmitStashBoxSceneDraft($input: StashBoxDraftSubmissionInput!) {
   submitStashBoxSceneDraft(input: $input)
 }

graphql/documents/queries/dlna.graphql

@@ -8,4 +8,4 @@ query DLNAStatus {
       until
     }
   }
-}
+}

graphql/documents/queries/gallery.graphql

@@ -1,4 +1,7 @@
-query FindGalleries($filter: FindFilterType, $gallery_filter: GalleryFilterType) {
+query FindGalleries(
+  $filter: FindFilterType
+  $gallery_filter: GalleryFilterType
+) {
   findGalleries(gallery_filter: $gallery_filter, filter: $filter) {
     count
     galleries {

graphql/documents/queries/image.graphql

@@ -1,5 +1,13 @@
-query FindImages($filter: FindFilterType, $image_filter: ImageFilterType, $image_ids: [Int!]) {
-  findImages(filter: $filter, image_filter: $image_filter, image_ids: $image_ids) {
+query FindImages(
+  $filter: FindFilterType
+  $image_filter: ImageFilterType
+  $image_ids: [Int!]
+) {
+  findImages(
+    filter: $filter
+    image_filter: $image_filter
+    image_ids: $image_ids
+  ) {
     count
     megapixels
     filesize

graphql/documents/queries/job.graphql

@@ -5,7 +5,7 @@ query JobQueue {
 }
 
 query FindJob($input: FindJobInput!) {
-    findJob(input: $input) {
-        ...JobData
-    }
+  findJob(input: $input) {
+    ...JobData
+  }
 }

graphql/documents/queries/legacy.graphql

@@ -8,4 +8,4 @@ query MarkerWall($q: String) {
   markerWall(q: $q) {
     ...SceneMarkerData
   }
-}
+}

graphql/documents/queries/misc.graphql

@@ -40,16 +40,20 @@ query AllTagsForFilter {
 
 query Stats {
   stats {
-    scene_count,
-    scenes_size,
-    scenes_duration,
-    image_count,
-    images_size,
-    gallery_count,
-    performer_count,
-    studio_count,
-    movie_count,
+    scene_count
+    scenes_size
+    scenes_duration
+    image_count
+    images_size
+    gallery_count
+    performer_count
+    studio_count
+    movie_count
     tag_count
+    total_o_count
+    total_play_duration
+    total_play_count
+    scenes_played
   }
 }
 

graphql/documents/queries/movie.graphql

@@ -11,4 +11,4 @@ query FindMovie($id: ID!) {
   findMovie(id: $id) {
     ...MovieData
   }
-}
+}

graphql/documents/queries/performer.graphql

@@ -1,4 +1,7 @@
-query FindPerformers($filter: FindFilterType, $performer_filter: PerformerFilterType) {
+query FindPerformers(
+  $filter: FindFilterType
+  $performer_filter: PerformerFilterType
+) {
   findPerformers(filter: $filter, performer_filter: $performer_filter) {
     count
     performers {

graphql/documents/queries/scene-marker.graphql

@@ -1,8 +1,11 @@
-query FindSceneMarkers($filter: FindFilterType, $scene_marker_filter: SceneMarkerFilterType) {
+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,5 +1,13 @@
-query FindScenes($filter: FindFilterType, $scene_filter: SceneFilterType, $scene_ids: [Int!]) {
-  findScenes(filter: $filter, scene_filter: $scene_filter, scene_ids: $scene_ids) {
+query FindScenes(
+  $filter: FindFilterType
+  $scene_filter: SceneFilterType
+  $scene_ids: [Int!]
+) {
+  findScenes(
+    filter: $filter
+    scene_filter: $scene_filter
+    scene_ids: $scene_ids
+  ) {
     count
     filesize
     duration
@@ -20,8 +28,8 @@ query FindScenesByPathRegex($filter: FindFilterType) {
   }
 }
 
-query FindDuplicateScenes($distance: Int) {
-  findDuplicateScenes(distance: $distance) {
+query FindDuplicateScenes($distance: Int, $duration_diff: Float) {
+  findDuplicateScenes(distance: $distance, duration_diff: $duration_diff) {
     ...SlimSceneData
   }
 }
@@ -44,7 +52,10 @@ query FindSceneMarkerTags($id: ID!) {
   }
 }
 
-query ParseSceneFilenames($filter: FindFilterType!, $config: SceneParserInput!) {
+query ParseSceneFilenames(
+  $filter: FindFilterType!
+  $config: SceneParserInput!
+) {
   parseSceneFilenames(filter: $filter, config: $config) {
     count
     results {

graphql/documents/queries/scrapers/freeones.graphql

@@ -1,3 +1,3 @@
 query ScrapeFreeonesPerformers($q: String!) {
   scrapeFreeonesPerformerList(query: $q)
-}
+}

graphql/documents/queries/scrapers/scrapers.graphql

@@ -42,13 +42,28 @@ query ListMovieScrapers {
   }
 }
 
-query ScrapeSinglePerformer($source: ScraperSourceInput!, $input: ScrapeSinglePerformerInput!) {
+query ScrapeSingleStudio(
+  $source: ScraperSourceInput!
+  $input: ScrapeSingleStudioInput!
+) {
+  scrapeSingleStudio(source: $source, input: $input) {
+    ...ScrapedStudioData
+  }
+}
+
+query ScrapeSinglePerformer(
+  $source: ScraperSourceInput!
+  $input: ScrapeSinglePerformerInput!
+) {
   scrapeSinglePerformer(source: $source, input: $input) {
     ...ScrapedPerformerData
   }
 }
 
-query ScrapeMultiPerformers($source: ScraperSourceInput!, $input: ScrapeMultiPerformersInput!) {
+query ScrapeMultiPerformers(
+  $source: ScraperSourceInput!
+  $input: ScrapeMultiPerformersInput!
+) {
   scrapeMultiPerformers(source: $source, input: $input) {
     ...ScrapedPerformerData
   }
@@ -60,13 +75,19 @@ query ScrapePerformerURL($url: String!) {
   }
 }
 
-query ScrapeSingleScene($source: ScraperSourceInput!, $input: ScrapeSingleSceneInput!) {
+query ScrapeSingleScene(
+  $source: ScraperSourceInput!
+  $input: ScrapeSingleSceneInput!
+) {
   scrapeSingleScene(source: $source, input: $input) {
     ...ScrapedSceneData
   }
 }
 
-query ScrapeMultiScenes($source: ScraperSourceInput!, $input: ScrapeMultiScenesInput!) {
+query ScrapeMultiScenes(
+  $source: ScraperSourceInput!
+  $input: ScrapeMultiScenesInput!
+) {
   scrapeMultiScenes(source: $source, input: $input) {
     ...ScrapedSceneData
   }
@@ -78,7 +99,10 @@ query ScrapeSceneURL($url: String!) {
   }
 }
 
-query ScrapeSingleGallery($source: ScraperSourceInput!, $input: ScrapeSingleGalleryInput!) {
+query ScrapeSingleGallery(
+  $source: ScraperSourceInput!
+  $input: ScrapeSingleGalleryInput!
+) {
   scrapeSingleGallery(source: $source, input: $input) {
     ...ScrapedGalleryData
   }

graphql/documents/queries/settings/config.graphql

@@ -6,9 +6,9 @@ query Configuration {
 
 query Directory($path: String) {
   directory(path: $path) {
-      path
-      parent
-      directories
+    path
+    parent
+    directories
   }
 }
 

graphql/documents/queries/studio.graphql

@@ -1,4 +1,4 @@
-query FindStudios($filter: FindFilterType, $studio_filter: StudioFilterType ) {
+query FindStudios($filter: FindFilterType, $studio_filter: StudioFilterType) {
   findStudios(filter: $filter, studio_filter: $studio_filter) {
     count
     studios {

graphql/documents/queries/tag.graphql

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

graphql/documents/subscriptions.graphql

@@ -19,4 +19,4 @@ subscription LoggingSubscribe {
 
 subscription ScanCompleteSubscribe {
   scanCompleteSubscribe
-}
+}

graphql/schema/schema.graphql

@@ -1,133 +1,208 @@
-"""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
 
-  """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!]
+    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!]
+    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
+  ): 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
+  ): FindStudiosResultType!
 
-   """Find a movie by ID"""
+  "Find a movie by ID"
   findMovie(id: ID!): Movie
-  """A function which queries Movie objects"""
-  findMovies(movie_filter: MovieFilterType, filter: FindFilterType): FindMoviesResultType!
+  "A function which queries Movie objects"
+  findMovies(
+    movie_filter: MovieFilterType
+    filter: FindFilterType
+  ): FindMoviesResultType!
 
   findGallery(id: ID!): Gallery
-  findGalleries(gallery_filter: GalleryFilterType, filter: FindFilterType): FindGalleriesResultType!
+  findGalleries(
+    gallery_filter: GalleryFilterType
+    filter: FindFilterType
+  ): FindGalleriesResultType!
 
   findTag(id: ID!): Tag
-  findTags(tag_filter: TagFilterType, filter: FindFilterType): FindTagsResultType!
+  findTags(
+    tag_filter: TagFilterType
+    filter: FindFilterType
+  ): 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])")
+  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!]!
 
   "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 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")
+  "Scrape a list of performers from a query"
+  scrapeFreeonesPerformerList(query: String!): [String!]!
+    @deprecated(
+      reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones"
+    )
 
   # Plugins
-  """List loaded plugins"""
+  "List loaded plugins"
   plugins: [Plugin!]
-  """List available plugin operations"""
+  "List available plugin operations"
   pluginTasks: [PluginTask!]
 
   # 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!
@@ -174,20 +249,20 @@ type Mutation {
   scenesDestroy(input: ScenesDestroyInput!): Boolean!
   scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
 
-  """Increments the o-counter for a scene. Returns the new value"""
+  "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"""
+  "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"""
+  "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."""
+  "Increments the play count for the scene. Returns the new play count value."
   sceneIncrementPlayCount(id: ID!): Int!
 
-  """Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"""
+  "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 +277,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
@@ -245,8 +320,10 @@ type Mutation {
   tagsDestroy(ids: [ID!]!): Boolean!
   tagsMerge(input: TagsMergeInput!): Tag
 
-  """Moves the given files to the given destination. Returns true if successful.
-  Either the destination_folder or destination_folder_id must be provided. If both are provided, the destination_folder_id takes precedence.
+  """
+  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.
@@ -260,88 +337,107 @@ type Mutation {
   destroySavedFilter(input: DestroyFilterInput!): Boolean!
   setDefaultFilter(input: SetDefaultFilterInput!): Boolean!
 
-  """Change general configuration options"""
+  "Change general configuration options"
   configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
   configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
   configureDLNA(input: ConfigDLNAInput!): ConfigDLNAResult!
   configureScraping(input: ConfigScrapingInput!): ConfigScrapingResult!
-  configureDefaults(input: ConfigDefaultSettingsInput!): ConfigDefaultSettingsResult!
+  configureDefaults(
+    input: ConfigDefaultSettingsInput!
+  ): ConfigDefaultSettingsResult!
 
   # overwrites the entire UI configuration
   configureUI(input: Map!): Map!
   # sets a single UI key value
   configureUISetting(key: String!, value: Any): Map!
 
-  """Generate and set (or clear) API key"""
+  "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"""
+  "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!
+  "Run plugin task. Returns the job ID"
+  runPluginTask(
+    plugin_id: ID!
+    task_name: String!
+    args: [PluginArgInput!]
+  ): ID!
   reloadPlugins: Boolean!
 
   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,263 +1,312 @@
 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 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"""
+  "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"""
+  "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"""
+  "Scraper user agent string"
+  scraperUserAgent: String
+    @deprecated(
+      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
+    )
+  "Scraper CDP path. Path to chrome executable or remote address"
+  scraperCDPPath: String
+    @deprecated(
+      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
+    )
+  "Whether the scraper should check for invalid certificates"
+  scraperCertCheck: Boolean
+    @deprecated(
+      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
+    )
+  "Stash-box instances used for tagging"
   stashBoxes: [StashBoxInput!]
-  """Python path - resolved using path if unset"""
+  "Python path - resolved using path if unset"
   pythonPath: String
 }
 
 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 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"""
+  "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"""
+  "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"""
+  "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"
   stashBoxes: [StashBox!]!
-  """Python path - resolved using path if unset"""
+  "Python path - resolved using path if unset"
   pythonPath: String!
 }
 
@@ -265,6 +314,7 @@ input ConfigDisableDropdownCreateInput {
   performer: Boolean
   tag: Boolean
   studio: Boolean
+  movie: Boolean
 }
 
 enum ImageLightboxDisplayMode {
@@ -297,62 +347,64 @@ 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"""
+  "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 +412,116 @@ 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"""
+
+  "Interface language"
   language: String
 
-  """Slideshow Delay"""
+  "Slideshow Delay"
   slideshowDelay: Int @deprecated(reason: "Use imageLightbox.slideshowDelay")
 
   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")
+  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"""
+  "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]
-  """List of interfaces to run DLNA on. Empty for all"""
+  "List of interfaces to run DLNA on. Empty for all"
   interfaces: [String!]
+  "Order to sort videos"
+  videoSortOrder: String
 }
 
 type ConfigDLNAResult {
   serverName: String!
-  """True if DLNA service should be enabled by default"""
+  "True if DLNA service should be enabled by default"
   enabled: Boolean!
-  """List of IPs whitelisted for DLNA service"""
+  "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]!
-  """List of interfaces to run DLNA on. Empty for all"""
+  "List of interfaces to run DLNA on. Empty for all"
   interfaces: [String!]!
+  "Order to sort videos"
+  videoSortOrder: String!
 }
 
 input ConfigScrapingInput {
-  """Scraper user agent string"""
+  "Scraper user agent string"
   scraperUserAgent: String
-  """Scraper CDP path. Path to chrome executable or remote address"""
+  "Scraper CDP path. Path to chrome executable or remote address"
   scraperCDPPath: String
-  """Whether the scraper should check for invalid certificates"""
+  "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 +530,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 +543,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!
@@ -499,14 +559,14 @@ type ConfigResult {
   ui: Map!
 }
 
-"""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,111 @@
 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!]!
+  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!]!
+  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!]!
+  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!]!
+  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
 }

graphql/schema/types/filters.graphql

@@ -6,26 +6,43 @@ enum SortDirectionEnum {
 input FindFilterType {
   q: String
   page: Int
-  """use per_page = -1 to indicate all results. Defaults to 25."""
+  "use per_page = -1 to indicate all results. Defaults to 25."
   per_page: Int
   sort: String
   direction: SortDirectionEnum
 }
 
 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 {
@@ -35,13 +52,15 @@ input ResolutionCriterionInput {
 
 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,96 +75,106 @@ 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"
+  height: StringCriterionInput @deprecated(reason: "Use height_cm instead")
+  "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 o count"
+  o_counter: IntCriterionInput
+  "Filter by StashID"
+  stash_id: StringCriterionInput
+    @deprecated(reason: "Use stash_id_endpoint instead")
+  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
+  "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 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"""
+  "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 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
 }
 
@@ -160,103 +189,111 @@ 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")
+  "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 video codec"
+  video_codec: StringCriterionInput
+  "Filter by audio codec"
+  audio_codec: StringCriterionInput
+  "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  """Filter to only include scenes which have markers. `true` or `false`"""
+  "Filter to only include scenes which have markers. `true` or `false`"
   has_markers: String
-  """Filter to only include scenes missing this property"""
+  "Filter to only include scenes missing this property"
   is_missing: String
-  """Filter to only include scenes with this studio"""
+  "Filter to only include scenes with this studio"
   studios: HierarchicalMultiCriterionInput
-  """Filter to only include scenes with this movie"""
+  "Filter to only include scenes with this movie"
   movies: MultiCriterionInput
-  """Filter to only include scenes with these tags"""
+  "Filter to only include scenes with these tags"
   tags: HierarchicalMultiCriterionInput
-  """Filter by tag count"""
+  "Filter by tag count"
   tag_count: IntCriterionInput
-  """Filter to only include scenes with performers with these tags"""
+  "Filter to only include scenes with performers with these tags"
   performer_tags: HierarchicalMultiCriterionInput
-  """Filter 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: StringCriterionInput
+    @deprecated(reason: "Use stash_id_endpoint instead")
+  "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 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
 }
 
 input MovieFilterType {
-
   name: StringCriterionInput
   director: StringCriterionInput
   synopsis: StringCriterionInput
 
-  """Filter by duration (in seconds)"""
+  "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
+  "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 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
 }
 
@@ -267,33 +304,35 @@ 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: StringCriterionInput
+    @deprecated(reason: "Use stash_id_endpoint instead")
+  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
-  """Filter to only include studios missing this property"""
+  "Filter to only include studios missing this property"
   is_missing: String
-  """Filter by rating"""
-  rating: IntCriterionInput @deprecated(reason: "Use 1-100 range with rating100")
+  "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 scene count"
   scene_count: IntCriterionInput
-  """Filter by image count"""
+  "Filter by image count"
   image_count: IntCriterionInput
-  """Filter by gallery count"""
+  "Filter by gallery count"
   gallery_count: IntCriterionInput
-  """Filter by url"""
+  "Filter by url"
   url: StringCriterionInput
-  """Filter by studio aliases"""
+  "Filter by studio aliases"
   aliases: StringCriterionInput
-  """Filter by autotag ignore value"""
+  "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
-  """Filter by creation time"""
+  "Filter by creation time"
   created_at: TimestampCriterionInput
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
 }
 
@@ -306,51 +345,52 @@ 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")
+  "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 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
 }
 
@@ -359,52 +399,52 @@ 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 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 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 creation time"
   created_at: TimestampCriterionInput
 
-  """Filter by last update time"""
+  "Filter by last update time"
   updated_at: TimestampCriterionInput
 }
 
@@ -415,77 +455,78 @@ input ImageFilterType {
 
   title: 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")
+  "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 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 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
 }
 
 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,9 +540,16 @@ input IntCriterionInput {
   modifier: CriterionModifier!
 }
 
+input FloatCriterionInput {
+  value: Float!
+  value2: Float
+  modifier: CriterionModifier!
+}
+
 input MultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
+  excludes: [ID!]
 }
 
 input GenderCriterionInput {
@@ -509,10 +557,16 @@ input GenderCriterionInput {
   modifier: CriterionModifier!
 }
 
+input CircumcisionCriterionInput {
+  value: [CircumisedEnum!]
+  modifier: CriterionModifier!
+}
+
 input HierarchicalMultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
   depth: Int
+  excludes: [ID!]
 }
 
 input DateCriterionInput {
@@ -527,31 +581,37 @@ 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
+  TAGS
+  IMAGES
 }
 
 type SavedFilter {
   id: ID!
   mode: FilterMode!
   name: String!
-  """JSON-encoded filter string"""
+  "JSON-encoded filter string"
   filter: String!
 }
 
 input SaveFilterInput {
-  """provide ID to overwrite existing filter"""
+  "provide ID to overwrite existing filter"
   id: ID
   mode: FilterMode!
   name: String!
-  """JSON-encoded filter string"""
+  "JSON-encoded filter string"
   filter: String!
 }
 
@@ -561,6 +621,6 @@ input DestroyFilterInput {
 
 input SetDefaultFilterInput {
   mode: FilterMode!
-  """JSON-encoded filter string - null to clear"""
+  "JSON-encoded filter string - null to clear"
   filter: String
 }

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,4 +1,4 @@
-"""Gallery type"""
+"Gallery type"
 type Gallery {
   id: ID!
   checksum: String! @deprecated(reason: "Use files.fingerprints")
@@ -26,7 +26,7 @@ type Gallery {
   tags: [Tag!]!
   performers: [Performer!]!
 
-  """The images in the gallery"""
+  "The images in the gallery"
   images: [Image!]! @deprecated(reason: "Use findImages")
   cover: Image
 }
@@ -87,7 +87,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.
   """

graphql/schema/types/image.graphql

@@ -13,13 +13,13 @@ type Image {
   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!]!
+  file: ImageFileType! @deprecated(reason: "Use visual_files")
+  files: [ImageFile!]! @deprecated(reason: "Use visual_files")
+  visual_files: [VisualFile!]!
   paths: ImagePathsType! # Resolver
-
   galleries: [Gallery!]!
   studio: Studio
   tags: [Tag!]!
@@ -35,6 +35,7 @@ type ImageFileType {
 
 type ImagePathsType {
   thumbnail: String # Resolver
+  preview: String # Resolver
   image: String # Resolver
 }
 
@@ -49,7 +50,7 @@ input ImageUpdateInput {
   organized: Boolean
   url: String
   date: String
-  
+
   studio_id: ID
   performer_ids: [ID!]
   tag_ids: [ID!]
@@ -69,7 +70,7 @@ input BulkImageUpdateInput {
   organized: Boolean
   url: String
   date: String
-  
+
   studio_id: ID
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
@@ -90,9 +91,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/logging.graphql

@@ -1,17 +1,17 @@
-"""Log entries"""
+"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

@@ -10,30 +10,31 @@ 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
+  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 +50,19 @@ type GenerateMetadataOptions {
   transcodes: Boolean
   phashes: Boolean
   interactiveHeatmapsSpeeds: 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
 }
 
@@ -76,88 +78,105 @@ input ScanMetadataInput {
   # 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)"""
+  "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 
+  # 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"""
+  "Strip file extension from title"
   stripFileExtension: Boolean @deprecated(reason: "Not implemented")
-  """Generate covers during scan"""
+  "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)"""
+  "Set name, date, details from metadata (if present)"
   useFileMetadata: Boolean! @deprecated(reason: "Not implemented")
-  """Strip file extension from title"""
+  "Strip file extension from title"
   stripFileExtension: Boolean! @deprecated(reason: "Not implemented")
-  """Generate covers during scan"""
+  "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 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 +186,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 +231,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
 }
 

graphql/schema/types/movie.graphql

@@ -1,9 +1,9 @@
 type Movie {
   id: ID!
-  checksum: String!
   name: String!
+  checksum: String! @deprecated(reason: "MD5 hash of name, use name directly")
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
   # rating expressed as 1-5
@@ -19,14 +19,14 @@ type Movie {
 
   front_image_path: String # Resolver
   back_image_path: String # Resolver
-  scene_count: Int # Resolver
+  scene_count: Int! # Resolver
   scenes: [Scene!]!
 }
 
 input MovieCreateInput {
   name: String!
   aliases: String
-  """Duration in seconds"""
+  "Duration in seconds"
   duration: Int
   date: String
   # rating expressed as 1-5
@@ -37,9 +37,9 @@ input MovieCreateInput {
   director: String
   synopsis: String
   url: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   front_image: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   back_image: String
 }
 
@@ -57,9 +57,9 @@ input MovieUpdateInput {
   director: String
   synopsis: String
   url: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   front_image: String
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   back_image: String
 }
 

graphql/schema/types/performer.graphql

@@ -7,9 +7,14 @@ enum GenderEnum {
   NON_BINARY
 }
 
+enum CircumisedEnum {
+  CUT
+  UNCUT
+}
+
 type Performer {
   id: ID!
-  checksum: String @deprecated(reason: "Not used") 
+  checksum: String @deprecated(reason: "Not used")
   name: String!
   disambiguation: String
   url: String
@@ -24,6 +29,8 @@ type Performer {
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
@@ -34,9 +41,12 @@ type Performer {
   ignore_auto_tag: Boolean!
 
   image_path: String # Resolver
-  scene_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
+  scene_count: Int! # Resolver
+  image_count: Int! # Resolver
+  gallery_count: Int! # Resolver
+  movie_count: Int! # Resolver
+  performer_count: Int! # Resolver
+  o_counter: Int # Resolver
   scenes: [Scene!]!
   stash_ids: [StashID!]!
   # rating expressed as 1-5
@@ -49,7 +59,6 @@ type Performer {
   weight: Int
   created_at: Time!
   updated_at: Time!
-  movie_count: Int
   movies: [Movie!]!
 }
 
@@ -67,6 +76,8 @@ input PerformerCreateInput {
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
@@ -76,7 +87,7 @@ input PerformerCreateInput {
   instagram: String
   favorite: Boolean
   tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
   # rating expressed as 1-5
@@ -105,6 +116,8 @@ input PerformerUpdateInput {
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String
@@ -114,7 +127,7 @@ input PerformerUpdateInput {
   instagram: String
   favorite: Boolean
   tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
   # rating expressed as 1-5
@@ -148,6 +161,8 @@ input BulkPerformerUpdateInput {
   height_cm: Int
   measurements: String
   fake_tits: String
+  penis_length: Float
+  circumcised: CircumisedEnum
   career_length: String
   tattoos: String
   piercings: String

graphql/schema/types/plugin.graphql

@@ -1,43 +1,42 @@
-
 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!]
+  tasks: [PluginTask!]
+  hooks: [PluginHook!]
 }
 
 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!]
 }

graphql/schema/types/scalars.graphql

@@ -1,4 +1,3 @@
-
 """
 Timestamp is a point in time. It is always output as RFC3339-compatible time points.
 It can be input as a RFC3339 string, or as "<4h" for "4 hours in the past" or ">5m"
@@ -11,4 +10,4 @@ scalar Map
 
 scalar Any
 
-scalar Int64
+scalar Int64

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

@@ -40,7 +40,8 @@ type Scene {
   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")
@@ -56,19 +57,18 @@ type Scene {
   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")
   files: [VideoFile!]!
   paths: ScenePathsType! # Resolver
-
   scene_markers: [SceneMarker!]!
   galleries: [Gallery!]!
   studio: Studio
@@ -77,7 +77,7 @@ type Scene {
   performers: [Performer!]!
   stash_ids: [StashID!]!
 
-  """Return valid stream paths"""
+  "Return valid stream paths"
   sceneStreams: [SceneStreamEndpoint!]!
 }
 
@@ -91,7 +91,8 @@ input SceneCreateInput {
   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")
@@ -103,12 +104,15 @@ input SceneCreateInput {
   performer_ids: [ID!]
   movies: [SceneMovieInput!]
   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,7 +123,8 @@ 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")
@@ -132,15 +137,15 @@ input SceneUpdateInput {
   performer_ids: [ID!]
   movies: [SceneMovieInput!]
   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
 
   primary_file_id: ID
@@ -164,7 +169,8 @@ 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")
@@ -175,7 +181,7 @@ input BulkSceneUpdateInput {
   gallery_ids: BulkUpdateIds
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
-  movie_ids:  BulkUpdateIds
+  movie_ids: BulkUpdateIds
 }
 
 input SceneDestroyInput {
@@ -192,17 +198,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,8 +258,10 @@ 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

graphql/schema/types/scraped-movie.graphql

@@ -1,4 +1,4 @@
-"""A movie from a scraping operation..."""
+"A movie from a scraping operation..."
 type ScrapedMovie {
   stored_id: ID
   name: String
@@ -11,9 +11,9 @@ type ScrapedMovie {
   synopsis: String
   studio: ScrapedStudio
 
-  """This should be a base64 encoded data URL"""
+  "This should be a base64 encoded data URL"
   front_image: String
-  """This should be a base64 encoded data URL"""
+  "This should be a base64 encoded data URL"
   back_image: String
 }
 

graphql/schema/types/scraped-performer.graphql

@@ -1,6 +1,6 @@
-"""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
@@ -15,6 +15,8 @@ type ScrapedPerformer {
   height: String
   measurements: String
   fake_tits: String
+  penis_length: String
+  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
@@ -22,7 +24,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,7 +35,7 @@ type ScrapedPerformer {
 }
 
 input ScrapedPerformerInput {
-  """Set if performer matched"""
+  "Set if performer matched"
   stored_id: ID
   name: String
   disambiguation: String
@@ -48,6 +50,8 @@ input ScrapedPerformerInput {
   height: String
   measurements: String
   fake_tits: String
+  penis_length: String
+  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
@@ -60,4 +64,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
 }
 
@@ -16,45 +16,46 @@ enum ScrapeContentType {
 }
 
 "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
+  | 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
 }
 
-
 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,14 +65,14 @@ 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!]
@@ -87,7 +88,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
@@ -116,84 +118,91 @@ input ScrapedGalleryInput {
 }
 
 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_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_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 gallery fragment"
   movie_input: ScrapedMovieInput
 }
 
 input StashBoxSceneQueryInput {
-  """Index of the configured stash-box instance to use"""
+  "Index of the configured stash-box instance to use"
   stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
+  "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"""
+  "Index of the configured stash-box instance to use"
   stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
+  "Instructs query by scene fingerprints"
   performer_ids: [ID!]
-  """Query by query string"""
+  "Query by query string"
   q: String
 }
 
@@ -208,16 +217,22 @@ 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"
+"If neither ids nor names are set, tag all items"
+input StashBoxBatchTagInput {
+  "Stash endpoint to use for the tagging"
   endpoint: Int!
-  "Fields to exclude when executing the performer tagging"
+  "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 {

graphql/schema/types/stats.graphql

@@ -9,4 +9,8 @@ type StatsResultType {
   studio_count: Int!
   movie_count: Int!
   tag_count: Int!
+  total_o_count: Int!
+  total_play_duration: Float!
+  total_play_count: Int!
+  scenes_played: Int!
 }

graphql/schema/types/studio.graphql

@@ -1,7 +1,7 @@
 type Studio {
   id: ID!
-  checksum: String!
   name: String!
+  checksum: String! @deprecated(reason: "MD5 hash of name, use name directly")
   url: String
   parent_studio: Studio
   child_studios: [Studio!]!
@@ -9,10 +9,11 @@ type Studio {
   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
+  movie_count(depth: Int): Int! # Resolver
   stash_ids: [StashID!]!
   # rating expressed as 1-5
   rating: Int @deprecated(reason: "Use 1-100 range with rating100")
@@ -21,7 +22,6 @@ type Studio {
   details: String
   created_at: Time!
   updated_at: Time!
-  movie_count: Int
   movies: [Movie!]!
 }
 
@@ -29,7 +29,7 @@ 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
@@ -45,8 +45,8 @@ 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

graphql/schema/types/tag.graphql

@@ -8,12 +8,11 @@ type Tag {
   updated_at: Time!
 
   image_path: String # Resolver
-  scene_count: Int # Resolver
-  scene_marker_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
-  performer_count: Int
-
+  scene_count(depth: Int): Int! # Resolver
+  scene_marker_count(depth: Int): Int! # Resolver
+  image_count(depth: Int): Int! # Resolver
+  gallery_count(depth: Int): Int! # Resolver
+  performer_count(depth: Int): Int! # Resolver
   parents: [Tag!]!
   children: [Tag!]!
 }
@@ -24,7 +23,7 @@ input TagCreateInput {
   aliases: [String!]
   ignore_auto_tag: Boolean
 
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
 
   parent_ids: [ID!]
@@ -38,7 +37,7 @@ input TagUpdateInput {
   aliases: [String!]
   ignore_auto_tag: Boolean
 
-  """This should be a URL or a base64 encoded data URL"""
+  "This should be a URL or a base64 encoded data URL"
   image: String
 
   parent_ids: [ID!]

graphql/stash-box/query.graphql

@@ -16,6 +16,10 @@ fragment StudioFragment on Studio {
   urls {
     ...URLFragment
   }
+  parent {
+    name
+    id
+  }
   images {
     ...ImageFragment
   }
@@ -131,7 +135,9 @@ query FindScenesByFullFingerprints($fingerprints: [FingerprintQueryInput!]!) {
   }
 }
 
-query FindScenesBySceneFingerprints($fingerprints: [[FingerprintQueryInput!]!]!) {
+query FindScenesBySceneFingerprints(
+  $fingerprints: [[FingerprintQueryInput!]!]!
+) {
   findScenesBySceneFingerprints(fingerprints: $fingerprints) {
     ...SceneFragment
   }
@@ -161,6 +167,12 @@ query FindSceneByID($id: ID!) {
   }
 }
 
+query FindStudio($id: ID, $name: String) {
+  findStudio(id: $id, name: $name) {
+    ...StudioFragment
+  }
+}
+
 mutation SubmitFingerprint($input: FingerprintSubmission!) {
   submitFingerprint(input: $input)
 }

internal/api/authentication.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"path"
 	"strings"
 
 	"github.com/stashapp/stash/internal/manager"
@@ -13,11 +14,6 @@ import (
 	"github.com/stashapp/stash/pkg/session"
 )
 
-const (
-	loginEndPoint  = "/login"
-	logoutEndPoint = "/logout"
-)
-
 const (
 	tripwireActivatedErrMsg = "Stash is exposed to the public internet without authentication, and is not serving any more content to protect your privacy. " +
 		"More information and fixes are available at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet"
@@ -30,7 +26,7 @@ const (
 
 func allowUnauthenticated(r *http.Request) bool {
 	// #2715 - allow access to UI files
-	return strings.HasPrefix(r.URL.Path, loginEndPoint) || r.URL.Path == logoutEndPoint || r.URL.Path == "/css" || strings.HasPrefix(r.URL.Path, "/assets")
+	return strings.HasPrefix(r.URL.Path, loginEndpoint) || r.URL.Path == logoutEndpoint || r.URL.Path == "/css" || strings.HasPrefix(r.URL.Path, "/assets")
 }
 
 func authenticateHandler() func(http.Handler) http.Handler {
@@ -38,38 +34,41 @@ func authenticateHandler() func(http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			c := config.GetInstance()
 
-			if !checkSecurityTripwireActivated(c, w) {
+			// error if external access tripwire activated
+			if accessErr := session.CheckExternalAccessTripwire(c); accessErr != nil {
+				http.Error(w, tripwireActivatedErrMsg, http.StatusForbidden)
 				return
 			}
 
 			userID, err := manager.GetInstance().SessionStore.Authenticate(w, r)
 			if err != nil {
 				if errors.Is(err, session.ErrUnauthorized) {
-					w.WriteHeader(http.StatusInternalServerError)
-					_, err = w.Write([]byte(err.Error()))
-					if err != nil {
-						logger.Error(err)
-					}
+					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
 				}
 
 				// unauthorized error
-				w.Header().Add("WWW-Authenticate", `FormBased`)
+				w.Header().Add("WWW-Authenticate", "FormBased")
 				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 
 			if err := session.CheckAllowPublicWithoutAuth(c, r); err != nil {
-				var externalAccess session.ExternalAccessError
-				switch {
-				case errors.As(err, &externalAccess):
-					securityActivateTripwireAccessedFromInternetWithoutAuth(c, externalAccess, w)
-					return
-				default:
+				var accessErr session.ExternalAccessError
+				if errors.As(err, &accessErr) {
+					session.LogExternalAccessError(accessErr)
+
+					err := c.ActivatePublicAccessTripwire(net.IP(accessErr).String())
+					if err != nil {
+						logger.Errorf("Error activating public access tripwire: %v", err)
+					}
+
+					http.Error(w, externalAccessErrMsg, http.StatusForbidden)
+				} else {
 					logger.Errorf("Error checking external access security: %v", err)
 					w.WriteHeader(http.StatusInternalServerError)
-					return
 				}
+				return
 			}
 
 			ctx := r.Context()
@@ -77,15 +76,15 @@ func authenticateHandler() func(http.Handler) http.Handler {
 			if c.HasCredentials() {
 				// authentication is required
 				if userID == "" && !allowUnauthenticated(r) {
-					// authentication was not received, redirect
-					// if graphql was requested, we just return a forbidden error
-					if r.URL.Path == "/graphql" {
-						w.Header().Add("WWW-Authenticate", `FormBased`)
+					// if graphql or a non-webpage was requested, we just return a forbidden error
+					ext := path.Ext(r.URL.Path)
+					if r.URL.Path == gqlEndpoint || (ext != "" && ext != ".html") {
+						w.Header().Add("WWW-Authenticate", "FormBased")
 						w.WriteHeader(http.StatusUnauthorized)
 						return
 					}
 
-					prefix := getProxyPrefix(r.Header)
+					prefix := getProxyPrefix(r)
 
 					// otherwise redirect to the login page
 					returnURL := url.URL{
@@ -95,7 +94,7 @@ func authenticateHandler() func(http.Handler) http.Handler {
 					q := make(url.Values)
 					q.Set(returnURLParam, returnURL.String())
 					u := url.URL{
-						Path:     prefix + "/login",
+						Path:     prefix + loginEndpoint,
 						RawQuery: q.Encode(),
 					}
 					http.Redirect(w, r, u.String(), http.StatusFound)
@@ -111,31 +110,3 @@ func authenticateHandler() func(http.Handler) http.Handler {
 		})
 	}
 }
-
-func checkSecurityTripwireActivated(c *config.Instance, w http.ResponseWriter) bool {
-	if accessErr := session.CheckExternalAccessTripwire(c); accessErr != nil {
-		w.WriteHeader(http.StatusForbidden)
-		_, err := w.Write([]byte(tripwireActivatedErrMsg))
-		if err != nil {
-			logger.Error(err)
-		}
-		return false
-	}
-
-	return true
-}
-
-func securityActivateTripwireAccessedFromInternetWithoutAuth(c *config.Instance, accessErr session.ExternalAccessError, w http.ResponseWriter) {
-	session.LogExternalAccessError(accessErr)
-
-	err := c.ActivatePublicAccessTripwire(net.IP(accessErr).String())
-	if err != nil {
-		logger.Error(err)
-	}
-
-	w.WriteHeader(http.StatusForbidden)
-	_, err = w.Write([]byte(externalAccessErrMsg))
-	if err != nil {
-		logger.Error(err)
-	}
-}

internal/api/changeset_translator.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"database/sql"
 	"fmt"
 	"strconv"
 	"strings"
@@ -92,21 +91,6 @@ func (t changesetTranslator) getFields() []string {
 	return ret
 }
 
-func (t changesetTranslator) nullString(value *string, field string) *sql.NullString {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullString{}
-
-	if value != nil {
-		ret.String = *value
-		ret.Valid = true
-	}
-
-	return ret
-}
-
 func (t changesetTranslator) string(value *string, field string) string {
 	if value == nil {
 		return ""
@@ -123,43 +107,36 @@ func (t changesetTranslator) optionalString(value *string, field string) models.
 	return models.NewOptionalStringPtr(value)
 }
 
-func (t changesetTranslator) sqliteDate(value *string, field string) *models.SQLiteDate {
+func (t changesetTranslator) optionalDate(value *string, field string) (models.OptionalDate, error) {
 	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &models.SQLiteDate{}
-
-	if value != nil {
-		ret.String = *value
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) optionalDate(value *string, field string) models.OptionalDate {
-	if !t.hasField(field) {
-		return models.OptionalDate{}
+		return models.OptionalDate{}, nil
 	}
 
 	if value == nil || *value == "" {
 		return models.OptionalDate{
 			Set:  true,
 			Null: true,
-		}
+		}, nil
 	}
 
-	return models.NewOptionalDate(models.NewDate(*value))
+	date, err := models.ParseDate(*value)
+	if err != nil {
+		return models.OptionalDate{}, err
+	}
+
+	return models.NewOptionalDate(date), nil
 }
 
-func (t changesetTranslator) datePtr(value *string, field string) *models.Date {
-	if value == nil {
-		return nil
+func (t changesetTranslator) datePtr(value *string, field string) (*models.Date, error) {
+	if value == nil || *value == "" {
+		return nil, nil
 	}
 
-	d := models.NewDate(*value)
-	return &d
+	date, err := models.ParseDate(*value)
+	if err != nil {
+		return nil, err
+	}
+	return &date, nil
 }
 
 func (t changesetTranslator) intPtrFromString(value *string, field string) (*int, error) {
@@ -174,37 +151,6 @@ func (t changesetTranslator) intPtrFromString(value *string, field string) (*int
 	return &vv, nil
 }
 
-func (t changesetTranslator) nullInt64(value *int, field string) *sql.NullInt64 {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullInt64{}
-
-	if value != nil {
-		ret.Int64 = int64(*value)
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) ratingConversion(legacyValue *int, rating100Value *int) *sql.NullInt64 {
-	const (
-		legacyField    = "rating"
-		rating100Field = "rating100"
-	)
-
-	legacyRating := t.nullInt64(legacyValue, legacyField)
-	if legacyRating != nil {
-		if legacyRating.Valid {
-			legacyRating.Int64 = int64(models.Rating5To100(int(legacyRating.Int64)))
-		}
-		return legacyRating
-	}
-	return t.nullInt64(rating100Value, rating100Field)
-}
-
 func (t changesetTranslator) ratingConversionInt(legacyValue *int, rating100Value *int) *int {
 	const (
 		legacyField    = "rating"
@@ -247,21 +193,6 @@ func (t changesetTranslator) optionalInt(value *int, field string) models.Option
 	return models.NewOptionalIntPtr(value)
 }
 
-func (t changesetTranslator) nullInt64FromString(value *string, field string) *sql.NullInt64 {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullInt64{}
-
-	if value != nil {
-		ret.Int64, _ = strconv.ParseInt(*value, 10, 64)
-		ret.Valid = true
-	}
-
-	return ret
-}
-
 func (t changesetTranslator) optionalIntFromString(value *string, field string) (models.OptionalInt, error) {
 	if !t.hasField(field) {
 		return models.OptionalInt{}, nil

internal/api/check_version.go

@@ -13,6 +13,7 @@ import (
 
 	"golang.org/x/sys/cpu"
 
+	"github.com/stashapp/stash/internal/build"
 	"github.com/stashapp/stash/pkg/logger"
 )
 
@@ -113,7 +114,6 @@ type LatestRelease struct {
 }
 
 func makeGithubRequest(ctx context.Context, url string, output interface{}) error {
-
 	transport := &http.Transport{Proxy: http.ProxyFromEnvironment}
 
 	client := &http.Client{
@@ -124,6 +124,7 @@ func makeGithubRequest(ctx context.Context, url string, output interface{}) erro
 	req, _ := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 
 	req.Header.Add("Accept", apiAcceptHeader) // gh api recommendation , send header with api version
+	logger.Debugf("Github API request: %s", url)
 	response, err := client.Do(req)
 
 	if err != nil {
@@ -170,7 +171,7 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 	wantedRelease := stashReleases()[platform]
 
 	url := apiReleases
-	if IsDevelop() {
+	if build.IsDevelop() {
 		// get the release tagged with the development tag
 		url += "/tags/" + developmentTag
 	} else {
@@ -213,7 +214,7 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 		}
 	}
 
-	_, githash, _ := GetVersion()
+	_, githash, _ := build.Version()
 	shLength := len(githash)
 	if shLength == 0 {
 		shLength = defaultSHLength
@@ -229,19 +230,39 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 }
 
 func getReleaseHash(ctx context.Context, tagName string) (string, error) {
-	url := apiTags
-	tags := []githubTagResponse{}
-	err := makeGithubRequest(ctx, url, &tags)
-	if err != nil {
-		return "", err
+	// Start with a small page size if not searching for latest_develop
+	perPage := 10
+	if tagName == developmentTag {
+		perPage = 100
 	}
 
-	for _, tag := range tags {
-		if tag.Name == tagName {
-			if len(tag.Commit.Sha) != 40 {
-				return "", errors.New("invalid Github API response")
+	// Limit to 5 pages, ie 500 tags - should be plenty
+	for page := 1; page <= 5; {
+		url := fmt.Sprintf("%s?per_page=%d&page=%d", apiTags, perPage, page)
+		tags := []githubTagResponse{}
+		err := makeGithubRequest(ctx, url, &tags)
+		if err != nil {
+			return "", err
+		}
+
+		for _, tag := range tags {
+			if tag.Name == tagName {
+				if len(tag.Commit.Sha) != 40 {
+					return "", errors.New("invalid Github API response")
+				}
+				return tag.Commit.Sha, nil
 			}
-			return tag.Commit.Sha, nil
+		}
+
+		if len(tags) == 0 {
+			break
+		}
+
+		// if not found in the first 10, search again on page 1 with the first 100
+		if perPage == 10 {
+			perPage = 100
+		} else {
+			page++
 		}
 	}
 
@@ -253,7 +274,7 @@ func printLatestVersion(ctx context.Context) {
 	if err != nil {
 		logger.Errorf("Couldn't retrieve latest version: %v", err)
 	} else {
-		_, githash, _ = GetVersion()
+		_, githash, _ := build.Version()
 		switch {
 		case githash == "":
 			logger.Infof("Latest version: %s (%s)", latestRelease.Version, latestRelease.ShortHash)

internal/api/error.go

@@ -0,0 +1,42 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+
+	"github.com/99designs/gqlgen/graphql"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/vektah/gqlparser/v2/gqlerror"
+)
+
+func gqlErrorHandler(ctx context.Context, e error) *gqlerror.Error {
+	if !errors.Is(ctx.Err(), context.Canceled) {
+		// log all errors - for now just log the error message
+		// we can potentially add more context later
+		fc := graphql.GetFieldContext(ctx)
+		if fc != nil {
+			logger.Errorf("%s: %v", fc.Path(), e)
+
+			// log the args in debug level
+			logger.DebugFunc(func() (string, []interface{}) {
+				var args interface{}
+				args = fc.Args
+
+				s, _ := json.Marshal(args)
+				if len(s) > 0 {
+					args = string(s)
+				}
+
+				return "%s: %v", []interface{}{
+					fc.Path(),
+					args,
+				}
+			})
+		}
+	}
+
+	// we may also want to transform the error message for the response
+	// for now just return the original error
+	return graphql.DefaultErrorPresenter(ctx, e)
+}

internal/api/images.go

@@ -87,7 +87,7 @@ func initialiseCustomImages() {
 	}
 }
 
-func getRandomPerformerImageUsingName(name string, gender models.GenderEnum, customPath string) ([]byte, error) {
+func getRandomPerformerImageUsingName(name string, gender *models.GenderEnum, customPath string) ([]byte, error) {
 	var box *imageBox
 
 	// If we have a custom path, we should return a new box in the given path.
@@ -95,11 +95,16 @@ func getRandomPerformerImageUsingName(name string, gender models.GenderEnum, cus
 		box = performerBoxCustom
 	}
 
+	var g models.GenderEnum
+	if gender != nil {
+		g = *gender
+	}
+
 	if box == nil {
-		switch gender {
-		case models.GenderEnumFemale:
+		switch g {
+		case models.GenderEnumFemale, models.GenderEnumTransgenderFemale:
 			box = performerBox
-		case models.GenderEnumMale:
+		case models.GenderEnumMale, models.GenderEnumTransgenderMale:
 			box = performerBoxMale
 		default:
 			box = performerBox

internal/api/models.go

@@ -1,4 +1,4 @@
-package models
+package api
 
 import (
 	"errors"

internal/api/models_test.go

@@ -1,4 +1,4 @@
-package models
+package api
 
 import (
 	"bytes"

internal/api/resolver.go

@@ -3,9 +3,11 @@ package api
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sort"
 	"strconv"
 
+	"github.com/stashapp/stash/internal/build"
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -156,18 +158,26 @@ func (r *queryResolver) Stats(ctx context.Context) (*StatsResultType, error) {
 		studiosCount, _ := studiosQB.Count(ctx)
 		moviesCount, _ := moviesQB.Count(ctx)
 		tagsCount, _ := tagsQB.Count(ctx)
+		totalOCount, _ := scenesQB.OCount(ctx)
+		totalPlayDuration, _ := scenesQB.PlayDuration(ctx)
+		totalPlayCount, _ := scenesQB.PlayCount(ctx)
+		uniqueScenePlayCount, _ := scenesQB.UniqueScenePlayCount(ctx)
 
 		ret = StatsResultType{
-			SceneCount:     scenesCount,
-			ScenesSize:     scenesSize,
-			ScenesDuration: scenesDuration,
-			ImageCount:     imageCount,
-			ImagesSize:     imageSize,
-			GalleryCount:   galleryCount,
-			PerformerCount: performersCount,
-			StudioCount:    studiosCount,
-			MovieCount:     moviesCount,
-			TagCount:       tagsCount,
+			SceneCount:        scenesCount,
+			ScenesSize:        scenesSize,
+			ScenesDuration:    scenesDuration,
+			ImageCount:        imageCount,
+			ImagesSize:        imageSize,
+			GalleryCount:      galleryCount,
+			PerformerCount:    performersCount,
+			StudioCount:       studiosCount,
+			MovieCount:        moviesCount,
+			TagCount:          tagsCount,
+			TotalOCount:       totalOCount,
+			TotalPlayDuration: totalPlayDuration,
+			TotalPlayCount:    totalPlayCount,
+			ScenesPlayed:      uniqueScenePlayCount,
 		}
 
 		return nil
@@ -179,7 +189,7 @@ func (r *queryResolver) Stats(ctx context.Context) (*StatsResultType, error) {
 }
 
 func (r *queryResolver) Version(ctx context.Context) (*Version, error) {
-	version, hash, buildtime := GetVersion()
+	version, hash, buildtime := build.Version()
 
 	return &Version{
 		Version:   &version,
@@ -206,6 +216,44 @@ func (r *queryResolver) Latestversion(ctx context.Context) (*LatestVersion, erro
 	}, nil
 }
 
+func (r *mutationResolver) ExecSQL(ctx context.Context, sql string, args []interface{}) (*SQLExecResult, error) {
+	var rowsAffected *int64
+	var lastInsertID *int64
+
+	db := manager.GetInstance().Database
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		var err error
+		rowsAffected, lastInsertID, err = db.ExecSQL(ctx, sql, args)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return &SQLExecResult{
+		RowsAffected: rowsAffected,
+		LastInsertID: lastInsertID,
+	}, nil
+}
+
+func (r *mutationResolver) QuerySQL(ctx context.Context, sql string, args []interface{}) (*SQLQueryResult, error) {
+	var cols []string
+	var rows [][]interface{}
+
+	db := manager.GetInstance().Database
+	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		var err error
+		cols, rows, err = db.QuerySQL(ctx, sql, args)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return &SQLQueryResult{
+		Columns: cols,
+		Rows:    rows,
+	}, nil
+}
+
 // Get scene marker tags which show up under the video.
 func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([]*SceneMarkerTag, error) {
 	sceneID, err := strconv.Atoi(scene_id)
@@ -228,6 +276,11 @@ func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([
 			if err != nil {
 				return err
 			}
+
+			if markerPrimaryTag == nil {
+				return fmt.Errorf("tag with id %d not found", sceneMarker.PrimaryTagID)
+			}
+
 			_, hasKey := tags[markerPrimaryTag.ID]
 			if !hasKey {
 				sceneMarkerTag := &SceneMarkerTag{Tag: markerPrimaryTag}

internal/api/resolver_model_gallery_chapter.go

@@ -2,19 +2,13 @@ package api
 
 import (
 	"context"
-	"time"
 
 	"github.com/stashapp/stash/pkg/models"
 )
 
 func (r *galleryChapterResolver) Gallery(ctx context.Context, obj *models.GalleryChapter) (ret *models.Gallery, err error) {
-	if !obj.GalleryID.Valid {
-		panic("Invalid gallery id")
-	}
-
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		galleryID := int(obj.GalleryID.Int64)
-		ret, err = r.repository.Gallery.Find(ctx, galleryID)
+		ret, err = r.repository.Gallery.Find(ctx, obj.GalleryID)
 		return err
 	}); err != nil {
 		return nil, err
@@ -22,11 +16,3 @@ func (r *galleryChapterResolver) Gallery(ctx context.Context, obj *models.Galler
 
 	return ret, nil
 }
-
-func (r *galleryChapterResolver) CreatedAt(ctx context.Context, obj *models.GalleryChapter) (*time.Time, error) {
-	return &obj.CreatedAt.Timestamp, nil
-}
-
-func (r *galleryChapterResolver) UpdatedAt(ctx context.Context, obj *models.GalleryChapter) (*time.Time, error) {
-	return &obj.UpdatedAt.Timestamp, nil
-}

internal/api/resolver_model_image.go

@@ -12,42 +12,55 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-func (r *imageResolver) getPrimaryFile(ctx context.Context, obj *models.Image) (*file.ImageFile, error) {
+func convertImageFile(f *file.ImageFile) *ImageFile {
+	ret := &ImageFile{
+		ID:             strconv.Itoa(int(f.ID)),
+		Path:           f.Path,
+		Basename:       f.Basename,
+		ParentFolderID: strconv.Itoa(int(f.ParentFolderID)),
+		ModTime:        f.ModTime,
+		Size:           f.Size,
+		Width:          f.Width,
+		Height:         f.Height,
+		CreatedAt:      f.CreatedAt,
+		UpdatedAt:      f.UpdatedAt,
+		Fingerprints:   resolveFingerprints(f.Base()),
+	}
+
+	if f.ZipFileID != nil {
+		zipFileID := strconv.Itoa(int(*f.ZipFileID))
+		ret.ZipFileID = &zipFileID
+	}
+
+	return ret
+}
+
+func (r *imageResolver) getPrimaryFile(ctx context.Context, obj *models.Image) (file.VisualFile, error) {
 	if obj.PrimaryFileID != nil {
 		f, err := loaders.From(ctx).FileByID.Load(*obj.PrimaryFileID)
 		if err != nil {
 			return nil, err
 		}
 
-		ret, ok := f.(*file.ImageFile)
+		asFrame, ok := f.(file.VisualFile)
 		if !ok {
-			return nil, fmt.Errorf("file %T is not an image file", f)
+			return nil, fmt.Errorf("file %T is not an frame", f)
 		}
 
-		return ret, nil
+		return asFrame, nil
 	}
 
 	return nil, nil
 }
 
-func (r *imageResolver) getFiles(ctx context.Context, obj *models.Image) ([]*file.ImageFile, error) {
+func (r *imageResolver) getFiles(ctx context.Context, obj *models.Image) ([]file.File, error) {
 	fileIDs, err := loaders.From(ctx).ImageFiles.Load(obj.ID)
 	if err != nil {
 		return nil, err
 	}
 
 	files, errs := loaders.From(ctx).FileByID.LoadAll(fileIDs)
-	ret := make([]*file.ImageFile, len(files))
-	for i, bf := range files {
-		f, ok := bf.(*file.ImageFile)
-		if !ok {
-			return nil, fmt.Errorf("file %T is not an image file", f)
-		}
-
-		ret[i] = f
-	}
-
-	return ret, firstError(errs)
+	return files, firstError(errs)
 }
 
 func (r *imageResolver) Title(ctx context.Context, obj *models.Image) (*string, error) {
@@ -65,9 +78,9 @@ func (r *imageResolver) File(ctx context.Context, obj *models.Image) (*ImageFile
 		return nil, nil
 	}
 
-	width := f.Width
-	height := f.Height
-	size := f.Size
+	width := f.GetWidth()
+	height := f.GetHeight()
+	size := f.Base().Size
 	return &ImageFileType{
 		Size:   int(size),
 		Width:  width,
@@ -75,6 +88,32 @@ func (r *imageResolver) File(ctx context.Context, obj *models.Image) (*ImageFile
 	}, nil
 }
 
+func convertVisualFile(f file.File) VisualFile {
+	switch f := f.(type) {
+	case *file.ImageFile:
+		return convertImageFile(f)
+	case *file.VideoFile:
+		return convertVideoFile(f)
+	default:
+		panic(fmt.Sprintf("unknown file type %T", f))
+	}
+}
+
+func (r *imageResolver) VisualFiles(ctx context.Context, obj *models.Image) ([]VisualFile, error) {
+	fileIDs, err := loaders.From(ctx).ImageFiles.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	files, errs := loaders.From(ctx).FileByID.LoadAll(fileIDs)
+	ret := make([]VisualFile, len(files))
+	for i, f := range files {
+		ret[i] = convertVisualFile(f)
+	}
+
+	return ret, firstError(errs)
+}
+
 func (r *imageResolver) Date(ctx context.Context, obj *models.Image) (*string, error) {
 	if obj.Date != nil {
 		result := obj.Date.String()
@@ -89,27 +128,18 @@ func (r *imageResolver) Files(ctx context.Context, obj *models.Image) ([]*ImageF
 		return nil, err
 	}
 
-	ret := make([]*ImageFile, len(files))
+	var ret []*ImageFile
 
-	for i, f := range files {
-		ret[i] = &ImageFile{
-			ID:             strconv.Itoa(int(f.ID)),
-			Path:           f.Path,
-			Basename:       f.Basename,
-			ParentFolderID: strconv.Itoa(int(f.ParentFolderID)),
-			ModTime:        f.ModTime,
-			Size:           f.Size,
-			Width:          f.Width,
-			Height:         f.Height,
-			CreatedAt:      f.CreatedAt,
-			UpdatedAt:      f.UpdatedAt,
-			Fingerprints:   resolveFingerprints(f.Base()),
+	for _, f := range files {
+		// filter out non-image files
+		imageFile, ok := f.(*file.ImageFile)
+		if !ok {
+			continue
 		}
 
-		if f.ZipFileID != nil {
-			zipFileID := strconv.Itoa(int(*f.ZipFileID))
-			ret[i].ZipFileID = &zipFileID
-		}
+		thisFile := convertImageFile(imageFile)
+
+		ret = append(ret, thisFile)
 	}
 
 	return ret, nil
@@ -121,7 +151,7 @@ func (r *imageResolver) FileModTime(ctx context.Context, obj *models.Image) (*ti
 		return nil, err
 	}
 	if f != nil {
-		return &f.ModTime, nil
+		return &f.Base().ModTime, nil
 	}
 
 	return nil, nil
@@ -131,10 +161,12 @@ func (r *imageResolver) Paths(ctx context.Context, obj *models.Image) (*ImagePat
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
 	builder := urlbuilders.NewImageURLBuilder(baseURL, obj)
 	thumbnailPath := builder.GetThumbnailURL()
+	previewPath := builder.GetPreviewURL()
 	imagePath := builder.GetImageURL()
 	return &ImagePathsType{
 		Image:     &imagePath,
 		Thumbnail: &thumbnailPath,
+		Preview:   &previewPath,
 	}, nil
 }
 

internal/api/resolver_model_movie.go

@@ -2,129 +2,90 @@ package api
 
 import (
 	"context"
-	"time"
 
 	"github.com/stashapp/stash/internal/api/loaders"
 	"github.com/stashapp/stash/internal/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/hash/md5"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
-func (r *movieResolver) Name(ctx context.Context, obj *models.Movie) (string, error) {
-	if obj.Name.Valid {
-		return obj.Name.String, nil
-	}
-	return "", nil
-}
-
-func (r *movieResolver) URL(ctx context.Context, obj *models.Movie) (*string, error) {
-	if obj.URL.Valid {
-		return &obj.URL.String, nil
-	}
-	return nil, nil
-}
-
-func (r *movieResolver) Aliases(ctx context.Context, obj *models.Movie) (*string, error) {
-	if obj.Aliases.Valid {
-		return &obj.Aliases.String, nil
-	}
-	return nil, nil
-}
-
-func (r *movieResolver) Duration(ctx context.Context, obj *models.Movie) (*int, error) {
-	if obj.Duration.Valid {
-		rating := int(obj.Duration.Int64)
-		return &rating, nil
-	}
-	return nil, nil
+func (r *movieResolver) Checksum(ctx context.Context, obj *models.Movie) (string, error) {
+	// generate checksum from movie name
+	return md5.FromString(obj.Name), nil
 }
 
 func (r *movieResolver) Date(ctx context.Context, obj *models.Movie) (*string, error) {
-	if obj.Date.Valid {
-		result := utils.GetYMDFromDatabaseDate(obj.Date.String)
+	if obj.Date != nil {
+		result := obj.Date.String()
 		return &result, nil
 	}
 	return nil, nil
 }
 
 func (r *movieResolver) Rating(ctx context.Context, obj *models.Movie) (*int, error) {
-	if obj.Rating.Valid {
-		rating := models.Rating100To5(int(obj.Rating.Int64))
+	if obj.Rating != nil {
+		rating := models.Rating100To5(*obj.Rating)
 		return &rating, nil
 	}
 	return nil, nil
 }
 
 func (r *movieResolver) Rating100(ctx context.Context, obj *models.Movie) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
+	return obj.Rating, nil
 }
 
 func (r *movieResolver) Studio(ctx context.Context, obj *models.Movie) (ret *models.Studio, err error) {
-	if obj.StudioID.Valid {
-		return loaders.From(ctx).StudioByID.Load(int(obj.StudioID.Int64))
-	}
-
-	return nil, nil
-}
-
-func (r *movieResolver) Director(ctx context.Context, obj *models.Movie) (*string, error) {
-	if obj.Director.Valid {
-		return &obj.Director.String, nil
-	}
-	return nil, nil
-}
-
-func (r *movieResolver) Synopsis(ctx context.Context, obj *models.Movie) (*string, error) {
-	if obj.Synopsis.Valid {
-		return &obj.Synopsis.String, nil
-	}
-	return nil, nil
-}
-
-func (r *movieResolver) FrontImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
-	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	frontimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj).GetMovieFrontImageURL()
-	return &frontimagePath, nil
-}
-
-func (r *movieResolver) BackImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
-	// don't return any thing if there is no back image
-	hasImage := false
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var err error
-		hasImage, err = r.repository.Movie.HasBackImage(ctx, obj.ID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	if !hasImage {
+	if obj.StudioID == nil {
 		return nil, nil
 	}
 
-	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	backimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj).GetMovieBackImageURL()
-	return &backimagePath, nil
+	return loaders.From(ctx).StudioByID.Load(*obj.StudioID)
 }
 
-func (r *movieResolver) SceneCount(ctx context.Context, obj *models.Movie) (ret *int, err error) {
-	var res int
+func (r *movieResolver) FrontImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	var hasImage bool
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = r.repository.Scene.CountByMovieID(ctx, obj.ID)
+		var err error
+		hasImage, err = r.repository.Movie.HasFrontImage(ctx, obj.ID)
 		return err
 	}); err != nil {
 		return nil, err
 	}
 
-	return &res, err
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	imagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj).GetMovieFrontImageURL(hasImage)
+	return &imagePath, nil
+}
+
+func (r *movieResolver) BackImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	var hasImage bool
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		var err error
+		hasImage, err = r.repository.Movie.HasBackImage(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	// don't return anything if there is no back image
+	if !hasImage {
+		return nil, nil
+	}
+
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	imagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj).GetMovieBackImageURL()
+	return &imagePath, nil
+}
+
+func (r *movieResolver) SceneCount(ctx context.Context, obj *models.Movie) (ret int, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Scene.CountByMovieID(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
 }
 
 func (r *movieResolver) Scenes(ctx context.Context, obj *models.Movie) (ret []*models.Scene, err error) {
@@ -138,11 +99,3 @@ func (r *movieResolver) Scenes(ctx context.Context, obj *models.Movie) (ret []*m
 
 	return ret, nil
 }
-
-func (r *movieResolver) CreatedAt(ctx context.Context, obj *models.Movie) (*time.Time, error) {
-	return &obj.CreatedAt.Timestamp, nil
-}
-
-func (r *movieResolver) UpdatedAt(ctx context.Context, obj *models.Movie) (*time.Time, error) {
-	return &obj.UpdatedAt.Timestamp, nil
-}

internal/api/resolver_model_performer.go

@@ -10,6 +10,7 @@ import (
 	"github.com/stashapp/stash/pkg/gallery"
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/performer"
 )
 
 // Checksum is deprecated
@@ -19,7 +20,7 @@ func (r *performerResolver) Checksum(ctx context.Context, obj *models.Performer)
 
 func (r *performerResolver) Aliases(ctx context.Context, obj *models.Performer) (*string, error) {
 	if !obj.Aliases.Loaded() {
-		if err := r.withTxn(ctx, func(ctx context.Context) error {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 			return obj.LoadAliases(ctx, r.repository.Performer)
 		}); err != nil {
 			return nil, err
@@ -32,7 +33,7 @@ func (r *performerResolver) Aliases(ctx context.Context, obj *models.Performer)
 
 func (r *performerResolver) AliasList(ctx context.Context, obj *models.Performer) ([]string, error) {
 	if !obj.Aliases.Loaded() {
-		if err := r.withTxn(ctx, func(ctx context.Context) error {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 			return obj.LoadAliases(ctx, r.repository.Performer)
 		}); err != nil {
 			return nil, err
@@ -63,8 +64,17 @@ func (r *performerResolver) Birthdate(ctx context.Context, obj *models.Performer
 }
 
 func (r *performerResolver) ImagePath(ctx context.Context, obj *models.Performer) (*string, error) {
+	var hasImage bool
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		var err error
+		hasImage, err = r.repository.Performer.HasImage(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	imagePath := urlbuilders.NewPerformerURLBuilder(baseURL, obj).GetPerformerImageURL()
+	imagePath := urlbuilders.NewPerformerURLBuilder(baseURL, obj).GetPerformerImageURL(hasImage)
 	return &imagePath, nil
 }
 
@@ -82,39 +92,76 @@ func (r *performerResolver) Tags(ctx context.Context, obj *models.Performer) (re
 	return ret, firstError(errs)
 }
 
-func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
+func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = r.repository.Scene.CountByPerformerID(ctx, obj.ID)
+		ret, err = r.repository.Scene.CountByPerformerID(ctx, obj.ID)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, nil
+	return ret, nil
 }
 
-func (r *performerResolver) ImageCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
+func (r *performerResolver) ImageCount(ctx context.Context, obj *models.Performer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = image.CountByPerformerID(ctx, r.repository.Image, obj.ID)
+		ret, err = image.CountByPerformerID(ctx, r.repository.Image, obj.ID)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, nil
+	return ret, nil
 }
 
-func (r *performerResolver) GalleryCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
+func (r *performerResolver) GalleryCount(ctx context.Context, obj *models.Performer) (ret int, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = gallery.CountByPerformerID(ctx, r.repository.Gallery, obj.ID)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
+func (r *performerResolver) MovieCount(ctx context.Context, obj *models.Performer) (ret int, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Movie.CountByPerformerID(ctx, obj.ID)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
+func (r *performerResolver) PerformerCount(ctx context.Context, obj *models.Performer) (ret int, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = performer.CountByAppearsWith(ctx, r.repository.Performer, obj.ID)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
+}
+
+func (r *performerResolver) OCounter(ctx context.Context, obj *models.Performer) (ret *int, err error) {
+	var res_scene int
+	var res_image int
 	var res int
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = gallery.CountByPerformerID(ctx, r.repository.Gallery, obj.ID)
+		res_scene, err = r.repository.Scene.OCountByPerformerID(ctx, obj.ID)
+		if err != nil {
+			return err
+		}
+		res_image, err = r.repository.Image.OCountByPerformerID(ctx, obj.ID)
 		return err
 	}); err != nil {
 		return nil, err
 	}
-
+	res = res_scene + res_image
 	return &res, nil
 }
 
@@ -169,15 +216,3 @@ func (r *performerResolver) Movies(ctx context.Context, obj *models.Performer) (
 
 	return ret, nil
 }
-
-func (r *performerResolver) MovieCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = r.repository.Movie.CountByPerformerID(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}

internal/api/resolver_model_scene.go

@@ -14,6 +14,35 @@ import (
 	"github.com/stashapp/stash/pkg/utils"
 )
 
+func convertVideoFile(f *file.VideoFile) *VideoFile {
+	ret := &VideoFile{
+		ID:             strconv.Itoa(int(f.ID)),
+		Path:           f.Path,
+		Basename:       f.Basename,
+		ParentFolderID: strconv.Itoa(int(f.ParentFolderID)),
+		ModTime:        f.ModTime,
+		Format:         f.Format,
+		Size:           f.Size,
+		Duration:       handleFloat64Value(f.Duration),
+		VideoCodec:     f.VideoCodec,
+		AudioCodec:     f.AudioCodec,
+		Width:          f.Width,
+		Height:         f.Height,
+		FrameRate:      handleFloat64Value(f.FrameRate),
+		BitRate:        int(f.BitRate),
+		CreatedAt:      f.CreatedAt,
+		UpdatedAt:      f.UpdatedAt,
+		Fingerprints:   resolveFingerprints(f.Base()),
+	}
+
+	if f.ZipFileID != nil {
+		zipFileID := strconv.Itoa(int(*f.ZipFileID))
+		ret.ZipFileID = &zipFileID
+	}
+
+	return ret
+}
+
 func (r *sceneResolver) getPrimaryFile(ctx context.Context, obj *models.Scene) (*file.VideoFile, error) {
 	if obj.PrimaryFileID != nil {
 		f, err := loaders.From(ctx).FileByID.Load(*obj.PrimaryFileID)
@@ -112,30 +141,7 @@ func (r *sceneResolver) Files(ctx context.Context, obj *models.Scene) ([]*VideoF
 	ret := make([]*VideoFile, len(files))
 
 	for i, f := range files {
-		ret[i] = &VideoFile{
-			ID:             strconv.Itoa(int(f.ID)),
-			Path:           f.Path,
-			Basename:       f.Basename,
-			ParentFolderID: strconv.Itoa(int(f.ParentFolderID)),
-			ModTime:        f.ModTime,
-			Format:         f.Format,
-			Size:           f.Size,
-			Duration:       handleFloat64Value(f.Duration),
-			VideoCodec:     f.VideoCodec,
-			AudioCodec:     f.AudioCodec,
-			Width:          f.Width,
-			Height:         f.Height,
-			FrameRate:      handleFloat64Value(f.FrameRate),
-			BitRate:        int(f.BitRate),
-			CreatedAt:      f.CreatedAt,
-			UpdatedAt:      f.UpdatedAt,
-			Fingerprints:   resolveFingerprints(f.Base()),
-		}
-
-		if f.ZipFileID != nil {
-			zipFileID := strconv.Itoa(int(*f.ZipFileID))
-			ret[i].ZipFileID = &zipFileID
-		}
+		ret[i] = convertVideoFile(f)
 	}
 
 	return ret, nil
@@ -178,8 +184,8 @@ func formatFingerprint(fp interface{}) string {
 func (r *sceneResolver) Paths(ctx context.Context, obj *models.Scene) (*ScenePathsType, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
 	config := manager.GetInstance().Config
-	builder := urlbuilders.NewSceneURLBuilder(baseURL, obj.ID)
-	screenshotPath := builder.GetScreenshotURL(obj.UpdatedAt)
+	builder := urlbuilders.NewSceneURLBuilder(baseURL, obj)
+	screenshotPath := builder.GetScreenshotURL()
 	previewPath := builder.GetStreamPreviewURL()
 	streamPath := builder.GetStreamURL(config.GetAPIKey()).String()
 	webpPath := builder.GetStreamPreviewImageURL()
@@ -370,7 +376,7 @@ func (r *sceneResolver) SceneStreams(ctx context.Context, obj *models.Scene) ([]
 	config := manager.GetInstance().Config
 
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	builder := urlbuilders.NewSceneURLBuilder(baseURL, obj.ID)
+	builder := urlbuilders.NewSceneURLBuilder(baseURL, obj)
 	apiKey := config.GetAPIKey()
 
 	return manager.GetSceneStreamPaths(obj, builder.GetStreamURL(apiKey), config.GetMaxStreamingTranscodeSize())
@@ -399,3 +405,32 @@ func (r *sceneResolver) InteractiveSpeed(ctx context.Context, obj *models.Scene)
 
 	return primaryFile.InteractiveSpeed, nil
 }
+
+func (r *sceneResolver) URL(ctx context.Context, obj *models.Scene) (*string, error) {
+	if !obj.URLs.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadURLs(ctx, r.repository.Scene)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	urls := obj.URLs.List()
+	if len(urls) == 0 {
+		return nil, nil
+	}
+
+	return &urls[0], nil
+}
+
+func (r *sceneResolver) Urls(ctx context.Context, obj *models.Scene) ([]string, error) {
+	if !obj.URLs.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadURLs(ctx, r.repository.Scene)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return obj.URLs.List(), nil
+}

internal/api/resolver_model_scene_marker.go

@@ -2,20 +2,14 @@ package api
 
 import (
 	"context"
-	"time"
 
 	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/models"
 )
 
 func (r *sceneMarkerResolver) Scene(ctx context.Context, obj *models.SceneMarker) (ret *models.Scene, err error) {
-	if !obj.SceneID.Valid {
-		panic("Invalid scene id")
-	}
-
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		sceneID := int(obj.SceneID.Int64)
-		ret, err = r.repository.Scene.Find(ctx, sceneID)
+		ret, err = r.repository.Scene.Find(ctx, obj.SceneID)
 		return err
 	}); err != nil {
 		return nil, err
@@ -48,26 +42,15 @@ func (r *sceneMarkerResolver) Tags(ctx context.Context, obj *models.SceneMarker)
 
 func (r *sceneMarkerResolver) Stream(ctx context.Context, obj *models.SceneMarker) (string, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	sceneID := int(obj.SceneID.Int64)
-	return urlbuilders.NewSceneURLBuilder(baseURL, sceneID).GetSceneMarkerStreamURL(obj.ID), nil
+	return urlbuilders.NewSceneMarkerURLBuilder(baseURL, obj).GetStreamURL(), nil
 }
 
 func (r *sceneMarkerResolver) Preview(ctx context.Context, obj *models.SceneMarker) (string, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	sceneID := int(obj.SceneID.Int64)
-	return urlbuilders.NewSceneURLBuilder(baseURL, sceneID).GetSceneMarkerStreamPreviewURL(obj.ID), nil
+	return urlbuilders.NewSceneMarkerURLBuilder(baseURL, obj).GetPreviewURL(), nil
 }
 
 func (r *sceneMarkerResolver) Screenshot(ctx context.Context, obj *models.SceneMarker) (string, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	sceneID := int(obj.SceneID.Int64)
-	return urlbuilders.NewSceneURLBuilder(baseURL, sceneID).GetSceneMarkerStreamScreenshotURL(obj.ID), nil
-}
-
-func (r *sceneMarkerResolver) CreatedAt(ctx context.Context, obj *models.SceneMarker) (*time.Time, error) {
-	return &obj.CreatedAt.Timestamp, nil
-}
-
-func (r *sceneMarkerResolver) UpdatedAt(ctx context.Context, obj *models.SceneMarker) (*time.Time, error) {
-	return &obj.UpdatedAt.Timestamp, nil
+	return urlbuilders.NewSceneMarkerURLBuilder(baseURL, obj).GetScreenshotURL(), nil
 }

internal/api/resolver_model_studio.go

@@ -2,34 +2,24 @@ package api
 
 import (
 	"context"
-	"time"
 
 	"github.com/stashapp/stash/internal/api/loaders"
 	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/gallery"
+	"github.com/stashapp/stash/pkg/hash/md5"
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/movie"
 	"github.com/stashapp/stash/pkg/performer"
+	"github.com/stashapp/stash/pkg/scene"
 )
 
-func (r *studioResolver) Name(ctx context.Context, obj *models.Studio) (string, error) {
-	if obj.Name.Valid {
-		return obj.Name.String, nil
-	}
-	panic("null name") // TODO make name required
-}
-
-func (r *studioResolver) URL(ctx context.Context, obj *models.Studio) (*string, error) {
-	if obj.URL.Valid {
-		return &obj.URL.String, nil
-	}
-	return nil, nil
+func (r *studioResolver) Checksum(ctx context.Context, obj *models.Studio) (string, error) {
+	// generate checksum from studio name
+	return md5.FromString(obj.Name), nil
 }
 
 func (r *studioResolver) ImagePath(ctx context.Context, obj *models.Studio) (*string, error) {
-	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	imagePath := urlbuilders.NewStudioURLBuilder(baseURL, obj).GetStudioImageURL()
-
 	var hasImage bool
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		var err error
@@ -39,79 +29,84 @@ func (r *studioResolver) ImagePath(ctx context.Context, obj *models.Studio) (*st
 		return nil, err
 	}
 
-	// indicate that image is missing by setting default query param to true
-	if !hasImage {
-		imagePath += "?default=true"
-	}
-
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	imagePath := urlbuilders.NewStudioURLBuilder(baseURL, obj).GetStudioImageURL(hasImage)
 	return &imagePath, nil
 }
 
-func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) (ret []string, err error) {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = r.repository.Studio.GetAliases(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
+func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) ([]string, error) {
+	if !obj.Aliases.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadAliases(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
 	}
 
-	return ret, err
+	return obj.Aliases.List(), nil
 }
 
-func (r *studioResolver) SceneCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res int
+func (r *studioResolver) SceneCount(ctx context.Context, obj *models.Studio, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = r.repository.Scene.CountByStudioID(ctx, obj.ID)
+		ret, err = scene.CountByStudioID(ctx, r.repository.Scene, obj.ID, depth)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, err
+	return ret, nil
 }
 
-func (r *studioResolver) ImageCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res int
+func (r *studioResolver) ImageCount(ctx context.Context, obj *models.Studio, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = image.CountByStudioID(ctx, r.repository.Image, obj.ID)
+		ret, err = image.CountByStudioID(ctx, r.repository.Image, obj.ID, depth)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, nil
+	return ret, nil
 }
 
-func (r *studioResolver) GalleryCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res int
+func (r *studioResolver) GalleryCount(ctx context.Context, obj *models.Studio, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = gallery.CountByStudioID(ctx, r.repository.Gallery, obj.ID)
+		ret, err = gallery.CountByStudioID(ctx, r.repository.Gallery, obj.ID, depth)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, nil
+	return ret, nil
 }
 
-func (r *studioResolver) PerformerCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res int
+func (r *studioResolver) PerformerCount(ctx context.Context, obj *models.Studio, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = performer.CountByStudioID(ctx, r.repository.Performer, obj.ID)
+		ret, err = performer.CountByStudioID(ctx, r.repository.Performer, obj.ID, depth)
 		return err
 	}); err != nil {
-		return nil, err
+		return 0, err
 	}
 
-	return &res, nil
+	return ret, nil
+}
+
+func (r *studioResolver) MovieCount(ctx context.Context, obj *models.Studio, depth *int) (ret int, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = movie.CountByStudioID(ctx, r.repository.Movie, obj.ID, depth)
+		return err
+	}); err != nil {
+		return 0, err
+	}
+
+	return ret, nil
 }
 
 func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (ret *models.Studio, err error) {
-	if !obj.ParentID.Valid {
+	if obj.ParentID == nil {
 		return nil, nil
 	}
 
-	return loaders.From(ctx).StudioByID.Load(int(obj.ParentID.Int64))
+	return loaders.From(ctx).StudioByID.Load(*obj.ParentID)
 }
 
 func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) (ret []*models.Studio, err error) {
@@ -126,47 +121,27 @@ func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) (
 }
 
 func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) ([]*models.StashID, error) {
-	var ret []models.StashID
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var err error
-		ret, err = r.repository.Studio.GetStashIDs(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
+	if !obj.StashIDs.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadStashIDs(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
 	}
 
-	return stashIDsSliceToPtrSlice(ret), nil
+	return stashIDsSliceToPtrSlice(obj.StashIDs.List()), nil
 }
 
 func (r *studioResolver) Rating(ctx context.Context, obj *models.Studio) (*int, error) {
-	if obj.Rating.Valid {
-		rating := models.Rating100To5(int(obj.Rating.Int64))
+	if obj.Rating != nil {
+		rating := models.Rating100To5(*obj.Rating)
 		return &rating, nil
 	}
 	return nil, nil
 }
 
 func (r *studioResolver) Rating100(ctx context.Context, obj *models.Studio) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
-}
-
-func (r *studioResolver) Details(ctx context.Context, obj *models.Studio) (*string, error) {
-	if obj.Details.Valid {
-		return &obj.Details.String, nil
-	}
-	return nil, nil
-}
-
-func (r *studioResolver) CreatedAt(ctx context.Context, obj *models.Studio) (*time.Time, error) {
-	return &obj.CreatedAt.Timestamp, nil
-}
-
-func (r *studioResolver) UpdatedAt(ctx context.Context, obj *models.Studio) (*time.Time, error) {
-	return &obj.UpdatedAt.Timestamp, nil
+	return obj.Rating, nil
 }
 
 func (r *studioResolver) Movies(ctx context.Context, obj *models.Studio) (ret []*models.Movie, err error) {
@@ -179,15 +154,3 @@ func (r *studioResolver) Movies(ctx context.Context, obj *models.Studio) (ret []
 
 	return ret, nil
 }
-
-func (r *studioResolver) MovieCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res, err = r.repository.Movie.CountByStudioID(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}