temp

.dockerignore

@@ -1,57 +0,0 @@
-####
-# Go
-####
-
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# GraphQL generated output
-pkg/models/generated_*.go
-ui/v2.5/src/core/generated-graphql.ts
-
-####
-# Jetbrains
-####
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-####
-# Random
-####
-
-ui/v2.5/node_modules
-ui/v2.5/build
-
-*.db
-
-stash
-dist
-
-docker

.gitattributes

@@ -1,6 +1,2 @@
 go.mod text eol=lf
-go.sum text eol=lf
-*.go text eol=lf
-vendor/** -text
-ui/v2.5/**/*.ts* text eol=lf
-ui/v2.5/**/*.scss text eol=lf
+go.sum text eol=lf

.github/FUNDING.yml

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

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/PULL_REQUEST_TEMPLATE/BugFix.md

@@ -1,18 +0,0 @@
----
-name: Bug Fix
-about: Add a bug fix this project!
-title: "[Bug Fix] Short Form Title (50 chars or less.)"
-labels: bug
-assignees: 'WithoutPants, bnkai, Leopere'
-
----
-<!-- Please make sure to read https://github.com/stashapp/stash/docs/CONTRIBUTING.md and check that you understand and have followed it as best as possible -->
-<!-- Explain what your bugfix seeks to remedy in a short paragraph. -->
-# Scope
-
-<!-- Declare any issues by typing `fixes #1` or `closes #1` for example so that the automation can kick in when this is merged -->
-## Closes/Fixes Issues
-
-<!-- What have you tested specifically and what possible impacts/areas there are that may need retesting by others. -->
-## Other testing QA Notes
-

.github/PULL_REQUEST_TEMPLATE/Feature.md

@@ -1,17 +0,0 @@
----
-name: Feature Addition
-about: Add a feature to this project!
-title: "[Feature] Short Form Title (50 chars or less.)"
-labels: enhancement
-assignees: 'WithoutPants, bnkai, Leopere'
-
----
-<!-- Please make sure to read https://github.com/stashapp/stash/docs/CONTRIBUTING.md and check that you understand and have followed it as best as possible
-Explain what your feature does in a short paragraph. -->
-# Scope
-
-<!-- Declare any issues by typing `fixes #1` or `closes #1` for example so that the automation can kick in when this is merged -->
-## Closes/Fixes Issues
-
-<!-- What have you tested specifically and what possible impacts/areas there are that may need retesting by others. -->
-## Other testing QA Notes

.github/workflows/build.yml

