Fix capitalization in custom localisation heading [skip-ci]

* Add "custom-field-" prefix to custom field detail item ids
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

.dockerignore

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[Bug Report] Short Form Subject (50 Chars or less)"
-labels: bug report
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem please ensure that your screenshots are SFW or at least appropriately censored.
-
-**Stash Version: (from Settings -> About):**
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug Report
+description: Create a report to help us fix the bug
+labels: ["bug report"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: Provide a clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: Detail the steps that would replicate this issue.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behaviour
+      description: Provide clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Screenshots or additional context
+      description: Provide any additional context and SFW screenshots here to help us solve this issue.
+    validations:
+      required: false
+  - type: input
+    id: stashversion
+    attributes:
+      label: Stash version
+      description: This can be found in Settings > About.
+      placeholder: (e.g. v0.28.1)
+    validations:
+      required: true
+  - type: input
+    id: devicedetails
+    attributes:
+      label: Device details
+      description: |
+        If this is an issue that occurs when using the Stash interface, please provide details of the device/browser used which presents the reported issue.
+      placeholder: (e.g. Firefox 97 (64-bit) on Windows 11)
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output from Settings > Logs. This will be automatically formatted into code, so no need for backticks.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community forum
+    url: https://discourse.stashapp.cc
+    about: Start a discussion on the community forum.
+  - name: Community Discord
+    url: https://discord.gg/Y8MNsvQBvZ
+    about: Chat with the community on Discord.
+  - name: Documentation
+    url: https://docs.stashapp.cc
+    about: Check out documentation for help and information.

.github/ISSUE_TEMPLATE/discussion---request-for-commentary--rfc-.md

@@ -1,24 +0,0 @@
----
-name: Discussion / Request for Commentary [RFC]
-about: This is for issues that will be discussed and won't necessarily result directly
-  in commits or pull requests.
-title: "[RFC] Short Form Title"
-labels: help wanted
-assignees: ''
-
----
-
-<!-- Update or delete the title if you need to delegate your title gore to something
-# Title
-
-*### Scope*
-<!-- describe the scope of your topic and your goals ideally within a single paragraph or TL;DR kind of summary so its easier for people to determine if they can contribute at a glance. -->
-
-##  Long Form
-<!-- Only required if your scope and titles can't cover everything. -->
-
-## Examples
-<!-- if you can show a picture or video examples post them here, please ensure that you respect people's time and attention and understand that people are volunteering their time, so concision is ideal and considerate. -->
-
-## Reference Reading
-<!-- if there is any reference reading or documentation, please refer to it here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature] Short Form Title (50 chars or less.)"
-labels: feature request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,44 @@
+name: Feature Request
+description: Request a new feature or idea to be added to Stash
+labels: ["feature request"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature you'd like
+      description: Provide a clear description of the feature you'd like implemented
+    validations:
+      required: true
+  - type: textarea
+    id: benefits
+    attributes:
+      label: Describe the benefits this would bring to existing users
+      description: |
+        Explain the measurable benefits this feature would achieve for existing users.
+        The benefits should be described in terms of outcomes for users, not specific implementations.
+    validations:
+      required: true
+  - type: textarea
+    id: already_possible
+    attributes:
+      label: Is there an existing way to achieve this goal?
+      description: |
+        Yes/No. If Yes, describe how your proposed feature differs from or improves upon the current method
+    validations:
+      required: true
+  - type: checkboxes
+    id: confirm-search
+    attributes:
+      label: Have you searched for an existing open/closed issue?
+      description: |
+        To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/stashapp/stash/issues?q=is%3Aissue) for any existing issues that cover the core request or benefit of your proposal.
+      options:
+        - label: I have searched for existing issues and none cover the core request of my proposal
+          required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

.github/workflows/build.yml

@@ -2,7 +2,10 @@ name: Build
 
 on:
   push:
-    branches: [ develop, master ]
+    branches: 
+      - develop
+      - master
+      - 'releases/**'
   pull_request:
   release:
     types: [ published ]
@@ -12,17 +15,22 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:7
+  COMPILER_IMAGE: stashapp/compiler:12
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
 
     - name: Checkout
       run: git fetch --prune --unshallow --tags
 
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+
     - name: Pull compiler image
       run: docker pull $COMPILER_IMAGE
 
@@ -32,7 +40,7 @@ jobs:
         cache-name: cache-node_modules
       with:
         path: ui/v2.5/node_modules
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml') }}
 
     - name: Cache UI build
       uses: actions/cache@v3
@@ -41,7 +49,7 @@ jobs:
         cache-name: cache-ui
       with:
         path: ui/v2.5/build
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
 
     - name: Cache go build
       uses: actions/cache@v3
@@ -60,7 +68,7 @@ jobs:
         docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --env OFFICIAL_BUILD=${{ env.official-build }} -w /stash $COMPILER_IMAGE tail -f /dev/null
 
     - name: Pre-install
-      run: docker exec -t build /bin/bash -c "make pre-ui"
+      run: docker exec -t build /bin/bash -c "make CI=1 pre-ui"
 
     - name: Generate
       run: docker exec -t build /bin/bash -c "make generate"
@@ -84,13 +92,16 @@ jobs:
 
     - name: Compile for all supported platforms
       run: |
-        docker exec -t build /bin/bash -c "make cross-compile-windows"
-        docker exec -t build /bin/bash -c "make cross-compile-macos-intel"
-        docker exec -t build /bin/bash -c "make cross-compile-macos-applesilicon"
-        docker exec -t build /bin/bash -c "make cross-compile-linux"
-        docker exec -t build /bin/bash -c "make cross-compile-linux-arm64v8"
-        docker exec -t build /bin/bash -c "make cross-compile-linux-arm32v7"
-        docker exec -t build /bin/bash -c "make cross-compile-linux-arm32v6"
+        docker exec -t build /bin/bash -c "make build-cc-windows"
+        docker exec -t build /bin/bash -c "make build-cc-macos"
+        docker exec -t build /bin/bash -c "make build-cc-linux"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm64v8"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v7"
+        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v6"
+        docker exec -t build /bin/bash -c "make build-cc-freebsd"
+
+    - name: Zip UI
+      run: docker exec -t build /bin/bash -c "make zip-ui"
 
     - name: Cleanup build container
       run: docker rm -f -v build
@@ -98,34 +109,42 @@ jobs:
     - name: Generate checksums
       run: |
         git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-        sha1sum dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
+        sha1sum dist/Stash.app.zip dist/stash-* dist/stash-ui.zip | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
         echo "STASH_VERSION=$(git describe --tags --exclude latest_develop)" >> $GITHUB_ENV
         echo "RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
 
     - name: Upload Windows binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: stash-win.exe
         path: dist/stash-win.exe
 
-    - name: Upload OSX binary
+    - name: Upload macOS binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: stash-macos-intel
-        path: dist/stash-macos-intel
+        name: stash-macos
+        path: dist/stash-macos
 
     - name: Upload Linux binary
       # only upload binaries for pull requests
       if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: stash-linux
         path: dist/stash-linux
 
+    - name: Upload UI
+      # only upload for pull requests
+      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
+      uses: actions/upload-artifact@v4
+      with:
+        name: stash-ui.zip
+        path: dist/stash-ui.zip
+
     - name: Update latest_develop tag
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
       run : git tag -f latest_develop; git push -f --tags
@@ -139,13 +158,15 @@ jobs:
         automatic_release_tag: latest_develop
         title: "${{ env.STASH_VERSION }}: Latest development build"
         files: |
-          dist/stash-macos-intel
-          dist/stash-macos-applesilicon
+          dist/Stash.app.zip
+          dist/stash-macos
           dist/stash-win.exe
           dist/stash-linux
           dist/stash-linux-arm64v8
           dist/stash-linux-arm32v7
           dist/stash-linux-arm32v6
+          dist/stash-freebsd
+          dist/stash-ui.zip
           CHECKSUMS_SHA1
 
     - name: Master release
@@ -157,13 +178,15 @@ jobs:
         token: "${{ secrets.GITHUB_TOKEN }}"
         allow_override: true
         files: |
-          dist/stash-macos-intel
-          dist/stash-macos-applesilicon
+          dist/Stash.app.zip
+          dist/stash-macos
           dist/stash-win.exe
           dist/stash-linux
           dist/stash-linux-arm64v8
           dist/stash-linux-arm32v7
           dist/stash-linux-arm32v6
+          dist/stash-freebsd
+          dist/stash-ui.zip
           CHECKSUMS_SHA1
         gzip: false
 

.github/workflows/golangci-lint.yml

@@ -6,10 +6,11 @@ on:
     branches:
       - master
       - develop
+      - 'releases/**'
   pull_request:
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:7
+  COMPILER_IMAGE: stashapp/compiler:12
 
 jobs:
   golangci:
@@ -21,6 +22,11 @@ jobs:
       - name: Checkout
         run: git fetch --prune --unshallow --tags
 
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+
       - name: Pull compiler image
         run: docker pull $COMPILER_IMAGE
 
@@ -33,7 +39,7 @@ jobs:
         run: docker exec -t build /bin/bash -c "make generate-backend"
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest

.gitignore

@@ -21,10 +21,8 @@ vendor
 # GraphQL generated output
 internal/api/generated_*.go
 
