Merge pull request #782 from stashapp/develop

Version 0.3 release

.dockerignore

@@ -0,0 +1,63 @@
+####
+# 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
+
+# Packr2 artifacts
+**/*-packr.go
+
+# GraphQL generated output
+pkg/models/generated_*.go
+ui/v2.5/src/core/generated-*.tsx
+
+# packr generated files
+*-packr.go
+
+####
+# 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,2 +1,6 @@
 go.mod text eol=lf
-go.sum 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

.github/FUNDING.yml

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

@@ -23,6 +23,8 @@ 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/PULL_REQUEST_TEMPLATE/BugFix.md

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

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

.gitignore

@@ -20,7 +20,7 @@
 
 # GraphQL generated output
 pkg/models/generated_*.go
-ui/v2/src/core/generated-*.tsx
+ui/v2.5/src/core/generated-*.tsx
 
 # packr generated files
 *-packr.go
@@ -48,6 +48,9 @@ ui/v2/src/core/generated-*.tsx
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
+# Goland Junk
+pkg/pkg
+
 ####
 # Random
 ####
@@ -58,3 +61,4 @@ node_modules
 
 stash
 dist
+.DS_Store

.idea/go.iml

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

.travis.yml

@@ -1,4 +1,8 @@
+if: tag != latest_develop # dont build for the latest_develop tagged version
+
 dist: xenial
+git:
+  depth: false
 language: go
 go:
 - 1.11.x
@@ -9,42 +13,84 @@ env:
   - GO111MODULE=on
 before_install:
 - echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
-- travis_retry yarn --cwd ui/v2 install --frozen-lockfile
+- nvm install 12
+- travis_retry make pre-ui
 - make generate
-- CI=false yarn --cwd ui/v2 build # TODO: Fix warnings
+- CI=false make ui-validate ui-only
 #- go get -v github.com/mgechev/revive
 script:
+# left lint off to avoid getting extra dependency
 #- make lint
-#- make vet
-- make it
+- make fmt-check vet 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}
+- sh ./scripts/cross-compile.sh
 - '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
+# push the latest tag when on the develop branch
+- if [ "$TRAVIS_BRANCH" = "develop" ]; then git tag -f latest_develop; git push -f --tags; fi
 - export RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')
+- export STASH_VERSION=$(git describe --tags --exclude latest_develop)
+# set TRAVIS_TAG explcitly to the version so that it doesn't pick up latest_develop
+- if [ "$TRAVIS_BRANCH" = "master"]; then export TRAVIS_TAG=${STASH_VERSION}; fi
 deploy:
-  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
+  # latest develop release
+  - provider: releases
+    # use the v2 release provider for proper release note setting
+    edge: true
+    api_key:
+      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
+    file:
+      - dist/stash-osx
+      - dist/stash-win.exe
+      - dist/stash-linux
+      - dist/stash-linux-arm64v8
+      - dist/stash-linux-arm32v7
+      - dist/stash-pi
+    skip_cleanup: true
+    overwrite: true
+    name: "${STASH_VERSION}: Latest development build"
+    release_notes: "**${RELEASE_DATE}**\n This is always the latest committed version on the develop branch. Use as your own risk!"
+    prerelease: true
+    on:
+      repo: stashapp/stash
+      branch: develop
+  # docker image build for develop release
+  - provider: script
+    skip_cleanup: true
+    script: bash ./docker/ci/x86_64/docker_push.sh development-x86_64
+    on:
+      repo: stashapp/stash
+      branch: develop
+  # official master release - only build when tagged
+  - provider: releases
+    api_key:
+      secure: tGJ2q62CfPdayid2qEtW2aGRhMgCl3lBXYYQqp3eH0vFgIIf6cs7IDX7YC/x3XKMEQ/iMLZmtCXZvSTqNrD6Sk7MSnt30GIs+4uxIZDnnd8mV5X3K4n4gjD+NAORc4DrQBvUGrYMKJsR5gtkH0nu6diWb1o1If7OiJEuCPRhrmQYcza7NUdABnA9Z2wn2RNUV9Ga33WUCqLMEU5GtNBlfQPiP/khCQrqn/ocR6wUjYut3J6YagzqH4wsfJi3glHyWtowcNIw1LZi5zFxHD/bRBT4Tln7yypkjWNq9eQILA6i6kRUGf7ggyTx26/k8n4tnu+QD0vVh4EcjlThpU/LGyUXzKrrxjRwaDZnM0oYxg5AfHcBuAiAdo0eWnV3lEWRfTJMIVb9MPf4qDmzR4RREfB5OXOxwq3ODeCcJE8sTIMD/wBPZrlqS/QrRpND2gn2X4snkVukN9t9F4CMTFMtVSzFV7TDJW5E5Lq6VEExulteQhs6kcK9NRPNAaLgRQAw7X9kVWfDtiGUP+fE2i8F9Bo8bm7sOT5O5VPMPykx3EgeNg1IqIgMTCsMlhMJT4xBJoQUgmd2wWyf3Ryw+P+sFgdb5Sd7+lFgJBjMUUoOxMxAOiEgdFvCXcr+/Udyz2RdtetU1/6VzXzLPcKOw0wubZeBkISqu7o9gpfdMP9Eq00=
+    file:
+      - dist/stash-osx
+      - dist/stash-win.exe
+      - dist/stash-linux
+      - dist/stash-linux-arm64v8
+      - dist/stash-linux-arm32v7
+      - dist/stash-pi
+    # make the release a draft so the maintainers can confirm before releasing
+    draft: true
+    skip_cleanup: true
+    overwrite: true
+    # don't write the body. To be done manually for now. In future we might
+    # want to generate the changelog or get it from a file
+    name: ${STASH_VERSION}
+    on:
+      repo: stashapp/stash
+      tags: true
+      # make sure we don't release using the latest_develop tag
+      condition: $TRAVIS_TAG != latest_develop
+  # docker image build for master release
+  - provider: script
+    skip_cleanup: true
+    script: bash ./docker/ci/x86_64/docker_push.sh latest
+    on:
+      repo: stashapp/stash
+      tags: true
+      # make sure we don't release using the latest_develop tag
+      condition: $TRAVIS_TAG != latest_develop

Makefile

@@ -1,14 +1,52 @@
-ifeq ($(OS),Windows_NT)
-  SEPARATOR := &&
-  SET := set
+IS_WIN =
+ifeq (${SHELL}, sh.exe)
+  IS_WIN = true
+endif
+ifeq (${SHELL}, cmd)
+  IS_WIN = true
 endif
 
-release: generate ui build
+ifdef IS_WIN
+  SEPARATOR := &&
+  SET := set
+else 
+  SEPARATOR := ;
+  SET := export
+endif
 
-build:
-	$(eval DATE := $(shell go run scripts/getDate.go))
+# set LDFLAGS environment variable to any extra ldflags required
+# set OUTPUT to generate a specific binary name
+
+LDFLAGS := $(LDFLAGS)
+ifdef OUTPUT
+  OUTPUT := -o $(OUTPUT)
+endif
+
+.PHONY: release pre-build install clean 
+
+release: generate ui build-release
+
+pre-build:
+ifndef BUILD_DATE
+	$(eval BUILD_DATE := $(shell go run -mod=vendor scripts/getDate.go))
+endif
+
+ifndef GITHASH
 	$(eval GITHASH := $(shell git rev-parse --short HEAD))
-	$(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)'"
+endif
+
+ifndef STASH_VERSION
+	$(eval STASH_VERSION := $(shell git describe --tags --exclude latest_develop))
+endif
+
+build: pre-build
+	$(eval LDFLAGS := $(LDFLAGS) -X 'github.com/stashapp/stash/pkg/api.version=$(STASH_VERSION)' -X 'github.com/stashapp/stash/pkg/api.buildstamp=$(BUILD_DATE)' -X 'github.com/stashapp/stash/pkg/api.githash=$(GITHASH)')
+	$(SET) CGO_ENABLED=1 $(SEPARATOR) go build $(OUTPUT) -mod=vendor -v -ldflags "$(LDFLAGS) $(EXTRA_LDFLAGS)"
+
+# strips debug symbols from the release build
+# consider -trimpath in go build if we move to go 1.13+
+build-release: EXTRA_LDFLAGS := -s -w
+build-release: build
 
 install:
 	packr2 install
@@ -20,13 +58,18 @@ clean:
 .PHONY: generate
 generate:
 	go generate -mod=vendor
-	cd ui/v2 && yarn run gqlgen
+	cd ui/v2.5 && 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 ./...
 
+# Ensures that changed files have had gofmt run on them
+.PHONY: fmt-check
+fmt-check:
+	sh ./scripts/check-gofmt.sh
+
 # Runs go vet on the project's source code.
 .PHONY: vet
 vet:
@@ -46,7 +89,45 @@ test:
 it:
 	go test -mod=vendor -tags=integration ./...
 
+# 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-only
+ui-only: pre-build
+	$(SET) REACT_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
+	$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
+	$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
+	cd ui/v2.5 && yarn build
+
 .PHONY: ui
-ui:
-	cd ui/v2 && yarn build
+ui: ui-only
 	packr2
+
+.PHONY: ui-start
+ui-start: pre-build
+	$(SET) REACT_APP_DATE="$(BUILD_DATE)" $(SEPARATOR) \
+	$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
+	$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
+	cd ui/v2.5 && yarn start
+
+.PHONY: fmt-ui
+fmt-ui:
+	cd ui/v2.5 && yarn format
+
+# runs tests and checks on the UI and builds it
+.PHONY: ui-validate
+ui-validate:
+	cd ui/v2.5 && yarn run validate
+
+# just repacks the packr files - use when updating migrations and packed files without 
+# rebuilding the UI
+.PHONY: packr
+packr:
+	packr2
+
+# runs all of the tests and checks required for a PR to be accepted
+.PHONY: validate
+validate: ui-validate fmt-check vet lint it

README.md

@@ -4,10 +4,14 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/stashapp/stash)](https://goreportcard.com/report/github.com/stashapp/stash)
 [![Discord](https://img.shields.io/discord/559159668438728723.svg?logo=discord)](https://discord.gg/2TsNFKt)
 
+https://stashapp.cc
+
 **Stash is a Go app which organizes and serves your porn.**
 
 See a demo [here](https://vimeo.com/275537038) (password is stashapp).
 
+An in-app manual is available, and the manual pages can be viewed [here](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en).
+
 # Docker install
 
 Follow [this README.md in the docker directory.](docker/production/README.md)
@@ -69,7 +73,7 @@ Join the [Discord server](https://discord.gg/2TsNFKt).
     * 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 --frozen-lockfile` in the `stash/ui/v2` folder (before running make generate for first time).
+    * Run `yarn install --frozen-lockfile` in the `stash/ui/v2.5` folder (before running make generate for first time).
 
 NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
 
@@ -92,11 +96,18 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
 
 ## Commands
 
-* `make generate` - Generate Go GraphQL and packr2 files
+* `make generate` - Generate Go and UI GraphQL files
 * `make build` - Builds the binary (make sure to build the UI as well... see below)
-* `make ui` - Builds the frontend
+* `make pre-ui` - Installs the UI dependencies. Only needs to be run once before building the UI for the first time, or if the dependencies are updated
+* `make fmt-ui` - Formats the UI source code.
+* `make ui` - Builds the frontend and the packr2 files
+* `make packr` - Generate packr2 files (sub-target of `ui`. Use to regenerate packr2 files without rebuilding UI)
 * `make vet` - Run `go vet`
 * `make lint` - Run the linter
+* `make fmt` - Run `go fmt`
+* `make fmt-check` - Ensure changed files are formatted correctly
+* `make it` - Run the unit and integration tests
+* `make validate` - Run all of the tests and checks required to submit a PR
 
 ## Building a release
 
@@ -111,3 +122,10 @@ where the app can be cross-compiled.  This process is kicked off by CI via the `
 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`
+
+## Customization
+
+You can make Stash interface fit your desired style with  [Custom CSS snippets](https://github.com/stashapp/stash/wiki/Custom-CSS-snippets) and [CSS Tweaks](https://github.com/stashapp/stash/wiki/CSS-Tweaks).
+
+[Stash Plex Theme](https://github.com/stashapp/stash/wiki/Stash-Plex-Theme) is a community created theme inspired by popular Plex Interface.
+

docker/build/x86_64/Dockerfile

@@ -0,0 +1,59 @@
+# this dockerfile must be built from the top-level stash directory
+# ie from top=level stash:
+# docker build -t stash/build -f docker/build/x86_64/Dockerfile .
+
+FROM golang:1.11.13 as compiler
+
+RUN apt-get update && apt-get install -y apt-transport-https
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+# prevent caching of the key
+ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
+RUN cat yarn.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    rm yarn.gpg
+
+RUN apt-get update && \
+    apt-get install -y nodejs yarn xz-utils --no-install-recommends || exit 1; \
+	rm -rf /var/lib/apt/lists/*;
+	
+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}
+
+WORKDIR /
+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;
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN wget -O /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar xf /ffmpeg.tar.xz && \
+    rm ffmpeg.tar.xz && \
+    mv /ffmpeg*/ /ffmpeg/
+
+# copy the ui yarn stuff so that it doesn't get rebuilt every time
+COPY ./ui/v2.5/package.json ./ui/v2.5/yarn.lock /stash/ui/v2.5/
+
+WORKDIR /stash
+RUN yarn --cwd ui/v2.5 install --frozen-lockfile
+
+COPY . /stash/
+ENV GO111MODULE=on
+
+RUN make generate 
+RUN make ui 
+RUN make build
+
+FROM ubuntu:19.10 as app
+
+RUN apt-get update && apt-get -y install ca-certificates
+COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+
+EXPOSE 9999
+CMD ["stash"]
+
+

docker/build/x86_64/README.md

@@ -0,0 +1,67 @@
+# Introduction
+
+This dockerfile is used to build a stash docker container using the current source code.
+
+# Building the docker container
+
+From the top-level directory (should contain `main.go` file):
+
+```
+docker build -t stash/build -f ./docker/build/x86_64/Dockerfile .
+
+```
+
+# 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

@@ -0,0 +1,25 @@
+
+# must be built from /dist directory
+
+FROM ubuntu:18.04 as prep
+LABEL MAINTAINER="https://discord.gg/Uz29ny"
+
+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 --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar xf /ffmpeg.tar.xz && \
+    rm ffmpeg.tar.xz && \
+    mv /ffmpeg*/ /ffmpeg/
+
+FROM ubuntu:18.04 as app
+RUN apt-get update && apt-get -y install ca-certificates
+COPY --from=prep /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
+COPY /stash-linux /usr/bin/stash
+
+EXPOSE 9999
+CMD ["stash"]

docker/ci/x86_64/README.md

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

docker/ci/x86_64/docker_push.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DOCKER_TAG=$1
+
+# must build the image from dist directory
+docker build -t stashapp/stash:$DOCKER_TAG -f ./docker/ci/x86_64/Dockerfile ./dist
+
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+docker push stashapp/stash:$DOCKER_TAG

docker/compiler/Dockerfile

@@ -10,9 +10,12 @@ ENV PACKR2_DOWNLOAD_URL=https://github.com/gobuffalo/packr/releases/download/v${
 # 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
 
+# prevent caching of the key
+ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
+RUN cat yarn.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    rm yarn.gpg
 
 RUN apt-get update && \
     apt-get install -y automake autogen \
@@ -20,6 +23,8 @@ RUN apt-get update && \
     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 \
