.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

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

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/workflows/build.yml

@@ -2,10 +2,7 @@ name: Build
 
 on:
   push:
-    branches: 
+    branches: [ develop, master ]
-      - develop
-      - master
-      - 'releases/**'
   pull_request:
   release:
     types: [ published ]
@@ -15,11 +12,11 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:12
+  COMPILER_IMAGE: stashapp/compiler:10
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
 
@@ -40,7 +37,7 @@ jobs:
         cache-name: cache-node_modules
       with:
         path: ui/v2.5/node_modules
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
 
     - name: Cache UI build
       uses: actions/cache@v3
@@ -49,7 +46,7 @@ jobs:
         cache-name: cache-ui
       with:
         path: ui/v2.5/build
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/pnpm-lock.yaml', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock', 'ui/v2.5/public/**', 'ui/v2.5/src/**', 'graphql/**/*.graphql') }}
 
     - name: Cache go build
       uses: actions/cache@v3
@@ -68,7 +65,7 @@ jobs:
         docker run -d --name build --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated --mount type=bind,source="$(pwd)/.go-cache",target=/root/.cache/go-build,consistency=delegated --env OFFICIAL_BUILD=${{ env.official-build }} -w /stash $COMPILER_IMAGE tail -f /dev/null
 
     - name: Pre-install
-      run: docker exec -t build /bin/bash -c "make CI=1 pre-ui"
+      run: docker exec -t build /bin/bash -c "make pre-ui"
 
     - name: Generate
       run: docker exec -t build /bin/bash -c "make generate"

.github/workflows/golangci-lint.yml

@@ -6,11 +6,10 @@ on:
     branches:
       - master
       - develop
-      - 'releases/**'
   pull_request:
 
 env:
-  COMPILER_IMAGE: stashapp/compiler:12
+  COMPILER_IMAGE: stashapp/compiler:10
 
 jobs:
   golangci:

.gitignore

@@ -21,9 +21,6 @@ vendor
 # GraphQL generated output
 internal/api/generated_*.go
 