@@ -1,200 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ develop, master ]
-  pull_request:
-  release:
-    types: [ published ]
-
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  COMPILER_IMAGE: stashapp/compiler:8
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Checkout
-      run: git fetch --prune --unshallow --tags
-
-    - name: Pull compiler image
-      run: docker pull $COMPILER_IMAGE
-
-    - name: Cache node modules
-      uses: actions/cache@v3
-      env:
-        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') }}
-
-    - name: Cache UI build
-      uses: actions/cache@v3
-      id: cache-ui
-      env:
-        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') }}
-
-    - name: Cache go build
-      uses: actions/cache@v3
-      env:
-        # increment the number suffix to bump the cache
-        cache-name: cache-go-cache-1
-      with:
-        path: .go-cache
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('go.mod', '**/go.sum') }}
-
-    - name: Start build container
-      env:
-        official-build: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event_name == 'release' && github.ref != 'refs/tags/latest_develop') }}
-      run: |
-        mkdir -p .go-cache
-        docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --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"
-
-    - name: Generate
-      run: docker exec -t build /bin/bash -c "make generate"
-
-    - name: Validate UI
-      # skip UI validation for pull requests if UI is unchanged
-      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
-      run: docker exec -t build /bin/bash -c "make validate-ui"
-
-    # Static validation happens in the linter workflow in parallel to this workflow
-    # Run Dynamic validation here, to make sure we pass all the projects integration tests
-    - name: Test Backend
-      run: docker exec -t build /bin/bash -c "make it"
-
-    - name: Build UI
-      # skip UI build for pull requests if UI is unchanged (UI was cached)
-      # this means that the build version/time may be incorrect if the UI is
-      # not changed in a pull request
-      if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
-      run: docker exec -t build /bin/bash -c "make ui"
-
-    - name: Compile for all supported platforms
-      run: |
-        docker exec -t build /bin/bash -c "make build-cc-windows"
-        docker exec -t build /bin/bash -c "make build-cc-macos"
-        docker exec -t build /bin/bash -c "make build-cc-linux"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm64v8"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v7"
-        docker exec -t build /bin/bash -c "make build-cc-linux-arm32v6"
-        docker exec -t build /bin/bash -c "make build-cc-freebsd"
-
-    - name: Cleanup build container
-      run: docker rm -f -v build
-
-    - name: Generate checksums
-      run: |
-        git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-        sha1sum dist/Stash.app.zip dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
-        echo "STASH_VERSION=$(git describe --tags --exclude latest_develop)" >> $GITHUB_ENV
-        echo "RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
-
-    - 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
-      with:
-        name: stash-win.exe
-        path: dist/stash-win.exe
-
-    - name: Upload macOS binary
-      # only upload binaries for pull requests
-      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
-      with:
-        name: stash-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
-      with:
-        name: stash-linux
-        path: dist/stash-linux
-
-    - 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
-
-    - name: Development Release
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      uses: marvinpinto/action-automatic-releases@v1.1.2
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: true
-        automatic_release_tag: latest_develop
-        title: "${{ env.STASH_VERSION }}: Latest development build"
-        files: |
-          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
-          CHECKSUMS_SHA1
-
-    - name: Master release
-      # NOTE: this isn't perfect, but should cover most scenarios
-      # DON'T create tag names starting with "v" if they are not stable releases
-      if: ${{ github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') }}
-      uses: WithoutPants/github-release@v2.0.4
-      with:
-        token: "${{ secrets.GITHUB_TOKEN }}"
-        allow_override: true
-        files: |
-          dist/Stash.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
-          CHECKSUMS_SHA1
-        gzip: false
-
-    - name: Development Docker
-      if: ${{ github.repository == 'stashapp/stash' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-        docker info
-        docker buildx create --name builder --use
-        docker buildx inspect --bootstrap
-        docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh development
-
-    - name: Release Docker
-      # NOTE: this isn't perfect, but should cover most scenarios
-      # DON'T create tag names starting with "v" if they are not stable releases
-      if: ${{ github.repository == 'stashapp/stash' && github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') }}
-      env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-        docker info
-        docker buildx create --name builder --use
-        docker buildx inspect --bootstrap
-        docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh latest "${{ github.event.release.tag_name }}"

.github/workflows/golangci-lint.yml

@@ -1,67 +0,0 @@
-name: Lint (golangci-lint)
-on:
-  push:
-    tags:
-      - v*
-    branches:
-      - master
-      - develop
-  pull_request:
-
-env:
-  COMPILER_IMAGE: stashapp/compiler:8
-
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Checkout
-        run: git fetch --prune --unshallow --tags
-
-      - name: Pull compiler image
-        run: docker pull $COMPILER_IMAGE
-
-      - name: Start build container
-        run: |
-          mkdir -p .go-cache
-          docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated -w /stash $COMPILER_IMAGE tail -f /dev/null
-
-      - name: Generate Backend
-        run: docker exec -t build /bin/bash -c "make generate-backend"
-
-      - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          #
-          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
-          # The location of the configuration file can be changed by using `--config=`
-          args: --timeout=5m
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true, then all caching functionality will be completely disabled,
-          #           takes precedence over all other caching options.
-          # skip-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
-
-          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-          # install-mode: "goinstall"
-
-      - name: Cleanup build container
-        run: docker rm -f -v build

.gitignore

@@ -2,9 +2,6 @@
 # Go
 ####
 
-# Vendored dependencies
-vendor
-
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -18,13 +15,19 @@ vendor
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+# Packr2 artifacts
+**/*-packr.go
+
 # GraphQL generated output
-internal/api/generated_*.go
+pkg/models/generated_*.go
+ui/v2/src/core/generated-*.tsx
+
+# packr generated files
+*-packr.go
 
 ####
-# Visual Studio
+# Jetbrains
 ####
-/.vs
 
 # User-specific stuff
 .idea/**/workspace.xml
@@ -32,8 +35,6 @@ internal/api/generated_*.go
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-.vscode
-.devcontainer
 
 # Generated files
 .idea/**/contentModel.xml
@@ -55,9 +56,5 @@ node_modules
 
 *.db
 
-/stash
-/Stash.app
-/phasher
+stash
 dist
-.DS_Store
-/.local*

.golangci.yml

@@ -1,89 +0,0 @@
-# options for analysis running
-run:
-  timeout: 5m
-
-linters:
-  disable-all: true
-  enable:
-    # Default set of linters from golangci-lint
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    # Linters added by the stash project.
-    # - contextcheck
-    - dogsled
-    - errchkjson
-    - errorlint
-    # - exhaustive
-    - exportloopref
-    - gocritic
-    # - goerr113
-    - gofmt
-    # - gomnd
-    # - ifshort
-    - misspell
-    # - nakedret
-    - noctx
-    - revive
-    - rowserrcheck
-    - sqlclosecheck
-
-# Project-specific linter overrides
-linters-settings:
-  gofmt:
-    simplify: false
-
-  errorlint:
-    # Disable errorf because there are false positives, where you don't want to wrap
-    #  an error.
-    errorf: false
-    asserts: true
-    comparison: true
-
-  revive:
-    ignore-generated-header: true
-    severity: error
-    confidence: 0.8
-    error-code: 1
-    warning-code: 1
-    rules:
-      - name: blank-imports
-        disabled: true
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-        disabled: true
-      - name: if-return
-        disabled: true
-      - name: increment-decrement
-      - name: var-naming
-        disabled: true
-      - name: var-declaration
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-        disabled: true
-      - name: indent-error-flow
-        disabled: true
-      - name: errorf
-      - name: empty-block
-        disabled: true
-      - name: superfluous-else
-      - name: unused-parameter
-        disabled: true
-      - name: unreachable-code
-      - name: redefines-builtin-id
-
-  rowserrcheck:
-    packages:
-      - github.com/jmoiron/sqlx

.goreleaser.yml

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

.gqlgenc.yml

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

.idea/go.iml

@@ -4,10 +4,11 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/certs" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/v2.5/build" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/v2.5/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/ui/v1/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/ui/v2/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ui/v2/node_modules" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

.mockery.yml

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

.travis.yml

@@ -0,0 +1,50 @@
+dist: xenial
+language: go
+go:
+- 1.11.x
+services:
+- docker
+env:
+  global:
+  - GO111MODULE=on
+before_install:
+- echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
+- travis_retry yarn --cwd ui/v2 install
+- make generate
+- CI=false yarn --cwd ui/v2 build # TODO: Fix warnings
+#- go get -v github.com/mgechev/revive
+script:
+#- make lint
+#- make vet
+- make it
+after_success:
+- if [ "$TRAVIS_BRANCH" = "develop" ]; then export TAG_SUFFIX="_dev"; elif [ "$TRAVIS_BRANCH" != "master" ]; then export TAG_SUFFIX="_$TRAVIS_BRANCH"; fi
+- export STASH_VERSION="v0.0.0-alpha${TAG_SUFFIX}"
+- docker pull stashapp/compiler:develop
+- sh ./scripts/cross-compile.sh ${STASH_VERSION}
+- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
+before_deploy:
+- if [ "$TRAVIS_BRANCH" = "develop" ]; then export TAG_SUFFIX="_dev"; fi
+- git tag -f ${STASH_VERSION}
+- git push -f --tags
+- export RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')
+deploy:
+  provider: releases
+  api_key:
+    secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
+  file:
+  - dist/stash-osx
+  - dist/stash-win.exe
+  - dist/stash-linux
+  - dist/stash-pi
+  skip_cleanup: true
+  overwrite: true
+  body: ${RELEASE_DATE}
+  on:
+    repo: stashapp/stash
+    all_branches: true
+    condition: $TRAVIS_BRANCH =~ ^(master|develop)$
+branches:
+  only:
+    - master
+    - develop

LICENSE

@@ -1,661 +1,21 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+MIT License
+
+Copyright (c) 2019 StashApp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

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

README.md

@@ -1,84 +1,113 @@
 # Stash
 
-[![Build](https://github.com/stashapp/stash/actions/workflows/build.yml/badge.svg?branch=develop&event=push)](https://github.com/stashapp/stash/actions/workflows/build.yml)
-[![Docker pulls](https://img.shields.io/docker/pulls/stashapp/stash.svg)](https://hub.docker.com/r/stashapp/stash 'DockerHub')
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/stashapp?logo=github)](https://github.com/sponsors/stashapp)
-[![Open Collective backers](https://img.shields.io/opencollective/backers/stashapp?logo=opencollective)](https://opencollective.com/stashapp)
+[![Build Status](https://travis-ci.org/stashapp/stash.svg?branch=master)](https://travis-ci.org/stashapp/stash)
 [![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 Go app which organizes and serves your porn.**
 
-* Stash gathers information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers and sites.
-* Stash supports a wide variety of both video and image formats.
-* You can tag videos and find them later.
-* Stash provides statistics about performers, tags, studios and more.
+See a demo [here](https://vimeo.com/275537038) (password is stashapp).
 
-You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
+# Docker install
 
-For further information you can consult the [documentation](https://docs.stashapp.cc) or [read the in-app manual](ui/v2.5/src/docs/en).
+Follow [this README.md in the docker directory.](docker/production/README.md)
 
-# Installing Stash
+# Bare-metal Install
 
-<img src="docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="docs/readme_assets/docker_logo.svg" width="100%" height="75"> Docker
-:---:|:---:|:---:|:---:
-[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe)</sub></sup> | [Latest Release](https://github.com/stashapp/stash/releases/latest/download/Stash.app.zip) <br /> <sup><sub>[Development Preview](https://github.com/stashapp/stash/releases/download/latest_develop/Stash.app.zip)</sub></sup> | [Latest Release (amd64)](https://github.com/stashapp/stash/releases/latest/download/stash-linux) <br /> <sup><sub>[Development Preview (amd64)](https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux)</sub></sup> <br /> [More Architectures...](https://github.com/stashapp/stash/releases/latest) | [Instructions](docker/production/README.md) <br /> <sup><sub>[Sample docker-compose.yml](docker/production/docker-compose.yml)</sub></sup>
+Stash supports macOS, Windows, and Linux.  Download the [latest release here](https://github.com/stashapp/stash/releases).
 
-Download links for other platforms and architectures are available on the [Releases page](https://github.com/stashapp/stash/releases).
+Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9998 to get started.
 
-## First Run
+*Note for Windows users:* Running the app might present a security prompt since the binary isn't signed yet.  Just click more info and then the "run anyway" button.
 
-#### Windows/macOS Users: Security Prompt
+#### FFMPEG
 
-On Windows or macOS, running the app might present a security prompt since the binary isn't yet signed. 
+If stash is unable to find or download FFMPEG then download it yourself from the link for your platform:
 
-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.
+* [macOS](https://ffmpeg.zeranoe.com/builds/macos64/static/ffmpeg-4.0-macos64-static.zip)
+* [Windows](https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.0-win64-static.zip)
+* [Linux](https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz)
 
-#### 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.
+The `ffmpeg(.exe)` and `ffprobe(.exe)` files should be placed in `~/.stash` on macOS / Linux or `C:\Users\YourUsername\.stash` on Windows.
 
 # Usage
 
-## Quickstart Guide
-Stash is a web-based application. Once the application is running, the interface is available (by default) from http://localhost:9999.
+## CLI
 
-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 provides some command line options.  See what is currently available by running `stash --help`.
 
-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.
+For example, to run stash locally on port 80 run it like this (OSX / Linux) `stash --host 127.0.0.1 --port 80`
 
-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. 
+## SSL (HTTPS)
 
-<sub>[StashDB](http://stashdb.org) is the canonical instance of our open source metadata API, [stash-box](https://github.com/stashapp/stash-box).</sub>
+Stash supports HTTPS with some additional work.  First you must generate a SSL certificate and key combo.  Here is an example using openssl:
 
-# Translation
-[![Translate](https://hosted.weblate.org/widget/stashapp/stash/svg-badge.svg)](https://hosted.weblate.org/engage/stashapp/)
-🇧🇷 🇨🇳 🇩🇰 🇳🇱 🇬🇧 🇪🇪 🇫🇮 🇫🇷 🇩🇪 🇮🇹 🇯🇵 🇰🇷 🇵🇱 🇷🇺 🇪🇸 🇸🇪 🇹🇼 🇹🇷
+`openssl req -x509 -newkey rsa:4096 -sha256 -days 7300 -nodes -keyout stash.key -out stash.crt -extensions san -config <(echo "[req]"; echo distinguished_name=req; echo "[san]"; echo subjectAltName=DNS:stash.server,IP:127.0.0.1) -subj /CN=stash.server`
 
-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!
+This command would need customizing for your environment.  [This link](https://stackoverflow.com/questions/10175812/how-to-create-a-self-signed-certificate-with-openssl) might be useful.
 
-# Support (FAQ)
+Once you have a certificate and key file name them `stash.crt` and `stash.key` and place them in the `~/.stash` directory.  Stash detects these and starts up using HTTPS rather than HTTP.
 
-Check out our documentation on [Stash-Docs](https://docs.stashapp.cc) for information about the software, questions, guides, add-ons and more. 
+# FAQ
 
-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)
+> I'm unable to run the app on OSX or Linux
 
-# Customization
+Try running `chmod u+x stash-osx` or `chmod u+x stash-linux` to make the file executable.
 
-## 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.
+> I have a question not answered here.
 
-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).
+Join the [Discord server](https://discord.gg/2TsNFKt).
 
-# For Developers
+# Development
 
-Pull requests are welcome! 
+## Install
 
-See [Development](docs/DEVELOPMENT.md) and [Contributing](docs/CONTRIBUTING.md) for information on working with the codebase, getting a local development setup, and contributing changes.
+* [Go](https://golang.org/dl/)
+* [Revive](https://github.com/mgechev/revive) - Configurable linter
+    * Go Install: `go get github.com/mgechev/revive`
+* [Packr2](https://github.com/gobuffalo/packr/tree/v2.0.2/v2) - Static asset bundler
+    * Go Install: `go get github.com/gobuffalo/packr/v2/packr2@v2.0.2`
+    * [Binary Download](https://github.com/gobuffalo/packr/releases)
+* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
+    * Run `yarn install` in the `stash/ui/v2` folder (before running make generate for first time).
+
+NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
+
+## Environment
+
+### macOS
+
+TODO
+
+### Windows
+
+1. Download and install [Go for Windows](https://golang.org/dl/)
+2. Download and install [MingW](https://sourceforge.net/projects/mingw-w64/)
+3. Search for "advanced system settings" and open the system properties dialog.
+    1. Click the `Environment Variables` button
+    2. Add `GO111MODULE=on`
+    3. Under system variables find the `Path`.  Edit and add `C:\Program Files\mingw-w64\*\mingw64\bin` (replace * with the correct path).
+
+NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
+
+## Commands
+
+* `make generate` - Generate Go GraphQL and packr2 files
+* `make build` - Builds the binary (make sure to build the UI as well... see below)
+* `make ui` - Builds the frontend
+* `make vet` - Run `go vet`
+* `make lint` - Run the linter
+
+## Building a release
+
+1. Run `make generate` to create generated files 
+2. Run `make ui` to compile the frontend
+3. Run `make build` to build the executable for your current platform
+
+## Cross compiling
+
+This project uses a modification of [this](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) docker container to create an environment
+where the app can be cross-compiled.  This process is kicked off by CI via the `scripts/cross-compile.sh` script.  Run the following
+command to open a bash shell to the container to poke around:
+
+`docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -i -t stashappdev/compiler:latest /bin/bash`

cmd/phasher/main.go

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

cmd/stash/main.go

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

docker/build/x86_64/Dockerfile

@@ -1,39 +0,0 @@
-# This dockerfile should be built with `make docker-build` from the stash root.
-
-# Build Frontend
-FROM node:alpine as frontend
-RUN apk add --no-cache make git
-## cache node_modules separately
-COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
-WORKDIR /stash
-COPY Makefile /stash/
-COPY ./graphql /stash/graphql/
-COPY ./ui /stash/ui/
-RUN make pre-ui
-RUN make generate-ui
-ARG GITHASH
-ARG STASH_VERSION
-RUN BUILD_DATE=$(date +"%Y-%m-%d %H:%M:%S") make ui
-
-# Build Backend
-FROM golang:1.19-alpine as backend
-RUN apk add --no-cache make alpine-sdk
-WORKDIR /stash
-COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
-COPY ./scripts /stash/scripts/
-COPY ./pkg /stash/pkg/
-COPY ./cmd /stash/cmd
-COPY ./internal /stash/internal
-COPY --from=frontend /stash /stash/
-RUN make generate-backend
-ARG GITHASH
-ARG STASH_VERSION
-RUN make flags-release flags-pie stash
-
-# Final Runnable Image
-FROM alpine:latest
-RUN apk add --no-cache ca-certificates vips-tools ffmpeg
-COPY --from=backend /stash/stash /usr/bin/
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-EXPOSE 9999
-ENTRYPOINT ["stash"]

docker/build/x86_64/Dockerfile-CUDA

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

docker/build/x86_64/README.md

@@ -1,67 +0,0 @@
-# Introduction
-
-This dockerfile is used to build a stash docker container using the current source code. This is ideal for testing your current branch in docker. Note that it does not include python, so python-based scrapers will not work in this image. The production docker images distributed by the project contain python and the necessary packages.
-
-# Building the docker container
-
-From the top-level directory (should contain `main.go` file):
-
-```
-make docker-build
-
-```
-
-# Running the docker container
-
-## Using docker-compose
-
-See the `README.md` file in `docker/production` for instructions on how to get docker-compose if needed.
-
-The `stash/build` container can be run with the `docker-compose.yml` file in `docker/production` by changing the `image` value to be `stash/build`. See the instructions in `docker/production` for how to run docker-compose.
-
-## Using `docker run`
-
-After building the container:
-
-```
-docker run \
- -e STASH_STASH=/data/ \
- -e STASH_METADATA=/metadata/ \
- -e STASH_CACHE=/cache/ \
- -e STASH_GENERATED=/generated/ \
- -v <path to config dir>:/root/.stash \
- -v <path to media>:/data \
- -v <path to metadata>:/metadata \
- -v <path to cache>:/cache \
- -v <path to generated>:/generated \
- -p 9999:9999 \
- stash/build:latest 
-```
-
-Change the `<xxx>` to the appropriate paths. Note that the `<path to media>` directory should be separate from the cache, generated and metadata directories. It is recommended to have the cache, generated and metadata directories in the same parent directory, for example:
-
-```
-/stash
-  /config
-  /metadata
-  /generated
-  /cache
-/media
-```
-
-Using this example directory structure, the above command would be:
-
-```
-docker run \
- -e STASH_STASH=/data/ \
- -e STASH_METADATA=/metadata/ \
- -e STASH_CACHE=/cache/ \
- -e STASH_GENERATED=/generated/ \
- -v /stash/config:/root/.stash \
- -v /media:/data \
- -v /stash/metadata:/metadata \
- -v /stash/cache:/cache \
- -v /stash/generated:/generated \
- -p 9999:9999 \
- stash/build:latest 
-```

docker/ci/x86_64/Dockerfile

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

docker/ci/x86_64/README.md

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

docker/ci/x86_64/docker_push.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-DOCKER_TAGS=""
-
-for TAG in "$@"
-do
-	DOCKER_TAGS="$DOCKER_TAGS -t stashapp/stash:$TAG"
-done
-
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-# must build the image from dist directory
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --push $DOCKER_TAGS -f docker/ci/x86_64/Dockerfile dist/
-

docker/compiler/Dockerfile

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

docker/compiler/README.md

@@ -1,3 +1 @@
-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 GitHub workflow files also need to be updated to pull the correct image tag.
+Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser

docker/compiler/create_osx_sdk.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+TMP=$(mktemp -d /tmp/XXXXXXXXXXX)
+SDK="MacOSX10.11.sdk"
+
+mkdir -p $TMP/$SDK/usr/include/c++
+
+cp -rf /Applications/Xcode7.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$SDK $TMP &>/dev/null || true
+cp -rf /Applications/Xcode7.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 $TMP/$SDK/usr/include/c++  || exit -1
+
+tar -C $TMP -czf $SDK.tar.gz $SDK

docker/production/README.md

@@ -1,37 +1,53 @@
-# 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.
+# Docker install on Ubuntu 18.04
+Installing StashApp can likely work on others if your OS either has it's own package manager or comes shipped with Docker and docker-compose.
 
 ## 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.
+The goal is to avoid as many dependencies as possible so for now the only pre-requisites you are required to have are `curl`, `docker`, and `docker-compose` 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.
-https://docs.docker.com/engine/install/
+### Docker
+
+Docker is effectively the 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 ship what's required to run an application from one place to another with a degree of a standard that makes it easy for everyone along the way to reproduce the environment for their step in the chain.
+
+The other side of docker is it brings everything that we would typically have to teach you about the individual components of your soon to be installed StashApp and ffmpeg, docker-compose wraps it up nicely in a handful of easy to follow steps that should result in the same environment on everyone's host.
+
+The installation method we recommend is via the `docker.com` website however if your specific operating system's repository versions are at the latest along with docker you should be good to launch with you using whatever instructions you wish.  The version of Docker we used in our deployment for testing this process was `Docker version 17.05.0-ce, build 89658be` however any versions later than this will be sufficient.  At the writing of this tutorial, this was not the latest version of Docker.
+
+#### Just the link to installation instructions, please
+Instructions for installing on Ubuntu are at the link that follows:
+https://docs.docker.com/install/linux/docker-ce/ubuntu/
+
+If you plan on using other versions of OS you should at least aim to be a Linux base with an x86_64 CPU and the appropriate minimum version of the dependencies.
+
+### Docker-compose
+Docker Compose's role in this deployment is to get you a fully working instance of StashApp exactly as you would need it to have a reasonable instance for testing / developing on, you could technically deploy a live instance with this, but without a reverse proxy, is not recommended.  You are encouraged to learn how to use the Docker-Compose format, but it's not a required prerequisite for getting this running you need to have it installed successfully.
+
+Install Docker Compose via this guide below, and it is essential if you're using an older version of Linux to use the official documentation from Docker.com because you require the more recent version of docker-compose at least version 3.4 aka 1.22.0 or newer.
+
+#### Just the link to installation instructions, please
+https://docs.docker.com/compose/install/
+
+### Install curl
+This one's easy, copy paste.
+
+```
+apt update -y && \
+apt install -f curl
+```
 
 ### Get the docker-compose.yml file
 
-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:
+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 you can make your Linux console do it for you with this.
 
 ```
-mkdir stashapp && cd stashapp
-curl -o docker-compose.yml https://raw.githubusercontent.com/stashapp/stash/develop/docker/production/docker-compose.yml
+curl -o ~/docker-compose.yml https://raw.githubusercontent.com/stashapp/stash/master/docker/production/docker-compose.yml
 ```
 
-Once you have that file where you want it, modify the settings as you please, and then run:
+Once you have that file where you want it, you can either modify the settings as you please OR you can run the following to get it up and running instantly.
 
 ```
-docker-compose up -d
+cd ~ && 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
+Installing StashApp this way will by default bind stash to port 9999 or in web browser terms.  http://YOURIP:9999 or if you're doing this on your machine locally which is the only recommended production version of this container as is with no security configurations set at all is http://localhost:9999
 
 Good luck and have fun!
-
-### Docker
-Docker is effectively a cross-platform software package repository. It allows you to ship an entire environment in what's referred to as a container. Containers are intended to hold everything that is needed to run an application from one place to another, making it easy for everyone along the way to reproduce the environment.
-
-The StashApp docker container ships with everything you need to automatically build and run stash, including ffmpeg.
-
-### docker-compose
-Docker Compose lets you specify how and where to run your containers, and to manage their environment. The docker-compose.yml file in this folder gets you a fully working instance of StashApp exactly as you would need it to have a reasonable instance for testing / developing on. If you are deploying a live instance for production, a reverse proxy (such as NGINX or Traefik) is recommended, but not required.
-
-The latest version is always recommended.

docker/production/docker-compose.yml

@@ -4,39 +4,28 @@ version: '3.4'
 services:
   stash:
     image: stashapp/stash:latest
-    container_name: stash
     restart: unless-stopped
-    ## the container's port must be the same with the STASH_PORT in the environment section
     ports:
       - "9999:9999"
-    ## If you intend to use stash's DLNA functionality uncomment the below network mode and comment out the above ports section
-    # network_mode: host
     logging:
       driver: "json-file"
       options:
         max-file: "10"
-        max-size: "2m"
+        max-size: "200k"
     environment:
       - STASH_STASH=/data/
       - STASH_GENERATED=/generated/
       - STASH_METADATA=/metadata/
       - STASH_CACHE=/cache/
-      ## Adjust below to change default port (9999)
-      - STASH_PORT=9999
     volumes:
       - /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
-      
-      ## Keep configs, scrapers, and plugins here.
+      ## Keep configs here.
       - ./config:/root/.stash
       ## Point this at your collection.
       - ./data:/data
+      ## This is where pre-generated transcodes live.
+      - ./transcodes:/transcodes
       ## This is where your stash's metadata lives
       - ./metadata:/metadata
       ## Any other cache content.
       - ./cache:/cache
-      ## Where to store binary blob data (scene covers, images)
-      - ./blobs:/blobs
-      ## Where to store generated content (screenshots,previews,transcodes,sprites)
-      - ./generated:/generated

docker/production/x86_64/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:18.04 as prep
+LABEL MAINTAINER="leopere [at] nixc [dot] us"
+
+RUN apt-get update && \
+    apt-get -y install curl xz-utils && \
+    apt-get autoclean -y && \
+    rm -rf /var/lib/apt/lists/*
+WORKDIR /
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases | grep -F 'stash-linux' | grep download | head -n 1 | cut -d'"' -f4) && \
+    chmod +x /stash && \
+    curl -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar xf /ffmpeg.tar.xz && \
+    rm ffmpeg.tar.xz && \
+    mv /ffmpeg*/ /ffmpeg/
+
+FROM ubuntu:18.04 as app
+RUN apt-get update && \
+    apt-get -y install ca-certificates && \
+    adduser stash --gecos GECOS --shell /bin/bash --disabled-password --home /home/stash
+COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+EXPOSE 9999
+CMD ["stash"]

docs/CONTRIBUTING.md

@@ -1,14 +0,0 @@
-
-## 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.
-
-## Contributor Checklist
-Please make sure that you've considered the following before you submit your Pull Requests as ready for merging.
-* I've run Code linters and [gofmt](https://golang.org/cmd/gofmt/) to make sure that my code is readable.
-* I have read through formerly submitted [pull requests](https://github.com/stashapp/stash/pulls) and [git issues](https://github.com/stashapp/stash/issues) to make sure that this contribution is required and isn't a duplicate. Also, so that I can manage to close any git Issues needing closed relating to this feature submission.
-* I  commented adequately on my code with the expectation in mind that anyone else should be able to look at this code I've submitted and know exactly what's happening and what the expectations are.
-
-### Legal Agreements
-* I acknowledge that if applicable to me, submitting and subsequent acceptance of this Pull Request I, the code contributor of this Pull Request, agree and acknowledge my understanding that the new code license has now been updated to [AGPL](/LICENSE.md). I agree that all code before this Pull Request, which I've previously submitted, is now to be re-licensed under the new license AGPL and no longer the former MIT license.
-
-**In case you were unable to follow any of the above include an explanation as to why not in your Pull Request.**

docs/DEVELOPMENT.md

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

docs/readme_assets/docker_logo.svg

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

docs/readme_assets/linux_logo.svg

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

docs/readme_assets/mac_logo.svg

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

docs/readme_assets/windows_logo.svg

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

go.mod

@@ -1,112 +1,30 @@
 module github.com/stashapp/stash
 
-go 1.19
-
 require (
-	github.com/99designs/gqlgen v0.17.2
-	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
-	github.com/Yamashou/gqlgenc v0.0.6
-	github.com/anacrolix/dms v1.2.2
-	github.com/antchfx/htmlquery v1.3.0
-	github.com/asticode/go-astisub v0.26.0
-	github.com/chromedp/cdproto v0.0.0-20231007061347-18b01cd81617
-	github.com/chromedp/chromedp v0.9.2
-	github.com/corona10/goimagehash v1.1.0
-	github.com/disintegration/imaging v1.6.2
-	github.com/doug-martin/goqu/v9 v9.18.0
-	github.com/go-chi/chi/v5 v5.0.10
-	github.com/go-chi/cors v1.2.1
-	github.com/go-chi/httplog v0.3.1
-	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
-	github.com/gofrs/uuid/v5 v5.0.0
-	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/golang-migrate/migrate/v4 v4.16.2
-	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v1.2.1
-	github.com/gorilla/websocket v1.5.0
-	github.com/hashicorp/golang-lru/v2 v2.0.6
-	github.com/jinzhu/copier v0.4.0
-	github.com/jmoiron/sqlx v1.3.5
-	github.com/json-iterator/go v1.1.12
-	github.com/kermieisinthehouse/gosx-notifier v0.1.2
-	github.com/kermieisinthehouse/systray v1.2.4
-	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mattn/go-sqlite3 v1.14.17
-	github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
-	github.com/remeh/sizedwaitgroup v1.0.0
-	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
+	github.com/99designs/gqlgen v0.9.0
+	github.com/PuerkitoBio/goquery v1.5.0
+	github.com/antchfx/htmlquery v1.2.0
+	github.com/antchfx/xpath v1.1.2 // indirect
+	github.com/bmatcuk/doublestar v1.1.5
+	github.com/disintegration/imaging v1.6.0
+	github.com/go-chi/chi v4.0.2+incompatible
+	github.com/gobuffalo/packr/v2 v2.0.2
+	github.com/golang-migrate/migrate/v4 v4.3.1
+	github.com/gorilla/websocket v1.4.0
+	github.com/h2non/filetype v1.0.8
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmoiron/sqlx v1.2.0
+	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
-	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cast v1.5.1
-	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.16.0
-	github.com/stretchr/testify v1.8.4
-	github.com/tidwall/gjson v1.16.0
-	github.com/vearutop/statigz v1.4.0
-	github.com/vektah/dataloaden v0.3.0
-	github.com/vektah/gqlparser/v2 v2.4.2
-	github.com/vektra/mockery/v2 v2.10.0
-	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
-	github.com/zencoder/go-dash/v3 v3.0.2
-	golang.org/x/crypto v0.17.0
-	golang.org/x/image v0.12.0
-	golang.org/x/net v0.17.0
-	golang.org/x/sys v0.15.0
-	golang.org/x/term v0.15.0
-	golang.org/x/text v0.14.0
-	gopkg.in/guregu/null.v4 v4.0.0
-	gopkg.in/yaml.v2 v2.4.0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spf13/pflag v1.0.3
+	github.com/spf13/viper v1.4.0
+	github.com/vektah/gqlparser v1.1.2
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
+	golang.org/x/image v0.0.0-20190118043309-183bebdce1b2 // indirect
+	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
+	gopkg.in/yaml.v2 v2.2.2
 )
 
-require (
-	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/antchfx/xpath v1.2.3 // indirect
-	github.com/asticode/go-astikit v0.20.0 // indirect
-	github.com/asticode/go-astits v1.8.0 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gobwas/httphead v0.1.0 // indirect
-	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/moq v0.2.3 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.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/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.30.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cobra v1.7.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/urfave/cli/v2 v2.8.1 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

gqlgen.yml

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

graphql/documents/data/config.graphql

@@ -0,0 +1,33 @@
+fragment ConfigGeneralData on ConfigGeneralResult {
+  stashes
+  databasePath
+  generatedPath
+  maxTranscodeSize
+  maxStreamingTranscodeSize
+  username
+  password
+  logFile
+  logOut
+  logLevel
+  logAccess
+  excludes
+}
+
+fragment ConfigInterfaceData on ConfigInterfaceResult {
+  soundOnPreview
+  wallShowTitle
+  maximumLoopDuration
+  autostartVideo
+  showStudioAsText
+  css
+  cssEnabled
+}
+
+fragment ConfigData on ConfigResult {
+  general {
+    ...ConfigGeneralData
+  }
+  interface {
+    ...ConfigInterfaceData
+  }
+}

graphql/documents/data/gallery.graphql

@@ -0,0 +1,11 @@
+fragment GalleryData on Gallery {
+  id
+  checksum
+  path
+  title
+  files {
+    index
+    name
+    path
+  }
+}

graphql/documents/data/performer-slim.graphql

@@ -0,0 +1,5 @@
+fragment SlimPerformerData on Performer {
+  id
+  name
+  image_path
+}

graphql/documents/data/performer.graphql

@@ -0,0 +1,22 @@
+fragment PerformerData on Performer {
+  id
+  checksum
+  name
+  url
+  twitter
+  instagram
+  birthdate
+  ethnicity
+  country
+  eye_color
+  height
+  measurements
+  fake_tits
+  career_length
+  tattoos
+  piercings
+  aliases
+  favorite
+  image_path
+  scene_count
+}

graphql/documents/data/scene-marker.graphql

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

graphql/documents/data/scene-slim.graphql

@@ -0,0 +1,60 @@
+fragment SlimSceneData on Scene {
+  id
+  checksum
+  title
+  details
+  url
+  date
+  rating
+  path
+
+  file {
+    size
+    duration
+    video_codec
+    audio_codec
+    width
+    height
+    framerate
+    bitrate
+  }
+
+  paths {
+    screenshot
+    preview
+    stream
+    webp
+    vtt
+    chapters_vtt
+  }
+
+  scene_markers {
+    id
+    title
+    seconds
+  }
+
+  gallery {
+    id
+    path
+    title
+  }
+
+  studio {
+    id
+    name
+    image_path
+  }
+
+  tags {
+    id
+    name
+  }
+
+  performers {
+    id
+    name
+    favorite
+    image_path
+  }
+}

graphql/documents/data/scene.graphql

@@ -0,0 +1,52 @@
+fragment SceneData on Scene {
+  id
+  checksum
+  title
+  details
+  url
+  date
+  rating
+  path
+
+  file {
+    size
+    duration
+    video_codec
+    audio_codec
+    width
+    height
+    framerate
+    bitrate
+  }
+
+  paths {
+    screenshot
+    preview
+    stream
+    webp
+    vtt
+    chapters_vtt
+  }
+
+  scene_markers {
+    ...SceneMarkerData
+  }
+
+  is_streamable
+
+  gallery {
+    ...GalleryData
+  }
+
+  studio {
+    ...StudioData
+  }
+
+  tags {
+    ...TagData
+  }
+
+  performers {
+    ...PerformerData
+  }
+}

graphql/documents/data/scrapers.graphql

@@ -0,0 +1,75 @@
+fragment ScrapedPerformerData on ScrapedPerformer {
+  name
+  url
+  birthdate
+  ethnicity
+  country
+  eye_color
+  height
+  measurements
+  fake_tits
+  career_length
+  tattoos
+  piercings
+  aliases
+}
+
+fragment ScrapedScenePerformerData on ScrapedScenePerformer {
+  id
+  name
+  url
+  twitter
+  instagram
+  birthdate
+  ethnicity
+  country
+  eye_color
+  height
+  measurements
+  fake_tits
+  career_length
+  tattoos
+  piercings
+  aliases
+}
+
+fragment ScrapedSceneStudioData on ScrapedSceneStudio {
+  id
+  name
+  url
+}
+
+fragment ScrapedSceneTagData on ScrapedSceneTag {
+  id
+  name
+}
+
+fragment ScrapedSceneData on ScrapedScene {
+  title
+  details
+  url
+  date
+
+  file {
+    size
+    duration
+    video_codec
+    audio_codec
+    width
+    height
+    framerate
+    bitrate
+  }
+
+  studio {
+    ...ScrapedSceneStudioData
+  }
+
+  tags {
+    ...ScrapedSceneTagData
+  }
+
+  performers {
+    ...ScrapedScenePerformerData
+  }
+}

graphql/documents/data/studio-slim.graphql

@@ -0,0 +1,5 @@
+fragment SlimStudioData on Studio {
+  id
+  name
+  image_path
+}

graphql/documents/data/studio.graphql

@@ -0,0 +1,8 @@
+fragment StudioData on Studio {
+  id
+  checksum
+  name
+  url
+  image_path
+  scene_count
+}

graphql/documents/data/tag.graphql

@@ -0,0 +1,6 @@
+fragment TagData on Tag {
+  id
+  name
+  scene_count
+  scene_marker_count
+}

graphql/documents/mutations/config.graphql

@@ -0,0 +1,11 @@
+mutation ConfigureGeneral($input: ConfigGeneralInput!) {
+  configureGeneral(input: $input) {
+    ...ConfigGeneralData
+  }
+}
+
+mutation ConfigureInterface($input: ConfigInterfaceInput!) {
+  configureInterface(input: $input) {
+    ...ConfigInterfaceData
+  }
+}

graphql/documents/mutations/performer.graphql

@@ -0,0 +1,89 @@
+mutation PerformerCreate(
+  $name: String,
+  $url: String,
+  $birthdate: String,
+  $ethnicity: String,
+  $country: String,
+  $eye_color: String,
+  $height: String,
+  $measurements: String,
+  $fake_tits: String,
+  $career_length: String,
+  $tattoos: String,
+  $piercings: String,
+  $aliases: String,
+  $twitter: String,
+  $instagram: String,
+  $favorite: Boolean,
+  $image: String) {
+
+  performerCreate(input: {
+                            name: $name,
+                            url: $url,
+                            birthdate: $birthdate,
+                            ethnicity: $ethnicity,
+                            country: $country,
+                            eye_color: $eye_color,
+                            height: $height,
+                            measurements: $measurements,
+                            fake_tits: $fake_tits,
+                            career_length: $career_length,
+                            tattoos: $tattoos,
+                            piercings: $piercings,
+                            aliases: $aliases,
+                            twitter: $twitter,
+                            instagram: $instagram,
+                            favorite: $favorite,
+                            image: $image
+                          }) {
+      ...PerformerData
+  }
+}
+
+mutation PerformerUpdate(
+  $id: ID!,
+  $name: String,
+  $url: String,
+  $birthdate: String,
+  $ethnicity: String,
+  $country: String,
+  $eye_color: String,
+  $height: String,
+  $measurements: String,
+  $fake_tits: String,
+  $career_length: String,
+  $tattoos: String,
+  $piercings: String,
+  $aliases: String,
+  $twitter: String,
+  $instagram: String,
+  $favorite: Boolean,
+  $image: String) {
+
+  performerUpdate(input: {
+                            id: $id,
+                            name: $name,
+                            url: $url,
+                            birthdate: $birthdate,
+                            ethnicity: $ethnicity,
+                            country: $country,
+                            eye_color: $eye_color,
+                            height: $height,
+                            measurements: $measurements,
+                            fake_tits: $fake_tits,
+                            career_length: $career_length,
+                            tattoos: $tattoos,
+                            piercings: $piercings,
+                            aliases: $aliases,
+                            twitter: $twitter,
+                            instagram: $instagram,
+                            favorite: $favorite,
+                            image: $image
+                          }) {
+    ...PerformerData
+  }
+}
+
+mutation PerformerDestroy($id: ID!) {
+  performerDestroy(input: { id: $id })
+}

graphql/documents/mutations/scene-marker.graphql

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

graphql/documents/mutations/scene.graphql

@@ -0,0 +1,67 @@
+mutation SceneUpdate(
+  $id: ID!,
+  $title: String,
+  $details: String,
+  $url: String,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $gallery_id: ID,
+  $performer_ids: [ID!] = [],
+  $tag_ids: [ID!] = [],
+  $cover_image: String) {
+
+  sceneUpdate(input: {
+                        id: $id,
+                        title: $title,
+                        details: $details,
+                        url: $url,
+                        date: $date,
+                        rating: $rating,
+                        studio_id: $studio_id,
+                        gallery_id: $gallery_id,
+                        performer_ids: $performer_ids,
+                        tag_ids: $tag_ids,
+                        cover_image: $cover_image
+                      }) {
+      ...SceneData
+  }
+}
+
+mutation BulkSceneUpdate(
+  $ids: [ID!] = [],
+  $title: String,
+  $details: String,
+  $url: String,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $gallery_id: ID,
+  $performer_ids: [ID!],
+  $tag_ids: [ID!]) {
+
+  bulkSceneUpdate(input: {
+                        ids: $ids,
+                        title: $title,
+                        details: $details,
+                        url: $url,
+                        date: $date,
+                        rating: $rating,
+                        studio_id: $studio_id,
+                        gallery_id: $gallery_id,
+                        performer_ids: $performer_ids,
+                        tag_ids: $tag_ids
+                      }) {
+      ...SceneData
+  }
+}
+
+mutation ScenesUpdate($input : [SceneUpdateInput!]!) {
+  scenesUpdate(input: $input) {
+    ...SceneData
+  }
+}
+
+mutation SceneDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
+  sceneDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
+}

graphql/documents/mutations/studio.graphql

@@ -0,0 +1,24 @@
+mutation StudioCreate(
+  $name: String!,
+  $url: String,
+  $image: String) {
+
+  studioCreate(input: { name: $name, url: $url, image: $image }) {
+    ...StudioData
+  }
+}
+
+mutation StudioUpdate(
+  $id: ID!
+  $name: String,
+  $url: String,
+  $image: String) {
+
+  studioUpdate(input: { id: $id, name: $name, url: $url, image: $image }) {
+    ...StudioData
+  }
+}
+
+mutation StudioDestroy($id: ID!) {
+  studioDestroy(input: { id: $id })
+}

graphql/documents/mutations/tag.graphql

@@ -0,0 +1,15 @@
+mutation TagCreate($name: String!) {
+  tagCreate(input: { name: $name }) {
+    ...TagData
+  }
+}
+
+mutation TagDestroy($id: ID!) {
+  tagDestroy(input: { id: $id })
+}
+
+mutation TagUpdate($id: ID!, $name: String!) {
+  tagUpdate(input: { id: $id, name: $name }) {
+    ...TagData
+  }
+}

graphql/documents/queries/gallery.graphql

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

graphql/documents/queries/legacy.graphql

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

graphql/documents/queries/misc.graphql

@@ -0,0 +1,68 @@
+query FindTag($id: ID!) {
+  findTag(id: $id) {
+    ...TagData
+  }
+}
+
+query MarkerStrings($q: String, $sort: String) {
+  markerStrings(q: $q, sort: $sort) {
+    id
+    count
+    title
+  }
+}
+
+query AllTags {
+  allTags {
+    ...TagData
+  }
+}
+
+query AllPerformersForFilter {
+  allPerformers {
+    ...SlimPerformerData
+  }
+}
+
+query AllStudiosForFilter {
+  allStudios {
+    ...SlimStudioData
+  }
+}
+
+query AllTagsForFilter {
+  allTags {
+    id
+    name
+  }
+}
+
+query ValidGalleriesForScene($scene_id: ID!) {
+  validGalleriesForScene(scene_id: $scene_id) {
+    id
+    path
+  }
+}
+
+query Stats {
+  stats {
+    scene_count,
+    gallery_count,
+    performer_count,
+    studio_count,
+    tag_count
+  }
+}
+
+query Logs {
+  logs {
+    ...LogEntryData
+  }
+}
+query Version {
+  version {
+    version
+    hash
+    build_time
+  }
+}

graphql/documents/queries/performer.graphql

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

graphql/documents/queries/scene-marker.graphql

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

graphql/documents/queries/scene.graphql

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

graphql/documents/queries/scrapers/freeones.graphql

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

graphql/documents/queries/scrapers/scrapers.graphql

@@ -0,0 +1,51 @@
+query ListPerformerScrapers {
+  listPerformerScrapers {
+    id
+    name
+    performer {
+      urls
+      supported_scrapes
+    }
+  }
+}
+
+query ListSceneScrapers {
+  listSceneScrapers {
+    id
+    name
+    scene {
+      urls
+      supported_scrapes
+    }
+  }
+}
+
+query ScrapePerformerList($scraper_id: ID!, $query: String!) {
+  scrapePerformerList(scraper_id: $scraper_id, query: $query) {
+    ...ScrapedPerformerData
+  }
+}
+
+query ScrapePerformer($scraper_id: ID!, $scraped_performer: ScrapedPerformerInput!) {
+  scrapePerformer(scraper_id: $scraper_id, scraped_performer: $scraped_performer) {
+    ...ScrapedPerformerData
+  }
+}
+
+query ScrapePerformerURL($url: String!) {
+  scrapePerformerURL(url: $url) {
+    ...ScrapedPerformerData
+  }
+}
+
+query ScrapeScene($scraper_id: ID!, $scene: SceneUpdateInput!) {
+  scrapeScene(scraper_id: $scraper_id, scene: $scene) {
+    ...ScrapedSceneData
+  }
+}
+
+query ScrapeSceneURL($url: String!) {
+  scrapeSceneURL(url: $url) {
+    ...ScrapedSceneData
+  }
+}

graphql/documents/queries/settings/config.graphql

@@ -0,0 +1,9 @@
+query Configuration {
+  configuration {
+    ...ConfigData
+  }
+}
+
+query Directories($path: String) {
+  directories(path: $path)
+}

graphql/documents/queries/settings/metadata.graphql

@@ -0,0 +1,35 @@
+query MetadataImport {
+  metadataImport
+}
+
+query MetadataExport {
+  metadataExport
+}
+
+query MetadataScan($input: ScanMetadataInput!) {
+  metadataScan(input: $input)
+}
+
+query MetadataGenerate($input: GenerateMetadataInput!) {
+  metadataGenerate(input: $input)
+}
+
+query MetadataAutoTag($input: AutoTagMetadataInput!) {
+  metadataAutoTag(input: $input)
+}
+
+query MetadataClean {
+  metadataClean
+}
+
+query JobStatus {
+  jobStatus {
+    progress
+    status
+    message
+  }
+}
+
+query StopJob {
+  stopJob
+}

graphql/documents/queries/studio.graphql

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

graphql/documents/subscriptions.graphql

@@ -0,0 +1,13 @@
+subscription MetadataUpdate {
+  metadataUpdate {
+    progress
+    status
+    message
+  }
+}
+
+subscription LoggingSubscribe {
+  loggingSubscribe {
+    ...LogEntryData
+  }
+}

graphql/schema/schema.graphql

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

graphql/schema/types/config.graphql

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

graphql/schema/types/dlna.graphql

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

graphql/schema/types/file.graphql

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

graphql/schema/types/filters.graphql

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

graphql/schema/types/gallery-chapter.graphql

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

graphql/schema/types/gallery.graphql

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

graphql/schema/types/image.graphql

@@ -1,100 +0,0 @@
-type Image {
-  id: ID!
-  title: String
-  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!
-  created_at: Time!
-  updated_at: Time!
-
-  files: [ImageFile!]! @deprecated(reason: "Use visual_files")
-  visual_files: [VisualFile!]!
-  paths: ImagePathsType! # Resolver
-  galleries: [Gallery!]!
-  studio: Studio
-  tags: [Tag!]!
-  performers: [Performer!]!
-}
-
-type ImageFileType {
-  mod_time: Time!
-  size: Int!
-  width: Int!
-  height: Int!
-}
-
-type ImagePathsType {
-  thumbnail: String # Resolver
-  preview: String # Resolver
-  image: String # Resolver
-}
-
-input ImageUpdateInput {
-  clientMutationId: String
-  id: ID!
-  title: String
-  code: String
-  # rating expressed as 1-100
-  rating100: Int
-  organized: Boolean
-  url: String @deprecated(reason: "Use urls")
-  urls: [String!]
-  date: String
-  details: String
-  photographer: String
-
-  studio_id: ID
-  performer_ids: [ID!]
-  tag_ids: [ID!]
-  gallery_ids: [ID!]
-
-  primary_file_id: ID
-}
-
-input BulkImageUpdateInput {
-  clientMutationId: String
-  ids: [ID!]
-  title: String
-  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
-}
-
-input ImageDestroyInput {
-  id: ID!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
-input ImagesDestroyInput {
-  ids: [ID!]!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
-type FindImagesResultType {
-  count: Int!
-  "Total megapixels of the images"
-  megapixels: Float!
-  "Total file size in bytes"
-  filesize: Float!
-  images: [Image!]!
-}

graphql/schema/types/job.graphql

@@ -1,33 +0,0 @@
-enum JobStatus {
-  READY
-  RUNNING
-  FINISHED
-  STOPPING
-  CANCELLED
-}
-
-type Job {
-  id: ID!
-  status: JobStatus!
-  subTasks: [String!]
-  description: String!
-  progress: Float
-  startTime: Time
-  endTime: Time
-  addTime: Time!
-}
-
-input FindJobInput {
-  id: ID!
-}
-
-enum JobStatusUpdateType {
-  ADD
-  REMOVE
-  UPDATE
-}
-
-type JobStatusUpdate {
-  type: JobStatusUpdateType!
-  job: Job!
-}

graphql/schema/types/logging.graphql

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

graphql/schema/types/metadata.graphql

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

graphql/schema/types/migration.graphql

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

graphql/schema/types/movie.graphql

@@ -1,75 +0,0 @@
-type Movie {
-  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
-  url: String
-  created_at: Time!
-  updated_at: Time!
-
-  front_image_path: String # Resolver
-  back_image_path: String # Resolver
-  scene_count: Int! # Resolver
-  scenes: [Scene!]!
-}
-
-input MovieCreateInput {
-  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
-  url: String
-  "This should be a URL or a base64 encoded data URL"
-  front_image: String
-  "This should be a URL or a base64 encoded data URL"
-  back_image: String
-}
-
-input MovieUpdateInput {
-  id: ID!
-  name: String
-  aliases: String
-  duration: Int
-  date: String
-  # rating expressed as 1-100
-  rating100: Int
-  studio_id: ID
-  director: String
-  synopsis: String
-  url: String
-  "This should be a URL or a base64 encoded data URL"
-  front_image: String
-  "This should be a URL or a base64 encoded data URL"
-  back_image: String
-}
-
-input BulkMovieUpdateInput {
-  clientMutationId: String
-  ids: [ID!]
-  # rating expressed as 1-100
-  rating100: Int
-  studio_id: ID
-  director: String
-}
-
-input MovieDestroyInput {
-  id: ID!
-}
-
-type FindMoviesResultType {
-  count: Int!
-  movies: [Movie!]!
-}

graphql/schema/types/package.graphql

@@ -1,36 +0,0 @@
-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

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

graphql/schema/types/plugin.graphql

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

graphql/schema/types/scalars.graphql

@@ -1,25 +0,0 @@
-"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"
-for "5 minutes in the future"
-"""
-scalar Timestamp
-
-"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-tag.graphql

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

graphql/schema/types/scene-marker.graphql

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

graphql/schema/types/scene.graphql

@@ -15,167 +15,58 @@ type ScenePathsType {
   stream: String # Resolver
   webp: String # Resolver
   vtt: String # Resolver
-  sprite: String # Resolver
-  funscript: String # Resolver
-  interactive_heatmap: String # Resolver
-  caption: String # Resolver
-}
-
-type SceneMovie {
-  movie: Movie!
-  scene_index: Int
-}
-
-type VideoCaption {
-  language_code: String!
-  caption_type: String!
+  chapters_vtt: String # Resolver
 }
 
 type Scene {
   id: ID!
+  checksum: String!
   title: String
-  code: String
   details: String
-  director: String
-  url: String @deprecated(reason: "Use urls")
-  urls: [String!]!
+  url: String
   date: String
-  # rating expressed as 1-100
-  rating100: Int
-  organized: Boolean!
-  o_counter: Int
-  interactive: Boolean!
-  interactive_speed: Int
-  captions: [VideoCaption!]
-  created_at: Time!
-  updated_at: Time!
-  "The last time play count was updated"
-  last_played_at: Time
-  "The time index a scene was left at"
-  resume_time: Float
-  "The total time a scene has spent playing"
-  play_duration: Float
-  "The number ot times a scene has been played"
-  play_count: Int
+  rating: Int
+  path: String!
 
-  "Times a scene was played"
-  play_history: [Time!]!
-  "Times the o counter was incremented"
-  o_history: [Time!]!
-
-  files: [VideoFile!]!
+  file: SceneFileType! # Resolver
   paths: ScenePathsType! # Resolver
+  is_streamable: Boolean! # Resolver
+
   scene_markers: [SceneMarker!]!
-  galleries: [Gallery!]!
+  gallery: Gallery
   studio: Studio
-  movies: [SceneMovie!]!
   tags: [Tag!]!
   performers: [Performer!]!
-  stash_ids: [StashID!]!
-
-  "Return valid stream paths"
-  sceneStreams: [SceneStreamEndpoint!]!
-}
-
-input SceneMovieInput {
-  movie_id: ID!
-  scene_index: Int
-}
-
-input SceneCreateInput {
-  title: String
-  code: String
-  details: String
-  director: String
-  url: String @deprecated(reason: "Use urls")
-  urls: [String!]
-  date: String
-  # rating expressed as 1-100
-  rating100: Int
-  organized: Boolean
-  studio_id: ID
-  gallery_ids: [ID!]
-  performer_ids: [ID!]
-  movies: [SceneMovieInput!]
-  tag_ids: [ID!]
-  "This should be a URL or a base64 encoded data URL"
-  cover_image: String
-  stash_ids: [StashIDInput!]
-
-  """
-  The first id will be assigned as primary.
-  Files will be reassigned from existing scenes if applicable.
-  Files must not already be primary for another scene.
-  """
-  file_ids: [ID!]
 }
 
 input SceneUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
-  code: String
   details: String
-  director: String
-  url: String @deprecated(reason: "Use urls")
-  urls: [String!]
+  url: String
   date: String
-  # rating expressed as 1-100
-  rating100: Int
-  o_counter: Int
-    @deprecated(reason: "Unsupported - Use sceneIncrementO/sceneDecrementO")
-  organized: Boolean
+  rating: Int
   studio_id: ID
-  gallery_ids: [ID!]
+  gallery_id: ID
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
   tag_ids: [ID!]
-  "This should be a URL or a base64 encoded data URL"
+  """This should be base64 encoded"""
   cover_image: String
-  stash_ids: [StashIDInput!]
-
-  "The time index a scene was left at"
-  resume_time: Float
-  "The total time a scene has spent playing"
-  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
-}
-
-enum BulkUpdateIdMode {
-  SET
-  ADD
-  REMOVE
-}
-
-input BulkUpdateIds {
-  ids: [ID!]
-  mode: BulkUpdateIdMode!
 }
 
 input BulkSceneUpdateInput {
   clientMutationId: String
   ids: [ID!]
   title: String
-  code: String
   details: String
-  director: String
-  url: String @deprecated(reason: "Use urls")
-  urls: BulkUpdateStrings
+  url: String
   date: String
-  # rating expressed as 1-100
-  rating100: Int
-  organized: Boolean
+  rating: Int
   studio_id: ID
-  gallery_ids: BulkUpdateIds
-  performer_ids: BulkUpdateIds
-  tag_ids: BulkUpdateIds
-  movie_ids: BulkUpdateIds
+  gallery_id: ID
+  performer_ids: [ID!]
+  tag_ids: [ID!]
 }
 
 input SceneDestroyInput {
@@ -184,89 +75,31 @@ input SceneDestroyInput {
   delete_generated: Boolean
 }
 
-input ScenesDestroyInput {
-  ids: [ID!]!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
 type FindScenesResultType {
   count: Int!
-  "Total duration in seconds"
-  duration: Float!
-  "Total file size in bytes"
-  filesize: Float!
   scenes: [Scene!]!
 }
 
 input SceneParserInput {
-  ignoreWords: [String!]
-  whitespaceCharacters: String
+  ignoreWords: [String!],
+  whitespaceCharacters: String,
   capitalizeTitle: Boolean
-  ignoreOrganized: Boolean
-}
-
-type SceneMovieID {
-  movie_id: ID!
-  scene_index: String
 }
 
 type SceneParserResult {
   scene: Scene!
   title: String
-  code: String
   details: String
-  director: String
   url: 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
+  rating: Int
   studio_id: ID
-  gallery_ids: [ID!]
+  gallery_id: ID
   performer_ids: [ID!]
-  movies: [SceneMovieID!]
   tag_ids: [ID!]
 }
 
 type SceneParserResultType {
   count: Int!
   results: [SceneParserResult!]!
-}
-
-input SceneHashInput {
-  checksum: String
-  oshash: String
-}
-
-type SceneStreamEndpoint {
-  url: String!
-  mime_type: String
-  label: String
-}
-
-input AssignSceneFileInput {
-  scene_id: ID!
-  file_id: ID!
-}
-
-input SceneMergeInput {
-  """
-  If destination scene has no files, then the primary file of the
-  first source scene will be assigned as primary
-  """
-  source: [ID!]!
-  destination: ID!
-  # values defined here will override values in the destination
-  values: SceneUpdateInput
-
-  # if true, the source history will be combined with the destination
-  play_history: Boolean
-  o_history: Boolean
-}
-
-type HistoryMutationResult {
-  count: Int!
-  history: [Time!]!
-}
+}

graphql/schema/types/scraped-movie.graphql

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

graphql/schema/types/scraped-performer.graphql

@@ -1,10 +1,6 @@
-"A performer from a scraping operation..."
+"""A performer from a scraping operation..."""
 type ScrapedPerformer {
-  "Set if performer matched"
-  stored_id: ID
   name: String
-  disambiguation: String
-  gender: String
   url: String
   twitter: String
   instagram: String
@@ -15,31 +11,14 @@ type ScrapedPerformer {
   height: String
   measurements: String
   fake_tits: String
-  penis_length: String
-  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
-  # aliases must be comma-delimited to be parsed correctly
   aliases: String
-  tags: [ScrapedTag!]
-
-  "This should be a base64 encoded data URL"
-  image: String @deprecated(reason: "use images instead")
-  images: [String!]
-  details: String
-  death_date: String
-  hair_color: String
-  weight: String
-  remote_site_id: String
 }
 
 input ScrapedPerformerInput {
-  "Set if performer matched"
-  stored_id: ID
   name: String
-  disambiguation: String
-  gender: String
   url: String
   twitter: String
   instagram: String
@@ -50,18 +29,8 @@ input ScrapedPerformerInput {
   height: String
   measurements: String
   fake_tits: String
-  penis_length: String
-  circumcised: String
   career_length: String
   tattoos: String
   piercings: String
   aliases: String
-
-  # not including tags for the input
-  # not including image for the input
-  details: String
-  death_date: String
-  hair_color: String
-  weight: String
-  remote_site_id: String
-}
+}

graphql/schema/types/scraper.graphql

@@ -1,244 +1,70 @@
 enum ScrapeType {
-  "From text query"
+  """From text query""" 
   NAME
-  "From existing object"
+  """From existing object"""
   FRAGMENT
-  "From URL"
+  """From URL"""
   URL
 }
 
-"Type of the content a scraper generates"
-enum ScrapeContentType {
-  GALLERY
-  MOVIE
-  PERFORMER
-  SCENE
-}
-
-"Scraped Content is the forming union over the different scrapers"
-union ScrapedContent =
-    ScrapedStudio
-  | ScrapedTag
-  | ScrapedScene
-  | ScrapedGallery
-  | ScrapedMovie
-  | ScrapedPerformer
-
 type ScraperSpec {
-  "URLs matching these can be scraped with"
-  urls: [String!]
-  supported_scrapes: [ScrapeType!]!
+    """URLs matching these can be scraped with"""
+    urls: [String!]
+    supported_scrapes: [ScrapeType!]!
 }
 
 type Scraper {
-  id: ID!
-  name: String!
-  "Details for performer scraper"
-  performer: ScraperSpec
-  "Details for scene scraper"
-  scene: ScraperSpec
-  "Details for gallery scraper"
-  gallery: ScraperSpec
-  "Details for movie scraper"
-  movie: ScraperSpec
+    id: ID!
+    name: String!
+    """Details for performer scraper"""
+    performer: ScraperSpec
+    """Details for scene scraper"""
+    scene: ScraperSpec
 }
 
-type ScrapedStudio {
-  "Set if studio matched"
-  stored_id: ID
+
+type ScrapedScenePerformer {
+  """Set if performer matched"""
+  id: ID
   name: String!
   url: String
-  parent: ScrapedStudio
-  image: String
-
-  remote_site_id: String
+  twitter: String
+  instagram: String
+  birthdate: String
+  ethnicity: String
+  country: String
+  eye_color: String
+  height: String
+  measurements: String
+  fake_tits: String
+  career_length: String
+  tattoos: String
+  piercings: String
+  aliases: String
 }
 
-type ScrapedTag {
-  "Set if tag matched"
-  stored_id: ID
+type ScrapedSceneStudio {
+  """Set if studio matched"""
+  id: ID
+  name: String!
+  url: String
+}
+
+type ScrapedSceneTag {
+  """Set if tag matched"""
+  id: ID
   name: String!
 }
 
 type ScrapedScene {
   title: String
-  code: String
   details: String
-  director: String
-  url: String @deprecated(reason: "use urls")
-  urls: [String!]
+  url: String
   date: String
 
-  "This should be a base64 encoded data URL"
-  image: String
-
   file: SceneFileType # Resolver
-  studio: ScrapedStudio
-  tags: [ScrapedTag!]
-  performers: [ScrapedPerformer!]
-  movies: [ScrapedMovie!]
 
-  remote_site_id: String
-  duration: Int
-  fingerprints: [StashBoxFingerprint!]
-}
-
-input ScrapedSceneInput {
-  title: String
-  code: String
-  details: String
-  director: String
-  url: String @deprecated(reason: "use urls")
-  urls: [String!]
-  date: String
-
-  # no image, file, duration or relationships
-
-  remote_site_id: String
-}
-
-type ScrapedGallery {
-  title: String
-  code: String
-  details: String
-  photographer: String
-  url: String @deprecated(reason: "use urls")
-  urls: [String!]
-  date: String
-
-  studio: ScrapedStudio
-  tags: [ScrapedTag!]
-  performers: [ScrapedPerformer!]
-}
-
-input ScrapedGalleryInput {
-  title: String
-  code: String
-  details: String
-  photographer: String
-  url: String @deprecated(reason: "use urls")
-  urls: [String!]
-  date: String
-
-  # no studio, tags or performers
-}
-
-input ScraperSourceInput {
-  "Index of the configured stash-box instance to use. Should be unset if scraper_id is set"
-  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: ID
-}
-
-type ScraperSource {
-  "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: ID
-}
-
-input ScrapeSingleSceneInput {
-  "Instructs to query by string"
-  query: String
-  "Instructs to query by scene fingerprints"
-  scene_id: ID
-  "Instructs to query by scene fragment"
-  scene_input: ScrapedSceneInput
-}
-
-input ScrapeMultiScenesInput {
-  "Instructs to query by scene fingerprints"
-  scene_ids: [ID!]
-}
-
-input ScrapeSingleStudioInput {
-  """
-  Query can be either a name or a Stash ID
-  """
-  query: String
-}
-
-input ScrapeSinglePerformerInput {
-  "Instructs to query by string"
-  query: String
-  "Instructs to query by performer id"
-  performer_id: ID
-  "Instructs to query by performer fragment"
-  performer_input: ScrapedPerformerInput
-}
-
-input ScrapeMultiPerformersInput {
-  "Instructs to query by scene fingerprints"
-  performer_ids: [ID!]
-}
-
-input ScrapeSingleGalleryInput {
-  "Instructs to query by string"
-  query: String
-  "Instructs to query by gallery id"
-  gallery_id: ID
-  "Instructs to query by gallery fragment"
-  gallery_input: ScrapedGalleryInput
-}
-
-input ScrapeSingleMovieInput {
-  "Instructs to query by string"
-  query: String
-  "Instructs to query by movie id"
-  movie_id: ID
-  "Instructs to query by gallery fragment"
-  movie_input: ScrapedMovieInput
-}
-
-input StashBoxSceneQueryInput {
-  "Index of the configured stash-box instance to use"
-  stash_box_index: Int!
-  "Instructs query by scene fingerprints"
-  scene_ids: [ID!]
-  "Query by query string"
-  q: String
-}
-
-input StashBoxPerformerQueryInput {
-  "Index of the configured stash-box instance to use"
-  stash_box_index: Int!
-  "Instructs query by scene fingerprints"
-  performer_ids: [ID!]
-  "Query by query string"
-  q: String
-}
-
-type StashBoxPerformerQueryResult {
-  query: String!
-  results: [ScrapedPerformer!]!
-}
-
-type StashBoxFingerprint {
-  algorithm: String!
-  hash: String!
-  duration: Int!
-}
-
-"If neither ids nor names are set, tag all items"
-input StashBoxBatchTagInput {
-  "Stash endpoint to use for the tagging"
-  endpoint: Int!
-  "Fields to exclude when executing the 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: [ID!]
-  "If set, only tag these names"
-  names: [String!]
-  "If set, only tag these performer ids"
-  performer_ids: [ID!] @deprecated(reason: "use ids")
-  "If set, only tag these performer names"
-  performer_names: [String!] @deprecated(reason: "use names")
+  studio: ScrapedSceneStudio
+  tags: [ScrapedSceneTag!]
+  performers: [ScrapedScenePerformer!]
 }

graphql/schema/types/sql.graphql

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

graphql/schema/types/stash-box.graphql

@@ -1,31 +0,0 @@
-type StashBox {
-  endpoint: String!
-  api_key: String!
-  name: String!
-}
-
-input StashBoxInput {
-  endpoint: String!
-  api_key: String!
-  name: String!
-}
-
-type StashID {
-  endpoint: String!
-  stash_id: String!
-}
-
-input StashIDInput {
-  endpoint: String!
-  stash_id: String!
-}
-
-input StashBoxFingerprintSubmissionInput {
-  scene_ids: [String!]!
-  stash_box_index: Int!
-}
-
-input StashBoxDraftSubmissionInput {
-  id: String!
-  stash_box_index: Int!
-}

graphql/schema/types/stats.graphql

@@ -1,16 +1,7 @@
 type StatsResultType {
   scene_count: Int!
-  scenes_size: Float!
-  scenes_duration: Float!
-  image_count: Int!
-  images_size: Float!
   gallery_count: Int!
   performer_count: Int!
   studio_count: Int!
-  movie_count: Int!
   tag_count: Int!
-  total_o_count: Int!
-  total_play_duration: Float!
-  total_play_count: Int!
-  scenes_played: Int!
-}
+}