temp

.dockerignore

@@ -1,63 +0,0 @@
-####
-# Go
-####
-
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# 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,6 +1,2 @@
 go.mod text eol=lf
-go.sum text eol=lf
-*.go text eol=lf
-vendor/** -text
-ui/v2.5/**/*.ts* text eol=lf
-ui/v2.5/**/*.scss text eol=lf
+go.sum text eol=lf

.github/FUNDING.yml

@@ -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,8 +23,6 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem please ensure that your screenshots are SFW or at least appropriately censored.
 
-**Stash Version: (from Settings -> About):**
-
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]

.github/PULL_REQUEST_TEMPLATE/BugFix.md

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

.github/PULL_REQUEST_TEMPLATE/Feature.md

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

.github/workflows/build.yml

@@ -1,144 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ develop, master ]
-  pull_request:
-    branches: [ develop ]
-  release:
-    types: [ published ]
-
-env:
-  COMPILER_IMAGE: stashapp/compiler:4
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Checkout
-      run: git fetch --prune --unshallow --tags
-
-    - name: Pull compiler image
-      run: docker pull $COMPILER_IMAGE
-
-    - name: Cache node modules
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-node_modules
-      with:
-        path: ui/v2.5/node_modules
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
-
-    - name: Pre-install
-      run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make pre-ui"
-
-    - name: Generate
-      run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make generate"
-    
-    # TODO: Replace with `make validate` once `revive` is bundled in COMPILER_IMAGE
-    - name: Validate
-      run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make ui-validate fmt-check vet it"
-
-    - name: Build UI
-      run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make ui-only"
-
-    - name: Compile for all supported platforms
-      run: ./scripts/cross-compile.sh
-
-    - name: Generate checksums
-      run: |
-        git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-        sha1sum dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
-        echo "STASH_VERSION=$(git describe --tags --exclude latest_develop)" >> $GITHUB_ENV
-        echo "RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S %Z')" >> $GITHUB_ENV
-    
-    - name: Upload Windows binary
-      # only upload binaries for pull requests
-      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
-      with:
-        name: stash-win.exe
-        path: dist/stash-win.exe
-
-    - name: Upload OSX binary
-      # only upload binaries for pull requests
-      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
-      with:
-        name: stash-osx
-        path: dist/stash-osx
-
-    - name: Upload Linux binary
-      # only upload binaries for pull requests
-      if: ${{ github.event_name == 'pull_request' && github.base_ref != 'refs/heads/develop' && github.base_ref != 'refs/heads/master'}}
-      uses: actions/upload-artifact@v2
-      with:
-        name: stash-linux
-        path: dist/stash-linux
-        
-    - name: Update latest_develop tag
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      run : git tag -f latest_develop; git push -f --tags
-
-    - name: Development Release
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}      
-      uses: marvinpinto/action-automatic-releases@v1.1.2
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: true
-        automatic_release_tag: latest_develop
-        title: "${{ env.STASH_VERSION }}: Latest development build"
-        files: |
-          dist/stash-osx
-          dist/stash-win.exe
-          dist/stash-linux
-          dist/stash-linux-arm64v8
-          dist/stash-linux-arm32v7
-          dist/stash-pi
-          CHECKSUMS_SHA1
-        
-    - name: Master release
-      if: ${{ github.event_name == 'release' && github.ref != 'refs/tags/latest_develop' }}
-      uses: meeDamian/github-release@2.0
-      with:
-        token: "${{ secrets.GITHUB_TOKEN }}"
-        allow_override: true
-        files: |
-          dist/stash-osx
-          dist/stash-win.exe
-          dist/stash-linux
-          dist/stash-linux-arm64v8
-          dist/stash-linux-arm32v7
-          dist/stash-pi
-          CHECKSUMS_SHA1
-        gzip: false
-    
-    - name: Development Docker
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64  
-        docker info
-        docker buildx create --name builder --use
-        docker buildx inspect --bootstrap
-        docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh development
-
-    - name: Release Docker
-      if: ${{ github.event_name == 'release' && github.ref != 'refs/tags/latest_develop' }}
-      env:
-        DOCKER_CLI_EXPERIMENTAL: enabled
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      run: |
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64  
-        docker info
-        docker buildx create --name builder --use
-        docker buildx inspect --bootstrap
-        docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh latest

.gitignore

@@ -20,7 +20,7 @@
 
 # GraphQL generated output
 pkg/models/generated_*.go
-ui/v2.5/src/core/generated-*.tsx
+ui/v2/src/core/generated-*.tsx
 
 # packr generated files
 *-packr.go
@@ -35,7 +35,6 @@ ui/v2.5/src/core/generated-*.tsx
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-.vscode
 
 # Generated files
 .idea/**/contentModel.xml
@@ -49,9 +48,6 @@ ui/v2.5/src/core/generated-*.tsx
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 
-# Goland Junk
-pkg/pkg
-
 ####
 # Random
 ####
@@ -62,4 +58,3 @@ node_modules
 
 stash
 dist
-.DS_Store

.gqlgenc.yml

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

.idea/go.iml

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

.travis.yml

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

.travis.yml.disabled

@@ -1,118 +0,0 @@
-if: tag != latest_develop # dont build for the latest_develop tagged version
-
-dist: xenial
-git:
-  depth: false
-language: go
-go:
-- 1.13.x
-services:
-- docker
-env:
-  global:
-  - GO111MODULE=on
-before_install:
-  - set -e
-  # Configure environment so changes are picked up when the Docker daemon is restarted after upgrading
-  - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
-  - export DOCKER_CLI_EXPERIMENTAL=enabled
-  # Upgrade to Docker CE 19.03 for BuildKit support
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  # install binfmt docker container, this container uses qemu to run arm programs transparently allowng docker to build arm 6,7,8 containers.
-  - docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-  # Show info to simplify debugging and create a builder that can build the platforms we need
-  - docker info
-  - docker buildx create --name builder --use
-  - docker buildx inspect --bootstrap
-  - docker buildx ls
-
-install:
-- echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
-- nvm install 12
-- travis_retry make pre-ui
-- make generate
-- 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 fmt-check vet it
-after_success:
-- docker pull stashapp/compiler:4
-- sh ./scripts/cross-compile.sh
-- git describe --tags --exclude latest_develop | tee CHECKSUMS_SHA1
-- sha1sum dist/stash-* | sed 's/dist\///g' | tee -a CHECKSUMS_SHA1
-- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
-before_deploy:
-# 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:
-  # 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
-      - CHECKSUMS_SHA1
-    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
-    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
-      - CHECKSUMS_SHA1
-    # 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

LICENSE

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

Makefile

@@ -1,55 +1,14 @@
-IS_WIN =
-ifeq (${SHELL}, sh.exe)
-  IS_WIN = true
-endif
-ifeq (${SHELL}, cmd)
-  IS_WIN = true
-endif
-
-ifdef IS_WIN
+ifeq ($(OS),Windows_NT)
   SEPARATOR := &&
   SET := set
-else 
-  SEPARATOR := ;
-  SET := export
 endif
 
-# set LDFLAGS environment variable to any extra ldflags required
-# set OUTPUT to generate a specific binary name
+release: generate ui build
 
-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
+build:
+	$(eval DATE := $(shell go run scripts/getDate.go))
 	$(eval GITHASH := $(shell git rev-parse --short HEAD))
-endif
-
-ifndef STASH_VERSION
-	$(eval STASH_VERSION := $(shell git describe --tags --exclude latest_develop))
-endif
-
-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 -tags "sqlite_omit_load_extension osusergo netgo" -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
-
-build-release-static: EXTRA_LDFLAGS := -extldflags=-static -s -w
-build-release-static: build
+	$(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)'"
 
 install:
 	packr2 install
@@ -61,23 +20,13 @@ clean:
 .PHONY: generate
 generate:
 	go generate -mod=vendor
-	cd ui/v2.5 && yarn run gqlgen
-
-# Regenerates stash-box client files
-.PHONY: generate-stash-box-client
-generate-stash-box-client:
-	go run -mod=vendor github.com/Yamashou/gqlgenc
+	cd ui/v2 && yarn run gqlgen
 
 # Runs gofmt -w on the project's source code, modifying any files that do not match its style.
 .PHONY: fmt
 fmt:
 	go fmt ./...
 
-# 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:
@@ -97,50 +46,7 @@ test:
 it:
 	go test -mod=vendor -tags=integration ./...
 