+    gcc-arm-linux-gnueabihf libc-dev-armhf-cross \
+    gcc-aarch64-linux-gnu libc-dev-arm64-cross \
 	nodejs yarn --no-install-recommends || exit 1; \
 	rm -rf /var/lib/apt/lists/*;
 

docker/compiler/Makefile

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

docker/develop/x86_64/Dockerfile

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

docker/production/x86_64/Dockerfile

@@ -7,17 +7,18 @@ RUN apt-get update && \
     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 && \
+
+# added " to end of stash-linux clause so that it doesn't pick up the arm builds
+RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases/latest | awk '/browser_download_url/ && /stash-linux/"' | sed -e 's/.*: "\(.*\)"/\1/') && \
+    chmod +x /stash
+    
+RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
     tar xf /ffmpeg.tar.xz && \
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
 FROM ubuntu: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
+RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
 EXPOSE 9999
 CMD ["stash"]

docs/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+
+## 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.**

go.mod

@@ -2,29 +2,35 @@ module github.com/stashapp/stash
 
 require (
 	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/antchfx/htmlquery v1.2.3
+	github.com/bmatcuk/doublestar/v2 v2.0.1
+	github.com/chromedp/cdproto v0.0.0-20200608134039-8a80cdaf865c
+	github.com/chromedp/chromedp v0.5.3
 	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/securecookie v1.1.1
+	github.com/gorilla/sessions v1.2.0
 	github.com/gorilla/websocket v1.4.0
 	github.com/h2non/filetype v1.0.8
-	// this is required for generate
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/json-iterator/go v1.1.9
+	github.com/mattn/go-sqlite3 v1.13.0
+	github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007
 	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
+	github.com/stretchr/testify v1.5.1
+	github.com/tidwall/gjson v1.6.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
+	golang.org/x/image v0.0.0-20190118043309-183bebdce1b2
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
 	gopkg.in/yaml.v2 v2.2.2
 )
 

go.sum

@@ -16,8 +16,6 @@ github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
-github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+sxIXdQ=
@@ -27,13 +25,11 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
-github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/antchfx/htmlquery v1.2.0 h1:oKShnsGlnOHX6t4uj5OHgLKkABcJoqnXpqnscoi9Lpw=
-github.com/antchfx/htmlquery v1.2.0/go.mod h1:MS9yksVSQXls00iXkiMqXr0J+umL/AmxXKuP28SUJM8=
-github.com/antchfx/xpath v1.1.2 h1:YziPrtM0gEJBnhdUGxYcIVYXZ8FXbtbovxOi+UW/yWQ=
-github.com/antchfx/xpath v1.1.2/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
+github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M=
+github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0=
+github.com/antchfx/xpath v1.1.6 h1:6sVh6hB5T6phw1pFpHRQ+C4bd8sNI+O58flqtg7h0R0=
+github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
 github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -41,11 +37,16 @@ github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/bmatcuk/doublestar v1.1.5 h1:2bNwBOmhyFEFcoB3tGvTD5xanq+4kyOZlB8wFYbMjkk=
-github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
+github.com/bmatcuk/doublestar/v2 v2.0.1 h1:EFT91DmIMRcrUEcYUW7AqSAwKvNzP5+CoDmNVBbcQOU=
+github.com/bmatcuk/doublestar/v2 v2.0.1/go.mod h1:QMmcs3H2AUQICWhfzLXz+IYln8lRQmTZRptLie8RgRw=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/chromedp/cdproto v0.0.0-20200116234248-4da64dd111ac/go.mod h1:PfAWWKJqjlGFYJEidUM6aVIWPr0EpobeyVWEEmplX7g=
+github.com/chromedp/cdproto v0.0.0-20200608134039-8a80cdaf865c h1:qM1xzKK8kc93zKPkxK4iqtjksqDDrU6g9wGnr30jyLo=
+github.com/chromedp/cdproto v0.0.0-20200608134039-8a80cdaf865c/go.mod h1:E6LPWRdIJc11h/di5p0rwvRmUYbhGpBEH7ZbPfzDIOE=
+github.com/chromedp/chromedp v0.5.3 h1:F9LafxmYpsQhWQBdCs+6Sret1zzeeFyHS5LkRF//Ffg=
+github.com/chromedp/chromedp v0.5.3/go.mod h1:YLdPtndaHQ4rCpSpBG+IPpy9JvX0VD+7aaLxYgYj28w=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
@@ -81,6 +82,7 @@ github.com/docker/docker v0.7.3-0.20190108045446-77df18c24acf/go.mod h1:eEKB0N0r
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
@@ -313,6 +315,12 @@ github.com/gobuffalo/uuid v2.0.5+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw
 github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
 github.com/gobuffalo/x v0.0.0-20181003152136-452098b06085/go.mod h1:WevpGD+5YOreDJznWevcn8NTmQEW5STSBgIkpkjzqXc=
 github.com/gobuffalo/x v0.0.0-20181007152206-913e47c59ca7/go.mod h1:9rDPXaB3kXdKWzMc4odGQQdG2e2DIEmANy5aSJ9yesY=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gofrs/uuid v3.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@@ -325,6 +333,8 @@ github.com/golang-migrate/migrate/v4 v4.3.1/go.mod h1:mJ89KBgbXmM3P49BqOxRL3riNF
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -340,6 +350,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
@@ -352,9 +363,12 @@ github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.2/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ=
+github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ=
 github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
@@ -383,6 +397,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
@@ -391,6 +407,8 @@ github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
@@ -401,6 +419,8 @@ github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46s
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08 h1:V0an7KRw92wmJysvFvtqtKMAPmvS5O0jtB0nYo6t+gs=
+github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08/go.mod h1:dFWs1zEqDjFtnBXsd1vPOZaLsESovai349994nHx3e0=
 github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -418,6 +438,9 @@ github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
+github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM=
 github.com/markbates/deplist v1.0.5/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM=
 github.com/markbates/going v1.0.2/go.mod h1:UWCk3zm0UKefHZ7l8BNqi26UyiEMniznk8naLdTcy6c=
@@ -445,6 +468,8 @@ github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
+github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
@@ -453,10 +478,16 @@ github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:F
 github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mongodb/mongo-go-driver v0.3.0/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU=
 github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
+github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007 h1:Ohgj9L0EYOgXxkDp+bczlMBiulwmqYzQpvQNUdtt3oc=
+github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007/go.mod h1:wKCOWMb6iNlvKiOToY2cNuaovSXvIiv1zDi9QDR7aGQ=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
@@ -569,13 +600,22 @@ github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
+github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
@@ -633,7 +673,6 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -660,6 +699,10 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
+golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
+golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -703,6 +746,9 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190426135247-a129542de9ae h1:mQLHiymj/JXKnnjc62tb7nD5pZLs940/sXJu+Xp3DBA=
 golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

gqlgen.yml

@@ -26,6 +26,8 @@ models:
     model: github.com/stashapp/stash/pkg/models.ScrapedItem
   Studio:
     model: github.com/stashapp/stash/pkg/models.Studio
+  Movie:
+    model: github.com/stashapp/stash/pkg/models.Movie
   Tag:
     model: github.com/stashapp/stash/pkg/models.Tag
   ScrapedPerformer:
@@ -36,7 +38,13 @@ models:
     model: github.com/stashapp/stash/pkg/models.ScrapedScenePerformer
   ScrapedSceneStudio:
     model: github.com/stashapp/stash/pkg/models.ScrapedSceneStudio
+  ScrapedSceneMovie:
+    model: github.com/stashapp/stash/pkg/models.ScrapedSceneMovie  
   ScrapedSceneTag:
     model: github.com/stashapp/stash/pkg/models.ScrapedSceneTag
   SceneFileType:
     model: github.com/stashapp/stash/pkg/models.SceneFileType
+  ScrapedMovie:
+    model: github.com/stashapp/stash/pkg/models.ScrapedMovie
+  ScrapedMovieStudio:
+    model: github.com/stashapp/stash/pkg/models.ScrapedMovieStudio

graphql/documents/data/config.graphql

@@ -2,25 +2,38 @@ fragment ConfigGeneralData on ConfigGeneralResult {
   stashes
   databasePath
   generatedPath
+  cachePath
+  calculateMD5
+  videoFileNamingAlgorithm
+  previewSegments
+  previewSegmentDuration
+  previewExcludeStart
+  previewExcludeEnd
+  previewPreset
   maxTranscodeSize
   maxStreamingTranscodeSize
   username
   password
+  maxSessionAge
   logFile
   logOut
   logLevel
   logAccess
   excludes
+  scraperUserAgent
+  scraperCDPPath
 }
 
 fragment ConfigInterfaceData on ConfigInterfaceResult {
   soundOnPreview
   wallShowTitle
+  wallPlayback
   maximumLoopDuration
   autostartVideo
   showStudioAsText
   css
   cssEnabled
+  language
 }
 
 fragment ConfigData on ConfigResult {

graphql/documents/data/gallery.graphql

@@ -8,4 +8,9 @@ fragment GalleryData on Gallery {
     name
     path
   }
+  scene {
+    id
+    title
+    path
+  }
 }

graphql/documents/data/movie-slim.graphql

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

graphql/documents/data/movie.graphql

@@ -0,0 +1,20 @@
+fragment MovieData on Movie {
+  id
+  checksum
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+
+  studio {
+    ...StudioData
+  }
+  
+  synopsis
+  url
+  front_image_path
+  back_image_path
+  scene_count
+}

graphql/documents/data/performer-slim.graphql

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

graphql/documents/data/performer.graphql

@@ -3,6 +3,7 @@ fragment PerformerData on Performer {
   checksum
   name
   url
+  gender
   twitter
   instagram
   birthdate

graphql/documents/data/scene-slim.graphql

@@ -1,6 +1,7 @@
 fragment SlimSceneData on Scene {
   id
   checksum
+  oshash
   title
   details
   url
@@ -47,6 +48,15 @@ fragment SlimSceneData on Scene {
     image_path
   }
 
+  movies {
+    movie {
+      id
+      name
+      front_image_path
+    }
+    scene_index
+  }
+
   tags {
     id
     name

graphql/documents/data/scene.graphql

@@ -1,6 +1,7 @@
 fragment SceneData on Scene {
   id
   checksum
+  oshash
   title
   details
   url
@@ -33,8 +34,6 @@ fragment SceneData on Scene {
     ...SceneMarkerData
   }
 
-  is_streamable
-
   gallery {
     ...GalleryData
   }
@@ -42,6 +41,13 @@ fragment SceneData on Scene {
   studio {
     ...StudioData
   }
+  
+  movies {
+    movie {
+      ...MovieData
+    }
+    scene_index
+  }
 
   tags {
     ...TagData

graphql/documents/data/scrapers.graphql

@@ -1,5 +1,6 @@
 fragment ScrapedPerformerData on ScrapedPerformer {
   name
+  gender
   url
   twitter
   instagram
@@ -14,11 +15,13 @@ fragment ScrapedPerformerData on ScrapedPerformer {
   tattoos
   piercings
   aliases
+  image
 }
 
 fragment ScrapedScenePerformerData on ScrapedScenePerformer {
-  id
+  stored_id
   name
+  gender
   url
   twitter
   instagram
@@ -35,14 +38,49 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
   aliases
 }
 
-fragment ScrapedSceneStudioData on ScrapedSceneStudio {
+fragment ScrapedMovieStudioData on ScrapedMovieStudio {
   id
   name
   url
 }
 
+fragment ScrapedMovieData on ScrapedMovie {
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+  url
+  synopsis
+  front_image
+  back_image
+
+  studio {
+    ...ScrapedMovieStudioData
+  }
+}
+
+fragment ScrapedSceneMovieData on ScrapedSceneMovie {
+  stored_id
+  name
+  aliases
+  duration
+  date
+  rating
+  director
+  url
+  synopsis
+}
+
+fragment ScrapedSceneStudioData on ScrapedSceneStudio {
+  stored_id
+  name
+  url
+}
+
 fragment ScrapedSceneTagData on ScrapedSceneTag {
-  id
+  stored_id
   name
 }
 
@@ -51,6 +89,7 @@ fragment ScrapedSceneData on ScrapedScene {
   details
   url
   date
+  image
 
   file {
     size
@@ -74,4 +113,8 @@ fragment ScrapedSceneData on ScrapedScene {
   performers {
     ...ScrapedScenePerformerData
   }
-}
+
+  movies {
+    ...ScrapedSceneMovieData
+  }
+}

graphql/documents/data/studio.graphql

@@ -3,6 +3,22 @@ fragment StudioData on Studio {
   checksum
   name
   url
+  parent_studio {
+    id
+    checksum
+    name
+    url
+    image_path
+    scene_count
+  }
+  child_studios {
+    id
+    checksum
+    name
+    url
+    image_path
+    scene_count
+  }
   image_path
   scene_count
 }

graphql/documents/data/tag.graphql

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

graphql/documents/mutations/metadata.graphql

@@ -0,0 +1,31 @@
+mutation MetadataImport {
+  metadataImport
+}
+
+mutation MetadataExport {
+  metadataExport
+}
+
+mutation MetadataScan($input: ScanMetadataInput!) {
+  metadataScan(input: $input)
+}
+
+mutation MetadataGenerate($input: GenerateMetadataInput!) {
+  metadataGenerate(input: $input)
+}
+
+mutation MetadataAutoTag($input: AutoTagMetadataInput!) {
+  metadataAutoTag(input: $input)
+}
+
+mutation MetadataClean {
+  metadataClean
+}
+
+mutation MigrateHashNaming {
+  migrateHashNaming
+}
+
+mutation StopJob {
+  stopJob
+}

graphql/documents/mutations/movie.graphql

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

graphql/documents/mutations/performer.graphql

@@ -1,6 +1,7 @@
 mutation PerformerCreate(
   $name: String,
   $url: String,
+  $gender: GenderEnum,
   $birthdate: String,
   $ethnicity: String,
   $country: String,
@@ -20,6 +21,7 @@ mutation PerformerCreate(
   performerCreate(input: {
                             name: $name,
                             url: $url,
+                            gender: $gender,
                             birthdate: $birthdate,
                             ethnicity: $ethnicity,
                             country: $country,
@@ -44,6 +46,7 @@ mutation PerformerUpdate(
   $id: ID!,
   $name: String,
   $url: String,
+  $gender: GenderEnum,
   $birthdate: String,
   $ethnicity: String,
   $country: String,
@@ -64,6 +67,7 @@ mutation PerformerUpdate(
                             id: $id,
                             name: $name,
                             url: $url,
+                            gender: $gender,
                             birthdate: $birthdate,
                             ethnicity: $ethnicity,
                             country: $country,

graphql/documents/mutations/plugins.graphql

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

graphql/documents/mutations/scene.graphql

@@ -8,6 +8,7 @@ mutation SceneUpdate(
   $studio_id: ID,
   $gallery_id: ID,
   $performer_ids: [ID!] = [],
+  $movies: [SceneMovieInput!] = [],
   $tag_ids: [ID!] = [],
   $cover_image: String) {
 
@@ -21,6 +22,7 @@ mutation SceneUpdate(
                         studio_id: $studio_id,
                         gallery_id: $gallery_id,
                         performer_ids: $performer_ids,
+                        movies: $movies,
                         tag_ids: $tag_ids,
                         cover_image: $cover_image
                       }) {
@@ -37,8 +39,8 @@ mutation BulkSceneUpdate(
   $rating: Int,
   $studio_id: ID,
   $gallery_id: ID,
-  $performer_ids: [ID!],
-  $tag_ids: [ID!]) {
+  $performer_ids: BulkUpdateIds,
+  $tag_ids: BulkUpdateIds) {
 
   bulkSceneUpdate(input: {
                         ids: $ids,
@@ -76,4 +78,12 @@ mutation SceneResetO($id: ID!) {
 
 mutation SceneDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
   sceneDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
+}
+
+mutation ScenesDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
+  scenesDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
+}
+
+mutation SceneGenerateScreenshot($id: ID!, $at: Float) {
+  sceneGenerateScreenshot(id: $id, at: $at)
+}

graphql/documents/mutations/scrapers.graphql

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

graphql/documents/mutations/studio.graphql

@@ -1,9 +1,10 @@
 mutation StudioCreate(
   $name: String!,
   $url: String,
-  $image: String) {
+  $image: String
+  $parent_id: ID) {
 
-  studioCreate(input: { name: $name, url: $url, image: $image }) {
+  studioCreate(input: { name: $name, url: $url, image: $image, parent_id: $parent_id }) {
     ...StudioData
   }
 }
@@ -12,9 +13,10 @@ mutation StudioUpdate(
   $id: ID!
   $name: String,
   $url: String,
-  $image: String) {
+  $image: String
+  $parent_id: ID) {
 
-  studioUpdate(input: { id: $id, name: $name, url: $url, image: $image }) {
+  studioUpdate(input: { id: $id, name: $name, url: $url, image: $image, parent_id: $parent_id }) {
     ...StudioData
   }
 }

graphql/documents/mutations/tag.graphql

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

graphql/documents/queries/gallery.graphql

@@ -1,5 +1,5 @@
-query FindGalleries($filter: FindFilterType) {
-  findGalleries(filter: $filter) {
+query FindGalleries($filter: FindFilterType, $gallery_filter: GalleryFilterType) {
+  findGalleries(gallery_filter: $gallery_filter, filter: $filter) {
     count
     galleries {
       ...GalleryData

graphql/documents/queries/misc.graphql

@@ -1,9 +1,3 @@
-query FindTag($id: ID!) {
-  findTag(id: $id) {
-    ...TagData
-  }
-}
-
 query MarkerStrings($q: String, $sort: String) {
   markerStrings(q: $q, sort: $sort) {
     id
@@ -19,19 +13,24 @@ query AllTags {
 }
 
 query AllPerformersForFilter {
-  allPerformers {
+  allPerformersSlim {
     ...SlimPerformerData
   }
 }
 
 query AllStudiosForFilter {
-  allStudios {
+  allStudiosSlim {
     ...SlimStudioData
   }
 }
+query AllMoviesForFilter {
+  allMoviesSlim {
+    ...SlimMovieData
+  }
+}
 
 query AllTagsForFilter {
-  allTags {
+  allTagsSlim {
     id
     name
   }
@@ -47,9 +46,11 @@ query ValidGalleriesForScene($scene_id: ID!) {
 query Stats {
   stats {
     scene_count,
+    scene_size_count,
     gallery_count,
     performer_count,
     studio_count,
+    movie_count,
     tag_count
   }
 }

graphql/documents/queries/movie.graphql

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

graphql/documents/queries/plugins.graphql

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

graphql/documents/queries/scene.graphql

@@ -46,8 +46,19 @@ query ParseSceneFilenames($filter: FindFilterType!, $config: SceneParserInput!)
       rating
       studio_id
       gallery_id
+      movies {
+        movie_id
+      }
       performer_ids
       tag_ids
     }
   }
-}
+}
+
+query SceneStreams($id: ID!) {
+  sceneStreams(id: $id) {
+    url
+    mime_type
+    label
+  }
+}

graphql/documents/queries/scrapers/scrapers.graphql

@@ -20,6 +20,17 @@ query ListSceneScrapers {
   }
 }
 
+query ListMovieScrapers {
+  listMovieScrapers {
+    id
+    name
+    movie {
+      urls
+      supported_scrapes
+    }
+  }
+}
+
 query ScrapePerformerList($scraper_id: ID!, $query: String!) {
   scrapePerformerList(scraper_id: $scraper_id, query: $query) {
     ...ScrapedPerformerData
@@ -48,4 +59,10 @@ query ScrapeSceneURL($url: String!) {
   scrapeSceneURL(url: $url) {
     ...ScrapedSceneData
   }
-}
+}
+
+query ScrapeMovieURL($url: String!) {
+  scrapeMovieURL(url: $url) {
+    ...ScrapedMovieData
+  }
+}

graphql/documents/queries/settings/config.graphql

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

graphql/documents/queries/settings/metadata.graphql

@@ -1,27 +1,3 @@
-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
@@ -29,7 +5,3 @@ query JobStatus {
     message
   }
 }
-
-query StopJob {
-  stopJob
-}

graphql/documents/queries/studio.graphql

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

graphql/documents/queries/tag.graphql

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

graphql/schema/schema.graphql

@@ -2,11 +2,16 @@
 type Query {
   """Find a scene by ID or Checksum"""
   findScene(id: ID, checksum: String): Scene
+  findSceneByHash(input: SceneHashInput!): Scene
+  
   """A function which queries Scene objects"""
   findScenes(scene_filter: SceneFilterType, scene_ids: [Int!], filter: FindFilterType): FindScenesResultType!
 
   findScenesByPathRegex(filter: FindFilterType): FindScenesResultType!
 
+  """Return valid stream paths"""
+  sceneStreams(id: ID): [SceneStreamEndpoint!]!
+
   parseSceneFilenames(filter: FindFilterType, config: SceneParserInput!): SceneParserResultType!
 
   """A function which queries SceneMarker objects"""
@@ -20,12 +25,18 @@ type Query {
   """Find a studio by ID"""
   findStudio(id: ID!): Studio
   """A function which queries Studio objects"""
-  findStudios(filter: FindFilterType): FindStudiosResultType!
+  findStudios(studio_filter: StudioFilterType, filter: FindFilterType): FindStudiosResultType!
+
+   """Find a movie by ID"""
+  findMovie(id: ID!): Movie
+  """A function which queries Movie objects"""
+  findMovies(movie_filter: MovieFilterType, filter: FindFilterType): FindMoviesResultType!
 
   findGallery(id: ID!): Gallery
-  findGalleries(filter: FindFilterType): FindGalleriesResultType!
+  findGalleries(gallery_filter: GalleryFilterType, filter: FindFilterType): FindGalleriesResultType!
 
   findTag(id: ID!): Tag
+  findTags(tag_filter: TagFilterType, filter: FindFilterType): FindTagsResultType!
 
   """Retrieve random scene markers for the wall"""
   markerWall(q: String): [SceneMarker!]!
@@ -48,6 +59,8 @@ type Query {
   """List available scrapers"""
   listPerformerScrapers: [Scraper!]!
   listSceneScrapers: [Scraper!]!
+  listMovieScrapers: [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"""
@@ -58,42 +71,45 @@ type Query {
   scrapeScene(scraper_id: ID!, scene: SceneUpdateInput!): ScrapedScene
   """Scrapes a complete performer record based on a URL"""
   scrapeSceneURL(url: String!): ScrapedScene
+  """Scrapes a complete movie record based on a URL"""
+  scrapeMovieURL(url: String!): ScrapedMovie
 
   """Scrape a performer using Freeones"""
   scrapeFreeones(performer_name: String!): ScrapedPerformer
   """Scrape a list of performers from a query"""
   scrapeFreeonesPerformerList(query: String!): [String!]!
 
+  # Plugins
+  """List loaded plugins"""
+  plugins: [Plugin!]
+  """List available plugin operations"""
+  pluginTasks: [PluginTask!]
+
+
   # Config
   """Returns the current, complete configuration"""
   configuration: ConfigResult!
   """Returns an array of paths for the given path"""
-  directories(path: String): [String!]!
+  directory(path: String): Directory!
 
   # Metadata
 
-  """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!
-
   jobStatus: MetadataUpdateStatus!
-  stopJob: Boolean!
 
   # Get everything
 
   allPerformers: [Performer!]!
   allStudios: [Studio!]!
+  allMovies: [Movie!]!
   allTags: [Tag!]!
 
+  # Get everything with minimal metadata
+
+  allPerformersSlim: [Performer!]!
+  allStudiosSlim: [Studio!]!
+  allMoviesSlim: [Movie!]!
+  allTagsSlim: [Tag!]!
+
   # Version
   version: Version!
   
@@ -105,6 +121,7 @@ type Mutation {
   sceneUpdate(input: SceneUpdateInput!): 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"""
@@ -114,6 +131,9 @@ type Mutation {
   """Resets the o-counter for a scene to 0. Returns the new value"""
   sceneResetO(id: ID!): Int!
 
+  """Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"""
+  sceneGenerateScreenshot(id: ID!, at: Float): String!
+
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
   sceneMarkerDestroy(id: ID!): Boolean!
@@ -126,6 +146,10 @@ type Mutation {
   studioUpdate(input: StudioUpdateInput!): Studio
   studioDestroy(input: StudioDestroyInput!): Boolean!
 
+  movieCreate(input: MovieCreateInput!): Movie
+  movieUpdate(input: MovieUpdateInput!): Movie
+  movieDestroy(input: MovieDestroyInput!): Boolean!
+
   tagCreate(input: TagCreateInput!): Tag
   tagUpdate(input: TagUpdateInput!): Tag
   tagDestroy(input: TagDestroyInput!): Boolean!
@@ -133,6 +157,30 @@ type Mutation {
   """Change general configuration options"""
   configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
   configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
+
+  """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!
+  """Migrate generated files for the current hash naming"""
+  migrateHashNaming: String!
+
+  """Reload scrapers"""
+  reloadScrapers: Boolean!
+
+  """Run plugin task. Returns the job ID"""
+  runPluginTask(plugin_id: ID!, task_name: String!, args: [PluginArgInput!]): String!
+  reloadPlugins: Boolean!
+
+  stopJob: Boolean!
 }
 
 type Subscription {

graphql/schema/types/config.graphql

@@ -7,6 +7,21 @@ enum StreamingResolutionEnum {
   "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
+}
+
 input ConfigGeneralInput {
   """Array of file paths to content"""
   stashes: [String!]
@@ -14,6 +29,22 @@ input ConfigGeneralInput {
   databasePath: String
   """Path to generated files"""
   generatedPath: String
+  """Path to cache"""
+  cachePath: String
+  """Whether to calculate MD5 checksums for scene video files"""
+  calculateMD5: Boolean!
+  """Hash algorithm to use for generated file naming"""
+  videoFileNamingAlgorithm: HashAlgorithm!
+  """Number of 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
   """Max generated transcode size"""
   maxTranscodeSize: StreamingResolutionEnum
   """Max streaming transcode size"""
@@ -22,6 +53,8 @@ input ConfigGeneralInput {
   username: String
   """Password"""
   password: String
+  """Maximum session cookie age"""
+  maxSessionAge: Int
   """Name of the log file"""
   logFile: String
   """Whether to also output to stderr"""
@@ -32,6 +65,10 @@ input ConfigGeneralInput {
   logAccess: Boolean!
   """Array of file regexp to exclude from Scan"""
   excludes: [String!]
+  """Scraper user agent string"""
+  scraperUserAgent: String
+  """Scraper CDP path. Path to chrome executable or remote address"""
+  scraperCDPPath: String
 }
 
 type ConfigGeneralResult {
@@ -41,7 +78,23 @@ type ConfigGeneralResult {
   databasePath: String!
   """Path to generated files"""
   generatedPath: String!
-    """Max generated transcode size"""
+  """Path to cache"""
+  cachePath: String!
+  """Whether to calculate MD5 checksums for scene video files"""
+  calculateMD5: Boolean!
+  """Hash algorithm to use for generated file naming"""
+  videoFileNamingAlgorithm: HashAlgorithm!
+  """Number of 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!
+  """Max generated transcode size"""
   maxTranscodeSize: StreamingResolutionEnum
   """Max streaming transcode size"""
   maxStreamingTranscodeSize: StreamingResolutionEnum
@@ -49,6 +102,8 @@ type ConfigGeneralResult {
   username: String!
   """Password"""
   password: String!
+  """Maximum session cookie age"""
+  maxSessionAge: Int!
   """Name of the log file"""
   logFile: String
   """Whether to also output to stderr"""
@@ -59,6 +114,10 @@ type ConfigGeneralResult {
   logAccess: Boolean!
   """Array of file regexp to exclude from Scan"""
   excludes: [String!]!
+  """Scraper user agent string"""
+  scraperUserAgent: String
+  """Scraper CDP path. Path to chrome executable or remote address"""
+  scraperCDPPath: String
 }
 
 input ConfigInterfaceInput {
@@ -66,6 +125,8 @@ input ConfigInterfaceInput {
   soundOnPreview: Boolean
   """Show title and tags in wall view"""
   wallShowTitle: Boolean
+  """Wall playback type"""
+  wallPlayback: String
   """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"""
@@ -75,6 +136,7 @@ input ConfigInterfaceInput {
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
+  language: String
 }
 
 type ConfigInterfaceResult {
@@ -82,6 +144,8 @@ type ConfigInterfaceResult {
   soundOnPreview: Boolean
   """Show title and tags in wall view"""
   wallShowTitle: Boolean
+  """Wall playback type"""
+  wallPlayback: String
   """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"""
@@ -91,6 +155,8 @@ type ConfigInterfaceResult {
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
+  """Interface language"""
+  language: String
 }
 
 """All configuration settings"""
@@ -98,3 +164,10 @@ type ConfigResult {
   general: ConfigGeneralResult!
   interface: ConfigInterfaceResult!
 }
+
+"""Directory structure of a path"""
+type Directory {
+    path: String!
+    parent: String
+    directories: [String!]!
+}

graphql/schema/types/filters.graphql

@@ -46,6 +46,10 @@ input PerformerFilterType {
   piercings: StringCriterionInput
   """Filter by aliases"""
   aliases: StringCriterionInput
+  """Filter by gender"""
+  gender: GenderCriterionInput
+  """Filter to only include performers missing this property"""
+  is_missing: String
 }
 
 input SceneMarkerFilterType {
@@ -74,12 +78,44 @@ input SceneFilterType {
   is_missing: String
   """Filter to only include scenes with this studio"""
   studios: MultiCriterionInput
+  """Filter to only include scenes with this movie"""
+  movies: MultiCriterionInput
   """Filter to only include scenes with these tags"""
   tags: MultiCriterionInput
   """Filter to only include scenes with these performers"""
   performers: MultiCriterionInput
 }
 
+input MovieFilterType {
+  """Filter to only include movies with this studio"""
+  studios: MultiCriterionInput
+  """Filter to only include movies missing this property"""
+  is_missing: String
+}
+
+input StudioFilterType {
+  """Filter to only include studios with this parent studio"""
+  parents: MultiCriterionInput
+  """Filter to only include studios missing this property"""
+  is_missing: String
+}
+
+input GalleryFilterType {
+  """Filter to only include galleries missing this property"""
+  is_missing: String
+}
+
+input TagFilterType {
+  """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 markers with this tag"""
+  marker_count: IntCriterionInput
+}
+
 enum CriterionModifier {
   """="""
   EQUALS,
@@ -112,4 +148,9 @@ input IntCriterionInput {
 input MultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
+}
+
+input GenderCriterionInput {
+  value: GenderEnum
+  modifier: CriterionModifier!
 }

graphql/schema/types/gallery.graphql

@@ -4,6 +4,7 @@ type Gallery {
   checksum: String!
   path: String!
   title: String
+  scene: Scene
 
   """The files in the gallery"""
   files: [GalleryFilesType!]! # Resolver

graphql/schema/types/metadata.graphql

@@ -1,8 +1,35 @@
 input GenerateMetadataInput {
   sprites: Boolean!
   previews: Boolean!
+  imagePreviews: Boolean!
+  previewOptions: GeneratePreviewOptionsInput
   markers: Boolean!
   transcodes: Boolean!
+  """gallery thumbnails for cache usage"""
+  thumbnails: Boolean!
+
+  """scene ids to generate for"""
+  sceneIDs: [ID!]
+  """marker ids to generate for"""
+  markerIDs: [ID!]
+  """gallery ids to generate for"""
+  galleryIDs: [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
 }
 
 input ScanMetadataInput {
@@ -20,6 +47,6 @@ input AutoTagMetadataInput {
 
 type MetadataUpdateStatus {
   progress: Float!
-	status: String!
+  status: String!
   message: String!
-}
+}

graphql/schema/types/movie.graphql

@@ -0,0 +1,59 @@
+type Movie {
+  id: ID!
+  checksum: String!
+  name: String!
+  aliases: String
+  """Duration in seconds"""
+  duration: Int
+  date: String
+  rating: Int
+  studio: Studio
+  director: String
+  synopsis: String
+  url: String
+
+  front_image_path: String # Resolver
+  back_image_path: String # Resolver
+  scene_count: Int # Resolver
+}
+
+input MovieCreateInput {
+  name: String!
+  aliases: String
+  """Duration in seconds"""
+  duration: Int
+  date: String
+  rating: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  url: String
+  """This should be base64 encoded"""
+  front_image: String
+  back_image: String
+}
+
+input MovieUpdateInput {
+  id: ID!
+  name: String
+  aliases: String
+  duration: Int
+  date: String
+  rating: Int
+  studio_id: ID
+  director: String
+  synopsis: String
+  url: String
+  """This should be base64 encoded"""
+  front_image: String
+  back_image: String
+}
+
+input MovieDestroyInput {
+  id: ID!
+}
+
+type FindMoviesResultType {
+  count: Int!
+  movies: [Movie!]!
+}

graphql/schema/types/performer.graphql

@@ -1,8 +1,18 @@
+enum GenderEnum {
+  MALE
+  FEMALE
+  TRANSGENDER_MALE
+  TRANSGENDER_FEMALE
+  INTERSEX
+  NON_BINARY
+}
+
 type Performer {
   id: ID!
   checksum: String!
   name: String
   url: String
+  gender: GenderEnum
   twitter: String
   instagram: String
   birthdate: String
@@ -26,6 +36,7 @@ type Performer {
 input PerformerCreateInput {
   name: String
   url: String
+  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
@@ -48,6 +59,7 @@ input PerformerUpdateInput {
   id: ID!
   name: String
   url: String
+  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String

graphql/schema/types/plugin.graphql

@@ -0,0 +1,35 @@
+
+type Plugin {
+    id: ID!
+    name: String!
+    description: String
+    url: String
+    version: String
+
+    tasks: [PluginTask!]
+}
+
+type PluginTask {
+    name: String!
+    description: 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!]
+}

graphql/schema/types/scene.graphql

@@ -18,9 +18,15 @@ type ScenePathsType {
   chapters_vtt: String # Resolver
 }
 
+type SceneMovie {
+  movie: Movie!
+  scene_index: Int
+}
+
 type Scene {
   id: ID!
-  checksum: String!
+  checksum: String
+  oshash: String
   title: String
   details: String
   url: String
@@ -31,15 +37,20 @@ type Scene {
 
   file: SceneFileType! # Resolver
   paths: ScenePathsType! # Resolver
-  is_streamable: Boolean! # Resolver
 
   scene_markers: [SceneMarker!]!
   gallery: Gallery
   studio: Studio
+  movies: [SceneMovie!]!
   tags: [Tag!]!
   performers: [Performer!]!
 }
 
+input SceneMovieInput {
+  movie_id: ID!
+  scene_index: Int
+}
+
 input SceneUpdateInput {
   clientMutationId: String
   id: ID!
@@ -51,11 +62,23 @@ input SceneUpdateInput {
   studio_id: ID
   gallery_id: ID
   performer_ids: [ID!]
+  movies: [SceneMovieInput!]
   tag_ids: [ID!]
   """This should be base64 encoded"""
   cover_image: String
 }
 
+enum BulkUpdateIdMode {
+  SET
+  ADD
+  REMOVE
+}
+
+input BulkUpdateIds {
+  ids: [ID!]
+  mode: BulkUpdateIdMode!
+}
+
 input BulkSceneUpdateInput {
   clientMutationId: String
   ids: [ID!]
@@ -66,8 +89,8 @@ input BulkSceneUpdateInput {
   rating: Int
   studio_id: ID
   gallery_id: ID
-  performer_ids: [ID!]
-  tag_ids: [ID!]
+  performer_ids: BulkUpdateIds
+  tag_ids: BulkUpdateIds
 }
 
 input SceneDestroyInput {
@@ -76,6 +99,12 @@ input SceneDestroyInput {
   delete_generated: Boolean
 }
 
+input ScenesDestroyInput {
+  ids: [ID!]!
+  delete_file: Boolean
+  delete_generated: Boolean
+}
+
 type FindScenesResultType {
   count: Int!
   scenes: [Scene!]!
@@ -87,6 +116,11 @@ input SceneParserInput {
   capitalizeTitle: Boolean
 }
 
+type SceneMovieID {
+  movie_id: ID!
+  scene_index: String
+}
+
 type SceneParserResult {
   scene: Scene!
   title: String
@@ -97,10 +131,22 @@ type SceneParserResult {
   studio_id: 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
+}

graphql/schema/types/scraped-movie.graphql

@@ -0,0 +1,34 @@
+type ScrapedMovieStudio {
+  """Set if studio matched"""
+  id: ID
+  name: String!
+  url: String
+}
+
+"""A movie from a scraping operation..."""
+type ScrapedMovie {
+  name: String
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  url: String
+  synopsis: String
+  studio: ScrapedMovieStudio
+
+  """This should be base64 encoded"""
+  front_image: String
+  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,6 +1,7 @@
 """A performer from a scraping operation..."""
 type ScrapedPerformer {
   name: String
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -15,10 +16,14 @@ type ScrapedPerformer {
   tattoos: String
   piercings: String
   aliases: String
+
+  """This should be base64 encoded"""
+  image: String
 }
 
 input ScrapedPerformerInput {
   name: String
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -33,4 +38,6 @@ input ScrapedPerformerInput {
   tattoos: String
   piercings: String
   aliases: String
+
+  # not including image for the input
 }

graphql/schema/types/scraper.graphql

@@ -20,13 +20,16 @@ type Scraper {
     performer: ScraperSpec
     """Details for scene scraper"""
     scene: ScraperSpec
+    """Details for movie scraper"""
+    movie: ScraperSpec
 }
 
 
 type ScrapedScenePerformer {
   """Set if performer matched"""
-  id: ID
+  stored_id: ID
   name: String!
+  gender: String
   url: String
   twitter: String
   instagram: String
@@ -43,16 +46,29 @@ type ScrapedScenePerformer {
   aliases: String
 }
 
+type ScrapedSceneMovie {
+  """Set if movie matched"""
+  stored_id: ID
+  name: String!
+  aliases: String
+  duration: String
+  date: String
+  rating: String
+  director: String
+  synopsis: String
+  url: String
+}
+
 type ScrapedSceneStudio {
   """Set if studio matched"""
-  id: ID
+  stored_id: ID
   name: String!
   url: String
 }
 
 type ScrapedSceneTag {
   """Set if tag matched"""
-  id: ID
+  stored_id: ID
   name: String!
 }
 
@@ -62,9 +78,13 @@ type ScrapedScene {
   url: String
   date: String
 
+  """This should be base64 encoded"""
+  image: String
+
   file: SceneFileType # Resolver
 
   studio: ScrapedSceneStudio
   tags: [ScrapedSceneTag!]
   performers: [ScrapedScenePerformer!]
+  movies: [ScrapedSceneMovie!]
 }

graphql/schema/types/stats.graphql

@@ -1,7 +1,9 @@
 type StatsResultType {
   scene_count: Int!
+  scene_size_count: String!
   gallery_count: Int!
   performer_count: Int!
   studio_count: Int!
+  movie_count: Int!
   tag_count: Int!
-}
+}

graphql/schema/types/studio.graphql

@@ -3,7 +3,8 @@ type Studio {
   checksum: String!
   name: String!
   url: String
-
+  parent_studio: Studio
+  child_studios: [Studio!]!
   image_path: String # Resolver
   scene_count: Int # Resolver
 }
@@ -11,6 +12,7 @@ type Studio {
 input StudioCreateInput {
   name: String!
   url: String
+  parent_id: ID
   """This should be base64 encoded"""
   image: String
 }
@@ -19,6 +21,7 @@ input StudioUpdateInput {
   id: ID!
   name: String
   url: String
+  parent_id: ID,
   """This should be base64 encoded"""
   image: String
 }

graphql/schema/types/tag.graphql

@@ -2,19 +2,31 @@ type Tag {
   id: ID!
   name: String!
 
+  image_path: String # Resolver
   scene_count: Int # Resolver
   scene_marker_count: Int # Resolver
 }
 
 input TagCreateInput {
   name: String!
+
+  """This should be base64 encoded"""
+  image: String
 }
 
 input TagUpdateInput {
   id: ID!
   name: String!
+
+  """This should be base64 encoded"""
+  image: String
 }
 
 input TagDestroyInput {
   id: ID!
+}
+
+type FindTagsResultType {
+  count: Int!
+  tags: [Tag!]!
 }

main.go

@@ -13,7 +13,12 @@ import (
 
 func main() {
 	manager.Initialize()
-	database.Initialize(config.GetDatabasePath())
+
+	// perform the post-migration for new databases
+	if database.Initialize(config.GetDatabasePath()) {
+		manager.GetInstance().PostMigrate()
+	}
+
 	api.Start()
 	blockForever()
 }

pkg/api/cache_thumbs.go

@@ -0,0 +1,72 @@
+package api
+
+import (
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager/paths"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+	"io/ioutil"
+)
+
+type thumbBuffer struct {
+	path string
+	dir  string
+	data []byte
+}
+
+func newCacheThumb(dir string, path string, data []byte) *thumbBuffer {
+	t := thumbBuffer{dir: dir, path: path, data: data}
+	return &t
+}
+
+var writeChan chan *thumbBuffer
+var touchChan chan *string
+
+func startThumbCache() { // TODO add extra wait, close chan code if/when stash gets a stop mode
+
+	writeChan = make(chan *thumbBuffer, 20)
+	go thumbnailCacheWriter()
+}
+
+//serialize file writes to avoid race conditions
+func thumbnailCacheWriter() {
+
+	for thumb := range writeChan {
+		exists, _ := utils.FileExists(thumb.path)
+		if !exists {
+			err := utils.WriteFile(thumb.path, thumb.data)
+			if err != nil {
+				logger.Errorf("Write error for thumbnail %s: %s ", thumb.path, err)
+			}
+		}
+	}
+
+}
+
+// get thumbnail from cache, otherwise create it and store to cache
+func cacheGthumb(gallery *models.Gallery, index int, width int) []byte {
+	thumbPath := paths.GetGthumbPath(gallery.Checksum, index, width)
+	exists, _ := utils.FileExists(thumbPath)
+	if exists { // if thumbnail exists in cache return that
+		content, err := ioutil.ReadFile(thumbPath)
+		if err == nil {
+			return content
+		} else {
+			logger.Errorf("Read Error for file %s : %s", thumbPath, err)
+		}
+
+	}
+	data := gallery.GetThumbnail(index, width)
+	thumbDir := paths.GetGthumbDir(gallery.Checksum)
+	t := newCacheThumb(thumbDir, thumbPath, data)
+	writeChan <- t // write the file to cache
+	return data
+}
+
+// create all thumbs for a given gallery
+func CreateGthumbs(gallery *models.Gallery) {
+	count := gallery.ImageCount()
+	for i := 0; i < count; i++ {
+		cacheGthumb(gallery, i, models.DefaultGthumbWidth)
+	}
+}

pkg/api/check_version.go

@@ -2,18 +2,26 @@ package api
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-	"github.com/stashapp/stash/pkg/logger"
 	"io/ioutil"
 	"net/http"
+	"regexp"
 	"runtime"
 	"time"
+
+	"github.com/stashapp/stash/pkg/logger"
 )
 
 //we use the github REST V3 API as no login is required
-const apiURL string = "https://api.github.com/repos/stashapp/stash/tags"
 const apiReleases string = "https://api.github.com/repos/stashapp/stash/releases"
+const apiTags string = "https://api.github.com/repos/stashapp/stash/tags"
 const apiAcceptHeader string = "application/vnd.github.v3+json"
+const developmentTag string = "latest_develop"
+
+// ErrNoVersion indicates that no version information has been embedded in the
+// stash binary
+var ErrNoVersion = errors.New("no stash version")
 
 var stashReleases = func() map[string]string {
 	return map[string]string{
@@ -24,17 +32,6 @@ var stashReleases = func() map[string]string {
 	}
 }
 
-type githubTagResponse struct {
-	Name        string
-	Zipball_url string
-	Tarball_url string
-	Commit      struct {
-		Sha string
-		Url string
-	}
-	Node_id string
-}
-
 type githubReleasesResponse struct {
 	Url              string
 	Assets_url       string
@@ -93,74 +90,118 @@ type githubAsset struct {
 	Browser_download_url string
 }
 
-//gets latest version (git commit hash) from github API
-//the repo's tags are used to find the latest version
-//of the "master" or "develop" branch
+type githubTagResponse struct {
+	Name        string
+	Zipball_url string
+	Tarball_url string
+	Commit      struct {
+		Sha string
+		Url string
+	}
+	Node_id string
+}
+
+func makeGithubRequest(url string, output interface{}) error {
+	client := &http.Client{
+		Timeout: 3 * time.Second,
+	}
+
+	req, _ := http.NewRequest("GET", url, nil)
+
+	req.Header.Add("Accept", apiAcceptHeader) // gh api recommendation , send header with api version
+	response, err := client.Do(req)
+
+	if err != nil {
+		return fmt.Errorf("Github API request failed: %s", err)
+	}
+
+	if response.StatusCode != http.StatusOK {
+		return fmt.Errorf("Github API request failed: %s", response.Status)
+	}
+
+	defer response.Body.Close()
+
+	data, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		return fmt.Errorf("Github API read response failed: %s", err)
+	}
+
+	err = json.Unmarshal(data, output)
+	if err != nil {
+		return fmt.Errorf("Unmarshalling Github API response failed: %s", err)
+	}
+
+	return nil
+}
+
+// GetLatestVersion gets latest version (git commit hash) from github API
+// If running a build from the "master" branch, then the latest full release
+// is used, otherwise it uses the release that is tagged with "latest_develop"
+// which is the latest pre-release build.
 func GetLatestVersion(shortHash bool) (latestVersion string, latestRelease string, err error) {
 
 	platform := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
 	wantedRelease := stashReleases()[platform]
 
-	branch, _, _ := GetVersion()
-	if branch == "" {
-		return "", "", fmt.Errorf("Stash doesn't have a version. Version check not supported.")
+	version, _, _ := GetVersion()
+	if version == "" {
+		return "", "", ErrNoVersion
 	}
 
-	client := &http.Client{
-		Timeout: 3 * time.Second,
+	// if the version is suffixed with -x-xxxx, then we are running a development build
+	usePreRelease := false
+	re := regexp.MustCompile(`-\d+-g\w+$`)
+	if re.MatchString(version) {
+		usePreRelease = true
 	}
 
-	req, _ := http.NewRequest("GET", apiReleases, nil)
+	url := apiReleases
+	if !usePreRelease {
+		// just get the latest full release
+		url += "/latest"
+	} else {
+		// get the release tagged with the development tag
+		url += "/tags/" + developmentTag
+	}
 
-	req.Header.Add("Accept", apiAcceptHeader) // gh api recommendation , send header with api version
-	response, err := client.Do(req)
-
-	input := make([]githubReleasesResponse, 0)
+	release := githubReleasesResponse{}
+	err = makeGithubRequest(url, &release)
 
 	if err != nil {
-		return "", "", fmt.Errorf("Github API request failed: %s", err)
-	} else {
+		return "", "", err
+	}
 
-		defer response.Body.Close()
+	if release.Prerelease == usePreRelease {
+		latestVersion = getReleaseHash(release, shortHash, usePreRelease)
 
-		data, err := ioutil.ReadAll(response.Body)
-		if err != nil {
-			return "", "", fmt.Errorf("Github API read response failed: %s", err)
-		} else {
-			err = json.Unmarshal(data, &input)
-			if err != nil {
-				return "", "", fmt.Errorf("Unmarshalling Github API response failed: %s", err)
-			} else {
-
-				for _, ghApi := range input {
-					if ghApi.Tag_name == branch {
-
-						if shortHash {
-							latestVersion = ghApi.Target_commitish[0:7] //shorthash is first 7 digits of git commit hash
-						} else {
-							latestVersion = ghApi.Target_commitish
-						}
-						if wantedRelease != "" {
-							for _, asset := range ghApi.Assets {
-								if asset.Name == wantedRelease {
-									latestRelease = asset.Browser_download_url
-									break
-								}
-
-							}
-						}
-						break
-					}
+		if wantedRelease != "" {
+			for _, asset := range release.Assets {
+				if asset.Name == wantedRelease {
+					latestRelease = asset.Browser_download_url
+					break
 				}
-
 			}
 		}
-		if latestVersion == "" {
-			return "", "", fmt.Errorf("No version found for \"%s\"", branch)
-		}
+	}
+
+	if latestVersion == "" {
+		return "", "", fmt.Errorf("No version found for \"%s\"", version)
 	}
 	return latestVersion, latestRelease, nil
+}
 
+func getReleaseHash(release githubReleasesResponse, shortHash bool, usePreRelease bool) string {
+	// the /latest API call doesn't return the hash in target_commitish
+	// also add sanity check in case Target_commitish is not 40 characters
+	if !usePreRelease || len(release.Target_commitish) != 40 {
+		return getShaFromTags(shortHash, release.Tag_name)
+	}
+
+	if shortHash {
+		return release.Target_commitish[0:7] //shorthash is first 7 digits of git commit hash
+	}
+
+	return release.Target_commitish
 }
 
 func printLatestVersion() {
@@ -175,5 +216,32 @@ func printLatestVersion() {
 			logger.Infof("New version: (%s) available.", latest)
 		}
 	}
-
+}
+
+// get sha from the github api tags endpoint
+// returns the sha1 hash/shorthash or "" if something's wrong
+func getShaFromTags(shortHash bool, name string) string {
+	url := apiTags
+	tags := []githubTagResponse{}
+	err := makeGithubRequest(url, &tags)
+
+	if err != nil {
+		logger.Errorf("Github Tags Api %v", err)
+		return ""
+	}
+
+	for _, tag := range tags {
+		if tag.Name == name {
+			if len(tag.Commit.Sha) != 40 {
+				return ""
+			}
+			if shortHash {
+				return tag.Commit.Sha[0:7] //shorthash is first 7 digits of git commit hash
+			}
+
+			return tag.Commit.Sha
+		}
+	}
+
+	return ""
 }

pkg/api/context_keys.go

@@ -9,4 +9,7 @@ const (
 	performerKey key = 1
 	sceneKey     key = 2
 	studioKey    key = 3
+	movieKey     key = 4
+	ContextUser  key = 5
+	tagKey       key = 6
 )

pkg/api/images.go

@@ -2,18 +2,48 @@ package api
 
 import (
 	"math/rand"
+	"strings"
 
 	"github.com/gobuffalo/packr/v2"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 var performerBox *packr.Box
+var performerBoxMale *packr.Box
 
 func initialiseImages() {
 	performerBox = packr.New("Performer Box", "../../static/performer")
+	performerBoxMale = packr.New("Male Performer Box", "../../static/performer_male")
 }
 
-func getRandomPerformerImage() ([]byte, error) {
-	imageFiles := performerBox.List()
+func getRandomPerformerImage(gender string) ([]byte, error) {
+	var box *packr.Box
+	switch strings.ToUpper(gender) {
+	case "FEMALE":
+		box = performerBox
+	case "MALE":
+		box = performerBoxMale
+	default:
+		box = performerBox
+
+	}
+	imageFiles := box.List()
 	index := rand.Intn(len(imageFiles))
-	return performerBox.Find(imageFiles[index])
+	return box.Find(imageFiles[index])
+}
+
+func getRandomPerformerImageUsingName(name, gender string) ([]byte, error) {
+	var box *packr.Box
+	switch strings.ToUpper(gender) {
+	case "FEMALE":
+		box = performerBox
+	case "MALE":
+		box = performerBoxMale
+	default:
+		box = performerBox
+
+	}
+	imageFiles := box.List()
+	index := utils.IntFromString(name) % uint64(len(imageFiles))
+	return box.Find(imageFiles[index])
 }

pkg/api/migrate.go

@@ -0,0 +1,96 @@
+package api
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+	"os"
+
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager"
+)
+
+type migrateData struct {
+	ExistingVersion uint
+	MigrateVersion  uint
+	BackupPath      string
+}
+
+func getMigrateData() migrateData {
+	return migrateData{
+		ExistingVersion: database.Version(),
+		MigrateVersion:  database.AppSchemaVersion(),
+		BackupPath:      database.DatabaseBackupPath(),
+	}
+}
+
+func getMigrateHandler(w http.ResponseWriter, r *http.Request) {
+	if !database.NeedsMigration() {
+		http.Redirect(w, r, "/", 301)
+		return
+	}
+
+	data, _ := setupUIBox.Find("migrate.html")
+	templ, err := template.New("Migrate").Parse(string(data))
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+		return
+	}
+
+	err = templ.Execute(w, getMigrateData())
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+	}
+}
+
+func doMigrateHandler(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		http.Error(w, fmt.Sprintf("error: %s", err), 500)
+	}
+
+	formBackupPath := r.Form.Get("backuppath")
+
+	// always backup so that we can roll back to the previous version if
+	// migration fails
+	backupPath := formBackupPath
+	if formBackupPath == "" {
+		backupPath = database.DatabaseBackupPath()
+	}
+
+	// perform database backup
+	if err = database.Backup(backupPath); err != nil {
+		http.Error(w, fmt.Sprintf("error backing up database: %s", err), 500)
+		return
+	}
+
+	err = database.RunMigrations()
+	if err != nil {
+		errStr := fmt.Sprintf("error performing migration: %s", err)
+
+		// roll back to the backed up version
+		restoreErr := database.RestoreFromBackup(backupPath)
+		if restoreErr != nil {
+			errStr = fmt.Sprintf("ERROR: unable to restore database from backup after migration failure: %s\n%s", restoreErr.Error(), errStr)
+		} else {
+			errStr = "An error occurred migrating the database to the latest schema version. The backup database file was automatically renamed to restore the database.\n" + errStr
+		}
+
+		http.Error(w, errStr, 500)
+		return
+	}
+
+	// perform post-migration operations
+	manager.GetInstance().PostMigrate()
+
+	// if no backup path was provided, then delete the created backup
+	if formBackupPath == "" {
+		err = os.Remove(backupPath)
+		if err != nil {
+			logger.Warnf("error removing unwanted database backup (%s): %s", backupPath, err.Error())
+		}
+	}
+
+	http.Redirect(w, r, "/", 301)
+}

pkg/api/resolver.go

@@ -33,6 +33,9 @@ func (r *Resolver) SceneMarker() models.SceneMarkerResolver {
 func (r *Resolver) Studio() models.StudioResolver {
 	return &studioResolver{r}
 }
+func (r *Resolver) Movie() models.MovieResolver {
+	return &movieResolver{r}
+}
 func (r *Resolver) Subscription() models.SubscriptionResolver {
 	return &subscriptionResolver{r}
 }
@@ -40,6 +43,22 @@ func (r *Resolver) Tag() models.TagResolver {
 	return &tagResolver{r}
 }
 
+func (r *Resolver) ScrapedSceneTag() models.ScrapedSceneTagResolver {
+	return &scrapedSceneTagResolver{r}
+}
+
+func (r *Resolver) ScrapedSceneMovie() models.ScrapedSceneMovieResolver {
+	return &scrapedSceneMovieResolver{r}
+}
+
+func (r *Resolver) ScrapedScenePerformer() models.ScrapedScenePerformerResolver {
+	return &scrapedScenePerformerResolver{r}
+}
+
+func (r *Resolver) ScrapedSceneStudio() models.ScrapedSceneStudioResolver {
+	return &scrapedSceneStudioResolver{r}
+}
+
 type mutationResolver struct{ *Resolver }
 type queryResolver struct{ *Resolver }
 type subscriptionResolver struct{ *Resolver }
@@ -49,7 +68,12 @@ type performerResolver struct{ *Resolver }
 type sceneResolver struct{ *Resolver }
 type sceneMarkerResolver struct{ *Resolver }
 type studioResolver struct{ *Resolver }
+type movieResolver struct{ *Resolver }
 type tagResolver struct{ *Resolver }
+type scrapedSceneTagResolver struct{ *Resolver }
+type scrapedSceneMovieResolver struct{ *Resolver }
+type scrapedScenePerformerResolver struct{ *Resolver }
+type scrapedSceneStudioResolver struct{ *Resolver }
 
 func (r *queryResolver) MarkerWall(ctx context.Context, q *string) ([]*models.SceneMarker, error) {
 	qb := models.NewSceneMarkerQueryBuilder()
@@ -89,19 +113,24 @@ func (r *queryResolver) ValidGalleriesForScene(ctx context.Context, scene_id *st
 func (r *queryResolver) Stats(ctx context.Context) (*models.StatsResultType, error) {
 	scenesQB := models.NewSceneQueryBuilder()
 	scenesCount, _ := scenesQB.Count()
+	scenesSizeCount, _ := scenesQB.SizeCount()
 	galleryQB := models.NewGalleryQueryBuilder()
 	galleryCount, _ := galleryQB.Count()
 	performersQB := models.NewPerformerQueryBuilder()
 	performersCount, _ := performersQB.Count()
 	studiosQB := models.NewStudioQueryBuilder()
 	studiosCount, _ := studiosQB.Count()
+	moviesQB := models.NewMovieQueryBuilder()
+	moviesCount, _ := moviesQB.Count()
 	tagsQB := models.NewTagQueryBuilder()
 	tagsCount, _ := tagsQB.Count()
 	return &models.StatsResultType{
 		SceneCount:     scenesCount,
+		SceneSizeCount: scenesSizeCount,
 		GalleryCount:   galleryCount,
 		PerformerCount: performersCount,
 		StudioCount:    studiosCount,
+		MovieCount:     moviesCount,
 		TagCount:       tagsCount,
 	}, nil
 }

pkg/api/resolver_model_gallery.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+
 	"github.com/stashapp/stash/pkg/models"
 )
 
@@ -13,3 +14,12 @@ func (r *galleryResolver) Files(ctx context.Context, obj *models.Gallery) ([]*mo
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
 	return obj.GetFiles(baseURL), nil
 }
+
+func (r *galleryResolver) Scene(ctx context.Context, obj *models.Gallery) (*models.Scene, error) {
+	if !obj.SceneID.Valid {
+		return nil, nil
+	}
+
+	qb := models.NewSceneQueryBuilder()
+	return qb.Find(int(obj.SceneID.Int64))
+}

pkg/api/resolver_model_movie.go

@@ -0,0 +1,95 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+func (r *movieResolver) Name(ctx context.Context, obj *models.Movie) (string, error) {
+	if obj.Name.Valid {
+		return obj.Name.String, nil
+	}
+	return "", nil
+}
+
+func (r *movieResolver) URL(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.URL.Valid {
+		return &obj.URL.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Aliases(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Aliases.Valid {
+		return &obj.Aliases.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Duration(ctx context.Context, obj *models.Movie) (*int, error) {
+	if obj.Duration.Valid {
+		rating := int(obj.Duration.Int64)
+		return &rating, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Date(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Date.Valid {
+		result := utils.GetYMDFromDatabaseDate(obj.Date.String)
+		return &result, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Rating(ctx context.Context, obj *models.Movie) (*int, error) {
+	if obj.Rating.Valid {
+		rating := int(obj.Rating.Int64)
+		return &rating, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Studio(ctx context.Context, obj *models.Movie) (*models.Studio, error) {
+	qb := models.NewStudioQueryBuilder()
+	if obj.StudioID.Valid {
+		return qb.Find(int(obj.StudioID.Int64), nil)
+	}
+
+	return nil, nil
+}
+
+func (r *movieResolver) Director(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Director.Valid {
+		return &obj.Director.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) Synopsis(ctx context.Context, obj *models.Movie) (*string, error) {
+	if obj.Synopsis.Valid {
+		return &obj.Synopsis.String, nil
+	}
+	return nil, nil
+}
+
+func (r *movieResolver) FrontImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	frontimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj.ID).GetMovieFrontImageURL()
+	return &frontimagePath, nil
+}
+
+func (r *movieResolver) BackImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	backimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj.ID).GetMovieBackImageURL()
+	return &backimagePath, nil
+}
+
+func (r *movieResolver) SceneCount(ctx context.Context, obj *models.Movie) (*int, error) {
+	qb := models.NewSceneQueryBuilder()
+	res, err := qb.CountByMovieID(obj.ID)
+	return &res, err
+}

pkg/api/resolver_model_performer.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+
 	"github.com/stashapp/stash/pkg/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/models"
 )
@@ -20,6 +21,19 @@ func (r *performerResolver) URL(ctx context.Context, obj *models.Performer) (*st
 	return nil, nil
 }
 
+func (r *performerResolver) Gender(ctx context.Context, obj *models.Performer) (*models.GenderEnum, error) {
+	var ret models.GenderEnum
+
+	if obj.Gender.Valid {
+		ret = models.GenderEnum(obj.Gender.String)
+		if ret.IsValid() {
+			return &ret, nil
+		}
+	}
+
+	return nil, nil
+}
+
 func (r *performerResolver) Twitter(ctx context.Context, obj *models.Performer) (*string, error) {
 	if obj.Twitter.Valid {
 		return &obj.Twitter.String, nil

pkg/api/resolver_model_scene.go

@@ -4,11 +4,24 @@ import (
 	"context"
 
 	"github.com/stashapp/stash/pkg/api/urlbuilders"
-	"github.com/stashapp/stash/pkg/manager"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/utils"
 )
 
+func (r *sceneResolver) Checksum(ctx context.Context, obj *models.Scene) (*string, error) {
+	if obj.Checksum.Valid {
+		return &obj.Checksum.String, nil
+	}
+	return nil, nil
+}
+
+func (r *sceneResolver) Oshash(ctx context.Context, obj *models.Scene) (*string, error) {
+	if obj.OSHash.Valid {
+		return &obj.OSHash.String, nil
+	}
+	return nil, nil
+}
+
 func (r *sceneResolver) Title(ctx context.Context, obj *models.Scene) (*string, error) {
 	if obj.Title.Valid {
 		return &obj.Title.String, nil
@@ -81,10 +94,6 @@ func (r *sceneResolver) Paths(ctx context.Context, obj *models.Scene) (*models.S
 	}, nil
 }
 
-func (r *sceneResolver) IsStreamable(ctx context.Context, obj *models.Scene) (bool, error) {
-	return manager.IsStreamable(obj)
-}
-
 func (r *sceneResolver) SceneMarkers(ctx context.Context, obj *models.Scene) ([]*models.SceneMarker, error) {
 	qb := models.NewSceneMarkerQueryBuilder()
 	return qb.FindBySceneID(obj.ID, nil)
@@ -100,6 +109,38 @@ func (r *sceneResolver) Studio(ctx context.Context, obj *models.Scene) (*models.
 	return qb.FindBySceneID(obj.ID)
 }
 
+func (r *sceneResolver) Movies(ctx context.Context, obj *models.Scene) ([]*models.SceneMovie, error) {
+	joinQB := models.NewJoinsQueryBuilder()
+	qb := models.NewMovieQueryBuilder()
+
+	sceneMovies, err := joinQB.GetSceneMovies(obj.ID, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var ret []*models.SceneMovie
+	for _, sm := range sceneMovies {
+		movie, err := qb.Find(sm.MovieID, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		sceneIdx := sm.SceneIndex
+		sceneMovie := &models.SceneMovie{
+			Movie: movie,
+		}
+
+		if sceneIdx.Valid {
+			var idx int
+			idx = int(sceneIdx.Int64)
+			sceneMovie.SceneIndex = &idx
+		}
+
+		ret = append(ret, sceneMovie)
+	}
+	return ret, nil
+}
+
 func (r *sceneResolver) Tags(ctx context.Context, obj *models.Scene) ([]*models.Tag, error) {
 	qb := models.NewTagQueryBuilder()
 	return qb.FindBySceneID(obj.ID, nil)

pkg/api/resolver_model_scraper.go

@@ -0,0 +1,23 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *scrapedSceneTagResolver) StoredID(ctx context.Context, obj *models.ScrapedSceneTag) (*string, error) {
+	return obj.ID, nil
+}
+
+func (r *scrapedSceneMovieResolver) StoredID(ctx context.Context, obj *models.ScrapedSceneMovie) (*string, error) {
+	return obj.ID, nil
+}
+
+func (r *scrapedScenePerformerResolver) StoredID(ctx context.Context, obj *models.ScrapedScenePerformer) (*string, error) {
+	return obj.ID, nil
+}
+
+func (r *scrapedSceneStudioResolver) StoredID(ctx context.Context, obj *models.ScrapedSceneStudio) (*string, error) {
+	return obj.ID, nil
+}

pkg/api/resolver_model_studio.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+
 	"github.com/stashapp/stash/pkg/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/models"
 )
@@ -31,3 +32,17 @@ func (r *studioResolver) SceneCount(ctx context.Context, obj *models.Studio) (*i
 	res, err := qb.CountByStudioID(obj.ID)
 	return &res, err
 }
+
+func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (*models.Studio, error) {
+	if !obj.ParentID.Valid {
+		return nil, nil
+	}
+
+	qb := models.NewStudioQueryBuilder()
+	return qb.Find(int(obj.ParentID.Int64), nil)
+}
+
+func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) ([]*models.Studio, error) {
+	qb := models.NewStudioQueryBuilder()
+	return qb.FindChildren(obj.ID, nil)
+}

pkg/api/resolver_model_tag.go

@@ -2,6 +2,8 @@ package api
 
 import (
 	"context"
+
+	"github.com/stashapp/stash/pkg/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/models"
 )
 
@@ -22,3 +24,9 @@ func (r *tagResolver) SceneMarkerCount(ctx context.Context, obj *models.Tag) (*i
 	count, err := qb.CountByTagID(obj.ID)
 	return &count, err
 }
+
+func (r *tagResolver) ImagePath(ctx context.Context, obj *models.Tag) (*string, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	imagePath := urlbuilders.NewTagURLBuilder(baseURL, obj.ID).GetTagImageURL()
+	return &imagePath, nil
+}

pkg/api/resolver_mutation_configure.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"path/filepath"
 
@@ -38,6 +39,44 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		config.Set(config.Generated, input.GeneratedPath)
 	}
 
+	if input.CachePath != nil {
+		if err := utils.EnsureDir(*input.CachePath); err != nil {
+			return makeConfigGeneralResult(), err
+		}
+		config.Set(config.Cache, input.CachePath)
+	}
+
+	if !input.CalculateMd5 && input.VideoFileNamingAlgorithm == models.HashAlgorithmMd5 {
+		return makeConfigGeneralResult(), errors.New("calculateMD5 must be true if using MD5")
+	}
+
+	if input.VideoFileNamingAlgorithm != config.GetVideoFileNamingAlgorithm() {
+		// validate changing VideoFileNamingAlgorithm
+		if err := manager.ValidateVideoFileNamingAlgorithm(input.VideoFileNamingAlgorithm); err != nil {
+			return makeConfigGeneralResult(), err
+		}
+
+		config.Set(config.VideoFileNamingAlgorithm, input.VideoFileNamingAlgorithm)
+	}
+
+	config.Set(config.CalculateMD5, input.CalculateMd5)
+
+	if input.PreviewSegments != nil {
+		config.Set(config.PreviewSegments, *input.PreviewSegments)
+	}
+	if input.PreviewSegmentDuration != nil {
+		config.Set(config.PreviewSegmentDuration, *input.PreviewSegmentDuration)
+	}
+	if input.PreviewExcludeStart != nil {
+		config.Set(config.PreviewExcludeStart, *input.PreviewExcludeStart)
+	}
+	if input.PreviewExcludeEnd != nil {
+		config.Set(config.PreviewExcludeEnd, *input.PreviewExcludeEnd)
+	}
+	if input.PreviewPreset != nil {
+		config.Set(config.PreviewPreset, input.PreviewPreset.String())
+	}
+
 	if input.MaxTranscodeSize != nil {
 		config.Set(config.MaxTranscodeSize, input.MaxTranscodeSize.String())
 	}
@@ -60,6 +99,10 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		}
 	}
 
+	if input.MaxSessionAge != nil {
+		config.Set(config.MaxSessionAge, *input.MaxSessionAge)
+	}
+
 	if input.LogFile != nil {
 		config.Set(config.LogFile, input.LogFile)
 	}
@@ -76,11 +119,25 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.Co
 		config.Set(config.Exclude, input.Excludes)
 	}
 
+	refreshScraperCache := false
+	if input.ScraperUserAgent != nil {
+		config.Set(config.ScraperUserAgent, input.ScraperUserAgent)
+		refreshScraperCache = true
+	}
+
+	if input.ScraperCDPPath != nil {
+		config.Set(config.ScraperCDPPath, input.ScraperCDPPath)
+		refreshScraperCache = true
+	}
+
 	if err := config.Write(); err != nil {
 		return makeConfigGeneralResult(), err
 	}
 
 	manager.GetInstance().RefreshConfig()
+	if refreshScraperCache {
+		manager.GetInstance().RefreshScraperCache()
+	}
 
 	return makeConfigGeneralResult(), nil
 }
@@ -94,6 +151,10 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input models.
 		config.Set(config.WallShowTitle, *input.WallShowTitle)
 	}
 
+	if input.WallPlayback != nil {
+		config.Set(config.WallPlayback, *input.WallPlayback)
+	}
+
 	if input.MaximumLoopDuration != nil {
 		config.Set(config.MaximumLoopDuration, *input.MaximumLoopDuration)
 	}
@@ -106,6 +167,10 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input models.
 		config.Set(config.ShowStudioAsText, *input.ShowStudioAsText)
 	}
 
+	if input.Language != nil {
+		config.Set(config.Language, *input.Language)
+	}
+
 	css := ""
 
 	if input.CSS != nil {

pkg/api/resolver_mutation_metadata.go

@@ -0,0 +1,58 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *mutationResolver) MetadataScan(ctx context.Context, input models.ScanMetadataInput) (string, error) {
+	manager.GetInstance().Scan(input.UseFileMetadata)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataImport(ctx context.Context) (string, error) {
+	manager.GetInstance().Import()
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataExport(ctx context.Context) (string, error) {
+	manager.GetInstance().Export()
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataGenerate(ctx context.Context, input models.GenerateMetadataInput) (string, error) {
+	manager.GetInstance().Generate(input)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataAutoTag(ctx context.Context, input models.AutoTagMetadataInput) (string, error) {
+	manager.GetInstance().AutoTag(input.Performers, input.Studios, input.Tags)
+	return "todo", nil
+}
+
+func (r *mutationResolver) MetadataClean(ctx context.Context) (string, error) {
+	manager.GetInstance().Clean()
+	return "todo", nil
+}
+
+func (r *mutationResolver) MigrateHashNaming(ctx context.Context) (string, error) {
+	manager.GetInstance().MigrateHash()
+	return "todo", nil
+}
+
+func (r *mutationResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateStatus, error) {
+	status := manager.GetInstance().Status
+	ret := models.MetadataUpdateStatus{
+		Progress: status.Progress,
+		Status:   status.Status.String(),
+		Message:  "",
+	}
+
+	return &ret, nil
+}
+
+func (r *mutationResolver) StopJob(ctx context.Context) (bool, error) {
+	return manager.GetInstance().Status.Stop(), nil
+}

pkg/api/resolver_mutation_movie.go

@@ -0,0 +1,250 @@
+package api
+
+import (
+	"context"
+	"database/sql"
+	"strconv"
+	"time"
+
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
+)
+
+func (r *mutationResolver) MovieCreate(ctx context.Context, input models.MovieCreateInput) (*models.Movie, error) {
+	// generate checksum from movie name rather than image
+	checksum := utils.MD5FromString(input.Name)
+
+	var frontimageData []byte
+	var backimageData []byte
+	var err error
+
+	// HACK: if back image is being set, set the front image to the default.
+	// This is because we can't have a null front image with a non-null back image.
+	if input.FrontImage == nil && input.BackImage != nil {
+		input.FrontImage = &models.DefaultMovieImage
+	}
+
+	// Process the base 64 encoded image string
+	if input.FrontImage != nil {
+		_, frontimageData, err = utils.ProcessBase64Image(*input.FrontImage)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Process the base 64 encoded image string
+	if input.BackImage != nil {
+		_, backimageData, err = utils.ProcessBase64Image(*input.BackImage)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Populate a new movie from the input
+	currentTime := time.Now()
+	newMovie := models.Movie{
+		Checksum:  checksum,
+		Name:      sql.NullString{String: input.Name, Valid: true},
+		CreatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
+		UpdatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
+	}
+
+	if input.Aliases != nil {
+		newMovie.Aliases = sql.NullString{String: *input.Aliases, Valid: true}
+	}
+	if input.Duration != nil {
+		duration := int64(*input.Duration)
+		newMovie.Duration = sql.NullInt64{Int64: duration, Valid: true}
+	}
+
+	if input.Date != nil {
+		newMovie.Date = models.SQLiteDate{String: *input.Date, Valid: true}
+	}
+
+	if input.Rating != nil {
+		rating := int64(*input.Rating)
+		newMovie.Rating = sql.NullInt64{Int64: rating, Valid: true}
+	}
+
+	if input.StudioID != nil {
+		studioID, _ := strconv.ParseInt(*input.StudioID, 10, 64)
+		newMovie.StudioID = sql.NullInt64{Int64: studioID, Valid: true}
+	}
+
+	if input.Director != nil {
+		newMovie.Director = sql.NullString{String: *input.Director, Valid: true}
+	}
+
+	if input.Synopsis != nil {
+		newMovie.Synopsis = sql.NullString{String: *input.Synopsis, Valid: true}
+	}
+
+	if input.URL != nil {
+		newMovie.URL = sql.NullString{String: *input.URL, Valid: true}
+	}
+
+	// Start the transaction and save the movie
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewMovieQueryBuilder()
+	movie, err := qb.Create(newMovie, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+
+	// update image table
+	if len(frontimageData) > 0 {
+		if err := qb.UpdateMovieImages(movie.ID, frontimageData, backimageData, tx); err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return movie, nil
+}
+
+func (r *mutationResolver) MovieUpdate(ctx context.Context, input models.MovieUpdateInput) (*models.Movie, error) {
+	// Populate movie from the input
+	movieID, _ := strconv.Atoi(input.ID)
+
+	updatedMovie := models.MoviePartial{
+		ID:        movieID,
+		UpdatedAt: &models.SQLiteTimestamp{Timestamp: time.Now()},
+	}
+	var frontimageData []byte
+	var err error
+	frontImageIncluded := wasFieldIncluded(ctx, "front_image")
+	if input.FrontImage != nil {
+		_, frontimageData, err = utils.ProcessBase64Image(*input.FrontImage)
+		if err != nil {
+			return nil, err
+		}
+	}
+	backImageIncluded := wasFieldIncluded(ctx, "back_image")
+	var backimageData []byte
+	if input.BackImage != nil {
+		_, backimageData, err = utils.ProcessBase64Image(*input.BackImage)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if input.Name != nil {
+		// generate checksum from movie name rather than image
+		checksum := utils.MD5FromString(*input.Name)
+		updatedMovie.Name = &sql.NullString{String: *input.Name, Valid: true}
+		updatedMovie.Checksum = &checksum
+	}
+
+	if input.Aliases != nil {
+		updatedMovie.Aliases = &sql.NullString{String: *input.Aliases, Valid: true}
+	}
+	if input.Duration != nil {
+		duration := int64(*input.Duration)
+		updatedMovie.Duration = &sql.NullInt64{Int64: duration, Valid: true}
+	}
+
+	if input.Date != nil {
+		updatedMovie.Date = &models.SQLiteDate{String: *input.Date, Valid: true}
+	}
+
+	if input.Rating != nil {
+		rating := int64(*input.Rating)
+		updatedMovie.Rating = &sql.NullInt64{Int64: rating, Valid: true}
+	} else {
+		// rating must be nullable
+		updatedMovie.Rating = &sql.NullInt64{Valid: false}
+	}
+
+	if input.StudioID != nil {
+		studioID, _ := strconv.ParseInt(*input.StudioID, 10, 64)
+		updatedMovie.StudioID = &sql.NullInt64{Int64: studioID, Valid: true}
+	} else {
+		// studio must be nullable
+		updatedMovie.StudioID = &sql.NullInt64{Valid: false}
+	}
+
+	if input.Director != nil {
+		updatedMovie.Director = &sql.NullString{String: *input.Director, Valid: true}
+	}
+
+	if input.Synopsis != nil {
+		updatedMovie.Synopsis = &sql.NullString{String: *input.Synopsis, Valid: true}
+	}
+
+	if input.URL != nil {
+		updatedMovie.URL = &sql.NullString{String: *input.URL, Valid: true}
+	}
+
+	// Start the transaction and save the movie
+	tx := database.DB.MustBeginTx(ctx, nil)
+	qb := models.NewMovieQueryBuilder()
+	movie, err := qb.Update(updatedMovie, tx)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+
+	// update image table
+	if frontImageIncluded || backImageIncluded {
+		if !frontImageIncluded {
+			frontimageData, err = qb.GetFrontImage(updatedMovie.ID, tx)
+			if err != nil {
+				tx.Rollback()
+				return nil, err
+			}
+		}
+		if !backImageIncluded {
+			backimageData, err = qb.GetBackImage(updatedMovie.ID, tx)
+			if err != nil {
+				tx.Rollback()
+				return nil, err
+			}
+		}
+
+		if len(frontimageData) == 0 && len(backimageData) == 0 {
+			// both images are being nulled. Destroy them.
+			if err := qb.DestroyMovieImages(movie.ID, tx); err != nil {
+				tx.Rollback()
+				return nil, err
+			}
+		} else {
+			// HACK - if front image is null and back image is not null, then set the front image
+			// to the default image since we can't have a null front image and a non-null back image
+			if frontimageData == nil && backimageData != nil {
+				_, frontimageData, _ = utils.ProcessBase64Image(models.DefaultMovieImage)
+			}
+
+			if err := qb.UpdateMovieImages(movie.ID, frontimageData, backimageData, tx); err != nil {
+				_ = tx.Rollback()
+				return nil, err
+			}
+		}
+	}
+
+	// Commit
+	if err := tx.Commit(); err != nil {
+		return nil, err
+	}
+
+	return movie, nil
+}
+
+func (r *mutationResolver) MovieDestroy(ctx context.Context, input models.MovieDestroyInput) (bool, error) {
+	qb := models.NewMovieQueryBuilder()
+	tx := database.DB.MustBeginTx(ctx, nil)
+	if err := qb.Destroy(input.ID, tx); err != nil {
+		_ = tx.Rollback()
+		return false, err
+	}
+	if err := tx.Commit(); err != nil {
+		return false, err
+	}
+	return true, nil
+}

pkg/api/resolver_mutation_performer.go

@@ -18,9 +18,7 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	var imageData []byte
 	var err error
 
-	if input.Image == nil {
-		imageData, err = getRandomPerformerImage()
-	} else {
+	if input.Image != nil {
 		_, imageData, err = utils.ProcessBase64Image(*input.Image)
 	}
 
@@ -31,7 +29,6 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	// Populate a new performer from the input
 	currentTime := time.Now()
 	newPerformer := models.Performer{
-		Image:     imageData,
 		Checksum:  checksum,
 		CreatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
@@ -42,6 +39,9 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	if input.URL != nil {
 		newPerformer.URL = sql.NullString{String: *input.URL, Valid: true}
 	}
+	if input.Gender != nil {
+		newPerformer.Gender = sql.NullString{String: input.Gender.String(), Valid: true}
+	}
 	if input.Birthdate != nil {
 		newPerformer.Birthdate = models.SQLiteDate{String: *input.Birthdate, Valid: true}
 	}
@@ -96,6 +96,14 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdatePerformerImage(performer.ID, imageData, tx); err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err
@@ -111,12 +119,14 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 		ID:        performerID,
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: time.Now()},
 	}
+	var imageData []byte
+	var err error
+	imageIncluded := wasFieldIncluded(ctx, "image")
 	if input.Image != nil {
-		_, imageData, err := utils.ProcessBase64Image(*input.Image)
+		_, imageData, err = utils.ProcessBase64Image(*input.Image)
 		if err != nil {
 			return nil, err
 		}
-		updatedPerformer.Image = imageData
 	}
 	if input.Name != nil {
 		// generate checksum from performer name rather than image
@@ -128,6 +138,9 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	if input.URL != nil {
 		updatedPerformer.URL = sql.NullString{String: *input.URL, Valid: true}
 	}
+	if input.Gender != nil {
+		updatedPerformer.Gender = sql.NullString{String: input.Gender.String(), Valid: true}
+	}
 	if input.Birthdate != nil {
 		updatedPerformer.Birthdate = models.SQLiteDate{String: *input.Birthdate, Valid: true}
 	}
@@ -178,10 +191,24 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	qb := models.NewPerformerQueryBuilder()
 	performer, err := qb.Update(updatedPerformer, tx)
 	if err != nil {
-		_ = tx.Rollback()
+		tx.Rollback()
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdatePerformerImage(performer.ID, imageData, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	} else if imageIncluded {
+		// must be unsetting
+		if err := qb.DestroyPerformerImage(performer.ID, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err

pkg/api/resolver_mutation_plugin.go

@@ -0,0 +1,48 @@
+package api
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/stashapp/stash/pkg/logger"
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/manager/config"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/plugin/common"
+)
+
+func (r *mutationResolver) RunPluginTask(ctx context.Context, pluginID string, taskName string, args []*models.PluginArgInput) (string, error) {
+	currentUser := getCurrentUserID(ctx)
+
+	var cookie *http.Cookie
+	var err error
+	if currentUser != nil {
+		cookie, err = createSessionCookie(*currentUser)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	serverConnection := common.StashServerConnection{
+		Scheme:        "http",
+		Port:          config.GetPort(),
+		SessionCookie: cookie,
+		Dir:           config.GetConfigPath(),
+	}
+
+	if HasTLSConfig() {
+		serverConnection.Scheme = "https"
+	}
+
+	manager.GetInstance().RunPluginTask(pluginID, taskName, args, serverConnection)
+	return "todo", nil
+}
+
+func (r *mutationResolver) ReloadPlugins(ctx context.Context) (bool, error) {
+	err := manager.GetInstance().PluginCache.ReloadPlugins()
+	if err != nil {
+		logger.Errorf("Error reading plugin configs: %s", err.Error())
+	}
+
+	return true, nil
+}

pkg/api/resolver_mutation_scene.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/stashapp/stash/pkg/database"
 	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/manager/config"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/utils"
 )
@@ -80,13 +81,15 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 	if input.Date != nil {
 		updatedScene.Date = &models.SQLiteDate{String: *input.Date, Valid: true}
 	}
+
 	if input.CoverImage != nil && *input.CoverImage != "" {
 		var err error
 		_, coverImageData, err = utils.ProcessBase64Image(*input.CoverImage)
 		if err != nil {
 			return nil, err
 		}
-		updatedScene.Cover = &coverImageData
+
+		// update the cover after updating the scene
 	}
 
 	if input.Rating != nil {
@@ -111,6 +114,13 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 		return nil, err
 	}
 
+	// update cover table
+	if len(coverImageData) > 0 {
+		if err := qb.UpdateSceneCover(sceneID, coverImageData, tx); err != nil {
+			return nil, err
+		}
+	}
+
 	// Clear the existing gallery value
 	gqb := models.NewGalleryQueryBuilder()
 	err = gqb.ClearGalleryId(sceneID, tx)
@@ -147,6 +157,31 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 		return nil, err
 	}
 
+	// Save the movies
+	var movieJoins []models.MoviesScenes
+
+	for _, movie := range input.Movies {
+
+		movieID, _ := strconv.Atoi(movie.MovieID)
+
+		movieJoin := models.MoviesScenes{
+			MovieID: movieID,
+			SceneID: sceneID,
+		}
+
+		if movie.SceneIndex != nil {
+			movieJoin.SceneIndex = sql.NullInt64{
+				Int64: int64(*movie.SceneIndex),
+				Valid: true,
+			}
+		}
+
+		movieJoins = append(movieJoins, movieJoin)
+	}
+	if err := jqb.UpdateMoviesScenes(sceneID, movieJoins, tx); err != nil {
+		return nil, err
+	}
+
 	// Save the tags
 	var tagJoins []models.ScenesTags
 	for _, tid := range input.TagIds {
@@ -163,12 +198,7 @@ func (r *mutationResolver) sceneUpdate(input models.SceneUpdateInput, tx *sqlx.T
 
 	// only update the cover image if provided and everything else was successful
 	if coverImageData != nil {
-		scene, err := qb.Find(sceneID)
-		if err != nil {
-			return nil, err
-		}
-
-		err = manager.SetSceneScreenshot(scene.Checksum, coverImageData)
+		err = manager.SetSceneScreenshot(scene.GetHash(config.GetVideoFileNamingAlgorithm()), coverImageData)
 		if err != nil {
 			return nil, err
 		}
@@ -251,9 +281,14 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 
 		// Save the performers
 		if wasFieldIncluded(ctx, "performer_ids") {
+			performerIDs, err := adjustScenePerformerIDs(tx, sceneID, *input.PerformerIds)
+			if err != nil {
+				_ = tx.Rollback()
+				return nil, err
+			}
+
 			var performerJoins []models.PerformersScenes
-			for _, pid := range input.PerformerIds {
-				performerID, _ := strconv.Atoi(pid)
+			for _, performerID := range performerIDs {
 				performerJoin := models.PerformersScenes{
 					PerformerID: performerID,
 					SceneID:     sceneID,
@@ -268,9 +303,14 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 
 		// Save the tags
 		if wasFieldIncluded(ctx, "tag_ids") {
+			tagIDs, err := adjustSceneTagIDs(tx, sceneID, *input.TagIds)
+			if err != nil {
+				_ = tx.Rollback()
+				return nil, err
+			}
+
 			var tagJoins []models.ScenesTags
-			for _, tid := range input.TagIds {
-				tagID, _ := strconv.Atoi(tid)
+			for _, tagID := range tagIDs {
 				tagJoin := models.ScenesTags{
 					SceneID: sceneID,
 					TagID:   tagID,
@@ -292,6 +332,72 @@ func (r *mutationResolver) BulkSceneUpdate(ctx context.Context, input models.Bul
 	return ret, nil
 }
 
+func adjustIDs(existingIDs []int, updateIDs models.BulkUpdateIds) []int {
+	for _, idStr := range updateIDs.Ids {
+		id, _ := strconv.Atoi(idStr)
+
+		// look for the id in the list
+		foundExisting := false
+		for idx, existingID := range existingIDs {
+			if existingID == id {
+				if updateIDs.Mode == models.BulkUpdateIDModeRemove {
+					// remove from the list
+					existingIDs = append(existingIDs[:idx], existingIDs[idx+1:]...)
+				}
+
+				foundExisting = true
+				break
+			}
+		}
+
+		if !foundExisting && updateIDs.Mode != models.BulkUpdateIDModeRemove {
+			existingIDs = append(existingIDs, id)
+		}
+	}
+
+	return existingIDs
+}
+
+func adjustScenePerformerIDs(tx *sqlx.Tx, sceneID int, ids models.BulkUpdateIds) ([]int, error) {
+	var ret []int
+
+	jqb := models.NewJoinsQueryBuilder()
+	if ids.Mode == models.BulkUpdateIDModeAdd || ids.Mode == models.BulkUpdateIDModeRemove {
+		// adding to the joins
+		performerJoins, err := jqb.GetScenePerformers(sceneID, tx)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, join := range performerJoins {
+			ret = append(ret, join.PerformerID)
+		}
+	}
+
+	return adjustIDs(ret, ids), nil
+}
+
+func adjustSceneTagIDs(tx *sqlx.Tx, sceneID int, ids models.BulkUpdateIds) ([]int, error) {
+	var ret []int
+
+	jqb := models.NewJoinsQueryBuilder()
+	if ids.Mode == models.BulkUpdateIDModeAdd || ids.Mode == models.BulkUpdateIDModeRemove {
+		// adding to the joins
+		tagJoins, err := jqb.GetSceneTags(sceneID, tx)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, join := range tagJoins {
+			ret = append(ret, join.TagID)
+		}
+	}
+
+	return adjustIDs(ret, ids), nil
+}
+
 func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneDestroyInput) (bool, error) {
 	qb := models.NewSceneQueryBuilder()
 	tx := database.DB.MustBeginTx(ctx, nil)
@@ -312,7 +418,7 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 	// if delete generated is true, then delete the generated files
 	// for the scene
 	if input.DeleteGenerated != nil && *input.DeleteGenerated {
-		manager.DeleteGeneratedSceneFiles(scene)
+		manager.DeleteGeneratedSceneFiles(scene, config.GetVideoFileNamingAlgorithm())
 	}
 
 	// if delete file is true, then delete the file as well
@@ -324,6 +430,48 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 	return true, nil
 }
 
+func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.ScenesDestroyInput) (bool, error) {
+	qb := models.NewSceneQueryBuilder()
+	tx := database.DB.MustBeginTx(ctx, nil)
+
+	var scenes []*models.Scene
+	for _, id := range input.Ids {
+		sceneID, _ := strconv.Atoi(id)
+
+		scene, err := qb.Find(sceneID)
+		if scene != nil {
+			scenes = append(scenes, scene)
+		}
+		err = manager.DestroyScene(sceneID, tx)
+
+		if err != nil {
+			tx.Rollback()
+			return false, err
+		}
+	}
+
+	if err := tx.Commit(); err != nil {
+		return false, err
+	}
+
+	fileNamingAlgo := config.GetVideoFileNamingAlgorithm()
+	for _, scene := range scenes {
+		// if delete generated is true, then delete the generated files
+		// for the scene
+		if input.DeleteGenerated != nil && *input.DeleteGenerated {
+			manager.DeleteGeneratedSceneFiles(scene, fileNamingAlgo)
+		}
+
+		// if delete file is true, then delete the file as well
+		// if it fails, just log a message
+		if input.DeleteFile != nil && *input.DeleteFile {
+			manager.DeleteSceneFile(scene)
+		}
+	}
+
+	return true, nil
+}
+
 func (r *mutationResolver) SceneMarkerCreate(ctx context.Context, input models.SceneMarkerCreateInput) (*models.SceneMarker, error) {
 	primaryTagID, _ := strconv.Atoi(input.PrimaryTagID)
 	sceneID, _ := strconv.Atoi(input.SceneID)
@@ -360,6 +508,14 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input models.S
 func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (bool, error) {
 	qb := models.NewSceneMarkerQueryBuilder()
 	tx := database.DB.MustBeginTx(ctx, nil)
+
+	markerID, _ := strconv.Atoi(id)
+	marker, err := qb.Find(markerID)
+
+	if err != nil {
+		return false, err
+	}
+
 	if err := qb.Destroy(id, tx); err != nil {
 		_ = tx.Rollback()
 		return false, err
@@ -367,6 +523,16 @@ func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (b
 	if err := tx.Commit(); err != nil {
 		return false, err
 	}
+
+	// delete the preview for the marker
+	sqb := models.NewSceneQueryBuilder()
+	scene, _ := sqb.Find(int(marker.SceneID.Int64))
+
+	if scene != nil {
+		seconds := int(marker.Seconds)
+		manager.DeleteSceneMarkerFiles(scene, seconds, config.GetVideoFileNamingAlgorithm())
+	}
+
 	return true, nil
 }
 
@@ -376,13 +542,18 @@ func changeMarker(ctx context.Context, changeType int, changedMarker models.Scen
 	qb := models.NewSceneMarkerQueryBuilder()
 	jqb := models.NewJoinsQueryBuilder()
 
+	var existingMarker *models.SceneMarker
 	var sceneMarker *models.SceneMarker
 	var err error
 	switch changeType {
 	case create:
 		sceneMarker, err = qb.Create(changedMarker, tx)
 	case update:
-		sceneMarker, err = qb.Update(changedMarker, tx)
+		// check to see if timestamp was changed
+		existingMarker, err = qb.Find(changedMarker.ID)
+		if err == nil {
+			sceneMarker, err = qb.Update(changedMarker, tx)
+		}
 	}
 	if err != nil {
 		_ = tx.Rollback()
@@ -420,6 +591,18 @@ func changeMarker(ctx context.Context, changeType int, changedMarker models.Scen
 		return nil, err
 	}
 
+	// remove the marker preview if the timestamp was changed
+	if existingMarker != nil && existingMarker.Seconds != changedMarker.Seconds {
+		sqb := models.NewSceneQueryBuilder()
+
+		scene, _ := sqb.Find(int(existingMarker.SceneID.Int64))
+
+		if scene != nil {
+			seconds := int(existingMarker.Seconds)
+			manager.DeleteSceneMarkerFiles(scene, seconds, config.GetVideoFileNamingAlgorithm())
+		}
+	}
+
 	return sceneMarker, nil
 }
 
@@ -482,3 +665,13 @@ func (r *mutationResolver) SceneResetO(ctx context.Context, id string) (int, err
 
 	return newVal, nil
 }
+
+func (r *mutationResolver) SceneGenerateScreenshot(ctx context.Context, id string, at *float64) (string, error) {
+	if at != nil {
+		manager.GetInstance().GenerateScreenshot(id, *at)
+	} else {
+		manager.GetInstance().GenerateDefaultScreenshot(id)
+	}
+
+	return "todo", nil
+}

pkg/api/resolver_mutation_scraper.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/manager"
+)
+
+func (r *mutationResolver) ReloadScrapers(ctx context.Context) (bool, error) {
+	err := manager.GetInstance().ScraperCache.ReloadScrapers()
+
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}

pkg/api/resolver_mutation_studio.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/manager"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/utils"
 )
@@ -31,7 +32,6 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	// Populate a new studio from the input
 	currentTime := time.Now()
 	newStudio := models.Studio{
-		Image:     imageData,
 		Checksum:  checksum,
 		Name:      sql.NullString{String: input.Name, Valid: true},
 		CreatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
@@ -40,6 +40,10 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	if input.URL != nil {
 		newStudio.URL = sql.NullString{String: *input.URL, Valid: true}
 	}
+	if input.ParentID != nil {
+		parentID, _ := strconv.ParseInt(*input.ParentID, 10, 64)
+		newStudio.ParentID = sql.NullInt64{Int64: parentID, Valid: true}
+	}
 
 	// Start the transaction and save the studio
 	tx := database.DB.MustBeginTx(ctx, nil)
@@ -50,6 +54,14 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdateStudioImage(studio.ID, imageData, tx); err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err
@@ -61,36 +73,68 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.StudioUpdateInput) (*models.Studio, error) {
 	// Populate studio from the input
 	studioID, _ := strconv.Atoi(input.ID)
-	updatedStudio := models.Studio{
+
+	updatedStudio := models.StudioPartial{
 		ID:        studioID,
-		UpdatedAt: models.SQLiteTimestamp{Timestamp: time.Now()},
+		UpdatedAt: &models.SQLiteTimestamp{Timestamp: time.Now()},
 	}
+
+	var imageData []byte
+	imageIncluded := wasFieldIncluded(ctx, "image")
 	if input.Image != nil {
-		_, imageData, err := utils.ProcessBase64Image(*input.Image)
+		var err error
+		_, imageData, err = utils.ProcessBase64Image(*input.Image)
 		if err != nil {
 			return nil, err
 		}
-		updatedStudio.Image = imageData
 	}
 	if input.Name != nil {
 		// generate checksum from studio name rather than image
 		checksum := utils.MD5FromString(*input.Name)
-		updatedStudio.Name = sql.NullString{String: *input.Name, Valid: true}
-		updatedStudio.Checksum = checksum
+		updatedStudio.Name = &sql.NullString{String: *input.Name, Valid: true}
+		updatedStudio.Checksum = &checksum
 	}
 	if input.URL != nil {
-		updatedStudio.URL = sql.NullString{String: *input.URL, Valid: true}
+		updatedStudio.URL = &sql.NullString{String: *input.URL, Valid: true}
+	}
+
+	if input.ParentID != nil {
+		parentID, _ := strconv.ParseInt(*input.ParentID, 10, 64)
+		updatedStudio.ParentID = &sql.NullInt64{Int64: parentID, Valid: true}
+	} else {
+		// parent studio must be nullable
+		updatedStudio.ParentID = &sql.NullInt64{Valid: false}
 	}
 
 	// Start the transaction and save the studio
 	tx := database.DB.MustBeginTx(ctx, nil)
 	qb := models.NewStudioQueryBuilder()
+
+	if err := manager.ValidateModifyStudio(updatedStudio, tx); err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+
 	studio, err := qb.Update(updatedStudio, tx)
 	if err != nil {
-		_ = tx.Rollback()
+		tx.Rollback()
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdateStudioImage(studio.ID, imageData, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	} else if imageIncluded {
+		// must be unsetting
+		if err := qb.DestroyStudioImage(studio.ID, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err

pkg/api/resolver_mutation_tag.go

@@ -2,10 +2,14 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/pkg/database"
-	"github.com/stashapp/stash/pkg/models"
+	"fmt"
 	"strconv"
 	"time"
+
+	"github.com/stashapp/stash/pkg/database"
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 func (r *mutationResolver) TagCreate(ctx context.Context, input models.TagCreateInput) (*models.Tag, error) {
@@ -17,15 +21,41 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input models.TagCreate
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: currentTime},
 	}
 
-	// Start the transaction and save the studio
+	var imageData []byte
+	var err error
+
+	if input.Image != nil {
+		_, imageData, err = utils.ProcessBase64Image(*input.Image)
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Start the transaction and save the tag
 	tx := database.DB.MustBeginTx(ctx, nil)
 	qb := models.NewTagQueryBuilder()
+
+	// ensure name is unique
+	if err := manager.EnsureTagNameUnique(newTag, tx); err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+
 	tag, err := qb.Create(newTag, tx)
 	if err != nil {
-		_ = tx.Rollback()
+		tx.Rollback()
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdateTagImage(tag.ID, imageData, tx); err != nil {
+			_ = tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err
@@ -43,15 +73,61 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input models.TagUpdate
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: time.Now()},
 	}
 
+	var imageData []byte
+	var err error
+
+	imageIncluded := wasFieldIncluded(ctx, "image")
+	if input.Image != nil {
+		_, imageData, err = utils.ProcessBase64Image(*input.Image)
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	// Start the transaction and save the tag
 	tx := database.DB.MustBeginTx(ctx, nil)
 	qb := models.NewTagQueryBuilder()
+
+	// ensure name is unique
+	existing, err := qb.Find(tagID, tx)
+	if err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+
+	if existing == nil {
+		tx.Rollback()
+		return nil, fmt.Errorf("Tag with ID %d not found", tagID)
+	}
+
+	if existing.Name != updatedTag.Name {
+		if err := manager.EnsureTagNameUnique(updatedTag, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	}
+
 	tag, err := qb.Update(updatedTag, tx)
 	if err != nil {
 		_ = tx.Rollback()
 		return nil, err
 	}
 
+	// update image table
+	if len(imageData) > 0 {
+		if err := qb.UpdateTagImage(tag.ID, imageData, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	} else if imageIncluded {
+		// must be unsetting
+		if err := qb.DestroyTagImage(tag.ID, tx); err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+	}
+
 	// Commit
 	if err := tx.Commit(); err != nil {
 		return nil, err

pkg/api/resolver_query_configuration.go

@@ -12,12 +12,18 @@ func (r *queryResolver) Configuration(ctx context.Context) (*models.ConfigResult
 	return makeConfigResult(), nil
 }
 
-func (r *queryResolver) Directories(ctx context.Context, path *string) ([]string, error) {
+func (r *queryResolver) Directory(ctx context.Context, path *string) (*models.Directory, error) {
 	var dirPath = ""
 	if path != nil {
 		dirPath = *path
 	}
-	return utils.ListDir(dirPath), nil
+	currentDir := utils.GetDir(dirPath)
+
+	return &models.Directory{
+		Path:        currentDir,
+		Parent:      utils.GetParent(currentDir),
+		Directories: utils.ListDir(currentDir),
+	}, nil
 }
 
 func makeConfigResult() *models.ConfigResult {
@@ -33,38 +39,56 @@ func makeConfigGeneralResult() *models.ConfigGeneralResult {
 	maxTranscodeSize := config.GetMaxTranscodeSize()
 	maxStreamingTranscodeSize := config.GetMaxStreamingTranscodeSize()
 
+	scraperUserAgent := config.GetScraperUserAgent()
+	scraperCDPPath := config.GetScraperCDPPath()
+
 	return &models.ConfigGeneralResult{
 		Stashes:                   config.GetStashPaths(),
 		DatabasePath:              config.GetDatabasePath(),
 		GeneratedPath:             config.GetGeneratedPath(),
+		CachePath:                 config.GetCachePath(),
+		CalculateMd5:              config.IsCalculateMD5(),
+		VideoFileNamingAlgorithm:  config.GetVideoFileNamingAlgorithm(),
+		PreviewSegments:           config.GetPreviewSegments(),
+		PreviewSegmentDuration:    config.GetPreviewSegmentDuration(),
+		PreviewExcludeStart:       config.GetPreviewExcludeStart(),
+		PreviewExcludeEnd:         config.GetPreviewExcludeEnd(),
+		PreviewPreset:             config.GetPreviewPreset(),
 		MaxTranscodeSize:          &maxTranscodeSize,
 		MaxStreamingTranscodeSize: &maxStreamingTranscodeSize,
 		Username:                  config.GetUsername(),
 		Password:                  config.GetPasswordHash(),
+		MaxSessionAge:             config.GetMaxSessionAge(),
 		LogFile:                   &logFile,
 		LogOut:                    config.GetLogOut(),
 		LogLevel:                  config.GetLogLevel(),
 		LogAccess:                 config.GetLogAccess(),
 		Excludes:                  config.GetExcludes(),
+		ScraperUserAgent:          &scraperUserAgent,
+		ScraperCDPPath:            &scraperCDPPath,
 	}
 }
 
 func makeConfigInterfaceResult() *models.ConfigInterfaceResult {
 	soundOnPreview := config.GetSoundOnPreview()
 	wallShowTitle := config.GetWallShowTitle()
+	wallPlayback := config.GetWallPlayback()
 	maximumLoopDuration := config.GetMaximumLoopDuration()
 	autostartVideo := config.GetAutostartVideo()
 	showStudioAsText := config.GetShowStudioAsText()
 	css := config.GetCSS()
 	cssEnabled := config.GetCSSEnabled()
+	language := config.GetLanguage()
 
 	return &models.ConfigInterfaceResult{
 		SoundOnPreview:      &soundOnPreview,
 		WallShowTitle:       &wallShowTitle,
+		WallPlayback:        &wallPlayback,
 		MaximumLoopDuration: &maximumLoopDuration,
 		AutostartVideo:      &autostartVideo,
 		ShowStudioAsText:    &showStudioAsText,
 		CSS:                 &css,
 		CSSEnabled:          &cssEnabled,
+		Language:            &language,
 	}
 }

pkg/api/resolver_query_find_gallery.go

@@ -2,8 +2,9 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/pkg/models"
 	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
 )
 
 func (r *queryResolver) FindGallery(ctx context.Context, id string) (*models.Gallery, error) {
@@ -12,9 +13,9 @@ func (r *queryResolver) FindGallery(ctx context.Context, id string) (*models.Gal
 	return qb.Find(idInt)
 }
 
-func (r *queryResolver) FindGalleries(ctx context.Context, filter *models.FindFilterType) (*models.FindGalleriesResultType, error) {
+func (r *queryResolver) FindGalleries(ctx context.Context, galleryFilter *models.GalleryFilterType, filter *models.FindFilterType) (*models.FindGalleriesResultType, error) {
 	qb := models.NewGalleryQueryBuilder()
-	galleries, total := qb.Query(filter)
+	galleries, total := qb.Query(galleryFilter, filter)
 	return &models.FindGalleriesResultType{
 		Count:     total,
 		Galleries: galleries,

pkg/api/resolver_query_find_movie.go

@@ -0,0 +1,33 @@
+package api
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *queryResolver) FindMovie(ctx context.Context, id string) (*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	idInt, _ := strconv.Atoi(id)
+	return qb.Find(idInt, nil)
+}
+
+func (r *queryResolver) FindMovies(ctx context.Context, movieFilter *models.MovieFilterType, filter *models.FindFilterType) (*models.FindMoviesResultType, error) {
+	qb := models.NewMovieQueryBuilder()
+	movies, total := qb.Query(movieFilter, filter)
+	return &models.FindMoviesResultType{
+		Count:  total,
+		Movies: movies,
+	}, nil
+}
+
+func (r *queryResolver) AllMovies(ctx context.Context) ([]*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	return qb.All()
+}
+
+func (r *queryResolver) AllMoviesSlim(ctx context.Context) ([]*models.Movie, error) {
+	qb := models.NewMovieQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_performer.go

@@ -25,3 +25,8 @@ func (r *queryResolver) AllPerformers(ctx context.Context) ([]*models.Performer,
 	qb := models.NewPerformerQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllPerformersSlim(ctx context.Context) ([]*models.Performer, error) {
+	qb := models.NewPerformerQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_scene.go

@@ -21,6 +21,28 @@ func (r *queryResolver) FindScene(ctx context.Context, id *string, checksum *str
 	return scene, err
 }
 
+func (r *queryResolver) FindSceneByHash(ctx context.Context, input models.SceneHashInput) (*models.Scene, error) {
+	qb := models.NewSceneQueryBuilder()
+	var scene *models.Scene
+	var err error
+
+	if input.Checksum != nil {
+		scene, err = qb.FindByChecksum(*input.Checksum)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if scene == nil && input.Oshash != nil {
+		scene, err = qb.FindByOSHash(*input.Oshash)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return scene, err
+}
+
 func (r *queryResolver) FindScenes(ctx context.Context, sceneFilter *models.SceneFilterType, sceneIds []int, filter *models.FindFilterType) (*models.FindScenesResultType, error) {
 	qb := models.NewSceneQueryBuilder()
 	scenes, total := qb.Query(sceneFilter, filter)

pkg/api/resolver_query_find_studio.go

@@ -12,9 +12,9 @@ func (r *queryResolver) FindStudio(ctx context.Context, id string) (*models.Stud
 	return qb.Find(idInt, nil)
 }
 
-func (r *queryResolver) FindStudios(ctx context.Context, filter *models.FindFilterType) (*models.FindStudiosResultType, error) {
+func (r *queryResolver) FindStudios(ctx context.Context, studioFilter *models.StudioFilterType, filter *models.FindFilterType) (*models.FindStudiosResultType, error) {
 	qb := models.NewStudioQueryBuilder()
-	studios, total := qb.Query(filter)
+	studios, total := qb.Query(studioFilter, filter)
 	return &models.FindStudiosResultType{
 		Count:   total,
 		Studios: studios,
@@ -25,3 +25,8 @@ func (r *queryResolver) AllStudios(ctx context.Context) ([]*models.Studio, error
 	qb := models.NewStudioQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllStudiosSlim(ctx context.Context) ([]*models.Studio, error) {
+	qb := models.NewStudioQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_find_tag.go

@@ -2,8 +2,9 @@ package api
 
 import (
 	"context"
-	"github.com/stashapp/stash/pkg/models"
 	"strconv"
+
+	"github.com/stashapp/stash/pkg/models"
 )
 
 func (r *queryResolver) FindTag(ctx context.Context, id string) (*models.Tag, error) {
@@ -12,7 +13,21 @@ func (r *queryResolver) FindTag(ctx context.Context, id string) (*models.Tag, er
 	return qb.Find(idInt, nil)
 }
 
+func (r *queryResolver) FindTags(ctx context.Context, tagFilter *models.TagFilterType, filter *models.FindFilterType) (*models.FindTagsResultType, error) {
+	qb := models.NewTagQueryBuilder()
+	tags, total := qb.Query(tagFilter, filter)
+	return &models.FindTagsResultType{
+		Count: total,
+		Tags:  tags,
+	}, nil
+}
+
 func (r *queryResolver) AllTags(ctx context.Context) ([]*models.Tag, error) {
 	qb := models.NewTagQueryBuilder()
 	return qb.All()
 }
+
+func (r *queryResolver) AllTagsSlim(ctx context.Context) ([]*models.Tag, error) {
+	qb := models.NewTagQueryBuilder()
+	return qb.AllSlim()
+}

pkg/api/resolver_query_metadata.go

@@ -7,36 +7,6 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 )
 
-func (r *queryResolver) MetadataScan(ctx context.Context, input models.ScanMetadataInput) (string, error) {
-	manager.GetInstance().Scan(input.UseFileMetadata)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataImport(ctx context.Context) (string, error) {
-	manager.GetInstance().Import()
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataExport(ctx context.Context) (string, error) {
-	manager.GetInstance().Export()
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataGenerate(ctx context.Context, input models.GenerateMetadataInput) (string, error) {
-	manager.GetInstance().Generate(input.Sprites, input.Previews, input.Markers, input.Transcodes)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataAutoTag(ctx context.Context, input models.AutoTagMetadataInput) (string, error) {
-	manager.GetInstance().AutoTag(input.Performers, input.Studios, input.Tags)
-	return "todo", nil
-}
-
-func (r *queryResolver) MetadataClean(ctx context.Context) (string, error) {
-	manager.GetInstance().Clean()
-	return "todo", nil
-}
-
 func (r *queryResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateStatus, error) {
 	status := manager.GetInstance().Status
 	ret := models.MetadataUpdateStatus{
@@ -47,7 +17,3 @@ func (r *queryResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateSt
 
 	return &ret, nil
 }
-
-func (r *queryResolver) StopJob(ctx context.Context) (bool, error) {
-	return manager.GetInstance().Status.Stop(), nil
-}

pkg/api/resolver_query_plugin.go

@@ -0,0 +1,16 @@
+package api
+
+import (
+	"context"
+
+	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/models"
+)
+
+func (r *queryResolver) Plugins(ctx context.Context) ([]*models.Plugin, error) {
+	return manager.GetInstance().PluginCache.ListPlugins(), nil
+}
+
+func (r *queryResolver) PluginTasks(ctx context.Context) ([]*models.PluginTask, error) {
+	return manager.GetInstance().PluginCache.ListPluginTasks(), nil
+}