-####
-# Jetbrains
-####
-
+# Generated locale files
+ui/login/locales/*
 
 ####
 # Visual Studio
@@ -52,9 +50,6 @@ internal/api/generated_*.go
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
-# Goland Junk
-pkg/pkg
-
 ####
 # Random
 ####
@@ -64,6 +59,7 @@ node_modules
 *.db
 
 /stash
+/Stash.app
 /phasher
 dist
 .DS_Store

.golangci.yml

@@ -15,11 +15,11 @@ linters:
     - unused
     # Linters added by the stash project.
     # - contextcheck
+    - copyloopvar
     - dogsled
     - errchkjson
     - errorlint
     # - exhaustive
-    - exportloopref
     - gocritic
     # - goerr113
     - gofmt
@@ -48,8 +48,6 @@ linters-settings:
     ignore-generated-header: true
     severity: error
     confidence: 0.8
-    error-code: 1
-    warning-code: 1
     rules:
       - name: blank-imports
         disabled: true

.gqlgenc.yml

@@ -1,14 +1,12 @@
 model:
   package: graphql
-  filename: ./pkg/scraper/stashbox/graphql/generated_models.go
+  filename: ./pkg/stashbox/graphql/generated_models.go
 client:
   package: graphql
-  filename: ./pkg/scraper/stashbox/graphql/generated_client.go
+  filename: ./pkg/stashbox/graphql/generated_client.go
 models:
   Date:
     model: github.com/99designs/gqlgen/graphql.String
-  SceneDraftInput:
-    model: github.com/stashapp/stash/pkg/scraper/stashbox/graphql.SceneDraftInput
 endpoint:
   # This points to stashdb.org currently, but can be directed at any stash-box 
   # instance. It is used for generation only.

.idea/go.iml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/certs" />
@@ -10,4 +11,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

Makefile

@@ -9,9 +9,11 @@ endif
 ifdef IS_WIN_SHELL
   RM := del /s /q
   RMDIR := rmdir /s /q
+  NOOP := @@
 else
   RM := rm -f
   RMDIR := rm -rf
+  NOOP := @:
 endif
 
 # set LDFLAGS environment variable to any extra ldflags required
@@ -36,7 +38,7 @@ GO_BUILD_FLAGS := $(GO_BUILD_FLAGS)
 
 # set GO_BUILD_TAGS environment variable to any extra build tags required
 GO_BUILD_TAGS := $(GO_BUILD_TAGS)
-GO_BUILD_TAGS += sqlite_stat4
+GO_BUILD_TAGS += sqlite_stat4 sqlite_math_functions
 
 # set STASH_NOLEGACY environment variable or uncomment to disable legacy browser support
 # STASH_NOLEGACY := true
@@ -46,33 +48,49 @@ GO_BUILD_TAGS += sqlite_stat4
 
 export CGO_ENABLED := 1
 
+# define COMPILER_IMAGE for cross-compilation docker container
+ifndef COMPILER_IMAGE
+  COMPILER_IMAGE := stashapp/compiler:latest
+endif
+
 .PHONY: release
 release: pre-ui generate ui build-release
 
 # targets to set various build flags
+# use combinations on the make command-line to configure a build, e.g.:
+# for a static-pie release build: `make flags-static-pie flags-release stash`
+# for a static windows debug build: `make flags-static-windows stash`
+
+# $(NOOP) prevents "nothing to be done" warnings
 
 .PHONY: flags-release
-flags-release: 
+flags-release:
+	$(NOOP)
 	$(eval LDFLAGS += -s -w)
 	$(eval GO_BUILD_FLAGS += -trimpath)
 
 .PHONY: flags-pie
 flags-pie:
+	$(NOOP)
 	$(eval GO_BUILD_FLAGS += -buildmode=pie)
 
 .PHONY: flags-static
-flags-static: 
+flags-static:
+	$(NOOP)
 	$(eval LDFLAGS += -extldflags=-static)
 	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
 
 .PHONY: flags-static-pie
-flags-static-pie: 
+flags-static-pie:
+	$(NOOP)
 	$(eval LDFLAGS += -extldflags=-static-pie)
 	$(eval GO_BUILD_FLAGS += -buildmode=pie)
 	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo netgo)
 
+# identical to flags-static-pie, but excluding netgo, which is not needed on windows
 .PHONY: flags-static-windows
 flags-static-windows:
+	$(NOOP)
 	$(eval LDFLAGS += -extldflags=-static-pie)
 	$(eval GO_BUILD_FLAGS += -buildmode=pie)
 	$(eval GO_BUILD_TAGS += sqlite_omit_load_extension osusergo)
@@ -105,166 +123,141 @@ build-flags: build-info
 stash: build-flags
 	go build $(STASH_OUTPUT) $(BUILD_FLAGS) ./cmd/stash
 
-.PHONY: stash-release
-stash-release: flags-release
-stash-release: flags-pie
-stash-release: stash
-
-.PHONY: stash-release-static
-stash-release-static: flags-release
-stash-release-static: flags-static-pie
-stash-release-static: stash
-
-.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
+# builds dynamically-linked PIE release binaries
 .PHONY: build-release
-build-release: stash-release phasher-release
+build-release: flags-release flags-pie build
 
-# builds statically-linked release binaries
-.PHONY: build-release-static
-build-release-static: stash-release-static phasher-release-static
+# compile and bundle into Stash.app
+# for when on macOS itself
+.PHONY: stash-macapp
+stash-macapp: STASH_OUTPUT := -o stash
+stash-macapp: flags-release flags-pie stash
+	rm -rf Stash.app
+	cp -R scripts/macos-bundle Stash.app
+	mkdir Stash.app/Contents/MacOS
+	cp stash Stash.app/Contents/MacOS/stash
 
-# 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
+# build-cc- targets should be run within the compiler docker container
 
-# 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: 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: build-cc-windows
+build-cc-windows: export GOOS := windows
+build-cc-windows: export GOARCH := amd64
+build-cc-windows: export CC := x86_64-w64-mingw32-gcc
+build-cc-windows: STASH_OUTPUT := -o dist/stash-win.exe
+build-cc-windows: PHASHER_OUTPUT :=-o dist/phasher-win.exe
+build-cc-windows: flags-release
+build-cc-windows: flags-static-windows
+build-cc-windows: build
 
-.PHONY: 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: 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: flags-pie
-cross-compile-macos-intel: build
+.PHONY: build-cc-macos-intel
+build-cc-macos-intel: export GOOS := darwin
+build-cc-macos-intel: export GOARCH := amd64
+build-cc-macos-intel: export CC := o64-clang
+build-cc-macos-intel: STASH_OUTPUT := -o dist/stash-macos-intel
+build-cc-macos-intel: PHASHER_OUTPUT := -o dist/phasher-macos-intel
+build-cc-macos-intel: flags-release
+# can't use static build for macOS
+build-cc-macos-intel: flags-pie
+build-cc-macos-intel: build
 
-.PHONY: 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: 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: flags-pie
-cross-compile-macos-applesilicon: build
+.PHONY: build-cc-macos-arm
+build-cc-macos-arm: export GOOS := darwin
+build-cc-macos-arm: export GOARCH := arm64
+build-cc-macos-arm: export CC := oa64e-clang
+build-cc-macos-arm: STASH_OUTPUT := -o dist/stash-macos-arm
+build-cc-macos-arm: PHASHER_OUTPUT := -o dist/phasher-macos-arm
+build-cc-macos-arm: flags-release
+# can't use static build for macOS
+build-cc-macos-arm: flags-pie
+build-cc-macos-arm: build
+
+.PHONY: build-cc-macos
+build-cc-macos:
+	make build-cc-macos-arm
+	make build-cc-macos-intel
+
+	# Combine into universal binaries
+	lipo -create -output dist/stash-macos dist/stash-macos-intel dist/stash-macos-arm
+	rm dist/stash-macos-intel dist/stash-macos-arm
+	lipo -create -output dist/phasher-macos dist/phasher-macos-intel dist/phasher-macos-arm
+	rm dist/phasher-macos-intel dist/phasher-macos-arm
 
-.PHONY: cross-compile-macos
-cross-compile-macos:
-	rm -rf dist/Stash.app dist/Stash-macos.zip
-	make cross-compile-macos-applesilicon
-	make cross-compile-macos-intel
-	# Combine into one universal binary
-	lipo -create -output dist/stash-macos-universal dist/stash-macos-intel dist/stash-macos-applesilicon
-	rm dist/stash-macos-intel dist/stash-macos-applesilicon
 	# Place into bundle and zip up
+	rm -rf dist/Stash.app
 	cp -R scripts/macos-bundle dist/Stash.app
 	mkdir dist/Stash.app/Contents/MacOS
-	mv dist/stash-macos-universal dist/Stash.app/Contents/MacOS/stash
-	cd dist && zip -r Stash-macos.zip Stash.app && cd ..
+	cp dist/stash-macos dist/Stash.app/Contents/MacOS/stash
+	cd dist && rm -f Stash.app.zip && zip -r Stash.app.zip Stash.app
 	rm -rf dist/Stash.app
 
-.PHONY: cross-compile-freebsd
-cross-compile-freebsd: export GOOS := freebsd
-cross-compile-freebsd: export GOARCH := amd64
-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: build-cc-freebsd
+build-cc-freebsd: export GOOS := freebsd
+build-cc-freebsd: export GOARCH := amd64
+build-cc-freebsd: export CC := clang -target x86_64-unknown-freebsd12.0 --sysroot=/opt/cross-freebsd
+build-cc-freebsd: STASH_OUTPUT := -o dist/stash-freebsd
+build-cc-freebsd: PHASHER_OUTPUT := -o dist/phasher-freebsd
+build-cc-freebsd: flags-release
+build-cc-freebsd: flags-static-pie
+build-cc-freebsd: build
 
-.PHONY: cross-compile-linux
-cross-compile-linux: export GOOS := linux
-cross-compile-linux: export GOARCH := amd64
-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: build-cc-linux
+build-cc-linux: export GOOS := linux
+build-cc-linux: export GOARCH := amd64
+build-cc-linux: STASH_OUTPUT := -o dist/stash-linux
+build-cc-linux: PHASHER_OUTPUT := -o dist/phasher-linux
+build-cc-linux: flags-release
+build-cc-linux: flags-static-pie
+build-cc-linux: build
 
-.PHONY: 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: 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: build-cc-linux-arm64v8
+build-cc-linux-arm64v8: export GOOS := linux
+build-cc-linux-arm64v8: export GOARCH := arm64
+build-cc-linux-arm64v8: export CC := aarch64-linux-gnu-gcc
+build-cc-linux-arm64v8: STASH_OUTPUT := -o dist/stash-linux-arm64v8
+build-cc-linux-arm64v8: PHASHER_OUTPUT := -o dist/phasher-linux-arm64v8
+build-cc-linux-arm64v8: flags-release
+build-cc-linux-arm64v8: flags-static-pie
+build-cc-linux-arm64v8: build
 
-.PHONY: 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-gnueabi-gcc -march=armv7-a 
-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: build-cc-linux-arm32v7
+build-cc-linux-arm32v7: export GOOS := linux
+build-cc-linux-arm32v7: export GOARCH := arm
+build-cc-linux-arm32v7: export GOARM := 7
+build-cc-linux-arm32v7: export CC := arm-linux-gnueabi-gcc -march=armv7-a
+build-cc-linux-arm32v7: STASH_OUTPUT := -o dist/stash-linux-arm32v7
+build-cc-linux-arm32v7: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v7
+build-cc-linux-arm32v7: flags-release
+build-cc-linux-arm32v7: flags-static
+build-cc-linux-arm32v7: build
 
-.PHONY: 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: 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: build-cc-linux-arm32v6
+build-cc-linux-arm32v6: export GOOS := linux
+build-cc-linux-arm32v6: export GOARCH := arm
+build-cc-linux-arm32v6: export GOARM := 6
+build-cc-linux-arm32v6: export CC := arm-linux-gnueabi-gcc
+build-cc-linux-arm32v6: STASH_OUTPUT := -o dist/stash-linux-arm32v6
+build-cc-linux-arm32v6: PHASHER_OUTPUT := -o dist/phasher-linux-arm32v6
+build-cc-linux-arm32v6: flags-release
+build-cc-linux-arm32v6: flags-static
+build-cc-linux-arm32v6: build
 
-.PHONY: cross-compile-all
-cross-compile-all:
-	make cross-compile-windows
-	make cross-compile-macos-intel
-	make cross-compile-macos-applesilicon
-	make cross-compile-linux
-	make cross-compile-linux-arm64v8
-	make cross-compile-linux-arm32v7
-	make cross-compile-linux-arm32v6
+.PHONY: build-cc-all
+build-cc-all:
+	make build-cc-windows
+	make build-cc-macos
+	make build-cc-linux
+	make build-cc-linux-arm64v8
+	make build-cc-linux-arm32v7
+	make build-cc-linux-arm32v6
+	make build-cc-freebsd
 
 .PHONY: touch-ui
 touch-ui:
@@ -282,12 +275,16 @@ generate: generate-backend generate-ui
 
 .PHONY: generate-ui
 generate-ui:
-	cd ui/v2.5 && yarn run gqlgen
+	cd ui/v2.5 && npm run gqlgen
 
 .PHONY: generate-backend
 generate-backend: touch-ui
 	go generate ./cmd/stash
 
+.PHONY: generate-login-locale
+generate-login-locale:
+	go generate ./ui
+
 .PHONY: generate-dataloaders
 generate-dataloaders:
 	go generate ./internal/api/loaders
@@ -314,7 +311,8 @@ test:
 # runs all tests - including integration tests
 .PHONY: it
 it:
-	go test -tags=integration ./...
+	$(eval GO_BUILD_TAGS += integration)
+	go test -tags "$(GO_BUILD_TAGS)" ./...
 
 # generates test mocks
 .PHONY: generate-test-mocks
@@ -340,9 +338,19 @@ server-clean:
 
 # installs UI dependencies. Run when first cloning repository, or if UI
 # dependencies have changed
+# If CI is set, configures pnpm to use a local store to avoid
+# putting .pnpm-store in /stash
+# NOTE: to run in the docker build container, using the existing
+# node_modules folder, rename the .modules.yaml to .modules.yaml.bak
+# and a new one will be generated. This will need to be reversed after
+# building.
 .PHONY: pre-ui
 pre-ui:
-	cd ui/v2.5 && yarn install --frozen-lockfile
+ifdef CI
+	cd ui/v2.5 && pnpm config set store-dir ~/.pnpm-store && pnpm install --frozen-lockfile
+else
+	cd ui/v2.5 && pnpm install --frozen-lockfile
+endif
 
 .PHONY: ui-env
 ui-env: build-info
@@ -357,29 +365,47 @@ ifdef STASH_SOURCEMAPS
 endif
 
 .PHONY: ui
-ui: ui-env
-	cd ui/v2.5 && yarn build
+ui: ui-only generate-login-locale
 
-.PHONY: ui-nolegacy
-ui-nolegacy: STASH_NOLEGACY := true
-ui-nolegacy: ui
+.PHONY: ui-only
+ui-only: ui-env
+	cd ui/v2.5 && npm run build
 
-.PHONY: ui-sourcemaps
-ui-sourcemaps: STASH_SOURCEMAPS := true
-ui-sourcemaps: ui
+.PHONY: zip-ui
+zip-ui:
+	rm -f dist/stash-ui.zip
+	cd ui/v2.5/build && zip -r ../../../dist/stash-ui.zip .
 
 .PHONY: ui-start
 ui-start: ui-env
-	cd ui/v2.5 && yarn start --host
+	cd ui/v2.5 && npm run start -- --host
 
 .PHONY: fmt-ui
 fmt-ui:
-	cd ui/v2.5 && yarn format
+	cd ui/v2.5 && npm run format
 
 # runs all of the frontend PR-acceptance steps
 .PHONY: validate-ui
 validate-ui:
-	cd ui/v2.5 && yarn run validate
+	cd ui/v2.5 && npm run validate
+
+# these targets run the same steps as fmt-ui and validate-ui, but only on files that have changed
+fmt-ui-quick:
+	cd ui/v2.5 && \
+	files=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
+	if [ -n "$$files" ]; then \
+	  npm run prettier -- --write $$files; \
+	fi
+
+# does not run tsc checks, as they are slow
+validate-ui-quick:
+	cd ui/v2.5 && \
+	tsfiles=$$(git diff --name-only --relative --diff-filter d src | grep -e "\.tsx\?\$$"); \
+	scssfiles=$$(git diff --name-only --relative --diff-filter d src | grep "\.scss"); \
+	prettyfiles=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
+	if [ -n "$$tsfiles" ]; then npm run eslint -- $$tsfiles; fi && \
+	if [ -n "$$scssfiles" ]; then npm run stylelint -- $$scssfiles; fi && \
+	if [ -n "$$prettyfiles" ]; then npm run prettier -- --check $$prettyfiles; fi
 
 # runs all of the backend PR-acceptance steps
 .PHONY: validate-backend
@@ -398,3 +424,16 @@ docker-build: build-info
 .PHONY: docker-cuda-build
 docker-cuda-build: build-info
 	docker build --build-arg GITHASH=$(GITHASH) --build-arg STASH_VERSION=$(STASH_VERSION) -t stash/cuda-build -f docker/build/x86_64/Dockerfile-CUDA .
+
+# start the build container - for cross compilation
+# this is adapted from the github actions build.yml file
+.PHONY: start-compiler-container
+start-compiler-container:
+	docker run -d --name build --mount type=bind,source="$(PWD)",target=/stash,consistency=delegated $(EXTRA_CONTAINER_ARGS) -w /stash $(COMPILER_IMAGE) tail -f /dev/null
+
+# run the cross-compilation using
+# docker exec -t build /bin/bash -c "make build-cc-<platform>"
+
+.PHONY: remove-compiler-container
+remove-compiler-container:
+	docker rm -f -v build

README.md

@@ -5,13 +5,13 @@
 [![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)
 
-### **Stash is a self-hosted webapp written in Go which organizes and serves your porn.**
-![demo image](docs/readme_assets/demo_image.png)
+### **Stash is a self-hosted webapp written in Go which organizes and serves your diverse content collection, catering to both your SFW and NSFW needs.**
+
+![Screenshot of Stash web application interface](docs/readme_assets/demo_image.png)
 
 * Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
 * Stash supports a wide variety of both video and image formats.
@@ -20,55 +20,88 @@
 
 You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
 
-For further information you can consult the [documentation](https://docs.stashapp.cc) or [read the in-app manual](ui/v2.5/src/docs/en).
+For further information you can consult the [documentation](https://docs.stashapp.cc) or access the in-app manual from within the application (also available at [docs.stashapp.cc/in-app-manual](https://docs.stashapp.cc/in-app-manual)).
 
 # Installing Stash
 
-<img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> MacOS| <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
+Step-by-step instructions are available at [docs.stashapp.cc/installation](https://docs.stashapp.cc/installation/).
+
+#### Windows Users:
+
+As of version 0.27.0, Stash no longer supports _Windows 7, 8, Server 2008 and Server 2012._  
+At least Windows 10 or Server 2016 is required.
+
+#### Mac Users:
+
+As of version 0.29.0, Stash requires _macOS 11 Big Sur_ or later.  
+Stash can still be run through docker on older versions of macOS.
+
+<img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
 :---:|:---:|:---:|:---:
-[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe)</sub></sup> | [Latest Release (Apple Silicon)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-applesilicon) <br /> <sup><sub>[Development Preview (Apple Silicon)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-applesilicon)</sub></sup> <br />[Latest Release (Intel)](https://github.com/stashapp/stash/releases/latest/download/stash-macos-intel) <br /> <sup><sub>[Development Preview (Intel)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-macos-intel)</sub></sup> | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux) <br /> <sup><sub>[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)</sub></sup> <br /> [More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md) <br /> <sup><sub> [Sample docker-compose.yml](docker/production/docker-compose.yml)</sub></sup>
+[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe)</sub></sup> | [Latest Release](https://github.com/stashapp/stash/releases/latest/download/Stash.app.zip) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/Stash.app.zip)</sub></sup> | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux) <br /> <sup><sub>[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)</sub></sup> <br /> [More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md) <br /> <sup><sub>[Sample docker-compose.yml](docker/production/docker-compose.yml)</sub></sup>
+
+Download links for other platforms and architectures are available on the [Releases](https://github.com/stashapp/stash/releases) page.
 
 ## First Run
-#### Windows Users: Security Prompt
-Running the app might present a security prompt since the binary isn't yet signed. Bypass this by clicking "more info" and then the "run anyway" button.
-#### FFMPEG
-Stash requires ffmpeg. If you don't have it installed, Stash will download a copy for you. It is recommended that Linux users install `ffmpeg` from their distro's package manager.
+
+#### Windows/macOS Users: Security Prompt
+
+On Windows or macOS, running the app might present a security prompt since the application binary isn't yet signed. 
+
+- On Windows, bypass this by clicking "more info" and then the "run anyway" button.
+- On macOS, Control+Click the app, click "Open", and then "Open" again.
+
+#### ffmpeg
+
+Stash requires FFmpeg. If you don't have it installed, Stash will prompt you to download a copy during setup. It is recommended that Linux users install `ffmpeg` from their distro's package manager.
 
 # Usage
 
 ## Quickstart Guide
-Stash is a web-based application. Once the application is running, the interface is available (by default) from http://localhost:9999.
+
+Stash is a web-based application. Once the application is running, the interface is available (by default) from `http://localhost:9999`.
 
 On first run, Stash will prompt you for some configuration options and media directories to index, called "Scanning" in Stash. After scanning, your media will be available for browsing, curating, editing, and tagging.
 
-Stash can pull metadata (performers, tags, descriptions, studios, and more) directly from many sites through the use of [scrapers](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en/Scraping.md), which integrate directly into Stash.
-
-Many community-maintained scrapers are available for download from [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers). The community also maintains StashDB, a crowd-sourced repository of scene, studio, and performer information, that can automatically identify much of a typical media collection. Inquire in the Discord for details. Identifying an entire collection will typically require a mix of multiple sources. 
+Stash can pull metadata (performers, tags, descriptions, studios, and more) directly from many sites through the use of [scrapers](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/docs/en/Manual/Scraping.md), which integrate directly into Stash. Identifying an entire collection will typically require a mix of multiple sources:
+- The stashapp team maintains [StashDB](https://stashdb.org/), a crowd-sourced repository of scene, studio, and performer information. Connecting it to Stash will allow you to automatically identify much of a typical media collection. It runs on our stash-box software and is primarily focused on mainstream digital scenes and studios. Instructions, invite codes, and more can be found in this guide to [Accessing StashDB](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stashdb/).
+- Several community-managed stash-box databases can also be connected to Stash in a similar manner. Each one serves a slightly different niche and follows their own methodology. A rundown of each stash-box, their differences, and the information you need to sign up can be found in this guide to [Accessing Stash-Boxes](https://guidelines.stashdb.org/docs/faq_getting-started/stashdb/accessing-stash-boxes/).
+- Many community-maintained scrapers can also be downloaded, installed, and updated from within Stash, allowing you to pull data from a wide range of other websites and databases. They can be found by navigating to `Settings → Metadata Providers → Available Scrapers → Community (stable)`. These can be trickier to use than a stash-box because every scraper works a little differently. For more information, please visit the [CommunityScrapers repository](https://github.com/stashapp/CommunityScrapers).
+- All of the above methods of scraping data into Stash are also covered in more detail in our [Guide to Scraping](https://docs.stashapp.cc/beginner-guides/guide-to-scraping/).
 
 <sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
 
 # Translation
-[![Translate](https://hosted.weblate.org/widget/stashapp/stash/svg-badge.svg)](https://hosted.weblate.org/engage/stashapp/)
-🇧🇷 🇨🇳 🇩🇰 🇳🇱 🇬🇧 🇪🇪 🇫🇮 🇫🇷 🇩🇪 🇮🇹 🇯🇵 🇰🇷 🇵🇱 🇷🇺 🇪🇸 🇸🇪 🇹🇼 🇹🇷
 
-Stash is available in 25 languages (so far!) and it could be in your language too. We use Weblate to coordinate community translations. If you want to help us translate Stash into your language, you can make an account at [Stash's Weblate](https://hosted.weblate.org/projects/stashapp/stash/) to get started contributing new languages or improving existing ones. Thanks!
+[![Translate](https://translate.codeberg.org/widget/stash/stash/svg-badge.svg)](https://translate.codeberg.org/engage/stash/)
 
-# Support (FAQ)
+Stash is available in 32 languages (so far!) and it could be in your language too. We use Weblate to coordinate community translations. If you want to help us translate Stash, you can make an account at [Codeberg's Weblate](https://translate.codeberg.org/projects/stash/stash/) to contribute to new or existing languages. Thanks!
 
-Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software, questions, guides, add-ons and more. 
+The badge below shows the current translation status of Stash across all supported languages:
 
-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)
+[![Translation status](https://translate.codeberg.org/widget/stash/stash/multi-auto.svg)](https://translate.codeberg.org/engage/stash/)
 
-# Customization
+# Support & Resources
 
-## Themes and CSS Customization
-There is a [directory of community-created themes](https://docs.stashapp.cc/user-interface-ui/themes) on Stash-Docs, along with instructions on how to install them.
+Need help or want to get involved? Start with the documentation, then reach out to the community if you need further assistance.
 
-You can also change the Stash interface to fit your desired style with various snippets from [Custom CSS snippets](https://docs.stashapp.cc/user-interface-ui/custom-css-snippets).
+- Documentation
+  - Official docs: https://docs.stashapp.cc - official guides guides and troubleshooting.
+  - In-app manual: press <kbd>Shift</kbd> + <kbd>?</kbd> in the app or view the manual online: https://docs.stashapp.cc/in-app-manual.
+  - FAQ: https://discourse.stashapp.cc/c/support/faq/28 - common questions and answers.
+  - Community wiki: https://discourse.stashapp.cc/tags/c/community-wiki/22/stash - guides, how-to’s and tips.
+  
+- Community & discussion
+  - Community forum: https://discourse.stashapp.cc - community support, feature requests and discussions.
+  - Discord: https://discord.gg/2TsNFKt - real-time chat and community support.
+  - GitHub discussions: https://github.com/stashapp/stash/discussions - community support and feature discussions.
+  - Lemmy community: https://discuss.online/c/stashapp - Reddit-style community space.
+
+- Community scrapers & plugins
+  - Metadata sources: https://docs.stashapp.cc/metadata-sources/
+  - Plugins: https://docs.stashapp.cc/plugins/
+  - Themes: https://docs.stashapp.cc/themes/
+  - Other projects: https://docs.stashapp.cc/other-projects/
 
 # For Developers
 

cmd/phasher/main.go

@@ -2,23 +2,42 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"os"
+	"os/exec"
+	"path/filepath"
 
 	flag "github.com/spf13/pflag"
 	"github.com/stashapp/stash/pkg/ffmpeg"
+	"github.com/stashapp/stash/pkg/hash/imagephash"
 	"github.com/stashapp/stash/pkg/hash/videophash"
 	"github.com/stashapp/stash/pkg/models"
 )
 
 func customUsage() {
 	fmt.Fprintf(os.Stderr, "Usage:\n")
-	fmt.Fprintf(os.Stderr, "%s [OPTIONS] VIDEOFILE...\n\nOptions:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "%s [OPTIONS] FILE...\n\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 }
 
-func printPhash(ff *ffmpeg.FFMpeg, ffp ffmpeg.FFProbe, inputfile string, quiet *bool) error {
+func printPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet *bool) error {
+	// Determine if this is a video or image file based on extension
+	ext := filepath.Ext(inputfile)
+	ext = ext[1:] // remove the leading dot
+
+	// Common image extensions
+	imageExts := map[string]bool{
+		"jpg": true, "jpeg": true, "png": true, "gif": true, "webp": true, "bmp": true, "avif": true,
+	}
+
+	if imageExts[ext] {
+		return printImagePhash(ff, inputfile, quiet)
+	}
+
+	return printVideoPhash(ff, ffp, inputfile, quiet)
+}
+
+func printVideoPhash(ff *ffmpeg.FFMpeg, ffp *ffmpeg.FFProbe, inputfile string, quiet *bool) error {
 	ffvideoFile, err := ffp.NewVideoFile(inputfile)
 	if err != nil {
 		return err
@@ -46,6 +65,31 @@ func printPhash(ff *ffmpeg.FFMpeg, ffp ffmpeg.FFProbe, inputfile string, quiet *
 	return nil
 }
 
+func printImagePhash(ff *ffmpeg.FFMpeg, inputfile string, quiet *bool) error {
+	imgFile := &models.ImageFile{
+		BaseFile: &models.BaseFile{Path: inputfile},
+	}
+
+	phash, err := imagephash.Generate(ff, imgFile)
+	if err != nil {
+		return err
+	}
+
+	if *quiet {
+		fmt.Printf("%x\n", *phash)
+	} else {
+		fmt.Printf("%x %v\n", *phash, imgFile.Path)
+	}
+	return nil
+}
+
+func getPaths() (string, string) {
+	ffmpegPath, _ := exec.LookPath("ffmpeg")
+	ffprobePath, _ := exec.LookPath("ffprobe")
+
+	return ffmpegPath, ffprobePath
+}
+
 func main() {
 	flag.Usage = customUsage
 	quiet := flag.BoolP("quiet", "q", false, "print only the phash")
@@ -60,24 +104,25 @@ func main() {
 	args := flag.Args()
 
 	if len(args) < 1 {
-		fmt.Fprintf(os.Stderr, "Missing VIDEOFILE argument.\n")
+		fmt.Fprintf(os.Stderr, "Missing FILE 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.Fprintln(os.Stderr, "Files will be processed sequentially! If required, use e.g. GNU Parallel to run concurrently.")
 		fmt.Fprintf(os.Stderr, "Example: parallel %v ::: *.mp4\n", os.Args[0])
 	}
 
-	ffmpegPath, ffprobePath := ffmpeg.GetPaths(nil)
+	ffmpegPath, ffprobePath := getPaths()
 	encoder := ffmpeg.NewEncoder(ffmpegPath)
-	encoder.InitHWSupport(context.TODO())
-	ffprobe := ffmpeg.FFProbe(ffprobePath)
+	// don't need to InitHWSupport, phashing doesn't use hw acceleration
+	ffprobe := ffmpeg.NewFFProbe(ffprobePath)
 
 	for _, item := range args {
 		if err := printPhash(encoder, ffprobe, item, quiet); err != nil {
 			fmt.Fprintln(os.Stderr, err)
 		}
 	}
+
 }

cmd/stash/main.go

@@ -2,67 +2,173 @@
 package main
 
 import (
+	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"os/signal"
+	"runtime/debug"
+	"runtime/pprof"
 	"syscall"
 
+	"github.com/spf13/pflag"
+
 	"github.com/stashapp/stash/internal/api"
+	"github.com/stashapp/stash/internal/build"
 	"github.com/stashapp/stash/internal/desktop"
+	"github.com/stashapp/stash/internal/log"
 	"github.com/stashapp/stash/internal/manager"
+	"github.com/stashapp/stash/internal/manager/config"
+	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/ui"
 
 	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
 )
 
+var exitCode = 0
+
 func main() {
-	defer recoverPanic()
-
-	_, err := manager.Initialize()
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		defer recoverPanic()
-		if err := api.Start(); err != nil {
-			handleError(err)
-		} else {
-			manager.GetInstance().Shutdown(0)
+	defer func() {
+		if exitCode != 0 {
+			os.Exit(exitCode)
 		}
 	}()
 
-	go handleSignals()
-	desktop.Start(manager.GetInstance(), &ui.FaviconProvider)
+	defer recoverPanic()
 
-	blockForever()
+	initLogTemp()
+
+	helpFlag := false
+	pflag.BoolVarP(&helpFlag, "help", "h", false, "show this help text and exit")
+
+	versionFlag := false
+	pflag.BoolVarP(&versionFlag, "version", "v", false, "show version number and exit")
+
+	cpuProfilePath := ""
+	pflag.StringVar(&cpuProfilePath, "cpuprofile", "", "write cpu profile to file")
+
+	pflag.Parse()
+
+	if helpFlag {
+		pflag.Usage()
+		return
+	}
+
+	if versionFlag {
+		fmt.Println(build.VersionString())
+		return
+	}
+
+	cfg, err := config.Initialize()
+	if err != nil {
+		exitError(fmt.Errorf("config initialization error: %w", err))
+		return
+	}
+
+	l := initLog(cfg)
+
+	if cpuProfilePath != "" {
+		if err := initProfiling(cpuProfilePath); err != nil {
+			exitError(err)
+			return
+		}
+		defer pprof.StopCPUProfile()
+	}
+
+	// initialise desktop.IsDesktop here so that it doesn't get affected by
+	// ffmpeg hardware checks later on
+	desktop.InitIsDesktop()
+
+	mgr, err := manager.Initialize(cfg, l)
+	if err != nil {
+		exitError(fmt.Errorf("manager initialization error: %w", err))
+		return
+	}
+	defer mgr.Shutdown()
+
+	server, err := api.Initialize()
+	if err != nil {
+		exitError(fmt.Errorf("api initialization error: %w", err))
+		return
+	}
+	defer server.Shutdown()
+
+	exit := make(chan int)
+
+	go func() {
+		err := server.Start()
+		if !errors.Is(err, http.ErrServerClosed) {
+			exitError(fmt.Errorf("http server error: %w", err))
+			exit <- 1
+		}
+	}()
+
+	go handleSignals(exit)
+	desktop.Start(exit, &ui.FaviconProvider)
+
+	exitCode = <-exit
+}
+
+// initLogTemp initializes a temporary logger for use before the config is loaded.
+// Logs only error level message to stderr.
+func initLogTemp() *log.Logger {
+	l := log.NewLogger()
+	l.Init("", true, "Error", 0)
+	logger.Logger = l
+
+	return l
+}
+
+func initLog(cfg *config.Config) *log.Logger {
+	l := log.NewLogger()
+	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel(), cfg.GetLogFileMaxSize())
+	logger.Logger = l
+
+	return l
+}
+
+func initProfiling(path string) error {
+	f, err := os.Create(path)
+	if err != nil {
+		return fmt.Errorf("unable to create CPU profile file: %v", err)
+	}
+
+	if err = pprof.StartCPUProfile(f); err != nil {
+		return fmt.Errorf("could not start CPU profiling: %v", err)
+	}
+
+	logger.Infof("profiling to %s", path)
+
+	return nil
 }
 
 func recoverPanic() {
-	if p := recover(); p != nil {
-		handleError(fmt.Errorf("Panic: %v", p))
+	if err := recover(); err != nil {
+		exitCode = 1
+		logger.Errorf("panic: %v\n%s", err, debug.Stack())
+		if desktop.IsDesktop() {
+			desktop.FatalError(fmt.Errorf("Panic: %v", err))
+		}
 	}
 }
 
-func handleError(err error) {
+func exitError(err error) {
+	exitCode = 1
+	logger.Error(err)
+	// #5784 - log to stdout as well as the logger
+	// this does mean that it will log twice if the logger is set to stdout
+	fmt.Println(err)
 	if desktop.IsDesktop() {
 		desktop.FatalError(err)
-		manager.GetInstance().Shutdown(0)
-	} else {
-		panic(err)
 	}
 }
 
-func handleSignals() {
+func handleSignals(exit chan<- int) {
 	// handle signals
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
 
 	<-signals
-	manager.GetInstance().Shutdown(0)
-}
-
-func blockForever() {
-	select {}
+	exit <- 0
 }

docker/build/x86_64/Dockerfile

@@ -1,34 +1,39 @@
 # This dockerfile should be built with `make docker-build` from the stash root.
 
 # Build Frontend
-FROM node:alpine as frontend
+FROM node:24-alpine AS frontend
 RUN apk add --no-cache make git
 ## cache node_modules separately
-COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+COPY ./ui/v2.5/package.json ./ui/v2.5/pnpm-lock.yaml /stash/ui/v2.5/
 WORKDIR /stash
 COPY Makefile /stash/
 COPY ./graphql /stash/graphql/
 COPY ./ui /stash/ui/
+# pnpm install with npm
+RUN npm install -g pnpm
 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
+RUN BUILD_DATE=$(date +"%Y-%m-%d %H:%M:%S") make ui-only
 
 # Build Backend
-FROM golang:1.19-alpine as backend
+FROM golang:1.24.3-alpine AS backend
 RUN apk add --no-cache make alpine-sdk
 WORKDIR /stash
 COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
+COPY ./graphql /stash/graphql/
 COPY ./scripts /stash/scripts/
 COPY ./pkg /stash/pkg/
-COPY ./cmd /stash/cmd
-COPY ./internal /stash/internal
+COPY ./cmd /stash/cmd/
+COPY ./internal /stash/internal/
+# needed for generate-login-locale
+COPY ./ui /stash/ui/
+RUN make generate-backend generate-login-locale
 COPY --from=frontend /stash /stash/
-RUN make generate-backend
 ARG GITHASH
 ARG STASH_VERSION
-RUN make stash-release
+RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM alpine:latest

docker/build/x86_64/Dockerfile-CUDA

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

docker/build/x86_64/README.md

@@ -4,7 +4,7 @@ This dockerfile is used to build a stash docker container using the current sour
 
 # Building the docker container
 
-From the top-level directory (should contain `main.go` file):
+From the top-level directory (should contain `tools.go` file):
 
 ```
 make docker-build

docker/ci/x86_64/Dockerfile

@@ -11,12 +11,18 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
 
 FROM --platform=$TARGETPLATFORM alpine:latest AS app
 COPY --from=binary /stash /usr/bin/
-RUN apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev \
-    && apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg vips-tools ruby tzdata \
-    && pip install mechanicalsoup cloudscraper bencoder.pyx \
-    && gem install faraday \
-    && apk del .build-deps
+
+RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools \
+    && pip install --break-system-packages mechanicalsoup cloudscraper stashapp-tools
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
+# Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL org.opencontainers.image.title="Stash" \
+    org.opencontainers.image.description="An organizer for your porn, written in Go." \
+    org.opencontainers.image.url="https://stashapp.cc" \
+    org.opencontainers.image.documentation="https://docs.stashapp.cc" \
+    org.opencontainers.image.source="https://github.com/stashapp/stash" \
+    org.opencontainers.image.licenses="AGPL-3.0"
+
 EXPOSE 9999
 CMD ["stash"]

docker/ci/x86_64/README.md

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

docker/compiler/Dockerfile

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

docker/compiler/Makefile

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

docker/compiler/README.md

@@ -1,3 +1,3 @@
 Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
 
-When the dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to docker hub. The `scripts/cross-compile.sh` script should also be updated to use the new version number tag, and the github workflow files need to be updated to pull the correct image tag.
+When the Dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to Docker Hub. The GitHub workflow files also need to be updated to pull the correct image tag.

docker/production/README.md

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

docker/production/docker-compose.yml

@@ -1,6 +1,5 @@
 # APPNICENAME=Stash
 # APPDESCRIPTION=An organizer for your porn, written in Go
-version: '3.4'
 services:
   stash:
     image: stashapp/stash:latest
@@ -27,10 +26,12 @@ services:
       - /etc/localtime:/etc/localtime:ro
       ## Adjust below paths (the left part) to your liking.
       ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
-      
+      ## The left part is the path on your host, the right part is the path in the stash container.
+
       ## Keep configs, scrapers, and plugins here.
       - ./config:/root/.stash
       ## Point this at your collection.
+      ## The left side is where your collection is on your host, the right side is where it will be in stash.
       - ./data:/data
       ## This is where your stash's metadata lives
       - ./metadata:/metadata

docs/CONTRIBUTING.md

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

docs/DEVELOPMENT.md

@@ -4,8 +4,9 @@
 
 * [Go](https://golang.org/dl/)
 * [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
-  * To install, follow the [local installation instructions](https://golangci-lint.run/usage/install/#local-installation)
-* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
+  * To install, follow the [local installation instructions](https://golangci-lint.run/welcome/install/#local-installation)
+* [nodejs](https://nodejs.org/en/download) - nodejs runtime
+  * corepack/[pnpm](https://pnpm.io/installation) - nodejs package manager (included with nodejs)
 
 ## Environment
 
@@ -22,19 +23,24 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 ### macOS
 
 1. If you don't have it already, install the [Homebrew package manager](https://brew.sh).
-2. Install dependencies: `brew install go git yarn gcc make node ffmpeg`
+2. Install dependencies: `brew install go git gcc make node ffmpeg`
 
 ### Linux
 
 #### Arch Linux
 
-1. Install dependencies: `sudo pacman -S go git yarn gcc make nodejs ffmpeg --needed`
+1. Install dependencies: `sudo pacman -S go git 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`
+
+### OpenBSD
+
+1. Install dependencies `doas pkg_add gmake go git node cmake ffmpeg`
+2. Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
+
+NOTE: The `make` command in OpenBSD will be `gmake`. For example, `make pre-ui` will be `gmake pre-ui`.
 
 ## Commands
 
@@ -43,11 +49,10 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 * `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 stash-macapp` - Builds the `Stash.app` macOS app (only works when on macOS, for cross-compilation see below)
 * `make phasher` - Builds the `phasher` binary
-* `make 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 build` - Builds both the `stash` and `phasher` binaries, alias for `make stash phasher`
+* `make build-release` - Builds release versions (debug information removed) of both the `stash` and `phasher` binaries, alias for `make flags-release flags-pie build`
 * `make docker-build` - Locally builds and tags a complete 'stash/build' docker image
 * `make docker-cuda-build` - Locally builds and tags a complete 'stash/cuda-build' docker image
 * `make validate` - Runs all of the tests and checks required to submit a PR
@@ -55,9 +60,20 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 * `make it` - Runs all unit and integration tests
 * `make fmt` - Formats the Go source code
 * `make fmt-ui` - Formats the UI source code
+* `make validate-ui` - Runs tests and checks for the UI only
+* `make fmt-ui-quick` - (experimental) Formats only changed UI source code
+* `make validate-ui-quick` - (experimental) Runs tests and checks of changed UI code
 * `make server-start` - Runs a development stash server in the `.local` directory
 * `make server-clean` - Removes the `.local` directory and all of its contents
-* `make ui-start` - Runs the UI in development mode. Requires a running Stash server to connect to. The server 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.
+* `make ui-start` - Runs the UI in development mode. Requires a running Stash server to connect to - the server URL can be changed from the default of `http://localhost:9999` using the environment variable `VITE_APP_PLATFORM_URL`, but keep in mind that authentication cannot be used since the session authorization cookie cannot be sent cross-origin. The UI runs on port `3000` or the next available port.
+
+When building, you can optionally prepend `flags-*` targets to the target list in your `make` command to use different build flags:
+
+* `flags-release` (e.g. `make flags-release stash`) - Remove debug information from the binary.
+* `flags-pie` (e.g. `make flags-pie build`) - Build a PIE (Position Independent Executable) binary. This provides increased security, but it is unsupported on some systems (notably 32-bit ARM and OpenBSD).
+* `flags-static` (e.g. `make flags-static phasher`) - Build a statically linked binary (the default is a dynamically linked binary).
+* `flags-static-pie` (e.g. `make flags-static-pie stash`) - Build a statically linked PIE binary (using `flags-static` and `flags-pie` separately will not work).
+* `flags-static-windows` (e.g. `make flags-static-windows build`) - Identical to `flags-static-pie`, but does not enable the `netgo` build tag, which is not needed for static builds on Windows.
 
 ## Local development quickstart
 
@@ -95,13 +111,19 @@ Simply run `make` or `make release`, or equivalently:
 3. Run `make ui` to build the frontend
 4. Run `make build-release` to build a release executable for your current platform
 
-## Cross compiling
+## Cross-compiling
 
-This project uses a modification of the [CI-GoReleaser](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) docker container to create an environment
-where the app can be cross-compiled.  This process is kicked off by CI via the `scripts/cross-compile.sh` script.  Run the following
-command to open a bash shell to the container to poke around:
+This project uses a modification of the [CI-GoReleaser](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) Docker container for cross-compilation, defined in `docker/compiler/Dockerfile`.
 
-`docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -i -t stashapp/compiler:latest /bin/bash`
+To cross-compile the app yourself:
+
+1. Run `make pre-ui`, `make generate` and `make ui` outside the container, to generate files and build the UI.
+2. Pull the latest compiler image from Docker Hub: `docker pull stashapp/compiler`
+3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it stashapp/compiler /bin/bash` to open a shell inside the container.
+4. From inside the container, run `make build-cc-all` to build for all platforms, or run `make build-cc-{platform}` to build for a specific platform (have a look at the `Makefile` for the list of targets).
+5. You will find the compiled binaries in `dist/`.
+
+NOTE: Since the container is run as UID 0 (root), the resulting binaries (and the `dist/` folder itself, if it had to be created) will be owned by root.
 
 ## Profiling
 

go.mod

@@ -1,115 +1,128 @@
 module github.com/stashapp/stash
 
+go 1.24.3
+
 require (
-	github.com/99designs/gqlgen v0.17.2
-	github.com/Yamashou/gqlgenc v0.0.6
+	github.com/99designs/gqlgen v0.17.73
+	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
+	github.com/Yamashou/gqlgenc v0.32.1
 	github.com/anacrolix/dms v1.2.2
-	github.com/antchfx/htmlquery v1.3.0
-	github.com/chromedp/cdproto v0.0.0-20210622022015-fe1827b46b84
-	github.com/chromedp/chromedp v0.7.3
-	github.com/corona10/goimagehash v1.0.3
-	github.com/disintegration/imaging v1.6.0
-	github.com/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/antchfx/htmlquery v1.3.5
+	github.com/asticode/go-astisub v0.25.1
+	github.com/chromedp/cdproto v0.0.0-20250803210736-d308e07a266d
+	github.com/chromedp/chromedp v0.14.2
+	github.com/corona10/goimagehash v1.1.0
+	github.com/disintegration/imaging v1.6.2
+	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
+	github.com/doug-martin/goqu/v9 v9.18.0
+	github.com/go-chi/chi/v5 v5.2.2
+	github.com/go-chi/cors v1.2.1
+	github.com/go-chi/httplog v0.3.1
+	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
+	github.com/golang-jwt/jwt/v4 v4.5.2
+	github.com/golang-migrate/migrate/v4 v4.16.2
+	github.com/google/uuid v1.6.0
 	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v1.2.0
+	github.com/gorilla/sessions v1.2.1
 	github.com/gorilla/websocket v1.5.0
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/jmoiron/sqlx v1.3.1
+	github.com/hashicorp/golang-lru/v2 v2.0.7
+	github.com/hasura/go-graphql-client v0.13.1
+	github.com/jinzhu/copier v0.4.0
+	github.com/jmoiron/sqlx v1.4.0
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.7
+	github.com/kermieisinthehouse/gosx-notifier v0.1.2
+	github.com/kermieisinthehouse/systray v1.2.4
+	github.com/knadh/koanf/parsers/yaml v1.1.0
+	github.com/knadh/koanf/providers/env v1.1.0
+	github.com/knadh/koanf/providers/file v1.2.0
+	github.com/knadh/koanf/providers/posflag v1.0.1
+	github.com/knadh/koanf/v2 v2.2.1
+	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/mattn/go-sqlite3 v1.14.22
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/remeh/sizedwaitgroup v1.0.0
-	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
-	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.8.2 // indirect
-	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.10.1
-	github.com/stretchr/testify v1.7.1
-	github.com/tidwall/gjson v1.9.3
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cast v1.6.0
+	github.com/spf13/pflag v1.0.6
+	github.com/stretchr/testify v1.10.0
+	github.com/tidwall/gjson v1.16.0
+	github.com/vearutop/statigz v1.4.0
+	github.com/vektah/dataloaden v0.3.0
+	github.com/vektah/gqlparser/v2 v2.5.27
 	github.com/vektra/mockery/v2 v2.10.0
-	golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
-	golang.org/x/image v0.5.0
-	golang.org/x/net v0.7.0
-	golang.org/x/sys v0.5.0
-	golang.org/x/term v0.5.0
-	golang.org/x/text v0.7.0
-	golang.org/x/tools v0.1.12 // indirect
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
+	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
+	github.com/zencoder/go-dash/v3 v3.0.2
+	golang.org/x/crypto v0.45.0
+	golang.org/x/image v0.18.0
+	golang.org/x/net v0.47.0
+	golang.org/x/sys v0.38.0
+	golang.org/x/term v0.37.0
+	golang.org/x/text v0.31.0
+	golang.org/x/time v0.10.0
+	gopkg.in/guregu/null.v4 v4.0.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 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
-	github.com/kermieisinthehouse/gosx-notifier v0.1.1
-	github.com/kermieisinthehouse/systray v1.2.4
-	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/spf13/cast v1.4.1
-	github.com/vearutop/statigz v1.1.6
-	github.com/vektah/dataloaden v0.3.0
-	github.com/vektah/gqlparser/v2 v2.4.2
-	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
-	github.com/zencoder/go-dash/v3 v3.0.2
-	gopkg.in/guregu/null.v4 v4.0.0
-)
-
-require (
-	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/antchfx/xpath v1.2.3 // indirect
+	github.com/agnivade/levenshtein v1.2.1 // indirect
+	github.com/antchfx/xpath v1.3.5 // indirect
 	github.com/asticode/go-astikit v0.20.0 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/chromedp/sysutil v1.1.0 // indirect
+	github.com/coder/websocket v1.8.12 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-chi/chi/v5 v5.0.0 // indirect
+	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.1.0-rc.5 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/moq v0.2.3 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/knadh/koanf/maps v0.1.2 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rs/zerolog v1.26.1 // indirect
+	github.com/rs/zerolog v1.30.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/cobra v1.4.0 // indirect
+	github.com/sosodev/duration v1.3.1 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/spf13/viper v1.16.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/urfave/cli/v2 v2.8.1 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	gopkg.in/ini.v1 v1.66.4 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/urfave/cli/v2 v2.27.6 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.3 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
-
-go 1.19

gqlgen.yml

@@ -7,19 +7,17 @@ exec:
   filename: internal/api/generated_exec.go
 model:
   filename: internal/api/generated_models.go
-resolver:
-  filename: internal/api/resolver.go
-  type: Resolver
 
 struct_tag: gqlgen
 
 autobind:
+  - github.com/stashapp/stash/internal/api
   - github.com/stashapp/stash/pkg/models
   - github.com/stashapp/stash/pkg/plugin
   - github.com/stashapp/stash/pkg/scraper
   - github.com/stashapp/stash/internal/identify
   - github.com/stashapp/stash/internal/dlna
-  - github.com/stashapp/stash/pkg/scraper/stashbox
+  - github.com/stashapp/stash/pkg/stashbox
 
 models:
   # Scalars
@@ -33,36 +31,24 @@ models:
     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
-    fields:
-      title:
-        resolver: true
-  # override models, from internal/api/models.go
-  BaseFile:
-    model: github.com/stashapp/stash/internal/api.BaseFile
-  GalleryFile:
-    model: github.com/stashapp/stash/internal/api.GalleryFile
-    fields:
-      # override fingerprint field
-      fingerprints:
-        fieldName: FingerprintSlice
+  BoolMap:
+    model: github.com/stashapp/stash/internal/api.BoolMap
+  PluginConfigMap:
+    model: github.com/stashapp/stash/internal/api.PluginConfigMap
+  File:
+    model: github.com/stashapp/stash/internal/api.File
   VideoFile:
     fields:
-      # override fingerprint field
-      fingerprints:
-        fieldName: FingerprintSlice
       # override float fields - #1572
       duration:
         fieldName: DurationFinite
       frame_rate:
         fieldName: FrameRateFinite
-  ImageFile:
-    fields:
-      # override fingerprint field
-      fingerprints:
-        fieldName: FingerprintSlice
+  # movie is group under the hood
+  Movie:
+    model: github.com/stashapp/stash/pkg/models.Group
+  MovieFilterType:
+    model: github.com/stashapp/stash/pkg/models.GroupFilterType
   # autobind on config causes generation issues
   BlobsStorageType:
     model: github.com/stashapp/stash/internal/manager/config.BlobsStorageType
@@ -82,6 +68,8 @@ models:
     model: github.com/stashapp/stash/internal/manager/config.ConfigDisableDropdownCreate
   ScanMetadataOptions:
     model:  github.com/stashapp/stash/internal/manager/config.ScanMetadataOptions
+  CleanGeneratedInput:
+    model: github.com/stashapp/stash/internal/manager/task.CleanGeneratedOptions
   AutoTagMetadataOptions:
     model: github.com/stashapp/stash/internal/manager/config.AutoTagMetadataOptions
   SystemStatus:
@@ -137,9 +125,6 @@ models:
     model: github.com/stashapp/stash/internal/identify.FieldStrategy
   ScraperSource:
     model: github.com/stashapp/stash/pkg/scraper.Source
-  # rebind inputs to types
-  StashIDInput:
-    model: github.com/stashapp/stash/pkg/models.StashID
   IdentifySourceInput:
     model: github.com/stashapp/stash/internal/identify.Source
   IdentifyFieldOptionsInput:
@@ -150,4 +135,13 @@ models:
     model: github.com/stashapp/stash/pkg/scraper.Source
   SavedFindFilterType:
     model: github.com/stashapp/stash/pkg/models.FindFilterType
+  # force resolvers
+  ConfigResult:
+    fields:
+      plugins:
+        resolver: true
+  Performer:
+    fields:
+      career_length:
+        resolver: true
   

graphql/documents/data/movie-slim.graphql

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

graphql/documents/data/movie.graphql

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

graphql/documents/data/tag.graphql

@@ -1,26 +0,0 @@
-fragment TagData on Tag {
-  id
-  name
-  description
-  aliases
-  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
-  }
-
-  children {
-    ...SlimTagData
-  }
-}

graphql/documents/mutations/file.graphql

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

graphql/documents/mutations/movie.graphql

@@ -1,25 +0,0 @@
-mutation MovieCreate($input: MovieCreateInput!) {
-  movieCreate(input: $input) {
-    ...MovieData
-  }
-}
-
-mutation MovieUpdate($input: MovieUpdateInput!) {
-  movieUpdate(input: $input) {
-    ...MovieData
-  }
-}
-
-mutation BulkMovieUpdate($input: BulkMovieUpdateInput!) {
-  bulkMovieUpdate(input: $input) {
-    ...MovieData
-  }
-}
-
-mutation MovieDestroy($id: ID!) {
-  movieDestroy(input: { id: $id })
-}
-
-mutation MoviesDestroy($ids: [ID!]!) {
-  moviesDestroy(ids: $ids)
-}

graphql/documents/mutations/plugins.graphql

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

graphql/documents/mutations/scrapers.graphql

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

graphql/documents/queries/gallery.graphql

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

graphql/documents/queries/movie.graphql

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

graphql/documents/queries/plugins.graphql

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

graphql/documents/queries/scrapers/freeones.graphql

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

graphql/documents/queries/tag.graphql

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

graphql/schema/schema.graphql

@@ -4,6 +4,27 @@ type Query {
   findSavedFilter(id: ID!): SavedFilter
   findSavedFilters(mode: FilterMode): [SavedFilter!]!
   findDefaultFilter(mode: FilterMode!): SavedFilter
+    @deprecated(reason: "default filter now stored in UI config")
+
+  "Find a file by its id or path"
+  findFile(id: ID, path: String): BaseFile!
+
+  "Queries for Files"
+  findFiles(
+    file_filter: FileFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindFilesResultType!
+
+  "Find a file by its id or path"
+  findFolder(id: ID, path: String): Folder!
+
+  "Queries for Files"
+  findFolders(
+    folder_filter: FolderFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindFoldersResultType!
 
   "Find a scene by ID or Checksum"
   findScene(id: ID, checksum: String): Scene
@@ -12,7 +33,8 @@ type Query {
   "A function which queries Scene objects"
   findScenes(
     scene_filter: SceneFilterType
-    scene_ids: [Int!]
+    scene_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
     filter: FindFilterType
   ): FindScenesResultType!
 
@@ -43,6 +65,7 @@ type Query {
   findSceneMarkers(
     scene_marker_filter: SceneMarkerFilterType
     filter: FindFilterType
+    ids: [ID!]
   ): FindSceneMarkersResultType!
 
   findImage(id: ID, checksum: String): Image
@@ -50,7 +73,8 @@ type Query {
   "A function which queries Scene objects"
   findImages(
     image_filter: ImageFilterType
-    image_ids: [Int!]
+    image_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
     filter: FindFilterType
   ): FindImagesResultType!
 
@@ -60,7 +84,8 @@ type Query {
   findPerformers(
     performer_filter: PerformerFilterType
     filter: FindFilterType
-    performer_ids: [Int!]
+    performer_ids: [Int!] @deprecated(reason: "use ids")
+    ids: [ID!]
   ): FindPerformersResultType!
 
   "Find a studio by ID"
@@ -69,26 +94,39 @@ type Query {
   findStudios(
     studio_filter: StudioFilterType
     filter: FindFilterType
+    ids: [ID!]
   ): FindStudiosResultType!
 
   "Find a movie by ID"
-  findMovie(id: ID!): Movie
+  findMovie(id: ID!): Movie @deprecated(reason: "Use findGroup instead")
   "A function which queries Movie objects"
   findMovies(
     movie_filter: MovieFilterType
     filter: FindFilterType
-  ): FindMoviesResultType!
+    ids: [ID!]
+  ): FindMoviesResultType! @deprecated(reason: "Use findGroups instead")
+
+  "Find a group by ID"
+  findGroup(id: ID!): Group
+  "A function which queries Group objects"
+  findGroups(
+    group_filter: GroupFilterType
+    filter: FindFilterType
+    ids: [ID!]
+  ): FindGroupsResultType!
 
   findGallery(id: ID!): Gallery
   findGalleries(
     gallery_filter: GalleryFilterType
     filter: FindFilterType
+    ids: [ID!]
   ): FindGalleriesResultType!
 
   findTag(id: ID!): Tag
   findTags(
     tag_filter: TagFilterType
     filter: FindFilterType
+    ids: [ID!]
   ): FindTagsResultType!
 
   "Retrieve random scene markers for the wall"
@@ -109,14 +147,6 @@ type Query {
 
   "List available scrapers"
   listScrapers(types: [ScrapeContentType!]!): [Scraper!]!
-  listPerformerScrapers: [Scraper!]!
-    @deprecated(reason: "Use listScrapers(types: [PERFORMER])")
-  listSceneScrapers: [Scraper!]!
-    @deprecated(reason: "Use listScrapers(types: [SCENE])")
-  listGalleryScrapers: [Scraper!]!
-    @deprecated(reason: "Use listScrapers(types: [GALLERY])")
-  listMovieScrapers: [Scraper!]!
-    @deprecated(reason: "Use listScrapers(types: [MOVIE])")
 
   "Scrape for a single scene"
   scrapeSingleScene(
@@ -135,6 +165,12 @@ type Query {
     input: ScrapeSingleStudioInput!
   ): [ScrapedStudio!]!
 
+  "Scrape for a single tag"
+  scrapeSingleTag(
+    source: ScraperSourceInput!
+    input: ScrapeSingleTagInput!
+  ): [ScrapedTag!]!
+
   "Scrape for a single performer"
   scrapeSinglePerformer(
     source: ScraperSourceInput!
@@ -156,7 +192,19 @@ type Query {
   scrapeSingleMovie(
     source: ScraperSourceInput!
     input: ScrapeSingleMovieInput!
-  ): [ScrapedMovie!]!
+  ): [ScrapedMovie!]! @deprecated(reason: "Use scrapeSingleGroup instead")
+
+  "Scrape for a single group"
+  scrapeSingleGroup(
+    source: ScraperSourceInput!
+    input: ScrapeSingleGroupInput!
+  ): [ScrapedGroup!]!
+
+  "Scrape for a single image"
+  scrapeSingleImage(
+    source: ScraperSourceInput!
+    input: ScrapeSingleImageInput!
+  ): [ScrapedImage!]!
 
   "Scrapes content based on a URL"
   scrapeURL(url: String!, ty: ScrapeContentType!): ScrapedContent
@@ -167,29 +215,13 @@ type Query {
   scrapeSceneURL(url: String!): ScrapedScene
   "Scrapes a complete gallery record based on a URL"
   scrapeGalleryURL(url: String!): ScrapedGallery
+  "Scrapes a complete image record based on a URL"
+  scrapeImageURL(url: String!): ScrapedImage
   "Scrapes a complete movie record based on a URL"
   scrapeMovieURL(url: String!): ScrapedMovie
-
-  "Scrape a list of performers based on name"
-  scrapePerformerList(scraper_id: ID!, query: String!): [ScrapedPerformer!]!
-    @deprecated(reason: "use scrapeSinglePerformer")
-  "Scrapes a complete performer record based on a scrapePerformerList result"
-  scrapePerformer(
-    scraper_id: ID!
-    scraped_performer: ScrapedPerformerInput!
-  ): ScrapedPerformer @deprecated(reason: "use scrapeSinglePerformer")
-  "Scrapes a complete scene record based on an existing scene"
-  scrapeScene(scraper_id: ID!, scene: SceneUpdateInput!): ScrapedScene
-    @deprecated(reason: "use scrapeSingleScene")
-  "Scrapes a complete gallery record based on an existing gallery"
-  scrapeGallery(scraper_id: ID!, gallery: GalleryUpdateInput!): ScrapedGallery
-    @deprecated(reason: "use scrapeSingleGallery")
-
-  "Scrape a list of performers from a query"
-  scrapeFreeonesPerformerList(query: String!): [String!]!
-    @deprecated(
-      reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones"
-    )
+    @deprecated(reason: "Use scrapeGroupURL instead")
+  "Scrapes a complete group record based on a URL"
+  scrapeGroupURL(url: String!): ScrapedGroup
 
   # Plugins
   "List loaded plugins"
@@ -197,6 +229,12 @@ type Query {
   "List available plugin operations"
   pluginTasks: [PluginTask!]
 
+  # Packages
+  "List installed packages"
+  installedPackages(type: PackageType!): [Package!]!
+  "List available packages"
+  availablePackages(type: PackageType!, source: String!): [Package!]!
+
   # Config
   "Returns the current, complete configuration"
   configuration: ConfigResult!
@@ -220,16 +258,16 @@ type Query {
 
   # Get everything
 
-  allScenes: [Scene!]!
+  allScenes: [Scene!]! @deprecated(reason: "Use findScenes instead")
   allSceneMarkers: [SceneMarker!]!
-  allImages: [Image!]!
-  allGalleries: [Gallery!]!
-  allStudios: [Studio!]!
-  allMovies: [Movie!]!
-  allTags: [Tag!]!
+    @deprecated(reason: "Use findSceneMarkers instead")
+  allImages: [Image!]! @deprecated(reason: "Use findImages instead")
+  allGalleries: [Gallery!]! @deprecated(reason: "Use findGalleries instead")
 
-  # @deprecated
   allPerformers: [Performer!]!
+  allTags: [Tag!]! @deprecated(reason: "Use findTags instead")
+  allStudios: [Studio!]! @deprecated(reason: "Use findStudios instead")
+  allMovies: [Movie!]! @deprecated(reason: "Use findGroups instead")
 
   # Get everything with minimal metadata
 
@@ -242,7 +280,12 @@ type Query {
 
 type Mutation {
   setup(input: SetupInput!): Boolean!
-  migrate(input: MigrateInput!): Boolean!
+
+  "Migrates the schema to the required version. Returns the job ID"
+  migrate(input: MigrateInput!): ID!
+
+  "Downloads and installs ffmpeg and ffprobe binaries into the configuration directory. Returns the job ID."
+  downloadFFMpeg: ID!
 
   sceneCreate(input: SceneCreateInput!): Scene
   sceneUpdate(input: SceneUpdateInput!): Scene
@@ -253,24 +296,47 @@ type Mutation {
   scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
 
   "Increments the o-counter for a scene. Returns the new value"
-  sceneIncrementO(id: ID!): Int!
+  sceneIncrementO(id: ID!): Int! @deprecated(reason: "Use sceneAddO instead")
   "Decrements the o-counter for a scene. Returns the new value"
-  sceneDecrementO(id: ID!): Int!
+  sceneDecrementO(id: ID!): Int! @deprecated(reason: "Use sceneRemoveO instead")
+
+  "Increments the o-counter for a scene. Uses the current time if none provided."
+  sceneAddO(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Decrements the o-counter for a scene, removing the last recorded time if specific time not provided. Returns the new value"
+  sceneDeleteO(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+
   "Resets the o-counter for a scene to 0. Returns the new value"
   sceneResetO(id: ID!): Int!
 
   "Sets the resume time point (if provided) and adds the provided duration to the scene's play duration"
   sceneSaveActivity(id: ID!, resume_time: Float, playDuration: Float): Boolean!
 
+  "Resets the resume time point and play duration"
+  sceneResetActivity(
+    id: ID!
+    reset_resume: Boolean
+    reset_duration: Boolean
+  ): Boolean!
+
   "Increments the play count for the scene. Returns the new play count value."
   sceneIncrementPlayCount(id: ID!): Int!
+    @deprecated(reason: "Use sceneAddPlay instead")
+
+  "Increments the play count for the scene. Uses the current time if none provided."
+  sceneAddPlay(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Decrements the play count for the scene, removing the specific times or the last recorded time if not provided."
+  sceneDeletePlay(id: ID!, times: [Timestamp!]): HistoryMutationResult!
+  "Resets the play count for a scene to 0. Returns the new play count value."
+  sceneResetPlayCount(id: ID!): Int!
 
   "Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"
   sceneGenerateScreenshot(id: ID!, at: Float): String!
 
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
+  bulkSceneMarkerUpdate(input: BulkSceneMarkerUpdateInput!): [SceneMarker!]
   sceneMarkerDestroy(id: ID!): Boolean!
+  sceneMarkersDestroy(ids: [ID!]!): Boolean!
 
   sceneAssignFile(input: AssignSceneFileInput!): Boolean!
 
@@ -295,6 +361,8 @@ type Mutation {
 
   addGalleryImages(input: GalleryAddInput!): Boolean!
   removeGalleryImages(input: GalleryRemoveInput!): Boolean!
+  setGalleryCover(input: GallerySetCoverInput!): Boolean!
+  resetGalleryCover(input: GalleryResetCoverInput!): Boolean!
 
   galleryChapterCreate(input: GalleryChapterCreateInput!): GalleryChapter
   galleryChapterUpdate(input: GalleryChapterUpdateInput!): GalleryChapter
@@ -305,23 +373,43 @@ type Mutation {
   performerDestroy(input: PerformerDestroyInput!): Boolean!
   performersDestroy(ids: [ID!]!): Boolean!
   bulkPerformerUpdate(input: BulkPerformerUpdateInput!): [Performer!]
+  performerMerge(input: PerformerMergeInput!): Performer!
 
   studioCreate(input: StudioCreateInput!): Studio
   studioUpdate(input: StudioUpdateInput!): Studio
   studioDestroy(input: StudioDestroyInput!): Boolean!
   studiosDestroy(ids: [ID!]!): Boolean!
+  bulkStudioUpdate(input: BulkStudioUpdateInput!): [Studio!]
 
   movieCreate(input: MovieCreateInput!): Movie
+    @deprecated(reason: "Use groupCreate instead")
   movieUpdate(input: MovieUpdateInput!): Movie
+    @deprecated(reason: "Use groupUpdate instead")
   movieDestroy(input: MovieDestroyInput!): Boolean!
+    @deprecated(reason: "Use groupDestroy instead")
   moviesDestroy(ids: [ID!]!): Boolean!
+    @deprecated(reason: "Use groupsDestroy instead")
   bulkMovieUpdate(input: BulkMovieUpdateInput!): [Movie!]
+    @deprecated(reason: "Use bulkGroupUpdate instead")
+
+  groupCreate(input: GroupCreateInput!): Group
+  groupUpdate(input: GroupUpdateInput!): Group
+  groupDestroy(input: GroupDestroyInput!): Boolean!
+  groupsDestroy(ids: [ID!]!): Boolean!
+  bulkGroupUpdate(input: BulkGroupUpdateInput!): [Group!]
+
+  addGroupSubGroups(input: GroupSubGroupAddInput!): Boolean!
+  removeGroupSubGroups(input: GroupSubGroupRemoveInput!): Boolean!
+
+  "Reorder sub groups within a group. Returns true if successful."
+  reorderSubGroups(input: ReorderSubGroupsInput!): Boolean!
 
   tagCreate(input: TagCreateInput!): Tag
   tagUpdate(input: TagUpdateInput!): Tag
   tagDestroy(input: TagDestroyInput!): Boolean!
   tagsDestroy(ids: [ID!]!): Boolean!
   tagsMerge(input: TagsMergeInput!): Tag
+  bulkTagUpdate(input: BulkTagUpdateInput!): [Tag!]
 
   """
   Moves the given files to the given destination. Returns true if successful.
@@ -334,11 +422,20 @@ type Mutation {
   """
   moveFiles(input: MoveFilesInput!): Boolean!
   deleteFiles(ids: [ID!]!): Boolean!
+  "Deletes file entries from the database without deleting the files from the filesystem"
+  destroyFiles(ids: [ID!]!): Boolean!
+
+  fileSetFingerprints(input: FileSetFingerprintsInput!): Boolean!
+  "Reveal the file in the system file manager"
+  revealFileInFileManager(id: ID!): Boolean!
+  "Reveal the folder in the system file manager"
+  revealFolderInFileManager(id: ID!): Boolean!
 
   # Saved filters
   saveFilter(input: SaveFilterInput!): SavedFilter!
   destroySavedFilter(input: DestroyFilterInput!): Boolean!
   setDefaultFilter(input: SetDefaultFilterInput!): Boolean!
+    @deprecated(reason: "now uses UI config")
 
   "Change general configuration options"
   configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
@@ -349,9 +446,19 @@ type Mutation {
     input: ConfigDefaultSettingsInput!
   ): ConfigDefaultSettingsResult!
 
-  # overwrites the entire UI configuration
-  configureUI(input: Map!): Map!
-  # sets a single UI key value
+  "overwrites the entire plugin configuration for the given plugin"
+  configurePlugin(plugin_id: ID!, input: Map!): Map!
+
+  """
+  overwrites the UI configuration
+  if input is provided, then the entire UI configuration is replaced
+  if partial is provided, then the partial UI configuration is merged into the existing UI configuration
+  """
+  configureUI(input: Map, partial: Map): Map!
+  """
+  sets a single UI key value
+  key is a dot separated path to the value
+  """
   configureUISetting(key: String!, value: Any): Map!
 
   "Generate and set (or clear) API key"
@@ -375,6 +482,8 @@ type Mutation {
   metadataAutoTag(input: AutoTagMetadataInput!): ID!
   "Clean metadata. Returns the job ID"
   metadataClean(input: CleanMetadataInput!): ID!
+  "Clean generated files. Returns the job ID"
+  metadataCleanGenerated(input: CleanGeneratedInput!): ID!
   "Identifies scenes using scrapers. Returns the job ID"
   metadataIdentify(input: IdentifyMetadataInput!): ID!
 
@@ -394,14 +503,60 @@ type Mutation {
   "Reload scrapers"
   reloadScrapers: Boolean!
 
-  "Run plugin task. Returns the job ID"
+  """
+  Enable/disable plugins - enabledMap is a map of plugin IDs to enabled booleans.
+  Plugins not in the map are not affected.
+  """
+  setPluginsEnabled(enabledMap: BoolMap!): Boolean!
+
+  """
+  Run a plugin task.
+  If task_name is provided, then the task must exist in the plugin config and the tasks configuration
+  will be used to run the plugin.
+  If no task_name is provided, then the plugin will be executed with the arguments provided only.
+  Returns the job ID
+  """
   runPluginTask(
     plugin_id: ID!
-    task_name: String!
-    args: [PluginArgInput!]
+    "if provided, then the default args will be applied"
+    task_name: String
+    "displayed in the task queue"
+    description: String
+    args: [PluginArgInput!] @deprecated(reason: "Use args_map instead")
+    args_map: Map
   ): ID!
+
+  """
+  Runs a plugin operation. The operation is run immediately and does not use the job queue.
+  Returns a map of the result.
+  """
+  runPluginOperation(plugin_id: ID!, args: Map): Any
+
   reloadPlugins: Boolean!
 
+  """
+  Installs the given packages.
+  If a package is already installed, it will be updated if needed..
+  If an error occurs when installing a package, the job will continue to install the remaining packages.
+  Returns the job ID
+  """
+  installPackages(type: PackageType!, packages: [PackageSpecInput!]!): ID!
+  """
+  Updates the given packages.
+  If a package is not installed, it will not be installed.
+  If a package does not need to be updated, it will not be updated.
+  If no packages are provided, all packages of the given type will be updated.
+  If an error occurs when updating a package, the job will continue to update the remaining packages.
+  Returns the job ID.
+  """
+  updatePackages(type: PackageType!, packages: [PackageSpecInput!]): ID!
+  """
+  Uninstalls the given packages.
+  If an error occurs when uninstalling a package, the job will continue to uninstall the remaining packages.
+  Returns the job ID
+  """
+  uninstallPackages(type: PackageType!, packages: [PackageSpecInput!]!): ID!
+
   stopJob(job_id: ID!): Boolean!
   stopAllJobs: Boolean!
 
@@ -428,6 +583,8 @@ type Mutation {
   stashBoxBatchPerformerTag(input: StashBoxBatchTagInput!): String!
   "Run batch studio tag task. Returns the job ID."
   stashBoxBatchStudioTag(input: StashBoxBatchTagInput!): String!
+  "Run batch tag tag task. Returns the job ID."
+  stashBoxBatchTagTag(input: StashBoxBatchTagInput!): String!
 
   "Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"
   enableDLNA(input: EnableDLNAInput!): Boolean!

graphql/schema/types/config.graphql

@@ -2,6 +2,8 @@ input SetupInput {
   "Empty to indicate $HOME/.stash/config.yml default"
   configLocation: String!
   stashes: [StashConfigInput!]!
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean
   "Empty to indicate default"
   databaseFile: String!
   "Empty to indicate default"
@@ -67,18 +69,26 @@ input ConfigGeneralInput {
   databasePath: String
   "Path to backup directory"
   backupDirectoryPath: String
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String
   "Path to generated files"
   generatedPath: String
   "Path to import/export files"
   metadataPath: String
   "Path to scrapers"
   scrapersPath: String
+  "Path to plugins"
+  pluginsPath: String
   "Path to cache"
   cachePath: String
   "Path to blobs - required for filesystem blob storage"
   blobsPath: String
   "Where to store blobs"
   blobsStorage: BlobsStorageType
+  "Path to the ffmpeg binary. If empty, stash will attempt to find it in the path or config directory"
+  ffmpegPath: String
+  "Path to the ffprobe binary. If empty, stash will attempt to find it in the path or config directory"
+  ffprobePath: String
   "Whether to calculate MD5 checksums for scene video files"
   calculateMD5: Boolean
   "Hash algorithm to use for generated file naming"
@@ -139,8 +149,6 @@ input ConfigGeneralInput {
   password: String
   "Maximum session cookie age"
   maxSessionAge: Int
-  "Comma separated list of proxies to allow traffic from"
-  trustedProxies: [String!] @deprecated(reason: "no longer supported")
   "Name of the log file"
   logFile: String
   "Whether to also output to stderr"
@@ -149,6 +157,8 @@ input ConfigGeneralInput {
   logLevel: String
   "Whether to log http access"
   logAccess: Boolean
+  "Maximum log size"
+  logFileMaxSize: Int
   "True if galleries should be created from folders with images"
   createGalleriesFromFolders: Boolean
   "Regex used to identify images as gallery covers"
@@ -165,25 +175,27 @@ input ConfigGeneralInput {
   imageExcludes: [String!]
   "Custom Performer Image Location"
   customPerformerImageLocation: String
-  "Scraper user agent string"
-  scraperUserAgent: String
-    @deprecated(
-      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
-    )
-  "Scraper CDP path. Path to chrome executable or remote address"
-  scraperCDPPath: String
-    @deprecated(
-      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
-    )
-  "Whether the scraper should check for invalid certificates"
-  scraperCertCheck: Boolean
-    @deprecated(
-      reason: "use mutation ConfigureScraping(input: ConfigScrapingInput) instead"
-    )
   "Stash-box instances used for tagging"
   stashBoxes: [StashBoxInput!]
   "Python path - resolved using path if unset"
   pythonPath: String
+
+  "Source of scraper packages"
+  scraperPackageSources: [PackageSourceInput!]
+  "Source of plugin packages"
+  pluginPackageSources: [PackageSourceInput!]
+
+  "Size of the longest dimension for each sprite in pixels"
+  spriteScreenshotSize: Int
+
+  "True if sprite generation should use the sprite interval and min/max sprites settings instead of the default"
+  useCustomSpriteInterval: Boolean
+  "Time between two different scrubber sprites in seconds - only used if useCustomSpriteInterval is true"
+  spriteInterval: Float
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  minimumSprites: Int
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  maximumSprites: Int
 }
 
 type ConfigGeneralResult {
@@ -193,6 +205,8 @@ type ConfigGeneralResult {
   databasePath: String!
   "Path to backup directory"
   backupDirectoryPath: String!
+  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
+  deleteTrashPath: String!
   "Path to generated files"
   generatedPath: String!
   "Path to import/export files"
@@ -201,12 +215,18 @@ type ConfigGeneralResult {
   configFilePath: String!
   "Path to scrapers"
   scrapersPath: String!
+  "Path to plugins"
+  pluginsPath: String!
   "Path to cache"
   cachePath: String!
   "Path to blobs - required for filesystem blob storage"
   blobsPath: String!
   "Where to store blobs"
   blobsStorage: BlobsStorageType!
+  "Path to the ffmpeg binary. If empty, stash will attempt to find it in the path or config directory"
+  ffmpegPath: String!
+  "Path to the ffprobe binary. If empty, stash will attempt to find it in the path or config directory"
+  ffprobePath: String!
   "Whether to calculate MD5 checksums for scene video files"
   calculateMD5: Boolean!
   "Hash algorithm to use for generated file naming"
@@ -269,8 +289,6 @@ type ConfigGeneralResult {
   password: String!
   "Maximum session cookie age"
   maxSessionAge: Int!
-  "Comma separated list of proxies to allow traffic from"
-  trustedProxies: [String!] @deprecated(reason: "no longer supported")
   "Name of the log file"
   logFile: String
   "Whether to also output to stderr"
@@ -279,6 +297,18 @@ type ConfigGeneralResult {
   logLevel: String!
   "Whether to log http access"
   logAccess: Boolean!
+  "Maximum log size"
+  logFileMaxSize: Int!
+  "True if sprite generation should use the sprite interval and min/max sprites settings instead of the default"
+  useCustomSpriteInterval: Boolean!
+  "Time between two different scrubber sprites in seconds - only used if useCustomSpriteInterval is true"
+  spriteInterval: Float!
+  "Minimum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  minimumSprites: Int!
+  "Maximum number of sprites to be generated - only used if useCustomSpriteInterval is true"
+  maximumSprites: Int!
+  "Size of the longest dimension for each sprite in pixels"
+  spriteScreenshotSize: Int!
   "Array of video file extensions"
   videoExtensions: [String!]!
   "Array of image file extensions"
@@ -295,19 +325,15 @@ type ConfigGeneralResult {
   imageExcludes: [String!]!
   "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"
   stashBoxes: [StashBox!]!
   "Python path - resolved using path if unset"
   pythonPath: String!
+
+  "Source of scraper packages"
+  scraperPackageSources: [PackageSource!]!
+  "Source of plugin packages"
+  pluginPackageSources: [PackageSource!]!
 }
 
 input ConfigDisableDropdownCreateInput {
@@ -315,6 +341,7 @@ input ConfigDisableDropdownCreateInput {
   tag: Boolean
   studio: Boolean
   movie: Boolean
+  gallery: Boolean
 }
 
 enum ImageLightboxDisplayMode {
@@ -335,6 +362,7 @@ input ConfigImageLightboxInput {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int
+  disableAnimation: Boolean
 }
 
 type ConfigImageLightboxResult {
@@ -344,9 +372,13 @@ type ConfigImageLightboxResult {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int!
+  disableAnimation: Boolean
 }
 
 input ConfigInterfaceInput {
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean
+
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 
@@ -385,12 +417,12 @@ input ConfigInterfaceInput {
   customLocales: String
   customLocalesEnabled: Boolean
 
+  "When true, disables all customizations (plugins, CSS, JavaScript, locales) for troubleshooting"
+  disableCustomizations: Boolean
+
   "Interface language"
   language: String
 
-  "Slideshow Delay"
-  slideshowDelay: Int @deprecated(reason: "Use imageLightbox.slideshowDelay")
-
   imageLightbox: ConfigImageLightboxInput
 
   "Set to true to disable creating new objects via the dropdown menus"
@@ -413,9 +445,13 @@ type ConfigDisableDropdownCreate {
   tag: Boolean!
   studio: Boolean!
   movie: Boolean!
+  gallery: Boolean!
 }
 
 type ConfigInterfaceResult {
+  "True if SFW content mode is enabled"
+  sfwContentMode: Boolean!
+
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 
@@ -458,18 +494,16 @@ type ConfigInterfaceResult {
   customLocales: String
   customLocalesEnabled: Boolean
 
+  "When true, disables all customizations (plugins, CSS, JavaScript, locales) for troubleshooting"
+  disableCustomizations: Boolean
+
   "Interface language"
   language: String
 
-  "Slideshow Delay"
-  slideshowDelay: Int @deprecated(reason: "Use imageLightbox.slideshowDelay")
-
   imageLightbox: ConfigImageLightboxResult!
 
   "Fields are true if creating via dropdown menus are disabled"
   disableDropdownCreate: ConfigDisableDropdownCreate!
-  disabledDropdownCreate: ConfigDisableDropdownCreate!
-    @deprecated(reason: "Use disableDropdownCreate")
 
   "Handy Connection Key"
   handyKey: String
@@ -483,6 +517,8 @@ input ConfigDLNAInput {
   serverName: String
   "True if DLNA service should be enabled by default"
   enabled: Boolean
+  "Defaults to 1338"
+  port: Int
   "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]
   "List of interfaces to run DLNA on. Empty for all"
@@ -495,6 +531,8 @@ type ConfigDLNAResult {
   serverName: String!
   "True if DLNA service should be enabled by default"
   enabled: Boolean!
+  "Defaults to 1338"
+  port: Int!
   "List of IPs whitelisted for DLNA service"
   whitelistedIPs: [String!]!
   "List of interfaces to run DLNA on. Empty for all"
@@ -557,6 +595,7 @@ type ConfigResult {
   scraping: ConfigScrapingResult!
   defaults: ConfigDefaultSettingsResult!
   ui: Map!
+  plugins(include: [ID!]): PluginConfigMap!
 }
 
 "Directory structure of a path"

graphql/schema/types/file.graphql

@@ -7,8 +7,11 @@ type Folder {
   id: ID!
   path: String!
 
-  parent_folder_id: ID
-  zip_file_id: ID
+  parent_folder_id: ID @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder
+  zip_file: BasicFile
 
   mod_time: Time!
 
@@ -21,12 +24,37 @@ interface BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
 
+  fingerprint(type: String!): String
+  fingerprints: [Fingerprint!]!
+
+  created_at: Time!
+  updated_at: Time!
+}
+
+type BasicFile implements BaseFile {
+  id: ID!
+  path: String!
+  basename: String!
+
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
+
+  mod_time: Time!
+  size: Int64!
+
+  fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
   created_at: Time!
@@ -38,12 +66,16 @@ type VideoFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
 
+  fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
   format: String!
@@ -64,14 +96,19 @@ type ImageFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
 
+  fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
+  format: String!
   width: Int!
   height: Int!
 
@@ -86,12 +123,16 @@ type GalleryFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID!
-  zip_file_id: ID
+  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+
+  parent_folder: Folder!
+  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
 
+  fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
   created_at: Time!
@@ -109,3 +150,34 @@ input MoveFilesInput {
   "valid only for single file id. If empty, existing basename is used"
   destination_basename: String
 }
+
+input SetFingerprintsInput {
+  type: String!
+  "an null value will remove the fingerprint"
+  value: String
+}
+
+input FileSetFingerprintsInput {
+  id: ID!
+  "only supplied fingerprint types will be modified"
+  fingerprints: [SetFingerprintsInput!]!
+}
+
+type FindFilesResultType {
+  count: Int!
+
+  "Total megapixels of any image files"
+  megapixels: Float!
+  "Total duration in seconds of any video files"
+  duration: Float!
+
+  "Total file size in bytes"
+  size: Int!
+
+  files: [BaseFile!]!
+}
+
+type FindFoldersResultType {
+  count: Int!
+  folders: [Folder!]!
+}

graphql/schema/types/filters.graphql

@@ -8,6 +8,7 @@ input FindFilterType {
   page: Int
   "use per_page = -1 to indicate all results. Defaults to 25."
   per_page: Int
+  # TODO - this should be refactored to not use a string
   sort: String
   direction: SortDirectionEnum
 }
@@ -61,22 +62,67 @@ input ResolutionCriterionInput {
   modifier: CriterionModifier!
 }
 
-input PHashDuplicationCriterionInput {
-  duplicated: Boolean
-  "Currently unimplemented"
+enum OrientationEnum {
+  "Landscape"
+  LANDSCAPE
+  "Portrait"
+  PORTRAIT
+  "Square"
+  SQUARE
+}
+
+input OrientationCriterionInput {
+  value: [OrientationEnum!]!
+}
+
+input DuplicationCriterionInput {
+  duplicated: Boolean @deprecated(reason: "Use phash field instead")
+  "Currently unimplemented. Intended for phash distance matching."
   distance: Int
+  "Filter by phash duplication"
+  phash: Boolean
+  "Filter by URL duplication"
+  url: Boolean
+  "Filter by Stash ID duplication"
+  stash_id: Boolean
+  "Filter by title duplication"
+  title: Boolean
+}
+
+input FileDuplicationCriterionInput {
+  duplicated: Boolean @deprecated(reason: "Use phash field instead")
+  "Currently unimplemented. Intended for phash distance matching."
+  distance: Int
+  "Filter by phash duplication"
+  phash: Boolean
 }
 
 input StashIDCriterionInput {
   """
   If present, this value is treated as a predicate.
-  That is, it will filter based on stash_ids with the matching endpoint
+  That is, it will filter based on stash_id with the matching endpoint
   """
   endpoint: String
   stash_id: String
   modifier: CriterionModifier!
 }
 
+input StashIDsCriterionInput {
+  """
+  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_ids: [String]
+  modifier: CriterionModifier!
+}
+
+input CustomFieldCriterionInput {
+  field: String!
+  value: [Any!]
+  modifier: CriterionModifier!
+}
+
 input PerformerFilterType {
   AND: PerformerFilterType
   OR: PerformerFilterType
@@ -98,8 +144,6 @@ input PerformerFilterType {
   country: StringCriterionInput
   "Filter by eye color"
   eye_color: StringCriterionInput
-  "Filter by height"
-  height: StringCriterionInput @deprecated(reason: "Use height_cm instead")
   "Filter by height in cm"
   height_cm: IntCriterionInput
   "Filter by measurements"
@@ -110,8 +154,13 @@ input PerformerFilterType {
   penis_length: FloatCriterionInput
   "Filter by ciricumcision"
   circumcised: CircumcisionCriterionInput
-  "Filter by career length"
+  "Deprecated: use career_start and career_end. This filter is non-functional."
   career_length: StringCriterionInput
+    @deprecated(reason: "Use career_start and career_end")
+  "Filter by career start year"
+  career_start: IntCriterionInput
+  "Filter by career end year"
+  career_end: IntCriterionInput
   "Filter by tattoos"
   tattoos: StringCriterionInput
   "Filter by piercings"
@@ -132,16 +181,15 @@ input PerformerFilterType {
   image_count: IntCriterionInput
   "Filter by gallery count"
   gallery_count: IntCriterionInput
+  "Filter by play count"
+  play_count: IntCriterionInput
   "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")
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter by url"
@@ -154,6 +202,8 @@ input PerformerFilterType {
   death_year: IntCriterionInput
   "Filter by studios where performer appears in scene/image/gallery"
   studios: HierarchicalMultiCriterionInput
+  "Filter by groups where performer appears in scene"
+  groups: HierarchicalMultiCriterionInput
   "Filter by performers where performer appears with another performer in scene/image/gallery"
   performers: MultiCriterionInput
   "Filter by autotag ignore value"
@@ -162,21 +212,33 @@ input PerformerFilterType {
   birthdate: DateCriterionInput
   "Filter by death date"
   death_date: DateCriterionInput
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input SceneMarkerFilterType {
-  "Filter to only include scene markers with this tag"
-  tag_id: ID @deprecated(reason: "use tags filter instead")
   "Filter to only include scene markers with these tags"
   tags: HierarchicalMultiCriterionInput
   "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"
   performers: MultiCriterionInput
+  "Filter to only include scene markers from these scenes"
+  scenes: MultiCriterionInput
+  "Filter by duration (in seconds)"
+  duration: FloatCriterionInput
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
@@ -187,6 +249,8 @@ input SceneMarkerFilterType {
   scene_created_at: TimestampCriterionInput
   "Filter by lscene ast update time"
   scene_updated_at: TimestampCriterionInput
+  "Filter by related scenes that meet this criteria"
+  scene_filter: SceneFilterType
 }
 
 input SceneFilterType {
@@ -212,19 +276,22 @@ input SceneFilterType {
   path: StringCriterionInput
   "Filter by file count"
   file_count: IntCriterionInput
-  "Filter by rating"
-  rating: IntCriterionInput
-    @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter by organized"
   organized: Boolean
   "Filter by o-counter"
   o_counter: IntCriterionInput
-  "Filter Scenes that have an exact phash match available"
-  duplicated: PHashDuplicationCriterionInput
+  "Filter Scenes by duplication criteria"
+  duplicated: DuplicationCriterionInput
   "Filter by resolution"
   resolution: ResolutionCriterionInput
+  "Filter by orientation"
+  orientation: OrientationCriterionInput
+  "Filter by frame rate"
+  framerate: IntCriterionInput
+  "Filter by bit rate"
+  bitrate: IntCriterionInput
   "Filter by video codec"
   video_codec: StringCriterionInput
   "Filter by audio codec"
@@ -238,7 +305,11 @@ input SceneFilterType {
   "Filter to only include scenes with this studio"
   studios: HierarchicalMultiCriterionInput
   "Filter to only include scenes with this movie"
-  movies: MultiCriterionInput
+  movies: MultiCriterionInput @deprecated(reason: "use groups instead")
+  "Filter to only include scenes with this group"
+  groups: HierarchicalMultiCriterionInput
+  "Filter to only include scenes with this gallery"
+  galleries: MultiCriterionInput
   "Filter to only include scenes with these tags"
   tags: HierarchicalMultiCriterionInput
   "Filter by tag count"
@@ -254,10 +325,12 @@ input SceneFilterType {
   "Filter by performer count"
   performer_count: IntCriterionInput
   "Filter by StashID"
-  stash_id: StringCriterionInput
-    @deprecated(reason: "Use stash_id_endpoint instead")
-  "Filter by StashID"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
+  "Filter by StashID count"
+  stash_id_count: IntCriterionInput
   "Filter by url"
   url: StringCriterionInput
   "Filter by interactive"
@@ -272,24 +345,47 @@ input SceneFilterType {
   play_count: IntCriterionInput
   "Filter by play duration (in seconds)"
   play_duration: IntCriterionInput
+  "Filter by scene last played time"
+  last_played_at: TimestampCriterionInput
   "Filter by date"
   date: DateCriterionInput
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
+  "Filter by related movies that meet this criteria"
+  movies_filter: MovieFilterType
+    @deprecated(reason: "use groups_filter instead")
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
+  "Filter by related markers that meet this criteria"
+  markers_filter: SceneMarkerFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input MovieFilterType {
+  AND: MovieFilterType
+  OR: MovieFilterType
+  NOT: MovieFilterType
+
   name: StringCriterionInput
   director: StringCriterionInput
   synopsis: StringCriterionInput
 
   "Filter by duration (in seconds)"
   duration: IntCriterionInput
-  "Filter by rating"
-  rating: IntCriterionInput
-    @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter to only include movies with this studio"
@@ -300,12 +396,75 @@ input MovieFilterType {
   url: StringCriterionInput
   "Filter to only include movies where performer appears in a scene"
   performers: MultiCriterionInput
+  "Filter to only include movies with these tags"
+  tags: HierarchicalMultiCriterionInput
+  "Filter by tag count"
+  tag_count: IntCriterionInput
   "Filter by date"
   date: DateCriterionInput
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+}
+
+input GroupFilterType {
+  AND: GroupFilterType
+  OR: GroupFilterType
+  NOT: GroupFilterType
+
+  name: StringCriterionInput
+  director: StringCriterionInput
+  synopsis: StringCriterionInput
+
+  "Filter by duration (in seconds)"
+  duration: IntCriterionInput
+  # rating expressed as 1-100
+  rating100: IntCriterionInput
+  "Filter to only include groups with this studio"
+  studios: HierarchicalMultiCriterionInput
+  "Filter to only include groups missing this property"
+  is_missing: String
+  "Filter by url"
+  url: StringCriterionInput
+  "Filter to only include groups where performer appears in a scene"
+  performers: MultiCriterionInput
+  "Filter to only include groups with these tags"
+  tags: HierarchicalMultiCriterionInput
+  "Filter by tag count"
+  tag_count: IntCriterionInput
+  "Filter by date"
+  date: DateCriterionInput
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+  "Filter by o-counter"
+  o_counter: IntCriterionInput
+
+  "Filter by containing groups"
+  containing_groups: HierarchicalMultiCriterionInput
+  "Filter by sub groups"
+  sub_groups: HierarchicalMultiCriterionInput
+  "Filter by number of containing groups the group has"
+  containing_group_count: IntCriterionInput
+  "Filter by number of sub-groups the group has"
+  sub_group_count: IntCriterionInput
+  "Filter by number of scenes the group has"
+  scene_count: IntCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+
+  "Filter by custom fields"
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input StudioFilterType {
@@ -318,33 +477,52 @@ input StudioFilterType {
   "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"
   stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+  "Filter by StashIDs"
+  stash_ids_endpoint: StashIDsCriterionInput
+  "Filter to only include studios with these tags"
+  tags: HierarchicalMultiCriterionInput
   "Filter to only include studios missing this property"
   is_missing: String
-  "Filter by rating"
-  rating: IntCriterionInput
-    @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
+  "Filter by favorite"
+  favorite: Boolean
   "Filter by scene count"
   scene_count: IntCriterionInput
   "Filter by image count"
   image_count: IntCriterionInput
   "Filter by gallery count"
   gallery_count: IntCriterionInput
+  "Filter by group count"
+  group_count: IntCriterionInput
+  "Filter by tag count"
+  tag_count: IntCriterionInput
   "Filter by url"
   url: StringCriterionInput
   "Filter by studio aliases"
   aliases: StringCriterionInput
+  "Filter by subsidiary studio count"
+  child_count: IntCriterionInput
   "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
+  "Filter by organized"
+  organized: Boolean
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input GalleryFilterType {
@@ -366,9 +544,6 @@ input GalleryFilterType {
   is_missing: String
   "Filter to include/exclude galleries that were created from zip"
   is_zip: Boolean
-  "Filter by rating"
-  rating: IntCriterionInput
-    @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter by organized"
@@ -377,6 +552,8 @@ input GalleryFilterType {
   average_resolution: ResolutionCriterionInput
   "Filter to only include galleries that have chapters. `true` or `false`"
   has_chapters: String
+  "Filter to only include galleries with these scenes"
+  scenes: MultiCriterionInput
   "Filter to only include galleries with this studio"
   studios: HierarchicalMultiCriterionInput
   "Filter to only include galleries with these tags"
@@ -403,6 +580,27 @@ input GalleryFilterType {
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
+  "Filter by related folders that meet this criteria"
+  folders_filter: FolderFilterType
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input TagFilterType {
@@ -413,9 +611,15 @@ input TagFilterType {
   "Filter by tag name"
   name: StringCriterionInput
 
+  "Filter by tag sort_name"
+  sort_name: StringCriterionInput
+
   "Filter by tag aliases"
   aliases: StringCriterionInput
 
+  "Filter by favorite"
+  favorite: Boolean
+
   "Filter by tag description"
   description: StringCriterionInput
 
@@ -434,6 +638,15 @@ input TagFilterType {
   "Filter by number of performers with this tag"
   performer_count: IntCriterionInput
 
+  "Filter by number of studios with this tag"
+  studio_count: IntCriterionInput
+
+  "Filter by number of movies with this tag"
+  movie_count: IntCriterionInput
+
+  "Filter by number of group with this tag"
+  group_count: IntCriterionInput
+
   "Filter by number of markers with this tag"
   marker_count: IntCriterionInput
 
@@ -452,11 +665,33 @@ input TagFilterType {
   "Filter by autotag ignore value"
   ignore_auto_tag: Boolean
 
+  "Filter by StashID"
+  stash_id_endpoint: StashIDCriterionInput
+    @deprecated(reason: "use stash_ids_endpoint instead")
+
+  "Filter by StashID"
+  stash_ids_endpoint: StashIDsCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related groups that meet this criteria"
+  groups_filter: GroupFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+
   "Filter by creation time"
   created_at: TimestampCriterionInput
 
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+
+  custom_fields: [CustomFieldCriterionInput!]
 }
 
 input ImageFilterType {
@@ -465,18 +700,18 @@ input ImageFilterType {
   NOT: ImageFilterType
 
   title: StringCriterionInput
+  details: StringCriterionInput
 
   " Filter by image id"
   id: IntCriterionInput
   "Filter by file checksum"
   checksum: StringCriterionInput
+  "Filter by file phash distance"
+  phash_distance: PhashDistanceCriterionInput
   "Filter by path"
   path: StringCriterionInput
   "Filter by file count"
   file_count: IntCriterionInput
-  "Filter by rating"
-  rating: IntCriterionInput
-    @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: IntCriterionInput
   "Filter by date"
@@ -489,6 +724,8 @@ input ImageFilterType {
   o_counter: IntCriterionInput
   "Filter by resolution"
   resolution: ResolutionCriterionInput
+  "Filter by orientation"
+  orientation: OrientationCriterionInput
   "Filter to only include images missing this property"
   is_missing: String
   "Filter to only include images with this studio"
@@ -505,12 +742,129 @@ input ImageFilterType {
   performer_count: IntCriterionInput
   "Filter images that have performers that have been favorited"
   performer_favorite: Boolean
+  "Filter images by performer age at time of image"
+  performer_age: IntCriterionInput
   "Filter to only include images with these galleries"
   galleries: MultiCriterionInput
   "Filter by creation time"
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
+
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+  "Filter by related performers that meet this criteria"
+  performers_filter: PerformerFilterType
+  "Filter by related studios that meet this criteria"
+  studios_filter: StudioFilterType
+  "Filter by related tags that meet this criteria"
+  tags_filter: TagFilterType
+  "Filter by related files that meet this criteria"
+  files_filter: FileFilterType
+  "Filter by custom fields"
+  custom_fields: [CustomFieldCriterionInput!]
+}
+
+input FileFilterType {
+  AND: FileFilterType
+  OR: FileFilterType
+  NOT: FileFilterType
+
+  path: StringCriterionInput
+  basename: StringCriterionInput
+  dir: StringCriterionInput
+
+  parent_folder: HierarchicalMultiCriterionInput
+  zip_file: MultiCriterionInput
+
+  "Filter by modification time"
+  mod_time: TimestampCriterionInput
+
+  "Filter files by duplication criteria (only phash applies to files)"
+  duplicated: FileDuplicationCriterionInput
+
+  "find files based on hash"
+  hashes: [FingerprintFilterInput!]
+
+  video_file_filter: VideoFileFilterInput
+  image_file_filter: ImageFileFilterInput
+
+  scene_count: IntCriterionInput
+  image_count: IntCriterionInput
+  gallery_count: IntCriterionInput
+
+  "Filter by related scenes that meet this criteria"
+  scenes_filter: SceneFilterType
+  "Filter by related images that meet this criteria"
+  images_filter: ImageFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+}
+
+input FolderFilterType {
+  AND: FolderFilterType
+  OR: FolderFilterType
+  NOT: FolderFilterType
+
+  path: StringCriterionInput
+
+  parent_folder: HierarchicalMultiCriterionInput
+  zip_file: MultiCriterionInput
+
+  "Filter by modification time"
+  mod_time: TimestampCriterionInput
+
+  gallery_count: IntCriterionInput
+
+  "Filter by files that meet this criteria"
+  files_filter: FileFilterType
+  "Filter by related galleries that meet this criteria"
+  galleries_filter: GalleryFilterType
+
+  "Filter by creation time"
+  created_at: TimestampCriterionInput
+  "Filter by last update time"
+  updated_at: TimestampCriterionInput
+}
+
+input VideoFileFilterInput {
+  resolution: ResolutionCriterionInput
+  orientation: OrientationCriterionInput
+  framerate: IntCriterionInput
+  bitrate: IntCriterionInput
+  format: StringCriterionInput
+  video_codec: StringCriterionInput
+  audio_codec: StringCriterionInput
+
+  "in seconds"
+  duration: IntCriterionInput
+
+  captions: StringCriterionInput
+
+  interactive: Boolean
+  interactive_speed: IntCriterionInput
+}
+
+input ImageFileFilterInput {
+  format: StringCriterionInput
+  resolution: ResolutionCriterionInput
+  orientation: OrientationCriterionInput
+}
+
+input FingerprintFilterInput {
+  type: String!
+  value: String!
+  "Hamming distance - defaults to 0"
+  distance: Int
 }
 
 enum CriterionModifier {
@@ -565,6 +919,7 @@ input MultiCriterionInput {
 
 input GenderCriterionInput {
   value: GenderEnum
+  value_list: [GenderEnum!]
   modifier: CriterionModifier!
 }
 
@@ -605,6 +960,7 @@ enum FilterMode {
   GALLERIES
   SCENE_MARKERS
   MOVIES
+  GROUPS
   TAGS
   IMAGES
 }

graphql/schema/types/gallery.graphql

@@ -1,21 +1,23 @@
+type GalleryPathsType {
+  cover: String!
+  preview: String! # Resolver
+}
+
 "Gallery type"
 type Gallery {
   id: ID!
-  checksum: String! @deprecated(reason: "Use files.fingerprints")
-  path: String @deprecated(reason: "Use files.path")
   title: String
+  code: String
   url: String @deprecated(reason: "Use urls")
   urls: [String!]!
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean!
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time @deprecated(reason: "Use files.mod_time")
 
   files: [GalleryFile!]!
   folder: Folder
@@ -27,19 +29,21 @@ type Gallery {
   tags: [Tag!]!
   performers: [Performer!]!
 
-  "The images in the gallery"
-  images: [Image!]! @deprecated(reason: "Use findImages")
   cover: Image
+
+  paths: GalleryPathsType! # Resolver
+  custom_fields: Map!
+  image(index: Int!): Image!
 }
 
 input GalleryCreateInput {
   title: String!
+  code: String
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -47,18 +51,20 @@ input GalleryCreateInput {
   studio_id: ID
   tag_ids: [ID!]
   performer_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input GalleryUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
+  code: String
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -68,17 +74,19 @@ input GalleryUpdateInput {
   performer_ids: [ID!]
 
   primary_file_id: ID
+
+  custom_fields: CustomFieldsInput
 }
 
 input BulkGalleryUpdateInput {
   clientMutationId: String
   ids: [ID!]
+  code: String
   url: String @deprecated(reason: "Use urls")
   urls: BulkUpdateStrings
   date: String
   details: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  photographer: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -86,6 +94,8 @@ input BulkGalleryUpdateInput {
   studio_id: ID
   tag_ids: BulkUpdateIds
   performer_ids: BulkUpdateIds
+
+  custom_fields: CustomFieldsInput
 }
 
 input GalleryDestroyInput {
@@ -97,6 +107,8 @@ input GalleryDestroyInput {
   """
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindGalleriesResultType {
@@ -113,3 +125,12 @@ input GalleryRemoveInput {
   gallery_id: ID!
   image_ids: [ID!]!
 }
+
+input GallerySetCoverInput {
+  gallery_id: ID!
+  cover_image_id: ID!
+}
+
+input GalleryResetCoverInput {
+  gallery_id: ID!
+}

graphql/schema/types/group.graphql

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

graphql/schema/types/image.graphql

@@ -1,23 +1,19 @@
 type Image {
   id: ID!
-  checksum: String @deprecated(reason: "Use files.fingerprints")
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
   url: String @deprecated(reason: "Use urls")
   urls: [String!]!
   date: String
+  details: String
+  photographer: String
   o_counter: Int
   organized: Boolean!
-  path: String! @deprecated(reason: "Use files.path")
   created_at: Time!
   updated_at: Time!
 
-  file_mod_time: Time @deprecated(reason: "Use files.mod_time")
-
-  file: ImageFileType! @deprecated(reason: "Use visual_files")
   files: [ImageFile!]! @deprecated(reason: "Use visual_files")
   visual_files: [VisualFile!]!
   paths: ImagePathsType! # Resolver
@@ -25,6 +21,7 @@ type Image {
   studio: Studio
   tags: [Tag!]!
   performers: [Performer!]!
+  custom_fields: Map!
 }
 
 type ImageFileType {
@@ -44,14 +41,15 @@ input ImageUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
+  details: String
+  photographer: String
 
   studio_id: ID
   performer_ids: [ID!]
@@ -59,37 +57,44 @@ input ImageUpdateInput {
   gallery_ids: [ID!]
 
   primary_file_id: ID
+  custom_fields: CustomFieldsInput
 }
 
 input BulkImageUpdateInput {
   clientMutationId: String
   ids: [ID!]
   title: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   url: String @deprecated(reason: "Use urls")
   urls: BulkUpdateStrings
   date: String
+  details: String
+  photographer: String
 
   studio_id: ID
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
   gallery_ids: BulkUpdateIds
+  custom_fields: CustomFieldsInput
 }
 
 input ImageDestroyInput {
   id: ID!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 input ImagesDestroyInput {
   ids: [ID!]!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindImagesResultType {

graphql/schema/types/job.graphql

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

graphql/schema/types/logging.graphql

@@ -1,6 +1,3 @@
-"Log entries"
-scalar Time
-
 enum LogLevel {
   Trace
   Debug

graphql/schema/types/metadata.graphql

@@ -1,5 +1,3 @@
-scalar Upload
-
 input GenerateMetadataInput {
   covers: Boolean
   sprites: Boolean
@@ -12,14 +10,22 @@ input GenerateMetadataInput {
   transcodes: Boolean
   "Generate transcodes even if not required"
   forceTranscodes: Boolean
+  "Generate video phashes during scan"
   phashes: Boolean
   interactiveHeatmapsSpeeds: Boolean
+  "Generate image phashes during scan"
+  imagePhashes: Boolean
+  imageThumbnails: Boolean
   clipPreviews: Boolean
 
   "scene ids to generate for"
   sceneIDs: [ID!]
   "marker ids to generate for"
   markerIDs: [ID!]
+  "image ids to generate for"
+  imageIDs: [ID!]
+  "gallery ids to generate for"
+  galleryIDs: [ID!]
 
   "overwrite existing media"
   overwrite: Boolean
@@ -50,6 +56,7 @@ type GenerateMetadataOptions {
   transcodes: Boolean
   phashes: Boolean
   interactiveHeatmapsSpeeds: Boolean
+  imageThumbnails: Boolean
   clipPreviews: Boolean
 }
 
@@ -75,19 +82,8 @@ input ScanMetaDataFilterInput {
 input ScanMetadataInput {
   paths: [String!]
 
-  # useFileMetadata is deprecated with the new file management system
-  # if this functionality is desired, then we can make a built in scraper instead.
-
-  "Set name, date, details from metadata (if present)"
-  useFileMetadata: Boolean @deprecated(reason: "Not implemented")
-
-  # stripFileExtension is deprecated since we no longer set the title from the
-  # filename - it is automatically returned if the object has no title. If this
-  # functionality is desired, then we could make this an option to not include
-  # the extension in the auto-generated title.
-
-  "Strip file extension from title"
-  stripFileExtension: Boolean @deprecated(reason: "Not implemented")
+  "Forces a rescan on files even if modification time is unchanged"
+  rescan: Boolean
   "Generate covers during scan"
   scanGenerateCovers: Boolean
   "Generate previews during scan"
@@ -96,8 +92,10 @@ input ScanMetadataInput {
   scanGenerateImagePreviews: Boolean
   "Generate sprites during scan"
   scanGenerateSprites: Boolean
-  "Generate phashes during scan"
+  "Generate video phashes during scan"
   scanGeneratePhashes: Boolean
+  "Generate image phashes during scan"
+  scanGenerateImagePhashes: Boolean
   "Generate image thumbnails during scan"
   scanGenerateThumbnails: Boolean
   "Generate image clip previews during scan"
@@ -108,10 +106,8 @@ input ScanMetadataInput {
 }
 
 type ScanMetadataOptions {
-  "Set name, date, details from metadata (if present)"
-  useFileMetadata: Boolean! @deprecated(reason: "Not implemented")
-  "Strip file extension from title"
-  stripFileExtension: Boolean! @deprecated(reason: "Not implemented")
+  "Forces a rescan on files even if modification time is unchanged"
+  rescan: Boolean!
   "Generate covers during scan"
   scanGenerateCovers: Boolean!
   "Generate previews during scan"
@@ -120,8 +116,10 @@ type ScanMetadataOptions {
   scanGenerateImagePreviews: Boolean!
   "Generate sprites during scan"
   scanGenerateSprites: Boolean!
-  "Generate phashes during scan"
+  "Generate video phashes during scan"
   scanGeneratePhashes: Boolean!
+  "Generate image phashes during scan"
+  scanGenerateImagePhashes: Boolean
   "Generate image thumbnails during scan"
   scanGenerateThumbnails: Boolean!
   "Generate image clip previews during scan"
@@ -135,6 +133,26 @@ input CleanMetadataInput {
   dryRun: Boolean!
 }
 
+input CleanGeneratedInput {
+  "Clean blob files without blob entries"
+  blobFiles: Boolean
+  "Clean sprite and vtt files without scene entries"
+  sprites: Boolean
+  "Clean preview files without scene entries"
+  screenshots: Boolean
+  "Clean scene transcodes without scene entries"
+  transcodes: Boolean
+
+  "Clean marker files without marker entries"
+  markers: Boolean
+
+  "Clean image thumbnails/clips without image entries"
+  imageThumbnails: Boolean
+
+  "Do a dry run. Don't delete any files"
+  dryRun: Boolean
+}
+
 input AutoTagMetadataInput {
   "Paths to tag, null for all files"
   paths: [String!]
@@ -197,7 +215,9 @@ input IdentifyMetadataOptionsInput {
   setCoverImage: Boolean
   setOrganized: Boolean
   "defaults to true if not provided"
-  includeMalePerformers: Boolean
+  includeMalePerformers: Boolean @deprecated(reason: "Use performerGenders")
+  "Filter to only include performers with these genders. If not provided, all genders are included."
+  performerGenders: [GenderEnum!]
   "defaults to true if not provided"
   skipMultipleMatches: Boolean
   "tag to tag skipped multiple matches with"
@@ -242,7 +262,9 @@ type IdentifyMetadataOptions {
   setCoverImage: Boolean
   setOrganized: Boolean
   "defaults to true if not provided"
-  includeMalePerformers: Boolean
+  includeMalePerformers: Boolean @deprecated(reason: "Use performerGenders")
+  "Filter to only include performers with these genders. If not provided, all genders are included."
+  performerGenders: [GenderEnum!]
   "defaults to true if not provided"
   skipMultipleMatches: Boolean
   "tag to tag skipped multiple matches with"
@@ -277,7 +299,8 @@ input ExportObjectsInput {
   studios: ExportObjectTypeInput
   performers: ExportObjectTypeInput
   tags: ExportObjectTypeInput
-  movies: ExportObjectTypeInput
+  groups: ExportObjectTypeInput
+  movies: ExportObjectTypeInput @deprecated(reason: "Use groups instead")
   galleries: ExportObjectTypeInput
   includeDependencies: Boolean
 }
@@ -302,6 +325,8 @@ input ImportObjectsInput {
 
 input BackupDatabaseInput {
   download: Boolean
+  "If true, blob files will be included in the backup. This can significantly increase the size of the backup and the time it takes to create it, but allows for a complete backup of the system that can be restored without needing access to the original media files."
+  includeBlobs: Boolean
 }
 
 input AnonymiseDatabaseInput {
@@ -320,8 +345,22 @@ type SystemStatus {
   configPath: String
   appSchema: Int!
   status: SystemStatusEnum!
+  os: String!
+  workingDir: String!
+  homeDir: String!
+  ffmpegPath: String
+  ffprobePath: String
 }
 
 input MigrateInput {
   backupPath: String!
 }
+
+input CustomFieldsInput {
+  "If populated, the entire custom fields map will be replaced with this value"
+  full: Map
+  "If populated, only the keys in this map will be updated"
+  partial: Map
+  "Remove any keys in this list"
+  remove: [String!]
+}

graphql/schema/types/movie.graphql

@@ -1,25 +1,24 @@
 type Movie {
   id: ID!
   name: String!
-  checksum: String! @deprecated(reason: "MD5 hash of name, use name directly")
   aliases: String
   "Duration in seconds"
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio: Studio
   director: String
   synopsis: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
+  tags: [Tag!]!
   created_at: Time!
   updated_at: Time!
 
   front_image_path: String # Resolver
   back_image_path: String # Resolver
-  scene_count: Int! # Resolver
+  scene_count(depth: Int): Int! # Resolver
   scenes: [Scene!]!
 }
 
@@ -29,14 +28,14 @@ input MovieCreateInput {
   "Duration in seconds"
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio_id: ID
   director: String
   synopsis: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
+  tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   front_image: String
   "This should be a URL or a base64 encoded data URL"
@@ -49,14 +48,14 @@ input MovieUpdateInput {
   aliases: String
   duration: Int
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio_id: ID
   director: String
   synopsis: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
+  tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   front_image: String
   "This should be a URL or a base64 encoded data URL"
@@ -66,12 +65,12 @@ input MovieUpdateInput {
 input BulkMovieUpdateInput {
   clientMutationId: String
   ids: [ID!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   studio_id: ID
   director: String
+  urls: BulkUpdateStrings
+  tag_ids: BulkUpdateIds
 }
 
 input MovieDestroyInput {

graphql/schema/types/package.graphql

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

graphql/schema/types/performer.graphql

@@ -14,27 +14,27 @@ enum CircumisedEnum {
 
 type Performer {
   id: ID!
-  checksum: String @deprecated(reason: "Not used")
   name: String!
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
   alias_list: [String!]!
   favorite: Boolean!
   tags: [Tag!]!
@@ -44,13 +44,12 @@ type Performer {
   scene_count: Int! # Resolver
   image_count: Int! # Resolver
   gallery_count: Int! # Resolver
-  movie_count: Int! # Resolver
+  group_count: Int! # Resolver
+  movie_count: Int! @deprecated(reason: "use group_count instead") # Resolver
   performer_count: Int! # Resolver
   o_counter: Int # Resolver
   scenes: [Scene!]!
   stash_ids: [StashID!]!
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -59,39 +58,41 @@ type Performer {
   weight: Int
   created_at: Time!
   updated_at: Time!
-  movies: [Movie!]!
+  groups: [Group!]!
+  movies: [Movie!]! @deprecated(reason: "use groups instead")
+
+  custom_fields: Map!
 }
 
 input PerformerCreateInput {
   name: String!
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   alias_list: [String!]
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   favorite: Boolean
   tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -99,39 +100,40 @@ input PerformerCreateInput {
   hair_color: String
   weight: Int
   ignore_auto_tag: Boolean
+
+  custom_fields: Map
 }
 
 input PerformerUpdateInput {
   id: ID!
   name: String
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   alias_list: [String!]
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   favorite: Boolean
   tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -139,6 +141,8 @@ input PerformerUpdateInput {
   hair_color: String
   weight: Int
   ignore_auto_tag: Boolean
+
+  custom_fields: CustomFieldsInput
 }
 
 input BulkUpdateStrings {
@@ -150,30 +154,29 @@ input BulkPerformerUpdateInput {
   clientMutationId: String
   ids: [ID!]
   disambiguation: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
   gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
   eye_color: String
-  # height must be parsable into an integer
-  height: String @deprecated(reason: "Use height_cm")
   height_cm: Int
   measurements: String
   fake_tits: String
   penis_length: Float
   circumcised: CircumisedEnum
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
-  aliases: String @deprecated(reason: "Use alias_list")
+  "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
   alias_list: BulkUpdateStrings
-  twitter: String
-  instagram: String
+  twitter: String @deprecated(reason: "Use urls")
+  instagram: String @deprecated(reason: "Use urls")
   favorite: Boolean
   tag_ids: BulkUpdateIds
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   details: String
@@ -181,6 +184,8 @@ input BulkPerformerUpdateInput {
   hair_color: String
   weight: Int
   ignore_auto_tag: Boolean
+
+  custom_fields: CustomFieldsInput
 }
 
 input PerformerDestroyInput {
@@ -191,3 +196,10 @@ type FindPerformersResultType {
   count: Int!
   performers: [Performer!]!
 }
+
+input PerformerMergeInput {
+  source: [ID!]!
+  destination: ID!
+  # values defined here will override values in the destination
+  values: PerformerUpdateInput
+}

graphql/schema/types/plugin.graphql

@@ -1,3 +1,10 @@
+type PluginPaths {
+  # path to javascript files
+  javascript: [String!]
+  # path to css files
+  css: [String!]
+}
+
 type Plugin {
   id: ID!
   name: String!
@@ -5,8 +12,19 @@ type Plugin {
   url: String
   version: String
 
+  enabled: Boolean!
+
   tasks: [PluginTask!]
   hooks: [PluginHook!]
+  settings: [PluginSetting!]
+
+  """
+  Plugin IDs of plugins that this plugin depends on.
+  Applies only for UI plugins to indicate css/javascript load order.
+  """
+  requires: [ID!]
+
+  paths: PluginPaths!
 }
 
 type PluginTask {
@@ -40,3 +58,16 @@ input PluginValueInput {
   o: [PluginArgInput!]
   a: [PluginValueInput!]
 }
+
+enum PluginSettingTypeEnum {
+  STRING
+  NUMBER
+  BOOLEAN
+}
+
+type PluginSetting {
+  name: String!
+  display_name: String
+  description: String
+  type: PluginSettingTypeEnum!
+}

graphql/schema/types/scalars.graphql

@@ -1,3 +1,6 @@
+"An RFC3339 timestamp"
+scalar Time
+
 """
 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"
@@ -5,9 +8,18 @@ for "5 minutes in the future"
 """
 scalar Timestamp
 
-# generic JSON object
+"A String -> Any map"
 scalar Map
 
+"A String -> Boolean map"
+scalar BoolMap
+
+"A plugin ID -> Map (String -> Any map) map"
+scalar PluginConfigMap
+
 scalar Any
 
 scalar Int64
+
+"A multipart file upload"
+scalar Upload

graphql/schema/types/scene-marker.graphql

@@ -2,7 +2,10 @@ type SceneMarker {
   id: ID!
   scene: Scene!
   title: String!
+  "The required start time of the marker (in seconds). Supports decimals."
   seconds: Float!
+  "The optional end time of the marker (in seconds). Supports decimals."
+  end_seconds: Float
   primary_tag: Tag!
   tags: [Tag!]!
   created_at: Time!
@@ -18,7 +21,10 @@ type SceneMarker {
 
 input SceneMarkerCreateInput {
   title: String!
+  "The required start time of the marker (in seconds). Supports decimals."
   seconds: Float!
+  "The optional end time of the marker (in seconds). Supports decimals."
+  end_seconds: Float
   scene_id: ID!
   primary_tag_id: ID!
   tag_ids: [ID!]
@@ -27,12 +33,22 @@ input SceneMarkerCreateInput {
 input SceneMarkerUpdateInput {
   id: ID!
   title: String
+  "The start time of the marker (in seconds). Supports decimals."
   seconds: Float
+  "The end time of the marker (in seconds). Supports decimals."
+  end_seconds: Float
   scene_id: ID
   primary_tag_id: ID
   tag_ids: [ID!]
 }
 
+input BulkSceneMarkerUpdateInput {
+  ids: [ID!]
+  title: String
+  primary_tag_id: ID
+  tag_ids: BulkUpdateIds
+}
+
 type FindSceneMarkersResultType {
   count: Int!
   scene_markers: [SceneMarker!]!

graphql/schema/types/scene.graphql

@@ -15,7 +15,6 @@ type ScenePathsType {
   stream: String # Resolver
   webp: String # Resolver
   vtt: String # Resolver
-  chapters_vtt: String @deprecated
   sprite: String # Resolver
   funscript: String # Resolver
   interactive_heatmap: String # Resolver
@@ -27,6 +26,11 @@ type SceneMovie {
   scene_index: Int
 }
 
+type SceneGroup {
+  group: Group!
+  scene_index: Int
+}
+
 type VideoCaption {
   language_code: String!
   caption_type: String!
@@ -34,8 +38,6 @@ type VideoCaption {
 
 type Scene {
   id: ID!
-  checksum: String @deprecated(reason: "Use files.fingerprints")
-  oshash: String @deprecated(reason: "Use files.fingerprints")
   title: String
   code: String
   details: String
@@ -43,20 +45,15 @@ type Scene {
   url: String @deprecated(reason: "Use urls")
   urls: [String!]!
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean!
   o_counter: Int
-  path: String! @deprecated(reason: "Use files.path")
-  phash: String @deprecated(reason: "Use files.fingerprints")
   interactive: Boolean!
   interactive_speed: Int
   captions: [VideoCaption!]
   created_at: Time!
   updated_at: Time!
-  file_mod_time: Time
   "The last time play count was updated"
   last_played_at: Time
   "The time index a scene was left at"
@@ -66,17 +63,24 @@ type Scene {
   "The number ot times a scene has been played"
   play_count: Int
 
-  file: SceneFileType! @deprecated(reason: "Use files")
+  "Times a scene was played"
+  play_history: [Time!]!
+  "Times the o counter was incremented"
+  o_history: [Time!]!
+
   files: [VideoFile!]!
   paths: ScenePathsType! # Resolver
   scene_markers: [SceneMarker!]!
   galleries: [Gallery!]!
   studio: Studio
-  movies: [SceneMovie!]!
+  groups: [SceneGroup!]!
+  movies: [SceneMovie!]! @deprecated(reason: "Use groups")
   tags: [Tag!]!
   performers: [Performer!]!
   stash_ids: [StashID!]!
 
+  custom_fields: Map!
+
   "Return valid stream paths"
   sceneStreams: [SceneStreamEndpoint!]!
 }
@@ -86,6 +90,11 @@ input SceneMovieInput {
   scene_index: Int
 }
 
+input SceneGroupInput {
+  group_id: ID!
+  scene_index: Int
+}
+
 input SceneCreateInput {
   title: String
   code: String
@@ -94,15 +103,14 @@ input SceneCreateInput {
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   studio_id: ID
   gallery_ids: [ID!]
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
+  groups: [SceneGroupInput!]
+  movies: [SceneMovieInput!] @deprecated(reason: "Use groups")
   tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   cover_image: String
@@ -114,6 +122,8 @@ input SceneCreateInput {
   Files must not already be primary for another scene.
   """
   file_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input SceneUpdateInput {
@@ -126,16 +136,16 @@ input SceneUpdateInput {
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   o_counter: Int
+    @deprecated(reason: "Unsupported - Use sceneIncrementO/sceneDecrementO")
   organized: Boolean
   studio_id: ID
   gallery_ids: [ID!]
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
+  groups: [SceneGroupInput!]
+  movies: [SceneMovieInput!] @deprecated(reason: "Use groups")
   tag_ids: [ID!]
   "This should be a URL or a base64 encoded data URL"
   cover_image: String
@@ -147,8 +157,13 @@ input SceneUpdateInput {
   play_duration: Float
   "The number ot times a scene has been played"
   play_count: Int
+    @deprecated(
+      reason: "Unsupported - Use sceneIncrementPlayCount/sceneDecrementPlayCount"
+    )
 
   primary_file_id: ID
+
+  custom_fields: CustomFieldsInput
 }
 
 enum BulkUpdateIdMode {
@@ -172,8 +187,6 @@ input BulkSceneUpdateInput {
   url: String @deprecated(reason: "Use urls")
   urls: BulkUpdateStrings
   date: String
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
@@ -181,19 +194,26 @@ input BulkSceneUpdateInput {
   gallery_ids: BulkUpdateIds
   performer_ids: BulkUpdateIds
   tag_ids: BulkUpdateIds
-  movie_ids: BulkUpdateIds
+  group_ids: BulkUpdateIds
+  movie_ids: BulkUpdateIds @deprecated(reason: "Use group_ids")
+
+  custom_fields: CustomFieldsInput
 }
 
 input SceneDestroyInput {
   id: ID!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 input ScenesDestroyInput {
   ids: [ID!]!
   delete_file: Boolean
   delete_generated: Boolean
+  "If true, delete the file entry from the database if the file is not assigned to any other objects"
+  destroy_file_entry: Boolean
 }
 
 type FindScenesResultType {
@@ -266,4 +286,13 @@ input SceneMergeInput {
   destination: ID!
   # values defined here will override values in the destination
   values: SceneUpdateInput
+
+  # if true, the source history will be combined with the destination
+  play_history: Boolean
+  o_history: Boolean
+}
+
+type HistoryMutationResult {
+  count: Int!
+  history: [Time!]!
 }

graphql/schema/types/scraped-group.graphql

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

graphql/schema/types/scraped-movie.graphql

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

graphql/schema/types/scraped-performer.graphql

@@ -5,9 +5,10 @@ type ScrapedPerformer {
   name: String
   disambiguation: String
   gender: String
-  url: String
-  twitter: String
-  instagram: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  twitter: String @deprecated(reason: "use urls")
+  instagram: String @deprecated(reason: "use urls")
   birthdate: String
   ethnicity: String
   country: String
@@ -17,7 +18,9 @@ type ScrapedPerformer {
   fake_tits: String
   penis_length: String
   circumcised: String
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   # aliases must be comma-delimited to be parsed correctly
@@ -40,9 +43,10 @@ input ScrapedPerformerInput {
   name: String
   disambiguation: String
   gender: String
-  url: String
-  twitter: String
-  instagram: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
+  twitter: String @deprecated(reason: "use urls")
+  instagram: String @deprecated(reason: "use urls")
   birthdate: String
   ethnicity: String
   country: String
@@ -52,7 +56,9 @@ input ScrapedPerformerInput {
   fake_tits: String
   penis_length: String
   circumcised: String
-  career_length: String
+  career_length: String @deprecated(reason: "Use career_start and career_end")
+  career_start: Int
+  career_end: Int
   tattoos: String
   piercings: String
   aliases: String

graphql/schema/types/scraper.graphql

@@ -10,7 +10,9 @@ enum ScrapeType {
 "Type of the content a scraper generates"
 enum ScrapeContentType {
   GALLERY
+  IMAGE
   MOVIE
+  GROUP
   PERFORMER
   SCENE
 }
@@ -21,7 +23,9 @@ union ScrapedContent =
   | ScrapedTag
   | ScrapedScene
   | ScrapedGallery
+  | ScrapedImage
   | ScrapedMovie
+  | ScrapedGroup
   | ScrapedPerformer
 
 type ScraperSpec {
@@ -39,17 +43,26 @@ type Scraper {
   scene: ScraperSpec
   "Details for gallery scraper"
   gallery: ScraperSpec
+  "Details for image scraper"
+  image: ScraperSpec
   "Details for movie scraper"
-  movie: ScraperSpec
+  movie: ScraperSpec @deprecated(reason: "use group")
+  "Details for group scraper"
+  group: ScraperSpec
 }
 
 type ScrapedStudio {
   "Set if studio matched"
   stored_id: ID
   name: String!
-  url: String
+  url: String @deprecated(reason: "use urls")
+  urls: [String!]
   parent: ScrapedStudio
   image: String
+  details: String
+  "Aliases must be comma-delimited to be parsed correctly"
+  aliases: String
+  tags: [ScrapedTag!]
 
   remote_site_id: String
 }
@@ -58,6 +71,10 @@ type ScrapedTag {
   "Set if tag matched"
   stored_id: ID
   name: String!
+  description: String
+  alias_list: [String!]
+  "Remote site ID, if applicable"
+  remote_site_id: String
 }
 
 type ScrapedScene {
@@ -76,7 +93,8 @@ type ScrapedScene {
   studio: ScrapedStudio
   tags: [ScrapedTag!]
   performers: [ScrapedPerformer!]
-  movies: [ScrapedMovie!]
+  movies: [ScrapedMovie!] @deprecated(reason: "use groups")
+  groups: [ScrapedGroup!]
 
   remote_site_id: String
   duration: Int
@@ -99,7 +117,9 @@ input ScrapedSceneInput {
 
 type ScrapedGallery {
   title: String
+  code: String
   details: String
+  photographer: String
   url: String @deprecated(reason: "use urls")
   urls: [String!]
   date: String
@@ -111,7 +131,9 @@ type ScrapedGallery {
 
 input ScrapedGalleryInput {
   title: String
+  code: String
   details: String
+  photographer: String
   url: String @deprecated(reason: "use urls")
   urls: [String!]
   date: String
@@ -119,12 +141,32 @@ input ScrapedGalleryInput {
   # no studio, tags or performers
 }
 
+type ScrapedImage {
+  title: String
+  code: String
+  details: String
+  photographer: String
+  urls: [String!]
+  date: String
+  studio: ScrapedStudio
+  tags: [ScrapedTag!]
+  performers: [ScrapedPerformer!]
+}
+
+input ScrapedImageInput {
+  title: String
+  code: String
+  details: String
+  urls: [String!]
+  date: String
+}
+
 input ScraperSourceInput {
   "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: String
-  "Scraper ID to scrape with. Should be unset if stash_box_index is set"
+  "Scraper ID to scrape with. Should be unset if stash_box_endpoint/stash_box_index is set"
   scraper_id: ID
 }
 
@@ -133,7 +175,7 @@ type ScraperSource {
   stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
   "Stash-box endpoint"
   stash_box_endpoint: String
-  "Scraper ID to scrape with. Should be unset if stash_box_index is set"
+  "Scraper ID to scrape with. Should be unset if stash_box_endpoint/stash_box_index is set"
   scraper_id: ID
 }
 
@@ -158,6 +200,13 @@ input ScrapeSingleStudioInput {
   query: String
 }
 
+input ScrapeSingleTagInput {
+  """
+  Query can be either a name or a Stash ID
+  """
+  query: String
+}
+
 input ScrapeSinglePerformerInput {
   "Instructs to query by string"
   query: String
@@ -181,18 +230,38 @@ input ScrapeSingleGalleryInput {
   gallery_input: ScrapedGalleryInput
 }
 
+input ScrapeSingleImageInput {
+  "Instructs to query by string"
+  query: String
+  "Instructs to query by image id"
+  image_id: ID
+  "Instructs to query by image fragment"
+  image_input: ScrapedImageInput
+}
+
 input ScrapeSingleMovieInput {
   "Instructs to query by string"
   query: String
   "Instructs to query by movie id"
   movie_id: ID
-  "Instructs to query by gallery fragment"
+  "Instructs to query by movie fragment"
   movie_input: ScrapedMovieInput
 }
 
+input ScrapeSingleGroupInput {
+  "Instructs to query by string"
+  query: String
+  "Instructs to query by group id"
+  group_id: ID
+  "Instructs to query by group fragment"
+  group_input: ScrapedGroupInput
+}
+
 input StashBoxSceneQueryInput {
   "Index of the configured stash-box instance to use"
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
   "Instructs query by scene fingerprints"
   scene_ids: [ID!]
   "Query by query string"
@@ -201,7 +270,9 @@ input StashBoxSceneQueryInput {
 
 input StashBoxPerformerQueryInput {
   "Index of the configured stash-box instance to use"
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
   "Instructs query by scene fingerprints"
   performer_ids: [ID!]
   "Query by query string"
@@ -219,22 +290,32 @@ type StashBoxFingerprint {
   duration: Int!
 }
 
-"If neither ids nor names are set, tag all items"
+"""
+Accepts either ids, or a combination of names and stash_ids.
+If none are set, then all existing items will be tagged.
+"""
 input StashBoxBatchTagInput {
   "Stash endpoint to use for the tagging"
-  endpoint: Int!
+  endpoint: Int @deprecated(reason: "use stash_box_endpoint")
+  "Endpoint of the stash-box instance to use"
+  stash_box_endpoint: String
   "Fields to exclude when executing the tagging"
   exclude_fields: [String!]
   "Refresh 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 in stash of the items to update.
+  If set, names and stash_ids fields will be ignored.
+  """
   ids: [ID!]
-  "If set, only tag these names"
+  "Names of the items in the stash-box instance to search for and create"
   names: [String!]
-  "If set, only tag these performer ids"
+  "Stash IDs of the items in the stash-box instance to search for and create"
+  stash_ids: [String!]
+  "IDs in stash of the performers to update"
   performer_ids: [ID!] @deprecated(reason: "use ids")
-  "If set, only tag these performer names"
+  "Names of the performers in the stash-box instance to search for and create"
   performer_names: [String!] @deprecated(reason: "use names")
 }

graphql/schema/types/stash-box.graphql

@@ -2,30 +2,37 @@ type StashBox {
   endpoint: String!
   api_key: String!
   name: String!
+  max_requests_per_minute: Int!
 }
 
 input StashBoxInput {
   endpoint: String!
   api_key: String!
   name: String!
+  # defaults to 240
+  max_requests_per_minute: Int
 }
 
 type StashID {
   endpoint: String!
   stash_id: String!
+  updated_at: Time!
 }
 
 input StashIDInput {
   endpoint: String!
   stash_id: String!
+  updated_at: Time
 }
 
 input StashBoxFingerprintSubmissionInput {
   scene_ids: [String!]!
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  stash_box_endpoint: String
 }
 
 input StashBoxDraftSubmissionInput {
   id: String!
-  stash_box_index: Int!
+  stash_box_index: Int @deprecated(reason: "use stash_box_endpoint")
+  stash_box_endpoint: String
 }

graphql/schema/types/stats.graphql

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

graphql/schema/types/studio.graphql

@@ -1,61 +1,91 @@
 type Studio {
   id: ID!
   name: String!
-  checksum: String! @deprecated(reason: "MD5 hash of name, use name directly")
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]!
   parent_studio: Studio
   child_studios: [Studio!]!
   aliases: [String!]!
+  tags: [Tag!]!
   ignore_auto_tag: Boolean!
+  organized: Boolean!
 
   image_path: String # 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
+  group_count(depth: Int): Int! # Resolver
+  movie_count(depth: Int): Int! @deprecated(reason: "use group_count instead") # Resolver
   stash_ids: [StashID!]!
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean!
   details: String
   created_at: Time!
   updated_at: Time!
-  movies: [Movie!]!
+  groups: [Group!]!
+  movies: [Movie!]! @deprecated(reason: "use groups instead")
+  o_counter: Int
+
+  custom_fields: Map!
 }
 
 input StudioCreateInput {
   name: String!
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean
   details: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
+  tag_ids: [ID!]
   ignore_auto_tag: Boolean
+  organized: Boolean
+
+  custom_fields: Map
 }
 
 input StudioUpdateInput {
   id: ID!
   name: String
-  url: String
+  url: String @deprecated(reason: "Use urls")
+  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
   stash_ids: [StashIDInput!]
-  # rating expressed as 1-5
-  rating: Int @deprecated(reason: "Use 1-100 range with rating100")
   # rating expressed as 1-100
   rating100: Int
+  favorite: Boolean
   details: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
+  tag_ids: [ID!]
   ignore_auto_tag: Boolean
+  organized: Boolean
+
+  custom_fields: CustomFieldsInput
+}
+
+input BulkStudioUpdateInput {
+  ids: [ID!]!
+  url: String @deprecated(reason: "Use urls")
+  urls: BulkUpdateStrings
+  parent_id: ID
+  # rating expressed as 1-100
+  rating100: Int
+  favorite: Boolean
+  details: String
+  tag_ids: BulkUpdateIds
+  ignore_auto_tag: Boolean
+  organized: Boolean
 }
 
 input StudioDestroyInput {

graphql/schema/types/tag.graphql

@@ -1,50 +1,69 @@
 type Tag {
   id: ID!
   name: String!
+  "Value that does not appear in the UI but overrides name for sorting"
+  sort_name: String
   description: String
   aliases: [String!]!
   ignore_auto_tag: Boolean!
   created_at: Time!
   updated_at: Time!
-
+  favorite: Boolean!
+  stash_ids: [StashID!]!
   image_path: String # Resolver
   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
+  studio_count(depth: Int): Int! # Resolver
+  group_count(depth: Int): Int! # Resolver
+  movie_count(depth: Int): Int! @deprecated(reason: "use group_count instead") # Resolver
   parents: [Tag!]!
   children: [Tag!]!
 
   parent_count: Int! # Resolver
   child_count: Int! # Resolver
+  custom_fields: Map!
 }
 
 input TagCreateInput {
   name: String!
+  "Value that does not appear in the UI but overrides name for sorting"
+  sort_name: String
   description: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   ignore_auto_tag: Boolean
-
+  favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
+  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]
+
+  custom_fields: Map
 }
 
 input TagUpdateInput {
   id: ID!
   name: String
+  "Value that does not appear in the UI but overrides name for sorting"
+  sort_name: String
   description: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
   aliases: [String!]
   ignore_auto_tag: Boolean
-
+  favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
+  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]
+
+  custom_fields: CustomFieldsInput
 }
 
 input TagDestroyInput {
@@ -59,4 +78,18 @@ type FindTagsResultType {
 input TagsMergeInput {
   source: [ID!]!
   destination: ID!
+  # values defined here will override values in the destination
+  values: TagUpdateInput
+}
+
+input BulkTagUpdateInput {
+  ids: [ID!]
+  description: String
+  "Duplicate aliases and those equal to name will result in an error (case-insensitive)"
+  aliases: BulkUpdateStrings
+  ignore_auto_tag: Boolean
+  favorite: Boolean
+
+  parent_ids: BulkUpdateIds
+  child_ids: BulkUpdateIds
 }

graphql/stash-box/query.graphql

@@ -13,6 +13,7 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
   name
   id
+  aliases
   urls {
     ...URLFragment
   }
@@ -28,11 +29,8 @@ fragment StudioFragment on Studio {
 fragment TagFragment on Tag {
   name
   id
-}
-
-fragment FuzzyDateFragment on FuzzyDate {
-  date
-  accuracy
+  description
+  aliases
 }
 
 fragment MeasurementsFragment on Measurements {
@@ -54,15 +52,16 @@ fragment PerformerFragment on Performer {
   aliases
   gender
   merged_ids
+  deleted
+  merged_into_id
   urls {
     ...URLFragment
   }
   images {
     ...ImageFragment
   }
-  birthdate {
-    ...FuzzyDateFragment
-  }
+  birth_date
+  death_date
   ethnicity
   country
   eye_color
@@ -123,18 +122,6 @@ fragment SceneFragment on Scene {
   }
 }
 
-query FindSceneByFingerprint($fingerprint: FingerprintQueryInput!) {
-  findSceneByFingerprint(fingerprint: $fingerprint) {
-    ...SceneFragment
-  }
-}
-
-query FindScenesByFullFingerprints($fingerprints: [FingerprintQueryInput!]!) {
-  findScenesByFullFingerprints(fingerprints: $fingerprints) {
-    ...SceneFragment
-  }
-}
-
 query FindScenesBySceneFingerprints(
   $fingerprints: [[FingerprintQueryInput!]!]!
 ) {
@@ -173,6 +160,21 @@ query FindStudio($id: ID, $name: String) {
   }
 }
 
+query FindTag($id: ID, $name: String) {
+  findTag(id: $id, name: $name) {
+    ...TagFragment
+  }
+}
+
+query QueryTags($input: TagQueryInput!) {
+  queryTags(input: $input) {
+    count
+    tags {
+      ...TagFragment
+    }
+  }
+}
+
 mutation SubmitFingerprint($input: FingerprintSubmission!) {
   submitFingerprint(input: $input)
 }

internal/api/authentication.go

@@ -16,12 +16,12 @@ import (
 
 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"
+		"More information and fixes are available at https://discourse.stashapp.cc/t/-/1658"
 
 	externalAccessErrMsg = "You have attempted to access Stash over the internet, and authentication is not enabled. " +
 		"This is extremely dangerous! The whole world can see your your stash page and browse your files! " +
 		"Stash is not answering any other requests to protect your privacy. " +
-		"Please read the log entry or visit https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet"
+		"Please read the log entry or visit https://discourse.stashapp.cc/t/-/1658"
 )
 
 func allowUnauthenticated(r *http.Request) bool {
@@ -40,9 +40,11 @@ func authenticateHandler() func(http.Handler) http.Handler {
 				return
 			}
 
+			r = session.SetLocalRequest(r)
+
 			userID, err := manager.GetInstance().SessionStore.Authenticate(w, r)
 			if err != nil {
-				if errors.Is(err, session.ErrUnauthorized) {
+				if !errors.Is(err, session.ErrUnauthorized) {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
 				}

internal/api/bool_map.go

@@ -0,0 +1,38 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+
+	"github.com/99designs/gqlgen/graphql"
+)
+
+func MarshalBoolMap(val map[string]bool) graphql.Marshaler {
+	return graphql.WriterFunc(func(w io.Writer) {
+		err := json.NewEncoder(w).Encode(val)
+		if err != nil {
+			panic(err)
+		}
+	})
+}
+
+func UnmarshalBoolMap(v interface{}) (map[string]bool, error) {
+	m, ok := v.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("%T is not a map", v)
+	}
+
+	result := make(map[string]bool)
+	for k, v := range m {
+		key := k
+		val, ok := v.(bool)
+		if !ok {
+			return nil, fmt.Errorf("key %s (%T) is not a bool", k, v)
+		}
+
+		result[key] = val
+	}
+
+	return result, nil
+}

internal/api/changeset_translator.go

@@ -98,7 +98,7 @@ func (t changesetTranslator) string(value *string) string {
 		return ""
 	}
 
-	return *value
+	return strings.TrimSpace(*value)
 }
 
 func (t changesetTranslator) optionalString(value *string, field string) models.OptionalString {
@@ -106,7 +106,12 @@ func (t changesetTranslator) optionalString(value *string, field string) models.
 		return models.OptionalString{}
 	}
 
-	return models.NewOptionalStringPtr(value)
+	if value == nil {
+		return models.NewOptionalStringPtr(nil)
+	}
+
+	trimmed := strings.TrimSpace(*value)
+	return models.NewOptionalString(trimmed)
 }
 
 func (t changesetTranslator) optionalDate(value *string, field string) (models.OptionalDate, error) {
@@ -153,40 +158,6 @@ func (t changesetTranslator) intPtrFromString(value *string) (*int, error) {
 	return &vv, nil
 }
 
-func (t changesetTranslator) ratingConversion(legacyValue *int, rating100Value *int) *int {
-	const (
-		legacyField    = "rating"
-		rating100Field = "rating100"
-	)
-
-	legacyRating := t.optionalInt(legacyValue, legacyField)
-	if legacyRating.Set && !legacyRating.Null {
-		ret := models.Rating5To100(legacyRating.Value)
-		return &ret
-	}
-
-	o := t.optionalInt(rating100Value, rating100Field)
-	if o.Set && !o.Null {
-		return &o.Value
-	}
-
-	return nil
-}
-
-func (t changesetTranslator) optionalRatingConversion(legacyValue *int, rating100Value *int) models.OptionalInt {
-	const (
-		legacyField    = "rating"
-		rating100Field = "rating100"
-	)
-
-	legacyRating := t.optionalInt(legacyValue, legacyField)
-	if legacyRating.Set && !legacyRating.Null {
-		legacyRating.Value = models.Rating5To100(legacyRating.Value)
-		return legacyRating
-	}
-	return t.optionalInt(rating100Value, rating100Field)
-}
-
 func (t changesetTranslator) optionalInt(value *int, field string) models.OptionalInt {
 	if !t.hasField(field) {
 		return models.OptionalInt{}
@@ -352,8 +323,14 @@ func (t changesetTranslator) updateStrings(value []string, field string) *models
 		return nil
 	}
 
+	// Trim whitespace from each string
+	trimmedValues := make([]string, len(value))
+	for i, v := range value {
+		trimmedValues[i] = strings.TrimSpace(v)
+	}
+
 	return &models.UpdateStrings{
-		Values: value,
+		Values: trimmedValues,
 		Mode:   models.RelationshipUpdateModeSet,
 	}
 }
@@ -363,49 +340,98 @@ func (t changesetTranslator) updateStringsBulk(value *BulkUpdateStrings, field s
 		return nil
 	}
 
+	// Trim whitespace from each string
+	trimmedValues := make([]string, len(value.Values))
+	for i, v := range value.Values {
+		trimmedValues[i] = strings.TrimSpace(v)
+	}
+
 	return &models.UpdateStrings{
-		Values: value.Values,
+		Values: trimmedValues,
 		Mode:   value.Mode,
 	}
 }
 
-func (t changesetTranslator) updateStashIDs(value []models.StashID, field string) *models.UpdateStashIDs {
+func (t changesetTranslator) updateStashIDs(value models.StashIDInputs, field string) *models.UpdateStashIDs {
 	if !t.hasField(field) {
 		return nil
 	}
 
 	return &models.UpdateStashIDs{
-		StashIDs: value,
+		StashIDs: value.ToStashIDs(),
 		Mode:     models.RelationshipUpdateModeSet,
 	}
 }
 
-func (t changesetTranslator) relatedMovies(value []models.SceneMovieInput) (models.RelatedMovies, error) {
-	moviesScenes, err := models.MoviesScenesFromInput(value)
+func (t changesetTranslator) relatedGroupsFromMovies(value []models.SceneMovieInput) (models.RelatedGroups, error) {
+	groupsScenes, err := models.GroupsScenesFromInput(value)
 	if err != nil {
-		return models.RelatedMovies{}, err
+		return models.RelatedGroups{}, err
 	}
 
-	return models.NewRelatedMovies(moviesScenes), nil
+	return models.NewRelatedGroups(groupsScenes), nil
 }
 
-func (t changesetTranslator) updateMovieIDs(value []models.SceneMovieInput, field string) (*models.UpdateMovieIDs, error) {
+func groupsScenesFromGroupInput(input []models.SceneGroupInput) ([]models.GroupsScenes, error) {
+	ret := make([]models.GroupsScenes, len(input))
+
+	for i, v := range input {
+		mID, err := strconv.Atoi(v.GroupID)
+		if err != nil {
+			return nil, fmt.Errorf("invalid group ID: %s", v.GroupID)
+		}
+
+		ret[i] = models.GroupsScenes{
+			GroupID:    mID,
+			SceneIndex: v.SceneIndex,
+		}
+	}
+
+	return ret, nil
+}
+
+func (t changesetTranslator) relatedGroups(value []models.SceneGroupInput) (models.RelatedGroups, error) {
+	groupsScenes, err := groupsScenesFromGroupInput(value)
+	if err != nil {
+		return models.RelatedGroups{}, err
+	}
+
+	return models.NewRelatedGroups(groupsScenes), nil
+}
+
+func (t changesetTranslator) updateGroupIDsFromMovies(value []models.SceneMovieInput, field string) (*models.UpdateGroupIDs, error) {
 	if !t.hasField(field) {
 		return nil, nil
 	}
 
-	moviesScenes, err := models.MoviesScenesFromInput(value)
+	groupsScenes, err := models.GroupsScenesFromInput(value)
 	if err != nil {
 		return nil, err
 	}
 
-	return &models.UpdateMovieIDs{
-		Movies: moviesScenes,
+	return &models.UpdateGroupIDs{
+		Groups: groupsScenes,
 		Mode:   models.RelationshipUpdateModeSet,
 	}, nil
 }
 
-func (t changesetTranslator) updateMovieIDsBulk(value *BulkUpdateIds, field string) (*models.UpdateMovieIDs, error) {
+func (t changesetTranslator) updateGroupIDs(value []models.SceneGroupInput, field string) (*models.UpdateGroupIDs, error) {
+	if !t.hasField(field) {
+		return nil, nil
+	}
+
+	groupsScenes, err := groupsScenesFromGroupInput(value)
+	if err != nil {
+		return nil, err
+	}
+
+	return &models.UpdateGroupIDs{
+		Groups: groupsScenes,
+		Mode:   models.RelationshipUpdateModeSet,
+	}, nil
+}
+
+func (t changesetTranslator) updateGroupIDsBulk(value *BulkUpdateIds, field string) (*models.UpdateGroupIDs, error) {
 	if !t.hasField(field) || value == nil {
 		return nil, nil
 	}
@@ -415,13 +441,74 @@ func (t changesetTranslator) updateMovieIDsBulk(value *BulkUpdateIds, field stri
 		return nil, fmt.Errorf("converting ids [%v]: %w", value.Ids, err)
 	}
 
-	movies := make([]models.MoviesScenes, len(ids))
+	groups := make([]models.GroupsScenes, len(ids))
 	for i, id := range ids {
-		movies[i] = models.MoviesScenes{MovieID: id}
+		groups[i] = models.GroupsScenes{GroupID: id}
 	}
 
-	return &models.UpdateMovieIDs{
-		Movies: movies,
+	return &models.UpdateGroupIDs{
+		Groups: groups,
+		Mode:   value.Mode,
+	}, nil
+}
+
+func groupsDescriptionsFromGroupInput(input []*GroupDescriptionInput) ([]models.GroupIDDescription, error) {
+	ret := make([]models.GroupIDDescription, len(input))
+
+	for i, v := range input {
+		gID, err := strconv.Atoi(v.GroupID)
+		if err != nil {
+			return nil, fmt.Errorf("invalid group ID: %s", v.GroupID)
+		}
+
+		ret[i] = models.GroupIDDescription{
+			GroupID: gID,
+		}
+		if v.Description != nil {
+			ret[i].Description = strings.TrimSpace(*v.Description)
+		}
+	}
+
+	return ret, nil
+}
+
+func (t changesetTranslator) groupIDDescriptions(value []*GroupDescriptionInput) (models.RelatedGroupDescriptions, error) {
+	groupsScenes, err := groupsDescriptionsFromGroupInput(value)
+	if err != nil {
+		return models.RelatedGroupDescriptions{}, err
+	}
+
+	return models.NewRelatedGroupDescriptions(groupsScenes), nil
+}
+
+func (t changesetTranslator) updateGroupIDDescriptions(value []*GroupDescriptionInput, field string) (*models.UpdateGroupDescriptions, error) {
+	if !t.hasField(field) {
+		return nil, nil
+	}
+
+	groupsScenes, err := groupsDescriptionsFromGroupInput(value)
+	if err != nil {
+		return nil, err
+	}
+
+	return &models.UpdateGroupDescriptions{
+		Groups: groupsScenes,
+		Mode:   models.RelationshipUpdateModeSet,
+	}, nil
+}
+
+func (t changesetTranslator) updateGroupIDDescriptionsBulk(value *BulkUpdateGroupDescriptionsInput, field string) (*models.UpdateGroupDescriptions, error) {
+	if !t.hasField(field) || value == nil {
+		return nil, nil
+	}
+
+	groups, err := groupsDescriptionsFromGroupInput(value.Groups)
+	if err != nil {
+		return nil, err
+	}
+
+	return &models.UpdateGroupDescriptions{
+		Groups: groups,
 		Mode:   value.Mode,
 	}, nil
 }

internal/api/check_version.go

@@ -7,8 +7,10 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"regexp"
 	"runtime"
+	"strings"
 	"time"
 
 	"golang.org/x/sys/cpu"
@@ -26,8 +28,8 @@ const defaultSHLength int = 8 // default length of SHA short hash returned by <g
 
 var stashReleases = func() map[string]string {
 	return map[string]string{
-		"darwin/amd64":  "stash-osx",
-		"darwin/arm64":  "stash-osx-applesilicon",
+		"darwin/amd64":  "stash-macos",
+		"darwin/arm64":  "stash-macos",
 		"linux/amd64":   "stash-linux",
 		"windows/amd64": "stash-win.exe",
 		"linux/arm":     "stash-linux-arm32v6",
@@ -36,6 +38,24 @@ var stashReleases = func() map[string]string {
 	}
 }
 
+// isMacOSBundle checks if the application is running from within a macOS .app bundle
+func isMacOSBundle() bool {
+	exec, err := os.Executable()
+	return err == nil && strings.Contains(exec, "Stash.app/")
+}
+
+// getWantedRelease determines which release variant to download based on platform and bundle type
+func getWantedRelease(platform string) string {
+	release := stashReleases()[platform]
+
+	// On macOS, check if running from .app bundle
+	if runtime.GOOS == "darwin" && isMacOSBundle() {
+		return "Stash.app.zip"
+	}
+
+	return release
+}
+
 type githubReleasesResponse struct {
 	Url              string
 	Assets_url       string
@@ -168,7 +188,7 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 	}
 
 	platform := fmt.Sprintf("%s/%s", runtime.GOOS, arch)
-	wantedRelease := stashReleases()[platform]
+	wantedRelease := getWantedRelease(platform)
 
 	url := apiReleases
 	if build.IsDevelop() {

internal/api/context_keys.go

@@ -5,12 +5,13 @@ package api
 type key int
 
 const (
-	// galleryKey key = 0
-	performerKey key = iota + 1
+	galleryKey key = 0
+	performerKey
 	sceneKey
 	studioKey
-	movieKey
+	groupKey
 	tagKey
 	downloadKey
 	imageKey
+	pluginKey
 )

internal/api/custom_fields.go

@@ -0,0 +1,12 @@
+package api
+
+import "github.com/stashapp/stash/pkg/models"
+
+func handleUpdateCustomFields(input models.CustomFieldsInput) models.CustomFieldsInput {
+	ret := input
+	// convert json.Numbers to int/float
+	ret.Full = convertMapJSONNumbers(ret.Full)
+	ret.Partial = convertMapJSONNumbers(ret.Partial)
+
+	return ret
+}

internal/api/dir_list.go

@@ -4,6 +4,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"golang.org/x/text/collate"
 )
@@ -25,13 +26,27 @@ func (s dirLister) Bytes(i int) []byte {
 // listDir will return the contents of a given directory path as a string slice
 func listDir(col *collate.Collator, path string) ([]string, error) {
 	var dirPaths []string
+	dirPath := path
+
 	files, err := os.ReadDir(path)
 	if err != nil {
-		path = filepath.Dir(path)
-		files, err = os.ReadDir(path)
+		dirPath = filepath.Dir(path)
+		dirFiles, err := os.ReadDir(dirPath)
 		if err != nil {
 			return dirPaths, err
 		}
+
+		// Filter dir contents by last path fragment if the dir isn't an exact match
+		base := strings.ToLower(filepath.Base(path))
+		if base != "." && base != string(filepath.Separator) {
+			for _, file := range dirFiles {
+				if strings.HasPrefix(strings.ToLower(file.Name()), base) {
+					files = append(files, file)
+				}
+			}
+		} else {
+			files = dirFiles
+		}
 	}
 
 	if col != nil {
@@ -42,7 +57,7 @@ func listDir(col *collate.Collator, path string) ([]string, error) {
 		if !file.IsDir() {
 			continue
 		}
-		dirPaths = append(dirPaths, filepath.Join(path, file.Name()))
+		dirPaths = append(dirPaths, filepath.Join(dirPath, file.Name()))
 	}
 	return dirPaths, nil
 }

internal/api/doc.go

@@ -0,0 +1,2 @@
+// Package api provides the HTTP and Graphql API for the application.
+package api

internal/api/fields.go

@@ -0,0 +1,23 @@
+package api
+
+import (
+	"context"
+
+	"github.com/99designs/gqlgen/graphql"
+)
+
+type queryFields []string
+
+func collectQueryFields(ctx context.Context) queryFields {
+	fields := graphql.CollectAllFields(ctx)
+	return queryFields(fields)
+}
+
+func (f queryFields) Has(field string) bool {
+	for _, v := range f {
+		if v == field {
+			return true
+		}
+	}
+	return false
+}

internal/api/images.go

@@ -1,12 +1,13 @@
 package api
 
 import (
+	"errors"
+	"fmt"
 	"io"
 	"io/fs"
 	"os"
 	"strings"
 
-	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/hash"
 	"github.com/stashapp/stash/pkg/logger"
@@ -18,13 +19,14 @@ type imageBox struct {
 	files []string
 }
 
-var imageExtensions = []string{
+var imageBoxExts = []string{
 	".jpg",
 	".jpeg",
 	".png",
 	".gif",
 	".svg",
 	".webp",
+	".avif",
 }
 
 func newImageBox(box fs.FS) (*imageBox, error) {
@@ -42,7 +44,7 @@ func newImageBox(box fs.FS) (*imageBox, error) {
 		}
 
 		baseName := strings.ToLower(d.Name())
-		for _, ext := range imageExtensions {
+		for _, ext := range imageBoxExts {
 			if strings.HasSuffix(baseName, ext) {
 				ret.files = append(ret.files, path)
 				break
@@ -55,65 +57,14 @@ func newImageBox(box fs.FS) (*imageBox, error) {
 	return ret, err
 }
 
-var performerBox *imageBox
-var performerBoxMale *imageBox
-var performerBoxCustom *imageBox
-
-func initialiseImages() {
-	var err error
-	performerBox, err = newImageBox(&static.Performer)
-	if err != nil {
-		logger.Warnf("error loading performer images: %v", err)
-	}
-	performerBoxMale, err = newImageBox(&static.PerformerMale)
-	if err != nil {
-		logger.Warnf("error loading male performer images: %v", err)
-	}
-	initialiseCustomImages()
-}
-
-func initialiseCustomImages() {
-	customPath := config.GetInstance().GetCustomPerformerImageLocation()
-	if customPath != "" {
-		logger.Debugf("Loading custom performer images from %s", customPath)
-		// We need to set performerBoxCustom at runtime, as this is a custom path, and store it in a pointer.
-		var err error
-		performerBoxCustom, err = newImageBox(os.DirFS(customPath))
-		if err != nil {
-			logger.Warnf("error loading custom performer from %s: %v", customPath, err)
-		}
-	} else {
-		performerBoxCustom = nil
-	}
-}
-
-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.
-	if performerBoxCustom != nil && len(performerBoxCustom.files) > 0 {
-		box = performerBoxCustom
+func (box *imageBox) GetRandomImageByName(name string) ([]byte, error) {
+	files := box.files
+	if len(files) == 0 {
+		return nil, errors.New("box is empty")
 	}
 
-	var g models.GenderEnum
-	if gender != nil {
-		g = *gender
-	}
-
-	if box == nil {
-		switch g {
-		case models.GenderEnumFemale, models.GenderEnumTransgenderFemale:
-			box = performerBox
-		case models.GenderEnumMale, models.GenderEnumTransgenderMale:
-			box = performerBoxMale
-		default:
-			box = performerBox
-		}
-	}
-
-	imageFiles := box.files
-	index := hash.IntFromString(name) % uint64(len(imageFiles))
-	img, err := box.box.Open(imageFiles[index])
+	index := hash.IntFromString(name) % uint64(len(files))
+	img, err := box.box.Open(files[index])
 	if err != nil {
 		return nil, err
 	}
@@ -121,3 +72,68 @@ func getRandomPerformerImageUsingName(name string, gender *models.GenderEnum, cu
 
 	return io.ReadAll(img)
 }
+
+var performerBox *imageBox
+var performerBoxMale *imageBox
+var performerBoxCustom *imageBox
+
+func init() {
+	var err error
+	performerBox, err = newImageBox(static.Sub(static.Performer))
+	if err != nil {
+		panic(fmt.Sprintf("loading performer images: %v", err))
+	}
+	performerBoxMale, err = newImageBox(static.Sub(static.PerformerMale))
+	if err != nil {
+		panic(fmt.Sprintf("loading male performer images: %v", err))
+	}
+}
+
+func initCustomPerformerImages(customPath string) {
+	if customPath != "" {
+		logger.Debugf("Loading custom performer images from %s", customPath)
+		var err error
+		performerBoxCustom, err = newImageBox(os.DirFS(customPath))
+		if err != nil {
+			logger.Warnf("error loading custom performer images from %s: %v", customPath, err)
+		}
+	} else {
+		performerBoxCustom = nil
+	}
+}
+
+func getDefaultPerformerImage(name string, gender *models.GenderEnum, sfwMode bool) []byte {
+	// try the custom box first if we have one
+	if performerBoxCustom != nil {
+		ret, err := performerBoxCustom.GetRandomImageByName(name)
+		if err == nil {
+			return ret
+		}
+		logger.Warnf("error loading custom default performer image: %v", err)
+	}
+
+	if sfwMode {
+		return static.ReadAll(static.DefaultSFWPerformerImage)
+	}
+
+	var g models.GenderEnum
+	if gender != nil {
+		g = *gender
+	}
+
+	var box *imageBox
+	switch g {
+	case models.GenderEnumFemale, models.GenderEnumTransgenderFemale:
+		box = performerBox
+	case models.GenderEnumMale, models.GenderEnumTransgenderMale:
+		box = performerBoxMale
+	default:
+		box = performerBox
+	}
+
+	ret, err := box.GetRandomImageByName(name)
+	if err != nil {
+		logger.Warnf("error loading default performer image: %v", err)
+	}
+	return ret
+}

internal/api/input.go

@@ -0,0 +1,35 @@
+package api
+
+import (
+	"fmt"
+
+	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
+)
+
+// TODO - apply handleIDs to other resolvers that accept ID lists
+
+// handleIDList validates and converts a list of string IDs to integers
+func handleIDList(idList []string, field string) ([]int, error) {
+	if err := validateIDList(idList); err != nil {
+		return nil, fmt.Errorf("validating %s: %w", field, err)
+	}
+
+	ids, err := stringslice.StringSliceToIntSlice(idList)
+	if err != nil {
+		return nil, fmt.Errorf("converting %s: %w", field, err)
+	}
+
+	return ids, nil
+}
+
+// validateIDList returns an error if there are any duplicate ids in the list
+func validateIDList(ids []string) error {
+	seen := make(map[string]struct{})
+	for _, id := range ids {
+		if _, exists := seen[id]; exists {
+			return fmt.Errorf("duplicate id found: %s", id)
+		}
+		seen[id] = struct{}{}
+	}
+	return nil
+}

internal/api/json.go

@@ -0,0 +1,65 @@
+package api
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// jsonNumberToNumber converts a JSON number to either a float64 or int64.
+func jsonNumberToNumber(n json.Number) interface{} {
+	if strings.Contains(string(n), ".") {
+		f, _ := n.Float64()
+		return f
+	}
+	ret, _ := n.Int64()
+	return ret
+}
+
+// anyJSONNumberToNumber converts a JSON number using jsonNumberToNumber, otherwise it returns the existing value
+func anyJSONNumberToNumber(v any) any {
+	if n, ok := v.(json.Number); ok {
+		return jsonNumberToNumber(n)
+	}
+
+	return v
+}
+
+// ConvertMapJSONNumbers converts all JSON numbers in a map to either float64 or int64.
+func convertMapJSONNumbers(m map[string]interface{}) (ret map[string]interface{}) {
+	if m == nil {
+		return nil
+	}
+
+	ret = make(map[string]interface{})
+	for k, v := range m {
+		if n, ok := v.(json.Number); ok {
+			ret[k] = jsonNumberToNumber(n)
+		} else if mm, ok := v.(map[string]interface{}); ok {
+			ret[k] = convertMapJSONNumbers(mm)
+		} else {
+			ret[k] = v
+		}
+	}
+
+	return ret
+}
+
+func convertCustomFieldCriterionValues(c models.CustomFieldCriterionInput) models.CustomFieldCriterionInput {
+	nv := make([]any, len(c.Value))
+	for i, v := range c.Value {
+		nv[i] = anyJSONNumberToNumber(v)
+	}
+	c.Value = nv
+	return c
+}
+
+func convertCustomFieldCriterionInputJSONNumbers(c []models.CustomFieldCriterionInput) []models.CustomFieldCriterionInput {
+	ret := make([]models.CustomFieldCriterionInput, len(c))
+	for i, v := range c {
+		ret[i] = convertCustomFieldCriterionValues(v)
+	}
+
+	return ret
+}

internal/api/json_test.go

@@ -0,0 +1,60 @@
+package api
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestConvertMapJSONNumbers(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    map[string]interface{}
+		expected map[string]interface{}
+	}{
+		{
+			name: "Convert JSON numbers to numbers",
+			input: map[string]interface{}{
+				"int":    json.Number("12"),
+				"float":  json.Number("12.34"),
+				"string": "foo",
+			},
+			expected: map[string]interface{}{
+				"int":    int64(12),
+				"float":  12.34,
+				"string": "foo",
+			},
+		},
+		{
+			name: "Convert JSON numbers to numbers in nested maps",
+			input: map[string]interface{}{
+				"foo": map[string]interface{}{
+					"int":           json.Number("56"),
+					"float":         json.Number("56.78"),
+					"nested-string": "bar",
+				},
+				"int":    json.Number("12"),
+				"float":  json.Number("12.34"),
+				"string": "foo",
+			},
+			expected: map[string]interface{}{
+				"foo": map[string]interface{}{
+					"int":           int64(56),
+					"float":         56.78,
+					"nested-string": "bar",
+				},
+				"int":    int64(12),
+				"float":  12.34,
+				"string": "foo",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := convertMapJSONNumbers(tt.input)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}

internal/api/loaders/customfieldsloader_gen.go

@@ -0,0 +1,221 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// CustomFieldsLoaderConfig captures the config to create a new CustomFieldsLoader
+type CustomFieldsLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([]models.CustomFieldMap, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewCustomFieldsLoader creates a new CustomFieldsLoader given a fetch, wait, and maxBatch
+func NewCustomFieldsLoader(config CustomFieldsLoaderConfig) *CustomFieldsLoader {
+	return &CustomFieldsLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// CustomFieldsLoader batches and caches requests
+type CustomFieldsLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([]models.CustomFieldMap, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int]models.CustomFieldMap
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *customFieldsLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type customFieldsLoaderBatch struct {
+	keys    []int
+	data    []models.CustomFieldMap
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a CustomFieldMap by key, batching and caching will be applied automatically
+func (l *CustomFieldsLoader) Load(key int) (models.CustomFieldMap, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a CustomFieldMap.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *CustomFieldsLoader) LoadThunk(key int) func() (models.CustomFieldMap, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (models.CustomFieldMap, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &customFieldsLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (models.CustomFieldMap, error) {
+		<-batch.done
+
+		var data models.CustomFieldMap
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *CustomFieldsLoader) LoadAll(keys []int) ([]models.CustomFieldMap, []error) {
+	results := make([]func() (models.CustomFieldMap, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	customFieldMaps := make([]models.CustomFieldMap, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		customFieldMaps[i], errors[i] = thunk()
+	}
+	return customFieldMaps, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a CustomFieldMaps.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *CustomFieldsLoader) LoadAllThunk(keys []int) func() ([]models.CustomFieldMap, []error) {
+	results := make([]func() (models.CustomFieldMap, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]models.CustomFieldMap, []error) {
+		customFieldMaps := make([]models.CustomFieldMap, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			customFieldMaps[i], errors[i] = thunk()
+		}
+		return customFieldMaps, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *CustomFieldsLoader) Prime(key int, value models.CustomFieldMap) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		l.unsafeSet(key, value)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *CustomFieldsLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *CustomFieldsLoader) unsafeSet(key int, value models.CustomFieldMap) {
+	if l.cache == nil {
+		l.cache = map[int]models.CustomFieldMap{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *customFieldsLoaderBatch) keyIndex(l *CustomFieldsLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *customFieldsLoaderBatch) startTimer(l *CustomFieldsLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *customFieldsLoaderBatch) end(l *CustomFieldsLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/dataloaders.go

@@ -1,15 +1,25 @@
+// Package loaders contains the dataloaders used by the resolver in [api].
+// They are generated with `make generate-dataloaders`.
+// The dataloaders are used to batch requests to the database.
+
 //go:generate go run github.com/vektah/dataloaden SceneLoader int *github.com/stashapp/stash/pkg/models.Scene
 //go:generate go run github.com/vektah/dataloaden GalleryLoader int *github.com/stashapp/stash/pkg/models.Gallery
 //go:generate go run github.com/vektah/dataloaden ImageLoader int *github.com/stashapp/stash/pkg/models.Image
 //go:generate go run github.com/vektah/dataloaden PerformerLoader int *github.com/stashapp/stash/pkg/models.Performer
 //go:generate go run github.com/vektah/dataloaden StudioLoader int *github.com/stashapp/stash/pkg/models.Studio
 //go:generate go run github.com/vektah/dataloaden TagLoader int *github.com/stashapp/stash/pkg/models.Tag
-//go:generate go run github.com/vektah/dataloaden MovieLoader int *github.com/stashapp/stash/pkg/models.Movie
+//go:generate go run github.com/vektah/dataloaden GroupLoader int *github.com/stashapp/stash/pkg/models.Group
 //go:generate go run github.com/vektah/dataloaden FileLoader github.com/stashapp/stash/pkg/models.FileID github.com/stashapp/stash/pkg/models.File
+//go:generate go run github.com/vektah/dataloaden FolderLoader github.com/stashapp/stash/pkg/models.FolderID *github.com/stashapp/stash/pkg/models.Folder
 //go:generate go run github.com/vektah/dataloaden SceneFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden ImageFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden GalleryFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
-
+//go:generate go run github.com/vektah/dataloaden CustomFieldsLoader int github.com/stashapp/stash/pkg/models.CustomFieldMap
+//go:generate go run github.com/vektah/dataloaden SceneOCountLoader int int
+//go:generate go run github.com/vektah/dataloaden ScenePlayCountLoader int int
+//go:generate go run github.com/vektah/dataloaden SceneOHistoryLoader int []time.Time
+//go:generate go run github.com/vektah/dataloaden ScenePlayHistoryLoader int []time.Time
+//go:generate go run github.com/vektah/dataloaden SceneLastPlayedLoader int *time.Time
 package loaders
 
 import (
@@ -17,9 +27,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/txn"
 )
 
 type contextKey struct{ name string }
@@ -34,23 +42,39 @@ const (
 )
 
 type Loaders struct {
-	SceneByID    *SceneLoader
-	SceneFiles   *SceneFileIDsLoader
+	SceneByID         *SceneLoader
+	SceneFiles        *SceneFileIDsLoader
+	ScenePlayCount    *ScenePlayCountLoader
+	SceneOCount       *SceneOCountLoader
+	ScenePlayHistory  *ScenePlayHistoryLoader
+	SceneOHistory     *SceneOHistoryLoader
+	SceneLastPlayed   *SceneLastPlayedLoader
+	SceneCustomFields *CustomFieldsLoader
+
 	ImageFiles   *ImageFileIDsLoader
 	GalleryFiles *GalleryFileIDsLoader
 
-	GalleryByID   *GalleryLoader
-	ImageByID     *ImageLoader
-	PerformerByID *PerformerLoader
-	StudioByID    *StudioLoader
-	TagByID       *TagLoader
-	MovieByID     *MovieLoader
-	FileByID      *FileLoader
+	GalleryByID         *GalleryLoader
+	GalleryCustomFields *CustomFieldsLoader
+	ImageByID           *ImageLoader
+	ImageCustomFields   *CustomFieldsLoader
+
+	PerformerByID         *PerformerLoader
+	PerformerCustomFields *CustomFieldsLoader
+
+	StudioByID         *StudioLoader
+	StudioCustomFields *CustomFieldsLoader
+
+	TagByID           *TagLoader
+	TagCustomFields   *CustomFieldsLoader
+	GroupByID         *GroupLoader
+	GroupCustomFields *CustomFieldsLoader
+	FileByID          *FileLoader
+	FolderByID        *FolderLoader
 }
 
 type Middleware struct {
-	DatabaseProvider txn.DatabaseProvider
-	Repository       manager.Repository
+	Repository models.Repository
 }
 
 func (m Middleware) Middleware(next http.Handler) http.Handler {
@@ -67,16 +91,41 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchGalleries(ctx),
 			},
+			GalleryCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchGalleryCustomFields(ctx),
+			},
 			ImageByID: &ImageLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
 				fetch:    m.fetchImages(ctx),
 			},
+			ImageCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchImageCustomFields(ctx),
+			},
 			PerformerByID: &PerformerLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
 				fetch:    m.fetchPerformers(ctx),
 			},
+			PerformerCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchPerformerCustomFields(ctx),
+			},
+			StudioCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchStudioCustomFields(ctx),
+			},
+			SceneCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchSceneCustomFields(ctx),
+			},
 			StudioByID: &StudioLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -87,16 +136,31 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchTags(ctx),
 			},
-			MovieByID: &MovieLoader{
+			TagCustomFields: &CustomFieldsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
-				fetch:    m.fetchMovies(ctx),
+				fetch:    m.fetchTagCustomFields(ctx),
+			},
+			GroupByID: &GroupLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchGroups(ctx),
+			},
+			GroupCustomFields: &CustomFieldsLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchGroupCustomFields(ctx),
 			},
 			FileByID: &FileLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
 				fetch:    m.fetchFiles(ctx),
 			},
+			FolderByID: &FolderLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchFolders(ctx),
+			},
 			SceneFiles: &SceneFileIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -112,6 +176,31 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchGalleriesFileIDs(ctx),
 			},
+			ScenePlayCount: &ScenePlayCountLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchScenesPlayCount(ctx),
+			},
+			SceneOCount: &SceneOCountLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchScenesOCount(ctx),
+			},
+			ScenePlayHistory: &ScenePlayHistoryLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchScenesPlayHistory(ctx),
+			},
+			SceneLastPlayed: &SceneLastPlayedLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchScenesLastPlayed(ctx),
+			},
+			SceneOHistory: &SceneOHistoryLoader{
+				wait:     wait,
+				maxBatch: maxBatch,
+				fetch:    m.fetchScenesOHistory(ctx),
+			},
 		}
 
 		newCtx := context.WithValue(r.Context(), loadersCtxKey, ldrs)
@@ -131,13 +220,9 @@ func toErrorSlice(err error) []error {
 	return nil
 }
 
-func (m Middleware) withTxn(ctx context.Context, fn func(ctx context.Context) error) error {
-	return txn.WithDatabase(ctx, m.DatabaseProvider, fn)
-}
-
 func (m Middleware) fetchScenes(ctx context.Context) func(keys []int) ([]*models.Scene, []error) {
 	return func(keys []int) (ret []*models.Scene, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Scene.FindMany(ctx, keys)
 			return err
@@ -146,9 +231,21 @@ func (m Middleware) fetchScenes(ctx context.Context) func(keys []int) ([]*models
 	}
 }
 
+func (m Middleware) fetchSceneCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchImages(ctx context.Context) func(keys []int) ([]*models.Image, []error) {
 	return func(keys []int) (ret []*models.Image, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Image.FindMany(ctx, keys)
 			return err
@@ -158,9 +255,21 @@ func (m Middleware) fetchImages(ctx context.Context) func(keys []int) ([]*models
 	}
 }
 
+func (m Middleware) fetchImageCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Image.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchGalleries(ctx context.Context) func(keys []int) ([]*models.Gallery, []error) {
 	return func(keys []int) (ret []*models.Gallery, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Gallery.FindMany(ctx, keys)
 			return err
@@ -172,7 +281,7 @@ func (m Middleware) fetchGalleries(ctx context.Context) func(keys []int) ([]*mod
 
 func (m Middleware) fetchPerformers(ctx context.Context) func(keys []int) ([]*models.Performer, []error) {
 	return func(keys []int) (ret []*models.Performer, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Performer.FindMany(ctx, keys)
 			return err
@@ -182,9 +291,21 @@ func (m Middleware) fetchPerformers(ctx context.Context) func(keys []int) ([]*mo
 	}
 }
 
+func (m Middleware) fetchPerformerCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Performer.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchStudios(ctx context.Context) func(keys []int) ([]*models.Studio, []error) {
 	return func(keys []int) (ret []*models.Studio, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Studio.FindMany(ctx, keys)
 			return err
@@ -193,9 +314,21 @@ func (m Middleware) fetchStudios(ctx context.Context) func(keys []int) ([]*model
 	}
 }
 
+func (m Middleware) fetchStudioCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Studio.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchTags(ctx context.Context) func(keys []int) ([]*models.Tag, []error) {
 	return func(keys []int) (ret []*models.Tag, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Tag.FindMany(ctx, keys)
 			return err
@@ -204,11 +337,47 @@ func (m Middleware) fetchTags(ctx context.Context) func(keys []int) ([]*models.T
 	}
 }
 
-func (m Middleware) fetchMovies(ctx context.Context) func(keys []int) ([]*models.Movie, []error) {
-	return func(keys []int) (ret []*models.Movie, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+func (m Middleware) fetchTagCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
-			ret, err = m.Repository.Movie.FindMany(ctx, keys)
+			ret, err = m.Repository.Tag.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchGroupCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Group.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchGalleryCustomFields(ctx context.Context) func(keys []int) ([]models.CustomFieldMap, []error) {
+	return func(keys []int) (ret []models.CustomFieldMap, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Gallery.GetCustomFieldsBulk(ctx, keys)
+			return err
+		})
+
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchGroups(ctx context.Context) func(keys []int) ([]*models.Group, []error) {
+	return func(keys []int) (ret []*models.Group, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Group.FindMany(ctx, keys)
 			return err
 		})
 		return ret, toErrorSlice(err)
@@ -217,7 +386,7 @@ func (m Middleware) fetchMovies(ctx context.Context) func(keys []int) ([]*models
 
 func (m Middleware) fetchFiles(ctx context.Context) func(keys []models.FileID) ([]models.File, []error) {
 	return func(keys []models.FileID) (ret []models.File, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.File.Find(ctx, keys...)
 			return err
@@ -226,9 +395,20 @@ func (m Middleware) fetchFiles(ctx context.Context) func(keys []models.FileID) (
 	}
 }
 
+func (m Middleware) fetchFolders(ctx context.Context) func(keys []models.FolderID) ([]*models.Folder, []error) {
+	return func(keys []models.FolderID) (ret []*models.Folder, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Folder.FindMany(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
 func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Scene.GetManyFileIDs(ctx, keys)
 			return err
@@ -239,7 +419,7 @@ func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([]
 
 func (m Middleware) fetchImagesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Image.GetManyFileIDs(ctx, keys)
 			return err
@@ -250,7 +430,7 @@ func (m Middleware) fetchImagesFileIDs(ctx context.Context) func(keys []int) ([]
 
 func (m Middleware) fetchGalleriesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
-		err := m.withTxn(ctx, func(ctx context.Context) error {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
 			var err error
 			ret, err = m.Repository.Gallery.GetManyFileIDs(ctx, keys)
 			return err
@@ -258,3 +438,58 @@ func (m Middleware) fetchGalleriesFileIDs(ctx context.Context) func(keys []int)
 		return ret, toErrorSlice(err)
 	}
 }
+
+func (m Middleware) fetchScenesOCount(ctx context.Context) func(keys []int) ([]int, []error) {
+	return func(keys []int) (ret []int, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetManyOCount(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchScenesPlayCount(ctx context.Context) func(keys []int) ([]int, []error) {
+	return func(keys []int) (ret []int, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetManyViewCount(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchScenesOHistory(ctx context.Context) func(keys []int) ([][]time.Time, []error) {
+	return func(keys []int) (ret [][]time.Time, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetManyODates(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchScenesPlayHistory(ctx context.Context) func(keys []int) ([][]time.Time, []error) {
+	return func(keys []int) (ret [][]time.Time, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetManyViewDates(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}
+
+func (m Middleware) fetchScenesLastPlayed(ctx context.Context) func(keys []int) ([]*time.Time, []error) {
+	return func(keys []int) (ret []*time.Time, errs []error) {
+		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+			var err error
+			ret, err = m.Repository.Scene.GetManyLastViewed(ctx, keys)
+			return err
+		})
+		return ret, toErrorSlice(err)
+	}
+}

internal/api/loaders/folderloader_gen.go

@@ -0,0 +1,224 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+// FolderLoaderConfig captures the config to create a new FolderLoader
+type FolderLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []models.FolderID) ([]*models.Folder, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewFolderLoader creates a new FolderLoader given a fetch, wait, and maxBatch
+func NewFolderLoader(config FolderLoaderConfig) *FolderLoader {
+	return &FolderLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// FolderLoader batches and caches requests
+type FolderLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []models.FolderID) ([]*models.Folder, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[models.FolderID]*models.Folder
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *folderLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type folderLoaderBatch struct {
+	keys    []models.FolderID
+	data    []*models.Folder
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a Folder by key, batching and caching will be applied automatically
+func (l *FolderLoader) Load(key models.FolderID) (*models.Folder, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a Folder.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderLoader) LoadThunk(key models.FolderID) func() (*models.Folder, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (*models.Folder, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &folderLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (*models.Folder, error) {
+		<-batch.done
+
+		var data *models.Folder
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *FolderLoader) LoadAll(keys []models.FolderID) ([]*models.Folder, []error) {
+	results := make([]func() (*models.Folder, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	folders := make([]*models.Folder, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		folders[i], errors[i] = thunk()
+	}
+	return folders, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a Folders.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *FolderLoader) LoadAllThunk(keys []models.FolderID) func() ([]*models.Folder, []error) {
+	results := make([]func() (*models.Folder, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]*models.Folder, []error) {
+		folders := make([]*models.Folder, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			folders[i], errors[i] = thunk()
+		}
+		return folders, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *FolderLoader) Prime(key models.FolderID, value *models.Folder) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := *value
+		l.unsafeSet(key, &cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *FolderLoader) Clear(key models.FolderID) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *FolderLoader) unsafeSet(key models.FolderID, value *models.Folder) {
+	if l.cache == nil {
+		l.cache = map[models.FolderID]*models.Folder{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *folderLoaderBatch) keyIndex(l *FolderLoader, key models.FolderID) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *folderLoaderBatch) startTimer(l *FolderLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *folderLoaderBatch) end(l *FolderLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/grouploader_gen.go

@@ -9,10 +9,10 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-// MovieLoaderConfig captures the config to create a new MovieLoader
-type MovieLoaderConfig struct {
+// GroupLoaderConfig captures the config to create a new GroupLoader
+type GroupLoaderConfig struct {
 	// Fetch is a method that provides the data for the loader
-	Fetch func(keys []int) ([]*models.Movie, []error)
+	Fetch func(keys []int) ([]*models.Group, []error)
 
 	// Wait is how long wait before sending a batch
 	Wait time.Duration
@@ -21,19 +21,19 @@ type MovieLoaderConfig struct {
 	MaxBatch int
 }
 
-// NewMovieLoader creates a new MovieLoader given a fetch, wait, and maxBatch
-func NewMovieLoader(config MovieLoaderConfig) *MovieLoader {
-	return &MovieLoader{
+// NewGroupLoader creates a new GroupLoader given a fetch, wait, and maxBatch
+func NewGroupLoader(config GroupLoaderConfig) *GroupLoader {
+	return &GroupLoader{
 		fetch:    config.Fetch,
 		wait:     config.Wait,
 		maxBatch: config.MaxBatch,
 	}
 }
 
-// MovieLoader batches and caches requests
-type MovieLoader struct {
+// GroupLoader batches and caches requests
+type GroupLoader struct {
 	// this method provides the data for the loader
-	fetch func(keys []int) ([]*models.Movie, []error)
+	fetch func(keys []int) ([]*models.Group, []error)
 
 	// how long to done before sending a batch
 	wait time.Duration
@@ -44,51 +44,51 @@ type MovieLoader struct {
 	// INTERNAL
 
 	// lazily created cache
-	cache map[int]*models.Movie
+	cache map[int]*models.Group
 
 	// the current batch. keys will continue to be collected until timeout is hit,
 	// then everything will be sent to the fetch method and out to the listeners
-	batch *movieLoaderBatch
+	batch *groupLoaderBatch
 
 	// mutex to prevent races
 	mu sync.Mutex
 }
 
-type movieLoaderBatch struct {
+type groupLoaderBatch struct {
 	keys    []int
-	data    []*models.Movie
+	data    []*models.Group
 	error   []error
 	closing bool
 	done    chan struct{}
 }
 
-// Load a Movie by key, batching and caching will be applied automatically
-func (l *MovieLoader) Load(key int) (*models.Movie, error) {
+// Load a Group by key, batching and caching will be applied automatically
+func (l *GroupLoader) Load(key int) (*models.Group, error) {
 	return l.LoadThunk(key)()
 }
 
-// LoadThunk returns a function that when called will block waiting for a Movie.
+// LoadThunk returns a function that when called will block waiting for a Group.
 // This method should be used if you want one goroutine to make requests to many
 // different data loaders without blocking until the thunk is called.
-func (l *MovieLoader) LoadThunk(key int) func() (*models.Movie, error) {
+func (l *GroupLoader) LoadThunk(key int) func() (*models.Group, error) {
 	l.mu.Lock()
 	if it, ok := l.cache[key]; ok {
 		l.mu.Unlock()
-		return func() (*models.Movie, error) {
+		return func() (*models.Group, error) {
 			return it, nil
 		}
 	}
 	if l.batch == nil {
-		l.batch = &movieLoaderBatch{done: make(chan struct{})}
+		l.batch = &groupLoaderBatch{done: make(chan struct{})}
 	}
 	batch := l.batch
 	pos := batch.keyIndex(l, key)
 	l.mu.Unlock()
 
-	return func() (*models.Movie, error) {
+	return func() (*models.Group, error) {
 		<-batch.done
 
-		var data *models.Movie
+		var data *models.Group
 		if pos < len(batch.data) {
 			data = batch.data[pos]
 		}
@@ -113,43 +113,43 @@ func (l *MovieLoader) LoadThunk(key int) func() (*models.Movie, error) {
 
 // LoadAll fetches many keys at once. It will be broken into appropriate sized
 // sub batches depending on how the loader is configured
-func (l *MovieLoader) LoadAll(keys []int) ([]*models.Movie, []error) {
-	results := make([]func() (*models.Movie, error), len(keys))
+func (l *GroupLoader) LoadAll(keys []int) ([]*models.Group, []error) {
+	results := make([]func() (*models.Group, error), len(keys))
 
 	for i, key := range keys {
 		results[i] = l.LoadThunk(key)
 	}
 
-	movies := make([]*models.Movie, len(keys))
+	groups := make([]*models.Group, len(keys))
 	errors := make([]error, len(keys))
 	for i, thunk := range results {
-		movies[i], errors[i] = thunk()
+		groups[i], errors[i] = thunk()
 	}
-	return movies, errors
+	return groups, errors
 }
 
-// LoadAllThunk returns a function that when called will block waiting for a Movies.
+// LoadAllThunk returns a function that when called will block waiting for a Groups.
 // This method should be used if you want one goroutine to make requests to many
 // different data loaders without blocking until the thunk is called.
-func (l *MovieLoader) LoadAllThunk(keys []int) func() ([]*models.Movie, []error) {
-	results := make([]func() (*models.Movie, error), len(keys))
+func (l *GroupLoader) LoadAllThunk(keys []int) func() ([]*models.Group, []error) {
+	results := make([]func() (*models.Group, error), len(keys))
 	for i, key := range keys {
 		results[i] = l.LoadThunk(key)
 	}
-	return func() ([]*models.Movie, []error) {
-		movies := make([]*models.Movie, len(keys))
+	return func() ([]*models.Group, []error) {
+		groups := make([]*models.Group, len(keys))
 		errors := make([]error, len(keys))
 		for i, thunk := range results {
-			movies[i], errors[i] = thunk()
+			groups[i], errors[i] = thunk()
 		}
-		return movies, errors
+		return groups, errors
 	}
 }
 
 // Prime the cache with the provided key and value. If the key already exists, no change is made
 // and false is returned.
 // (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
-func (l *MovieLoader) Prime(key int, value *models.Movie) bool {
+func (l *GroupLoader) Prime(key int, value *models.Group) bool {
 	l.mu.Lock()
 	var found bool
 	if _, found = l.cache[key]; !found {
@@ -163,22 +163,22 @@ func (l *MovieLoader) Prime(key int, value *models.Movie) bool {
 }
 
 // Clear the value at key from the cache, if it exists
-func (l *MovieLoader) Clear(key int) {
+func (l *GroupLoader) Clear(key int) {
 	l.mu.Lock()
 	delete(l.cache, key)
 	l.mu.Unlock()
 }
 
-func (l *MovieLoader) unsafeSet(key int, value *models.Movie) {
+func (l *GroupLoader) unsafeSet(key int, value *models.Group) {
 	if l.cache == nil {
-		l.cache = map[int]*models.Movie{}
+		l.cache = map[int]*models.Group{}
 	}
 	l.cache[key] = value
 }
 
 // keyIndex will return the location of the key in the batch, if its not found
 // it will add the key to the batch
-func (b *movieLoaderBatch) keyIndex(l *MovieLoader, key int) int {
+func (b *groupLoaderBatch) keyIndex(l *GroupLoader, key int) int {
 	for i, existingKey := range b.keys {
 		if key == existingKey {
 			return i
@@ -202,7 +202,7 @@ func (b *movieLoaderBatch) keyIndex(l *MovieLoader, key int) int {
 	return pos
 }
 
-func (b *movieLoaderBatch) startTimer(l *MovieLoader) {
+func (b *groupLoaderBatch) startTimer(l *GroupLoader) {
 	time.Sleep(l.wait)
 	l.mu.Lock()
 
@@ -218,7 +218,7 @@ func (b *movieLoaderBatch) startTimer(l *MovieLoader) {
 	b.end(l)
 }
 
-func (b *movieLoaderBatch) end(l *MovieLoader) {
+func (b *groupLoaderBatch) end(l *GroupLoader) {
 	b.data, b.error = l.fetch(b.keys)
 	close(b.done)
 }

internal/api/loaders/scenelastplayedloader_gen.go

@@ -0,0 +1,222 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+)
+
+// SceneLastPlayedLoaderConfig captures the config to create a new SceneLastPlayedLoader
+type SceneLastPlayedLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([]*time.Time, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewSceneLastPlayedLoader creates a new SceneLastPlayedLoader given a fetch, wait, and maxBatch
+func NewSceneLastPlayedLoader(config SceneLastPlayedLoaderConfig) *SceneLastPlayedLoader {
+	return &SceneLastPlayedLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// SceneLastPlayedLoader batches and caches requests
+type SceneLastPlayedLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([]*time.Time, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int]*time.Time
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *sceneLastPlayedLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type sceneLastPlayedLoaderBatch struct {
+	keys    []int
+	data    []*time.Time
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a Time by key, batching and caching will be applied automatically
+func (l *SceneLastPlayedLoader) Load(key int) (*time.Time, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a Time.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneLastPlayedLoader) LoadThunk(key int) func() (*time.Time, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (*time.Time, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &sceneLastPlayedLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (*time.Time, error) {
+		<-batch.done
+
+		var data *time.Time
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *SceneLastPlayedLoader) LoadAll(keys []int) ([]*time.Time, []error) {
+	results := make([]func() (*time.Time, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	times := make([]*time.Time, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		times[i], errors[i] = thunk()
+	}
+	return times, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a Times.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneLastPlayedLoader) LoadAllThunk(keys []int) func() ([]*time.Time, []error) {
+	results := make([]func() (*time.Time, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]*time.Time, []error) {
+		times := make([]*time.Time, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			times[i], errors[i] = thunk()
+		}
+		return times, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *SceneLastPlayedLoader) Prime(key int, value *time.Time) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := *value
+		l.unsafeSet(key, &cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *SceneLastPlayedLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *SceneLastPlayedLoader) unsafeSet(key int, value *time.Time) {
+	if l.cache == nil {
+		l.cache = map[int]*time.Time{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *sceneLastPlayedLoaderBatch) keyIndex(l *SceneLastPlayedLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *sceneLastPlayedLoaderBatch) startTimer(l *SceneLastPlayedLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *sceneLastPlayedLoaderBatch) end(l *SceneLastPlayedLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/sceneocountloader_gen.go

@@ -0,0 +1,219 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+)
+
+// SceneOCountLoaderConfig captures the config to create a new SceneOCountLoader
+type SceneOCountLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([]int, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewSceneOCountLoader creates a new SceneOCountLoader given a fetch, wait, and maxBatch
+func NewSceneOCountLoader(config SceneOCountLoaderConfig) *SceneOCountLoader {
+	return &SceneOCountLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// SceneOCountLoader batches and caches requests
+type SceneOCountLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([]int, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int]int
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *sceneOCountLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type sceneOCountLoaderBatch struct {
+	keys    []int
+	data    []int
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a int by key, batching and caching will be applied automatically
+func (l *SceneOCountLoader) Load(key int) (int, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a int.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneOCountLoader) LoadThunk(key int) func() (int, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (int, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &sceneOCountLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (int, error) {
+		<-batch.done
+
+		var data int
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *SceneOCountLoader) LoadAll(keys []int) ([]int, []error) {
+	results := make([]func() (int, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	ints := make([]int, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		ints[i], errors[i] = thunk()
+	}
+	return ints, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a ints.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneOCountLoader) LoadAllThunk(keys []int) func() ([]int, []error) {
+	results := make([]func() (int, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]int, []error) {
+		ints := make([]int, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			ints[i], errors[i] = thunk()
+		}
+		return ints, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *SceneOCountLoader) Prime(key int, value int) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		l.unsafeSet(key, value)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *SceneOCountLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *SceneOCountLoader) unsafeSet(key int, value int) {
+	if l.cache == nil {
+		l.cache = map[int]int{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *sceneOCountLoaderBatch) keyIndex(l *SceneOCountLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *sceneOCountLoaderBatch) startTimer(l *SceneOCountLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *sceneOCountLoaderBatch) end(l *SceneOCountLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/sceneohistoryloader_gen.go

@@ -0,0 +1,223 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+)
+
+// SceneOHistoryLoaderConfig captures the config to create a new SceneOHistoryLoader
+type SceneOHistoryLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([][]time.Time, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewSceneOHistoryLoader creates a new SceneOHistoryLoader given a fetch, wait, and maxBatch
+func NewSceneOHistoryLoader(config SceneOHistoryLoaderConfig) *SceneOHistoryLoader {
+	return &SceneOHistoryLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// SceneOHistoryLoader batches and caches requests
+type SceneOHistoryLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([][]time.Time, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int][]time.Time
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *sceneOHistoryLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type sceneOHistoryLoaderBatch struct {
+	keys    []int
+	data    [][]time.Time
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a Time by key, batching and caching will be applied automatically
+func (l *SceneOHistoryLoader) Load(key int) ([]time.Time, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a Time.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneOHistoryLoader) LoadThunk(key int) func() ([]time.Time, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() ([]time.Time, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &sceneOHistoryLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() ([]time.Time, error) {
+		<-batch.done
+
+		var data []time.Time
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *SceneOHistoryLoader) LoadAll(keys []int) ([][]time.Time, []error) {
+	results := make([]func() ([]time.Time, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	times := make([][]time.Time, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		times[i], errors[i] = thunk()
+	}
+	return times, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a Times.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *SceneOHistoryLoader) LoadAllThunk(keys []int) func() ([][]time.Time, []error) {
+	results := make([]func() ([]time.Time, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([][]time.Time, []error) {
+		times := make([][]time.Time, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			times[i], errors[i] = thunk()
+		}
+		return times, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *SceneOHistoryLoader) Prime(key int, value []time.Time) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := make([]time.Time, len(value))
+		copy(cpy, value)
+		l.unsafeSet(key, cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *SceneOHistoryLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *SceneOHistoryLoader) unsafeSet(key int, value []time.Time) {
+	if l.cache == nil {
+		l.cache = map[int][]time.Time{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *sceneOHistoryLoaderBatch) keyIndex(l *SceneOHistoryLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *sceneOHistoryLoaderBatch) startTimer(l *SceneOHistoryLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *sceneOHistoryLoaderBatch) end(l *SceneOHistoryLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/sceneplaycountloader_gen.go

@@ -0,0 +1,219 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+)
+
+// ScenePlayCountLoaderConfig captures the config to create a new ScenePlayCountLoader
+type ScenePlayCountLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([]int, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewScenePlayCountLoader creates a new ScenePlayCountLoader given a fetch, wait, and maxBatch
+func NewScenePlayCountLoader(config ScenePlayCountLoaderConfig) *ScenePlayCountLoader {
+	return &ScenePlayCountLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// ScenePlayCountLoader batches and caches requests
+type ScenePlayCountLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([]int, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int]int
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *scenePlayCountLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type scenePlayCountLoaderBatch struct {
+	keys    []int
+	data    []int
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a int by key, batching and caching will be applied automatically
+func (l *ScenePlayCountLoader) Load(key int) (int, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a int.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *ScenePlayCountLoader) LoadThunk(key int) func() (int, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() (int, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &scenePlayCountLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() (int, error) {
+		<-batch.done
+
+		var data int
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *ScenePlayCountLoader) LoadAll(keys []int) ([]int, []error) {
+	results := make([]func() (int, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	ints := make([]int, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		ints[i], errors[i] = thunk()
+	}
+	return ints, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a ints.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *ScenePlayCountLoader) LoadAllThunk(keys []int) func() ([]int, []error) {
+	results := make([]func() (int, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([]int, []error) {
+		ints := make([]int, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			ints[i], errors[i] = thunk()
+		}
+		return ints, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *ScenePlayCountLoader) Prime(key int, value int) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		l.unsafeSet(key, value)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *ScenePlayCountLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *ScenePlayCountLoader) unsafeSet(key int, value int) {
+	if l.cache == nil {
+		l.cache = map[int]int{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *scenePlayCountLoaderBatch) keyIndex(l *ScenePlayCountLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *scenePlayCountLoaderBatch) startTimer(l *ScenePlayCountLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *scenePlayCountLoaderBatch) end(l *ScenePlayCountLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/loaders/sceneplayhistoryloader_gen.go

@@ -0,0 +1,223 @@
+// Code generated by github.com/vektah/dataloaden, DO NOT EDIT.
+
+package loaders
+
+import (
+	"sync"
+	"time"
+)
+
+// ScenePlayHistoryLoaderConfig captures the config to create a new ScenePlayHistoryLoader
+type ScenePlayHistoryLoaderConfig struct {
+	// Fetch is a method that provides the data for the loader
+	Fetch func(keys []int) ([][]time.Time, []error)
+
+	// Wait is how long wait before sending a batch
+	Wait time.Duration
+
+	// MaxBatch will limit the maximum number of keys to send in one batch, 0 = not limit
+	MaxBatch int
+}
+
+// NewScenePlayHistoryLoader creates a new ScenePlayHistoryLoader given a fetch, wait, and maxBatch
+func NewScenePlayHistoryLoader(config ScenePlayHistoryLoaderConfig) *ScenePlayHistoryLoader {
+	return &ScenePlayHistoryLoader{
+		fetch:    config.Fetch,
+		wait:     config.Wait,
+		maxBatch: config.MaxBatch,
+	}
+}
+
+// ScenePlayHistoryLoader batches and caches requests
+type ScenePlayHistoryLoader struct {
+	// this method provides the data for the loader
+	fetch func(keys []int) ([][]time.Time, []error)
+
+	// how long to done before sending a batch
+	wait time.Duration
+
+	// this will limit the maximum number of keys to send in one batch, 0 = no limit
+	maxBatch int
+
+	// INTERNAL
+
+	// lazily created cache
+	cache map[int][]time.Time
+
+	// the current batch. keys will continue to be collected until timeout is hit,
+	// then everything will be sent to the fetch method and out to the listeners
+	batch *scenePlayHistoryLoaderBatch
+
+	// mutex to prevent races
+	mu sync.Mutex
+}
+
+type scenePlayHistoryLoaderBatch struct {
+	keys    []int
+	data    [][]time.Time
+	error   []error
+	closing bool
+	done    chan struct{}
+}
+
+// Load a Time by key, batching and caching will be applied automatically
+func (l *ScenePlayHistoryLoader) Load(key int) ([]time.Time, error) {
+	return l.LoadThunk(key)()
+}
+
+// LoadThunk returns a function that when called will block waiting for a Time.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *ScenePlayHistoryLoader) LoadThunk(key int) func() ([]time.Time, error) {
+	l.mu.Lock()
+	if it, ok := l.cache[key]; ok {
+		l.mu.Unlock()
+		return func() ([]time.Time, error) {
+			return it, nil
+		}
+	}
+	if l.batch == nil {
+		l.batch = &scenePlayHistoryLoaderBatch{done: make(chan struct{})}
+	}
+	batch := l.batch
+	pos := batch.keyIndex(l, key)
+	l.mu.Unlock()
+
+	return func() ([]time.Time, error) {
+		<-batch.done
+
+		var data []time.Time
+		if pos < len(batch.data) {
+			data = batch.data[pos]
+		}
+
+		var err error
+		// its convenient to be able to return a single error for everything
+		if len(batch.error) == 1 {
+			err = batch.error[0]
+		} else if batch.error != nil {
+			err = batch.error[pos]
+		}
+
+		if err == nil {
+			l.mu.Lock()
+			l.unsafeSet(key, data)
+			l.mu.Unlock()
+		}
+
+		return data, err
+	}
+}
+
+// LoadAll fetches many keys at once. It will be broken into appropriate sized
+// sub batches depending on how the loader is configured
+func (l *ScenePlayHistoryLoader) LoadAll(keys []int) ([][]time.Time, []error) {
+	results := make([]func() ([]time.Time, error), len(keys))
+
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+
+	times := make([][]time.Time, len(keys))
+	errors := make([]error, len(keys))
+	for i, thunk := range results {
+		times[i], errors[i] = thunk()
+	}
+	return times, errors
+}
+
+// LoadAllThunk returns a function that when called will block waiting for a Times.
+// This method should be used if you want one goroutine to make requests to many
+// different data loaders without blocking until the thunk is called.
+func (l *ScenePlayHistoryLoader) LoadAllThunk(keys []int) func() ([][]time.Time, []error) {
+	results := make([]func() ([]time.Time, error), len(keys))
+	for i, key := range keys {
+		results[i] = l.LoadThunk(key)
+	}
+	return func() ([][]time.Time, []error) {
+		times := make([][]time.Time, len(keys))
+		errors := make([]error, len(keys))
+		for i, thunk := range results {
+			times[i], errors[i] = thunk()
+		}
+		return times, errors
+	}
+}
+
+// Prime the cache with the provided key and value. If the key already exists, no change is made
+// and false is returned.
+// (To forcefully prime the cache, clear the key first with loader.clear(key).prime(key, value).)
+func (l *ScenePlayHistoryLoader) Prime(key int, value []time.Time) bool {
+	l.mu.Lock()
+	var found bool
+	if _, found = l.cache[key]; !found {
+		// make a copy when writing to the cache, its easy to pass a pointer in from a loop var
+		// and end up with the whole cache pointing to the same value.
+		cpy := make([]time.Time, len(value))
+		copy(cpy, value)
+		l.unsafeSet(key, cpy)
+	}
+	l.mu.Unlock()
+	return !found
+}
+
+// Clear the value at key from the cache, if it exists
+func (l *ScenePlayHistoryLoader) Clear(key int) {
+	l.mu.Lock()
+	delete(l.cache, key)
+	l.mu.Unlock()
+}
+
+func (l *ScenePlayHistoryLoader) unsafeSet(key int, value []time.Time) {
+	if l.cache == nil {
+		l.cache = map[int][]time.Time{}
+	}
+	l.cache[key] = value
+}
+
+// keyIndex will return the location of the key in the batch, if its not found
+// it will add the key to the batch
+func (b *scenePlayHistoryLoaderBatch) keyIndex(l *ScenePlayHistoryLoader, key int) int {
+	for i, existingKey := range b.keys {
+		if key == existingKey {
+			return i
+		}
+	}
+
+	pos := len(b.keys)
+	b.keys = append(b.keys, key)
+	if pos == 0 {
+		go b.startTimer(l)
+	}
+
+	if l.maxBatch != 0 && pos >= l.maxBatch-1 {
+		if !b.closing {
+			b.closing = true
+			l.batch = nil
+			go b.end(l)
+		}
+	}
+
+	return pos
+}
+
+func (b *scenePlayHistoryLoaderBatch) startTimer(l *ScenePlayHistoryLoader) {
+	time.Sleep(l.wait)
+	l.mu.Lock()
+
+	// we must have hit a batch limit and are already finalizing this batch
+	if b.closing {
+		l.mu.Unlock()
+		return
+	}
+
+	l.batch = nil
+	l.mu.Unlock()
+
+	b.end(l)
+}
+
+func (b *scenePlayHistoryLoaderBatch) end(l *ScenePlayHistoryLoader) {
+	b.data, b.error = l.fetch(b.keys)
+	close(b.done)
+}

internal/api/models.go

@@ -1,64 +1,100 @@
 package api
 
 import (
-	"errors"
 	"fmt"
-	"io"
-	"strconv"
-	"time"
 
-	"github.com/99designs/gqlgen/graphql"
-	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/utils"
+	"github.com/stashapp/stash/pkg/sliceutil"
 )
 
-type BaseFile interface{}
+type BaseFile interface {
+	IsBaseFile()
+}
+
+type VisualFile interface {
+	IsVisualFile()
+}
+
+func convertVisualFile(f models.File) (VisualFile, error) {
+	switch f := f.(type) {
+	case VisualFile:
+		return f, nil
+	case *models.VideoFile:
+		return &VideoFile{VideoFile: f}, nil
+	case *models.ImageFile:
+		return &ImageFile{ImageFile: f}, nil
+	default:
+		return nil, fmt.Errorf("file %s is not a visual file", f.Base().Path)
+	}
+}
+
+func convertBaseFile(f models.File) BaseFile {
+	if f == nil {
+		return nil
+	}
+
+	switch f := f.(type) {
+	case BaseFile:
+		return f
+	case *models.VideoFile:
+		return &VideoFile{VideoFile: f}
+	case *models.ImageFile:
+		return &ImageFile{ImageFile: f}
+	case *models.BaseFile:
+		return &BasicFile{BaseFile: f}
+	default:
+		panic("unknown file type")
+	}
+}
+
+func convertBaseFiles(files []models.File) []BaseFile {
+	return sliceutil.Map(files, convertBaseFile)
+}
 
 type GalleryFile struct {
 	*models.BaseFile
 }
 
-var ErrTimestamp = errors.New("cannot parse Timestamp")
+func (GalleryFile) IsBaseFile() {}
 
-func MarshalTimestamp(t time.Time) graphql.Marshaler {
-	if t.IsZero() {
-		return graphql.Null
-	}
+func (GalleryFile) IsVisualFile() {}
 
-	return graphql.WriterFunc(func(w io.Writer) {
-		_, err := io.WriteString(w, strconv.Quote(t.Format(time.RFC3339Nano)))
-		if err != nil {
-			logger.Warnf("could not marshal timestamp: %v", err)
-		}
-	})
+func (f *GalleryFile) Fingerprints() []models.Fingerprint {
+	return f.BaseFile.Fingerprints
 }
 
-func UnmarshalTimestamp(v interface{}) (time.Time, error) {
-	if tmpStr, ok := v.(string); ok {
-		if len(tmpStr) == 0 {
-			return time.Time{}, fmt.Errorf("%w: empty string", ErrTimestamp)
-		}
-
-		switch tmpStr[0] {
-		case '>', '<':
-			d, err := time.ParseDuration(tmpStr[1:])
-			if err != nil {
-				return time.Time{}, fmt.Errorf("%w: cannot parse %v-duration: %v", ErrTimestamp, tmpStr[0], err)
-			}
-			t := time.Now()
-			// Compute point in time:
-			if tmpStr[0] == '<' {
-				t = t.Add(-d)
-			} else {
-				t = t.Add(d)
-			}
-
-			return t, nil
-		}
-
-		return utils.ParseDateStringAsTime(tmpStr)
-	}
-
-	return time.Time{}, fmt.Errorf("%w: not a string", ErrTimestamp)
+type VideoFile struct {
+	*models.VideoFile
+}
+
+func (VideoFile) IsBaseFile() {}
+
+func (VideoFile) IsVisualFile() {}
+
+func (f *VideoFile) Fingerprints() []models.Fingerprint {
+	return f.VideoFile.Fingerprints
+}
+
+type ImageFile struct {
+	*models.ImageFile
+}
+
+func (ImageFile) IsBaseFile() {}
+
+func (ImageFile) IsVisualFile() {}
+
+func (f *ImageFile) Fingerprints() []models.Fingerprint {
+	return f.ImageFile.Fingerprints
+}
+
+type BasicFile struct {
+	*models.BaseFile
+}
+
+func (BasicFile) IsBaseFile() {}
+
+func (BasicFile) IsVisualFile() {}
+
+func (f *BasicFile) Fingerprints() []models.Fingerprint {
+	return f.BaseFile.Fingerprints
 }

internal/api/plugin_map.go

@@ -0,0 +1,37 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+
+	"github.com/99designs/gqlgen/graphql"
+)
+
+func MarshalPluginConfigMap(val map[string]map[string]interface{}) graphql.Marshaler {
+	return graphql.WriterFunc(func(w io.Writer) {
+		err := json.NewEncoder(w).Encode(val)
+		if err != nil {
+			panic(err)
+		}
+	})
+}
+
+func UnmarshalPluginConfigMap(v interface{}) (map[string]map[string]interface{}, error) {
+	m, ok := v.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("%T is not a plugin config map", v)
+	}
+
+	result := make(map[string]map[string]interface{})
+	for k, v := range m {
+		val, ok := v.(map[string]interface{})
+		if !ok {
+			return nil, fmt.Errorf("key %s (%T) is not a map", k, v)
+		}
+
+		result[k] = val
+	}
+
+	return result, nil
+}

internal/api/resolver.go

@@ -11,9 +11,8 @@ import (
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/plugin"
+	"github.com/stashapp/stash/pkg/plugin/hook"
 	"github.com/stashapp/stash/pkg/scraper"
-	"github.com/stashapp/stash/pkg/txn"
 )
 
 var (
@@ -29,15 +28,15 @@ var (
 )
 
 type hookExecutor interface {
-	ExecutePostHooks(ctx context.Context, id int, hookType plugin.HookTriggerEnum, input interface{}, inputFields []string)
+	ExecutePostHooks(ctx context.Context, id int, hookType hook.TriggerEnum, input interface{}, inputFields []string)
 }
 
 type Resolver struct {
-	txnManager     txn.Manager
-	repository     manager.Repository
+	repository     models.Repository
 	sceneService   manager.SceneService
 	imageService   manager.ImageService
 	galleryService manager.GalleryService
+	groupService   manager.GroupService
 
 	hookExecutor hookExecutor
 }
@@ -73,18 +72,44 @@ func (r *Resolver) SceneMarker() SceneMarkerResolver {
 func (r *Resolver) Studio() StudioResolver {
 	return &studioResolver{r}
 }
-func (r *Resolver) Movie() MovieResolver {
-	return &movieResolver{r}
+
+func (r *Resolver) Group() GroupResolver {
+	return &groupResolver{r}
 }
+func (r *Resolver) Movie() MovieResolver {
+	return &movieResolver{&groupResolver{r}}
+}
+
 func (r *Resolver) Subscription() SubscriptionResolver {
 	return &subscriptionResolver{r}
 }
 func (r *Resolver) Tag() TagResolver {
 	return &tagResolver{r}
 }
+func (r *Resolver) GalleryFile() GalleryFileResolver {
+	return &galleryFileResolver{r}
+}
+func (r *Resolver) VideoFile() VideoFileResolver {
+	return &videoFileResolver{r}
+}
+func (r *Resolver) ImageFile() ImageFileResolver {
+	return &imageFileResolver{r}
+}
+func (r *Resolver) BasicFile() BasicFileResolver {
+	return &basicFileResolver{r}
+}
+func (r *Resolver) Folder() FolderResolver {
+	return &folderResolver{r}
+}
 func (r *Resolver) SavedFilter() SavedFilterResolver {
 	return &savedFilterResolver{r}
 }
+func (r *Resolver) Plugin() PluginResolver {
+	return &pluginResolver{r}
+}
+func (r *Resolver) ConfigResult() ConfigResultResolver {
+	return &configResultResolver{r}
+}
 
 type mutationResolver struct{ *Resolver }
 type queryResolver struct{ *Resolver }
@@ -97,16 +122,27 @@ type sceneResolver struct{ *Resolver }
 type sceneMarkerResolver struct{ *Resolver }
 type imageResolver struct{ *Resolver }
 type studioResolver struct{ *Resolver }
-type movieResolver struct{ *Resolver }
+
+// movie is group under the hood
+type groupResolver struct{ *Resolver }
+type movieResolver struct{ *groupResolver }
+
 type tagResolver struct{ *Resolver }
+type galleryFileResolver struct{ *Resolver }
+type videoFileResolver struct{ *Resolver }
+type imageFileResolver struct{ *Resolver }
+type basicFileResolver struct{ *Resolver }
+type folderResolver struct{ *Resolver }
 type savedFilterResolver struct{ *Resolver }
+type pluginResolver struct{ *Resolver }
+type configResultResolver struct{ *Resolver }
 
 func (r *Resolver) withTxn(ctx context.Context, fn func(ctx context.Context) error) error {
-	return txn.WithTxn(ctx, r.txnManager, fn)
+	return r.repository.WithTxn(ctx, fn)
 }
 
 func (r *Resolver) withReadTxn(ctx context.Context, fn func(ctx context.Context) error) error {
-	return txn.WithReadTxn(ctx, r.txnManager, fn)
+	return r.repository.WithReadTxn(ctx, fn)
 }
 
 func (r *queryResolver) MarkerWall(ctx context.Context, q *string) (ret []*models.SceneMarker, err error) {
@@ -145,27 +181,90 @@ func (r *queryResolver) Stats(ctx context.Context) (*StatsResultType, error) {
 	var ret StatsResultType
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		repo := r.repository
-		scenesQB := repo.Scene
+		sceneQB := repo.Scene
 		imageQB := repo.Image
 		galleryQB := repo.Gallery
-		studiosQB := repo.Studio
-		performersQB := repo.Performer
-		moviesQB := repo.Movie
-		tagsQB := repo.Tag
-		scenesCount, _ := scenesQB.Count(ctx)
-		scenesSize, _ := scenesQB.Size(ctx)
-		scenesDuration, _ := scenesQB.Duration(ctx)
-		imageCount, _ := imageQB.Count(ctx)
-		imageSize, _ := imageQB.Size(ctx)
-		galleryCount, _ := galleryQB.Count(ctx)
-		performersCount, _ := performersQB.Count(ctx)
-		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)
+		studioQB := repo.Studio
+		performerQB := repo.Performer
+		movieQB := repo.Group
+		tagQB := repo.Tag
+
+		// embrace the error
+
+		scenesCount, err := sceneQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		scenesSize, err := sceneQB.Size(ctx)
+		if err != nil {
+			return err
+		}
+
+		scenesDuration, err := sceneQB.Duration(ctx)
+		if err != nil {
+			return err
+		}
+
+		imageCount, err := imageQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		imageSize, err := imageQB.Size(ctx)
+		if err != nil {
+			return err
+		}
+
+		galleryCount, err := galleryQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		performersCount, err := performerQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		studiosCount, err := studioQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		groupsCount, err := movieQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		tagsCount, err := tagQB.Count(ctx)
+		if err != nil {
+			return err
+		}
+
+		scenesTotalOCount, err := sceneQB.GetAllOCount(ctx)
+		if err != nil {
+			return err
+		}
+		imagesTotalOCount, err := imageQB.OCount(ctx)
+		if err != nil {
+			return err
+		}
+		totalOCount := scenesTotalOCount + imagesTotalOCount
+
+		totalPlayDuration, err := sceneQB.PlayDuration(ctx)
+		if err != nil {
+			return err
+		}
+
+		totalPlayCount, err := sceneQB.CountAllViews(ctx)
+		if err != nil {
+			return err
+		}
+
+		uniqueScenePlayCount, err := sceneQB.CountUniqueViews(ctx)
+		if err != nil {
+			return err
+		}
 
 		ret = StatsResultType{
 			SceneCount:        scenesCount,
@@ -176,7 +275,8 @@ func (r *queryResolver) Stats(ctx context.Context) (*StatsResultType, error) {
 			GalleryCount:      galleryCount,
 			PerformerCount:    performersCount,
 			StudioCount:       studiosCount,
-			MovieCount:        moviesCount,
+			GroupCount:        groupsCount,
+			MovieCount:        groupsCount,
 			TagCount:          tagsCount,
 			TotalOCount:       totalOCount,
 			TotalPlayDuration: totalPlayDuration,

internal/api/resolver_model_config.go

@@ -0,0 +1,25 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/internal/manager/config"
+)
+
+func (r *configResultResolver) Plugins(ctx context.Context, obj *ConfigResult, include []string) (map[string]map[string]interface{}, error) {
+	if len(include) == 0 {
+		ret := config.GetInstance().GetAllPluginConfiguration()
+		return ret, nil
+	}
+
+	ret := make(map[string]map[string]interface{})
+
+	for _, plugin := range include {
+		c := config.GetInstance().GetPluginConfiguration(plugin)
+		if len(c) > 0 {
+			ret[plugin] = c
+		}
+	}
+
+	return ret, nil
+}

internal/api/resolver_model_file.go

@@ -0,0 +1,80 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/internal/api/loaders"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func fingerprintResolver(fp models.Fingerprints, type_ string) (*string, error) {
+	fingerprint := fp.For(type_)
+	if fingerprint != nil {
+		value := fingerprint.Value()
+		return &value, nil
+	}
+	return nil, nil
+}
+
+func (r *galleryFileResolver) Fingerprint(ctx context.Context, obj *GalleryFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.BaseFile.Fingerprints, type_)
+}
+
+func (r *imageFileResolver) Fingerprint(ctx context.Context, obj *ImageFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.ImageFile.Fingerprints, type_)
+}
+
+func (r *videoFileResolver) Fingerprint(ctx context.Context, obj *VideoFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.VideoFile.Fingerprints, type_)
+}
+
+func (r *basicFileResolver) Fingerprint(ctx context.Context, obj *BasicFile, type_ string) (*string, error) {
+	return fingerprintResolver(obj.BaseFile.Fingerprints, type_)
+}
+
+func (r *galleryFileResolver) ParentFolder(ctx context.Context, obj *GalleryFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *imageFileResolver) ParentFolder(ctx context.Context, obj *ImageFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *videoFileResolver) ParentFolder(ctx context.Context, obj *VideoFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func (r *basicFileResolver) ParentFolder(ctx context.Context, obj *BasicFile) (*models.Folder, error) {
+	return loaders.From(ctx).FolderByID.Load(obj.ParentFolderID)
+}
+
+func zipFileResolver(ctx context.Context, zipFileID *models.FileID) (*BasicFile, error) {
+	if zipFileID == nil {
+		return nil, nil
+	}
+
+	f, err := loaders.From(ctx).FileByID.Load(*zipFileID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &BasicFile{
+		BaseFile: f.Base(),
+	}, nil
+}
+
+func (r *galleryFileResolver) ZipFile(ctx context.Context, obj *GalleryFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *imageFileResolver) ZipFile(ctx context.Context, obj *ImageFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *videoFileResolver) ZipFile(ctx context.Context, obj *VideoFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}
+
+func (r *basicFileResolver) ZipFile(ctx context.Context, obj *BasicFile) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}

internal/api/resolver_model_folder.go

@@ -0,0 +1,20 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/internal/api/loaders"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (*models.Folder, error) {
+	if obj.ParentFolderID == nil {
+		return nil, nil
+	}
+
+	return loaders.From(ctx).FolderByID.Load(*obj.ParentFolderID)
+}
+
+func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
+	return zipFileResolver(ctx, obj.ZipFileID)
+}

internal/api/resolver_model_gallery.go

@@ -2,28 +2,16 @@ package api
 
 import (
 	"context"
-	"time"
+	"fmt"
 
 	"github.com/stashapp/stash/internal/api/loaders"
+	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/internal/manager/config"
 
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 )
 
-func (r *galleryResolver) getPrimaryFile(ctx context.Context, obj *models.Gallery) (models.File, error) {
-	if obj.PrimaryFileID != nil {
-		f, err := loaders.From(ctx).FileByID.Load(*obj.PrimaryFileID)
-		if err != nil {
-			return nil, err
-		}
-
-		return f, nil
-	}
-
-	return nil, nil
-}
-
 func (r *galleryResolver) getFiles(ctx context.Context, obj *models.Gallery) ([]models.File, error) {
 	fileIDs, err := loaders.From(ctx).GalleryFiles.Load(obj.ID)
 	if err != nil {
@@ -78,38 +66,6 @@ func (r *galleryResolver) Folder(ctx context.Context, obj *models.Gallery) (*mod
 	return ret, nil
 }
 
-func (r *galleryResolver) FileModTime(ctx context.Context, obj *models.Gallery) (*time.Time, error) {
-	f, err := r.getPrimaryFile(ctx, obj)
-	if err != nil {
-		return nil, err
-	}
-	if f != nil {
-		return &f.Base().ModTime, nil
-	}
-
-	return nil, nil
-}
-
-// Images is deprecated, slow and shouldn't be used
-func (r *galleryResolver) Images(ctx context.Context, obj *models.Gallery) (ret []*models.Image, err error) {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var err error
-
-		// #2376 - sort images by path
-		// doing this via Query is really slow, so stick with FindByGalleryID
-		ret, err = r.repository.Image.FindByGalleryID(ctx, obj.ID)
-		if err != nil {
-			return err
-		}
-
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
 func (r *galleryResolver) Cover(ctx context.Context, obj *models.Gallery) (ret *models.Image, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		// Find cover image first
@@ -130,26 +86,6 @@ func (r *galleryResolver) Date(ctx context.Context, obj *models.Gallery) (*strin
 	return nil, nil
 }
 
-func (r *galleryResolver) Checksum(ctx context.Context, obj *models.Gallery) (string, error) {
-	if !obj.Files.PrimaryLoaded() {
-		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-			return obj.LoadPrimaryFile(ctx, r.repository.File)
-		}); err != nil {
-			return "", err
-		}
-	}
-
-	return obj.PrimaryChecksum(), nil
-}
-
-func (r *galleryResolver) Rating(ctx context.Context, obj *models.Gallery) (*int, error) {
-	if obj.Rating != nil {
-		rating := models.Rating100To5(*obj.Rating)
-		return &rating, nil
-	}
-	return nil, nil
-}
-
 func (r *galleryResolver) Rating100(ctx context.Context, obj *models.Gallery) (*int, error) {
 	return obj.Rating, nil
 }
@@ -255,3 +191,41 @@ func (r *galleryResolver) Urls(ctx context.Context, obj *models.Gallery) ([]stri
 
 	return obj.URLs.List(), nil
 }
+
+func (r *galleryResolver) Paths(ctx context.Context, obj *models.Gallery) (*GalleryPathsType, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	builder := urlbuilders.NewGalleryURLBuilder(baseURL, obj)
+
+	return &GalleryPathsType{
+		Cover:   builder.GetCoverURL(),
+		Preview: builder.GetPreviewURL(),
+	}, nil
+}
+
+func (r *galleryResolver) Image(ctx context.Context, obj *models.Gallery, index int) (ret *models.Image, err error) {
+	if index < 0 {
+		return nil, fmt.Errorf("index must >= 0")
+	}
+
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Image.FindByGalleryIDIndex(ctx, obj.ID, uint(index))
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return
+}
+
+func (r *galleryResolver) CustomFields(ctx context.Context, obj *models.Gallery) (map[string]interface{}, error) {
+	m, err := loaders.From(ctx).GalleryCustomFields.Load(obj.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	if m == nil {
+		return make(map[string]interface{}), nil
+	}
+
+	return m, nil
+}