-# generates test mocks
-.PHONY: generate-test-mocks
-generate-test-mocks:
-	go run -mod=vendor github.com/vektra/mockery/v2 --dir ./pkg/models --name '.*ReaderWriter' --outpkg mocks --output ./pkg/models/mocks
-
-# 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: ui-only
+ui:
+	cd ui/v2 && yarn build
 	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,63 +4,43 @@
 [![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.**
 
-**Stash is a locally hosted web-based app written in Go which organizes and serves your porn.**
+See a demo [here](https://vimeo.com/275537038) (password is stashapp).
 
-* It can gather information about videos in your collection from the internet, and is extensible through the use of community-built plugins for a large number of content producers.
-* It supports a wide variety of both video and image formats.
-* You can tag videos and find them later.
-* It provides statistics about performers, tags, studios and other things.
-
-You can [watch a SFW demo video](https://vimeo.com/545323354) to see it in action.
-
-For further information you can [read the in-app manual](ui/v2.5/src/docs/en).
-
-# Installing stash
-
-## via Docker
+# Docker install
 
 Follow [this README.md in the docker directory.](docker/production/README.md)
 
-## Pre-Compiled Binaries
+# Bare-metal Install
 
-The Stash server runs on macOS, Windows, and Linux.  Download the [latest release here](https://github.com/stashapp/stash/releases).
+Stash supports macOS, Windows, and Linux.  Download the [latest release here](https://github.com/stashapp/stash/releases).
 
-Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9999 to get started.
+Run the executable (double click the exe on windows or run `./stash-osx` / `./stash-linux` from the terminal on macOS / Linux) and navigate to either https://localhost:9999 or http://localhost:9998 to get started.
 
-*Note for Windows users:* Running the app might present a security prompt since the binary isn't yet signed.  Bypass this by clicking "more info" and then the "run anyway" button.
+*Note for Windows users:* Running the app might present a security prompt since the binary isn't signed yet.  Just click more info and then the "run anyway" button.
 
 #### FFMPEG
 
 If stash is unable to find or download FFMPEG then download it yourself from the link for your platform:
 
-* [macOS ffmpeg](https://evermeet.cx/ffmpeg/ffmpeg-4.3.1.zip), [macOS ffprobe](https://evermeet.cx/ffmpeg/ffprobe-4.3.1.zip)
-* [Windows](https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip)
-* [Linux](https://www.johnvansickle.com/ffmpeg/)
+* [macOS](https://ffmpeg.zeranoe.com/builds/macos64/static/ffmpeg-4.0-macos64-static.zip)
+* [Windows](https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.0-win64-static.zip)
+* [Linux](https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz)
 
 The `ffmpeg(.exe)` and `ffprobe(.exe)` files should be placed in `~/.stash` on macOS / Linux or `C:\Users\YourUsername\.stash` on Windows.
 
 # Usage
 
-## Quickstart Guide
-1) Download and install Stash and its dependencies
-2) Run Stash. It will prompt you for some configuration options and a directory to index (you can also do this step afterward)
-3) After configuration, launch your web browser and navigate to the URL shown within the Stash app.
-
-**Note that Stash does not currently retrieve and organize information about your entire library automatically.**  You will need to help it along through the use of [scrapers](blob/develop/ui/v2.5/src/docs/en/Scraping.md).  The Stash community has developed scrapers for many popular data sources which can be downloaded and installed from [this repository](https://github.com/stashapp/CommunityScrapers).
-
-The simplest way to tag a large number of files is by using the [Tagger](https://github.com/stashapp/stash/blob/develop/ui/v2.5/src/docs/en/Tagger.md) which uses filename keywords to help identify the file and pull in scene and performer information from our stash-box database. Note that this data source is not comprehensive and you may need to use the scrapers to identify some of your media.
-
 ## CLI
 
-Stash runs as a command-line app and local web server.  There are some command-line options available, which you can see by running `stash --help`.
+Stash provides some command line options.  See what is currently available by running `stash --help`.
 
 For example, to run stash locally on port 80 run it like this (OSX / Linux) `stash --host 127.0.0.1 --port 80`
 
 ## SSL (HTTPS)
 
-Stash can run over HTTPS with some additional work.  First you must generate a SSL certificate and key combo.  Here is an example using openssl:
+Stash supports HTTPS with some additional work.  First you must generate a SSL certificate and key combo.  Here is an example using openssl:
 
 `openssl req -x509 -newkey rsa:4096 -sha256 -days 7300 -nodes -keyout stash.key -out stash.crt -extensions san -config <(echo "[req]"; echo distinguished_name=req; echo "[san]"; echo subjectAltName=DNS:stash.server,IP:127.0.0.1) -subj /CN=stash.server`
 
@@ -68,35 +48,28 @@ This command would need customizing for your environment.  [This link](https://s
 
 Once you have a certificate and key file name them `stash.crt` and `stash.key` and place them in the `~/.stash` directory.  Stash detects these and starts up using HTTPS rather than HTTP.
 
-# Customization
+# FAQ
 
-## Themes and CSS Customization
-There is a [directory of community-created themes](https://github.com/stashapp/stash/wiki/Themes) on our Wiki, along with instructions on how to install them.
+> I'm unable to run the app on OSX or Linux
 
-You can also 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).
+Try running `chmod u+x stash-osx` or `chmod u+x stash-linux` to make the file executable.
 
-# Support (FAQ)
+> I have a question not answered here.
 
-Answers to other Frequently Asked Questions can be found [on our Wiki](https://github.com/stashapp/stash/wiki/FAQ)
+Join the [Discord server](https://discord.gg/2TsNFKt).
 
-For issues not addressed there, there are a few options.
+# Development
 
-* Read the [Wiki](https://github.com/stashapp/stash/wiki)
-* Check the in-app documentation (also available [here](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en)
-* Join the [Discord server](https://discord.gg/2TsNFKt), where the community can offer support.
-
-# Compiling From Source Code
-
-## Pre-requisites
+## Install
 
 * [Go](https://golang.org/dl/)
 * [Revive](https://github.com/mgechev/revive) - Configurable linter
     * Go Install: `go get github.com/mgechev/revive`
-* [Packr2](https://github.com/gobuffalo/packr/) - Static asset bundler
-    * Go Install: `go get github.com/gobuffalo/packr/v2/packr2`
+* [Packr2](https://github.com/gobuffalo/packr/tree/v2.0.2/v2) - Static asset bundler
+    * Go Install: `go get github.com/gobuffalo/packr/v2/packr2@v2.0.2`
     * [Binary Download](https://github.com/gobuffalo/packr/releases)
 * [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
-    * Run `yarn install --frozen-lockfile` in the `stash/ui/v2.5` folder (before running make generate for first time).
+    * Run `yarn install` in the `stash/ui/v2` folder (before running make generate for first time).
 
 NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
 
@@ -119,18 +92,11 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
 
 ## Commands
 
-* `make generate` - Generate Go and UI GraphQL files
+* `make generate` - Generate Go GraphQL and packr2 files
 * `make build` - Builds the binary (make sure to build the UI as well... see below)
-* `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 ui` - Builds the frontend
 * `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
 
@@ -140,7 +106,7 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW.
 
 ## Cross compiling
 
-This project uses a modification of the [CI-GoReleaser](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) docker container to create an environment
+This project uses a modification of [this](https://github.com/bep/dockerfiles/tree/master/ci-goreleaser) docker container to create an environment
 where the app can be cross-compiled.  This process is kicked off by CI via the `scripts/cross-compile.sh` script.  Run the following
 command to open a bash shell to the container to poke around:
 

docker/build/x86_64/Dockerfile

@@ -1,61 +0,0 @@
-# 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.13.15 as compiler
-
-RUN apt-get update && apt-get install -y apt-transport-https
-RUN curl -sL https://deb.nodesource.com/setup_lts.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:20.04 as app
-
-RUN apt-get update && apt-get -y install ca-certificates
-COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
-
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-
-EXPOSE 9999
-CMD ["stash"]
-
-

docker/build/x86_64/README.md

@@ -1,67 +0,0 @@
-# Introduction
-
-This dockerfile is used to build a stash docker container using the current source code.
-
-# 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

@@ -1,19 +0,0 @@
-FROM --platform=$BUILDPLATFORM ubuntu:20.04  AS prep
-ARG TARGETPLATFORM
-WORKDIR /
-COPY stash-*  /
-RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-pi; \
-    elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then BIN=stash-linux-arm32v7; \
-    elif [ "$TARGETPLATFORM" = "linux/arm64" ];  then BIN=stash-linux-arm64v8; \
-    elif [ "$TARGETPLATFORM" = "linux/amd64" ];  then BIN=stash-linux; \
-    fi; \
-    mv $BIN /stash
-FROM ubuntu:20.04 as app
-run apt update && apt install -y python3 python3 python-is-python3 python3-requests ffmpeg && rm -rf /var/lib/apt/lists/*
-COPY --from=prep /stash /usr/bin/
-
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-
-EXPOSE 9999
-CMD ["stash"]
-

docker/ci/x86_64/README.md

@@ -1 +0,0 @@
-This dockerfile is used by 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

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-DOCKER_TAG=$1
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-# must build the image from dist directory
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push --output type=image,name=stashapp/stash:$DOCKER_TAG,push=true -f docker/ci/x86_64/Dockerfile dist/
-

docker/compiler/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13.15
+FROM golang:1.11.5
 
 LABEL maintainer="stashappdev@gmail.com"
 
@@ -9,22 +9,17 @@ 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_lts.x | bash -
+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 \
     libtool libxml2-dev uuid-dev libssl-dev bash \
     patch make tar xz-utils bzip2 gzip sed cpio \
-	gcc-8-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
+	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=stashapp
+user=stashappdev
 repo=compiler
-version=4
+version=2
 
 latest:
 	docker build -t ${user}/${repo}:latest .

docker/compiler/README.md

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

docker/develop/x86_64/Dockerfile

@@ -1,27 +0,0 @@
-FROM ubuntu:20.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:20.04 as app
-RUN apt-get update && apt-get -y install ca-certificates
-COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
-
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-
-EXPOSE 9999
-CMD ["stash"]

docker/production/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       driver: "json-file"
       options:
         max-file: "10"
-        max-size: "2m"
+        max-size: "200k"
     environment:
       - STASH_STASH=/data/
       - STASH_GENERATED=/generated/
@@ -19,16 +19,13 @@ services:
       - STASH_CACHE=/cache/
     volumes:
       - /etc/localtime:/etc/localtime:ro
-      ## Adjust below paths (the left part) to your liking.
-      ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
-      
       ## Keep configs here.
       - ./config:/root/.stash
       ## Point this at your collection.
       - ./data:/data
+      ## This is where pre-generated transcodes live.
+      - ./transcodes:/transcodes
       ## This is where your stash's metadata lives
       - ./metadata:/metadata
       ## Any other cache content.
       - ./cache:/cache
-      ## Where to store generated content (screenshots,previews,transcodes,sprites)
-      - ./generated:/generated

docker/production/x86_64/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as prep
+FROM ubuntu:18.04 as prep
 LABEL MAINTAINER="leopere [at] nixc [dot] us"
 
 RUN apt-get update && \
@@ -7,21 +7,17 @@ RUN apt-get update && \
     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/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 && \
+RUN curl -L -o /stash $(curl -s https://api.github.com/repos/stashapp/stash/releases | grep -F 'stash-linux' | grep download | head -n 1 | cut -d'"' -f4) && \
+    chmod +x /stash && \
+    curl -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
     tar xf /ffmpeg.tar.xz && \
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
-FROM ubuntu:20.04 as app
-RUN apt-get update && apt-get -y install ca-certificates
+FROM ubuntu:18.04 as app
+RUN apt-get update && \
+    apt-get -y install ca-certificates && \
+    adduser stash --gecos GECOS --shell /bin/bash --disabled-password --home /home/stash
 COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
-
-ENV STASH_CONFIG_FILE=/root/.stash/config.yml
-
 EXPOSE 9999
 CMD ["stash"]

docs/CONTRIBUTING.md

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

go.mod

@@ -1,45 +1,30 @@
 module github.com/stashapp/stash
 
 require (
-	github.com/99designs/gqlgen v0.12.2
-	github.com/Yamashou/gqlgenc v0.0.0-20200902035953-4dbef3551953
-	github.com/antchfx/htmlquery v1.2.3
-	github.com/chromedp/cdproto v0.0.0-20200608134039-8a80cdaf865c
-	github.com/chromedp/chromedp v0.5.3
-	github.com/corona10/goimagehash v1.0.3
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/99designs/gqlgen v0.9.0
+	github.com/PuerkitoBio/goquery v1.5.0
+	github.com/antchfx/htmlquery v1.2.0
+	github.com/antchfx/xpath v1.1.2 // indirect
+	github.com/bmatcuk/doublestar v1.1.5
 	github.com/disintegration/imaging v1.6.0
-	github.com/fvbommel/sortorder v1.0.2
 	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.2
+	github.com/gorilla/websocket v1.4.0
 	github.com/h2non/filetype v1.0.8
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/json-iterator/go v1.1.9
-	github.com/mattn/go-sqlite3 v1.14.6
-	github.com/natefinch/pie v0.0.0-20170715172608-9a0d72014007
-	github.com/remeh/sizedwaitgroup v1.0.0
+	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/rs/cors v1.6.0
 	github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.5.1
-	github.com/tidwall/gjson v1.6.0
-	github.com/vektah/gqlparser/v2 v2.0.1
-	github.com/vektra/mockery/v2 v2.2.1
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
-	golang.org/x/tools v0.0.0-20200915031644-64986481280e // indirect
-	gopkg.in/yaml.v2 v2.3.0
+	github.com/spf13/viper v1.4.0
+	github.com/vektah/gqlparser v1.1.2
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
+	golang.org/x/image v0.0.0-20190118043309-183bebdce1b2 // indirect
+	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
+	gopkg.in/yaml.v2 v2.2.2
 )
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
-
-go 1.13

go.sum

@@ -3,91 +3,60 @@ cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.36.0/go.mod h1:RUoy9p/M4ge0HzT8L+SDZ8jg+Q6fth0CiBuhFJpSV40=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
 dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
-github.com/99designs/gqlgen v0.12.2 h1:aOdpsiCycFtCnAv8CAI1exnKrIDHMqtMzQoXeTziY4o=
-github.com/99designs/gqlgen v0.12.2/go.mod h1:7zdGo6ry9u1YBp/qlb2uxSU5Mt2jQKLcBETQiKk+Bxo=
+github.com/99designs/gqlgen v0.9.0 h1:g1arBPML74Vqv0L3Q+TqIhGXLspV+2MYtRLkBxuZrlE=
+github.com/99designs/gqlgen v0.9.0/go.mod h1:HrrG7ic9EgLPsULxsZh/Ti+p0HNWgR3XRuvnD0pb5KY=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 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/Yamashou/gqlgenc v0.0.0-20200902035953-4dbef3551953 h1:+iPJDL28FxZhEdtJ9qykrMt/oDiOvlzTa0zV06nUcFM=
-github.com/Yamashou/gqlgenc v0.0.0-20200902035953-4dbef3551953/go.mod h1:kaTsk10p2hJWwrB2t7vMsk1lXj9KAHaDYRtJQiB+Ick=
 github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+sxIXdQ=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/agnivade/levenshtein v1.0.3 h1:M5ZnqLOoZR8ygVq0FfkXsNOKzMCk0xRiow0R5+5VkQ0=
-github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
-github.com/agnivade/levenshtein v1.1.0 h1:n6qGwyHG61v3ABce1rPVZklEYRT8NFpCMrpZdBUbYGM=
-github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 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.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/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/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/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
-github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+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/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=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
-github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
 github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
@@ -101,12 +70,8 @@ github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc/go.mod h1:Y1SNZ4dRUOKX
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
-github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
@@ -116,7 +81,6 @@ 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=
@@ -129,14 +93,11 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk=
-github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
-github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
 github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -297,7 +258,6 @@ github.com/gobuffalo/packr v1.15.0/go.mod h1:t5gXzEhIviQwVlNx/+3SfS07GS+cZ2hn76W
 github.com/gobuffalo/packr v1.15.1/go.mod h1:IeqicJ7jm8182yrVmNbM6PR4g79SjN9tZLH8KduZZwE=
 github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
 github.com/gobuffalo/packr v1.20.0/go.mod h1:JDytk1t2gP+my1ig7iI4NcVaXr886+N0ecUga6884zw=
-github.com/gobuffalo/packr v1.21.0 h1:p2ujcDJQp2QTiYWcI0ByHbr/gMoCouok6M0vXs/yTYQ=
 github.com/gobuffalo/packr v1.21.0/go.mod h1:H00jGfj1qFKxscFJSw8wcL4hpQtPe1PfU2wa6sg/SR0=
 github.com/gobuffalo/packr/v2 v2.0.0-rc.8/go.mod h1:y60QCdzwuMwO2R49fdQhsjCPv7tLQFR0ayzxxla9zes=
 github.com/gobuffalo/packr/v2 v2.0.0-rc.9/go.mod h1:fQqADRfZpEsgkc7c/K7aMew3n4aF1Kji7+lIZeR98Fc=
@@ -352,12 +312,6 @@ 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=
@@ -370,16 +324,12 @@ 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=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -387,21 +337,13 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 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/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
@@ -409,16 +351,13 @@ 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=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -427,39 +366,22 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/h2non/filetype v1.0.8 h1:le8gpf+FQA0/DlDABbtisA1KiTS0Xi+YSC/E8yY3Y14=
 github.com/h2non/filetype v1.0.8/go.mod h1:isekKqOuhMj+s/7r3rIeTErIRy4Rub5uBWHfvMusLMU=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 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=
@@ -468,12 +390,7 @@ 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.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-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/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 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=
 github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
@@ -483,8 +400,6 @@ 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=
@@ -500,14 +415,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
-github.com/magiconair/properties v1.8.1/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=
@@ -529,54 +438,26 @@ github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/markbates/sigtx v1.0.0/go.mod h1:QF1Hv6Ic6Ca6W+T+DL0Y/ypborFKyvUY9HmuCD4VeTc=
 github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGfH0DQzY7w=
-github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007 h1:reVOUXwnhsYv/8UqjvhrMOu5CNT9UapHFLbQ2JcXsmg=
-github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4=
 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.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 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=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 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/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/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/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/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/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -590,18 +471,14 @@ github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKw
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
@@ -619,35 +496,19 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
-github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.1.0 h1:g0fH8RicVgNl+zVZDCDfbdWxAWoAEJyI7I3TZYXFiig=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2 h1:J7U/N7eRtzjhs26d6GqMh2HBuXP8/Z64Densiiieafo=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8=
-github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
@@ -673,8 +534,6 @@ github.com/shurcooL/octicon v0.0.0-20180602230221-c42b0e3b24d9/go.mod h1:eWdoE5J
 github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
 github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
@@ -687,10 +546,6 @@ github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
@@ -703,8 +558,6 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
-github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -714,58 +567,35 @@ github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaN
 github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 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/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
-github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 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.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-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/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 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=
 github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
-github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
-github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e h1:+w0Zm/9gaWpEAyDlU1eKOuk5twTjAjuevXqcJJw8hrg=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/gqlparser v1.3.1 h1:8b0IcD3qZKWJQHSzynbDlrtP3IxVydZ2DZepCGofqfU=
-github.com/vektah/gqlparser v1.3.1/go.mod h1:bkVf0FX+Stjg/MHnm8mEyubuaArhNEqfQhF+OTiAL74=
-github.com/vektah/gqlparser/v2 v2.0.1 h1:xgl5abVnsd4hkN9rk65OJID9bfcLSMuTaTcZj777q1o=
-github.com/vektah/gqlparser/v2 v2.0.1/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
-github.com/vektra/mockery/v2 v2.2.1 h1:EYgPvxyYkm/0JKs62qlVc9pO+ljb8biPbDWabk5/PmI=
-github.com/vektra/mockery/v2 v2.2.1/go.mod h1:rBZUbbhMbiSX1WlCGsOgAi6xjuJGxB7KKbnoL0XNYW8=
+github.com/vektah/gqlparser v1.1.2 h1:ZsyLGn7/7jDNI+y4SEhI4yAxRChlv15pUHMjijT+e68=
+github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -779,7 +609,6 @@ golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181025113841-85e1b3f9139a/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -792,40 +621,18 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
-golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20190118043309-183bebdce1b2 h1:FNSSV4jv1PrPsiM2iKGpqLPPgYACqh9Muav7Pollk1k=
+golang.org/x/image v0.0.0-20190118043309-183bebdce1b2/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 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/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+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=
@@ -841,7 +648,6 @@ golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
@@ -851,26 +657,14 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/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-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-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-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 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=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -879,11 +673,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -908,19 +698,10 @@ golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190116161447-11f53e031339 h1:g/Jesu8+QLnA0CPzF3E1pURg0Byr7i6jLoX5sqjcAh0=
 golang.org/x/sys v0.0.0-20190116161447-11f53e031339/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/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=
@@ -966,51 +747,16 @@ golang.org/x/tools v0.0.0-20190219185102-9394956cfdc5/go.mod h1:E6PF97AdD6v0s+fP
 golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd h1:oMEQDWVXVNpceQoVd1JN3CQ7LYJJzs5qWqZIUcxXHHw=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589 h1:rjUrONFu4kLchcZTfp3/96bR8bW8dIa8uz3cR5n0cgM=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e h1:ssd5ulOvVWlh4kDSUF2SqzmMeWfjmwDXM+uGw/aQjRE=
-golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200827163409-021d7c6f1ec3 h1:OjYQxZBKJFs+sJbHkvSGIKNMkZXDJQ9JsMpebGhkafI=
-golang.org/x/tools v0.0.0-20200827163409-021d7c6f1ec3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200915031644-64986481280e h1:tfSNPIxC48Azhz4nLSPskz/yE9R6ftFRK8pfgfqWUAc=
-golang.org/x/tools v0.0.0-20200915031644-64986481280e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1018,8 +764,6 @@ google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO50
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -1027,35 +771,24 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk
 google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -1063,19 +796,11 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=

gqlgen.yml

@@ -16,10 +16,6 @@ struct_tag: gqlgen
 models:
   Gallery:
     model: github.com/stashapp/stash/pkg/models.Gallery
-  Image:
-    model: github.com/stashapp/stash/pkg/models.Image
-  ImageFileType:
-    model: github.com/stashapp/stash/pkg/models.ImageFileType
   Performer:
     model: github.com/stashapp/stash/pkg/models.Performer
   Scene:
@@ -30,8 +26,6 @@ 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:
@@ -42,15 +36,7 @@ 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
-  StashID:
-    model: github.com/stashapp/stash/pkg/models.StashID

graphql/documents/data/config.graphql

@@ -1,58 +1,26 @@
 fragment ConfigGeneralData on ConfigGeneralResult {
-  stashes {
-    path
-    excludeVideo
-    excludeImage
-  }
+  stashes
   databasePath
   generatedPath
-  cachePath
-  calculateMD5
-  videoFileNamingAlgorithm
-  parallelTasks
-  previewSegments
-  previewSegmentDuration
-  previewExcludeStart
-  previewExcludeEnd
-  previewPreset
   maxTranscodeSize
   maxStreamingTranscodeSize
-  apiKey
   username
   password
-  maxSessionAge
   logFile
   logOut
   logLevel
   logAccess
-  createGalleriesFromFolders
-  videoExtensions
-  imageExtensions
-  galleryExtensions
   excludes
-  imageExcludes
-  scraperUserAgent
-  scraperCertCheck
-  scraperCDPPath
-  stashBoxes {
-    name
-    endpoint
-    api_key
-  }
 }
 
 fragment ConfigInterfaceData on ConfigInterfaceResult {
-  menuItems
   soundOnPreview
   wallShowTitle
-  wallPlayback
   maximumLoopDuration
   autostartVideo
   showStudioAsText
   css
   cssEnabled
-  language
-  slideshowDelay
 }
 
 fragment ConfigData on ConfigResult {

graphql/documents/data/gallery-slim.graphql

@@ -1,44 +0,0 @@
-fragment SlimGalleryData on Gallery {
-  id
-  checksum
-  path
-  title
-  date
-  url
-  details
-  rating
-  organized
-  image_count
-  cover {
-    file {
-      size
-      width
-      height
-    }
-    
-    paths {
-      thumbnail
-    }
-  }
-  studio {
-    id
-    name
-    image_path
-  }
-  tags {
-    id
-    name
-  }
-  performers {
-    id
-    name
-    gender
-    favorite
-    image_path
-  }
-  scenes {
-    id
-    title
-    path
-  }
-}

graphql/documents/data/gallery.graphql

@@ -3,28 +3,9 @@ fragment GalleryData on Gallery {
   checksum
   path
   title
-  date
-  url
-  details
-  rating
-  organized
-  images {
-    ...SlimImageData
-  }
-  cover {
-    ...SlimImageData
-  }
-  studio {
-    ...SlimStudioData
-  }
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-  scenes {
-    ...SlimSceneData
+  files {
+    index
+    name
+    path
   }
 }

graphql/documents/data/image-slim.graphql

@@ -1,45 +0,0 @@
-fragment SlimImageData on Image {
-  id
-  checksum
-  title
-  rating
-  organized
-  o_counter
-  path
-
-  file {
-    size
-    width
-    height
-  }
-
-  paths {
-    thumbnail
-    image
-  }
-
-  galleries {
-    id
-    path
-    title
-  }
-
-  studio {
-    id
-    name
-    image_path
-  }
-
-  tags {
-    id
-    name
-  }
-
-  performers {
-    id
-    name
-    gender
-    favorite
-    image_path
-  }
-}

graphql/documents/data/image.graphql

@@ -1,36 +0,0 @@
-fragment ImageData on Image {
-  id
-  checksum
-  title
-  rating
-  organized
-  o_counter
-  path
-
-  file {
-    size
-    width
-    height
-  }
-
-  paths {
-    thumbnail
-    image
-  }
-
-  galleries {
-    ...GalleryData
-  }
-
-  studio {
-    ...SlimStudioData
-  }
-  
-  tags {
-    ...SlimTagData
-  }
-
-  performers {
-    ...PerformerData
-  }
-}

graphql/documents/data/movie-slim.graphql

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

graphql/documents/data/movie.graphql

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

graphql/documents/data/performer-slim.graphql

@@ -1,16 +1,5 @@
 fragment SlimPerformerData on Performer {
   id
   name
-  gender
   image_path
-  favorite
-  tags {
-    id
-    name
-  }
-  stash_ids {
-    endpoint
-    stash_id
-  }
-  rating
 }

graphql/documents/data/performer.graphql

@@ -3,7 +3,6 @@ fragment PerformerData on Performer {
   checksum
   name
   url
-  gender
   twitter
   instagram
   birthdate
@@ -20,20 +19,4 @@ fragment PerformerData on Performer {
   favorite
   image_path
   scene_count
-  image_count
-  gallery_count
-
-  tags {
-    ...SlimTagData
-  }
-
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  rating
-  details
-  death_date
-  hair_color
-  weight
 }

graphql/documents/data/scene-slim.graphql

@@ -1,16 +1,12 @@
 fragment SlimSceneData on Scene {
   id
   checksum
-  oshash
   title
   details
   url
   date
   rating
-  o_counter
-  organized
   path
-  phash
 
   file {
     size
@@ -30,7 +26,6 @@ fragment SlimSceneData on Scene {
     webp
     vtt
     chapters_vtt
-    sprite
   }
 
   scene_markers {
@@ -39,7 +34,7 @@ fragment SlimSceneData on Scene {
     seconds
   }
 
-  galleries {
+  gallery {
     id
     path
     title
@@ -51,15 +46,6 @@ fragment SlimSceneData on Scene {
     image_path
   }
 
-  movies {
-    movie {
-      id
-      name
-      front_image_path
-    }
-    scene_index
-  }
-
   tags {
     id
     name
@@ -68,13 +54,7 @@ fragment SlimSceneData on Scene {
   performers {
     id
     name
-    gender
     favorite
     image_path
   }
-
-  stash_ids {
-    endpoint
-    stash_id
-  }
 }

graphql/documents/data/scene.graphql

@@ -1,16 +1,12 @@
 fragment SceneData on Scene {
   id
   checksum
-  oshash
   title
   details
   url
   date
   rating
-  o_counter
-  organized
   path
-  phash
 
   file {
     size
@@ -36,31 +32,21 @@ fragment SceneData on Scene {
     ...SceneMarkerData
   }
 
-  galleries {
-    ...SlimGalleryData
+  is_streamable
+
+  gallery {
+    ...GalleryData
   }
 
   studio {
-    ...SlimStudioData
-  }
-  
-  movies {
-    movie {
-      ...MovieData
-    }
-    scene_index
+    ...StudioData
   }
 
   tags {
-    ...SlimTagData
+    ...TagData
   }
 
   performers {
     ...PerformerData
   }
-
-  stash_ids {
-    endpoint
-    stash_id
-  }
 }

graphql/documents/data/scrapers.graphql

@@ -1,9 +1,6 @@
 fragment ScrapedPerformerData on ScrapedPerformer {
   name
-  gender
   url
-  twitter
-  instagram
   birthdate
   ethnicity
   country
@@ -15,20 +12,11 @@ fragment ScrapedPerformerData on ScrapedPerformer {
   tattoos
   piercings
   aliases
-  tags {
-    ...ScrapedSceneTagData
-  }
-  image
-  details
-  death_date
-  hair_color
-  weight
 }
 
 fragment ScrapedScenePerformerData on ScrapedScenePerformer {
-  stored_id
+  id
   name
-  gender
   url
   twitter
   instagram
@@ -43,61 +31,16 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
   tattoos
   piercings
   aliases
-  tags {
-    ...ScrapedSceneTagData
-  }
-  remote_site_id
-  images
-  details
-  death_date
-  hair_color
-  weight
 }
 
-fragment ScrapedMovieStudioData on ScrapedMovieStudio {
+fragment ScrapedSceneStudioData on ScrapedSceneStudio {
   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
-  remote_site_id
-}
-
 fragment ScrapedSceneTagData on ScrapedSceneTag {
-  stored_id
+  id
   name
 }
 
@@ -106,7 +49,6 @@ fragment ScrapedSceneData on ScrapedScene {
   details
   url
   date
-  image
 
   file {
     size
@@ -130,77 +72,4 @@ fragment ScrapedSceneData on ScrapedScene {
   performers {
     ...ScrapedScenePerformerData
   }
-
-  movies {
-    ...ScrapedSceneMovieData
-  }
-}
-
-fragment ScrapedGalleryData on ScrapedGallery {
-  title
-  details
-  url
-  date
-
-  studio {
-    ...ScrapedSceneStudioData
-  }
-
-  tags {
-    ...ScrapedSceneTagData
-  }
-
-  performers {
-    ...ScrapedScenePerformerData
-  }
-}
-
-fragment ScrapedStashBoxSceneData on ScrapedScene {
-  title
-  details
-  url
-  date
-  image
-  remote_site_id
-  duration
-
-  file {
-    size
-    duration
-    video_codec
-    audio_codec
-    width
-    height
-    framerate
-    bitrate
-  }
-
-  fingerprints {
-    hash
-    algorithm
-    duration
-  }
-
-  studio {
-    ...ScrapedSceneStudioData
-  }
-
-  tags {
-    ...ScrapedSceneTagData
-  }
-
-  performers {
-    ...ScrapedScenePerformerData
-  }
-
-  movies {
-    ...ScrapedSceneMovieData
-  }
-}
-
-fragment ScrapedStashBoxPerformerData on StashBoxPerformerQueryResult {
-  query
-  results {
-    ...ScrapedScenePerformerData
-  }
-}
+}

graphql/documents/data/studio-slim.graphql

@@ -2,13 +2,4 @@ fragment SlimStudioData on Studio {
   id
   name
   image_path
-  stash_ids {
-    endpoint
-    stash_id
-  }
-  parent_studio {
-    id
-  }
-  details
-  rating
-}
+}

graphql/documents/data/studio.graphql

@@ -3,34 +3,6 @@ fragment StudioData on Studio {
   checksum
   name
   url
-  parent_studio {
-    id
-    checksum
-    name
-    url
-    image_path
-    scene_count
-    image_count
-    gallery_count
-  }
-  child_studios {
-    id
-    checksum
-    name
-    url
-    image_path
-    scene_count
-    image_count
-    gallery_count
-  }
   image_path
   scene_count
-  image_count
-  gallery_count
-  stash_ids {
-    stash_id
-    endpoint
-  }
-  details
-  rating
 }

graphql/documents/data/tag-slim.graphql

@@ -1,5 +0,0 @@
-fragment SlimTagData on Tag {
-  id
-  name
-  image_path
-}

graphql/documents/data/tag.graphql

@@ -1,10 +1,6 @@
 fragment TagData on Tag {
   id
   name
-  image_path
   scene_count
   scene_marker_count
-  image_count
-  gallery_count
-  performer_count
 }

graphql/documents/mutations/config.graphql

@@ -1,11 +1,3 @@
-mutation Setup($input: SetupInput!) {
-  setup(input: $input)
-}
-
-mutation Migrate($input: MigrateInput!) {
-  migrate(input: $input)
-}
-
 mutation ConfigureGeneral($input: ConfigGeneralInput!) {
   configureGeneral(input: $input) {
     ...ConfigGeneralData
@@ -16,8 +8,4 @@ mutation ConfigureInterface($input: ConfigInterfaceInput!) {
   configureInterface(input: $input) {
     ...ConfigInterfaceData
   }
-}
-
-mutation GenerateAPIKey($input: GenerateAPIKeyInput!) {
-  generateAPIKey(input: $input)
-}
+}

graphql/documents/mutations/gallery.graphql

@@ -1,41 +0,0 @@
-mutation GalleryCreate(
-  $input: GalleryCreateInput!) {
-
-  galleryCreate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation GalleryUpdate(
-  $input: GalleryUpdateInput!) {
-
-  galleryUpdate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation BulkGalleryUpdate(
-  $input: BulkGalleryUpdateInput!) {
-
-  bulkGalleryUpdate(input: $input) {
-      ...GalleryData
-  }
-}
-
-mutation GalleriesUpdate($input : [GalleryUpdateInput!]!) {
-  galleriesUpdate(input: $input) {
-    ...GalleryData
-  }
-}
-
-mutation GalleryDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  galleryDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation AddGalleryImages($gallery_id: ID!, $image_ids: [ID!]!) {
-  addGalleryImages(input: {gallery_id: $gallery_id, image_ids: $image_ids})
-}
-
-mutation RemoveGalleryImages($gallery_id: ID!, $image_ids: [ID!]!) {
-  removeGalleryImages(input: {gallery_id: $gallery_id, image_ids: $image_ids})
-}

graphql/documents/mutations/image.graphql

@@ -1,41 +0,0 @@
-mutation ImageUpdate(
-  $input: ImageUpdateInput!) {
-
-  imageUpdate(input: $input) {
-      ...SlimImageData
-  }
-}
-
-mutation BulkImageUpdate(
-  $input: BulkImageUpdateInput!) {
-
-  bulkImageUpdate(input: $input) {
-      ...SlimImageData
-  }
-}
-
-mutation ImagesUpdate($input : [ImageUpdateInput!]!) {
-  imagesUpdate(input: $input) {
-    ...SlimImageData
-  }
-}
-
-mutation ImageIncrementO($id: ID!) {
-  imageIncrementO(id: $id) 
-}
-
-mutation ImageDecrementO($id: ID!) {
-  imageDecrementO(id: $id)
-}
-
-mutation ImageResetO($id: ID!) {
-  imageResetO(id: $id)
-}
-
-mutation ImageDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
-  imageDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation ImagesDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  imagesDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}

graphql/documents/mutations/metadata.graphql

@@ -1,43 +0,0 @@
-mutation MetadataImport {
-  metadataImport
-}
-
-mutation MetadataExport {
-  metadataExport
-}
-
-mutation ExportObjects($input: ExportObjectsInput!) {
-  exportObjects(input: $input)
-}
-
-mutation ImportObjects($input: ImportObjectsInput!) {
-  importObjects(input: $input)
-}
-
-mutation MetadataScan($input: ScanMetadataInput!) {
-  metadataScan(input: $input)
-}
-
-mutation MetadataGenerate($input: GenerateMetadataInput!) {
-  metadataGenerate(input: $input)
-}
-
-mutation MetadataAutoTag($input: AutoTagMetadataInput!) {
-  metadataAutoTag(input: $input)
-}
-
-mutation MetadataClean($input: CleanMetadataInput!) {
-  metadataClean(input: $input)
-}
-
-mutation MigrateHashNaming {
-  migrateHashNaming
-}
-
-mutation StopJob {
-  stopJob
-}
-
-mutation BackupDatabase($input: BackupDatabaseInput!) {
-  backupDatabase(input: $input)
-}

graphql/documents/mutations/movie.graphql

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

graphql/documents/mutations/performer.graphql

@@ -1,31 +1,89 @@
 mutation PerformerCreate(
-  $input: PerformerCreateInput!) {
+  $name: String,
+  $url: String,
+  $birthdate: String,
+  $ethnicity: String,
+  $country: String,
+  $eye_color: String,
+  $height: String,
+  $measurements: String,
+  $fake_tits: String,
+  $career_length: String,
+  $tattoos: String,
+  $piercings: String,
+  $aliases: String,
+  $twitter: String,
+  $instagram: String,
+  $favorite: Boolean,
+  $image: String) {
 
-  performerCreate(input: $input) {
+  performerCreate(input: {
+                            name: $name,
+                            url: $url,
+                            birthdate: $birthdate,
+                            ethnicity: $ethnicity,
+                            country: $country,
+                            eye_color: $eye_color,
+                            height: $height,
+                            measurements: $measurements,
+                            fake_tits: $fake_tits,
+                            career_length: $career_length,
+                            tattoos: $tattoos,
+                            piercings: $piercings,
+                            aliases: $aliases,
+                            twitter: $twitter,
+                            instagram: $instagram,
+                            favorite: $favorite,
+                            image: $image
+                          }) {
       ...PerformerData
   }
 }
 
 mutation PerformerUpdate(
-  $input: PerformerUpdateInput!) {
+  $id: ID!,
+  $name: String,
+  $url: String,
+  $birthdate: String,
+  $ethnicity: String,
+  $country: String,
+  $eye_color: String,
+  $height: String,
+  $measurements: String,
+  $fake_tits: String,
+  $career_length: String,
+  $tattoos: String,
+  $piercings: String,
+  $aliases: String,
+  $twitter: String,
+  $instagram: String,
+  $favorite: Boolean,
+  $image: String) {
 
-  performerUpdate(input: $input) {
-    ...PerformerData
-  }
-}
-
-mutation BulkPerformerUpdate(
-  $input: BulkPerformerUpdateInput!) {
-
-  bulkPerformerUpdate(input: $input) {
+  performerUpdate(input: {
+                            id: $id,
+                            name: $name,
+                            url: $url,
+                            birthdate: $birthdate,
+                            ethnicity: $ethnicity,
+                            country: $country,
+                            eye_color: $eye_color,
+                            height: $height,
+                            measurements: $measurements,
+                            fake_tits: $fake_tits,
+                            career_length: $career_length,
+                            tattoos: $tattoos,
+                            piercings: $piercings,
+                            aliases: $aliases,
+                            twitter: $twitter,
+                            instagram: $instagram,
+                            favorite: $favorite,
+                            image: $image
+                          }) {
     ...PerformerData
   }
 }
 
 mutation PerformerDestroy($id: ID!) {
   performerDestroy(input: { id: $id })
-}
-
-mutation PerformersDestroy($ids: [ID!]!) {
-  performersDestroy(ids: $ids)
-}
+}

graphql/documents/mutations/plugins.graphql

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

graphql/documents/mutations/scene.graphql

@@ -1,16 +1,58 @@
 mutation SceneUpdate(
-  $input: SceneUpdateInput!) {
+  $id: ID!,
+  $title: String,
+  $details: String,
+  $url: String,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $gallery_id: ID,
+  $performer_ids: [ID!] = [],
+  $tag_ids: [ID!] = [],
+  $cover_image: String) {
 
-  sceneUpdate(input: $input) {
-    ...SceneData
+  sceneUpdate(input: {
+                        id: $id,
+                        title: $title,
+                        details: $details,
+                        url: $url,
+                        date: $date,
+                        rating: $rating,
+                        studio_id: $studio_id,
+                        gallery_id: $gallery_id,
+                        performer_ids: $performer_ids,
+                        tag_ids: $tag_ids,
+                        cover_image: $cover_image
+                      }) {
+      ...SceneData
   }
 }
 
 mutation BulkSceneUpdate(
-  $input: BulkSceneUpdateInput!) {
+  $ids: [ID!] = [],
+  $title: String,
+  $details: String,
+  $url: String,
+  $date: String,
+  $rating: Int,
+  $studio_id: ID,
+  $gallery_id: ID,
+  $performer_ids: [ID!],
+  $tag_ids: [ID!]) {
 
-  bulkSceneUpdate(input: $input) {
-    ...SceneData
+  bulkSceneUpdate(input: {
+                        ids: $ids,
+                        title: $title,
+                        details: $details,
+                        url: $url,
+                        date: $date,
+                        rating: $rating,
+                        studio_id: $studio_id,
+                        gallery_id: $gallery_id,
+                        performer_ids: $performer_ids,
+                        tag_ids: $tag_ids
+                      }) {
+      ...SceneData
   }
 }
 
@@ -20,26 +62,6 @@ mutation ScenesUpdate($input : [SceneUpdateInput!]!) {
   }
 }
 
-mutation SceneIncrementO($id: ID!) {
-  sceneIncrementO(id: $id) 
-}
-
-mutation SceneDecrementO($id: ID!) {
-  sceneDecrementO(id: $id)
-}
-
-mutation SceneResetO($id: ID!) {
-  sceneResetO(id: $id)
-}
-
 mutation SceneDestroy($id: ID!, $delete_file: Boolean, $delete_generated : Boolean) {
   sceneDestroy(input: {id: $id, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation ScenesDestroy($ids: [ID!]!, $delete_file: Boolean, $delete_generated : Boolean) {
-  scenesDestroy(input: {ids: $ids, delete_file: $delete_file, delete_generated: $delete_generated})
-}
-
-mutation SceneGenerateScreenshot($id: ID!, $at: Float) {
-  sceneGenerateScreenshot(id: $id, at: $at)
-}
+}

graphql/documents/mutations/scrapers.graphql

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

graphql/documents/mutations/stash-box.graphql

@@ -1,7 +0,0 @@
-mutation SubmitStashBoxFingerprints($input: StashBoxFingerprintSubmissionInput!) {
-  submitStashBoxFingerprints(input: $input)
-}
-
-mutation StashBoxBatchPerformerTag($input: StashBoxBatchPerformerTagInput!) {
-  stashBoxBatchPerformerTag(input: $input)
-}

graphql/documents/mutations/studio.graphql

@@ -1,19 +1,24 @@
-mutation StudioCreate($input: StudioCreateInput!) {
-  studioCreate(input: $input) {
+mutation StudioCreate(
+  $name: String!,
+  $url: String,
+  $image: String) {
+
+  studioCreate(input: { name: $name, url: $url, image: $image }) {
     ...StudioData
   }
 }
 
-mutation StudioUpdate($input: StudioUpdateInput!) {
-  studioUpdate(input: $input) {
+mutation StudioUpdate(
+  $id: ID!
+  $name: String,
+  $url: String,
+  $image: String) {
+
+  studioUpdate(input: { id: $id, name: $name, url: $url, image: $image }) {
     ...StudioData
   }
 }
 
 mutation StudioDestroy($id: ID!) {
   studioDestroy(input: { id: $id })
-}
-
-mutation StudiosDestroy($ids: [ID!]!) {
-  studiosDestroy(ids: $ids)
-}
+}

graphql/documents/mutations/tag.graphql

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

graphql/documents/queries/gallery.graphql

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

graphql/documents/queries/image.graphql

@@ -1,14 +0,0 @@
-query FindImages($filter: FindFilterType, $image_filter: ImageFilterType, $image_ids: [Int!]) {
-  findImages(filter: $filter, image_filter: $image_filter, image_ids: $image_ids) {
-    count
-    images {
-      ...SlimImageData
-    }
-  }
-}
-
-query FindImage($id: ID!, $checksum: String) {
-  findImage(id: $id, checksum: $checksum) {
-    ...ImageData
-  }
-}

graphql/documents/queries/misc.graphql

@@ -1,3 +1,9 @@
+query FindTag($id: ID!) {
+  findTag(id: $id) {
+    ...TagData
+  }
+}
+
 query MarkerStrings($q: String, $sort: String) {
   markerStrings(q: $q, sort: $sort) {
     id
@@ -23,11 +29,6 @@ query AllStudiosForFilter {
     ...SlimStudioData
   }
 }
-query AllMoviesForFilter {
-  allMovies {
-    ...SlimMovieData
-  }
-}
 
 query AllTagsForFilter {
   allTags {
@@ -36,16 +37,19 @@ query AllTagsForFilter {
   }
 }
 
+query ValidGalleriesForScene($scene_id: ID!) {
+  validGalleriesForScene(scene_id: $scene_id) {
+    id
+    path
+  }
+}
+
 query Stats {
   stats {
     scene_count,
-    scenes_size,
-    image_count,
-    images_size,
     gallery_count,
     performer_count,
     studio_count,
-    movie_count,
     tag_count
   }
 }
@@ -62,10 +66,3 @@ query Version {
     build_time
   }
 }
-
-query LatestVersion {
-  latestversion {
-    shorthash
-    url
-  }
-}

graphql/documents/queries/movie.graphql

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

graphql/documents/queries/performer.graphql

@@ -11,4 +11,4 @@ query FindPerformer($id: ID!) {
   findPerformer(id: $id) {
     ...PerformerData
   }
-}
+}

graphql/documents/queries/plugins.graphql

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

graphql/documents/queries/scene.graphql

@@ -16,12 +16,6 @@ query FindScenesByPathRegex($filter: FindFilterType) {
   }
 }
 
-query FindDuplicateScenes($distance: Int) {
-  findDuplicateScenes(distance: $distance) {
-    ...SlimSceneData
-  }
-}
-
 query FindScene($id: ID!, $checksum: String) {
   findScene(id: $id, checksum: $checksum) {
     ...SceneData
@@ -51,20 +45,9 @@ query ParseSceneFilenames($filter: FindFilterType!, $config: SceneParserInput!)
       date
       rating
       studio_id
-      gallery_ids
-      movies {
-        movie_id
-      }
+      gallery_id
       performer_ids
       tag_ids
     }
   }
-}
-
-query SceneStreams($id: ID!) {
-  sceneStreams(id: $id) {
-    url
-    mime_type
-    label
-  }
-}
+}

graphql/documents/queries/scrapers/freeones.graphql

@@ -15,10 +15,6 @@ query ScrapeFreeones($performer_name: String!) {
     tattoos
     piercings
     aliases
-    details
-    death_date
-    hair_color
-    weight
   }
 }
 

graphql/documents/queries/scrapers/scrapers.graphql

@@ -20,28 +20,6 @@ query ListSceneScrapers {
   }
 }
 
-query ListGalleryScrapers {
-  listGalleryScrapers {
-    id
-    name
-    gallery {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
-query ListMovieScrapers {
-  listMovieScrapers {
-    id
-    name
-    movie {
-      urls
-      supported_scrapes
-    }
-  }
-}
-
 query ScrapePerformerList($scraper_id: ID!, $query: String!) {
   scrapePerformerList(scraper_id: $scraper_id, query: $query) {
     ...ScrapedPerformerData
@@ -70,34 +48,4 @@ query ScrapeSceneURL($url: String!) {
   scrapeSceneURL(url: $url) {
     ...ScrapedSceneData
   }
-}
-
-query ScrapeGallery($scraper_id: ID!, $gallery: GalleryUpdateInput!) {
-  scrapeGallery(scraper_id: $scraper_id, gallery: $gallery) {
-    ...ScrapedGalleryData
-  }
-}
-
-query ScrapeGalleryURL($url: String!) {
-  scrapeGalleryURL(url: $url) {
-    ...ScrapedGalleryData
-  }
-}
-
-query ScrapeMovieURL($url: String!) {
-  scrapeMovieURL(url: $url) {
-    ...ScrapedMovieData
-  }
-}
-
-query QueryStashBoxScene($input: StashBoxSceneQueryInput!) {
-  queryStashBoxScene(input: $input) {
-    ...ScrapedStashBoxSceneData
-  }
-}
-
-query QueryStashBoxPerformer($input: StashBoxPerformerQueryInput!) {
-  queryStashBoxPerformer(input: $input) {
-    ...ScrapedStashBoxPerformerData
-  }
-}
+}

graphql/documents/queries/settings/config.graphql

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

graphql/documents/queries/settings/metadata.graphql

@@ -1,3 +1,27 @@
+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
@@ -6,12 +30,6 @@ query JobStatus {
   }
 }
 
-query SystemStatus {
-  systemStatus {
-    databaseSchema
-    databasePath
-    appSchema
-    status
-    configPath
-  }
-}
+query StopJob {
+  stopJob
+}

graphql/documents/queries/studio.graphql

@@ -1,5 +1,5 @@
-query FindStudios($filter: FindFilterType, $studio_filter: StudioFilterType ) {
-  findStudios(filter: $filter, studio_filter: $studio_filter) {
+query FindStudios($filter: FindFilterType) {
+  findStudios(filter: $filter) {
     count
     studios {
       ...StudioData
@@ -11,4 +11,4 @@ query FindStudio($id: ID!) {
   findStudio(id: $id) {
     ...StudioData
   }
-}
+}

graphql/documents/queries/tag.graphql

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

graphql/schema/schema.graphql

@@ -2,29 +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!
 
-  """ Returns any groups of scenes that are perceptual duplicates within the queried distance """
-  findDuplicateScenes(distance: Int): [[Scene!]!]!
-
-  """Return valid stream paths"""
-  sceneStreams(id: ID): [SceneStreamEndpoint!]!
-
   parseSceneFilenames(filter: FindFilterType, config: SceneParserInput!): SceneParserResultType!
 
   """A function which queries SceneMarker objects"""
   findSceneMarkers(scene_marker_filter: SceneMarkerFilterType filter: FindFilterType): FindSceneMarkersResultType!
 
-  findImage(id: ID, checksum: String): Image
-  
-  """A function which queries Scene objects"""
-  findImages(image_filter: ImageFilterType, image_ids: [Int!], filter: FindFilterType): FindImagesResultType!
-
   """Find a performer by ID"""
   findPerformer(id: ID!): Performer
   """A function which queries Performer objects"""
@@ -33,18 +20,12 @@ type Query {
   """Find a studio by ID"""
   findStudio(id: ID!): Studio
   """A function which queries Studio objects"""
-  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!
+  findStudios(filter: FindFilterType): FindStudiosResultType!
 
   findGallery(id: ID!): Gallery
-  findGalleries(gallery_filter: GalleryFilterType, filter: FindFilterType): FindGalleriesResultType!
+  findGalleries(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!]!
@@ -53,6 +34,8 @@ type Query {
 
   """Get marker strings"""
   markerStrings(q: String, sort: String): [MarkerStringsResultType]!
+  """Get the list of valid galleries for a given scene ID"""
+  validGalleriesForScene(scene_id: ID): [Gallery!]!
   """Get stats"""
   stats: StatsResultType!
   """Organize scene markers by tag for a given scene ID"""
@@ -65,9 +48,6 @@ type Query {
   """List available scrapers"""
   listPerformerScrapers: [Scraper!]!
   listSceneScrapers: [Scraper!]!
-  listGalleryScrapers: [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"""
@@ -78,137 +58,23 @@ 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 gallery record based on an existing gallery"""
-  scrapeGallery(scraper_id: ID!, gallery: GalleryUpdateInput!): ScrapedGallery
-  """Scrapes a complete gallery record based on a URL"""
-  scrapeGalleryURL(url: String!): ScrapedGallery
-  """Scrapes a complete movie record based on a URL"""
-  scrapeMovieURL(url: String!): ScrapedMovie
 
   """Scrape a performer using Freeones"""
   scrapeFreeones(performer_name: String!): ScrapedPerformer
   """Scrape a list of performers from a query"""
   scrapeFreeonesPerformerList(query: String!): [String!]!
 
-  """Query StashBox for scenes"""
-  queryStashBoxScene(input: StashBoxSceneQueryInput!): [ScrapedScene!]!
-  queryStashBoxPerformer(input: StashBoxPerformerQueryInput!): [StashBoxPerformerQueryResult!]!
-
-  # 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"""
-  directory(path: String): Directory!
+  directories(path: String): [String!]!
 
   # Metadata
-  systemStatus: SystemStatus!
-  jobStatus: MetadataUpdateStatus!
 
-  # Get everything
-
-  allPerformers: [Performer!]!
-  allStudios: [Studio!]!
-  allMovies: [Movie!]!
-  allTags: [Tag!]!
-
-  # Get everything with minimal metadata
-
-  # Version
-  version: Version!
-  
-  # LatestVersion
-  latestversion: ShortVersion!
-}
-
-type Mutation {
-  setup(input: SetupInput!): Boolean!
-  migrate(input: MigrateInput!): Boolean!
-
-  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"""
-  sceneIncrementO(id: ID!): Int!
-  """Decrements the o-counter for a scene. Returns the new value"""
-  sceneDecrementO(id: ID!): Int!
-  """Resets the o-counter for a scene to 0. Returns the new value"""
-  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!
-
-  imageUpdate(input: ImageUpdateInput!): Image
-  bulkImageUpdate(input: BulkImageUpdateInput!): [Image!]
-  imageDestroy(input: ImageDestroyInput!): Boolean!
-  imagesDestroy(input: ImagesDestroyInput!): Boolean!
-  imagesUpdate(input: [ImageUpdateInput!]!): [Image]
-
-  """Increments the o-counter for an image. Returns the new value"""
-  imageIncrementO(id: ID!): Int!
-  """Decrements the o-counter for an image. Returns the new value"""
-  imageDecrementO(id: ID!): Int!
-  """Resets the o-counter for a image to 0. Returns the new value"""
-  imageResetO(id: ID!): Int!
-
-  galleryCreate(input: GalleryCreateInput!): Gallery
-  galleryUpdate(input: GalleryUpdateInput!): Gallery
-  bulkGalleryUpdate(input: BulkGalleryUpdateInput!): [Gallery!]
-  galleryDestroy(input: GalleryDestroyInput!): Boolean!
-  galleriesUpdate(input: [GalleryUpdateInput!]!): [Gallery]
-
-  addGalleryImages(input: GalleryAddInput!): Boolean!
-  removeGalleryImages(input: GalleryRemoveInput!): Boolean!
-
-  performerCreate(input: PerformerCreateInput!): Performer
-  performerUpdate(input: PerformerUpdateInput!): Performer
-  performerDestroy(input: PerformerDestroyInput!): Boolean!
-  performersDestroy(ids: [ID!]!): Boolean!
-  bulkPerformerUpdate(input: BulkPerformerUpdateInput!): [Performer!]
-
-  studioCreate(input: StudioCreateInput!): Studio
-  studioUpdate(input: StudioUpdateInput!): Studio
-  studioDestroy(input: StudioDestroyInput!): Boolean!
-  studiosDestroy(ids: [ID!]!): Boolean!
-
-  movieCreate(input: MovieCreateInput!): Movie
-  movieUpdate(input: MovieUpdateInput!): Movie
-  movieDestroy(input: MovieDestroyInput!): Boolean!
-  moviesDestroy(ids: [ID!]!): Boolean!
-
-  tagCreate(input: TagCreateInput!): Tag
-  tagUpdate(input: TagUpdateInput!): Tag
-  tagDestroy(input: TagDestroyInput!): Boolean!
-  tagsDestroy(ids: [ID!]!): Boolean!
-
-  """Change general configuration options"""
-  configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
-  configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
-
-  """Generate and set (or clear) API key"""
-  generateAPIKey(input: GenerateAPIKeyInput!): String!
-
-  """Returns a link to download the result"""
-  exportObjects(input: ExportObjectsInput!): String
-
-  """Performs an incremental import. Returns the job ID"""
-  importObjects(input: ImportObjectsInput!): String!
-
-  """Start an full import. Completely wipes the database and imports from the metadata directory. Returns the job ID"""
+  """Start an import. Returns the job ID"""
   metadataImport: String!
-  """Start a full export. Outputs to the metadata directory. Returns the job ID"""
+  """Start an export. Returns the job ID"""
   metadataExport: String!
   """Start a scan. Returns the job ID"""
   metadataScan(input: ScanMetadataInput!): String!
@@ -217,27 +83,46 @@ type Mutation {
   """Start auto-tagging. Returns the job ID"""
   metadataAutoTag(input: AutoTagMetadataInput!): String!
   """Clean metadata. Returns the job ID"""
-  metadataClean(input: CleanMetadataInput!): 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!
+  metadataClean: String!
 
+  jobStatus: MetadataUpdateStatus!
   stopJob: Boolean!
 
-  """Submit fingerprints to stash-box instance"""
-  submitStashBoxFingerprints(input: StashBoxFingerprintSubmissionInput!): Boolean!
+  # Get everything
 
-  """Backup the database. Optionally returns a link to download the database file"""
-  backupDatabase(input: BackupDatabaseInput!): String
+  allPerformers: [Performer!]!
+  allStudios: [Studio!]!
+  allTags: [Tag!]!
 
-  """Run batch performer tag task. Returns the job ID."""
-  stashBoxBatchPerformerTag(input: StashBoxBatchPerformerTagInput!): String!
+  # Version
+  version: Version!
+}
+
+type Mutation {
+  sceneUpdate(input: SceneUpdateInput!): Scene
+  bulkSceneUpdate(input: BulkSceneUpdateInput!): [Scene!]
+  sceneDestroy(input: SceneDestroyInput!): Boolean!
+  scenesUpdate(input: [SceneUpdateInput!]!): [Scene]
+
+  sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
+  sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
+  sceneMarkerDestroy(id: ID!): Boolean!
+
+  performerCreate(input: PerformerCreateInput!): Performer
+  performerUpdate(input: PerformerUpdateInput!): Performer
+  performerDestroy(input: PerformerDestroyInput!): Boolean!
+
+  studioCreate(input: StudioCreateInput!): Studio
+  studioUpdate(input: StudioUpdateInput!): Studio
+  studioDestroy(input: StudioDestroyInput!): Boolean!
+
+  tagCreate(input: TagCreateInput!): Tag
+  tagUpdate(input: TagUpdateInput!): Tag
+  tagDestroy(input: TagDestroyInput!): Boolean!
+
+  """Change general configuration options"""
+  configureGeneral(input: ConfigGeneralInput!): ConfigGeneralResult!
+  configureInterface(input: ConfigInterfaceInput!): ConfigInterfaceResult!
 }
 
 type Subscription {
@@ -251,4 +136,4 @@ schema {
   query: Query
   mutation: Mutation
   subscription: Subscription
-}
+}

graphql/schema/types/config.graphql

@@ -1,13 +1,3 @@
-input SetupInput {
-  """Empty to indicate $HOME/.stash/config.yml default"""
-  configLocation: String!
-  stashes: [StashConfigInput!]!
-  """Empty to indicate default"""
-  databaseFile: String!
-  """Empty to indicate default"""
-  generatedLocation: String!
-}
-
 enum StreamingResolutionEnum {
   "240p", LOW
   "480p", STANDARD
@@ -17,46 +7,13 @@ 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: [StashConfigInput!]
+  stashes: [String!]
   """Path to the SQLite database"""
   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 parallel tasks to start during scan/generate"""
-  parallelTasks: Int
-  """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"""
@@ -65,8 +22,6 @@ 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"""
@@ -75,69 +30,25 @@ input ConfigGeneralInput {
   logLevel: String!
   """Whether to log http access"""
   logAccess: Boolean!
-  """True if galleries should be created from folders with images"""
-  createGalleriesFromFolders: Boolean!
-  """Array of video file extensions"""
-  videoExtensions: [String!]
-  """Array of image file extensions"""
-  imageExtensions: [String!]
-  """Array of gallery zip file extensions"""
-  galleryExtensions: [String!]
-  """Array of file regexp to exclude from Video Scans"""
+  """Array of file regexp to exclude from Scan"""
   excludes: [String!]
-  """Array of file regexp to exclude from Image Scans"""
-  imageExcludes: [String!]
-  """Scraper user agent string"""
-  scraperUserAgent: String
-  """Scraper CDP path. Path to chrome executable or remote address"""
-  scraperCDPPath: String
-  """Whether the scraper should check for invalid certificates"""
-  scraperCertCheck: Boolean!
-  """Stash-box instances used for tagging"""
-  stashBoxes: [StashBoxInput!]!
 }
 
 type ConfigGeneralResult {
   """Array of file paths to content"""
-  stashes: [StashConfig!]!
+  stashes: [String!]!
   """Path to the SQLite database"""
   databasePath: String!
   """Path to generated files"""
   generatedPath: String!
-  """Path to the config file used"""
-  configFilePath: String!
-  """Path to scrapers"""
-  scrapersPath: 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 parallel tasks to start during scan/generate"""
-  parallelTasks: Int!
-  """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"""
+    """Max generated transcode size"""
   maxTranscodeSize: StreamingResolutionEnum
   """Max streaming transcode size"""
   maxStreamingTranscodeSize: StreamingResolutionEnum
-  """API Key"""
-  apiKey: String!
   """Username"""
   username: String!
   """Password"""
   password: String!
-  """Maximum session cookie age"""
-  maxSessionAge: Int!
   """Name of the log file"""
   logFile: String
   """Whether to also output to stderr"""
@@ -146,37 +57,15 @@ type ConfigGeneralResult {
   logLevel: String!
   """Whether to log http access"""
   logAccess: Boolean!
-  """Array of video file extensions"""
-  videoExtensions: [String!]!
-  """Array of image file extensions"""
-  imageExtensions: [String!]!
-  """Array of gallery zip file extensions"""
-  galleryExtensions: [String!]!
-  """True if galleries should be created from folders with images"""
-  createGalleriesFromFolders: Boolean!
-  """Array of file regexp to exclude from Video Scans"""
+  """Array of file regexp to exclude from Scan"""
   excludes: [String!]!
-  """Array of file regexp to exclude from Image Scans"""
-  imageExcludes: [String!]!
-  """Scraper user agent string"""
-  scraperUserAgent: String
-  """Scraper CDP path. Path to chrome executable or remote address"""
-  scraperCDPPath: String
-  """Whether the scraper should check for invalid certificates"""
-  scraperCertCheck: Boolean!
-  """Stash-box instances used for tagging"""
-  stashBoxes: [StashBox!]!
 }
 
 input ConfigInterfaceInput {
-  """Ordered list of items that should be shown in the menu"""
-  menuItems: [String!]
   """Enable sound on mouseover previews"""
   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"""
@@ -186,34 +75,22 @@ input ConfigInterfaceInput {
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
-  """Interface language"""
-  language: String
-  """Slideshow Delay"""
-  slideshowDelay: Int
 }
 
 type ConfigInterfaceResult {
-  """Ordered list of items that should be shown in the menu"""
-  menuItems: [String!]
   """Enable sound on mouseover previews"""
   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"""
   autostartVideo: Boolean
-  """If true, studio overlays will be shown as text instead of logo images"""
+   """If true, studio overlays will be shown as text instead of logo images"""
   showStudioAsText: Boolean
   """Custom CSS"""
   css: String
   cssEnabled: Boolean
-  """Interface language"""
-  language: String
-  """Slideshow Delay"""
-  slideshowDelay: Int
 }
 
 """All configuration settings"""
@@ -221,27 +98,3 @@ type ConfigResult {
   general: ConfigGeneralResult!
   interface: ConfigInterfaceResult!
 }
-
-"""Directory structure of a path"""
-type Directory {
-    path: String!
-    parent: String
-    directories: [String!]!
-}
-
-"""Stash configuration details"""
-input StashConfigInput {
-  path: String!
-  excludeVideo: Boolean!
-  excludeImage: Boolean!
-}
-
-type StashConfig {
-  path: String!
-  excludeVideo: Boolean!
-  excludeImage: Boolean!
-}
-
-input GenerateAPIKeyInput {
-  clear: Boolean
-}

graphql/schema/types/filters.graphql

@@ -6,26 +6,17 @@ enum SortDirectionEnum {
 input FindFilterType {
   q: String
   page: Int
-  """use per_page = -1 to indicate all results. Defaults to 25."""
   per_page: Int
   sort: String
   direction: SortDirectionEnum
 }
 
 enum ResolutionEnum {
-  "144p", VERY_LOW
   "240p", LOW
-  "360p", R360P
   "480p", STANDARD
-  "540p", WEB_HD
   "720p", STANDARD_HD
   "1080p", FULL_HD
-  "1440p", QUAD_HD
-  "1920p", VR_HD
   "4k", FOUR_K
-  "5k", FIVE_K
-  "6k", SIX_K
-  "8k", EIGHT_K
 }
 
 input PerformerFilterType {
@@ -47,7 +38,7 @@ input PerformerFilterType {
   measurements: StringCriterionInput
   """Filter by fake tits value"""
   fake_tits: StringCriterionInput
-  """Filter by career length"""
+  """Filter by career length"""  
   career_length: StringCriterionInput
   """Filter by tattoos"""
   tattoos: StringCriterionInput
@@ -55,32 +46,6 @@ 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
-  """Filter to only include performers with these tags"""
-  tags: MultiCriterionInput
-  """Filter by tag count"""
-  tag_count: IntCriterionInput
-  """Filter by scene count"""
-  scene_count: IntCriterionInput
-  """Filter by image count"""
-  image_count: IntCriterionInput
-  """Filter by gallery count"""
-  gallery_count: IntCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by url"""
-  url: StringCriterionInput
-  """Filter by hair color"""
-  hair_color: StringCriterionInput
-  """Filter by weight"""
-  weight: IntCriterionInput
-  """Filter by death year"""
-  death_year: IntCriterionInput
 }
 
 input SceneMarkerFilterType {
@@ -95,164 +60,20 @@ input SceneMarkerFilterType {
 }
 
 input SceneFilterType {
-  AND: SceneFilterType
-  OR: SceneFilterType
-  NOT: SceneFilterType
-
-  """Filter by path"""
-  path: StringCriterionInput
   """Filter by rating"""
   rating: IntCriterionInput
-  """Filter by organized"""
-  organized: Boolean
-  """Filter by o-counter"""
-  o_counter: IntCriterionInput
   """Filter by resolution"""
   resolution: ResolutionEnum
-  """Filter by duration (in seconds)"""
-  duration: IntCriterionInput
   """Filter to only include scenes which have markers. `true` or `false`"""
   has_markers: String
   """Filter to only include scenes missing this property"""
   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 by tag count"""
-  tag_count: IntCriterionInput
-  """Filter to only include scenes with performers with these tags"""
-  performer_tags: MultiCriterionInput
   """Filter to only include scenes with these performers"""
   performers: MultiCriterionInput
-  """Filter by performer count"""
-  performer_count: IntCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter by url"""
-  url: StringCriterionInput
-}
-
-input MovieFilterType {
-  """Filter to only include movies with this studio"""
-  studios: MultiCriterionInput
-  """Filter to only include movies missing this property"""
-  is_missing: String
-  """Filter by url"""
-  url: StringCriterionInput
-}
-
-input StudioFilterType {
-  """Filter to only include studios with this parent studio"""
-  parents: MultiCriterionInput
-  """Filter by StashID"""
-  stash_id: StringCriterionInput
-  """Filter to only include studios missing this property"""
-  is_missing: String
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by scene count"""
-  scene_count: IntCriterionInput
-  """Filter by image count"""
-  image_count: IntCriterionInput
-  """Filter by gallery count"""
-  gallery_count: IntCriterionInput
-  """Filter by url"""
-  url: StringCriterionInput
-}
-
-input GalleryFilterType {
-  AND: GalleryFilterType
-  OR: GalleryFilterType
-  NOT: GalleryFilterType
-
-  """Filter by path"""
-  path: StringCriterionInput
-  """Filter to only include galleries missing this property"""
-  is_missing: String
-  """Filter to include/exclude galleries that were created from zip"""
-  is_zip: Boolean
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by organized"""
-  organized: Boolean
-  """Filter by average image resolution"""
-  average_resolution: ResolutionEnum
-  """Filter to only include galleries with this studio"""
-  studios: MultiCriterionInput
-  """Filter to only include galleries with these tags"""
-  tags: MultiCriterionInput
-  """Filter by tag count"""
-  tag_count: IntCriterionInput
-  """Filter to only include galleries with performers with these tags"""
-  performer_tags: MultiCriterionInput
-  """Filter to only include galleries with these performers"""
-  performers: MultiCriterionInput
-  """Filter by performer count"""
-  performer_count: IntCriterionInput
-  """Filter by number of images in this gallery"""
-  image_count: IntCriterionInput
-  """Filter by url"""
-  url: StringCriterionInput
-}
-
-input TagFilterType {
-  AND: TagFilterType
-  OR: TagFilterType
-  NOT: 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 images with this tag"""
-  image_count: IntCriterionInput
-
-  """Filter by number of galleries with this tag"""
-  gallery_count: IntCriterionInput
-
-  """Filter by number of performers with this tag"""
-  performer_count: IntCriterionInput
-
-  """Filter by number of markers with this tag"""
-  marker_count: IntCriterionInput
-}
-
-input ImageFilterType {
-  AND: ImageFilterType
-  OR: ImageFilterType
-  NOT: ImageFilterType
-
-  """Filter by path"""
-  path: StringCriterionInput
-  """Filter by rating"""
-  rating: IntCriterionInput
-  """Filter by organized"""
-  organized: Boolean
-  """Filter by o-counter"""
-  o_counter: IntCriterionInput
-  """Filter by resolution"""
-  resolution: ResolutionEnum
-  """Filter to only include images missing this property"""
-  is_missing: String
-  """Filter to only include images with this studio"""
-  studios: MultiCriterionInput
-  """Filter to only include images with these tags"""
-  tags: MultiCriterionInput
-  """Filter by tag count"""
-  tag_count: IntCriterionInput
-  """Filter to only include images with performers with these tags"""
-  performer_tags: MultiCriterionInput
-  """Filter to only include images with these performers"""
-  performers: MultiCriterionInput
-  """Filter by performer count"""
-  performer_count: IntCriterionInput
-  """Filter to only include images with these galleries"""
-  galleries: MultiCriterionInput
 }
 
 enum CriterionModifier {
@@ -272,10 +93,6 @@ enum CriterionModifier {
   INCLUDES_ALL,
   INCLUDES,
   EXCLUDES,
-  """MATCHES REGEX"""
-  MATCHES_REGEX,
-  """NOT MATCHES REGEX"""
-  NOT_MATCHES_REGEX,
 }
 
 input StringCriterionInput {
@@ -291,9 +108,4 @@ input IntCriterionInput {
 input MultiCriterionInput {
   value: [ID!]
   modifier: CriterionModifier!
-}
-
-input GenderCriterionInput {
-  value: GenderEnum
-  modifier: CriterionModifier!
-}
+}

graphql/schema/types/gallery.graphql

@@ -2,22 +2,11 @@
 type Gallery {
   id: ID!
   checksum: String!
-  path: String
+  path: String!
   title: String
-  url: String
-  date: String
-  details: String
-  rating: Int
-  organized: Boolean!
-  scenes: [Scene!]!
-  studio: Studio
-  image_count: Int!
-  tags: [Tag!]!
-  performers: [Performer!]!
 
-  """The images in the gallery"""
-  images: [Image!]! # Resolver
-  cover: Image
+  """The files in the gallery"""
+  files: [GalleryFilesType!]! # Resolver
 }
 
 type GalleryFilesType {
@@ -26,65 +15,7 @@ type GalleryFilesType {
   path: String
 }
 
-input GalleryCreateInput {
-  title: String!
-  url: String
-  date: String
-  details: String
-  rating: Int
-  organized: Boolean
-  scene_ids: [ID!]
-  studio_id: ID
-  tag_ids: [ID!]
-  performer_ids: [ID!]
-}
-
-input GalleryUpdateInput {
-  clientMutationId: String
-  id: ID!
-  title: String
-  url: String
-  date: String
-  details: String
-  rating: Int
-  organized: Boolean
-  scene_ids: [ID!]
-  studio_id: ID
-  tag_ids: [ID!]
-  performer_ids: [ID!]
-}
-
-input BulkGalleryUpdateInput {
-  clientMutationId: String
-  ids: [ID!]
-  url: String
-  date: String
-  details: String
-  rating: Int
-  organized: Boolean
-  scene_ids: BulkUpdateIds
-  studio_id: ID
-  tag_ids: BulkUpdateIds
-  performer_ids: BulkUpdateIds
-}
-
-input GalleryDestroyInput {
-  ids: [ID!]!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
 type FindGalleriesResultType {
   count: Int!
   galleries: [Gallery!]!
-}
-
-input GalleryAddInput {
-  gallery_id: ID!
-  image_ids: [ID!]!
-}
-
-input GalleryRemoveInput {
-  gallery_id: ID!
-  image_ids: [ID!]!
-}
+}

graphql/schema/types/image.graphql

@@ -1,71 +0,0 @@
-type Image {
-  id: ID!
-  checksum: String
-  title: String
-  rating: Int
-  o_counter: Int
-  organized: Boolean!
-  path: String!
-
-  file: ImageFileType! # Resolver
-  paths: ImagePathsType! # Resolver
-
-  galleries: [Gallery!]!
-  studio: Studio
-  tags: [Tag!]!
-  performers: [Performer!]!
-}
-
-type ImageFileType {
-  size: Int
-  width: Int
-  height: Int
-}
-
-type ImagePathsType {
-  thumbnail: String # Resolver
-  image: String # Resolver
-}
-
-input ImageUpdateInput {
-  clientMutationId: String
-  id: ID!
-  title: String
-  rating: Int
-  organized: Boolean
-  
-  studio_id: ID
-  performer_ids: [ID!]
-  tag_ids: [ID!]
-  gallery_ids: [ID!]
-}
-
-input BulkImageUpdateInput {
-  clientMutationId: String
-  ids: [ID!]
-  title: String
-  rating: Int
-  organized: Boolean
-  
-  studio_id: ID
-  performer_ids: BulkUpdateIds
-  tag_ids: BulkUpdateIds
-  gallery_ids: BulkUpdateIds
-}
-
-input ImageDestroyInput {
-  id: ID!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
-input ImagesDestroyInput {
-  ids: [ID!]!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
-type FindImagesResultType {
-  count: Int!
-  images: [Image!]!
-}

graphql/schema/types/metadata.graphql

@@ -1,60 +1,15 @@
-scalar Upload
-
 input GenerateMetadataInput {
   sprites: Boolean!
   previews: Boolean!
-  imagePreviews: Boolean!
-  previewOptions: GeneratePreviewOptionsInput
   markers: Boolean!
   transcodes: Boolean!
-  phashes: Boolean!
-
-  """scene ids to generate for"""
-  sceneIDs: [ID!]
-  """marker ids to generate for"""
-  markerIDs: [ID!]
-
-  """overwrite existing media"""
-  overwrite: Boolean
-}
-
-input GeneratePreviewOptionsInput {
-  """Number of segments in a preview file"""
-  previewSegments: Int
-  """Preview segment duration, in seconds"""
-  previewSegmentDuration: Float
-  """Duration of start of video to exclude when generating previews"""
-  previewExcludeStart: String
-  """Duration of end of video to exclude when generating previews"""
-  previewExcludeEnd: String
-  """Preset when generating preview"""
-  previewPreset: PreviewPreset
 }
 
 input ScanMetadataInput {
-  paths: [String!]
-  """Set name, date, details from metadata (if present)"""
-  useFileMetadata: Boolean
-  """Strip file extension from title"""
-  stripFileExtension: Boolean
-  """Generate previews during scan"""
-  scanGeneratePreviews: Boolean
-  """Generate image previews during scan"""
-  scanGenerateImagePreviews: Boolean
-  """Generate sprites during scan"""
-  scanGenerateSprites: Boolean
-  """Generate phashes during scan"""
-  scanGeneratePhashes: Boolean
-}
-
-input CleanMetadataInput {
-  """Do a dry run. Don't delete any files"""
-  dryRun: Boolean!
+  useFileMetadata: Boolean!
 }
 
 input AutoTagMetadataInput {
-  """Paths to tag, null for all files"""
-  paths: [String!]
   """IDs of performers to tag files with, or "*" for all"""
   performers: [String!]
   """IDs of studios to tag files with, or "*" for all"""
@@ -65,62 +20,6 @@ input AutoTagMetadataInput {
 
 type MetadataUpdateStatus {
   progress: Float!
-  status: String!
+	status: String!
   message: String!
-}
-
-input ExportObjectTypeInput {
-  ids: [String!]
-  all: Boolean
-}
-
-input ExportObjectsInput {
-  scenes: ExportObjectTypeInput
-  images: ExportObjectTypeInput
-  studios: ExportObjectTypeInput
-  performers: ExportObjectTypeInput
-  tags: ExportObjectTypeInput
-  movies: ExportObjectTypeInput
-  galleries: ExportObjectTypeInput
-  includeDependencies: Boolean
-}
-
-enum ImportDuplicateEnum {
-  IGNORE
-  OVERWRITE
-  FAIL
-}
-
-enum ImportMissingRefEnum {
-  IGNORE
-  FAIL
-  CREATE
-}
-
-input ImportObjectsInput {
-  file: Upload!
-  duplicateBehaviour: ImportDuplicateEnum!
-  missingRefBehaviour: ImportMissingRefEnum!
-}
-
-input BackupDatabaseInput {
-  download: Boolean
-}
-
-enum SystemStatusEnum {
-  SETUP
-  NEEDS_MIGRATION
-  OK
-}
-
-type SystemStatus {
-  databaseSchema: Int
-  databasePath: String
-  configPath: String
-  appSchema: Int!
-  status: SystemStatusEnum!
-}
-
-input MigrateInput {
-  backupPath: String!
-}
+}

graphql/schema/types/movie.graphql

@@ -1,61 +0,0 @@
-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 a URL or a base64 encoded data URL"""
-  front_image: String
-  """This should be a URL or a base64 encoded data URL"""
-  back_image: String
-}
-
-input MovieUpdateInput {
-  id: ID!
-  name: String
-  aliases: String
-  duration: Int
-  date: String
-  rating: Int
-  studio_id: ID
-  director: String
-  synopsis: String
-  url: String
-  """This should be a URL or a base64 encoded data URL"""
-  front_image: String
-  """This should be a URL or a base64 encoded data URL"""
-  back_image: String
-}
-
-input MovieDestroyInput {
-  id: ID!
-}
-
-type FindMoviesResultType {
-  count: Int!
-  movies: [Movie!]!
-}

graphql/schema/types/performer.graphql

@@ -1,18 +1,8 @@
-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
@@ -27,25 +17,15 @@ type Performer {
   piercings: String
   aliases: String
   favorite: Boolean!
-  tags: [Tag!]!
 
   image_path: String # Resolver
   scene_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
   scenes: [Scene!]!
-  stash_ids: [StashID!]!
-  rating: Int
-  details: String
-  death_date: String
-  hair_color: String
-  weight: Int
 }
 
 input PerformerCreateInput {
-  name: String!
+  name: String
   url: String
-  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
@@ -60,22 +40,14 @@ input PerformerCreateInput {
   twitter: String
   instagram: String
   favorite: Boolean
-  tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  """This should be base64 encoded"""
   image: String
-  stash_ids: [StashIDInput!]
-  rating: Int
-  details: String
-  death_date: String
-  hair_color: String
-  weight: Int
 }
 
 input PerformerUpdateInput {
   id: ID!
   name: String
   url: String
-  gender: GenderEnum
   birthdate: String
   ethnicity: String
   country: String
@@ -90,42 +62,8 @@ input PerformerUpdateInput {
   twitter: String
   instagram: String
   favorite: Boolean
-  tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  """This should be base64 encoded"""
   image: String
-  stash_ids: [StashIDInput!]
-  rating: Int
-  details: String
-  death_date: String
-  hair_color: String
-  weight: Int
-}
-
-input BulkPerformerUpdateInput {
-  clientMutationId: String
-  ids: [ID!]
-  url: String
-  gender: GenderEnum
-  birthdate: String
-  ethnicity: String
-  country: String
-  eye_color: String
-  height: String
-  measurements: String
-  fake_tits: String
-  career_length: String
-  tattoos: String
-  piercings: String
-  aliases: String
-  twitter: String
-  instagram: String
-  favorite: Boolean
-  tag_ids: BulkUpdateIds
-  rating: Int
-  details: String
-  death_date: String
-  hair_color: String
-  weight: Int
 }
 
 input PerformerDestroyInput {
@@ -135,4 +73,4 @@ input PerformerDestroyInput {
 type FindPerformersResultType {
   count: Int!
   performers: [Performer!]!
-}
+}

graphql/schema/types/plugin.graphql

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

@@ -16,43 +16,27 @@ type ScenePathsType {
   webp: String # Resolver
   vtt: String # Resolver
   chapters_vtt: String # Resolver
-  sprite: String # Resolver
-}
-
-type SceneMovie {
-  movie: Movie!
-  scene_index: Int
 }
 
 type Scene {
   id: ID!
-  checksum: String
-  oshash: String
+  checksum: String!
   title: String
   details: String
   url: String
   date: String
   rating: Int
-  organized: Boolean!
-  o_counter: Int
   path: String!
-  phash: String
 
   file: SceneFileType! # Resolver
   paths: ScenePathsType! # Resolver
+  is_streamable: Boolean! # Resolver
 
   scene_markers: [SceneMarker!]!
-  galleries: [Gallery!]!
+  gallery: Gallery
   studio: Studio
-  movies: [SceneMovie!]!
   tags: [Tag!]!
   performers: [Performer!]!
-  stash_ids: [StashID!]!
-}
-
-input SceneMovieInput {
-  movie_id: ID!
-  scene_index: Int
 }
 
 input SceneUpdateInput {
@@ -63,26 +47,12 @@ input SceneUpdateInput {
   url: String
   date: String
   rating: Int
-  organized: Boolean
   studio_id: ID
-  gallery_ids: [ID!]
+  gallery_id: ID
   performer_ids: [ID!]
-  movies: [SceneMovieInput!]
   tag_ids: [ID!]
-  """This should be a URL or a base64 encoded data URL"""
+  """This should be base64 encoded"""
   cover_image: String
-  stash_ids: [StashIDInput!]
-}
-
-enum BulkUpdateIdMode {
-  SET
-  ADD
-  REMOVE
-}
-
-input BulkUpdateIds {
-  ids: [ID!]
-  mode: BulkUpdateIdMode!
 }
 
 input BulkSceneUpdateInput {
@@ -93,11 +63,10 @@ input BulkSceneUpdateInput {
   url: String
   date: String
   rating: Int
-  organized: Boolean
   studio_id: ID
-  gallery_ids: BulkUpdateIds
-  performer_ids: BulkUpdateIds
-  tag_ids: BulkUpdateIds
+  gallery_id: ID
+  performer_ids: [ID!]
+  tag_ids: [ID!]
 }
 
 input SceneDestroyInput {
@@ -106,12 +75,6 @@ input SceneDestroyInput {
   delete_generated: Boolean
 }
 
-input ScenesDestroyInput {
-  ids: [ID!]!
-  delete_file: Boolean
-  delete_generated: Boolean
-}
-
 type FindScenesResultType {
   count: Int!
   scenes: [Scene!]!
@@ -123,11 +86,6 @@ input SceneParserInput {
   capitalizeTitle: Boolean
 }
 
-type SceneMovieID {
-  movie_id: ID!
-  scene_index: String
-}
-
 type SceneParserResult {
   scene: Scene!
   title: String
@@ -136,24 +94,12 @@ type SceneParserResult {
   date: String
   rating: Int
   studio_id: ID
-  gallery_ids: [ID!]
+  gallery_id: ID
   performer_ids: [ID!]
-  movies: [SceneMovieID!]
   tag_ids: [ID!]
 }
 
 type SceneParserResultType {
   count: Int!
   results: [SceneParserResult!]!
-}
-
-input SceneHashInput {
-  checksum: String
-  oshash: String
-}
-
-type SceneStreamEndpoint {
-  url: String!
-  mime_type: String
-  label: String
-}
+}

graphql/schema/types/scraped-movie.graphql

@@ -1,35 +0,0 @@
-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 a base64 encoded data URL"""
-  front_image: String
-  """This should be a base64 encoded data URL"""
-  back_image: String
-}
-
-input ScrapedMovieInput {
-  name: String
-  aliases: String
-  duration: String
-  date: String
-  rating: String
-  director: String
-  url: String
-  synopsis: String
-}

graphql/schema/types/scraped-performer.graphql

@@ -1,7 +1,6 @@
 """A performer from a scraping operation..."""
 type ScrapedPerformer {
   name: String
-  gender: String
   url: String
   twitter: String
   instagram: String
@@ -16,20 +15,10 @@ type ScrapedPerformer {
   tattoos: String
   piercings: String
   aliases: String
-  # Should be ScrapedPerformerTag - but would be identical types
-  tags: [ScrapedSceneTag!]
-
-  """This should be a base64 encoded data URL"""
-  image: String
-  details: String
-  death_date: String
-  hair_color: String
-  weight: String
 }
 
 input ScrapedPerformerInput {
   name: String
-  gender: String
   url: String
   twitter: String
   instagram: String
@@ -44,11 +33,4 @@ input ScrapedPerformerInput {
   tattoos: String
   piercings: String
   aliases: String
-
-  # not including tags for the input
-  # not including image for the input
-  details: String
-  death_date: String
-  hair_color: String
-  weight: String
 }

graphql/schema/types/scraper.graphql

@@ -20,17 +20,13 @@ type Scraper {
     performer: ScraperSpec
     """Details for scene scraper"""
     scene: ScraperSpec
-    """Details for gallery scraper"""
-    gallery: ScraperSpec
-    """Details for movie scraper"""
-    movie: ScraperSpec
 }
 
+
 type ScrapedScenePerformer {
   """Set if performer matched"""
-  stored_id: ID
+  id: ID
   name: String!
-  gender: String
   url: String
   twitter: String
   instagram: String
@@ -45,41 +41,18 @@ type ScrapedScenePerformer {
   tattoos: String
   piercings: String
   aliases: String
-  tags: [ScrapedSceneTag!]
-
-  remote_site_id: String
-  images: [String!]
-  details: String
-  death_date: String
-  hair_color: String
-  weight: 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"""
-  stored_id: ID
+  id: ID
   name: String!
   url: String
-
-  remote_site_id: String
 }
 
 type ScrapedSceneTag {
   """Set if tag matched"""
-  stored_id: ID
+  id: ID
   name: String!
 }
 
@@ -89,65 +62,9 @@ type ScrapedScene {
   url: String
   date: String
 
-  """This should be a base64 encoded data URL"""
-  image: String
-
   file: SceneFileType # Resolver
 
   studio: ScrapedSceneStudio
   tags: [ScrapedSceneTag!]
   performers: [ScrapedScenePerformer!]
-  movies: [ScrapedSceneMovie!]
-
-  remote_site_id: String
-  duration: Int
-  fingerprints: [StashBoxFingerprint!]
-}
-
-type ScrapedGallery {
-  title: String
-  details: String
-  url: String
-  date: String
-
-  studio: ScrapedSceneStudio
-  tags: [ScrapedSceneTag!]
-  performers: [ScrapedScenePerformer!]
-}
-
-input StashBoxSceneQueryInput {
-  """Index of the configured stash-box instance to use"""
-  stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
-  scene_ids: [ID!]
-  """Query by query string"""
-  q: String
-}
-
-input StashBoxPerformerQueryInput {
-  """Index of the configured stash-box instance to use"""
-  stash_box_index: Int!
-  """Instructs query by scene fingerprints"""
-  performer_ids: [ID!]
-  """Query by query string"""
-  q: String
-}
-
-type StashBoxPerformerQueryResult {
-  query: String!
-  results: [ScrapedScenePerformer!]!
-}
-
-type StashBoxFingerprint {
-  algorithm: String!
-  hash: String!
-  duration: Int!
-}
-
-input StashBoxBatchPerformerTagInput {
-  endpoint: Int!
-  exclude_fields: [String!]
-  refresh: Boolean!
-  performer_ids: [ID!]
-  performer_names: [String!]
 }

graphql/schema/types/stash-box.graphql

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

graphql/schema/types/stats.graphql

@@ -1,11 +1,7 @@
 type StatsResultType {
   scene_count: Int!
-  scenes_size: Float!
-  image_count: Int!
-  images_size: Float!
   gallery_count: Int!
   performer_count: Int!
   studio_count: Int!
-  movie_count: Int!
   tag_count: Int!
-}
+}

graphql/schema/types/studio.graphql

@@ -3,39 +3,24 @@ type Studio {
   checksum: String!
   name: String!
   url: String
-  parent_studio: Studio
-  child_studios: [Studio!]!
 
   image_path: String # Resolver
   scene_count: Int # Resolver
-  image_count: Int # Resolver
-  gallery_count: Int # Resolver
-  stash_ids: [StashID!]!
-  rating: Int
-  details: String
 }
 
 input StudioCreateInput {
   name: String!
   url: String
-  parent_id: ID
-  """This should be a URL or a base64 encoded data URL"""
+  """This should be base64 encoded"""
   image: String
-  stash_ids: [StashIDInput!]
-  rating: Int
-  details: String
 }
 
 input StudioUpdateInput {
   id: ID!
   name: String
   url: String
-  parent_id: ID,
-  """This should be a URL or a base64 encoded data URL"""
+  """This should be base64 encoded"""
   image: String
-  stash_ids: [StashIDInput!]
-  rating: Int
-  details: String
 }
 
 input StudioDestroyInput {
@@ -45,4 +30,4 @@ input StudioDestroyInput {
 type FindStudiosResultType {
   count: Int!
   studios: [Studio!]!
-}
+}

graphql/schema/types/tag.graphql

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

graphql/schema/types/version.graphql

@@ -2,9 +2,4 @@ type Version {
   version: String
   hash: String!
   build_time: String!
-}
-
-type ShortVersion {
-  shorthash: String!
-  url: String!
-}
+}

graphql/stash-box/query.graphql

@@ -1,156 +0,0 @@
-fragment URLFragment on URL {
-  url
-  type
-}
-
-fragment ImageFragment on Image {
-  id
-  url
-  width
-  height
-}
-
-fragment StudioFragment on Studio {
-  name
-  id
-  urls {
-    ...URLFragment
-  }
-  images {
-    ...ImageFragment
-  }
-}
-
-fragment TagFragment on Tag {
-  name
-  id
-}
-
-fragment FuzzyDateFragment on FuzzyDate {
-  date
-  accuracy
-}
-
-fragment MeasurementsFragment on Measurements {
-  band_size
-  cup_size
-  waist
-  hip
-}
-
-fragment BodyModificationFragment on BodyModification {
-  location
-  description
-}
-
-fragment PerformerFragment on Performer {
-  id
-  name
-  disambiguation
-  aliases
-  gender
-  urls {
-    ...URLFragment
-  }
-  images {
-    ...ImageFragment
-  }
-  birthdate {
-    ...FuzzyDateFragment
-  }
-  ethnicity
-  country
-  eye_color
-  hair_color
-  height
-  measurements {
-    ...MeasurementsFragment
-  }
-  breast_type
-  career_start_year
-  career_end_year
-  tattoos {
-    ...BodyModificationFragment
-  }
-  piercings {
-    ...BodyModificationFragment
-  }
-  details
-  death_date {
-    ...FuzzyDateFragment
-  }
-  weight
-}
-
-fragment PerformerAppearanceFragment on PerformerAppearance {
-  as
-  performer {
-    ...PerformerFragment
-  }
-}
-
-fragment FingerprintFragment on Fingerprint {
-  algorithm
-  hash
-  duration
-}
-
-fragment SceneFragment on Scene {
-  id
-  title
-  details
-  duration
-  date
-  urls {
-    ...URLFragment
-  }
-  images {
-    ...ImageFragment
-  }
-  studio {
-    ...StudioFragment
-  }
-  tags {
-    ...TagFragment
-  }
-  performers {
-    ...PerformerAppearanceFragment
-  }
-  fingerprints {
-    ...FingerprintFragment
-  }
-}
-
-query FindSceneByFingerprint($fingerprint: FingerprintQueryInput!) {
-  findSceneByFingerprint(fingerprint: $fingerprint) {
-    ...SceneFragment
-  }
-}
-
-query FindScenesByFingerprints($fingerprints: [String!]!) {
-  findScenesByFingerprints(fingerprints: $fingerprints) {
-    ...SceneFragment
-  }
-}
-
-query SearchScene($term: String!) {
-  searchScene(term: $term) {
-    ...SceneFragment
-  }
-}
-
-query SearchPerformer($term: String!) {
-  searchPerformer(term: $term) {
-    ...PerformerFragment
-  }
-}
-
-query FindPerformerByID($id: ID!) {
-  findPerformer(id: $id) {
-    ...PerformerFragment
-  }
-}
-
-mutation SubmitFingerprint($input: FingerprintSubmission!) {
-  submitFingerprint(input: $input)
-}

main.go

@@ -3,7 +3,9 @@ package main
 
 import (
 	"github.com/stashapp/stash/pkg/api"
+	"github.com/stashapp/stash/pkg/database"
 	"github.com/stashapp/stash/pkg/manager"
+	"github.com/stashapp/stash/pkg/manager/config"
 
 	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
@@ -11,6 +13,7 @@ import (
 
 func main() {
 	manager.Initialize()
+	database.Initialize(config.GetDatabasePath())
 	api.Start()
 	blockForever()
 }

pkg/api/changeset_translator.go

@@ -1,141 +0,0 @@
-package api
-
-import (
-	"context"
-	"database/sql"
-	"strconv"
-
-	"github.com/99designs/gqlgen/graphql"
-	"github.com/stashapp/stash/pkg/models"
-)
-
-const updateInputField = "input"
-
-func getArgumentMap(ctx context.Context) map[string]interface{} {
-	rctx := graphql.GetResolverContext(ctx)
-	reqCtx := graphql.GetRequestContext(ctx)
-	return rctx.Field.ArgumentMap(reqCtx.Variables)
-}
-
-func getUpdateInputMap(ctx context.Context) map[string]interface{} {
-	args := getArgumentMap(ctx)
-
-	input, _ := args[updateInputField]
-	var ret map[string]interface{}
-	if input != nil {
-		ret, _ = input.(map[string]interface{})
-	}
-
-	if ret == nil {
-		ret = make(map[string]interface{})
-	}
-
-	return ret
-}
-
-func getUpdateInputMaps(ctx context.Context) []map[string]interface{} {
-	args := getArgumentMap(ctx)
-
-	input, _ := args[updateInputField]
-	var ret []map[string]interface{}
-	if input != nil {
-		// convert []interface{} into []map[string]interface{}
-		iSlice, _ := input.([]interface{})
-		for _, i := range iSlice {
-			m, _ := i.(map[string]interface{})
-			if m != nil {
-				ret = append(ret, m)
-			}
-		}
-	}
-
-	return ret
-}
-
-type changesetTranslator struct {
-	inputMap map[string]interface{}
-}
-
-func (t changesetTranslator) hasField(field string) bool {
-	if t.inputMap == nil {
-		return false
-	}
-
-	_, found := t.inputMap[field]
-	return found
-}
-
-func (t changesetTranslator) nullString(value *string, field string) *sql.NullString {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullString{}
-
-	if value != nil {
-		ret.String = *value
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) sqliteDate(value *string, field string) *models.SQLiteDate {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &models.SQLiteDate{}
-
-	if value != nil {
-		ret.String = *value
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) nullInt64(value *int, field string) *sql.NullInt64 {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullInt64{}
-
-	if value != nil {
-		ret.Int64 = int64(*value)
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) nullInt64FromString(value *string, field string) *sql.NullInt64 {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullInt64{}
-
-	if value != nil {
-		ret.Int64, _ = strconv.ParseInt(*value, 10, 64)
-		ret.Valid = true
-	}
-
-	return ret
-}
-
-func (t changesetTranslator) nullBool(value *bool, field string) *sql.NullBool {
-	if !t.hasField(field) {
-		return nil
-	}
-
-	ret := &sql.NullBool{}
-
-	if value != nil {
-		ret.Bool = *value
-		ret.Valid = true
-	}
-
-	return ret
-}

pkg/api/check_version.go

@@ -1,270 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"regexp"
-	"runtime"
-	"time"
-
-	"golang.org/x/sys/cpu"
-
-	"github.com/stashapp/stash/pkg/logger"
-)
-
-//we use the github REST V3 API as no login is required
-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"
-const defaultSHLength int = 7 // default length of SHA short hash returned by <git rev-parse --short HEAD>
-
-// 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{
-		"darwin/amd64":  "stash-osx",
-		"linux/amd64":   "stash-linux",
-		"windows/amd64": "stash-win.exe",
-		"linux/arm":     "stash-pi",
-		"linux/arm64":   "stash-linux-arm64v8",
-		"linux/armv7":   "stash-linux-arm32v7",
-	}
-}
-
-type githubReleasesResponse struct {
-	Url              string
-	Assets_url       string
-	Upload_url       string
-	Html_url         string
-	Id               int64
-	Node_id          string
-	Tag_name         string
-	Target_commitish string
-	Name             string
-	Draft            bool
-	Author           githubAuthor
-	Prerelease       bool
-	Created_at       string
-	Published_at     string
-	Assets           []githubAsset
-	Tarball_url      string
-	Zipball_url      string
-	Body             string
-}
-
-type githubAuthor struct {
-	Login               string
-	Id                  int64
-	Node_id             string
-	Avatar_url          string
-	Gravatar_id         string
-	Url                 string
-	Html_url            string
-	Followers_url       string
-	Following_url       string
-	Gists_url           string
-	Starred_url         string
-	Subscriptions_url   string
-	Organizations_url   string
-	Repos_url           string
-	Events_url          string
-	Received_events_url string
-	Type                string
-	Site_admin          bool
-}
-
-type githubAsset struct {
-	Url                  string
-	Id                   int64
-	Node_id              string
-	Name                 string
-	Label                string
-	Uploader             githubAuthor
-	Content_type         string
-	State                string
-	Size                 int64
-	Download_count       int64
-	Created_at           string
-	Updated_at           string
-	Browser_download_url string
-}
-
-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) {
-
-	arch := runtime.GOARCH                                                                    // https://en.wikipedia.org/wiki/Comparison_of_ARM_cores
-	isARMv7 := cpu.ARM.HasNEON || cpu.ARM.HasVFPv3 || cpu.ARM.HasVFPv3D16 || cpu.ARM.HasVFPv4 // armv6 doesn't support any of these features
-	if arch == "arm" && isARMv7 {
-		arch = "armv7"
-	}
-
-	platform := fmt.Sprintf("%s/%s", runtime.GOOS, arch)
-	wantedRelease := stashReleases()[platform]
-
-	version, _, _ := GetVersion()
-	if version == "" {
-		return "", "", ErrNoVersion
-	}
-
-	// 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
-	}
-
-	url := apiReleases
-	if !usePreRelease {
-		// just get the latest full release
-		url += "/latest"
-	} else {
-		// get the release tagged with the development tag
-		url += "/tags/" + developmentTag
-	}
-
-	release := githubReleasesResponse{}
-	err = makeGithubRequest(url, &release)
-
-	if err != nil {
-		return "", "", err
-	}
-
-	if release.Prerelease == usePreRelease {
-		latestVersion = getReleaseHash(release, shortHash, usePreRelease)
-
-		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\"", version)
-	}
-	return latestVersion, latestRelease, nil
-}
-
-func getReleaseHash(release githubReleasesResponse, shortHash bool, usePreRelease bool) string {
-	shaLength := len(release.Target_commitish)
-	// 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 || shaLength != 40 {
-		return getShaFromTags(shortHash, release.Tag_name)
-	}
-
-	if shortHash {
-		last := defaultSHLength                                // default length of git short hash
-		_, gitShort, _ := GetVersion()                         // retrieve it to check actual length
-		if len(gitShort) > last && len(gitShort) < shaLength { // sometimes short hash is longer
-			last = len(gitShort)
-		}
-		return release.Target_commitish[0:last]
-	}
-
-	return release.Target_commitish
-}
-
-func printLatestVersion() {
-	_, githash, _ = GetVersion()
-	latest, _, err := GetLatestVersion(true)
-	if err != nil {
-		logger.Errorf("Couldn't find latest version: %s", err)
-	} else {
-		if githash == latest {
-			logger.Infof("Version: (%s) is already the latest released.", latest)
-		} else {
-			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 ""
-	}
-	_, gitShort, _ := GetVersion() // retrieve short hash to check actual length
-
-	for _, tag := range tags {
-		if tag.Name == name {
-			shaLength := len(tag.Commit.Sha)
-			if shaLength != 40 {
-				return ""
-			}
-			if shortHash {
-				last := defaultSHLength                                // default length of git short hash
-				if len(gitShort) > last && len(gitShort) < shaLength { // sometimes short hash is longer
-					last = len(gitShort)
-				}
-				return tag.Commit.Sha[0:last]
-			}
-
-			return tag.Commit.Sha
-		}
-	}
-
-	return ""
-}

pkg/api/context_keys.go

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

pkg/api/images.go

@@ -2,48 +2,18 @@ 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(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()
+func getRandomPerformerImage() ([]byte, error) {
+	imageFiles := performerBox.List()
 	index := rand.Intn(len(imageFiles))
-	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])
+	return performerBox.Find(imageFiles[index])
 }

pkg/api/resolver.go

@@ -5,13 +5,12 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/stashapp/stash/pkg/logger"
+	"github.com/99designs/gqlgen/graphql"
+
 	"github.com/stashapp/stash/pkg/models"
 )
 
-type Resolver struct {
-	txnManager models.TransactionManager
-}
+type Resolver struct{}
 
 func (r *Resolver) Gallery() models.GalleryResolver {
 	return &galleryResolver{r}
@@ -28,18 +27,12 @@ func (r *Resolver) Query() models.QueryResolver {
 func (r *Resolver) Scene() models.SceneResolver {
 	return &sceneResolver{r}
 }
-func (r *Resolver) Image() models.ImageResolver {
-	return &imageResolver{r}
-}
 func (r *Resolver) SceneMarker() models.SceneMarkerResolver {
 	return &sceneMarkerResolver{r}
 }
 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}
 }
@@ -47,22 +40,6 @@ 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 }
@@ -71,93 +48,62 @@ type galleryResolver struct{ *Resolver }
 type performerResolver struct{ *Resolver }
 type sceneResolver struct{ *Resolver }
 type sceneMarkerResolver struct{ *Resolver }
-type imageResolver 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 *Resolver) withTxn(ctx context.Context, fn func(r models.Repository) error) error {
-	return r.txnManager.WithTxn(ctx, fn)
+func (r *queryResolver) MarkerWall(ctx context.Context, q *string) ([]*models.SceneMarker, error) {
+	qb := models.NewSceneMarkerQueryBuilder()
+	return qb.Wall(q)
 }
 
-func (r *Resolver) withReadTxn(ctx context.Context, fn func(r models.ReaderRepository) error) error {
-	return r.txnManager.WithReadTxn(ctx, fn)
+func (r *queryResolver) SceneWall(ctx context.Context, q *string) ([]*models.Scene, error) {
+	qb := models.NewSceneQueryBuilder()
+	return qb.Wall(q)
 }
 
-func (r *queryResolver) MarkerWall(ctx context.Context, q *string) (ret []*models.SceneMarker, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.SceneMarker().Wall(q)
-		return err
-	}); err != nil {
-		return nil, err
+func (r *queryResolver) MarkerStrings(ctx context.Context, q *string, sort *string) ([]*models.MarkerStringsResultType, error) {
+	qb := models.NewSceneMarkerQueryBuilder()
+	return qb.GetMarkerStrings(q, sort)
+}
+
+func (r *queryResolver) ValidGalleriesForScene(ctx context.Context, scene_id *string) ([]*models.Gallery, error) {
+	if scene_id == nil {
+		panic("nil scene id") // TODO make scene_id mandatory
 	}
-	return ret, nil
-}
-
-func (r *queryResolver) SceneWall(ctx context.Context, q *string) (ret []*models.Scene, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Scene().Wall(q)
-		return err
-	}); err != nil {
+	sceneID, _ := strconv.Atoi(*scene_id)
+	sqb := models.NewSceneQueryBuilder()
+	scene, err := sqb.Find(sceneID)
+	if err != nil {
 		return nil, err
 	}
 
-	return ret, nil
-}
-
-func (r *queryResolver) MarkerStrings(ctx context.Context, q *string, sort *string) (ret []*models.MarkerStringsResultType, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.SceneMarker().GetMarkerStrings(q, sort)
-		return err
-	}); err != nil {
-		return nil, err
+	qb := models.NewGalleryQueryBuilder()
+	validGalleries, err := qb.ValidGalleriesForScenePath(scene.Path)
+	sceneGallery, _ := qb.FindBySceneID(sceneID, nil)
+	if sceneGallery != nil {
+		validGalleries = append(validGalleries, sceneGallery)
 	}
-
-	return ret, nil
+	return validGalleries, nil
 }
 
 func (r *queryResolver) Stats(ctx context.Context) (*models.StatsResultType, error) {
-	var ret models.StatsResultType
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		scenesQB := repo.Scene()
-		imageQB := repo.Image()
-		galleryQB := repo.Gallery()
-		studiosQB := repo.Studio()
-		performersQB := repo.Performer()
-		moviesQB := repo.Movie()
-		tagsQB := repo.Tag()
-		scenesCount, _ := scenesQB.Count()
-		scenesSize, _ := scenesQB.Size()
-		imageCount, _ := imageQB.Count()
-		imageSize, _ := imageQB.Size()
-		galleryCount, _ := galleryQB.Count()
-		performersCount, _ := performersQB.Count()
-		studiosCount, _ := studiosQB.Count()
-		moviesCount, _ := moviesQB.Count()
-		tagsCount, _ := tagsQB.Count()
-
-		ret = models.StatsResultType{
-			SceneCount:     scenesCount,
-			ScenesSize:     scenesSize,
-			ImageCount:     imageCount,
-			ImagesSize:     imageSize,
-			GalleryCount:   galleryCount,
-			PerformerCount: performersCount,
-			StudioCount:    studiosCount,
-			MovieCount:     moviesCount,
-			TagCount:       tagsCount,
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return &ret, nil
+	scenesQB := models.NewSceneQueryBuilder()
+	scenesCount, _ := scenesQB.Count()
+	galleryQB := models.NewGalleryQueryBuilder()
+	galleryCount, _ := galleryQB.Count()
+	performersQB := models.NewPerformerQueryBuilder()
+	performersCount, _ := performersQB.Count()
+	studiosQB := models.NewStudioQueryBuilder()
+	studiosCount, _ := studiosQB.Count()
+	tagsQB := models.NewTagQueryBuilder()
+	tagsCount, _ := tagsQB.Count()
+	return &models.StatsResultType{
+		SceneCount:     scenesCount,
+		GalleryCount:   galleryCount,
+		PerformerCount: performersCount,
+		StudioCount:    studiosCount,
+		TagCount:       tagsCount,
+	}, nil
 }
 
 func (r *queryResolver) Version(ctx context.Context) (*models.Version, error) {
@@ -170,58 +116,33 @@ func (r *queryResolver) Version(ctx context.Context) (*models.Version, error) {
 	}, nil
 }
 
-//Gets latest version (git shorthash commit for now)
-func (r *queryResolver) Latestversion(ctx context.Context) (*models.ShortVersion, error) {
-	ver, url, err := GetLatestVersion(true)
-	if err == nil {
-		logger.Infof("Retrieved latest hash: %s", ver)
-	} else {
-		logger.Errorf("Error while retrieving latest hash: %s", err)
-	}
-
-	return &models.ShortVersion{
-		Shorthash: ver,
-		URL:       url,
-	}, err
-}
-
 // Get scene marker tags which show up under the video.
 func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([]*models.SceneMarkerTag, error) {
-	sceneID, err := strconv.Atoi(scene_id)
+	sceneID, _ := strconv.Atoi(scene_id)
+	sqb := models.NewSceneMarkerQueryBuilder()
+	sceneMarkers, err := sqb.FindBySceneID(sceneID, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	var keys []int
 	tags := make(map[int]*models.SceneMarkerTag)
-
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		sceneMarkers, err := repo.SceneMarker().FindBySceneID(sceneID)
+	var keys []int
+	tqb := models.NewTagQueryBuilder()
+	for _, sceneMarker := range sceneMarkers {
+		markerPrimaryTag, err := tqb.Find(sceneMarker.PrimaryTagID, nil)
 		if err != nil {
-			return err
+			return nil, err
 		}
-
-		tqb := repo.Tag()
-		for _, sceneMarker := range sceneMarkers {
-			markerPrimaryTag, err := tqb.Find(sceneMarker.PrimaryTagID)
-			if err != nil {
-				return err
-			}
-			_, hasKey := tags[markerPrimaryTag.ID]
-			var sceneMarkerTag *models.SceneMarkerTag
-			if !hasKey {
-				sceneMarkerTag = &models.SceneMarkerTag{Tag: markerPrimaryTag}
-				tags[markerPrimaryTag.ID] = sceneMarkerTag
-				keys = append(keys, markerPrimaryTag.ID)
-			} else {
-				sceneMarkerTag = tags[markerPrimaryTag.ID]
-			}
-			tags[markerPrimaryTag.ID].SceneMarkers = append(tags[markerPrimaryTag.ID].SceneMarkers, sceneMarker)
+		_, hasKey := tags[markerPrimaryTag.ID]
+		var sceneMarkerTag *models.SceneMarkerTag
+		if !hasKey {
+			sceneMarkerTag = &models.SceneMarkerTag{Tag: markerPrimaryTag}
+			tags[markerPrimaryTag.ID] = sceneMarkerTag
+			keys = append(keys, markerPrimaryTag.ID)
+		} else {
+			sceneMarkerTag = tags[markerPrimaryTag.ID]
 		}
-
-		return nil
-	}); err != nil {
-		return nil, err
+		tags[markerPrimaryTag.ID].SceneMarkers = append(tags[markerPrimaryTag.ID].SceneMarkers, sceneMarker)
 	}
 
 	// Sort so that primary tags that show up earlier in the video are first.
@@ -238,3 +159,13 @@ func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([
 
 	return result, nil
 }
+
+// wasFieldIncluded returns true if the given field was included in the request.
+// Slices are unmarshalled to empty slices even if the field was omitted. This
+// method determines if it was omitted altogether.
+func wasFieldIncluded(ctx context.Context, field string) bool {
+	rctx := graphql.GetRequestContext(ctx)
+
+	_, ret := rctx.Variables[field]
+	return ret
+}

pkg/api/resolver_model_gallery.go

@@ -2,154 +2,14 @@ package api
 
 import (
 	"context"
-
-	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/utils"
 )
 
-func (r *galleryResolver) Path(ctx context.Context, obj *models.Gallery) (*string, error) {
-	if obj.Path.Valid {
-		return &obj.Path.String, nil
-	}
-	return nil, nil
-}
-
 func (r *galleryResolver) Title(ctx context.Context, obj *models.Gallery) (*string, error) {
-	if obj.Title.Valid {
-		return &obj.Title.String, nil
-	}
-	return nil, nil
+	return nil, nil // TODO remove this from schema
 }
 
-func (r *galleryResolver) Images(ctx context.Context, obj *models.Gallery) (ret []*models.Image, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Image().FindByGalleryID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) Cover(ctx context.Context, obj *models.Gallery) (ret *models.Image, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		imgs, err := repo.Image().FindByGalleryID(obj.ID)
-		if err != nil {
-			return err
-		}
-
-		if len(imgs) > 0 {
-			ret = imgs[0]
-		}
-
-		for _, img := range imgs {
-			if image.IsCover(img) {
-				ret = img
-				break
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) Date(ctx context.Context, obj *models.Gallery) (*string, error) {
-	if obj.Date.Valid {
-		result := utils.GetYMDFromDatabaseDate(obj.Date.String)
-		return &result, nil
-	}
-	return nil, nil
-}
-
-func (r *galleryResolver) URL(ctx context.Context, obj *models.Gallery) (*string, error) {
-	if obj.URL.Valid {
-		return &obj.URL.String, nil
-	}
-	return nil, nil
-}
-
-func (r *galleryResolver) Details(ctx context.Context, obj *models.Gallery) (*string, error) {
-	if obj.Details.Valid {
-		return &obj.Details.String, nil
-	}
-	return nil, nil
-}
-
-func (r *galleryResolver) Rating(ctx context.Context, obj *models.Gallery) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
-}
-
-func (r *galleryResolver) Scenes(ctx context.Context, obj *models.Gallery) (ret []*models.Scene, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Scene().FindByGalleryID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) Studio(ctx context.Context, obj *models.Gallery) (ret *models.Studio, err error) {
-	if !obj.StudioID.Valid {
-		return nil, nil
-	}
-
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Studio().Find(int(obj.StudioID.Int64))
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) Tags(ctx context.Context, obj *models.Gallery) (ret []*models.Tag, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Tag().FindByGalleryID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) Performers(ctx context.Context, obj *models.Gallery) (ret []*models.Performer, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Performer().FindByGalleryID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *galleryResolver) ImageCount(ctx context.Context, obj *models.Gallery) (ret int, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Image().CountByGalleryID(obj.ID)
-		return err
-	}); err != nil {
-		return 0, err
-	}
-
-	return ret, nil
+func (r *galleryResolver) Files(ctx context.Context, obj *models.Gallery) ([]*models.GalleryFilesType, error) {
+	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
+	return obj.GetFiles(baseURL), nil
 }

pkg/api/resolver_model_image.go

@@ -1,93 +0,0 @@
-package api
-
-import (
-	"context"
-
-	"github.com/stashapp/stash/pkg/api/urlbuilders"
-	"github.com/stashapp/stash/pkg/image"
-	"github.com/stashapp/stash/pkg/models"
-)
-
-func (r *imageResolver) Title(ctx context.Context, obj *models.Image) (*string, error) {
-	ret := image.GetTitle(obj)
-	return &ret, nil
-}
-
-func (r *imageResolver) Rating(ctx context.Context, obj *models.Image) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
-}
-
-func (r *imageResolver) File(ctx context.Context, obj *models.Image) (*models.ImageFileType, error) {
-	width := int(obj.Width.Int64)
-	height := int(obj.Height.Int64)
-	size := int(obj.Size.Int64)
-	return &models.ImageFileType{
-		Size:   &size,
-		Width:  &width,
-		Height: &height,
-	}, nil
-}
-
-func (r *imageResolver) Paths(ctx context.Context, obj *models.Image) (*models.ImagePathsType, error) {
-	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	builder := urlbuilders.NewImageURLBuilder(baseURL, obj)
-	thumbnailPath := builder.GetThumbnailURL()
-	imagePath := builder.GetImageURL()
-	return &models.ImagePathsType{
-		Image:     &imagePath,
-		Thumbnail: &thumbnailPath,
-	}, nil
-}
-
-func (r *imageResolver) Galleries(ctx context.Context, obj *models.Image) (ret []*models.Gallery, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		ret, err = repo.Gallery().FindByImageID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *imageResolver) Studio(ctx context.Context, obj *models.Image) (ret *models.Studio, err error) {
-	if !obj.StudioID.Valid {
-		return nil, nil
-	}
-
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Studio().Find(int(obj.StudioID.Int64))
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *imageResolver) Tags(ctx context.Context, obj *models.Image) (ret []*models.Tag, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Tag().FindByImageID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *imageResolver) Performers(ctx context.Context, obj *models.Image) (ret []*models.Performer, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Performer().FindByImageID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}

pkg/api/resolver_model_movie.go

@@ -1,125 +0,0 @@
-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) (ret *models.Studio, err error) {
-	if obj.StudioID.Valid {
-		if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-			ret, err = repo.Studio().Find(int(obj.StudioID.Int64))
-			return err
-		}); err != nil {
-			return nil, err
-		}
-
-		return ret, 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).GetMovieFrontImageURL()
-	return &frontimagePath, nil
-}
-
-func (r *movieResolver) BackImagePath(ctx context.Context, obj *models.Movie) (*string, error) {
-	// don't return any thing if there is no back image
-	var img []byte
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		var err error
-		img, err = repo.Movie().GetBackImage(obj.ID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	if img == nil {
-		return nil, nil
-	}
-
-	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	backimagePath := urlbuilders.NewMovieURLBuilder(baseURL, obj).GetMovieBackImageURL()
-	return &backimagePath, nil
-}
-
-func (r *movieResolver) SceneCount(ctx context.Context, obj *models.Movie) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		res, err = repo.Scene().CountByMovieID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, err
-}

pkg/api/resolver_model_performer.go

@@ -2,10 +2,7 @@ package api
 
 import (
 	"context"
-
 	"github.com/stashapp/stash/pkg/api/urlbuilders"
-	"github.com/stashapp/stash/pkg/gallery"
-	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 )
 
@@ -23,19 +20,6 @@ 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
@@ -136,112 +120,17 @@ func (r *performerResolver) Favorite(ctx context.Context, obj *models.Performer)
 
 func (r *performerResolver) ImagePath(ctx context.Context, obj *models.Performer) (*string, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
-	imagePath := urlbuilders.NewPerformerURLBuilder(baseURL, obj).GetPerformerImageURL()
+	imagePath := urlbuilders.NewPerformerURLBuilder(baseURL, obj.ID).GetPerformerImageURL()
 	return &imagePath, nil
 }
 
-func (r *performerResolver) Tags(ctx context.Context, obj *models.Performer) (ret []*models.Tag, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Tag().FindByPerformerID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
+func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performer) (*int, error) {
+	qb := models.NewSceneQueryBuilder()
+	res, err := qb.CountByPerformerID(obj.ID)
+	return &res, err
 }
 
-func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		res, err = repo.Scene().CountByPerformerID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-func (r *performerResolver) ImageCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		res, err = image.CountByPerformerID(repo.Image(), obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-func (r *performerResolver) GalleryCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
-	var res int
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		res, err = gallery.CountByPerformerID(repo.Gallery(), obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &res, nil
-}
-
-func (r *performerResolver) Scenes(ctx context.Context, obj *models.Performer) (ret []*models.Scene, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Scene().FindByPerformerID(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *performerResolver) StashIds(ctx context.Context, obj *models.Performer) (ret []*models.StashID, err error) {
-	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
-		ret, err = repo.Performer().GetStashIDs(obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *performerResolver) Rating(ctx context.Context, obj *models.Performer) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
-}
-
-func (r *performerResolver) Details(ctx context.Context, obj *models.Performer) (*string, error) {
-	if obj.Details.Valid {
-		return &obj.Details.String, nil
-	}
-	return nil, nil
-}
-
-func (r *performerResolver) DeathDate(ctx context.Context, obj *models.Performer) (*string, error) {
-	if obj.DeathDate.Valid {
-		return &obj.DeathDate.String, nil
-	}
-	return nil, nil
-}
-
-func (r *performerResolver) HairColor(ctx context.Context, obj *models.Performer) (*string, error) {
-	if obj.HairColor.Valid {
-		return &obj.HairColor.String, nil
-	}
-	return nil, nil
-}
-
-func (r *performerResolver) Weight(ctx context.Context, obj *models.Performer) (*int, error) {
-	if obj.Weight.Valid {
-		weight := int(obj.Weight.Int64)
-		return &weight, nil
-	}
-	return nil, nil
+func (r *performerResolver) Scenes(ctx context.Context, obj *models.Performer) ([]*models.Scene, error) {
+	qb := models.NewSceneQueryBuilder()
+	return qb.FindByPerformerID(obj.ID)
 }