-# Generated locale files
-ui/login/locales/*
-
 ####
 # Visual Studio
 ####

.gqlgenc.yml

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

.idea/go.iml

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

Makefile

@@ -275,16 +275,12 @@ generate: generate-backend generate-ui
 
 .PHONY: generate-ui
 generate-ui:
-	cd ui/v2.5 && npm run gqlgen
+	cd ui/v2.5 && yarn run gqlgen
 
 .PHONY: generate-backend
 generate-backend: touch-ui
 	go generate ./cmd/stash
 
-.PHONY: generate-login-locale
-generate-login-locale:
-	go generate ./ui
-
 .PHONY: generate-dataloaders
 generate-dataloaders:
 	go generate ./internal/api/loaders
@@ -338,19 +334,9 @@ server-clean:
 
 # installs UI dependencies. Run when first cloning repository, or if UI
 # dependencies have changed
-# If CI is set, configures pnpm to use a local store to avoid
-# putting .pnpm-store in /stash
-# NOTE: to run in the docker build container, using the existing
-# node_modules folder, rename the .modules.yaml to .modules.yaml.bak
-# and a new one will be generated. This will need to be reversed after
-# building.
 .PHONY: pre-ui
 pre-ui:
-ifdef CI
+	cd ui/v2.5 && yarn install --frozen-lockfile
-	cd ui/v2.5 && pnpm config set store-dir ~/.pnpm-store && pnpm install --frozen-lockfile
-else
-	cd ui/v2.5 && pnpm install --frozen-lockfile
-endif
 
 .PHONY: ui-env
 ui-env: build-info
@@ -365,11 +351,8 @@ ifdef STASH_SOURCEMAPS
 endif
 
 .PHONY: ui
-ui: ui-only generate-login-locale
+ui: ui-env
-
+	cd ui/v2.5 && yarn build
-.PHONY: ui-only
-ui-only: ui-env
-	cd ui/v2.5 && npm run build
 
 .PHONY: zip-ui
 zip-ui:
@@ -378,24 +361,20 @@ zip-ui:
 
 .PHONY: ui-start
 ui-start: ui-env
-	cd ui/v2.5 && npm run start -- --host
+	cd ui/v2.5 && yarn start --host
 
 .PHONY: fmt-ui
 fmt-ui:
-	cd ui/v2.5 && npm run format
+	cd ui/v2.5 && yarn format
 
 # runs all of the frontend PR-acceptance steps
 .PHONY: validate-ui
 validate-ui:
-	cd ui/v2.5 && npm run validate
+	cd ui/v2.5 && yarn run validate
 
 # these targets run the same steps as fmt-ui and validate-ui, but only on files that have changed
 fmt-ui-quick:
-	cd ui/v2.5 && \
+	cd ui/v2.5 && yarn run prettier --write $$(git diff --name-only --relative --diff-filter d . ../../graphql)
-	files=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
-	if [ -n "$$files" ]; then \
-	  npm run prettier -- --write $$files; \
-	fi
 
 # does not run tsc checks, as they are slow
 validate-ui-quick:
@@ -403,9 +382,9 @@ validate-ui-quick:
 	tsfiles=$$(git diff --name-only --relative --diff-filter d src | grep -e "\.tsx\?\$$"); \
 	scssfiles=$$(git diff --name-only --relative --diff-filter d src | grep "\.scss"); \
 	prettyfiles=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
-	if [ -n "$$tsfiles" ]; then npm run eslint -- $$tsfiles; fi && \
+	if [ -n "$$tsfiles" ]; then yarn run eslint $$tsfiles; fi && \
-	if [ -n "$$scssfiles" ]; then npm run stylelint -- $$scssfiles; fi && \
+	if [ -n "$$scssfiles" ]; then yarn run stylelint $$scssfiles; fi && \
-	if [ -n "$$prettyfiles" ]; then npm run prettier -- --check $$prettyfiles; fi
+	if [ -n "$$prettyfiles" ]; then yarn run prettier --check $$prettyfiles; fi
 
 # runs all of the backend PR-acceptance steps
 .PHONY: validate-backend

README.md

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

cmd/stash/main.go

@@ -110,7 +110,7 @@ func main() {
 // Logs only error level message to stderr.
 func initLogTemp() *log.Logger {
 	l := log.NewLogger()
-	l.Init("", true, "Error", 0)
+	l.Init("", true, "Error")
 	logger.Logger = l
 
 	return l
@@ -118,7 +118,7 @@ func initLogTemp() *log.Logger {
 
 func initLog(cfg *config.Config) *log.Logger {
 	l := log.NewLogger()
-	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel(), cfg.GetLogFileMaxSize())
+	l.Init(cfg.GetLogFile(), cfg.GetLogOut(), cfg.GetLogLevel())
 	logger.Logger = l
 
 	return l
@@ -152,9 +152,6 @@ func recoverPanic() {
 func exitError(err error) {
 	exitCode = 1
 	logger.Error(err)
-	// #5784 - log to stdout as well as the logger
-	// this does mean that it will log twice if the logger is set to stdout
-	fmt.Println(err)
 	if desktop.IsDesktop() {
 		desktop.FatalError(err)
 	}

docker/build/x86_64/Dockerfile

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

docker/build/x86_64/Dockerfile-CUDA

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

docker/build/x86_64/README.md

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

docker/ci/x86_64/Dockerfile

@@ -12,8 +12,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
 FROM --platform=$TARGETPLATFORM alpine:latest AS app
 COPY --from=binary /stash /usr/bin/
 
-RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg tzdata vips vips-tools \
+RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata vips vips-tools \
-    && pip install --break-system-packages mechanicalsoup cloudscraper stashapp-tools
+    && pip install --user --break-system-packages mechanicalsoup cloudscraper stashapp-tools \
+    && gem install faraday
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
 
 # Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys

docker/compiler/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.3
+FROM golang:1.22.8
 
 LABEL maintainer="https://discord.gg/2TsNFKt"
 
@@ -8,11 +8,15 @@ RUN mkdir -p /etc/apt/keyrings
 
 ADD https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key nodesource.gpg.key
 RUN cat nodesource.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && rm nodesource.gpg.key
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+
+ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
+RUN cat yarn.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg && rm yarn.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        git make tar bash nodejs zip \
+        git make tar bash nodejs yarn zip \
         clang llvm-dev cmake patch libxml2-dev uuid-dev libssl-dev xz-utils \
         bzip2 gzip sed cpio libbz2-dev zlib1g-dev \
         gcc-mingw-w64 \
@@ -20,9 +24,6 @@ RUN apt-get update && \
         gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
     rm -rf /var/lib/apt/lists/*;
 
-# pnpm install with npm
-RUN npm install -g pnpm
-
 # FreeBSD cross-compilation setup
 # https://github.com/smartmontools/docker-build/blob/6b8c92560d17d325310ba02d9f5a4b250cb0764a/Dockerfile#L66
 ENV FREEBSD_VERSION       13.4

docker/compiler/Makefile

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

docs/DEVELOPMENT.md

@@ -5,8 +5,7 @@
 * [Go](https://golang.org/dl/)
 * [GolangCI](https://golangci-lint.run/) - A meta-linter which runs several linters in parallel
   * To install, follow the [local installation instructions](https://golangci-lint.run/welcome/install/#local-installation)
-* [nodejs](https://nodejs.org/en/download) - nodejs runtime
+* [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
-  * corepack/[pnpm](https://pnpm.io/installation) - nodejs package manager (included with nodejs)
 
 ## Environment
 
@@ -23,22 +22,32 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MinGW. For examp
 ### macOS
 
 1. If you don't have it already, install the [Homebrew package manager](https://brew.sh).
-2. Install dependencies: `brew install go git gcc make node ffmpeg`
+2. Install dependencies: `brew install go git yarn gcc make node ffmpeg`
 
 ### Linux
 
 #### Arch Linux
 
-1. Install dependencies: `sudo pacman -S go git gcc make nodejs ffmpeg --needed`
+1. Install dependencies: `sudo pacman -S go git yarn gcc make nodejs ffmpeg --needed`
 
 #### Ubuntu
 
-1. Install dependencies: `sudo apt-get install golang git gcc nodejs ffmpeg -y`
+1. Install dependencies: `sudo apt-get install golang git yarnpkg gcc nodejs ffmpeg -y`
 
 ### OpenBSD
 
-1. Install dependencies `doas pkg_add gmake go git node cmake ffmpeg`
+1. Install dependencies `doas pkg_add gmake go git yarn node cmake`
-2. Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
+2. Compile a custom ffmpeg from ports. The default ffmpeg in OpenBSD's packages is not compiled with WebP support, which is required by Stash.
+   - If you've already installed ffmpeg, uninstall it: `doas pkg_delete ffmpeg`
+   - If you haven't already, [fetch the ports tree and verify](https://www.openbsd.org/faq/ports/ports.html#PortsFetch).
+   - Find the ffmpeg port in `/usr/ports/graphics/ffmpeg`, and patch the Makefile to include libwebp
+     - Add `webp` to `WANTLIB`
+     - Add `graphics/libwebp` to the list in `LIB_DEPENDS`
+     - Add `-lwebp -lwebpdecoder -lwebpdemux -lwebpmux` to `LIBavcodec_EXTRALIBS`
+     - Add `--enable-libweb` to the list in `CONFIGURE_ARGS`
+     - If you've already built ffmpeg from ports before, you may need to also increment `REVISION`
+     - Run `doas make install`
+   - Follow the instructions below to build a release, but replace the final step `make build-release` with `gmake flags-release stash`, to [avoid the PIE buildmode](https://github.com/golang/go/issues/59866).
 
 NOTE: The `make` command in OpenBSD will be `gmake`. For example, `make pre-ui` will be `gmake pre-ui`.
 

go.mod

@@ -1,11 +1,11 @@
 module github.com/stashapp/stash
 
-go 1.24.3
+go 1.22.8
 
 require (
-	github.com/99designs/gqlgen v0.17.73
+	github.com/99designs/gqlgen v0.17.55
 	github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552
-	github.com/Yamashou/gqlgenc v0.32.1
+	github.com/Yamashou/gqlgenc v0.25.3
 	github.com/anacrolix/dms v1.2.2
 	github.com/antchfx/htmlquery v1.3.0
 	github.com/asticode/go-astisub v0.25.1
@@ -15,11 +15,11 @@ require (
 	github.com/disintegration/imaging v1.6.2
 	github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
 	github.com/doug-martin/goqu/v9 v9.18.0
-	github.com/go-chi/chi/v5 v5.2.2
+	github.com/go-chi/chi/v5 v5.0.12
 	github.com/go-chi/cors v1.2.1
 	github.com/go-chi/httplog v0.3.1
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4
-	github.com/golang-jwt/jwt/v4 v4.5.2
+	github.com/golang-jwt/jwt/v4 v4.5.1
 	github.com/golang-migrate/migrate/v4 v4.16.2
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/securecookie v1.1.1
@@ -32,11 +32,7 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/kermieisinthehouse/gosx-notifier v0.1.2
 	github.com/kermieisinthehouse/systray v1.2.4
-	github.com/knadh/koanf/parsers/yaml v1.1.0
+	github.com/knadh/koanf v1.5.0
-	github.com/knadh/koanf/providers/env v1.1.0
-	github.com/knadh/koanf/providers/file v1.2.0
-	github.com/knadh/koanf/providers/posflag v1.0.1
-	github.com/knadh/koanf/v2 v2.2.1
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/mitchellh/mapstructure v1.5.0
@@ -46,44 +42,40 @@ require (
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cast v1.6.0
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.9.0
 	github.com/tidwall/gjson v1.16.0
 	github.com/vearutop/statigz v1.4.0
 	github.com/vektah/dataloaden v0.3.0
-	github.com/vektah/gqlparser/v2 v2.5.27
+	github.com/vektah/gqlparser/v2 v2.5.18
 	github.com/vektra/mockery/v2 v2.10.0
 	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
 	github.com/zencoder/go-dash/v3 v3.0.2
-	golang.org/x/crypto v0.45.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/image v0.18.0
-	golang.org/x/net v0.47.0
+	golang.org/x/net v0.33.0
-	golang.org/x/sys v0.38.0
+	golang.org/x/sys v0.28.0
-	golang.org/x/term v0.37.0
+	golang.org/x/term v0.27.0
-	golang.org/x/text v0.31.0
+	golang.org/x/text v0.21.0
-	golang.org/x/time v0.10.0
 	gopkg.in/guregu/null.v4 v4.0.0
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/agnivade/levenshtein v1.2.1 // indirect
+	github.com/agnivade/levenshtein v1.2.0 // indirect
 	github.com/antchfx/xpath v1.2.3 // indirect
 	github.com/asticode/go-astikit v0.20.0 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/coder/websocket v1.8.12 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.3.0 // indirect
-	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -91,10 +83,9 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -117,13 +108,12 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/urfave/cli/v2 v2.27.6 // indirect
+	github.com/urfave/cli/v2 v2.27.5 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.yaml.in/yaml/v3 v3.0.3 // indirect
+	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
-	golang.org/x/tools v0.38.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -51,27 +51,28 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/99designs/gqlgen v0.17.73 h1:A3Ki+rHWqKbAOlg5fxiZBnz6OjW3nwupDHEG15gEsrg=
+github.com/99designs/gqlgen v0.17.55 h1:3vzrNWYyzSZjGDFo68e5j9sSauLxfKvLp+6ioRokVtM=
-github.com/99designs/gqlgen v0.17.73/go.mod h1:2RyGWjy2k7W9jxrs8MOQthXGkD3L3oGr0jXW3Pu8lGg=
+github.com/99designs/gqlgen v0.17.55/go.mod h1:3Bq768f8hgVPGZxL8aY9MaYmbxa6llPM/qu1IGH1EJo=
 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/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.9.3 h1:mpJr/ikUA9/GNJB/DBZcGeFDXUtosHRyRrwh7KGdTG0=
-github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
+github.com/PuerkitoBio/goquery v1.9.3/go.mod h1:1ndLHPdTz+DyQPICCWYlYQMPl0oXZj0G6D4LCYA6u4U=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
 github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552 h1:eukVk+mGmbSZppLw8WJGpEUgMC570eb32y7FOsPW4Kc=
 github.com/WithoutPants/sortorder v0.0.0-20230616003020-921c9ef69552/go.mod h1:LKbO1i6L1lSlwWx4NHWVECxubHNKFz2YQoEMGXAFVy8=
-github.com/Yamashou/gqlgenc v0.32.1 h1:EHs9//xQxXlyltkSFXM+fhO2rTXcWNw6FPKRJ6t+iQQ=
+github.com/Yamashou/gqlgenc v0.25.3 h1:mVV8/Ho8EDZUQKQZbQqqXGNq8jc8aQfPpHhZOnTkMNE=
-github.com/Yamashou/gqlgenc v0.32.1/go.mod h1:o5SxKt9d3+oUZ2i0V3CW8lHFyunfLR+KcKHubS4zf5E=
+github.com/Yamashou/gqlgenc v0.25.3/go.mod h1:G0g1N81xpIklVdnyboW1zwOHcj/n4hNfhTwfN29Rjig=
-github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
+github.com/agnivade/levenshtein v1.2.0 h1:U9L4IOT0Y3i0TIlUIDJ7rVUziKi/zPbrJGaFrtYH3SY=
-github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=
+github.com/agnivade/levenshtein v1.2.0/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/anacrolix/dms v1.2.2 h1:0mk2/DXNqa5KDDbaLgFPf3oMV6VCGdFNh3d/gt4oafM=
 github.com/anacrolix/dms v1.2.2/go.mod h1:msPKAoppoNRfrYplJqx63FZ+VipDZ4Xsj3KzIQxyU7k=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
@@ -83,8 +84,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
 github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
-github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
+github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
 github.com/antchfx/htmlquery v1.3.0 h1:5I5yNFOVI+egyia5F2s/5Do2nFWxJz41Tr3DyfKD25E=
 github.com/antchfx/htmlquery v1.3.0/go.mod h1:zKPDVTMhfOmcwxheXUsx4rKJy8KEY/PU6eXr/2SebQ8=
 github.com/antchfx/xpath v1.2.3 h1:CCZWOzv5bAqjVv0offZ2LVgVYFbeldKQVuLNbViZdes=
@@ -103,6 +104,16 @@ github.com/asticode/go-astisub v0.25.1 h1:RZMGfZPp7CXOkI6g+zCU7DRLuciGPGup921uKZ
 github.com/asticode/go-astisub v0.25.1/go.mod h1:WTkuSzFB+Bp7wezuSf2Oxulj5A8zu2zLRVFf6bIFQK8=
 github.com/asticode/go-astits v1.8.0 h1:rf6aiiGn/QhlFjNON1n5plqF3Fs025XLUwiQ0NB6oZg=
 github.com/asticode/go-astits v1.8.0/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ=
+github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
+github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
+github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ=
+github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8=
+github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
+github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 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/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -151,8 +162,8 @@ github.com/corona10/goimagehash v1.1.0 h1:teNMX/1e+Wn/AYSbLHX8mj+mF9r60R1kBeqE9M
 github.com/corona10/goimagehash v1.1.0/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
-github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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=
@@ -174,6 +185,7 @@ github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8
 github.com/doug-martin/goqu/v9 v9.18.0 h1:/6bcuEtAe6nsSMVK/M+fOiXUNfyFF3yYtE07DBPFMYY=
 github.com/doug-martin/goqu/v9 v9.18.0/go.mod h1:nf0Wc2/hV3gYK9LiyqIrzBEVGlI8qW3GuDCEobC4wBQ=
 github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -188,17 +200,19 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
-github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/httplog v0.3.1 h1:uC3IUWCZagtbCinb3ypFh36SEcgd6StWw2Bu0XSXRtg=
@@ -208,18 +222,20 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
 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=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
@@ -227,13 +243,11 @@ github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm
 github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/gobwas/ws v1.3.0 h1:sbeU3Y4Qzlb+MOzIe6mQGf7QR4Hkv6ZD0qhGkBFL2O0=
 github.com/gobwas/ws v1.3.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-migrate/migrate/v4 v4.16.2 h1:8coYbMKUyInrFk1lfGfRovTLAW7PhWp8qQDT2iKfuoA=
 github.com/golang-migrate/migrate/v4 v4.16.2/go.mod h1:pfcJX4nPHaVdc5nmdCikFBWtm+UBpiZjRNNsyBbp0/o=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
@@ -270,6 +284,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 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=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -286,8 +301,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -326,9 +342,11 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
+github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
@@ -336,6 +354,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
+github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -345,12 +365,17 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 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-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -365,8 +390,14 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
 github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
+github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
+github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
+github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hasura/go-graphql-client v0.13.1 h1:kKbjhxhpwz58usVl+Xvgah/TDha5K2akNTRQdsEHN6U=
 github.com/hasura/go-graphql-client v0.13.1/go.mod h1:k7FF7h53C+hSNFRG3++DdVZWIuHdCaTbI7siTJ//zGQ=
+github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=
+github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -377,12 +408,18 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+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/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -390,25 +427,17 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kermieisinthehouse/gosx-notifier v0.1.2 h1:KV0KBeKK2B24kIHY7iK0jgS64Q05f4oB+hUZmsPodxQ=
 github.com/kermieisinthehouse/gosx-notifier v0.1.2/go.mod h1:xyWT07azFtUOcHl96qMVvKhvKzsMcS7rKTHQyv8WTho=
 github.com/kermieisinthehouse/systray v1.2.4 h1:pdH5vnl+KKjRrVCRU4g/2W1/0HVzuuJ6WXHlPPHYY6s=
 github.com/kermieisinthehouse/systray v1.2.4/go.mod h1:axh6C/jNuSyC0QGtidZJURc9h+h41HNoMySoLVrhVR4=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
+github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
-github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
-github.com/knadh/koanf/parsers/yaml v1.1.0 h1:3ltfm9ljprAHt4jxgeYLlFPmUaunuCgu1yILuTXRdM4=
-github.com/knadh/koanf/parsers/yaml v1.1.0/go.mod h1:HHmcHXUrp9cOPcuC+2wrr44GTUB0EC+PyfN3HZD9tFg=
-github.com/knadh/koanf/providers/env v1.1.0 h1:U2VXPY0f+CsNDkvdsG8GcsnK4ah85WwWyJgef9oQMSc=
-github.com/knadh/koanf/providers/env v1.1.0/go.mod h1:QhHHHZ87h9JxJAn2czdEl6pdkNnDh/JS1Vtsyt65hTY=
-github.com/knadh/koanf/providers/file v1.2.0 h1:hrUJ6Y9YOA49aNu/RSYzOTFlqzXSCpmYIDXI7OJU6+U=
-github.com/knadh/koanf/providers/file v1.2.0/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
-github.com/knadh/koanf/providers/posflag v1.0.1 h1:EnMxHSrPkYCFnKgBUl5KBgrjed8gVFrcXDzaW4l/C6Y=
-github.com/knadh/koanf/providers/posflag v1.0.1/go.mod h1:3Wn3+YG3f4ljzRyCUgIwH7G0sZ1pMjCOsNBovrbKmAk=
-github.com/knadh/koanf/v2 v2.2.1 h1:jaleChtw85y3UdBnI0wCqcg1sj1gPoz6D3caGNHtrNE=
-github.com/knadh/koanf/v2 v2.2.1/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -439,9 +468,8 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.3/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.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
@@ -459,17 +487,22 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 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 v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -481,20 +514,26 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 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/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/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -511,17 +550,24 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 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/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -539,6 +585,8 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
 github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
 github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
@@ -547,6 +595,7 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -567,9 +616,8 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
 github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
 github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
@@ -590,8 +638,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
@@ -604,14 +652,14 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
+github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
-github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
+github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 github.com/vearutop/statigz v1.4.0 h1:RQL0KG3j/uyA/PFpHeZ/L6l2ta920/MxlOAIGEOuwmU=
 github.com/vearutop/statigz v1.4.0/go.mod h1:LYTolBLiz9oJISwiVKnOQoIwhO1LWX1A7OECawGS8XE=
 github.com/vektah/dataloaden v0.3.0 h1:ZfVN2QD6swgvp+tDqdH/OIT/wu3Dhu0cus0k5gIZS84=
 github.com/vektah/dataloaden v0.3.0/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/gqlparser/v2 v2.5.27 h1:RHPD3JOplpk5mP5JGX8RKZkt2/Vwj/PZv0HxTdwFp0s=
+github.com/vektah/gqlparser/v2 v2.5.18 h1:zSND3GtutylAQ1JpWnTHcqtaRZjl+y3NROeW8vuNo6Y=
-github.com/vektah/gqlparser/v2 v2.5.27/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
+github.com/vektah/gqlparser/v2 v2.5.18/go.mod h1:6HLzf7JKv9Fi3APymudztFQNmLXR5qJeEo6BOFcXVfc=
 github.com/vektra/mockery/v2 v2.10.0 h1:MiiQWxwdq7/ET6dCXLaJzSGEN17k758H7JHS9kOdiks=
 github.com/vektra/mockery/v2 v2.10.0/go.mod h1:m/WO2UzWzqgVX3nvqpRQq70I4Z7jbSCRhdmkgtp+Ab4=
 github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
@@ -630,8 +678,11 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 github.com/zencoder/go-dash/v3 v3.0.2 h1:oP1+dOh+Gp57PkvdCyMfbHtrHaxfl3w4kR3KBBbuqQE=
 github.com/zencoder/go-dash/v3 v3.0.2/go.mod h1:30R5bKy1aUYY45yesjtZ9l8trNc2TwNqbS17WVQmCzk=
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
+go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -645,8 +696,6 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
-go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -664,8 +713,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 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=
@@ -707,8 +756,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -758,8 +807,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/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-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -789,16 +838,18 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 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-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -810,10 +861,12 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -828,6 +881,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -835,6 +890,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -847,6 +903,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -869,19 +926,21 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 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=
+golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -890,13 +949,11 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -956,8 +1013,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1004,6 +1061,7 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 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=
@@ -1067,9 +1125,11 @@ google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 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.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
@@ -1110,6 +1170,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1122,14 +1183,14 @@ gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -1146,3 +1207,4 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

gqlgen.yml

@@ -17,7 +17,7 @@ autobind:
   - github.com/stashapp/stash/pkg/scraper
   - github.com/stashapp/stash/internal/identify
   - github.com/stashapp/stash/internal/dlna
-  - github.com/stashapp/stash/pkg/stashbox
+  - github.com/stashapp/stash/pkg/scraper/stashbox
 
 models:
   # Scalars
@@ -35,8 +35,6 @@ models:
     model: github.com/stashapp/stash/internal/api.BoolMap
   PluginConfigMap:
     model: github.com/stashapp/stash/internal/api.PluginConfigMap
-  File:
-    model: github.com/stashapp/stash/internal/api.File
   VideoFile:
     fields:
       # override float fields - #1572

graphql/schema/schema.graphql

@@ -6,26 +6,6 @@ type Query {
   findDefaultFilter(mode: FilterMode!): SavedFilter
     @deprecated(reason: "default filter now stored in UI config")
 
-  "Find a file by its id or path"
-  findFile(id: ID, path: String): BaseFile!
-
-  "Queries for Files"
-  findFiles(
-    file_filter: FileFilterType
-    filter: FindFilterType
-    ids: [ID!]
-  ): FindFilesResultType!
-
-  "Find a file by its id or path"
-  findFolder(id: ID, path: String): Folder!
-
-  "Queries for Files"
-  findFolders(
-    folder_filter: FolderFilterType
-    filter: FindFilterType
-    ids: [ID!]
-  ): FindFoldersResultType!
-
   "Find a scene by ID or Checksum"
   findScene(id: ID, checksum: String): Scene
   findSceneByHash(input: SceneHashInput!): Scene
@@ -165,12 +145,6 @@ type Query {
     input: ScrapeSingleStudioInput!
   ): [ScrapedStudio!]!
 
-  "Scrape for a single tag"
-  scrapeSingleTag(
-    source: ScraperSourceInput!
-    input: ScrapeSingleTagInput!
-  ): [ScrapedTag!]!
-
   "Scrape for a single performer"
   scrapeSinglePerformer(
     source: ScraperSourceInput!
@@ -334,7 +308,6 @@ type Mutation {
 
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker
-  bulkSceneMarkerUpdate(input: BulkSceneMarkerUpdateInput!): [SceneMarker!]
   sceneMarkerDestroy(id: ID!): Boolean!
   sceneMarkersDestroy(ids: [ID!]!): Boolean!
 
@@ -378,7 +351,6 @@ type Mutation {
   studioUpdate(input: StudioUpdateInput!): Studio
   studioDestroy(input: StudioDestroyInput!): Boolean!
   studiosDestroy(ids: [ID!]!): Boolean!
-  bulkStudioUpdate(input: BulkStudioUpdateInput!): [Studio!]
 
   movieCreate(input: MovieCreateInput!): Movie
     @deprecated(reason: "Use groupCreate instead")

graphql/schema/types/config.graphql

@@ -2,8 +2,6 @@ input SetupInput {
   "Empty to indicate $HOME/.stash/config.yml default"
   configLocation: String!
   stashes: [StashConfigInput!]!
-  "True if SFW content mode is enabled"
-  sfwContentMode: Boolean
   "Empty to indicate default"
   databaseFile: String!
   "Empty to indicate default"
@@ -69,8 +67,6 @@ input ConfigGeneralInput {
   databasePath: String
   "Path to backup directory"
   backupDirectoryPath: String
-  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
-  deleteTrashPath: String
   "Path to generated files"
   generatedPath: String
   "Path to import/export files"
@@ -157,8 +153,6 @@ input ConfigGeneralInput {
   logLevel: String
   "Whether to log http access"
   logAccess: Boolean
-  "Maximum log size"
-  logFileMaxSize: Int
   "True if galleries should be created from folders with images"
   createGalleriesFromFolders: Boolean
   "Regex used to identify images as gallery covers"
@@ -193,8 +187,6 @@ type ConfigGeneralResult {
   databasePath: String!
   "Path to backup directory"
   backupDirectoryPath: String!
-  "Path to trash directory - if set, deleted files will be moved here instead of being permanently deleted"
-  deleteTrashPath: String!
   "Path to generated files"
   generatedPath: String!
   "Path to import/export files"
@@ -285,8 +277,6 @@ type ConfigGeneralResult {
   logLevel: String!
   "Whether to log http access"
   logAccess: Boolean!
-  "Maximum log size"
-  logFileMaxSize: Int!
   "Array of video file extensions"
   videoExtensions: [String!]!
   "Array of image file extensions"
@@ -339,7 +329,6 @@ input ConfigImageLightboxInput {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int
-  disableAnimation: Boolean
 }
 
 type ConfigImageLightboxResult {
@@ -349,13 +338,9 @@ type ConfigImageLightboxResult {
   resetZoomOnNav: Boolean
   scrollMode: ImageLightboxScrollMode
   scrollAttemptsBeforeChange: Int!
-  disableAnimation: Boolean
 }
 
 input ConfigInterfaceInput {
-  "True if SFW content mode is enabled"
-  sfwContentMode: Boolean
-
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 
@@ -422,9 +407,6 @@ type ConfigDisableDropdownCreate {
 }
 
 type ConfigInterfaceResult {
-  "True if SFW content mode is enabled"
-  sfwContentMode: Boolean!
-
   "Ordered list of items that should be shown in the menu"
   menuItems: [String!]
 

graphql/schema/types/file.graphql

@@ -7,11 +7,8 @@ type Folder {
   id: ID!
   path: String!
 
-  parent_folder_id: ID @deprecated(reason: "Use parent_folder instead")
+  parent_folder_id: ID
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+  zip_file_id: ID
-
-  parent_folder: Folder
-  zip_file: BasicFile
 
   mod_time: Time!
 
@@ -24,32 +21,8 @@ interface BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  parent_folder_id: ID!
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+  zip_file_id: ID
-
-  parent_folder: Folder!
-  zip_file: BasicFile
-
-  mod_time: Time!
-  size: Int64!
-
-  fingerprint(type: String!): String
-  fingerprints: [Fingerprint!]!
-
-  created_at: Time!
-  updated_at: Time!
-}
-
-type BasicFile implements BaseFile {
-  id: ID!
-  path: String!
-  basename: String!
-
-  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
-
-  parent_folder: Folder!
-  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -66,11 +39,8 @@ type VideoFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  parent_folder_id: ID!
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+  zip_file_id: ID
-
-  parent_folder: Folder!
-  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -96,11 +66,8 @@ type ImageFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  parent_folder_id: ID!
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+  zip_file_id: ID
-
-  parent_folder: Folder!
-  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -108,7 +75,6 @@ type ImageFile implements BaseFile {
   fingerprint(type: String!): String
   fingerprints: [Fingerprint!]!
 
-  format: String!
   width: Int!
   height: Int!
 
@@ -123,11 +89,8 @@ type GalleryFile implements BaseFile {
   path: String!
   basename: String!
 
-  parent_folder_id: ID! @deprecated(reason: "Use parent_folder instead")
+  parent_folder_id: ID!
-  zip_file_id: ID @deprecated(reason: "Use zip_file instead")
+  zip_file_id: ID
-
-  parent_folder: Folder!
-  zip_file: BasicFile
 
   mod_time: Time!
   size: Int64!
@@ -162,22 +125,3 @@ input FileSetFingerprintsInput {
   "only supplied fingerprint types will be modified"
   fingerprints: [SetFingerprintsInput!]!
 }
-
-type FindFilesResultType {
-  count: Int!
-
-  "Total megapixels of any image files"
-  megapixels: Float!
-  "Total duration in seconds of any video files"
-  duration: Float!
-
-  "Total file size in bytes"
-  size: Int!
-
-  files: [BaseFile!]!
-}
-
-type FindFoldersResultType {
-  count: Int!
-  folders: [Folder!]!
-}

graphql/schema/types/filters.graphql

@@ -168,8 +168,6 @@ input PerformerFilterType {
   death_year: IntCriterionInput
   "Filter by studios where performer appears in scene/image/gallery"
   studios: HierarchicalMultiCriterionInput
-  "Filter by groups where performer appears in scene"
-  groups: HierarchicalMultiCriterionInput
   "Filter by performers where performer appears with another performer in scene/image/gallery"
   performers: MultiCriterionInput
   "Filter by autotag ignore value"
@@ -330,8 +328,6 @@ input SceneFilterType {
   groups_filter: GroupFilterType
   "Filter by related markers that meet this criteria"
   markers_filter: SceneMarkerFilterType
-  "Filter by related files that meet this criteria"
-  files_filter: FileFilterType
 }
 
 input MovieFilterType {
@@ -403,8 +399,6 @@ input GroupFilterType {
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
-  "Filter by o-counter"
-  o_counter: IntCriterionInput
 
   "Filter by containing groups"
   containing_groups: HierarchicalMultiCriterionInput
@@ -538,10 +532,6 @@ input GalleryFilterType {
   studios_filter: StudioFilterType
   "Filter by related tags that meet this criteria"
   tags_filter: TagFilterType
-  "Filter by related files that meet this criteria"
-  files_filter: FileFilterType
-  "Filter by related folders that meet this criteria"
-  folders_filter: FolderFilterType
 }
 
 input TagFilterType {
@@ -687,106 +677,6 @@ input ImageFilterType {
   studios_filter: StudioFilterType
   "Filter by related tags that meet this criteria"
   tags_filter: TagFilterType
-  "Filter by related files that meet this criteria"
-  files_filter: FileFilterType
-}
-
-input FileFilterType {
-  AND: FileFilterType
-  OR: FileFilterType
-  NOT: FileFilterType
-
-  path: StringCriterionInput
-  basename: StringCriterionInput
-  dir: StringCriterionInput
-
-  parent_folder: HierarchicalMultiCriterionInput
-  zip_file: MultiCriterionInput
-
-  "Filter by modification time"
-  mod_time: TimestampCriterionInput
-
-  "Filter files that have an exact match available"
-  duplicated: PHashDuplicationCriterionInput
-
-  "find files based on hash"
-  hashes: [FingerprintFilterInput!]
-
-  video_file_filter: VideoFileFilterInput
-  image_file_filter: ImageFileFilterInput
-
-  scene_count: IntCriterionInput
-  image_count: IntCriterionInput
-  gallery_count: IntCriterionInput
-
-  "Filter by related scenes that meet this criteria"
-  scenes_filter: SceneFilterType
-  "Filter by related images that meet this criteria"
-  images_filter: ImageFilterType
-  "Filter by related galleries that meet this criteria"
-  galleries_filter: GalleryFilterType
-
-  "Filter by creation time"
-  created_at: TimestampCriterionInput
-  "Filter by last update time"
-  updated_at: TimestampCriterionInput
-}
-
-input FolderFilterType {
-  AND: FolderFilterType
-  OR: FolderFilterType
-  NOT: FolderFilterType
-
-  path: StringCriterionInput
-
-  parent_folder: HierarchicalMultiCriterionInput
-  zip_file: MultiCriterionInput
-
-  "Filter by modification time"
-  mod_time: TimestampCriterionInput
-
-  gallery_count: IntCriterionInput
-
-  "Filter by files that meet this criteria"
-  files_filter: FileFilterType
-  "Filter by related galleries that meet this criteria"
-  galleries_filter: GalleryFilterType
-
-  "Filter by creation time"
-  created_at: TimestampCriterionInput
-  "Filter by last update time"
-  updated_at: TimestampCriterionInput
-}
-
-input VideoFileFilterInput {
-  resolution: ResolutionCriterionInput
-  orientation: OrientationCriterionInput
-  framerate: IntCriterionInput
-  bitrate: IntCriterionInput
-  format: StringCriterionInput
-  video_codec: StringCriterionInput
-  audio_codec: StringCriterionInput
-
-  "in seconds"
-  duration: IntCriterionInput
-
-  captions: StringCriterionInput
-
-  interactive: Boolean
-  interactive_speed: IntCriterionInput
-}
-
-input ImageFileFilterInput {
-  format: StringCriterionInput
-  resolution: ResolutionCriterionInput
-  orientation: OrientationCriterionInput
-}
-
-input FingerprintFilterInput {
-  type: String!
-  value: String!
-  "Hamming distance - defaults to 0"
-  distance: Int
 }
 
 enum CriterionModifier {

graphql/schema/types/group.graphql

@@ -27,10 +27,8 @@ type Group {
   front_image_path: String # Resolver
   back_image_path: String # Resolver
   scene_count(depth: Int): Int! # Resolver
-  performer_count(depth: Int): Int! # Resolver
   sub_group_count(depth: Int): Int! # Resolver
   scenes: [Scene!]!
-  o_counter: Int # Resolver
 }
 
 input GroupDescriptionInput {

graphql/schema/types/metadata.graphql

@@ -344,6 +344,4 @@ input CustomFieldsInput {
   full: Map
   "If populated, only the keys in this map will be updated"
   partial: Map
-  "Remove any keys in this list"
-  remove: [String!]
 }

graphql/schema/types/scene-marker.graphql

@@ -42,13 +42,6 @@ input SceneMarkerUpdateInput {
   tag_ids: [ID!]
 }
 
-input BulkSceneMarkerUpdateInput {
-  ids: [ID!]
-  title: String
-  primary_tag_id: ID
-  tag_ids: BulkUpdateIds
-}
-
 type FindSceneMarkersResultType {
   count: Int!
   scene_markers: [SceneMarker!]!

graphql/schema/types/scraper.graphql

@@ -55,14 +55,9 @@ type ScrapedStudio {
   "Set if studio matched"
   stored_id: ID
   name: String!
-  url: String @deprecated(reason: "use urls")
+  url: String
-  urls: [String!]
   parent: ScrapedStudio
   image: String
-  details: String
-  "Aliases must be comma-delimited to be parsed correctly"
-  aliases: String
-  tags: [ScrapedTag!]
 
   remote_site_id: String
 }
@@ -71,8 +66,6 @@ type ScrapedTag {
   "Set if tag matched"
   stored_id: ID
   name: String!
-  "Remote site ID, if applicable"
-  remote_site_id: String
 }
 
 type ScrapedScene {
@@ -198,13 +191,6 @@ input ScrapeSingleStudioInput {
   query: String
 }
 
-input ScrapeSingleTagInput {
-  """
-  Query can be either a name or a Stash ID
-  """
-  query: String
-}
-
 input ScrapeSinglePerformerInput {
   "Instructs to query by string"
   query: String
@@ -288,10 +274,7 @@ type StashBoxFingerprint {
   duration: Int!
 }
 
-"""
+"If neither ids nor names are set, tag all items"
-Accepts either ids, or a combination of names and stash_ids.
-If none are set, then all existing items will be tagged.
-"""
 input StashBoxBatchTagInput {
   "Stash endpoint to use for the tagging"
   endpoint: Int @deprecated(reason: "use stash_box_endpoint")
@@ -303,17 +286,12 @@ input StashBoxBatchTagInput {
   refresh: Boolean!
   "If batch adding studios, should their parent studios also be created?"
   createParent: Boolean!
-  """
+  "If set, only tag these ids"
-  IDs in stash of the items to update.
-  If set, names and stash_ids fields will be ignored.
-  """
   ids: [ID!]
-  "Names of the items in the stash-box instance to search for and create"
+  "If set, only tag these names"
   names: [String!]
-  "Stash IDs of the items in the stash-box instance to search for and create"
+  "If set, only tag these performer ids"
-  stash_ids: [String!]
-  "IDs in stash of the performers to update"
   performer_ids: [ID!] @deprecated(reason: "use ids")
-  "Names of the performers in the stash-box instance to search for and create"
+  "If set, only tag these performer names"
   performer_names: [String!] @deprecated(reason: "use names")
 }

graphql/schema/types/stash-box.graphql

@@ -2,15 +2,12 @@ type StashBox {
   endpoint: String!
   api_key: String!
   name: String!
-  max_requests_per_minute: Int!
 }
 
 input StashBoxInput {
   endpoint: String!
   api_key: String!
   name: String!
-  # defaults to 240
-  max_requests_per_minute: Int
 }
 
 type StashID {

graphql/schema/types/studio.graphql

@@ -1,8 +1,7 @@
 type Studio {
   id: ID!
   name: String!
-  url: String @deprecated(reason: "Use urls")
+  url: String
-  urls: [String!]!
   parent_studio: Studio
   child_studios: [Studio!]!
   aliases: [String!]!
@@ -25,13 +24,11 @@ type Studio {
   updated_at: Time!
   groups: [Group!]!
   movies: [Movie!]! @deprecated(reason: "use groups instead")
-  o_counter: Int
 }
 
 input StudioCreateInput {
   name: String!
-  url: String @deprecated(reason: "Use urls")
+  url: String
-  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
@@ -48,8 +45,7 @@ input StudioCreateInput {
 input StudioUpdateInput {
   id: ID!
   name: String
-  url: String @deprecated(reason: "Use urls")
+  url: String
-  urls: [String!]
   parent_id: ID
   "This should be a URL or a base64 encoded data URL"
   image: String
@@ -63,19 +59,6 @@ input StudioUpdateInput {
   ignore_auto_tag: Boolean
 }
 
-input BulkStudioUpdateInput {
-  ids: [ID!]!
-  url: String @deprecated(reason: "Use urls")
-  urls: BulkUpdateStrings
-  parent_id: ID
-  # rating expressed as 1-100
-  rating100: Int
-  favorite: Boolean
-  details: String
-  tag_ids: BulkUpdateIds
-  ignore_auto_tag: Boolean
-}
-
 input StudioDestroyInput {
   id: ID!
 }

graphql/schema/types/tag.graphql

@@ -9,7 +9,6 @@ type Tag {
   created_at: Time!
   updated_at: Time!
   favorite: Boolean!
-  stash_ids: [StashID!]!
   image_path: String # Resolver
   scene_count(depth: Int): Int! # Resolver
   scene_marker_count(depth: Int): Int! # Resolver
@@ -36,7 +35,6 @@ input TagCreateInput {
   favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
-  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]
@@ -53,7 +51,6 @@ input TagUpdateInput {
   favorite: Boolean
   "This should be a URL or a base64 encoded data URL"
   image: String
-  stash_ids: [StashIDInput!]
 
   parent_ids: [ID!]
   child_ids: [ID!]

graphql/stash-box/query.graphql

@@ -13,7 +13,6 @@ fragment ImageFragment on Image {
 fragment StudioFragment on Studio {
   name
   id
-  aliases
   urls {
     ...URLFragment
   }
@@ -170,21 +169,6 @@ query FindStudio($id: ID, $name: String) {
   }
 }
 
-query FindTag($id: ID, $name: String) {
-  findTag(id: $id, name: $name) {
-    ...TagFragment
-  }
-}
-
-query QueryTags($input: TagQueryInput!) {
-  queryTags(input: $input) {
-    count
-    tags {
-      ...TagFragment
-    }
-  }
-}
-
 mutation SubmitFingerprint($input: FingerprintSubmission!) {
   submitFingerprint(input: $input)
 }

internal/api/authentication.go

@@ -16,12 +16,12 @@ import (
 
 const (
 	tripwireActivatedErrMsg = "Stash is exposed to the public internet without authentication, and is not serving any more content to protect your privacy. " +
-		"More information and fixes are available at https://discourse.stashapp.cc/t/-/1658"
+		"More information and fixes are available at https://docs.stashapp.cc/faq/setup/#protecting-against-accidental-exposure-to-the-internet"
 
 	externalAccessErrMsg = "You have attempted to access Stash over the internet, and authentication is not enabled. " +
 		"This is extremely dangerous! The whole world can see your your stash page and browse your files! " +
 		"Stash is not answering any other requests to protect your privacy. " +
-		"Please read the log entry or visit https://discourse.stashapp.cc/t/-/1658"
+		"Please read the log entry or visit https://docs.stashapp.cc/faq/setup/#protecting-against-accidental-exposure-to-the-internet"
 )
 
 func allowUnauthenticated(r *http.Request) bool {

internal/api/changeset_translator.go

@@ -98,7 +98,7 @@ func (t changesetTranslator) string(value *string) string {
 		return ""
 	}
 
-	return strings.TrimSpace(*value)
+	return *value
 }
 
 func (t changesetTranslator) optionalString(value *string, field string) models.OptionalString {
@@ -106,12 +106,7 @@ func (t changesetTranslator) optionalString(value *string, field string) models.
 		return models.OptionalString{}
 	}
 
-	if value == nil {
+	return models.NewOptionalStringPtr(value)
-		return models.NewOptionalStringPtr(nil)
-	}
-
-	trimmed := strings.TrimSpace(*value)
-	return models.NewOptionalString(trimmed)
 }
 
 func (t changesetTranslator) optionalDate(value *string, field string) (models.OptionalDate, error) {
@@ -323,14 +318,8 @@ func (t changesetTranslator) updateStrings(value []string, field string) *models
 		return nil
 	}
 
-	// Trim whitespace from each string
-	trimmedValues := make([]string, len(value))
-	for i, v := range value {
-		trimmedValues[i] = strings.TrimSpace(v)
-	}
-
 	return &models.UpdateStrings{
-		Values: trimmedValues,
+		Values: value,
 		Mode:   models.RelationshipUpdateModeSet,
 	}
 }
@@ -340,14 +329,8 @@ func (t changesetTranslator) updateStringsBulk(value *BulkUpdateStrings, field s
 		return nil
 	}
 
-	// Trim whitespace from each string
-	trimmedValues := make([]string, len(value.Values))
-	for i, v := range value.Values {
-		trimmedValues[i] = strings.TrimSpace(v)
-	}
-
 	return &models.UpdateStrings{
-		Values: trimmedValues,
+		Values: value.Values,
 		Mode:   value.Mode,
 	}
 }
@@ -465,7 +448,7 @@ func groupsDescriptionsFromGroupInput(input []*GroupDescriptionInput) ([]models.
 			GroupID: gID,
 		}
 		if v.Description != nil {
-			ret[i].Description = strings.TrimSpace(*v.Description)
+			ret[i].Description = *v.Description
 		}
 	}
 

internal/api/check_version.go

@@ -7,10 +7,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"regexp"
 	"runtime"
-	"strings"
 	"time"
 
 	"golang.org/x/sys/cpu"
@@ -38,24 +36,6 @@ var stashReleases = func() map[string]string {
 	}
 }
 
-// isMacOSBundle checks if the application is running from within a macOS .app bundle
-func isMacOSBundle() bool {
-	exec, err := os.Executable()
-	return err == nil && strings.Contains(exec, "Stash.app/")
-}
-
-// getWantedRelease determines which release variant to download based on platform and bundle type
-func getWantedRelease(platform string) string {
-	release := stashReleases()[platform]
-
-	// On macOS, check if running from .app bundle
-	if runtime.GOOS == "darwin" && isMacOSBundle() {
-		return "Stash.app.zip"
-	}
-
-	return release
-}
-
 type githubReleasesResponse struct {
 	Url              string
 	Assets_url       string
@@ -188,7 +168,7 @@ func GetLatestRelease(ctx context.Context) (*LatestRelease, error) {
 	}
 
 	platform := fmt.Sprintf("%s/%s", runtime.GOOS, arch)
-	wantedRelease := getWantedRelease(platform)
+	wantedRelease := stashReleases()[platform]
 
 	url := apiReleases
 	if build.IsDevelop() {

internal/api/custom_fields.go

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

internal/api/fields.go

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

internal/api/images.go

@@ -26,7 +26,6 @@ var imageBoxExts = []string{
 	".gif",
 	".svg",
 	".webp",
-	".avif",
 }
 
 func newImageBox(box fs.FS) (*imageBox, error) {
@@ -102,7 +101,7 @@ func initCustomPerformerImages(customPath string) {
 	}
 }
 
-func getDefaultPerformerImage(name string, gender *models.GenderEnum, sfwMode bool) []byte {
+func getDefaultPerformerImage(name string, gender *models.GenderEnum) []byte {
 	// try the custom box first if we have one
 	if performerBoxCustom != nil {
 		ret, err := performerBoxCustom.GetRandomImageByName(name)
@@ -112,10 +111,6 @@ func getDefaultPerformerImage(name string, gender *models.GenderEnum, sfwMode bo
 		logger.Warnf("error loading custom default performer image: %v", err)
 	}
 
-	if sfwMode {
-		return static.ReadAll(static.DefaultSFWPerformerImage)
-	}
-
 	var g models.GenderEnum
 	if gender != nil {
 		g = *gender

internal/api/loaders/dataloaders.go

@@ -10,7 +10,6 @@
 //go:generate go run github.com/vektah/dataloaden TagLoader int *github.com/stashapp/stash/pkg/models.Tag
 //go:generate go run github.com/vektah/dataloaden GroupLoader int *github.com/stashapp/stash/pkg/models.Group
 //go:generate go run github.com/vektah/dataloaden FileLoader github.com/stashapp/stash/pkg/models.FileID github.com/stashapp/stash/pkg/models.File
-//go:generate go run github.com/vektah/dataloaden FolderLoader github.com/stashapp/stash/pkg/models.FolderID *github.com/stashapp/stash/pkg/models.Folder
 //go:generate go run github.com/vektah/dataloaden SceneFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden ImageFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
 //go:generate go run github.com/vektah/dataloaden GalleryFileIDsLoader int []github.com/stashapp/stash/pkg/models.FileID
@@ -63,7 +62,6 @@ type Loaders struct {
 	TagByID    *TagLoader
 	GroupByID  *GroupLoader
 	FileByID   *FileLoader
-	FolderByID *FolderLoader
 }
 
 type Middleware struct {
@@ -119,11 +117,6 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
 				maxBatch: maxBatch,
 				fetch:    m.fetchFiles(ctx),
 			},
-			FolderByID: &FolderLoader{
-				wait:     wait,
-				maxBatch: maxBatch,
-				fetch:    m.fetchFolders(ctx),
-			},
 			SceneFiles: &SceneFileIDsLoader{
 				wait:     wait,
 				maxBatch: maxBatch,
@@ -286,17 +279,6 @@ func (m Middleware) fetchFiles(ctx context.Context) func(keys []models.FileID) (
 	}
 }
 
-func (m Middleware) fetchFolders(ctx context.Context) func(keys []models.FolderID) ([]*models.Folder, []error) {
-	return func(keys []models.FolderID) (ret []*models.Folder, errs []error) {
-		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
-			var err error
-			ret, err = m.Repository.Folder.FindMany(ctx, keys)
-			return err
-		})
-		return ret, toErrorSlice(err)
-	}
-}
-
 func (m Middleware) fetchScenesFileIDs(ctx context.Context) func(keys []int) ([][]models.FileID, []error) {
 	return func(keys []int) (ret [][]models.FileID, errs []error) {
 		err := m.Repository.WithDB(ctx, func(ctx context.Context) error {

internal/api/loaders/folderloader_gen.go

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

internal/api/models.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil"
 )
 
 type BaseFile interface {
@@ -28,29 +27,6 @@ func convertVisualFile(f models.File) (VisualFile, error) {
 	}
 }
 
-func convertBaseFile(f models.File) BaseFile {
-	if f == nil {
-		return nil
-	}
-
-	switch f := f.(type) {
-	case BaseFile:
-		return f
-	case *models.VideoFile:
-		return &VideoFile{VideoFile: f}
-	case *models.ImageFile:
-		return &ImageFile{ImageFile: f}
-	case *models.BaseFile:
-		return &BasicFile{BaseFile: f}
-	default:
-		panic("unknown file type")
-	}
-}
-
-func convertBaseFiles(files []models.File) []BaseFile {
-	return sliceutil.Map(files, convertBaseFile)
-}
-
 type GalleryFile struct {
 	*models.BaseFile
 }
@@ -86,15 +62,3 @@ func (ImageFile) IsVisualFile() {}
 func (f *ImageFile) Fingerprints() []models.Fingerprint {
 	return f.ImageFile.Fingerprints
 }
-
-type BasicFile struct {
-	*models.BaseFile
-}
-
-func (BasicFile) IsBaseFile() {}
-
-func (BasicFile) IsVisualFile() {}
-
-func (f *BasicFile) Fingerprints() []models.Fingerprint {
-	return f.BaseFile.Fingerprints
-}

internal/api/resolver.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/plugin/hook"
 	"github.com/stashapp/stash/pkg/scraper"
+	"github.com/stashapp/stash/pkg/scraper/stashbox"
 )
 
 var (
@@ -95,12 +96,6 @@ func (r *Resolver) VideoFile() VideoFileResolver {
 func (r *Resolver) ImageFile() ImageFileResolver {
 	return &imageFileResolver{r}
 }
-func (r *Resolver) BasicFile() BasicFileResolver {
-	return &basicFileResolver{r}
-}
-func (r *Resolver) Folder() FolderResolver {
-	return &folderResolver{r}
-}
 func (r *Resolver) SavedFilter() SavedFilterResolver {
 	return &savedFilterResolver{r}
 }
@@ -131,8 +126,6 @@ type tagResolver struct{ *Resolver }
 type galleryFileResolver struct{ *Resolver }
 type videoFileResolver struct{ *Resolver }
 type imageFileResolver struct{ *Resolver }
-type basicFileResolver struct{ *Resolver }
-type folderResolver struct{ *Resolver }
 type savedFilterResolver struct{ *Resolver }
 type pluginResolver struct{ *Resolver }
 type configResultResolver struct{ *Resolver }
@@ -145,6 +138,10 @@ func (r *Resolver) withReadTxn(ctx context.Context, fn func(ctx context.Context)
 	return r.repository.WithReadTxn(ctx, fn)
 }
 
+func (r *Resolver) stashboxRepository() stashbox.Repository {
+	return stashbox.NewRepository(r.repository)
+}
+
 func (r *queryResolver) MarkerWall(ctx context.Context, q *string) (ret []*models.SceneMarker, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		ret, err = r.repository.SceneMarker.Wall(ctx, q)

internal/api/resolver_model_file.go

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

internal/api/resolver_model_folder.go

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

internal/api/resolver_model_movie.go

@@ -7,7 +7,6 @@ import (
 	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/group"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/performer"
 	"github.com/stashapp/stash/pkg/scene"
 )
 
@@ -182,17 +181,6 @@ func (r *groupResolver) SceneCount(ctx context.Context, obj *models.Group, depth
 	return ret, nil
 }
 
-func (r *groupResolver) PerformerCount(ctx context.Context, obj *models.Group, depth *int) (ret int, err error) {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = performer.CountByGroupID(ctx, r.repository.Performer, obj.ID, depth)
-		return err
-	}); err != nil {
-		return 0, err
-	}
-
-	return ret, nil
-}
-
 func (r *groupResolver) Scenes(ctx context.Context, obj *models.Group) (ret []*models.Scene, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		var err error
@@ -204,14 +192,3 @@ func (r *groupResolver) Scenes(ctx context.Context, obj *models.Group) (ret []*m
 
 	return ret, nil
 }
-
-func (r *groupResolver) OCounter(ctx context.Context, obj *models.Group) (ret *int, err error) {
-	var count int
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		count, err = r.repository.Scene.OCountByGroupID(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-	return &count, nil
-}

internal/api/resolver_model_studio.go

@@ -40,35 +40,6 @@ func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) ([]str
 	return obj.Aliases.List(), nil
 }
 
-func (r *studioResolver) URL(ctx context.Context, obj *models.Studio) (*string, error) {
-	if !obj.URLs.Loaded() {
-		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-			return obj.LoadURLs(ctx, r.repository.Studio)
-		}); err != nil {
-			return nil, err
-		}
-	}
-
-	urls := obj.URLs.List()
-	if len(urls) == 0 {
-		return nil, nil
-	}
-
-	return &urls[0], nil
-}
-
-func (r *studioResolver) Urls(ctx context.Context, obj *models.Studio) ([]string, error) {
-	if !obj.URLs.Loaded() {
-		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-			return obj.LoadURLs(ctx, r.repository.Studio)
-		}); err != nil {
-			return nil, err
-		}
-	}
-
-	return obj.URLs.List(), nil
-}
-
 func (r *studioResolver) Tags(ctx context.Context, obj *models.Studio) (ret []*models.Tag, err error) {
 	if !obj.TagIDs.Loaded() {
 		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
@@ -143,24 +114,6 @@ func (r *studioResolver) MovieCount(ctx context.Context, obj *models.Studio, dep
 	return r.GroupCount(ctx, obj, depth)
 }
 
-func (r *studioResolver) OCounter(ctx context.Context, obj *models.Studio) (ret *int, err error) {
-	var res_scene int
-	var res_image int
-	var res int
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		res_scene, err = r.repository.Scene.OCountByStudioID(ctx, obj.ID)
-		if err != nil {
-			return err
-		}
-		res_image, err = r.repository.Image.OCountByStudioID(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
-	}
-	res = res_scene + res_image
-	return &res, nil
-}
-
 func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (ret *models.Studio, err error) {
 	if obj.ParentID == nil {
 		return nil, nil

internal/api/resolver_model_tag.go

@@ -54,16 +54,6 @@ func (r *tagResolver) Aliases(ctx context.Context, obj *models.Tag) (ret []strin
 	return obj.Aliases.List(), nil
 }
 
-func (r *tagResolver) StashIds(ctx context.Context, obj *models.Tag) ([]*models.StashID, error) {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		return obj.LoadStashIDs(ctx, r.repository.Tag)
-	}); err != nil {
-		return nil, err
-	}
-
-	return stashIDsSliceToPtrSlice(obj.StashIDs.List()), nil
-}
-
 func (r *tagResolver) SceneCount(ctx context.Context, obj *models.Tag, depth *int) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		ret, err = scene.CountByTagID(ctx, r.repository.Scene, obj.ID, depth)

internal/api/resolver_mutation_configure.go

@@ -150,15 +150,6 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 		c.SetString(config.BackupDirectoryPath, *input.BackupDirectoryPath)
 	}
 
-	existingDeleteTrashPath := c.GetDeleteTrashPath()
-	if input.DeleteTrashPath != nil && existingDeleteTrashPath != *input.DeleteTrashPath {
-		if err := validateDir(config.DeleteTrashPath, *input.DeleteTrashPath, true); err != nil {
-			return makeConfigGeneralResult(), err
-		}
-
-		c.SetString(config.DeleteTrashPath, *input.DeleteTrashPath)
-	}
-
 	existingGeneratedPath := c.GetGeneratedPath()
 	if input.GeneratedPath != nil && existingGeneratedPath != *input.GeneratedPath {
 		if err := validateDir(config.Generated, *input.GeneratedPath, false); err != nil {
@@ -343,10 +334,6 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 		logger.SetLogLevel(*input.LogLevel)
 	}
 
-	if input.LogFileMaxSize != nil && *input.LogFileMaxSize != c.GetLogFileMaxSize() {
-		c.SetInt(config.LogFileMaxSize, *input.LogFileMaxSize)
-	}
-
 	if input.Excludes != nil {
 		for _, r := range input.Excludes {
 			_, err := regexp.Compile(r)
@@ -458,8 +445,6 @@ func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input ConfigGen
 func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigInterfaceInput) (*ConfigInterfaceResult, error) {
 	c := config.GetInstance()
 
-	r.setConfigBool(config.SFWContentMode, input.SfwContentMode)
-
 	if input.MenuItems != nil {
 		c.SetInterface(config.MenuItems, input.MenuItems)
 	}
@@ -493,8 +478,6 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input ConfigI
 		r.setConfigString(config.ImageLightboxScrollModeKey, (*string)(options.ScrollMode))
 
 		r.setConfigInt(config.ImageLightboxScrollAttemptsBeforeChange, options.ScrollAttemptsBeforeChange)
-
-		r.setConfigBool(config.ImageLightboxDisableAnimation, options.DisableAnimation)
 	}
 
 	if input.CSS != nil {

internal/api/resolver_mutation_file.go

@@ -149,9 +149,7 @@ func (r *mutationResolver) DeleteFiles(ctx context.Context, ids []string) (ret b
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
+	fileDeleter := file.NewDeleter()
-
-	fileDeleter := file.NewDeleterWithTrash(trashPath)
 	destroyer := &file.ZipDestroyer{
 		FileDestroyer:   r.repository.File,
 		FolderDestroyer: r.repository.Folder,

internal/api/resolver_mutation_gallery.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/file"
@@ -44,7 +43,7 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	// Populate a new gallery from the input
 	newGallery := models.NewGallery()
 
-	newGallery.Title = strings.TrimSpace(input.Title)
+	newGallery.Title = input.Title
 	newGallery.Code = translator.string(input.Code)
 	newGallery.Details = translator.string(input.Details)
 	newGallery.Photographer = translator.string(input.Photographer)
@@ -75,9 +74,9 @@ func (r *mutationResolver) GalleryCreate(ctx context.Context, input GalleryCreat
 	}
 
 	if input.Urls != nil {
-		newGallery.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
+		newGallery.URLs = models.NewRelatedStrings(input.Urls)
 	} else if input.URL != nil {
-		newGallery.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
+		newGallery.URLs = models.NewRelatedStrings([]string{*input.URL})
 	}
 
 	// Start the transaction and save the gallery
@@ -334,12 +333,10 @@ func (r *mutationResolver) GalleryDestroy(ctx context.Context, input models.Gall
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
-
 	var galleries []*models.Gallery
 	var imgsDestroyed []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleterWithTrash(trashPath),
+		Deleter: file.NewDeleter(),
 		Paths:   manager.GetInstance().Paths,
 	}
 

internal/api/resolver_mutation_group.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/group"
@@ -22,7 +21,7 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 	// Populate a new group from the input
 	newGroup := models.NewGroup()
 
-	newGroup.Name = strings.TrimSpace(input.Name)
+	newGroup.Name = input.Name
 	newGroup.Aliases = translator.string(input.Aliases)
 	newGroup.Duration = input.Duration
 	newGroup.Rating = input.Rating100
@@ -56,7 +55,7 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 	}
 
 	if input.Urls != nil {
-		newGroup.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
+		newGroup.URLs = models.NewRelatedStrings(input.Urls)
 	}
 
 	return &newGroup, nil

internal/api/resolver_mutation_image.go

@@ -308,11 +308,9 @@ func (r *mutationResolver) ImageDestroy(ctx context.Context, input models.ImageD
 		return false, fmt.Errorf("converting id: %w", err)
 	}
 
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
-
 	var i *models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleterWithTrash(trashPath),
+		Deleter: file.NewDeleter(),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
@@ -350,11 +348,9 @@ func (r *mutationResolver) ImagesDestroy(ctx context.Context, input models.Image
 		return false, fmt.Errorf("converting ids: %w", err)
 	}
 
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
-
 	var images []*models.Image
 	fileDeleter := &image.FileDeleter{
-		Deleter: file.NewDeleterWithTrash(trashPath),
+		Deleter: file.NewDeleter(),
 		Paths:   manager.GetInstance().Paths,
 	}
 	if err := r.withTxn(ctx, func(ctx context.Context) error {

internal/api/resolver_mutation_movie.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/internal/static"
 	"github.com/stashapp/stash/pkg/models"
@@ -33,7 +32,7 @@ func (r *mutationResolver) MovieCreate(ctx context.Context, input MovieCreateInp
 	// Populate a new group from the input
 	newGroup := models.NewGroup()
 
-	newGroup.Name = strings.TrimSpace(input.Name)
+	newGroup.Name = input.Name
 	newGroup.Aliases = translator.string(input.Aliases)
 	newGroup.Duration = input.Duration
 	newGroup.Rating = input.Rating100
@@ -57,9 +56,9 @@ func (r *mutationResolver) MovieCreate(ctx context.Context, input MovieCreateInp
 	}
 
 	if input.Urls != nil {
-		newGroup.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
+		newGroup.URLs = models.NewRelatedStrings(input.Urls)
 	} else if input.URL != nil {
-		newGroup.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
+		newGroup.URLs = models.NewRelatedStrings([]string{*input.URL})
 	}
 
 	// Process the base 64 encoded image string

internal/api/resolver_mutation_performer.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
@@ -38,9 +37,9 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	// Populate a new performer from the input
 	newPerformer := models.NewPerformer()
 
-	newPerformer.Name = strings.TrimSpace(input.Name)
+	newPerformer.Name = input.Name
 	newPerformer.Disambiguation = translator.string(input.Disambiguation)
-	newPerformer.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.AliasList))
+	newPerformer.Aliases = models.NewRelatedStrings(input.AliasList)
 	newPerformer.Gender = input.Gender
 	newPerformer.Ethnicity = translator.string(input.Ethnicity)
 	newPerformer.Country = translator.string(input.Country)
@@ -63,17 +62,17 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 
 	newPerformer.URLs = models.NewRelatedStrings([]string{})
 	if input.URL != nil {
-		newPerformer.URLs.Add(strings.TrimSpace(*input.URL))
+		newPerformer.URLs.Add(*input.URL)
 	}
 	if input.Twitter != nil {
-		newPerformer.URLs.Add(utils.URLFromHandle(strings.TrimSpace(*input.Twitter), twitterURL))
+		newPerformer.URLs.Add(utils.URLFromHandle(*input.Twitter, twitterURL))
 	}
 	if input.Instagram != nil {
-		newPerformer.URLs.Add(utils.URLFromHandle(strings.TrimSpace(*input.Instagram), instagramURL))
+		newPerformer.URLs.Add(utils.URLFromHandle(*input.Instagram, instagramURL))
 	}
 
 	if input.Urls != nil {
-		newPerformer.URLs.Add(stringslice.TrimSpace(input.Urls)...)
+		newPerformer.URLs.Add(input.Urls...)
 	}
 
 	var err error
@@ -297,7 +296,10 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
-	updatedPerformer.CustomFields = handleUpdateCustomFields(input.CustomFields)
+	updatedPerformer.CustomFields = input.CustomFields
+	// convert json.Numbers to int/float
+	updatedPerformer.CustomFields.Full = convertMapJSONNumbers(updatedPerformer.CustomFields.Full)
+	updatedPerformer.CustomFields.Partial = convertMapJSONNumbers(updatedPerformer.CustomFields.Partial)
 
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
@@ -414,10 +416,6 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
-	if input.CustomFields != nil {
-		updatedPerformer.CustomFields = handleUpdateCustomFields(*input.CustomFields)
-	}
-
 	ret := []*models.Performer{}
 
 	// Start the transaction and save the performers

internal/api/resolver_mutation_saved_filter.go

@@ -32,7 +32,7 @@ func (r *mutationResolver) SaveFilter(ctx context.Context, input SaveFilterInput
 
 		f := models.SavedFilter{
 			Mode:         input.Mode,
-			Name:         strings.TrimSpace(input.Name),
+			Name:         input.Name,
 			FindFilter:   input.FindFilter,
 			ObjectFilter: input.ObjectFilter,
 			UIOptions:    input.UIOptions,

internal/api/resolver_mutation_scene.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/stashapp/stash/internal/manager"
@@ -63,9 +62,9 @@ func (r *mutationResolver) SceneCreate(ctx context.Context, input models.SceneCr
 	}
 
 	if input.Urls != nil {
-		newScene.URLs = models.NewRelatedStrings(stringslice.TrimSpace(input.Urls))
+		newScene.URLs = models.NewRelatedStrings(input.Urls)
 	} else if input.URL != nil {
-		newScene.URLs = models.NewRelatedStrings([]string{strings.TrimSpace(*input.URL)})
+		newScene.URLs = models.NewRelatedStrings([]string{*input.URL})
 	}
 
 	newScene.PerformerIDs, err = translator.relatedIds(input.PerformerIds)
@@ -429,11 +428,10 @@ func (r *mutationResolver) SceneDestroy(ctx context.Context, input models.SceneD
 	}
 
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	var s *models.Scene
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleterWithTrash(trashPath),
+		Deleter:        file.NewDeleter(),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -484,10 +482,9 @@ func (r *mutationResolver) ScenesDestroy(ctx context.Context, input models.Scene
 
 	var scenes []*models.Scene
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleterWithTrash(trashPath),
+		Deleter:        file.NewDeleter(),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}
@@ -596,9 +593,8 @@ func (r *mutationResolver) SceneMerge(ctx context.Context, input SceneMergeInput
 	}
 
 	mgr := manager.GetInstance()
-	trashPath := mgr.Config.GetDeleteTrashPath()
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleterWithTrash(trashPath),
+		Deleter:        file.NewDeleter(),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -654,7 +650,7 @@ func (r *mutationResolver) SceneMarkerCreate(ctx context.Context, input SceneMar
 	// Populate a new scene marker from the input
 	newMarker := models.NewSceneMarker()
 
-	newMarker.Title = strings.TrimSpace(input.Title)
+	newMarker.Title = input.Title
 	newMarker.Seconds = input.Seconds
 	newMarker.PrimaryTagID = primaryTagID
 	newMarker.SceneID = sceneID
@@ -698,13 +694,6 @@ func validateSceneMarkerEndSeconds(seconds, endSeconds float64) error {
 	return nil
 }
 
-func float64OrZero(f *float64) float64 {
-	if f == nil {
-		return 0
-	}
-	return *f
-}
-
 func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMarkerUpdateInput) (*models.SceneMarker, error) {
 	markerID, err := strconv.Atoi(input.ID)
 	if err != nil {
@@ -740,10 +729,9 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 	}
 
 	mgr := manager.GetInstance()
-	trashPath := mgr.Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleterWithTrash(trashPath),
+		Deleter:        file.NewDeleter(),
 		FileNamingAlgo: mgr.Config.GetVideoFileNamingAlgorithm(),
 		Paths:          mgr.Paths,
 	}
@@ -796,7 +784,7 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 		}
 
 		// remove the marker preview if the scene changed or if the timestamp was changed
-		if existingMarker.SceneID != newMarker.SceneID || existingMarker.Seconds != newMarker.Seconds || float64OrZero(existingMarker.EndSeconds) != float64OrZero(newMarker.EndSeconds) {
+		if existingMarker.SceneID != newMarker.SceneID || existingMarker.Seconds != newMarker.Seconds || existingMarker.EndSeconds != newMarker.EndSeconds {
 			seconds := int(existingMarker.Seconds)
 			if err := fileDeleter.MarkMarkerFiles(existingScene, seconds); err != nil {
 				return err
@@ -825,123 +813,6 @@ func (r *mutationResolver) SceneMarkerUpdate(ctx context.Context, input SceneMar
 	return r.getSceneMarker(ctx, markerID)
 }
 
-func (r *mutationResolver) BulkSceneMarkerUpdate(ctx context.Context, input BulkSceneMarkerUpdateInput) ([]*models.SceneMarker, error) {
-	ids, err := stringslice.StringSliceToIntSlice(input.Ids)
-	if err != nil {
-		return nil, fmt.Errorf("converting ids: %w", err)
-	}
-
-	translator := changesetTranslator{
-		inputMap: getUpdateInputMap(ctx),
-	}
-
-	// Populate performer from the input
-	partial := models.NewSceneMarkerPartial()
-
-	partial.Title = translator.optionalString(input.Title, "title")
-
-	partial.PrimaryTagID, err = translator.optionalIntFromString(input.PrimaryTagID, "primary_tag_id")
-	if err != nil {
-		return nil, fmt.Errorf("converting primary tag id: %w", err)
-	}
-
-	partial.TagIDs, err = translator.updateIdsBulk(input.TagIds, "tag_ids")
-	if err != nil {
-		return nil, fmt.Errorf("converting tag ids: %w", err)
-	}
-
-	ret := []*models.SceneMarker{}
-
-	// Start the transaction and save the performers
-	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		qb := r.repository.SceneMarker
-
-		for _, id := range ids {
-			l := partial
-
-			if err := adjustMarkerPartialForTagExclusion(ctx, r.repository.SceneMarker, id, &l); err != nil {
-				return err
-			}
-
-			updated, err := qb.UpdatePartial(ctx, id, l)
-			if err != nil {
-				return err
-			}
-
-			ret = append(ret, updated)
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	// execute post hooks outside of txn
-	var newRet []*models.SceneMarker
-	for _, m := range ret {
-		r.hookExecutor.ExecutePostHooks(ctx, m.ID, hook.SceneMarkerUpdatePost, input, translator.getFields())
-
-		m, err = r.getSceneMarker(ctx, m.ID)
-		if err != nil {
-			return nil, err
-		}
-
-		newRet = append(newRet, m)
-	}
-
-	return newRet, nil
-}
-
-// adjustMarkerPartialForTagExclusion adjusts the SceneMarkerPartial to exclude the primary tag from tag updates.
-func adjustMarkerPartialForTagExclusion(ctx context.Context, r models.SceneMarkerReader, id int, partial *models.SceneMarkerPartial) error {
-	if partial.TagIDs == nil && !partial.PrimaryTagID.Set {
-		return nil
-	}
-
-	// exclude primary tag from tag updates
-	var primaryTagID int
-	if partial.PrimaryTagID.Set {
-		primaryTagID = partial.PrimaryTagID.Value
-	} else {
-		existing, err := r.Find(ctx, id)
-		if err != nil {
-			return fmt.Errorf("finding existing primary tag id: %w", err)
-		}
-
-		primaryTagID = existing.PrimaryTagID
-	}
-
-	existingTagIDs, err := r.GetTagIDs(ctx, id)
-	if err != nil {
-		return fmt.Errorf("getting existing tag ids: %w", err)
-	}
-
-	tagIDAttr := partial.TagIDs
-
-	if tagIDAttr == nil {
-		tagIDAttr = &models.UpdateIDs{
-			IDs:  existingTagIDs,
-			Mode: models.RelationshipUpdateModeSet,
-		}
-	}
-
-	newTagIDs := tagIDAttr.Apply(existingTagIDs)
-	// Remove primary tag from newTagIDs if present
-	newTagIDs = sliceutil.Exclude(newTagIDs, []int{primaryTagID})
-
-	if len(existingTagIDs) != len(newTagIDs) {
-		partial.TagIDs = &models.UpdateIDs{
-			IDs:  newTagIDs,
-			Mode: models.RelationshipUpdateModeSet,
-		}
-	} else {
-		// no change to tags required
-		partial.TagIDs = nil
-	}
-
-	return nil
-}
-
 func (r *mutationResolver) SceneMarkerDestroy(ctx context.Context, id string) (bool, error) {
 	return r.SceneMarkersDestroy(ctx, []string{id})
 }
@@ -954,10 +825,9 @@ func (r *mutationResolver) SceneMarkersDestroy(ctx context.Context, markerIDs []
 
 	var markers []*models.SceneMarker
 	fileNamingAlgo := manager.GetInstance().Config.GetVideoFileNamingAlgorithm()
-	trashPath := manager.GetInstance().Config.GetDeleteTrashPath()
 
 	fileDeleter := &scene.FileDeleter{
-		Deleter:        file.NewDeleterWithTrash(trashPath),
+		Deleter:        file.NewDeleter(),
 		FileNamingAlgo: fileNamingAlgo,
 		Paths:          manager.GetInstance().Paths,
 	}

internal/api/resolver_mutation_stash_box.go

@@ -7,10 +7,6 @@ import (
 
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/pkg/logger"
-	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/scene"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
-	"github.com/stashapp/stash/pkg/stashbox"
 )
 
 func (r *mutationResolver) SubmitStashBoxFingerprints(ctx context.Context, input StashBoxFingerprintSubmissionInput) (bool, error) {
@@ -19,27 +15,12 @@ func (r *mutationResolver) SubmitStashBoxFingerprints(ctx context.Context, input
 		return false, err
 	}
 
-	ids, err := stringslice.StringSliceToIntSlice(input.SceneIds)
-	if err != nil {
-		return false, err
-	}
-
 	client := r.newStashBoxClient(*b)
-
+	return client.SubmitStashBoxFingerprints(ctx, input.SceneIds)
-	var scenes []*models.Scene
-
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		scenes, err = r.sceneService.FindByIDs(ctx, ids, scene.LoadStashIDs, scene.LoadFiles)
-		return err
-	}); err != nil {
-		return false, err
-	}
-
-	return client.SubmitFingerprints(ctx, scenes)
 }
 
 func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
-	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint) //nolint:staticcheck
+	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint)
 	if err != nil {
 		return "", err
 	}
@@ -49,7 +30,7 @@ func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input
 }
 
 func (r *mutationResolver) StashBoxBatchStudioTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
-	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint) //nolint:staticcheck
+	b, err := resolveStashBoxBatchTagInput(input.Endpoint, input.StashBoxEndpoint)
 	if err != nil {
 		return "", err
 	}
@@ -88,84 +69,17 @@ func (r *mutationResolver) SubmitStashBoxSceneDraft(ctx context.Context, input S
 			logger.Errorf("Error getting scene cover: %v", err)
 		}
 
-		draft, err := r.makeSceneDraft(ctx, scene, cover)
+		if err := scene.LoadURLs(ctx, r.repository.Scene); err != nil {
-		if err != nil {
+			return fmt.Errorf("loading scene URLs: %w", err)
-			return err
 		}
 
-		res, err = client.SubmitSceneDraft(ctx, *draft)
+		res, err = client.SubmitSceneDraft(ctx, scene, cover)
 		return err
 	})
 
 	return res, err
 }
 
-func (r *mutationResolver) makeSceneDraft(ctx context.Context, s *models.Scene, cover []byte) (*stashbox.SceneDraft, error) {
-	if err := s.LoadURLs(ctx, r.repository.Scene); err != nil {
-		return nil, fmt.Errorf("loading scene URLs: %w", err)
-	}
-
-	if err := s.LoadStashIDs(ctx, r.repository.Scene); err != nil {
-		return nil, err
-	}
-
-	draft := &stashbox.SceneDraft{
-		Scene: s,
-	}
-
-	pqb := r.repository.Performer
-	sqb := r.repository.Studio
-
-	if s.StudioID != nil {
-		var err error
-		draft.Studio, err = sqb.Find(ctx, *s.StudioID)
-		if err != nil {
-			return nil, err
-		}
-		if draft.Studio == nil {
-			return nil, fmt.Errorf("studio with id %d not found", *s.StudioID)
-		}
-
-		if err := draft.Studio.LoadStashIDs(ctx, r.repository.Studio); err != nil {
-			return nil, err
-		}
-	}
-
-	// submit all file fingerprints
-	if err := s.LoadFiles(ctx, r.repository.Scene); err != nil {
-		return nil, err
-	}
-
-	scenePerformers, err := pqb.FindBySceneID(ctx, s.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, p := range scenePerformers {
-		if err := p.LoadStashIDs(ctx, pqb); err != nil {
-			return nil, err
-		}
-	}
-	draft.Performers = scenePerformers
-
-	draft.Tags, err = r.repository.Tag.FindBySceneID(ctx, s.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Load StashIDs for tags
-	tqb := r.repository.Tag
-	for _, t := range draft.Tags {
-		if err := t.LoadStashIDs(ctx, tqb); err != nil {
-			return nil, err
-		}
-	}
-
-	draft.Cover = cover
-
-	return draft, nil
-}
-
 func (r *mutationResolver) SubmitStashBoxPerformerDraft(ctx context.Context, input StashBoxDraftSubmissionInput) (*string, error) {
 	b, err := resolveStashBox(input.StashBoxIndex, input.StashBoxEndpoint)
 	if err != nil {
@@ -191,22 +105,7 @@ func (r *mutationResolver) SubmitStashBoxPerformerDraft(ctx context.Context, inp
 			return fmt.Errorf("performer with id %d not found", id)
 		}
 
-		pqb := r.repository.Performer
+		res, err = client.SubmitPerformerDraft(ctx, performer)
-		if err := performer.LoadAliases(ctx, pqb); err != nil {
-			return err
-		}
-
-		if err := performer.LoadURLs(ctx, pqb); err != nil {
-			return err
-		}
-
-		if err := performer.LoadStashIDs(ctx, pqb); err != nil {
-			return err
-		}
-
-		img, _ := pqb.GetImage(ctx, performer.ID)
-
-		res, err = client.SubmitPerformerDraft(ctx, performer, img)
 		return err
 	})
 

internal/api/resolver_mutation_studio.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/plugin/hook"
@@ -33,25 +32,17 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 	// Populate a new studio from the input
 	newStudio := models.NewStudio()
 
-	newStudio.Name = strings.TrimSpace(input.Name)
+	newStudio.Name = input.Name
+	newStudio.URL = translator.string(input.URL)
 	newStudio.Rating = input.Rating100
 	newStudio.Favorite = translator.bool(input.Favorite)
 	newStudio.Details = translator.string(input.Details)
 	newStudio.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
-	newStudio.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
+	newStudio.Aliases = models.NewRelatedStrings(input.Aliases)
 	newStudio.StashIDs = models.NewRelatedStashIDs(models.StashIDInputs(input.StashIds).ToStashIDs())
 
 	var err error
 
-	newStudio.URLs = models.NewRelatedStrings([]string{})
-	if input.URL != nil {
-		newStudio.URLs.Add(strings.TrimSpace(*input.URL))
-	}
-
-	if input.Urls != nil {
-		newStudio.URLs.Add(stringslice.TrimSpace(input.Urls)...)
-	}
-
 	newStudio.ParentID, err = translator.intPtrFromString(input.ParentID)
 	if err != nil {
 		return nil, fmt.Errorf("converting parent id: %w", err)
@@ -115,6 +106,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 
 	updatedStudio.ID = studioID
 	updatedStudio.Name = translator.optionalString(input.Name, "name")
+	updatedStudio.URL = translator.optionalString(input.URL, "url")
 	updatedStudio.Details = translator.optionalString(input.Details, "details")
 	updatedStudio.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedStudio.Favorite = translator.optionalBool(input.Favorite, "favorite")
@@ -132,26 +124,6 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 		return nil, fmt.Errorf("converting tag ids: %w", err)
 	}
 
-	if translator.hasField("urls") {
-		// ensure url not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
-			return nil, err
-		}
-
-		updatedStudio.URLs = translator.updateStrings(input.Urls, "urls")
-	} else if translator.hasField("url") {
-		// handle legacy url field
-		legacyURLs := []string{}
-		if input.URL != nil {
-			legacyURLs = append(legacyURLs, *input.URL)
-		}
-
-		updatedStudio.URLs = &models.UpdateStrings{
-			Mode:   models.RelationshipUpdateModeSet,
-			Values: legacyURLs,
-		}
-	}
-
 	// Process the base 64 encoded image string
 	var imageData []byte
 	imageIncluded := translator.hasField("image")
@@ -191,96 +163,6 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 	return r.getStudio(ctx, studioID)
 }
 
-func (r *mutationResolver) BulkStudioUpdate(ctx context.Context, input BulkStudioUpdateInput) ([]*models.Studio, error) {
-	ids, err := stringslice.StringSliceToIntSlice(input.Ids)
-	if err != nil {
-		return nil, fmt.Errorf("converting ids: %w", err)
-	}
-
-	translator := changesetTranslator{
-		inputMap: getUpdateInputMap(ctx),
-	}
-
-	// Populate performer from the input
-	partial := models.NewStudioPartial()
-
-	partial.ParentID, err = translator.optionalIntFromString(input.ParentID, "parent_id")
-	if err != nil {
-		return nil, fmt.Errorf("converting parent id: %w", err)
-	}
-
-	if translator.hasField("urls") {
-		// ensure url/twitter/instagram are not included in the input
-		if err := r.validateNoLegacyURLs(translator); err != nil {
-			return nil, err
-		}
-
-		partial.URLs = translator.updateStringsBulk(input.Urls, "urls")
-	} else if translator.hasField("url") {
-		// handle legacy url field
-		legacyURLs := []string{}
-		if input.URL != nil {
-			legacyURLs = append(legacyURLs, *input.URL)
-		}
-
-		partial.URLs = &models.UpdateStrings{
-			Mode:   models.RelationshipUpdateModeSet,
-			Values: legacyURLs,
-		}
-	}
-
-	partial.Favorite = translator.optionalBool(input.Favorite, "favorite")
-	partial.Rating = translator.optionalInt(input.Rating100, "rating100")
-	partial.Details = translator.optionalString(input.Details, "details")
-	partial.IgnoreAutoTag = translator.optionalBool(input.IgnoreAutoTag, "ignore_auto_tag")
-
-	partial.TagIDs, err = translator.updateIdsBulk(input.TagIds, "tag_ids")
-	if err != nil {
-		return nil, fmt.Errorf("converting tag ids: %w", err)
-	}
-
-	ret := []*models.Studio{}
-
-	// Start the transaction and save the performers
-	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		qb := r.repository.Studio
-
-		for _, id := range ids {
-			local := partial
-			local.ID = id
-			if err := studio.ValidateModify(ctx, local, qb); err != nil {
-				return err
-			}
-
-			updated, err := qb.UpdatePartial(ctx, local)
-			if err != nil {
-				return err
-			}
-
-			ret = append(ret, updated)
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	// execute post hooks outside of txn
-	var newRet []*models.Studio
-	for _, studio := range ret {
-		r.hookExecutor.ExecutePostHooks(ctx, studio.ID, hook.StudioUpdatePost, input, translator.getFields())
-
-		studio, err = r.getStudio(ctx, studio.ID)
-		if err != nil {
-			return nil, err
-		}
-
-		newRet = append(newRet, studio)
-	}
-
-	return newRet, nil
-}
-
 func (r *mutationResolver) StudioDestroy(ctx context.Context, input StudioDestroyInput) (bool, error) {
 	id, err := strconv.Atoi(input.ID)
 	if err != nil {

internal/api/resolver_mutation_tag.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
@@ -33,21 +32,13 @@ func (r *mutationResolver) TagCreate(ctx context.Context, input TagCreateInput)
 	// Populate a new tag from the input
 	newTag := models.NewTag()
 
-	newTag.Name = strings.TrimSpace(input.Name)
+	newTag.Name = input.Name
 	newTag.SortName = translator.string(input.SortName)
-	newTag.Aliases = models.NewRelatedStrings(stringslice.TrimSpace(input.Aliases))
+	newTag.Aliases = models.NewRelatedStrings(input.Aliases)
 	newTag.Favorite = translator.bool(input.Favorite)
 	newTag.Description = translator.string(input.Description)
 	newTag.IgnoreAutoTag = translator.bool(input.IgnoreAutoTag)
 
-	var stashIDInputs models.StashIDInputs
-	for _, sid := range input.StashIds {
-		if sid != nil {
-			stashIDInputs = append(stashIDInputs, *sid)
-		}
-	}
-	newTag.StashIDs = models.NewRelatedStashIDs(stashIDInputs.ToStashIDs())
-
 	var err error
 
 	newTag.ParentIDs, err = translator.relatedIds(input.ParentIds)
@@ -119,14 +110,6 @@ func (r *mutationResolver) TagUpdate(ctx context.Context, input TagUpdateInput)
 
 	updatedTag.Aliases = translator.updateStrings(input.Aliases, "aliases")
 
-	var updateStashIDInputs models.StashIDInputs
-	for _, sid := range input.StashIds {
-		if sid != nil {
-			updateStashIDInputs = append(updateStashIDInputs, *sid)
-		}
-	}
-	updatedTag.StashIDs = translator.updateStashIDs(updateStashIDInputs, "stash_ids")
-
 	updatedTag.ParentIDs, err = translator.updateIds(input.ParentIds, "parent_ids")
 	if err != nil {
 		return nil, fmt.Errorf("converting parent tag ids: %w", err)

internal/api/resolver_query_configuration.go

@@ -82,7 +82,6 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		Stashes:                       config.GetStashPaths(),
 		DatabasePath:                  config.GetDatabasePath(),
 		BackupDirectoryPath:           config.GetBackupDirectoryPath(),
-		DeleteTrashPath:               config.GetDeleteTrashPath(),
 		GeneratedPath:                 config.GetGeneratedPath(),
 		MetadataPath:                  config.GetMetadataPath(),
 		ConfigFilePath:                config.GetConfigFile(),
@@ -116,7 +115,6 @@ func makeConfigGeneralResult() *ConfigGeneralResult {
 		LogOut:                        config.GetLogOut(),
 		LogLevel:                      config.GetLogLevel(),
 		LogAccess:                     config.GetLogAccess(),
-		LogFileMaxSize:                config.GetLogFileMaxSize(),
 		VideoExtensions:               config.GetVideoExtensions(),
 		ImageExtensions:               config.GetImageExtensions(),
 		GalleryExtensions:             config.GetGalleryExtensions(),
@@ -164,7 +162,6 @@ func makeConfigInterfaceResult() *ConfigInterfaceResult {
 	disableDropdownCreate := config.GetDisableDropdownCreate()
 
 	return &ConfigInterfaceResult{
-		SfwContentMode:               config.GetSFWContentMode(),
 		MenuItems:                    menuItems,
 		SoundOnPreview:               &soundOnPreview,
 		WallShowTitle:                &wallShowTitle,
@@ -252,19 +249,18 @@ func (r *queryResolver) ValidateStashBoxCredentials(ctx context.Context, input c
 	if valid {
 		status = fmt.Sprintf("Successfully authenticated as %s", user.Me.Name)
 	} else {
-		errorStr := strings.ToLower(err.Error())
 		switch {
-		case strings.Contains(errorStr, "doctype"):
+		case strings.Contains(strings.ToLower(err.Error()), "doctype"):
 			// Index file returned rather than graphql
 			status = "Invalid endpoint"
-		case strings.Contains(errorStr, "request failed"):
+		case strings.Contains(err.Error(), "request failed"):
 			status = "No response from server"
-		case strings.Contains(errorStr, "invalid character") ||
+		case strings.HasPrefix(err.Error(), "invalid character") ||
-			strings.Contains(errorStr, "illegal base64 data") ||
+			strings.HasPrefix(err.Error(), "illegal base64 data") ||
-			strings.Contains(errorStr, "unexpected end of json input") ||
+			err.Error() == "unexpected end of JSON input" ||
-			strings.Contains(errorStr, "token contains an invalid number of segments"):
+			err.Error() == "token contains an invalid number of segments":
 			status = "Malformed API key."
-		case strings.Contains(errorStr, "signature is invalid"):
+		case err.Error() == "" || err.Error() == "signature is invalid":
 			status = "Invalid or expired API key."
 		default:
 			status = fmt.Sprintf("Unknown error: %s", err)

internal/api/resolver_query_find_file.go

@@ -1,120 +0,0 @@
-package api
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
-)
-
-func (r *queryResolver) FindFile(ctx context.Context, id *string, path *string) (BaseFile, error) {
-	var ret models.File
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		qb := r.repository.File
-		var err error
-		switch {
-		case id != nil:
-			idInt, err := strconv.Atoi(*id)
-			if err != nil {
-				return err
-			}
-			var files []models.File
-			files, err = qb.Find(ctx, models.FileID(idInt))
-			if err != nil {
-				return err
-			}
-			if len(files) > 0 {
-				ret = files[0]
-			}
-		case path != nil:
-			ret, err = qb.FindByPath(ctx, *path, true)
-			if err == nil && ret == nil {
-				return errors.New("file not found")
-			}
-		default:
-			return errors.New("either id or path must be provided")
-		}
-
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return convertBaseFile(ret), nil
-}
-
-func (r *queryResolver) FindFiles(
-	ctx context.Context,
-	fileFilter *models.FileFilterType,
-	filter *models.FindFilterType,
-	ids []string,
-) (ret *FindFilesResultType, err error) {
-	var fileIDs []models.FileID
-	if len(ids) > 0 {
-		fileIDsInt, err := stringslice.StringSliceToIntSlice(ids)
-		if err != nil {
-			return nil, err
-		}
-
-		fileIDs = models.FileIDsFromInts(fileIDsInt)
-	}
-
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var files []models.File
-		var err error
-
-		fields := collectQueryFields(ctx)
-		result := &models.FileQueryResult{}
-
-		if len(fileIDs) > 0 {
-			files, err = r.repository.File.Find(ctx, fileIDs...)
-			if err == nil {
-				result.Count = len(files)
-				for _, f := range files {
-					if asVideo, ok := f.(*models.VideoFile); ok {
-						result.TotalDuration += asVideo.Duration
-					}
-					if asImage, ok := f.(*models.ImageFile); ok {
-						result.Megapixels += asImage.Megapixels()
-					}
-
-					result.TotalSize += f.Base().Size
-				}
-			}
-		} else {
-			result, err = r.repository.File.Query(ctx, models.FileQueryOptions{
-				QueryOptions: models.QueryOptions{
-					FindFilter: filter,
-					Count:      fields.Has("count"),
-				},
-				FileFilter:    fileFilter,
-				TotalDuration: fields.Has("duration"),
-				Megapixels:    fields.Has("megapixels"),
-				TotalSize:     fields.Has("size"),
-			})
-			if err == nil {
-				files, err = result.Resolve(ctx)
-			}
-		}
-
-		if err != nil {
-			return err
-		}
-
-		ret = &FindFilesResultType{
-			Count:      result.Count,
-			Files:      convertBaseFiles(files),
-			Duration:   result.TotalDuration,
-			Megapixels: result.Megapixels,
-			Size:       int(result.TotalSize),
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}

internal/api/resolver_query_find_folder.go

@@ -1,100 +0,0 @@
-package api
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
-)
-
-func (r *queryResolver) FindFolder(ctx context.Context, id *string, path *string) (*models.Folder, error) {
-	var ret *models.Folder
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		qb := r.repository.Folder
-		var err error
-		switch {
-		case id != nil:
-			idInt, err := strconv.Atoi(*id)
-			if err != nil {
-				return err
-			}
-			ret, err = qb.Find(ctx, models.FolderID(idInt))
-			if err != nil {
-				return err
-			}
-		case path != nil:
-			ret, err = qb.FindByPath(ctx, *path, true)
-			if err == nil && ret == nil {
-				return errors.New("folder not found")
-			}
-		default:
-			return errors.New("either id or path must be provided")
-		}
-
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}
-
-func (r *queryResolver) FindFolders(
-	ctx context.Context,
-	folderFilter *models.FolderFilterType,
-	filter *models.FindFilterType,
-	ids []string,
-) (ret *FindFoldersResultType, err error) {
-	var folderIDs []models.FolderID
-	if len(ids) > 0 {
-		folderIDsInt, err := stringslice.StringSliceToIntSlice(ids)
-		if err != nil {
-			return nil, err
-		}
-
-		folderIDs = models.FolderIDsFromInts(folderIDsInt)
-	}
-
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var folders []*models.Folder
-		var err error
-
-		fields := collectQueryFields(ctx)
-		result := &models.FolderQueryResult{}
-
-		if len(folderIDs) > 0 {
-			folders, err = r.repository.Folder.FindMany(ctx, folderIDs)
-			if err == nil {
-				result.Count = len(folders)
-			}
-		} else {
-			result, err = r.repository.Folder.Query(ctx, models.FolderQueryOptions{
-				QueryOptions: models.QueryOptions{
-					FindFilter: filter,
-					Count:      fields.Has("count"),
-				},
-				FolderFilter: folderFilter,
-			})
-			if err == nil {
-				folders, err = result.Resolve(ctx)
-			}
-		}
-
-		if err != nil {
-			return err
-		}
-
-		ret = &FindFoldersResultType{
-			Count:   result.Count,
-			Folders: folders,
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return ret, nil
-}

internal/api/resolver_query_find_tag.go

@@ -62,11 +62,7 @@ func (r *queryResolver) FindTags(ctx context.Context, tagFilter *models.TagFilte
 func (r *queryResolver) AllTags(ctx context.Context) (ret []*models.Tag, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
 		ret, err = r.repository.Tag.All(ctx)
-		if err != nil {
+		return err
-			return err
-		}
-
-		return nil
 	}); err != nil {
 		return nil, err
 	}

internal/api/resolver_query_scraper.go

@@ -4,13 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"slices"
 	"strconv"
 
-	"github.com/stashapp/stash/pkg/match"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/scraper"
-	"github.com/stashapp/stash/pkg/sliceutil"
+	"github.com/stashapp/stash/pkg/scraper/stashbox"
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
 )
 
@@ -31,7 +29,7 @@ func (r *queryResolver) ScrapePerformerURL(ctx context.Context, url string) (*mo
 	return marshalScrapedPerformer(content)
 }
 
-func (r *queryResolver) ScrapeSceneQuery(ctx context.Context, scraperID string, query string) ([]*models.ScrapedScene, error) {
+func (r *queryResolver) ScrapeSceneQuery(ctx context.Context, scraperID string, query string) ([]*scraper.ScrapedScene, error) {
 	if query == "" {
 		return nil, nil
 	}
@@ -49,7 +47,7 @@ func (r *queryResolver) ScrapeSceneQuery(ctx context.Context, scraperID string,
 	return ret, nil
 }
 
-func (r *queryResolver) ScrapeSceneURL(ctx context.Context, url string) (*models.ScrapedScene, error) {
+func (r *queryResolver) ScrapeSceneURL(ctx context.Context, url string) (*scraper.ScrapedScene, error) {
 	content, err := r.scraperCache().ScrapeURL(ctx, url, scraper.ScrapeContentTypeScene)
 	if err != nil {
 		return nil, err
@@ -63,7 +61,7 @@ func (r *queryResolver) ScrapeSceneURL(ctx context.Context, url string) (*models
 	return ret, nil
 }
 
-func (r *queryResolver) ScrapeGalleryURL(ctx context.Context, url string) (*models.ScrapedGallery, error) {
+func (r *queryResolver) ScrapeGalleryURL(ctx context.Context, url string) (*scraper.ScrapedGallery, error) {
 	content, err := r.scraperCache().ScrapeURL(ctx, url, scraper.ScrapeContentTypeGallery)
 	if err != nil {
 		return nil, err
@@ -77,7 +75,7 @@ func (r *queryResolver) ScrapeGalleryURL(ctx context.Context, url string) (*mode
 	return ret, nil
 }
 
-func (r *queryResolver) ScrapeImageURL(ctx context.Context, url string) (*models.ScrapedImage, error) {
+func (r *queryResolver) ScrapeImageURL(ctx context.Context, url string) (*scraper.ScrapedImage, error) {
 	content, err := r.scraperCache().ScrapeURL(ctx, url, scraper.ScrapeContentTypeImage)
 	if err != nil {
 		return nil, err
@@ -101,12 +99,12 @@ func (r *queryResolver) ScrapeMovieURL(ctx context.Context, url string) (*models
 }
 
 func (r *queryResolver) ScrapeGroupURL(ctx context.Context, url string) (*models.ScrapedGroup, error) {
-	content, err := r.scraperCache().ScrapeURL(ctx, url, scraper.ScrapeContentTypeGroup)
+	content, err := r.scraperCache().ScrapeURL(ctx, url, scraper.ScrapeContentTypeMovie)
 	if err != nil {
 		return nil, err
 	}
 
-	ret, err := marshalScrapedGroup(content)
+	ret, err := marshalScrapedMovie(content)
 	if err != nil {
 		return nil, err
 	}
@@ -131,8 +129,8 @@ func (r *queryResolver) ScrapeGroupURL(ctx context.Context, url string) (*models
 	return group, nil
 }
 
-func (r *queryResolver) ScrapeSingleScene(ctx context.Context, source scraper.Source, input ScrapeSingleSceneInput) ([]*models.ScrapedScene, error) {
+func (r *queryResolver) ScrapeSingleScene(ctx context.Context, source scraper.Source, input ScrapeSingleSceneInput) ([]*scraper.ScrapedScene, error) {
-	var ret []*models.ScrapedScene
+	var ret []*scraper.ScrapedScene
 
 	var sceneID int
 	if input.SceneID != nil {
@@ -184,14 +182,9 @@ func (r *queryResolver) ScrapeSingleScene(ctx context.Context, source scraper.So
 
 		switch {
 		case input.SceneID != nil:
-			var fps []models.Fingerprints
+			ret, err = client.FindStashBoxSceneByFingerprints(ctx, sceneID)
-			fps, err = r.getScenesFingerprints(ctx, []int{sceneID})
-			if err != nil {
-				return nil, err
-			}
-			ret, err = client.FindSceneByFingerprints(ctx, fps[0])
 		case input.Query != nil:
-			ret, err = client.QueryScene(ctx, *input.Query)
+			ret, err = client.QueryStashBoxScene(ctx, *input.Query)
 		default:
 			return nil, fmt.Errorf("%w: scene_id or query must be set", ErrInput)
 		}
@@ -199,23 +192,14 @@ func (r *queryResolver) ScrapeSingleScene(ctx context.Context, source scraper.So
 		if err != nil {
 			return nil, err
 		}
-
-		// TODO - this should happen after any scene is scraped
-		if err := r.matchScenesRelationships(ctx, ret, b.Endpoint); err != nil {
-			return nil, err
-		}
 	default:
 		return nil, fmt.Errorf("%w: scraper_id or stash_box_index must be set", ErrInput)
 	}
 
-	for i := range ret {
-		slices.SortFunc(ret[i].Tags, models.ScrapedTagSortFunction)
-	}
-
 	return ret, nil
 }
 
-func (r *queryResolver) ScrapeMultiScenes(ctx context.Context, source scraper.Source, input ScrapeMultiScenesInput) ([][]*models.ScrapedScene, error) {
+func (r *queryResolver) ScrapeMultiScenes(ctx context.Context, source scraper.Source, input ScrapeMultiScenesInput) ([][]*scraper.ScrapedScene, error) {
 	if source.ScraperID != nil {
 		return nil, ErrNotImplemented
 	} else if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
@@ -231,89 +215,12 @@ func (r *queryResolver) ScrapeMultiScenes(ctx context.Context, source scraper.So
 			return nil, err
 		}
 
-		fps, err := r.getScenesFingerprints(ctx, sceneIDs)
+		return client.FindStashBoxScenesByFingerprints(ctx, sceneIDs)
-		if err != nil {
-			return nil, err
-		}
-
-		ret, err := client.FindScenesByFingerprints(ctx, fps)
-		if err != nil {
-			return nil, err
-		}
-
-		// match relationships - this mutates the existing scenes so we can
-		// just flatten the slice and pass it in
-		flat := sliceutil.Flatten(ret)
-
-		if err := r.matchScenesRelationships(ctx, flat, b.Endpoint); err != nil {
-			return nil, err
-		}
-
-		return ret, nil
 	}
 
 	return nil, errors.New("scraper_id or stash_box_index must be set")
 }
 
-func (r *queryResolver) getScenesFingerprints(ctx context.Context, ids []int) ([]models.Fingerprints, error) {
-	fingerprints := make([]models.Fingerprints, len(ids))
-
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		qb := r.repository.Scene
-
-		for i, sceneID := range ids {
-			scene, err := qb.Find(ctx, sceneID)
-			if err != nil {
-				return err
-			}
-
-			if scene == nil {
-				return fmt.Errorf("scene with id %d not found", sceneID)
-			}
-
-			if err := scene.LoadFiles(ctx, qb); err != nil {
-				return err
-			}
-
-			var sceneFPs models.Fingerprints
-
-			for _, f := range scene.Files.List() {
-				sceneFPs = append(sceneFPs, f.Fingerprints...)
-			}
-
-			fingerprints[i] = sceneFPs
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return fingerprints, nil
-}
-
-// matchSceneRelationships accepts scraped scenes and attempts to match its relationships to existing stash models.
-func (r *queryResolver) matchScenesRelationships(ctx context.Context, ss []*models.ScrapedScene, endpoint string) error {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		matcher := match.SceneRelationships{
-			PerformerFinder: r.repository.Performer,
-			TagFinder:       r.repository.Tag,
-			StudioFinder:    r.repository.Studio,
-		}
-
-		for _, s := range ss {
-			if err := matcher.MatchRelationships(ctx, s, endpoint); err != nil {
-				return err
-			}
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.Source, input ScrapeSingleStudioInput) ([]*models.ScrapedStudio, error) {
 	if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
 		b, err := resolveStashBox(source.StashBoxIndex, source.StashBoxEndpoint)
@@ -324,7 +231,7 @@ func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.S
 		client := r.newStashBoxClient(*b)
 
 		var ret []*models.ScrapedStudio
-		out, err := client.FindStudio(ctx, *input.Query)
+		out, err := client.FindStashBoxStudio(ctx, *input.Query)
 
 		if err != nil {
 			return nil, err
@@ -333,63 +240,13 @@ func (r *queryResolver) ScrapeSingleStudio(ctx context.Context, source scraper.S
 		}
 
 		if len(ret) > 0 {
-			if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-				for _, studio := range ret {
-					if err := match.ScrapedStudioHierarchy(ctx, r.repository.Studio, studio, b.Endpoint); err != nil {
-						return err
-					}
-				}
-
-				return nil
-			}); err != nil {
-				return nil, err
-			}
 			return ret, nil
 		}
 
 		return nil, nil
 	}
 
-	return nil, errors.New("stash_box_endpoint must be set")
+	return nil, errors.New("stash_box_index must be set")
-}
-
-func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Source, input ScrapeSingleTagInput) ([]*models.ScrapedTag, error) {
-	if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
-		b, err := resolveStashBox(source.StashBoxIndex, source.StashBoxEndpoint)
-		if err != nil {
-			return nil, err
-		}
-
-		client := r.newStashBoxClient(*b)
-
-		var ret []*models.ScrapedTag
-		out, err := client.QueryTag(ctx, *input.Query)
-
-		if err != nil {
-			return nil, err
-		} else if out != nil {
-			ret = append(ret, out...)
-		}
-
-		if len(ret) > 0 {
-			if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-				for _, tag := range ret {
-					if err := match.ScrapedTag(ctx, r.repository.Tag, tag, b.Endpoint); err != nil {
-						return err
-					}
-				}
-
-				return nil
-			}); err != nil {
-				return nil, err
-			}
-			return ret, nil
-		}
-
-		return nil, nil
-	}
-
-	return nil, errors.New("stash_box_endpoint must be set")
 }
 
 func (r *queryResolver) ScrapeSinglePerformer(ctx context.Context, source scraper.Source, input ScrapeSinglePerformerInput) ([]*models.ScrapedPerformer, error) {
@@ -428,29 +285,23 @@ func (r *queryResolver) ScrapeSinglePerformer(ctx context.Context, source scrape
 
 		client := r.newStashBoxClient(*b)
 
-		var query string
+		var res []*stashbox.StashBoxPerformerQueryResult
 		switch {
 		case input.PerformerID != nil:
-			names, err := r.findPerformerNames(ctx, []string{*input.PerformerID})
+			res, err = client.FindStashBoxPerformersByNames(ctx, []string{*input.PerformerID})
-			if err != nil {
-				return nil, err
-			}
-
-			query = names[0]
 		case input.Query != nil:
-			query = *input.Query
+			res, err = client.QueryStashBoxPerformer(ctx, *input.Query)
 		default:
 			return nil, ErrNotImplemented
 		}
 
-		if query == "" {
-			return nil, nil
-		}
-		ret, err = client.QueryPerformer(ctx, query)
-
 		if err != nil {
 			return nil, err
 		}
+
+		if len(res) > 0 {
+			ret = res[0].Results
+		}
 	default:
 		return nil, errors.New("scraper_id or stash_box_index must be set")
 	}
@@ -462,11 +313,6 @@ func (r *queryResolver) ScrapeMultiPerformers(ctx context.Context, source scrape
 	if source.ScraperID != nil {
 		return nil, ErrNotImplemented
 	} else if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
-		names, err := r.findPerformerNames(ctx, input.PerformerIds)
-		if err != nil {
-			return nil, err
-		}
-
 		b, err := resolveStashBox(source.StashBoxIndex, source.StashBoxEndpoint)
 		if err != nil {
 			return nil, err
@@ -474,40 +320,14 @@ func (r *queryResolver) ScrapeMultiPerformers(ctx context.Context, source scrape
 
 		client := r.newStashBoxClient(*b)
 
-		return client.QueryPerformers(ctx, names)
+		return client.FindStashBoxPerformersByPerformerNames(ctx, input.PerformerIds)
 	}
 
 	return nil, errors.New("scraper_id or stash_box_index must be set")
 }
 
-func (r *queryResolver) findPerformerNames(ctx context.Context, performerIDs []string) ([]string, error) {
+func (r *queryResolver) ScrapeSingleGallery(ctx context.Context, source scraper.Source, input ScrapeSingleGalleryInput) ([]*scraper.ScrapedGallery, error) {
-	ids, err := stringslice.StringSliceToIntSlice(performerIDs)
+	var ret []*scraper.ScrapedGallery
-	if err != nil {
-		return nil, err
-	}
-
-	names := make([]string, len(ids))
-
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		p, err := r.repository.Performer.FindMany(ctx, ids)
-		if err != nil {
-			return err
-		}
-
-		for i, pp := range p {
-			names[i] = pp.Name
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return names, nil
-}
-
-func (r *queryResolver) ScrapeSingleGallery(ctx context.Context, source scraper.Source, input ScrapeSingleGalleryInput) ([]*models.ScrapedGallery, error) {
-	var ret []*models.ScrapedGallery
 
 	if source.StashBoxIndex != nil || source.StashBoxEndpoint != nil {
 		return nil, ErrNotSupported
@@ -549,7 +369,7 @@ func (r *queryResolver) ScrapeSingleGallery(ctx context.Context, source scraper.
 	return ret, nil
 }
 
-func (r *queryResolver) ScrapeSingleImage(ctx context.Context, source scraper.Source, input ScrapeSingleImageInput) ([]*models.ScrapedImage, error) {
+func (r *queryResolver) ScrapeSingleImage(ctx context.Context, source scraper.Source, input ScrapeSingleImageInput) ([]*scraper.ScrapedImage, error) {
 	if source.StashBoxIndex != nil {
 		return nil, ErrNotSupported
 	}

internal/api/routes_performer.go

@@ -18,14 +18,9 @@ type PerformerFinder interface {
 	GetImage(ctx context.Context, performerID int) ([]byte, error)
 }
 
-type sfwConfig interface {
-	GetSFWContentMode() bool
-}
-
 type performerRoutes struct {
 	routes
 	performerFinder PerformerFinder
-	sfwConfig       sfwConfig
 }
 
 func (rs performerRoutes) Routes() chi.Router {
@@ -59,7 +54,7 @@ func (rs performerRoutes) Image(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if len(image) == 0 {
-		image = getDefaultPerformerImage(performer.Name, performer.Gender, rs.sfwConfig.GetSFWContentMode())
+		image = getDefaultPerformerImage(performer.Name, performer.Gender)
 	}
 
 	utils.ServeImage(w, r, image)

internal/api/routes_plugin.go

@@ -20,7 +20,6 @@ func (rs pluginRoutes) Routes() chi.Router {
 
 	r.Route("/{pluginId}", func(r chi.Router) {
 		r.Use(rs.PluginCtx)
-		r.Get("/assets", rs.Assets)
 		r.Get("/assets/*", rs.Assets)
 		r.Get("/javascript", rs.Javascript)
 		r.Get("/css", rs.CSS)

internal/api/scraped_content.go

@@ -9,8 +9,8 @@ import (
 
 // marshalScrapedScenes converts ScrapedContent into ScrapedScene. If conversion fails, an
 // error is returned to the caller.
-func marshalScrapedScenes(content []scraper.ScrapedContent) ([]*models.ScrapedScene, error) {
+func marshalScrapedScenes(content []scraper.ScrapedContent) ([]*scraper.ScrapedScene, error) {
-	var ret []*models.ScrapedScene
+	var ret []*scraper.ScrapedScene
 	for _, c := range content {
 		if c == nil {
 			// graphql schema requires scenes to be non-nil
@@ -18,9 +18,9 @@ func marshalScrapedScenes(content []scraper.ScrapedContent) ([]*models.ScrapedSc
 		}
 
 		switch s := c.(type) {
-		case *models.ScrapedScene:
+		case *scraper.ScrapedScene:
 			ret = append(ret, s)
-		case models.ScrapedScene:
+		case scraper.ScrapedScene:
 			ret = append(ret, &s)
 		default:
 			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedScene", models.ErrConversion)
@@ -55,8 +55,8 @@ func marshalScrapedPerformers(content []scraper.ScrapedContent) ([]*models.Scrap
 
 // marshalScrapedGalleries converts ScrapedContent into ScrapedGallery. If
 // conversion fails, an error is returned.
-func marshalScrapedGalleries(content []scraper.ScrapedContent) ([]*models.ScrapedGallery, error) {
+func marshalScrapedGalleries(content []scraper.ScrapedContent) ([]*scraper.ScrapedGallery, error) {
-	var ret []*models.ScrapedGallery
+	var ret []*scraper.ScrapedGallery
 	for _, c := range content {
 		if c == nil {
 			// graphql schema requires galleries to be non-nil
@@ -64,9 +64,9 @@ func marshalScrapedGalleries(content []scraper.ScrapedContent) ([]*models.Scrape
 		}
 
 		switch g := c.(type) {
-		case *models.ScrapedGallery:
+		case *scraper.ScrapedGallery:
 			ret = append(ret, g)
-		case models.ScrapedGallery:
+		case scraper.ScrapedGallery:
 			ret = append(ret, &g)
 		default:
 			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedGallery", models.ErrConversion)
@@ -76,8 +76,8 @@ func marshalScrapedGalleries(content []scraper.ScrapedContent) ([]*models.Scrape
 	return ret, nil
 }
 
-func marshalScrapedImages(content []scraper.ScrapedContent) ([]*models.ScrapedImage, error) {
+func marshalScrapedImages(content []scraper.ScrapedContent) ([]*scraper.ScrapedImage, error) {
-	var ret []*models.ScrapedImage
+	var ret []*scraper.ScrapedImage
 	for _, c := range content {
 		if c == nil {
 			// graphql schema requires images to be non-nil
@@ -85,9 +85,9 @@ func marshalScrapedImages(content []scraper.ScrapedContent) ([]*models.ScrapedIm
 		}
 
 		switch g := c.(type) {
-		case *models.ScrapedImage:
+		case *scraper.ScrapedImage:
 			ret = append(ret, g)
-		case models.ScrapedImage:
+		case scraper.ScrapedImage:
 			ret = append(ret, &g)
 		default:
 			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedImage", models.ErrConversion)
@@ -113,37 +113,7 @@ func marshalScrapedMovies(content []scraper.ScrapedContent) ([]*models.ScrapedMo
 		case models.ScrapedMovie:
 			ret = append(ret, &m)
 		default:
-			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedMovie", models.ErrConversion)
+			return nil, fmt.Errorf("%w: cannot turn ScrapedConetnt into ScrapedMovie", models.ErrConversion)
-		}
-	}
-
-	return ret, nil
-}
-
-// marshalScrapedMovies converts ScrapedContent into ScrapedMovie. If conversion
-// fails, an error is returned.
-func marshalScrapedGroups(content []scraper.ScrapedContent) ([]*models.ScrapedGroup, error) {
-	var ret []*models.ScrapedGroup
-	for _, c := range content {
-		if c == nil {
-			// graphql schema requires groups to be non-nil
-			continue
-		}
-
-		switch m := c.(type) {
-		case *models.ScrapedGroup:
-			ret = append(ret, m)
-		case models.ScrapedGroup:
-			ret = append(ret, &m)
-		// it's possible that a scraper returns models.ScrapedMovie
-		case *models.ScrapedMovie:
-			g := m.ScrapedGroup()
-			ret = append(ret, &g)
-		case models.ScrapedMovie:
-			g := m.ScrapedGroup()
-			ret = append(ret, &g)
-		default:
-			return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedGroup", models.ErrConversion)
 		}
 	}
 
@@ -161,7 +131,7 @@ func marshalScrapedPerformer(content scraper.ScrapedContent) (*models.ScrapedPer
 }
 
 // marshalScrapedScene will marshal a single scraped scene
-func marshalScrapedScene(content scraper.ScrapedContent) (*models.ScrapedScene, error) {
+func marshalScrapedScene(content scraper.ScrapedContent) (*scraper.ScrapedScene, error) {
 	s, err := marshalScrapedScenes([]scraper.ScrapedContent{content})
 	if err != nil {
 		return nil, err
@@ -171,7 +141,7 @@ func marshalScrapedScene(content scraper.ScrapedContent) (*models.ScrapedScene,
 }
 
 // marshalScrapedGallery will marshal a single scraped gallery
-func marshalScrapedGallery(content scraper.ScrapedContent) (*models.ScrapedGallery, error) {
+func marshalScrapedGallery(content scraper.ScrapedContent) (*scraper.ScrapedGallery, error) {
 	g, err := marshalScrapedGalleries([]scraper.ScrapedContent{content})
 	if err != nil {
 		return nil, err
@@ -181,7 +151,7 @@ func marshalScrapedGallery(content scraper.ScrapedContent) (*models.ScrapedGalle
 }
 
 // marshalScrapedImage will marshal a single scraped image
-func marshalScrapedImage(content scraper.ScrapedContent) (*models.ScrapedImage, error) {
+func marshalScrapedImage(content scraper.ScrapedContent) (*scraper.ScrapedImage, error) {
 	g, err := marshalScrapedImages([]scraper.ScrapedContent{content})
 	if err != nil {
 		return nil, err
@@ -199,13 +169,3 @@ func marshalScrapedMovie(content scraper.ScrapedContent) (*models.ScrapedMovie,
 
 	return m[0], nil
 }
-
-// marshalScrapedMovie will marshal a single scraped movie
-func marshalScrapedGroup(content scraper.ScrapedContent) (*models.ScrapedGroup, error) {
-	m, err := marshalScrapedGroups([]scraper.ScrapedContent{content})
-	if err != nil {
-		return nil, err
-	}
-
-	return m[0], nil
-}

internal/api/server.go

@@ -41,11 +41,10 @@ import (
 )
 
 const (
-	loginEndpoint       = "/login"
+	loginEndpoint      = "/login"
-	loginLocaleEndpoint = loginEndpoint + "/locale"
+	logoutEndpoint     = "/logout"
-	logoutEndpoint      = "/logout"
+	gqlEndpoint        = "/graphql"
-	gqlEndpoint         = "/graphql"
+	playgroundEndpoint = "/playground"
-	playgroundEndpoint  = "/playground"
 )
 
 type Server struct {
@@ -207,7 +206,7 @@ func Initialize() (*Server, error) {
 	r.HandleFunc(playgroundEndpoint, func(w http.ResponseWriter, r *http.Request) {
 		setPageSecurityHeaders(w, r, pluginCache.ListPlugins())
 		endpoint := getProxyPrefix(r) + gqlEndpoint
-		gqlPlayground.Handler("GraphQL playground", endpoint, gqlPlayground.WithGraphiqlEnablePluginExplorer(true))(w, r)
+		gqlPlayground.Handler("GraphQL playground", endpoint)(w, r)
 	})
 
 	r.Mount("/performer", server.getPerformerRoutes())
@@ -229,7 +228,6 @@ func Initialize() (*Server, error) {
 	r.Get(loginEndpoint, handleLogin())
 	r.Post(loginEndpoint, handleLoginPost())
 	r.Get(logoutEndpoint, handleLogout())
-	r.Get(loginLocaleEndpoint, handleLoginLocale(cfg))
 	r.HandleFunc(loginEndpoint+"/*", func(w http.ResponseWriter, r *http.Request) {
 		r.URL.Path = strings.TrimPrefix(r.URL.Path, loginEndpoint)
 		w.Header().Set("Cache-Control", "no-cache")
@@ -322,7 +320,6 @@ func (s *Server) getPerformerRoutes() chi.Router {
 	return performerRoutes{
 		routes:          routes{txnManager: repo.TxnManager},
 		performerFinder: repo.Performer,
-		sfwConfig:       s.manager.Config,
 	}.Routes()
 }
 

internal/api/session.go

@@ -17,11 +17,7 @@ import (
 	"github.com/stashapp/stash/ui"
 )
 
-const (
+const returnURLParam = "returnURL"
-	returnURLParam = "returnURL"
-
-	defaultLocale = "en-GB"
-)
 
 func getLoginPage() []byte {
 	data, err := fs.ReadFile(ui.LoginUIBox, "login.html")
@@ -62,47 +58,6 @@ func serveLoginPage(w http.ResponseWriter, r *http.Request, returnURL string, lo
 	utils.ServeStaticContent(w, r, buffer.Bytes())
 }
 
-func handleLoginLocale(cfg *config.Config) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		// get the locale from the config
-		lang := cfg.GetLanguage()
-		if lang == "" {
-			lang = defaultLocale
-		}
-
-		data, err := getLoginLocale(lang)
-		if err != nil {
-			logger.Debugf("Failed to load login locale file for language %s: %v", lang, err)
-			// try again with the default language
-			if lang != defaultLocale {
-				data, err = getLoginLocale(defaultLocale)
-				if err != nil {
-					logger.Errorf("Failed to load login locale file for default language %s: %v", defaultLocale, err)
-				}
-			}
-
-			// if there's still an error, response with an internal server error
-			if err != nil {
-				http.Error(w, "Failed to load login locale file", http.StatusInternalServerError)
-				return
-			}
-		}
-
-		// write a script to set the locale string map as a global variable
-		localeScript := fmt.Sprintf("var localeStrings = %s;", data)
-		w.Header().Set("Content-Type", "application/javascript")
-		_, _ = w.Write([]byte(localeScript))
-	}
-}
-
-func getLoginLocale(lang string) ([]byte, error) {
-	data, err := fs.ReadFile(ui.LoginUIBox, "locales/"+lang+".json")
-	if err != nil {
-		return nil, err
-	}
-	return data, nil
-}
-
 func handleLogin() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		returnURL := r.URL.Query().Get(returnURLParam)
@@ -123,26 +78,31 @@ func handleLogin() http.HandlerFunc {
 
 func handleLoginPost() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		url := r.FormValue(returnURLParam)
+		if url == "" {
+			url = getProxyPrefix(r) + "/"
+		}
+
 		err := manager.GetInstance().SessionStore.Login(w, r)
 		if err != nil {
 			// always log the error
-			logger.Errorf("Error logging in: %v from IP: %s", err, r.RemoteAddr)
+			logger.Errorf("Error logging in: %v", err)
 		}
 
 		var invalidCredentialsError *session.InvalidCredentialsError
 
 		if errors.As(err, &invalidCredentialsError) {
-			http.Error(w, "Username or password is invalid", http.StatusUnauthorized)
+			// serve login page with an error
+			serveLoginPage(w, r, url, "Username or password is invalid")
 			return
 		}
 
 		if err != nil {
-			// don't expose the error to the user
+			http.Error(w, err.Error(), http.StatusInternalServerError)
-			http.Error(w, "An unexpected error occurred. See logs", http.StatusInternalServerError)
 			return
 		}
 
-		w.WriteHeader(http.StatusOK)
+		http.Redirect(w, r, url, http.StatusFound)
 	}
 }
 

internal/api/stash_box.go

@@ -7,11 +7,11 @@ import (
 	"github.com/stashapp/stash/internal/manager"
 	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/pkg/models"
-	"github.com/stashapp/stash/pkg/stashbox"
+	"github.com/stashapp/stash/pkg/scraper/stashbox"
 )
 
 func (r *Resolver) newStashBoxClient(box models.StashBox) *stashbox.Client {
-	return stashbox.NewClient(box, stashbox.ExcludeTagPatterns(manager.GetInstance().Config.GetScraperExcludeTagPatterns()))
+	return stashbox.NewClient(box, r.stashboxRepository(), manager.GetInstance().Config.GetScraperExcludeTagPatterns())
 }
 
 func resolveStashBoxFn(indexField, endpointField string) func(index *int, endpoint *string) (*models.StashBox, error) {

internal/api/urlbuilders/gallery.go

@@ -9,14 +9,12 @@ import (
 type GalleryURLBuilder struct {
 	BaseURL   string
 	GalleryID string
-	UpdatedAt string
 }
 
 func NewGalleryURLBuilder(baseURL string, gallery *models.Gallery) GalleryURLBuilder {
 	return GalleryURLBuilder{
 		BaseURL:   baseURL,
 		GalleryID: strconv.Itoa(gallery.ID),
-		UpdatedAt: strconv.FormatInt(gallery.UpdatedAt.Unix(), 10),
 	}
 }
 
@@ -25,5 +23,5 @@ func (b GalleryURLBuilder) GetPreviewURL() string {
 }
 
 func (b GalleryURLBuilder) GetCoverURL() string {
-	return b.BaseURL + "/gallery/" + b.GalleryID + "/cover?t=" + b.UpdatedAt
+	return b.BaseURL + "/gallery/" + b.GalleryID + "/cover"
 }

internal/autotag/integration_test.go

@@ -225,7 +225,7 @@ func createSceneFile(ctx context.Context, name string, folderStore models.Folder
 }
 
 func getOrCreateFolder(ctx context.Context, folderStore models.FolderFinderCreator, folderPath string) (*models.Folder, error) {
-	f, err := folderStore.FindByPath(ctx, folderPath, true)
+	f, err := folderStore.FindByPath(ctx, folderPath)
 	if err != nil {
 		return nil, fmt.Errorf("getting folder by path: %w", err)
 	}

internal/desktop/systray_nonlinux.go

@@ -3,7 +3,6 @@
 package desktop
 
 import (
-	"runtime"
 	"strings"
 
 	"github.com/kermieisinthehouse/systray"
@@ -21,12 +20,7 @@ func startSystray(exit chan int, faviconProvider FaviconProvider) {
 	// system is started from a non-terminal method, e.g. double-clicking an icon.
 	c := config.GetInstance()
 	if c.GetShowOneTimeMovedNotification() {
-		// Use platform-appropriate terminology
+		SendNotification("Stash has moved!", "Stash now runs in your tray, instead of a terminal window.")
-		location := "tray"
-		if runtime.GOOS == "darwin" {
-			location = "menu bar"
-		}
-		SendNotification("Stash has moved!", "Stash now runs in your "+location+", instead of a terminal window.")
 		c.SetBool(config.ShowOneTimeMovedNotification, false)
 		if err := c.Write(); err != nil {
 			logger.Errorf("Error while writing configuration file: %v", err)

internal/dlna/cms.go

@@ -27,7 +27,7 @@ import (
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-const defaultProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*,http-get:*:image/avif:*"
+const defaultProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*"
 
 type connectionManagerService struct {
 	*Server

internal/identify/identify.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stashapp/stash/pkg/logger"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/scene"
+	"github.com/stashapp/stash/pkg/scraper"
 	"github.com/stashapp/stash/pkg/sliceutil"
 	"github.com/stashapp/stash/pkg/txn"
 	"github.com/stashapp/stash/pkg/utils"
@@ -31,7 +32,7 @@ func (e *MultipleMatchesFoundError) Error() string {
 }
 
 type SceneScraper interface {
-	ScrapeScenes(ctx context.Context, sceneID int) ([]*models.ScrapedScene, error)
+	ScrapeScenes(ctx context.Context, sceneID int) ([]*scraper.ScrapedScene, error)
 }
 
 type SceneUpdatePostHookExecutor interface {
@@ -95,7 +96,7 @@ func (t *SceneIdentifier) Identify(ctx context.Context, scene *models.Scene) err
 }
 
 type scrapeResult struct {
-	result *models.ScrapedScene
+	result *scraper.ScrapedScene
 	source ScraperSource
 }
 
@@ -373,7 +374,7 @@ func getFieldOptions(options []MetadataOptions) map[string]*FieldOptions {
 	return ret
 }
 
-func getScenePartial(scene *models.Scene, scraped *models.ScrapedScene, fieldOptions map[string]*FieldOptions, setOrganized bool) models.ScenePartial {
+func getScenePartial(scene *models.Scene, scraped *scraper.ScrapedScene, fieldOptions map[string]*FieldOptions, setOrganized bool) models.ScenePartial {
 	partial := models.ScenePartial{}
 
 	if scraped.Title != nil && (scene.Title != *scraped.Title) {

internal/identify/identify_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stashapp/stash/pkg/scraper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
@@ -18,10 +19,10 @@ var testCtx = context.Background()
 
 type mockSceneScraper struct {
 	errIDs  []int
-	results map[int][]*models.ScrapedScene
+	results map[int][]*scraper.ScrapedScene
 }
 
-func (s mockSceneScraper) ScrapeScenes(ctx context.Context, sceneID int) ([]*models.ScrapedScene, error) {
+func (s mockSceneScraper) ScrapeScenes(ctx context.Context, sceneID int) ([]*scraper.ScrapedScene, error) {
 	if slices.Contains(s.errIDs, sceneID) {
 		return nil, errors.New("scrape scene error")
 	}
@@ -69,7 +70,7 @@ func TestSceneIdentifier_Identify(t *testing.T) {
 		{
 			Scraper: mockSceneScraper{
 				errIDs: []int{errID1},
-				results: map[int][]*models.ScrapedScene{
+				results: map[int][]*scraper.ScrapedScene{
 					found1ID: {{
 						Title: &scrapedTitle,
 					}},
@@ -79,7 +80,7 @@ func TestSceneIdentifier_Identify(t *testing.T) {
 		{
 			Scraper: mockSceneScraper{
 				errIDs: []int{errID2},
-				results: map[int][]*models.ScrapedScene{
+				results: map[int][]*scraper.ScrapedScene{
 					found2ID: {{
 						Title: &scrapedTitle,
 					}},
@@ -249,7 +250,7 @@ func TestSceneIdentifier_modifyScene(t *testing.T) {
 					StashIDs:     models.NewRelatedStashIDs([]models.StashID{}),
 				},
 				&scrapeResult{
-					result: &models.ScrapedScene{},
+					result: &scraper.ScrapedScene{},
 					source: ScraperSource{
 						Options: defaultOptions,
 					},
@@ -385,14 +386,14 @@ func Test_getScenePartial(t *testing.T) {
 		Mode:   models.RelationshipUpdateModeSet,
 	}
 
-	scrapedScene := &models.ScrapedScene{
+	scrapedScene := &scraper.ScrapedScene{
 		Title:   &scrapedTitle,
 		Date:    &scrapedDate,
 		Details: &scrapedDetails,
 		URLs:    []string{scrapedURL},
 	}
 
-	scrapedUnchangedScene := &models.ScrapedScene{
+	scrapedUnchangedScene := &scraper.ScrapedScene{
 		Title:   &originalTitle,
 		Date:    &originalDate,
 		Details: &originalDetails,
@@ -422,7 +423,7 @@ func Test_getScenePartial(t *testing.T) {
 
 	type args struct {
 		scene        *models.Scene
-		scraped      *models.ScrapedScene
+		scraped      *scraper.ScrapedScene
 		fieldOptions map[string]*FieldOptions
 		setOrganized bool
 	}

internal/identify/scene.go

@@ -153,8 +153,6 @@ func (g sceneRelationships) tags(ctx context.Context) ([]int, error) {
 		tagIDs = originalTagIDs
 	}
 
-	endpoint := g.result.source.RemoteSite
-
 	for _, t := range scraped {
 		if t.StoredID != nil {
 			// existing tag, just add it
@@ -165,9 +163,10 @@ func (g sceneRelationships) tags(ctx context.Context) ([]int, error) {
 
 			tagIDs = sliceutil.AppendUnique(tagIDs, int(tagID))
 		} else if createMissing {
-			newTag := t.ToTag(endpoint, nil)
+			newTag := models.NewTag()
+			newTag.Name = t.Name
 
-			err := g.tagCreator.Create(ctx, newTag)
+			err := g.tagCreator.Create(ctx, &newTag)
 			if err != nil {
 				return nil, fmt.Errorf("error creating tag: %w", err)
 			}

internal/identify/scene_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/models/mocks"
+	"github.com/stashapp/stash/pkg/scraper"
 	"github.com/stashapp/stash/pkg/utils"
 	"github.com/stretchr/testify/mock"
 )
@@ -124,7 +125,7 @@ func Test_sceneRelationships_studio(t *testing.T) {
 				source: ScraperSource{
 					RemoteSite: "endpoint",
 				},
-				result: &models.ScrapedScene{
+				result: &scraper.ScrapedScene{
 					Studio: tt.result,
 				},
 			}
@@ -314,7 +315,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
 			tr.scene = tt.scene
 			tr.fieldOptions["performers"] = tt.fieldOptions
 			tr.result = &scrapeResult{
-				result: &models.ScrapedScene{
+				result: &scraper.ScrapedScene{
 					Performers: tt.scraped,
 				},
 			}
@@ -506,7 +507,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
 			tr.scene = tt.scene
 			tr.fieldOptions["tags"] = tt.fieldOptions
 			tr.result = &scrapeResult{
-				result: &models.ScrapedScene{
+				result: &scraper.ScrapedScene{
 					Tags: tt.scraped,
 				},
 			}
@@ -726,7 +727,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
 				source: ScraperSource{
 					RemoteSite: tt.endpoint,
 				},
-				result: &models.ScrapedScene{
+				result: &scraper.ScrapedScene{
 					RemoteSiteID: tt.remoteSiteID,
 				},
 			}
@@ -826,7 +827,7 @@ func Test_sceneRelationships_cover(t *testing.T) {
 				ID: tt.sceneID,
 			}
 			tr.result = &scrapeResult{
-				result: &models.ScrapedScene{
+				result: &scraper.ScrapedScene{
 					Image: tt.image,
 				},
 			}

internal/log/logger.go

@@ -3,14 +3,12 @@ package log
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/sirupsen/logrus"
-	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 )
 
 type LogItem struct {
@@ -43,8 +41,8 @@ func NewLogger() *Logger {
 }
 
 // Init initialises the logger based on a logging configuration
-func (log *Logger) Init(logFile string, logOut bool, logLevel string, logFileMaxSize int) {
+func (log *Logger) Init(logFile string, logOut bool, logLevel string) {
-	var logger io.WriteCloser
+	var file *os.File
 	customFormatter := new(logrus.TextFormatter)
 	customFormatter.TimestampFormat = "2006-01-02 15:04:05"
 	customFormatter.ForceColors = true
@@ -59,38 +57,30 @@ func (log *Logger) Init(logFile string, logOut bool, logLevel string, logFileMax
 	// the access log colouring not being applied
 	_, _ = customFormatter.Format(logrus.NewEntry(log.logger))
 
-	// if size is 0, disable rotation
 	if logFile != "" {
-		if logFileMaxSize == 0 {
+		var err error
-			var err error
+		file, err = os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
-			logger, err = os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+
-			if err != nil {
+		if err != nil {
-				fmt.Fprintf(os.Stderr, "unable to open log file %s: %v\n", logFile, err)
+			fmt.Printf("Could not open '%s' for log output due to error: %s\n", logFile, err.Error())
-			}
-		} else {
-			logger = &lumberjack.Logger{
-				Filename: logFile,
-				MaxSize:  logFileMaxSize, // Megabytes
-				Compress: true,
-			}
 		}
 	}
 
-	if logger != nil {
+	if file != nil {
 		if logOut {
 			// log to file separately disabling colours
 			fileFormatter := new(logrus.TextFormatter)
 			fileFormatter.TimestampFormat = customFormatter.TimestampFormat
 			fileFormatter.FullTimestamp = customFormatter.FullTimestamp
 			log.logger.AddHook(&fileLogHook{
-				Writer:    logger,
+				Writer:    file,
 				Formatter: fileFormatter,
 			})
 		} else {
 			// logging to file only
 			// turn off the colouring for the file
 			customFormatter.ForceColors = false
-			log.logger.Out = logger
+			log.logger.Out = file
 		}
 	}
 

internal/manager/config/config.go

@@ -16,9 +16,9 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
+	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/parsers/yaml"
 	"github.com/knadh/koanf/providers/file"
-	"github.com/knadh/koanf/v2"
 
 	"github.com/stashapp/stash/internal/identify"
 	"github.com/stashapp/stash/pkg/fsutil"
@@ -43,9 +43,6 @@ const (
 	Password            = "password"
 	MaxSessionAge       = "max_session_age"
 
-	// SFWContentMode mode config key
-	SFWContentMode = "sfw_content_mode"
-
 	FFMpegPath  = "ffmpeg_path"
 	FFProbePath = "ffprobe_path"
 
@@ -209,7 +206,6 @@ const (
 	ImageLightboxResetZoomOnNav             = "image_lightbox.reset_zoom_on_nav"
 	ImageLightboxScrollModeKey              = "image_lightbox.scroll_mode"
 	ImageLightboxScrollAttemptsBeforeChange = "image_lightbox.scroll_attempts_before_change"
-	ImageLightboxDisableAnimation           = "image_lightbox.disable_animation"
 
 	UI = "ui"
 
@@ -253,15 +249,13 @@ const (
 	DLNAPortDefault = 1338
 
 	// Logging options
-	LogFile               = "logfile"
+	LogFile          = "logfile"
-	LogOut                = "logout"
+	LogOut           = "logout"
-	defaultLogOut         = true
+	defaultLogOut    = true
-	LogLevel              = "loglevel"
+	LogLevel         = "loglevel"
-	defaultLogLevel       = "Info"
+	defaultLogLevel  = "Info"
-	LogAccess             = "logaccess"
+	LogAccess        = "logaccess"
-	defaultLogAccess      = true
+	defaultLogAccess = true
-	LogFileMaxSize        = "logfile_max_size"
-	defaultLogFileMaxSize = 0 // megabytes, default disabled
 
 	// Default settings
 	DefaultScanSettings     = "defaults.scan_task"
@@ -273,9 +267,6 @@ const (
 	DeleteGeneratedDefault        = "defaults.delete_generated"
 	deleteGeneratedDefaultDefault = true
 
-	// Trash/Recycle Bin options
-	DeleteTrashPath = "delete_trash_path"
-
 	// Desktop Integration Options
 	NoBrowser                           = "nobrowser"
 	NoBrowserDefault                    = false
@@ -294,9 +285,9 @@ const (
 // slice default values
 var (
 	defaultVideoExtensions   = []string{"m4v", "mp4", "mov", "wmv", "avi", "mpg", "mpeg", "rmvb", "rm", "flv", "asf", "mkv", "webm", "f4v"}
-	defaultImageExtensions   = []string{"png", "jpg", "jpeg", "gif", "webp", "avif"}
+	defaultImageExtensions   = []string{"png", "jpg", "jpeg", "gif", "webp"}
 	defaultGalleryExtensions = []string{"zip", "cbz"}
-	defaultMenuItems         = []string{"scenes", "images", "groups", "markers", "galleries", "performers", "studios", "tags"}
+	defaultMenuItems         = []string{"scenes", "images", "movies", "markers", "galleries", "performers", "studios", "tags"}
 )
 
 type MissingConfigError struct {
@@ -637,15 +628,7 @@ func (i *Config) getStringMapString(key string) map[string]string {
 	return ret
 }
 
-// GetSFW returns true if SFW mode is enabled.
+// GetStathPaths returns the configured stash library paths.
-// Default performer images are changed to more agnostic images when enabled.
-func (i *Config) GetSFWContentMode() bool {
-	i.RLock()
-	defer i.RUnlock()
-	return i.getBool(SFWContentMode)
-}
-
-// GetStashPaths returns the configured stash library paths.
 // Works opposite to the usual case - it will return the override
 // value only if the main value is not set.
 func (i *Config) GetStashPaths() StashConfigs {
@@ -1122,10 +1105,9 @@ func stashBoxValidate(str string) bool {
 }
 
 type StashBoxInput struct {
-	Endpoint             string `json:"endpoint"`
+	Endpoint string `json:"endpoint"`
-	APIKey               string `json:"api_key"`
+	APIKey   string `json:"api_key"`
-	Name                 string `json:"name"`
+	Name     string `json:"name"`
-	MaxRequestsPerMinute int    `json:"max_requests_per_minute"`
 }
 
 func (i *Config) ValidateStashBoxes(boxes []*StashBoxInput) error {
@@ -1297,10 +1279,6 @@ func (i *Config) GetImageLightboxOptions() ConfigImageLightboxResult {
 	if v := i.with(ImageLightboxScrollAttemptsBeforeChange); v != nil {
 		ret.ScrollAttemptsBeforeChange = v.Int(ImageLightboxScrollAttemptsBeforeChange)
 	}
-	if v := i.with(ImageLightboxDisableAnimation); v != nil {
-		value := v.Bool(ImageLightboxDisableAnimation)
-		ret.DisableAnimation = &value
-	}
 
 	return ret
 }
@@ -1477,14 +1455,6 @@ func (i *Config) GetDeleteGeneratedDefault() bool {
 	return i.getBoolDefault(DeleteGeneratedDefault, deleteGeneratedDefaultDefault)
 }
 
-func (i *Config) GetDeleteTrashPath() string {
-	return i.getString(DeleteTrashPath)
-}
-
-func (i *Config) SetDeleteTrashPath(value string) {
-	i.SetString(DeleteTrashPath, value)
-}
-
 // GetDefaultIdentifySettings returns the default Identify task settings.
 // Returns nil if the settings could not be unmarshalled, or if it
 // has not been set.
@@ -1563,7 +1533,7 @@ func (i *Config) GetDefaultGenerateSettings() *models.GenerateMetadataOptions {
 }
 
 // GetDangerousAllowPublicWithoutAuth determines if the security feature is enabled.
-// See https://discourse.stashapp.cc/t/-/1658
+// See https://docs.stashapp.cc/faq/setup/#protecting-against-accidental-exposure-to-the-internet
 func (i *Config) GetDangerousAllowPublicWithoutAuth() bool {
 	return i.getBool(dangerousAllowPublicWithoutAuth)
 }
@@ -1654,16 +1624,6 @@ func (i *Config) GetLogAccess() bool {
 	return i.getBoolDefault(LogAccess, defaultLogAccess)
 }
 
-// GetLogFileMaxSize returns the maximum size of the log file in megabytes for lumberjack to rotate
-func (i *Config) GetLogFileMaxSize() int {
-	value := i.getInt(LogFileMaxSize)
-	if value < 0 {
-		value = defaultLogFileMaxSize
-	}
-
-	return value
-}
-
 // Max allowed graphql upload size in megabytes
 func (i *Config) GetMaxUploadSize() int64 {
 	i.RLock()

internal/manager/config/init.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/posflag"
-	"github.com/knadh/koanf/v2"
 	"github.com/spf13/pflag"
 
 	"github.com/stashapp/stash/pkg/fsutil"

internal/manager/config/ui.go

@@ -13,7 +13,6 @@ type ConfigImageLightboxResult struct {
 	ResetZoomOnNav             *bool                     `json:"resetZoomOnNav"`
 	ScrollMode                 *ImageLightboxScrollMode  `json:"scrollMode"`
 	ScrollAttemptsBeforeChange int                       `json:"scrollAttemptsBeforeChange"`
-	DisableAnimation           *bool                     `json:"disableAnimation"`
 }
 
 type ImageLightboxDisplayMode string

internal/manager/exclude_files.go

@@ -60,10 +60,6 @@ func generateRegexps(patterns []string) []*regexp.Regexp {
 	var fileRegexps []*regexp.Regexp
 
 	for _, pattern := range patterns {
-		if pattern == "" || pattern == " " {
-			logger.Warnf("Skipping empty exclude pattern")
-			continue
-		}
 		if !strings.HasPrefix(pattern, "(?i)") {
 			pattern = "(?i)" + pattern
 		}

internal/manager/generator_interactive_heatmap_speed.go

@@ -28,8 +28,7 @@ type InteractiveHeatmapSpeedGenerator struct {
 
 type Script struct {
 	// Version of Launchscript
-	// #5600 - ignore version, don't validate type
+	Version string `json:"version"`
-	Version json.RawMessage `json:"version"`
 	// Inverted causes up and down movement to be flipped.
 	Inverted bool `json:"inverted,omitempty"`
 	// Range is the percentage of a full stroke to use.
@@ -41,7 +40,7 @@ type Script struct {
 // Action is a move at a specific time.
 type Action struct {
 	// At time in milliseconds the action should fire.
-	At float64 `json:"at"`
+	At int64 `json:"at"`
 	// Pos is the place in percent to move to.
 	Pos int `json:"pos"`
 
@@ -110,8 +109,8 @@ func (g *InteractiveHeatmapSpeedGenerator) LoadFunscriptData(path string, sceneD
 	// trim actions with negative timestamps to avoid index range errors when generating heatmap
 	// #3181 - also trim actions that occur after the scene duration
 	loggedBadTimestamp := false
-	sceneDurationMilli := sceneDuration * 1000
+	sceneDurationMilli := int64(sceneDuration * 1000)
-	isValid := func(x float64) bool {
+	isValid := func(x int64) bool {
 		return x >= 0 && x < sceneDurationMilli
 	}
 
@@ -133,7 +132,7 @@ func (g *InteractiveHeatmapSpeedGenerator) LoadFunscriptData(path string, sceneD
 
 func (funscript *Script) UpdateIntensityAndSpeed() {
 
-	var t1, t2 float64
+	var t1, t2 int64
 	var p1, p2 int
 	var intensity float64
 	for i := range funscript.Actions {
@@ -242,13 +241,13 @@ func (gt GradientTable) GetYRange(t float64) [2]float64 {
 
 func (funscript Script) getGradientTable(numSegments int, sceneDurationMilli int64) GradientTable {
 	const windowSize = 15
-	const backfillThreshold = float64(500)
+	const backfillThreshold = 500
 
 	segments := make([]struct {
 		count     int
 		intensity int
 		yRange    [2]float64
-		at        float64
+		at        int64
 	}, numSegments)
 	gradient := make(GradientTable, numSegments)
 	posList := []int{}
@@ -298,7 +297,7 @@ func (funscript Script) getGradientTable(numSegments int, sceneDurationMilli int
 
 	// Fill in gaps in segments
 	for i := 0; i < numSegments; i++ {
-		segmentTS := float64((maxts / int64(numSegments)) * int64(i))
+		segmentTS := (maxts / int64(numSegments)) * int64(i)
 
 		// Empty segment - fill it with the previous up to backfillThreshold ms
 		if segments[i].count == 0 {
@@ -407,8 +406,7 @@ func ConvertFunscriptToCSV(funscriptPath string) ([]byte, error) {
 			pos = convertRange(pos, 0, funscript.Range, 0, 100)
 		}
 
-		// I don't know whether the csv format requires int or float, so for now we'll use int
+		buffer.WriteString(fmt.Sprintf("%d,%d\r\n", action.At, pos))
-		buffer.WriteString(fmt.Sprintf("%d,%d\r\n", int(math.Round(action.At)), pos))
 	}
 	return buffer.Bytes(), nil
 }

internal/manager/manager.go

@@ -219,11 +219,8 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
 		// paths since they must not be relative. The config file property is
 		// resolved to an absolute path when stash is run normally, so convert
 		// relative paths to absolute paths during setup.
-		// #6287 - this should no longer be necessary since the ffmpeg code
+		configFile, _ := filepath.Abs(input.ConfigLocation)
-		// converts to absolute paths. Converting the config location to
+
-		// absolute means that scraper and plugin paths default to absolute
-		// which we don't want.
-		configFile := input.ConfigLocation
 		configDir := filepath.Dir(configFile)
 
 		if exists, _ := fsutil.DirExists(configDir); !exists {
@@ -265,10 +262,6 @@ func (s *Manager) Setup(ctx context.Context, input SetupInput) error {
 		cfg.SetString(config.Cache, input.CacheLocation)
 	}
 
-	if input.SFWContentMode {
-		cfg.SetBool(config.SFWContentMode, true)
-	}
-
 	if input.StoreBlobsInDatabase {
 		cfg.SetInterface(config.BlobsStorage, config.BlobStorageTypeDatabase)
 	} else {
@@ -329,11 +322,6 @@ func (s *Manager) BackupDatabase(download bool) (string, string, error) {
 		backupPath = f.Name()
 		backupName = s.Database.DatabaseBackupPath("")
 		f.Close()
-
-		// delete the temp file so that the backup operation can create it
-		if err := os.Remove(backupPath); err != nil {
-			return "", "", fmt.Errorf("could not remove temporary backup file %v: %w", backupPath, err)
-		}
 	} else {
 		backupDir := s.Config.GetBackupDirectoryPathOrDefault()
 		if backupDir != "" {

internal/manager/manager_tasks.go

@@ -294,7 +294,6 @@ func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
 		Handlers: []file.CleanHandler{
 			&cleanHandler{},
 		},
-		TrashPath: s.Config.GetDeleteTrashPath(),
 	}
 
 	j := cleanJob{
@@ -365,37 +364,9 @@ func (s *Manager) MigrateHash(ctx context.Context) int {
 	return s.JobManager.Add(ctx, "Migrating scene hashes...", j)
 }
 
-// batchTagType indicates which batch tagging mode to use
+// If neither ids nor names are set, tag all items
-type batchTagType int
-
-const (
-	batchTagByIds batchTagType = iota
-	batchTagByNamesOrStashIds
-	batchTagAll
-)
-
-// getBatchTagType determines the batch tag mode based on the input
-func (input StashBoxBatchTagInput) getBatchTagType(hasPerformerFields bool) batchTagType {
-	switch {
-	case len(input.Ids) > 0:
-		return batchTagByIds
-	case hasPerformerFields && len(input.PerformerIds) > 0:
-		return batchTagByIds
-	case len(input.StashIDs) > 0 || len(input.Names) > 0:
-		return batchTagByNamesOrStashIds
-	case hasPerformerFields && len(input.PerformerNames) > 0:
-		return batchTagByNamesOrStashIds
-	default:
-		return batchTagAll
-	}
-}
-
-// Accepts either ids, or a combination of names and stash_ids.
-// If none are set, then all existing items will be tagged.
 type StashBoxBatchTagInput struct {
-	// Stash endpoint to use for the tagging
+	// Stash endpoint to use for the tagging - deprecated - use StashBoxEndpoint
-	//
-	// Deprecated: use StashBoxEndpoint
 	Endpoint         *int    `json:"endpoint"`
 	StashBoxEndpoint *string `json:"stash_box_endpoint"`
 	// Fields to exclude when executing the tagging
@@ -404,143 +375,128 @@ type StashBoxBatchTagInput struct {
 	Refresh bool `json:"refresh"`
 	// If batch adding studios, should their parent studios also be created?
 	CreateParent bool `json:"createParent"`
-	// IDs in stash of the items to update.
+	// If set, only tag these ids
-	// If set, names and stash_ids fields will be ignored.
 	Ids []string `json:"ids"`
-	// Names of the items in the stash-box instance to search for and create
+	// If set, only tag these names
 	Names []string `json:"names"`
-	// Stash IDs of the items in the stash-box instance to search for and create
+	// If set, only tag these performer ids
-	StashIDs []string `json:"stash_ids"`
-	// IDs in stash of the performers to update
 	//
-	// Deprecated: use Ids
+	// Deprecated: please use Ids
 	PerformerIds []string `json:"performer_ids"`
-	// Names of the performers in the stash-box instance to search for and create
+	// If set, only tag these performer names
 	//
-	// Deprecated: use Names
+	// Deprecated: please use Names
 	PerformerNames []string `json:"performer_names"`
 }
 
-func (s *Manager) batchTagPerformersByIds(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
-	var tasks []Task
-
-	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-		performerQuery := s.Repository.Performer
-
-		ids := input.Ids
-		if len(ids) == 0 {
-			ids = input.PerformerIds //nolint:staticcheck
-		}
-
-		for _, performerID := range ids {
-			if id, err := strconv.Atoi(performerID); err == nil {
-				performer, err := performerQuery.Find(ctx, id)
-				if err != nil {
-					return err
-				}
-
-				if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
-					return fmt.Errorf("loading performer stash ids: %w", err)
-				}
-
-				hasStashID := performer.StashIDs.ForEndpoint(box.Endpoint) != nil
-				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
-					tasks = append(tasks, &stashBoxBatchPerformerTagTask{
-						performer:      performer,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-					})
-				}
-			}
-		}
-		return nil
-	})
-
-	return tasks, err
-}
-
-func (s *Manager) batchTagPerformersByNamesOrStashIds(input StashBoxBatchTagInput, box *models.StashBox) []Task {
-	var tasks []Task
-
-	for i := range input.StashIDs {
-		stashID := input.StashIDs[i]
-		if len(stashID) > 0 {
-			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
-				stashID:        &stashID,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-	}
-
-	names := input.Names
-	if len(names) == 0 {
-		names = input.PerformerNames //nolint:staticcheck
-	}
-
-	for i := range names {
-		name := names[i]
-		if len(name) > 0 {
-			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
-				name:           &name,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-	}
-
-	return tasks
-}
-
-func (s *Manager) batchTagAllPerformers(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
-	var tasks []Task
-
-	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-		performerQuery := s.Repository.Performer
-		var performers []*models.Performer
-		var err error
-
-		performers, err = performerQuery.FindByStashIDStatus(ctx, input.Refresh, box.Endpoint)
-
-		if err != nil {
-			return fmt.Errorf("error querying performers: %v", err)
-		}
-
-		for _, performer := range performers {
-			if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
-				return fmt.Errorf("error loading stash ids for performer %s: %v", performer.Name, err)
-			}
-
-			tasks = append(tasks, &stashBoxBatchPerformerTagTask{
-				performer:      performer,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-		return nil
-	})
-
-	return tasks, err
-}
-
 func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.StashBox, input StashBoxBatchTagInput) int {
 	j := job.MakeJobExec(func(ctx context.Context, progress *job.Progress) error {
 		logger.Infof("Initiating stash-box batch performer tag")
 
-		var tasks []Task
+		var tasks []StashBoxBatchTagTask
-		var err error
 
-		switch input.getBatchTagType(true) {
+		// The gocritic linter wants to turn this ifElseChain into a switch.
-		case batchTagByIds:
+		// however, such a switch would contain quite large blocks for each section
-			tasks, err = s.batchTagPerformersByIds(ctx, input, box)
+		// and would arguably be hard to read.
-		case batchTagByNamesOrStashIds:
+		//
-			tasks = s.batchTagPerformersByNamesOrStashIds(input, box)
+		// This is why we mark this section nolint. In principle, we should look to
-		case batchTagAll:
+		// rewrite the section at some point, to avoid the linter warning.
-			tasks, err = s.batchTagAllPerformers(ctx, input, box)
+		if len(input.Ids) > 0 || len(input.PerformerIds) > 0 { //nolint:gocritic
-		}
+			// The user has chosen only to tag the items on the current page
+			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+				performerQuery := s.Repository.Performer
 
-		if err != nil {
+				idsToUse := input.PerformerIds
-			return err
+				if len(input.Ids) > 0 {
+					idsToUse = input.Ids
+				}
+
+				for _, performerID := range idsToUse {
+					if id, err := strconv.Atoi(performerID); err == nil {
+						performer, err := performerQuery.Find(ctx, id)
+						if err == nil {
+							if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
+								return fmt.Errorf("loading performer stash ids: %w", err)
+							}
+
+							// Check if the user wants to refresh existing or new items
+							hasStashID := performer.StashIDs.ForEndpoint(box.Endpoint) != nil
+							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
+								tasks = append(tasks, StashBoxBatchTagTask{
+									performer:      performer,
+									refresh:        input.Refresh,
+									box:            box,
+									excludedFields: input.ExcludeFields,
+									taskType:       Performer,
+								})
+							}
+						} else {
+							return err
+						}
+					}
+				}
+				return nil
+			}); err != nil {
+				return err
+			}
+		} else if len(input.Names) > 0 || len(input.PerformerNames) > 0 {
+			// The user is batch adding performers
+			namesToUse := input.PerformerNames
+			if len(input.Names) > 0 {
+				namesToUse = input.Names
+			}
+
+			for i := range namesToUse {
+				name := namesToUse[i]
+				if len(name) > 0 {
+					tasks = append(tasks, StashBoxBatchTagTask{
+						name:           &name,
+						refresh:        false,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+						taskType:       Performer,
+					})
+				}
+			}
+		} else { //nolint:gocritic
+			// The gocritic linter wants to fold this if-block into the else on the line above.
+			// However, this doesn't really help with readability of the current section. Mark it
+			// as nolint for now. In the future we'd like to rewrite this code by factoring some of
+			// this into separate functions.
+
+			// The user has chosen to tag every item in their database
+			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+				performerQuery := s.Repository.Performer
+				var performers []*models.Performer
+				var err error
+
+				if input.Refresh {
+					performers, err = performerQuery.FindByStashIDStatus(ctx, true, box.Endpoint)
+				} else {
+					performers, err = performerQuery.FindByStashIDStatus(ctx, false, box.Endpoint)
+				}
+
+				if err != nil {
+					return fmt.Errorf("error querying performers: %v", err)
+				}
+
+				for _, performer := range performers {
+					if err := performer.LoadStashIDs(ctx, performerQuery); err != nil {
+						return fmt.Errorf("error loading stash ids for performer %s: %v", performer.Name, err)
+					}
+
+					tasks = append(tasks, StashBoxBatchTagTask{
+						performer:      performer,
+						refresh:        input.Refresh,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+						taskType:       Performer,
+					})
+				}
+				return nil
+			}); err != nil {
+				return err
+			}
 		}
 
 		if len(tasks) == 0 {
@@ -552,7 +508,7 @@ func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.Sta
 		logger.Infof("Starting stash-box batch operation for %d performers", len(tasks))
 
 		for _, task := range tasks {
-			progress.ExecuteTask(task.GetDescription(), func() {
+			progress.ExecuteTask(task.Description(), func() {
 				task.Start(ctx)
 			})
 
@@ -565,116 +521,103 @@ func (s *Manager) StashBoxBatchPerformerTag(ctx context.Context, box *models.Sta
 	return s.JobManager.Add(ctx, "Batch stash-box performer tag...", j)
 }
 
-func (s *Manager) batchTagStudiosByIds(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
-	var tasks []Task
-
-	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-		studioQuery := s.Repository.Studio
-
-		for _, studioID := range input.Ids {
-			if id, err := strconv.Atoi(studioID); err == nil {
-				studio, err := studioQuery.Find(ctx, id)
-				if err != nil {
-					return err
-				}
-
-				if err := studio.LoadStashIDs(ctx, studioQuery); err != nil {
-					return fmt.Errorf("loading studio stash ids: %w", err)
-				}
-
-				hasStashID := studio.StashIDs.ForEndpoint(box.Endpoint) != nil
-				if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
-					tasks = append(tasks, &stashBoxBatchStudioTagTask{
-						studio:         studio,
-						createParent:   input.CreateParent,
-						box:            box,
-						excludedFields: input.ExcludeFields,
-					})
-				}
-			}
-		}
-		return nil
-	})
-
-	return tasks, err
-}
-
-func (s *Manager) batchTagStudiosByNamesOrStashIds(input StashBoxBatchTagInput, box *models.StashBox) []Task {
-	var tasks []Task
-
-	for i := range input.StashIDs {
-		stashID := input.StashIDs[i]
-		if len(stashID) > 0 {
-			tasks = append(tasks, &stashBoxBatchStudioTagTask{
-				stashID:        &stashID,
-				createParent:   input.CreateParent,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-	}
-
-	for i := range input.Names {
-		name := input.Names[i]
-		if len(name) > 0 {
-			tasks = append(tasks, &stashBoxBatchStudioTagTask{
-				name:           &name,
-				createParent:   input.CreateParent,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-	}
-
-	return tasks
-}
-
-func (s *Manager) batchTagAllStudios(ctx context.Context, input StashBoxBatchTagInput, box *models.StashBox) ([]Task, error) {
-	var tasks []Task
-
-	err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
-		studioQuery := s.Repository.Studio
-		var studios []*models.Studio
-		var err error
-
-		studios, err = studioQuery.FindByStashIDStatus(ctx, input.Refresh, box.Endpoint)
-
-		if err != nil {
-			return fmt.Errorf("error querying studios: %v", err)
-		}
-
-		for _, studio := range studios {
-			tasks = append(tasks, &stashBoxBatchStudioTagTask{
-				studio:         studio,
-				createParent:   input.CreateParent,
-				box:            box,
-				excludedFields: input.ExcludeFields,
-			})
-		}
-		return nil
-	})
-
-	return tasks, err
-}
-
 func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, box *models.StashBox, input StashBoxBatchTagInput) int {
 	j := job.MakeJobExec(func(ctx context.Context, progress *job.Progress) error {
 		logger.Infof("Initiating stash-box batch studio tag")
 
-		var tasks []Task
+		var tasks []StashBoxBatchTagTask
-		var err error
 
-		switch input.getBatchTagType(false) {
+		// The gocritic linter wants to turn this ifElseChain into a switch.
-		case batchTagByIds:
+		// however, such a switch would contain quite large blocks for each section
-			tasks, err = s.batchTagStudiosByIds(ctx, input, box)
+		// and would arguably be hard to read.
-		case batchTagByNamesOrStashIds:
+		//
-			tasks = s.batchTagStudiosByNamesOrStashIds(input, box)
+		// This is why we mark this section nolint. In principle, we should look to
-		case batchTagAll:
+		// rewrite the section at some point, to avoid the linter warning.
-			tasks, err = s.batchTagAllStudios(ctx, input, box)
+		if len(input.Ids) > 0 { //nolint:gocritic
-		}
+			// The user has chosen only to tag the items on the current page
+			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+				studioQuery := s.Repository.Studio
 
-		if err != nil {
+				for _, studioID := range input.Ids {
-			return err
+					if id, err := strconv.Atoi(studioID); err == nil {
+						studio, err := studioQuery.Find(ctx, id)
+						if err == nil {
+							if err := studio.LoadStashIDs(ctx, studioQuery); err != nil {
+								return fmt.Errorf("loading studio stash ids: %w", err)
+							}
+
+							// Check if the user wants to refresh existing or new items
+							hasStashID := studio.StashIDs.ForEndpoint(box.Endpoint) != nil
+							if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
+								tasks = append(tasks, StashBoxBatchTagTask{
+									studio:         studio,
+									refresh:        input.Refresh,
+									createParent:   input.CreateParent,
+									box:            box,
+									excludedFields: input.ExcludeFields,
+									taskType:       Studio,
+								})
+							}
+						} else {
+							return err
+						}
+					}
+				}
+				return nil
+			}); err != nil {
+				logger.Error(err.Error())
+			}
+		} else if len(input.Names) > 0 {
+			// The user is batch adding studios
+			for i := range input.Names {
+				name := input.Names[i]
+				if len(name) > 0 {
+					tasks = append(tasks, StashBoxBatchTagTask{
+						name:           &name,
+						refresh:        false,
+						createParent:   input.CreateParent,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+						taskType:       Studio,
+					})
+				}
+			}
+		} else { //nolint:gocritic
+			// The gocritic linter wants to fold this if-block into the else on the line above.
+			// However, this doesn't really help with readability of the current section. Mark it
+			// as nolint for now. In the future we'd like to rewrite this code by factoring some of
+			// this into separate functions.
+
+			// The user has chosen to tag every item in their database
+			if err := s.Repository.WithTxn(ctx, func(ctx context.Context) error {
+				studioQuery := s.Repository.Studio
+				var studios []*models.Studio
+				var err error
+
+				if input.Refresh {
+					studios, err = studioQuery.FindByStashIDStatus(ctx, true, box.Endpoint)
+				} else {
+					studios, err = studioQuery.FindByStashIDStatus(ctx, false, box.Endpoint)
+				}
+
+				if err != nil {
+					return fmt.Errorf("error querying studios: %v", err)
+				}
+
+				for _, studio := range studios {
+					tasks = append(tasks, StashBoxBatchTagTask{
+						studio:         studio,
+						refresh:        input.Refresh,
+						createParent:   input.CreateParent,
+						box:            box,
+						excludedFields: input.ExcludeFields,
+						taskType:       Studio,
+					})
+				}
+				return nil
+			}); err != nil {
+				return err
+			}
 		}
 
 		if len(tasks) == 0 {
@@ -686,7 +629,7 @@ func (s *Manager) StashBoxBatchStudioTag(ctx context.Context, box *models.StashB
 		logger.Infof("Starting stash-box batch operation for %d studios", len(tasks))
 
 		for _, task := range tasks {
-			progress.ExecuteTask(task.GetDescription(), func() {
+			progress.ExecuteTask(task.Description(), func() {
 				task.Start(ctx)
 			})
 

internal/manager/models.go

@@ -21,7 +21,6 @@ type SetupInput struct {
 	// Empty to indicate $HOME/.stash/config.yml default
 	ConfigLocation string                     `json:"configLocation"`
 	Stashes        []*config.StashConfigInput `json:"stashes"`
-	SFWContentMode bool                       `json:"sfwContentMode"`
 	// Empty to indicate default
 	DatabaseFile string `json:"databaseFile"`
 	// Empty to indicate default

internal/manager/repository.go

@@ -14,9 +14,6 @@ type SceneService interface {
 	AssignFile(ctx context.Context, sceneID int, fileID models.FileID) error
 	Merge(ctx context.Context, sourceIDs []int, destinationID int, fileDeleter *scene.FileDeleter, options scene.MergeOptions) error
 	Destroy(ctx context.Context, scene *models.Scene, fileDeleter *scene.FileDeleter, deleteGenerated, deleteFile bool) error
-
-	FindByIDs(ctx context.Context, ids []int, load ...scene.LoadRelationshipOption) ([]*models.Scene, error)
-	sceneFingerprintGetter
 }
 
 type ImageService interface {

internal/manager/running_streams.go

@@ -3,9 +3,7 @@ package manager
 import (
 	"context"
 	"errors"
-	"mime"
 	"net/http"
-	"path/filepath"
 
 	"github.com/stashapp/stash/internal/manager/config"
 	"github.com/stashapp/stash/internal/static"
@@ -48,17 +46,14 @@ func (s *SceneServer) StreamSceneDirect(scene *models.Scene, w http.ResponseWrit
 
 	sceneHash := scene.GetHash(config.GetInstance().GetVideoFileNamingAlgorithm())
 
-	fp := GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash)
+	filepath := GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash)
 	streamRequestCtx := ffmpeg.NewStreamRequestContext(w, r)
 
 	// #2579 - hijacking and closing the connection here causes video playback to fail in Safari
 	// We trust that the request context will be closed, so we don't need to call Cancel on the
 	// returned context here.
-	_ = GetInstance().ReadLockManager.ReadLock(streamRequestCtx, fp)
+	_ = GetInstance().ReadLockManager.ReadLock(streamRequestCtx, filepath)
-	_, filename := filepath.Split(fp)
+	http.ServeFile(w, r, filepath)
-	contentDisposition := mime.FormatMediaType("inline", map[string]string{"filename": filename})
-	w.Header().Set("Content-Disposition", contentDisposition)
-	http.ServeFile(w, r, fp)
 }
 
 func (s *SceneServer) ServeScreenshot(scene *models.Scene, w http.ResponseWriter, r *http.Request) {

internal/manager/task_export.go

@@ -1042,43 +1042,23 @@ func (t *ExportTask) ExportTags(ctx context.Context, workers int) {
 	logger.Info("[tags] exporting")
 	startTime := time.Now()
 
-	tagIdx := 0
+	jobCh := make(chan *models.Tag, workers*2) // make a buffered channel to feed workers
-	if t.tags != nil {
+
-		tagIdx = len(t.tags.IDs)
+	for w := 0; w < workers; w++ { // create export Tag workers
+		tagsWg.Add(1)
+		go t.exportTag(ctx, &tagsWg, jobCh)
 	}
 
-	for {
+	for i, tag := range tags {
-		jobCh := make(chan *models.Tag, workers*2) // make a buffered channel to feed workers
+		index := i + 1
+		logger.Progressf("[tags] %d of %d", index, len(tags))
 
-		for w := 0; w < workers; w++ { // create export Tag workers
+		jobCh <- tag // feed workers
-			tagsWg.Add(1)
-			go t.exportTag(ctx, &tagsWg, jobCh)
-		}
-
-		for i, tag := range tags {
-			index := i + 1 + tagIdx
-			logger.Progressf("[tags] %d of %d", index, len(tags)+tagIdx)
-
-			jobCh <- tag // feed workers
-		}
-
-		close(jobCh)
-		tagsWg.Wait()
-
-		// if more tags were added, we need to export those too
-		if t.tags == nil || len(t.tags.IDs) == tagIdx {
-			break
-		}
-
-		newTags, err := reader.FindMany(ctx, t.tags.IDs[tagIdx:])
-		if err != nil {
-			logger.Errorf("[tags] failed to fetch tags: %v", err)
-		}
-
-		tags = newTags
-		tagIdx = len(t.tags.IDs)
 	}
 
+	close(jobCh)
+	tagsWg.Wait()
+
 	logger.Infof("[tags] export complete in %s. %d workers used.", time.Since(startTime), workers)
 }
 
@@ -1095,15 +1075,6 @@ func (t *ExportTask) exportTag(ctx context.Context, wg *sync.WaitGroup, jobChan
 			continue
 		}
 
-		if t.includeDependencies {
-			tagIDs, err := tag.GetDependentTagIDs(ctx, tagReader, thisTag)
-			if err != nil {
-				logger.Errorf("[tags] <%s> error getting dependent tags: %v", thisTag.Name, err)
-				continue
-			}
-			t.tags.IDs = sliceutil.AppendUniques(t.tags.IDs, tagIDs)
-		}
-
 		fn := newTagJSON.Filename()
 
 		if err := t.json.saveTag(fn, newTagJSON); err != nil {

internal/manager/task_generate_image_thumbnail.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os/exec"
 
 	"github.com/stashapp/stash/pkg/fsutil"
 	"github.com/stashapp/stash/pkg/image"
@@ -21,13 +20,6 @@ func (t *GenerateImageThumbnailTask) GetDescription() string {
 	return fmt.Sprintf("Generating Thumbnail for image %s", t.Image.Path)
 }
 
-func (t *GenerateImageThumbnailTask) logStderr(err error) {
-	var exitErr *exec.ExitError
-	if errors.As(err, &exitErr) {
-		logger.Debugf("[generator] error output: %s", exitErr.Stderr)
-	}
-}
-
 func (t *GenerateImageThumbnailTask) Start(ctx context.Context) {
 	if !t.required() {
 		return
@@ -54,15 +46,14 @@ func (t *GenerateImageThumbnailTask) Start(ctx context.Context) {
 	if err != nil {
 		// don't log for animated images
 		if !errors.Is(err, image.ErrNotSupportedForThumbnail) {
-			logger.Errorf("[generator] getting thumbnail for image %s: %s", path, err.Error())
+			logger.Errorf("[generator] getting thumbnail for image %s: %w", path, err)
-			t.logStderr(err)
 		}
 		return
 	}
 
 	err = fsutil.WriteFile(thumbPath, data)
 	if err != nil {
-		logger.Errorf("[generator] writing thumbnail for image %s: %s", path, err.Error())
+		logger.Errorf("[generator] writing thumbnail for image %s: %w", path, err)
 		return
 	}
 }

internal/manager/task_generate_markers.go

@@ -107,12 +107,6 @@ func (t *GenerateMarkersTask) generateMarker(videoFile *models.VideoFile, scene
 	sceneHash := scene.GetHash(t.fileNamingAlgorithm)
 	seconds := float64(sceneMarker.Seconds)
 
-	// check if marker past duration
-	if seconds > float64(videoFile.Duration) {
-		logger.Warnf("[generator] scene marker at %.2f seconds exceeds video duration of %.2f seconds, skipping", seconds, float64(videoFile.Duration))
-		return
-	}
-
 	g := t.generator
 
 	if err := g.MarkerPreviewVideo(context.TODO(), videoFile.Path, sceneHash, seconds, sceneMarker.EndSeconds, instance.Config.GetPreviewAudio()); err != nil {

internal/manager/task_generate_screenshot.go

@@ -32,7 +32,6 @@ func (t *GenerateCoverTask) Start(ctx context.Context) {
 		return t.Scene.LoadPrimaryFile(ctx, r.File)
 	}); err != nil {
 		logger.Error(err)
-		return
 	}
 
 	if !required {

internal/manager/task_identify.go

@@ -9,13 +9,11 @@ import (
 	"github.com/stashapp/stash/internal/identify"
 	"github.com/stashapp/stash/pkg/job"
 	"github.com/stashapp/stash/pkg/logger"
-	"github.com/stashapp/stash/pkg/match"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/scene"
 	"github.com/stashapp/stash/pkg/scraper"
+	"github.com/stashapp/stash/pkg/scraper/stashbox"
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
-	"github.com/stashapp/stash/pkg/stashbox"
-	"github.com/stashapp/stash/pkg/txn"
 )
 
 var ErrInput = errors.New("invalid request input")
@@ -171,20 +169,12 @@ func (j *IdentifyJob) getSources() ([]identify.ScraperSource, error) {
 
 		var src identify.ScraperSource
 		if stashBox != nil {
-			matcher := match.SceneRelationships{
+			stashboxRepository := stashbox.NewRepository(instance.Repository)
-				PerformerFinder: instance.Repository.Performer,
-				TagFinder:       instance.Repository.Tag,
-				StudioFinder:    instance.Repository.Studio,
-			}
-
 			src = identify.ScraperSource{
 				Name: "stash-box: " + stashBox.Endpoint,
 				Scraper: stashboxSource{
-					Client:                 stashbox.NewClient(*stashBox, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns())),
+					stashbox.NewClient(*stashBox, stashboxRepository, instance.Config.GetScraperExcludeTagPatterns()),
-					endpoint:               stashBox.Endpoint,
+					stashBox.Endpoint,
-					txnManager:             instance.Repository.TxnManager,
-					sceneFingerprintGetter: instance.SceneService,
-					matcher:                matcher,
 				},
 				RemoteSite: stashBox.Endpoint,
 			}
@@ -257,42 +247,14 @@ func resolveStashBox(sb []*models.StashBox, source scraper.Source) (*models.Stas
 type stashboxSource struct {
 	*stashbox.Client
 	endpoint string
-
-	txnManager             models.TxnManager
-	sceneFingerprintGetter sceneFingerprintGetter
-	matcher                match.SceneRelationships
 }
 
-type sceneFingerprintGetter interface {
+func (s stashboxSource) ScrapeScenes(ctx context.Context, sceneID int) ([]*scraper.ScrapedScene, error) {
-	GetScenesFingerprints(ctx context.Context, ids []int) ([]models.Fingerprints, error)
+	results, err := s.FindStashBoxSceneByFingerprints(ctx, sceneID)
-}
-
-func (s stashboxSource) ScrapeScenes(ctx context.Context, sceneID int) ([]*models.ScrapedScene, error) {
-	var fps []models.Fingerprints
-	if err := txn.WithReadTxn(ctx, s.txnManager, func(ctx context.Context) error {
-		var err error
-		fps, err = s.sceneFingerprintGetter.GetScenesFingerprints(ctx, []int{sceneID})
-		return err
-	}); err != nil {
-		return nil, fmt.Errorf("error getting scene fingerprints: %w", err)
-	}
-
-	results, err := s.FindSceneByFingerprints(ctx, fps[0])
 	if err != nil {
 		return nil, fmt.Errorf("error querying stash-box using scene ID %d: %w", sceneID, err)
 	}
 
-	if err := txn.WithReadTxn(ctx, s.txnManager, func(ctx context.Context) error {
-		for _, ret := range results {
-			if err := s.matcher.MatchRelationships(ctx, ret, s.endpoint); err != nil {
-				return err
-			}
-		}
-		return nil
-	}); err != nil {
-		return nil, fmt.Errorf("error matching scene relationships: %w", err)
-	}
-
 	if len(results) > 0 {
 		return results, nil
 	}
@@ -309,7 +271,7 @@ type scraperSource struct {
 	scraperID string
 }
 
-func (s scraperSource) ScrapeScenes(ctx context.Context, sceneID int) ([]*models.ScrapedScene, error) {
+func (s scraperSource) ScrapeScenes(ctx context.Context, sceneID int) ([]*scraper.ScrapedScene, error) {
 	content, err := s.cache.ScrapeID(ctx, s.scraperID, sceneID, scraper.ScrapeContentTypeScene)
 	if err != nil {
 		return nil, err
@@ -320,8 +282,8 @@ func (s scraperSource) ScrapeScenes(ctx context.Context, sceneID int) ([]*models
 		return nil, nil
 	}
 
-	if scene, ok := content.(models.ScrapedScene); ok {
+	if scene, ok := content.(scraper.ScrapedScene); ok {
-		return []*models.ScrapedScene{&scene}, nil
+		return []*scraper.ScrapedScene{&scene}, nil
 	}
 
 	return nil, errors.New("could not convert content to scene")

internal/manager/task_import.go

@@ -709,11 +709,6 @@ func (t *ImportTask) ImportScenes(ctx context.Context) {
 				return err
 			}
 
-			// skip importing markers if the scene was not created
-			if sceneImporter.ID == 0 {
-				return nil
-			}
-
 			// import the scene markers
 			for _, m := range sceneJSON.Markers {
 				markerImporter := &scene.MarkerImporter{

internal/manager/task_stash_box_tag.go

@@ -6,41 +6,64 @@ import (
 	"strconv"
 
 	"github.com/stashapp/stash/pkg/logger"
-	"github.com/stashapp/stash/pkg/match"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
+	"github.com/stashapp/stash/pkg/scraper/stashbox"
 	"github.com/stashapp/stash/pkg/sliceutil"
-	"github.com/stashapp/stash/pkg/stashbox"
 	"github.com/stashapp/stash/pkg/studio"
 )
 
-// stashBoxBatchPerformerTagTask is used to tag or create performers from stash-box.
+type StashBoxTagTaskType int
-//
+
-// Two modes of operation:
+const (
-//   - Update existing performer: set performer to update from stash-box data
+	Performer StashBoxTagTaskType = iota
-//   - Create new performer: set name or stashID to search stash-box and create locally
+	Studio
-type stashBoxBatchPerformerTagTask struct {
+)
+
+type StashBoxBatchTagTask struct {
 	box            *models.StashBox
 	name           *string
-	stashID        *string
 	performer      *models.Performer
+	studio         *models.Studio
+	refresh        bool
+	createParent   bool
 	excludedFields []string
+	taskType       StashBoxTagTaskType
 }
 
-func (t *stashBoxBatchPerformerTagTask) getName() string {
+func (t *StashBoxBatchTagTask) Start(ctx context.Context) {
-	switch {
+	switch t.taskType {
-	case t.name != nil:
+	case Performer:
-		return *t.name
+		t.stashBoxPerformerTag(ctx)
-	case t.stashID != nil:
+	case Studio:
-		return *t.stashID
+		t.stashBoxStudioTag(ctx)
-	case t.performer != nil:
-		return t.performer.Name
 	default:
-		return ""
+		logger.Errorf("Error starting batch task, unknown task_type %d", t.taskType)
 	}
 }
 
-func (t *stashBoxBatchPerformerTagTask) Start(ctx context.Context) {
+func (t *StashBoxBatchTagTask) Description() string {
+	if t.taskType == Performer {
+		var name string
+		if t.name != nil {
+			name = *t.name
+		} else {
+			name = t.performer.Name
+		}
+		return fmt.Sprintf("Tagging performer %s from stash-box", name)
+	} else if t.taskType == Studio {
+		var name string
+		if t.name != nil {
+			name = *t.name
+		} else {
+			name = t.studio.Name
+		}
+		return fmt.Sprintf("Tagging studio %s from stash-box", name)
+	}
+	return fmt.Sprintf("Unknown tagging task type %d from stash-box", t.taskType)
+}
+
+func (t *StashBoxBatchTagTask) stashBoxPerformerTag(ctx context.Context) {
 	performer, err := t.findStashBoxPerformer(ctx)
 	if err != nil {
 		logger.Errorf("Error fetching performer data from stash-box: %v", err)
@@ -52,43 +75,30 @@ func (t *stashBoxBatchPerformerTagTask) Start(ctx context.Context) {
 		excluded[field] = true
 	}
 
+	// performer will have a value if pulling from Stash-box by Stash ID or name was successful
 	if performer != nil {
 		t.processMatchedPerformer(ctx, performer, excluded)
 	} else {
-		logger.Infof("No match found for %s", t.getName())
+		var name string
+		if t.name != nil {
+			name = *t.name
+		} else if t.performer != nil {
+			name = t.performer.Name
+		}
+		logger.Infof("No match found for %s", name)
 	}
 }
 
-func (t *stashBoxBatchPerformerTagTask) GetDescription() string {
+func (t *StashBoxBatchTagTask) findStashBoxPerformer(ctx context.Context) (*models.ScrapedPerformer, error) {
-	return fmt.Sprintf("Tagging performer %s from stash-box", t.getName())
-}
-
-func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Context) (*models.ScrapedPerformer, error) {
 	var performer *models.ScrapedPerformer
 	var err error
 
 	r := instance.Repository
 
-	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
+	stashboxRepository := stashbox.NewRepository(r)
+	client := stashbox.NewClient(*t.box, stashboxRepository, instance.Config.GetScraperExcludeTagPatterns())
 
-	switch {
+	if t.refresh {
-	case t.name != nil:
-		performer, err = client.FindPerformerByName(ctx, *t.name)
-	case t.stashID != nil:
-		performer, err = client.FindPerformerByID(ctx, *t.stashID)
-
-		if performer != nil && performer.RemoteMergedIntoId != nil {
-			mergedPerformer, err := t.handleMergedPerformer(ctx, performer, client)
-			if err != nil {
-				return nil, err
-			}
-
-			if mergedPerformer != nil {
-				logger.Infof("Performer id %s merged into %s, updating local performer", *t.stashID, *performer.RemoteMergedIntoId)
-				performer = mergedPerformer
-			}
-		}
-	case t.performer != nil: // tagging or updating existing performer
 		var remoteID string
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			qb := r.Performer
@@ -108,9 +118,8 @@ func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Contex
 		}); err != nil {
 			return nil, err
 		}
-
 		if remoteID != "" {
-			performer, err = client.FindPerformerByID(ctx, remoteID)
+			performer, err = client.FindStashBoxPerformerByID(ctx, remoteID)
 
 			if performer != nil && performer.RemoteMergedIntoId != nil {
 				mergedPerformer, err := t.handleMergedPerformer(ctx, performer, client)
@@ -123,25 +132,22 @@ func (t *stashBoxBatchPerformerTagTask) findStashBoxPerformer(ctx context.Contex
 					performer = mergedPerformer
 				}
 			}
+		}
+	} else {
+		var name string
+		if t.name != nil {
+			name = *t.name
 		} else {
-			// find by performer name instead
+			name = t.performer.Name
-			performer, err = client.FindPerformerByName(ctx, t.performer.Name)
-		}
-	}
-
-	if performer != nil {
-		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-			return match.ScrapedPerformer(ctx, r.Performer, performer, t.box.Endpoint)
-		}); err != nil {
-			return nil, err
 		}
+		performer, err = client.FindStashBoxPerformerByName(ctx, name)
 	}
 
 	return performer, err
 }
 
-func (t *stashBoxBatchPerformerTagTask) handleMergedPerformer(ctx context.Context, performer *models.ScrapedPerformer, client *stashbox.Client) (mergedPerformer *models.ScrapedPerformer, err error) {
+func (t *StashBoxBatchTagTask) handleMergedPerformer(ctx context.Context, performer *models.ScrapedPerformer, client *stashbox.Client) (mergedPerformer *models.ScrapedPerformer, err error) {
-	mergedPerformer, err = client.FindPerformerByID(ctx, *performer.RemoteMergedIntoId)
+	mergedPerformer, err = client.FindStashBoxPerformerByID(ctx, *performer.RemoteMergedIntoId)
 	if err != nil {
 		return nil, fmt.Errorf("loading merged performer %s from stashbox", *performer.RemoteMergedIntoId)
 	}
@@ -155,7 +161,8 @@ func (t *stashBoxBatchPerformerTagTask) handleMergedPerformer(ctx context.Contex
 	return mergedPerformer, nil
 }
 
-func (t *stashBoxBatchPerformerTagTask) processMatchedPerformer(ctx context.Context, p *models.ScrapedPerformer, excluded map[string]bool) {
+func (t *StashBoxBatchTagTask) processMatchedPerformer(ctx context.Context, p *models.ScrapedPerformer, excluded map[string]bool) {
+	// Refreshing an existing performer
 	if t.performer != nil {
 		storedID, _ := strconv.Atoi(*p.StoredID)
 
@@ -165,6 +172,7 @@ func (t *stashBoxBatchPerformerTagTask) processMatchedPerformer(ctx context.Cont
 			return
 		}
 
+		// Start the transaction and update the performer
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Performer
@@ -210,8 +218,8 @@ func (t *stashBoxBatchPerformerTagTask) processMatchedPerformer(ctx context.Cont
 		} else {
 			logger.Infof("Updated performer %s", *p.Name)
 		}
-	} else {
+	} else if t.name != nil && p.Name != nil {
-		// no existing performer, create a new one
+		// Creating a new performer
 		newPerformer := p.ToPerformer(t.box.Endpoint, excluded)
 		image, err := p.GetImage(ctx, excluded)
 		if err != nil {
@@ -247,34 +255,7 @@ func (t *stashBoxBatchPerformerTagTask) processMatchedPerformer(ctx context.Cont
 	}
 }
 
-// stashBoxBatchStudioTagTask is used to tag or create studios from stash-box.
+func (t *StashBoxBatchTagTask) stashBoxStudioTag(ctx context.Context) {
-//
-// Two modes of operation:
-//   - Update existing studio: set studio to update from stash-box data
-//   - Create new studio: set name or stashID to search stash-box and create locally
-type stashBoxBatchStudioTagTask struct {
-	box            *models.StashBox
-	name           *string
-	stashID        *string
-	studio         *models.Studio
-	createParent   bool
-	excludedFields []string
-}
-
-func (t *stashBoxBatchStudioTagTask) getName() string {
-	switch {
-	case t.name != nil:
-		return *t.name
-	case t.stashID != nil:
-		return *t.stashID
-	case t.studio != nil:
-		return t.studio.Name
-	default:
-		return ""
-	}
-}
-
-func (t *stashBoxBatchStudioTagTask) Start(ctx context.Context) {
 	studio, err := t.findStashBoxStudio(ctx)
 	if err != nil {
 		logger.Errorf("Error fetching studio data from stash-box: %v", err)
@@ -286,31 +267,30 @@ func (t *stashBoxBatchStudioTagTask) Start(ctx context.Context) {
 		excluded[field] = true
 	}
 
+	// studio will have a value if pulling from Stash-box by Stash ID or name was successful
 	if studio != nil {
 		t.processMatchedStudio(ctx, studio, excluded)
 	} else {
-		logger.Infof("No match found for %s", t.getName())
+		var name string
+		if t.name != nil {
+			name = *t.name
+		} else if t.studio != nil {
+			name = t.studio.Name
+		}
+		logger.Infof("No match found for %s", name)
 	}
 }
 
-func (t *stashBoxBatchStudioTagTask) GetDescription() string {
+func (t *StashBoxBatchTagTask) findStashBoxStudio(ctx context.Context) (*models.ScrapedStudio, error) {
-	return fmt.Sprintf("Tagging studio %s from stash-box", t.getName())
-}
-
-func (t *stashBoxBatchStudioTagTask) findStashBoxStudio(ctx context.Context) (*models.ScrapedStudio, error) {
 	var studio *models.ScrapedStudio
 	var err error
 
 	r := instance.Repository
 
-	client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
+	stashboxRepository := stashbox.NewRepository(r)
+	client := stashbox.NewClient(*t.box, stashboxRepository, instance.Config.GetScraperExcludeTagPatterns())
 
-	switch {
+	if t.refresh {
-	case t.name != nil:
-		studio, err = client.FindStudio(ctx, *t.name)
-	case t.stashID != nil:
-		studio, err = client.FindStudio(ctx, *t.stashID)
-	case t.studio != nil:
 		var remoteID string
 		if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
 			if !t.studio.StashIDs.Loaded() {
@@ -328,31 +308,24 @@ func (t *stashBoxBatchStudioTagTask) findStashBoxStudio(ctx context.Context) (*m
 		}); err != nil {
 			return nil, err
 		}
-
 		if remoteID != "" {
-			studio, err = client.FindStudio(ctx, remoteID)
+			studio, err = client.FindStashBoxStudio(ctx, remoteID)
+		}
+	} else {
+		var name string
+		if t.name != nil {
+			name = *t.name
 		} else {
-			// find by studio name instead
+			name = t.studio.Name
-			studio, err = client.FindStudio(ctx, t.studio.Name)
 		}
-	}
+		studio, err = client.FindStashBoxStudio(ctx, name)
-
-	if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
-		if studio != nil {
-			if err := match.ScrapedStudioHierarchy(ctx, r.Studio, studio, t.box.Endpoint); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return nil, err
 	}
 
 	return studio, err
 }
 
-func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s *models.ScrapedStudio, excluded map[string]bool) {
+func (t *StashBoxBatchTagTask) processMatchedStudio(ctx context.Context, s *models.ScrapedStudio, excluded map[string]bool) {
+	// Refreshing an existing studio
 	if t.studio != nil {
 		storedID, _ := strconv.Atoi(*s.StoredID)
 
@@ -369,6 +342,7 @@ func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s
 			return
 		}
 
+		// Start the transaction and update the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -401,8 +375,8 @@ func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s
 		} else {
 			logger.Infof("Updated studio %s", s.Name)
 		}
-	} else if s.Name != "" {
+	} else if t.name != nil && s.Name != "" {
-		// no existing studio, create a new one
+		// Creating a new studio
 		if s.Parent != nil && t.createParent {
 			err := t.processParentStudio(ctx, s.Parent, excluded)
 			if err != nil {
@@ -417,6 +391,7 @@ func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s
 			return
 		}
 
+		// Start the transaction and save the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -445,8 +420,9 @@ func (t *stashBoxBatchStudioTagTask) processMatchedStudio(ctx context.Context, s
 	}
 }
 
-func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, parent *models.ScrapedStudio, excluded map[string]bool) error {
+func (t *StashBoxBatchTagTask) processParentStudio(ctx context.Context, parent *models.ScrapedStudio, excluded map[string]bool) error {
 	if parent.StoredID == nil {
+		// The parent needs to be created
 		newParentStudio := parent.ToStudio(t.box.Endpoint, excluded)
 
 		image, err := parent.GetImage(ctx, excluded)
@@ -455,6 +431,7 @@ func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, pa
 			return err
 		}
 
+		// Start the transaction and save the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio
@@ -480,6 +457,7 @@ func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, pa
 		}
 		return err
 	} else {
+		// The parent studio matched an existing one and the user has chosen in the UI to link and/or update it
 		storedID, _ := strconv.Atoi(*parent.StoredID)
 
 		image, err := parent.GetImage(ctx, excluded)
@@ -488,6 +466,7 @@ func (t *stashBoxBatchStudioTagTask) processParentStudio(ctx context.Context, pa
 			return err
 		}
 
+		// Start the transaction and update the studio
 		r := instance.Repository
 		err = r.WithTxn(ctx, func(ctx context.Context) error {
 			qb := r.Studio