Windows | 
macOS | 
Linux | 
Docker
:---:|:---:|:---:|:---:
@@ -85,23 +87,23 @@ The badge below shows the current translation status of Stash across all support
Need help or want to get involved? Start with the documentation, then reach out to the community if you need further assistance.
-- Documentation
- - Official docs: https://docs.stashapp.cc - official guides guides and troubleshooting.
- - In-app manual: press Shift + ? in the app or view the manual online: https://docs.stashapp.cc/in-app-manual.
- - FAQ: https://discourse.stashapp.cc/c/support/faq/28 - common questions and answers.
- - Community wiki: https://discourse.stashapp.cc/tags/c/community-wiki/22/stash - guides, how-to’s and tips.
+### Documentation
+- [Official documentation](https://docs.stashapp.cc) - official guides guides and troubleshooting.
+- [In-app manual](https://docs.stashapp.cc/in-app-manual) press Shift + ? in the app or view the manual online.
+- [FAQ](https://discourse.stashapp.cc/c/support/faq/28) - common questions and answers.
+- [Community wiki](https://discourse.stashapp.cc/tags/c/community-wiki/22/stash) - guides, how-to’s and tips.
-- Community & discussion
- - Community forum: https://discourse.stashapp.cc - community support, feature requests and discussions.
- - Discord: https://discord.gg/2TsNFKt - real-time chat and community support.
- - GitHub discussions: https://github.com/stashapp/stash/discussions - community support and feature discussions.
- - Lemmy community: https://discuss.online/c/stashapp - Reddit-style community space.
+### Community & 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) - board-style community space.
-- Community scrapers & plugins
- - Metadata sources: https://docs.stashapp.cc/metadata-sources/
- - Plugins: https://docs.stashapp.cc/plugins/
- - Themes: https://docs.stashapp.cc/themes/
- - Other projects: https://docs.stashapp.cc/other-projects/
+### Community scrapers & plugins
+- [Metadata sources](https://docs.stashapp.cc/metadata-sources/)
+- [Plugins](https://docs.stashapp.cc/plugins/)
+- [Themes](https://docs.stashapp.cc/themes/)
+- [Other projects](https://docs.stashapp.cc/other-projects/)
# For Developers
diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index 6a9c6b76d..2161cb6af 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -12,7 +12,7 @@ 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 tzdata vips vips-tools vips-heif \
&& pip install --break-system-packages mechanicalsoup cloudscraper stashapp-tools
ENV STASH_CONFIG_FILE=/root/.stash/config.yml
diff --git a/docker/compiler/.gitignore b/docker/compiler/.gitignore
deleted file mode 100644
index 7012bfd63..000000000
--- a/docker/compiler/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sdk.tar.*
\ No newline at end of file
diff --git a/docker/compiler/Dockerfile b/docker/compiler/Dockerfile
index 0154d7e61..c9dfb9c7c 100644
--- a/docker/compiler/Dockerfile
+++ b/docker/compiler/Dockerfile
@@ -1,82 +1,86 @@
-FROM golang:1.24.3
+### OSXCROSS
+FROM debian:bookworm AS osxcross
+# add osxcross
+WORKDIR /tmp/osxcross
+ARG OSXCROSS_REVISION=5e1b71fcceb23952f3229995edca1b6231525b5b
+ADD --checksum=sha256:d3f771bbc20612fea577b18a71be3af2eb5ad2dd44624196cf55de866d008647 https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REVISION} /tmp/osxcross.tar.gz
-LABEL maintainer="https://discord.gg/2TsNFKt"
+ARG OSX_SDK_VERSION=11.3
+ARG OSX_SDK_DOWNLOAD_FILE=MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
+ARG OSX_SDK_DOWNLOAD_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
+ADD --checksum=sha256:cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4 ${OSX_SDK_DOWNLOAD_URL} /tmp/osxcross/tarballs/${OSX_SDK_DOWNLOAD_FILE}
-RUN apt-get update && apt-get install -y apt-transport-https ca-certificates gnupg
+ENV UNATTENDED=yes \
+ SDK_VERSION=${OSX_SDK_VERSION} \
+ OSX_VERSION_MIN=10.10
+RUN apt update && \
+ apt install -y --no-install-recommends \
+ bash ca-certificates clang cmake git patch libssl-dev bzip2 cpio libbz2-dev libxml2-dev make python3 xz-utils zlib1g-dev
+# lzma-dev libxml2-dev xz
+RUN tar --strip=1 -C /tmp/osxcross -xf /tmp/osxcross.tar.gz
+RUN ./build.sh
-RUN mkdir -p /etc/apt/keyrings
+### FREEBSD cross-compilation stage
+# use alpine for cacheable image since apt is notorous for not caching
+FROM alpine:3 AS freebsd
+# match golang latest
+# https://go.dev/wiki/FreeBSD
+ARG FREEBSD_VERSION=12.4
+ADD --checksum=sha256:581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8 \
+ http://ftp-archive.freebsd.org/mirror/FreeBSD-Archive/old-releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz \
+ /tmp/base.txz
-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
+WORKDIR /opt/cross-freebsd
+RUN apk add --no-cache tar xz
+RUN tar -xf /tmp/base.txz --strip-components=1 ./usr/lib ./usr/include ./lib
+RUN cd /opt/cross-freebsd/usr/lib && \
+ find . -type l -exec sh -c ' \
+ for link; do \
+ target=$(readlink "$link"); \
+ case "$target" in \
+ /lib/*) ln -sf "/opt/cross-freebsd$target" "$link";; \
+ esac; \
+ done \
+ ' sh {} + && \
+ ln -s libc++.a libstdc++.a && \
+ ln -s libc++.so libstdc++.so
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- git make tar bash nodejs zip \
- clang llvm-dev cmake patch libxml2-dev uuid-dev libssl-dev xz-utils \
- bzip2 gzip sed cpio libbz2-dev zlib1g-dev \
- gcc-mingw-w64 \
- gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
- gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
- rm -rf /var/lib/apt/lists/*;
+### BUILDER
+FROM golang:1.24.3 AS builder
+ENV PATH=/opt/osx-ndk-x86/bin:$PATH
+
+# copy in nodejs instead of using nodesource :thumbsup:
+COPY --from=docker.io/library/node:24-bookworm /usr/local /usr/local
+# copy in osxcross
+COPY --from=osxcross /tmp/osxcross/target/lib /usr/lib
+COPY --from=osxcross /tmp/osxcross/target /opt/osx-ndk-x86
+# copy in cross-freebsd
+COPY --from=freebsd /opt/cross-freebsd /opt/cross-freebsd
# 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
-ENV FREEBSD_DOWNLOAD_URL http://ftp.plusline.de/FreeBSD/releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz
-ENV FREEBSD_SHA 8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c
+# git for getting hash
+# make and bash for building
-RUN cd /tmp && \
- curl -o base.txz $FREEBSD_DOWNLOAD_URL && \
- echo "$FREEBSD_SHA base.txz" | sha256sum -c - && \
- mkdir -p /opt/cross-freebsd && \
- cd /opt/cross-freebsd && \
- tar -xf /tmp/base.txz ./lib/ ./usr/lib/ ./usr/include/ && \
- rm -f /tmp/base.txz && \
- cd /opt/cross-freebsd/usr/lib && \
- find . -xtype l | xargs ls -l | grep ' /lib/' | awk '{print "ln -sf /opt/cross-freebsd"$11 " " $9}' | /bin/sh && \
- ln -s libc++.a libstdc++.a && \
- ln -s libc++.so libstdc++.so
-
-# macOS cross-compilation setup
-ENV OSX_SDK_VERSION 11.3
-ENV OSX_SDK_DOWNLOAD_FILE MacOSX${OSX_SDK_VERSION}.sdk.tar.xz
-ENV OSX_SDK_DOWNLOAD_URL https://github.com/phracker/MacOSX-SDKs/releases/download/${OSX_SDK_VERSION}/${OSX_SDK_DOWNLOAD_FILE}
-ENV OSX_SDK_SHA cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4
-ENV OSXCROSS_REVISION 5e1b71fcceb23952f3229995edca1b6231525b5b
-ENV OSXCROSS_DOWNLOAD_URL https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REVISION}
-ENV OSXCROSS_SHA d3f771bbc20612fea577b18a71be3af2eb5ad2dd44624196cf55de866d008647
-
-RUN cd /tmp && \
- curl -o osxcross.tar.gz $OSXCROSS_DOWNLOAD_URL && \
- echo "$OSXCROSS_SHA osxcross.tar.gz" | sha256sum -c - && \
- mkdir osxcross && \
- tar --strip=1 -C osxcross -xf osxcross.tar.gz && \
- rm -f osxcross.tar.gz && \
- curl -Lo $OSX_SDK_DOWNLOAD_FILE $OSX_SDK_DOWNLOAD_URL && \
- echo "$OSX_SDK_SHA $OSX_SDK_DOWNLOAD_FILE" | sha256sum -c - && \
- mv $OSX_SDK_DOWNLOAD_FILE osxcross/tarballs/ && \
- UNATTENDED=yes SDK_VERSION=$OSX_SDK_VERSION OSX_VERSION_MIN=10.10 osxcross/build.sh && \
- cp osxcross/target/lib/* /usr/lib/ && \
- mv osxcross/target /opt/osx-ndk-x86 && \
- rm -rf /tmp/osxcross
-
-ENV PATH /opt/osx-ndk-x86/bin:$PATH
-
-RUN mkdir -p /root/.ssh && \
- chmod 0700 /root/.ssh && \
- ssh-keyscan github.com > /root/.ssh/known_hosts
-
-# ignore "dubious ownership" errors
+# clang for macos
+# zip for stashapp.zip
+# gcc-extensions for cross-arch build
+# we still target arm soft float?
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
+ git make bash \
+ clang zip \
+ gcc-mingw-w64 \
+ gcc-arm-linux-gnueabi \
+ libc-dev-armel-cross linux-libc-dev-armel-cross \
+ gcc-aarch64-linux-gnu libc-dev-arm64-cross && \
+ rm -rf /var/lib/apt/lists/*;
RUN git config --global safe.directory '*'
-
# To test locally:
# make generate
# make ui
# cd docker/compiler
-# make build
-# docker run --rm -v /PATH_TO_STASH:/stash -w /stash -i -t stashapp/compiler:latest make build-cc-all
-# # binaries will show up in /dist
+# docker build . -t ghcr.io/stashapp/compiler:latest
+# docker run --rm -v /PATH_TO_STASH:/stash -w /stash -i -t ghcr.io/stashapp/compiler:latest make build-cc-all
+# # binaries will show up in /dist
\ No newline at end of file
diff --git a/docker/compiler/Makefile b/docker/compiler/Makefile
index ed6a9a285..66f19f5d6 100644
--- a/docker/compiler/Makefile
+++ b/docker/compiler/Makefile
@@ -1,16 +1,22 @@
+host=ghcr.io
user=stashapp
repo=compiler
-version=12
+version=13
+
+VERSION_IMAGE = ${host}/${user}/${repo}:${version}
+LATEST_IMAGE = ${host}/${user}/${repo}:latest
latest:
- docker build -t ${user}/${repo}:latest .
+ docker build -t ${LATEST_IMAGE} .
build:
- docker build -t ${user}/${repo}:${version} -t ${user}/${repo}:latest .
+ docker build -t ${VERSION_IMAGE} -t ${LATEST_IMAGE} .
build-no-cache:
- docker build --no-cache -t ${user}/${repo}:${version} -t ${user}/${repo}:latest .
+ docker build --no-cache -t ${VERSION_IMAGE} -t ${LATEST_IMAGE} .
-install: build
- docker push ${user}/${repo}:${version}
- docker push ${user}/${repo}:latest
+# requires docker login ghcr.io
+# echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
+push:
+ docker push ${VERSION_IMAGE}
+ docker push ${LATEST_IMAGE}
\ No newline at end of file
diff --git a/docker/compiler/README.md b/docker/compiler/README.md
index 6bb7d8d99..c7b4840f9 100644
--- a/docker/compiler/README.md
+++ b/docker/compiler/README.md
@@ -1,3 +1,3 @@
Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
-When the Dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to Docker Hub. The GitHub workflow files also need to be updated to pull the correct image tag.
+When the Dockerfile is changed, the version number should be incremented in [.github/workflows/build-compiler.yml](../../.github/workflows/build-compiler.yml) and the workflow [manually ran](). `env: COMPILER_IMAGE` in [.github/workflows/build.yml](../../.github/workflows/build.yml) also needs to be updated to pull the correct image tag.
\ No newline at end of file
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 85c2f6f23..a26ce6817 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -118,8 +118,8 @@ This project uses a modification of the [CI-GoReleaser](https://github.com/bep/d
To cross-compile the app yourself:
1. Run `make pre-ui`, `make generate` and `make ui` outside the container, to generate files and build the UI.
-2. Pull the latest compiler image from Docker Hub: `docker pull stashapp/compiler`
-3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it stashapp/compiler /bin/bash` to open a shell inside the container.
+2. Pull the latest compiler image from GHCR: `docker pull ghcr.io/stashapp/compiler`
+3. Run `docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash -it ghcr.io/stashapp/compiler /bin/bash` to open a shell inside the container.
4. From inside the container, run `make build-cc-all` to build for all platforms, or run `make build-cc-{platform}` to build for a specific platform (have a look at the `Makefile` for the list of targets).
5. You will find the compiled binaries in `dist/`.
diff --git a/graphql/schema/types/file.graphql b/graphql/schema/types/file.graphql
index 37fb5539f..fcc2a58c8 100644
--- a/graphql/schema/types/file.graphql
+++ b/graphql/schema/types/file.graphql
@@ -16,6 +16,9 @@ type Folder {
parent_folders: [Folder!]!
zip_file: BasicFile
+ "Returns direct sub-folders"
+ sub_folders: [Folder!]!
+
mod_time: Time!
created_at: Time!
@@ -156,7 +159,7 @@ input MoveFilesInput {
input SetFingerprintsInput {
type: String!
- "an null value will remove the fingerprint"
+ "a null value will remove the fingerprint"
value: String
}
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 323fb8741..c7d880266 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -152,15 +152,15 @@ input PerformerFilterType {
fake_tits: StringCriterionInput
"Filter by penis length value"
penis_length: FloatCriterionInput
- "Filter by ciricumcision"
+ "Filter by circumcision"
circumcised: CircumcisionCriterionInput
"Deprecated: use career_start and career_end. This filter is non-functional."
career_length: StringCriterionInput
@deprecated(reason: "Use career_start and career_end")
- "Filter by career start year"
- career_start: IntCriterionInput
- "Filter by career end year"
- career_end: IntCriterionInput
+ "Filter by career start"
+ career_start: DateCriterionInput
+ "Filter by career end"
+ career_end: DateCriterionInput
"Filter by tattoos"
tattoos: StringCriterionInput
"Filter by piercings"
@@ -249,9 +249,9 @@ input SceneMarkerFilterType {
updated_at: TimestampCriterionInput
"Filter by scene date"
scene_date: DateCriterionInput
- "Filter by cscene reation time"
+ "Filter by scene creation time"
scene_created_at: TimestampCriterionInput
- "Filter by lscene ast update time"
+ "Filter by scene last update time"
scene_updated_at: TimestampCriterionInput
"Filter by related scenes that meet this criteria"
scene_filter: SceneFilterType
@@ -665,7 +665,7 @@ input TagFilterType {
"Filter by number of parent tags the tag has"
parent_count: IntCriterionInput
- "Filter by number f child tags the tag has"
+ "Filter by number of child tags the tag has"
child_count: IntCriterionInput
"Filter by autotag ignore value"
@@ -933,7 +933,7 @@ input GenderCriterionInput {
}
input CircumcisionCriterionInput {
- value: [CircumisedEnum!]
+ value: [CircumcisedEnum!]
modifier: CriterionModifier!
}
diff --git a/graphql/schema/types/group.graphql b/graphql/schema/types/group.graphql
index a1c878923..8610f39dc 100644
--- a/graphql/schema/types/group.graphql
+++ b/graphql/schema/types/group.graphql
@@ -99,6 +99,8 @@ input BulkGroupUpdateInput {
ids: [ID!]
# rating expressed as 1-100
rating100: Int
+ date: String
+ synopsis: String
studio_id: ID
director: String
urls: BulkUpdateStrings
diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql
index e2601150b..6ad620dbe 100644
--- a/graphql/schema/types/metadata.graphql
+++ b/graphql/schema/types/metadata.graphql
@@ -131,6 +131,14 @@ type ScanMetadataOptions {
input CleanMetadataInput {
paths: [String!]
+ """
+ Don't check zip file contents when determining whether to clean a file.
+ This can significantly speed up the clean process, but will potentially miss removed files within zip files.
+ Where users do not modify zip files contents directly, this should be safe to use.
+ Defaults to false.
+ """
+ ignoreZipFileContents: Boolean
+
"Do a dry run. Don't delete any files"
dryRun: Boolean!
}
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index 97a80b94f..bf17298da 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -7,7 +7,7 @@ enum GenderEnum {
NON_BINARY
}
-enum CircumisedEnum {
+enum CircumcisedEnum {
CUT
UNCUT
}
@@ -29,10 +29,10 @@ type Performer {
measurements: String
fake_tits: String
penis_length: Float
- circumcised: CircumisedEnum
+ circumcised: CircumcisedEnum
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
alias_list: [String!]!
@@ -78,10 +78,10 @@ input PerformerCreateInput {
measurements: String
fake_tits: String
penis_length: Float
- circumcised: CircumisedEnum
+ circumcised: CircumcisedEnum
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
"Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -119,10 +119,10 @@ input PerformerUpdateInput {
measurements: String
fake_tits: String
penis_length: Float
- circumcised: CircumisedEnum
+ circumcised: CircumcisedEnum
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
"Duplicate aliases and those equal to name will be ignored (case-insensitive)"
@@ -165,10 +165,10 @@ input BulkPerformerUpdateInput {
measurements: String
fake_tits: String
penis_length: Float
- circumcised: CircumisedEnum
+ circumcised: CircumcisedEnum
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
"Duplicate aliases and those equal to name will result in an error (case-insensitive)"
diff --git a/graphql/schema/types/scraped-performer.graphql b/graphql/schema/types/scraped-performer.graphql
index 0818e61c2..799b5cd6e 100644
--- a/graphql/schema/types/scraped-performer.graphql
+++ b/graphql/schema/types/scraped-performer.graphql
@@ -19,8 +19,8 @@ type ScrapedPerformer {
penis_length: String
circumcised: String
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
# aliases must be comma-delimited to be parsed correctly
@@ -57,8 +57,8 @@ input ScrapedPerformerInput {
penis_length: String
circumcised: String
career_length: String @deprecated(reason: "Use career_start and career_end")
- career_start: Int
- career_end: Int
+ career_start: String
+ career_end: String
tattoos: String
piercings: String
aliases: String
diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index b8810aa79..fafd928f7 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -73,6 +73,7 @@ type ScrapedTag {
name: String!
description: String
alias_list: [String!]
+ parent: ScrapedTag
"Remote site ID, if applicable"
remote_site_id: String
}
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index edd44c835..ebaf05648 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -31,6 +31,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
fragment MeasurementsFragment on Measurements {
diff --git a/internal/api/loaders/dataloaders.go b/internal/api/loaders/dataloaders.go
index 2ba650962..c1faf61ed 100644
--- a/internal/api/loaders/dataloaders.go
+++ b/internal/api/loaders/dataloaders.go
@@ -11,7 +11,7 @@
//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 FolderParentFolderIDsLoader github.com/stashapp/stash/pkg/models.FolderID []github.com/stashapp/stash/pkg/models.FolderID
+//go:generate go run github.com/vektah/dataloaden FolderRelatedFolderIDsLoader github.com/stashapp/stash/pkg/models.FolderID []github.com/stashapp/stash/pkg/models.FolderID
//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
@@ -75,7 +75,8 @@ type Loaders struct {
FileByID *FileLoader
FolderByID *FolderLoader
- FolderParentFolderIDs *FolderParentFolderIDsLoader
+ FolderParentFolderIDs *FolderRelatedFolderIDsLoader
+ FolderSubFolderIDs *FolderRelatedFolderIDsLoader
}
type Middleware struct {
@@ -166,11 +167,16 @@ func (m Middleware) Middleware(next http.Handler) http.Handler {
maxBatch: maxBatch,
fetch: m.fetchFolders(ctx),
},
- FolderParentFolderIDs: &FolderParentFolderIDsLoader{
+ FolderParentFolderIDs: &FolderRelatedFolderIDsLoader{
wait: wait,
maxBatch: maxBatch,
fetch: m.fetchFoldersParentFolderIDs(ctx),
},
+ FolderSubFolderIDs: &FolderRelatedFolderIDsLoader{
+ wait: wait,
+ maxBatch: maxBatch,
+ fetch: m.fetchFoldersSubFolderIDs(ctx),
+ },
SceneFiles: &SceneFileIDsLoader{
wait: wait,
maxBatch: maxBatch,
@@ -427,6 +433,17 @@ func (m Middleware) fetchFoldersParentFolderIDs(ctx context.Context) func(keys [
}
}
+func (m Middleware) fetchFoldersSubFolderIDs(ctx context.Context) func(keys []models.FolderID) ([][]models.FolderID, []error) {
+ return func(keys []models.FolderID) (ret [][]models.FolderID, errs []error) {
+ err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
+ var err error
+ ret, err = m.Repository.Folder.GetManySubFolderIDs(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 {
diff --git a/internal/api/loaders/folderparentfolderidsloader_gen.go b/internal/api/loaders/folderrelatedfolderidsloader_gen.go
similarity index 81%
rename from internal/api/loaders/folderparentfolderidsloader_gen.go
rename to internal/api/loaders/folderrelatedfolderidsloader_gen.go
index c9eca3a3d..d0edb92f4 100644
--- a/internal/api/loaders/folderparentfolderidsloader_gen.go
+++ b/internal/api/loaders/folderrelatedfolderidsloader_gen.go
@@ -22,16 +22,16 @@ type FolderParentFolderIDsLoaderConfig struct {
}
// NewFolderParentFolderIDsLoader creates a new FolderParentFolderIDsLoader given a fetch, wait, and maxBatch
-func NewFolderParentFolderIDsLoader(config FolderParentFolderIDsLoaderConfig) *FolderParentFolderIDsLoader {
- return &FolderParentFolderIDsLoader{
+func NewFolderParentFolderIDsLoader(config FolderParentFolderIDsLoaderConfig) *FolderRelatedFolderIDsLoader {
+ return &FolderRelatedFolderIDsLoader{
fetch: config.Fetch,
wait: config.Wait,
maxBatch: config.MaxBatch,
}
}
-// FolderParentFolderIDsLoader batches and caches requests
-type FolderParentFolderIDsLoader struct {
+// FolderRelatedFolderIDsLoader batches and caches requests
+type FolderRelatedFolderIDsLoader struct {
// this method provides the data for the loader
fetch func(keys []models.FolderID) ([][]models.FolderID, []error)
@@ -63,14 +63,14 @@ type folderParentFolderIDsLoaderBatch struct {
}
// Load a FolderID by key, batching and caching will be applied automatically
-func (l *FolderParentFolderIDsLoader) Load(key models.FolderID) ([]models.FolderID, error) {
+func (l *FolderRelatedFolderIDsLoader) Load(key models.FolderID) ([]models.FolderID, error) {
return l.LoadThunk(key)()
}
// LoadThunk returns a function that when called will block waiting for a FolderID.
// 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 *FolderParentFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]models.FolderID, error) {
+func (l *FolderRelatedFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]models.FolderID, error) {
l.mu.Lock()
if it, ok := l.cache[key]; ok {
l.mu.Unlock()
@@ -113,7 +113,7 @@ func (l *FolderParentFolderIDsLoader) LoadThunk(key models.FolderID) func() ([]m
// LoadAll fetches many keys at once. It will be broken into appropriate sized
// sub batches depending on how the loader is configured
-func (l *FolderParentFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]models.FolderID, []error) {
+func (l *FolderRelatedFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]models.FolderID, []error) {
results := make([]func() ([]models.FolderID, error), len(keys))
for i, key := range keys {
@@ -131,7 +131,7 @@ func (l *FolderParentFolderIDsLoader) LoadAll(keys []models.FolderID) ([][]model
// LoadAllThunk returns a function that when called will block waiting for a FolderIDs.
// 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 *FolderParentFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func() ([][]models.FolderID, []error) {
+func (l *FolderRelatedFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func() ([][]models.FolderID, []error) {
results := make([]func() ([]models.FolderID, error), len(keys))
for i, key := range keys {
results[i] = l.LoadThunk(key)
@@ -149,7 +149,7 @@ func (l *FolderParentFolderIDsLoader) LoadAllThunk(keys []models.FolderID) func(
// 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 *FolderParentFolderIDsLoader) Prime(key models.FolderID, value []models.FolderID) bool {
+func (l *FolderRelatedFolderIDsLoader) Prime(key models.FolderID, value []models.FolderID) bool {
l.mu.Lock()
var found bool
if _, found = l.cache[key]; !found {
@@ -164,13 +164,13 @@ func (l *FolderParentFolderIDsLoader) Prime(key models.FolderID, value []models.
}
// Clear the value at key from the cache, if it exists
-func (l *FolderParentFolderIDsLoader) Clear(key models.FolderID) {
+func (l *FolderRelatedFolderIDsLoader) Clear(key models.FolderID) {
l.mu.Lock()
delete(l.cache, key)
l.mu.Unlock()
}
-func (l *FolderParentFolderIDsLoader) unsafeSet(key models.FolderID, value []models.FolderID) {
+func (l *FolderRelatedFolderIDsLoader) unsafeSet(key models.FolderID, value []models.FolderID) {
if l.cache == nil {
l.cache = map[models.FolderID][]models.FolderID{}
}
@@ -179,7 +179,7 @@ func (l *FolderParentFolderIDsLoader) unsafeSet(key models.FolderID, value []mod
// 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 *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderParentFolderIDsLoader, key models.FolderID) int {
+func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderRelatedFolderIDsLoader, key models.FolderID) int {
for i, existingKey := range b.keys {
if key == existingKey {
return i
@@ -203,7 +203,7 @@ func (b *folderParentFolderIDsLoaderBatch) keyIndex(l *FolderParentFolderIDsLoad
return pos
}
-func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderParentFolderIDsLoader) {
+func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderRelatedFolderIDsLoader) {
time.Sleep(l.wait)
l.mu.Lock()
@@ -219,7 +219,7 @@ func (b *folderParentFolderIDsLoaderBatch) startTimer(l *FolderParentFolderIDsLo
b.end(l)
}
-func (b *folderParentFolderIDsLoaderBatch) end(l *FolderParentFolderIDsLoader) {
+func (b *folderParentFolderIDsLoaderBatch) end(l *FolderRelatedFolderIDsLoader) {
b.data, b.error = l.fetch(b.keys)
close(b.done)
}
diff --git a/internal/api/resolver.go b/internal/api/resolver.go
index 061d0e1a9..b1cec1c9d 100644
--- a/internal/api/resolver.go
+++ b/internal/api/resolver.go
@@ -7,6 +7,7 @@ import (
"sort"
"strconv"
+ "github.com/99designs/gqlgen/graphql"
"github.com/stashapp/stash/internal/build"
"github.com/stashapp/stash/internal/manager"
"github.com/stashapp/stash/pkg/logger"
@@ -145,6 +146,13 @@ func (r *Resolver) withReadTxn(ctx context.Context, fn func(ctx context.Context)
return r.repository.WithReadTxn(ctx, fn)
}
+// idOnly returns true if the query is only asking for the id field.
+// This can be used to optimize certain queries where we don't need to load the full object if we're only getting the id.
+func (r *Resolver) idOnly(ctx context.Context) bool {
+ fields := graphql.CollectAllFields(ctx)
+ return len(fields) == 1 && fields[0] == "id"
+}
+
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)
diff --git a/internal/api/resolver_model_folder.go b/internal/api/resolver_model_folder.go
index c203a3f82..725ca34f8 100644
--- a/internal/api/resolver_model_folder.go
+++ b/internal/api/resolver_model_folder.go
@@ -17,20 +17,62 @@ func (r *folderResolver) ParentFolder(ctx context.Context, obj *models.Folder) (
return nil, nil
}
+ if r.idOnly(ctx) {
+ return &models.Folder{ID: *obj.ParentFolderID}, nil
+ }
+
return loaders.From(ctx).FolderByID.Load(*obj.ParentFolderID)
}
+func foldersFromIDs(ids []models.FolderID) []*models.Folder {
+ ret := make([]*models.Folder, len(ids))
+ for i, id := range ids {
+ ret[i] = &models.Folder{ID: id}
+ }
+ return ret
+}
+
func (r *folderResolver) ParentFolders(ctx context.Context, obj *models.Folder) ([]*models.Folder, error) {
ids, err := loaders.From(ctx).FolderParentFolderIDs.Load(obj.ID)
if err != nil {
return nil, err
}
+ if r.idOnly(ctx) {
+ return foldersFromIDs(ids), nil
+ }
+
+ var errs []error
+ ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
+ return ret, firstError(errs)
+}
+
+func (r *folderResolver) SubFolders(ctx context.Context, obj *models.Folder) ([]*models.Folder, error) {
+ ids, err := loaders.From(ctx).FolderSubFolderIDs.Load(obj.ID)
+ if err != nil {
+ return nil, err
+ }
+
+ if r.idOnly(ctx) {
+ return foldersFromIDs(ids), nil
+ }
+
var errs []error
ret, errs := loaders.From(ctx).FolderByID.LoadAll(ids)
return ret, firstError(errs)
}
func (r *folderResolver) ZipFile(ctx context.Context, obj *models.Folder) (*BasicFile, error) {
+ // shortcut for id only queries
+ if r.idOnly(ctx) {
+ if obj.ZipFileID == nil {
+ return nil, nil
+ }
+
+ return &BasicFile{
+ BaseFile: &models.BaseFile{ID: *obj.ZipFileID},
+ }, nil
+ }
+
return zipFileResolver(ctx, obj.ZipFileID)
}
diff --git a/internal/api/resolver_model_performer.go b/internal/api/resolver_model_performer.go
index b770f5801..261a98ff3 100644
--- a/internal/api/resolver_model_performer.go
+++ b/internal/api/resolver_model_performer.go
@@ -10,7 +10,6 @@ import (
"github.com/stashapp/stash/pkg/image"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/performer"
- "github.com/stashapp/stash/pkg/utils"
)
func (r *performerResolver) AliasList(ctx context.Context, obj *models.Performer) ([]string, error) {
@@ -110,12 +109,28 @@ func (r *performerResolver) HeightCm(ctx context.Context, obj *models.Performer)
return obj.Height, nil
}
+func (r *performerResolver) CareerStart(ctx context.Context, obj *models.Performer) (*string, error) {
+ if obj.CareerStart != nil {
+ ret := obj.CareerStart.String()
+ return &ret, nil
+ }
+ return nil, nil
+}
+
+func (r *performerResolver) CareerEnd(ctx context.Context, obj *models.Performer) (*string, error) {
+ if obj.CareerEnd != nil {
+ ret := obj.CareerEnd.String()
+ return &ret, nil
+ }
+ return nil, nil
+}
+
func (r *performerResolver) CareerLength(ctx context.Context, obj *models.Performer) (*string, error) {
if obj.CareerStart == nil && obj.CareerEnd == nil {
return nil, nil
}
- ret := utils.FormatYearRange(obj.CareerStart, obj.CareerEnd)
+ ret := models.FormatYearRange(obj.CareerStart, obj.CareerEnd)
return &ret, nil
}
diff --git a/internal/api/resolver_mutation_group.go b/internal/api/resolver_mutation_group.go
index dff5a6c1e..6c986c4da 100644
--- a/internal/api/resolver_mutation_group.go
+++ b/internal/api/resolver_mutation_group.go
@@ -227,6 +227,12 @@ func (r *mutationResolver) GroupUpdate(ctx context.Context, input GroupUpdateInp
func groupPartialFromBulkGroupUpdateInput(translator changesetTranslator, input BulkGroupUpdateInput) (ret models.GroupPartial, err error) {
updatedGroup := models.NewGroupPartial()
+ updatedGroup.Date, err = translator.optionalDate(input.Date, "date")
+ if err != nil {
+ err = fmt.Errorf("converting date: %w", err)
+ return
+ }
+ updatedGroup.Synopsis = translator.optionalString(input.Synopsis, "synopsis")
updatedGroup.Rating = translator.optionalInt(input.Rating100, "rating100")
updatedGroup.Director = translator.optionalString(input.Director, "director")
diff --git a/internal/api/resolver_mutation_migrate.go b/internal/api/resolver_mutation_migrate.go
index 083d307e9..b739be1e0 100644
--- a/internal/api/resolver_mutation_migrate.go
+++ b/internal/api/resolver_mutation_migrate.go
@@ -47,6 +47,10 @@ func (r *mutationResolver) Migrate(ctx context.Context, input manager.MigrateInp
Database: mgr.Database,
}
+ if err := t.PreExecute(); err != nil {
+ return "", err
+ }
+
jobID := mgr.JobManager.Add(ctx, "Migrating database...", t)
return strconv.Itoa(jobID), nil
diff --git a/internal/api/resolver_mutation_performer.go b/internal/api/resolver_mutation_performer.go
index 653348304..6f88c54ca 100644
--- a/internal/api/resolver_mutation_performer.go
+++ b/internal/api/resolver_mutation_performer.go
@@ -52,17 +52,6 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
newPerformer.FakeTits = translator.string(input.FakeTits)
newPerformer.PenisLength = input.PenisLength
newPerformer.Circumcised = input.Circumcised
- newPerformer.CareerStart = input.CareerStart
- newPerformer.CareerEnd = input.CareerEnd
- // if career_start/career_end not provided, parse deprecated career_length
- if newPerformer.CareerStart == nil && newPerformer.CareerEnd == nil && input.CareerLength != nil {
- start, end, err := utils.ParseYearRangeString(*input.CareerLength)
- if err != nil {
- return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
- }
- newPerformer.CareerStart = start
- newPerformer.CareerEnd = end
- }
newPerformer.Tattoos = translator.string(input.Tattoos)
newPerformer.Piercings = translator.string(input.Piercings)
newPerformer.Favorite = translator.bool(input.Favorite)
@@ -100,6 +89,25 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
return nil, fmt.Errorf("converting death date: %w", err)
}
+ newPerformer.CareerStart, err = translator.datePtr(input.CareerStart)
+ if err != nil {
+ return nil, fmt.Errorf("converting career start: %w", err)
+ }
+ newPerformer.CareerEnd, err = translator.datePtr(input.CareerEnd)
+ if err != nil {
+ return nil, fmt.Errorf("converting career end: %w", err)
+ }
+
+ // if career_start/career_end not provided, parse deprecated career_length
+ if newPerformer.CareerStart == nil && newPerformer.CareerEnd == nil && input.CareerLength != nil {
+ start, end, err := models.ParseYearRangeString(*input.CareerLength)
+ if err != nil {
+ return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
+ }
+ newPerformer.CareerStart = start
+ newPerformer.CareerEnd = end
+ }
+
newPerformer.TagIDs, err = translator.relatedIds(input.TagIds)
if err != nil {
return nil, fmt.Errorf("converting tag ids: %w", err)
@@ -273,18 +281,25 @@ func performerPartialFromInput(input models.PerformerUpdateInput, translator cha
updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
// prefer career_start/career_end over deprecated career_length
if translator.hasField("career_start") || translator.hasField("career_end") {
- updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
- updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+ var err error
+ updatedPerformer.CareerStart, err = translator.optionalDate(input.CareerStart, "career_start")
+ if err != nil {
+ return nil, fmt.Errorf("converting career start: %w", err)
+ }
+ updatedPerformer.CareerEnd, err = translator.optionalDate(input.CareerEnd, "career_end")
+ if err != nil {
+ return nil, fmt.Errorf("converting career end: %w", err)
+ }
} else if translator.hasField("career_length") && input.CareerLength != nil {
- start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+ start, end, err := models.ParseYearRangeString(*input.CareerLength)
if err != nil {
return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
}
if start != nil {
- updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+ updatedPerformer.CareerStart = models.NewOptionalDate(*start)
}
if end != nil {
- updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+ updatedPerformer.CareerEnd = models.NewOptionalDate(*end)
}
}
updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
@@ -444,18 +459,24 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input BulkPe
updatedPerformer.Circumcised = translator.optionalString((*string)(input.Circumcised), "circumcised")
// prefer career_start/career_end over deprecated career_length
if translator.hasField("career_start") || translator.hasField("career_end") {
- updatedPerformer.CareerStart = translator.optionalInt(input.CareerStart, "career_start")
- updatedPerformer.CareerEnd = translator.optionalInt(input.CareerEnd, "career_end")
+ updatedPerformer.CareerStart, err = translator.optionalDate(input.CareerStart, "career_start")
+ if err != nil {
+ return nil, fmt.Errorf("converting career start: %w", err)
+ }
+ updatedPerformer.CareerEnd, err = translator.optionalDate(input.CareerEnd, "career_end")
+ if err != nil {
+ return nil, fmt.Errorf("converting career end: %w", err)
+ }
} else if translator.hasField("career_length") && input.CareerLength != nil {
- start, end, err := utils.ParseYearRangeString(*input.CareerLength)
+ start, end, err := models.ParseYearRangeString(*input.CareerLength)
if err != nil {
return nil, fmt.Errorf("could not parse career_length %q: %w", *input.CareerLength, err)
}
if start != nil {
- updatedPerformer.CareerStart = models.NewOptionalInt(*start)
+ updatedPerformer.CareerStart = models.NewOptionalDate(*start)
}
if end != nil {
- updatedPerformer.CareerEnd = models.NewOptionalInt(*end)
+ updatedPerformer.CareerEnd = models.NewOptionalDate(*end)
}
}
updatedPerformer.Tattoos = translator.optionalString(input.Tattoos, "tattoos")
diff --git a/internal/api/resolver_query_job.go b/internal/api/resolver_query_job.go
index 0e1222445..44b6b15c4 100644
--- a/internal/api/resolver_query_job.go
+++ b/internal/api/resolver_query_job.go
@@ -33,15 +33,26 @@ func (r *queryResolver) FindJob(ctx context.Context, input FindJobInput) (*Job,
}
func jobToJobModel(j job.Job) *Job {
+ subTasks := make([]string, len(j.Details))
+ for i, t := range j.Details {
+ subTasks[i] = sanitiseWebsocketString(t)
+ }
+
+ var jobError *string
+ if j.Error != nil {
+ s := sanitiseWebsocketString(*j.Error)
+ jobError = &s
+ }
+
ret := &Job{
ID: strconv.Itoa(j.ID),
Status: JobStatus(j.Status),
- Description: j.Description,
- SubTasks: j.Details,
+ Description: sanitiseWebsocketString(j.Description),
+ SubTasks: subTasks,
StartTime: j.StartTime,
EndTime: j.EndTime,
AddTime: j.AddTime,
- Error: j.Error,
+ Error: jobError,
}
if j.Progress != -1 {
diff --git a/internal/api/resolver_query_scraper.go b/internal/api/resolver_query_scraper.go
index 86d449921..353bb1a32 100644
--- a/internal/api/resolver_query_scraper.go
+++ b/internal/api/resolver_query_scraper.go
@@ -6,6 +6,7 @@ import (
"fmt"
"slices"
"strconv"
+ "strings"
"github.com/stashapp/stash/pkg/match"
"github.com/stashapp/stash/pkg/models"
@@ -363,7 +364,8 @@ func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Sour
client := r.newStashBoxClient(*b)
var ret []*models.ScrapedTag
- out, err := client.QueryTag(ctx, *input.Query)
+ query := *input.Query
+ out, err := client.QueryTag(ctx, query)
if err != nil {
return nil, err
@@ -383,6 +385,22 @@ func (r *queryResolver) ScrapeSingleTag(ctx context.Context, source scraper.Sour
}); err != nil {
return nil, err
}
+
+ // tag name query returns results that may not match the query exactly.
+ // if there is an exact match, it should be first
+ if query != "" {
+ for i, result := range ret {
+ if strings.EqualFold(result.Name, query) {
+ // prepend exact match to the front of the slice
+ if i != 0 {
+ ret = append([]*models.ScrapedTag{result}, append(ret[:i], ret[i+1:]...)...)
+ }
+
+ break
+ }
+ }
+ }
+
return ret, nil
}
diff --git a/internal/api/resolver_subscription_logging.go b/internal/api/resolver_subscription_logging.go
index 423fa88af..b4acb534c 100644
--- a/internal/api/resolver_subscription_logging.go
+++ b/internal/api/resolver_subscription_logging.go
@@ -2,11 +2,19 @@ package api
import (
"context"
+ "strings"
"github.com/stashapp/stash/internal/log"
"github.com/stashapp/stash/internal/manager"
)
+// sanitiseWebsocketString is used to ensure that any strings sent over the websocket are valid UTF-8.
+// Any invalid UTF-8 sequences will be replaced with the Unicode replacement character (U+FFFD).
+// Invalid UTF-8 sequences can cause the websocket connection to be closed.
+func sanitiseWebsocketString(s string) string {
+ return strings.ToValidUTF8(s, "\uFFFD")
+}
+
func getLogLevel(logType string) LogLevel {
switch logType {
case "progress":
@@ -33,7 +41,7 @@ func logEntriesFromLogItems(logItems []log.LogItem) []*LogEntry {
ret[i] = &LogEntry{
Time: entry.Time,
Level: getLogLevel(entry.Type),
- Message: entry.Message,
+ Message: sanitiseWebsocketString(entry.Message),
}
}
diff --git a/internal/manager/manager_tasks.go b/internal/manager/manager_tasks.go
index c9e840519..76938e9ff 100644
--- a/internal/manager/manager_tasks.go
+++ b/internal/manager/manager_tasks.go
@@ -314,6 +314,8 @@ type CleanMetadataInput struct {
Paths []string `json:"paths"`
// Do a dry run. Don't delete any files
DryRun bool `json:"dryRun"`
+
+ IgnoreZipFileContents bool `json:"ignoreZipFileContents"`
}
func (s *Manager) Clean(ctx context.Context, input CleanMetadataInput) int {
@@ -431,7 +433,7 @@ type StashBoxBatchTagInput struct {
ExcludeFields []string `json:"exclude_fields"`
// Refresh items already tagged by StashBox if true. Only tag items with no StashBox tagging if false
Refresh bool `json:"refresh"`
- // If batch adding studios, should their parent studios also be created?
+ // If batch adding studios or tags, should their parent entities also be created?
CreateParent bool `json:"createParent"`
// IDs in stash of the items to update.
// If set, names and stash_ids fields will be ignored.
@@ -749,6 +751,7 @@ func (s *Manager) batchTagTagsByIds(ctx context.Context, input StashBoxBatchTagI
if (input.Refresh && hasStashID) || (!input.Refresh && !hasStashID) {
tasks = append(tasks, &stashBoxBatchTagTagTask{
tag: t,
+ createParent: input.CreateParent,
box: box,
excludedFields: input.ExcludeFields,
})
@@ -769,6 +772,7 @@ func (s *Manager) batchTagTagsByNamesOrStashIds(input StashBoxBatchTagInput, box
if len(stashID) > 0 {
tasks = append(tasks, &stashBoxBatchTagTagTask{
stashID: &stashID,
+ createParent: input.CreateParent,
box: box,
excludedFields: input.ExcludeFields,
})
@@ -780,6 +784,7 @@ func (s *Manager) batchTagTagsByNamesOrStashIds(input StashBoxBatchTagInput, box
if len(name) > 0 {
tasks = append(tasks, &stashBoxBatchTagTagTask{
name: &name,
+ createParent: input.CreateParent,
box: box,
excludedFields: input.ExcludeFields,
})
@@ -806,6 +811,7 @@ func (s *Manager) batchTagAllTags(ctx context.Context, input StashBoxBatchTagInp
for _, t := range tags {
tasks = append(tasks, &stashBoxBatchTagTagTask{
tag: t,
+ createParent: input.CreateParent,
box: box,
excludedFields: input.ExcludeFields,
})
diff --git a/internal/manager/scan_stashignore_test.go b/internal/manager/scan_stashignore_test.go
index fafd246e8..2745ff970 100644
--- a/internal/manager/scan_stashignore_test.go
+++ b/internal/manager/scan_stashignore_test.go
@@ -23,8 +23,8 @@ type stashIgnorePathFilter struct {
libraryRoot string
}
-func (f *stashIgnorePathFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
- return f.filter.Accept(ctx, path, info, f.libraryRoot)
+func (f *stashIgnorePathFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
+ return f.filter.Accept(ctx, path, info, f.libraryRoot, zipFilePath)
}
// createTestFileOnDisk creates a file with some content.
@@ -105,7 +105,7 @@ temp/
if err != nil {
t.Fatalf("failed to stat file %s: %v", scenario.path, err)
}
- accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+ accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
if accepted != scenario.accepted {
t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -160,7 +160,7 @@ func TestScannerWithNestedStashIgnore(t *testing.T) {
if err != nil {
t.Fatalf("failed to stat file %s: %v", scenario.path, err)
}
- accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+ accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
if accepted != scenario.accepted {
t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -205,7 +205,7 @@ func TestScannerWithoutStashIgnore(t *testing.T) {
if err != nil {
t.Fatalf("failed to stat file %s: %v", scenario.path, err)
}
- accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+ accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
if accepted != scenario.accepted {
t.Errorf("unexpected accept result for %s: expected %v, got %v",
@@ -258,7 +258,7 @@ func TestScannerWithNegationPattern(t *testing.T) {
if err != nil {
t.Fatalf("failed to stat file %s: %v", scenario.path, err)
}
- accepted := scanner.AcceptEntry(ctx, scenario.path, info)
+ accepted := scanner.AcceptEntry(ctx, scenario.path, info, "")
if accepted != scenario.accepted {
t.Errorf("unexpected accept result for %s: expected %v, got %v",
diff --git a/internal/manager/task/migrate.go b/internal/manager/task/migrate.go
index 95798d301..dd320a83b 100644
--- a/internal/manager/task/migrate.go
+++ b/internal/manager/task/migrate.go
@@ -7,6 +7,8 @@ import (
"os"
"path/filepath"
+ "github.com/stashapp/stash/internal/manager/config"
+ "github.com/stashapp/stash/pkg/fsutil"
"github.com/stashapp/stash/pkg/job"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/sqlite"
@@ -29,6 +31,21 @@ type databaseSchemaInfo struct {
StepsRequired uint
}
+// PreExecute validates the environment before executing the migration.
+// It returns an error if the migration cannot be performed.
+func (s *MigrateJob) PreExecute() error {
+ // ensure backup directory exists and is writable
+ backupDir := s.Config.GetBackupDirectoryPathOrDefault()
+ if backupDir != "" {
+ if err := fsutil.EnsureDir(backupDir); err != nil {
+ logger.Errorf("error ensuring backup directory exists: %s", err)
+ logger.Warnf("Backup directory (%s) must be modified to a valid directory or removed from the config file", config.BackupDirectoryPath)
+ return fmt.Errorf("error creating backup directory: %w", err)
+ }
+ }
+ return nil
+}
+
func (s *MigrateJob) Execute(ctx context.Context, progress *job.Progress) error {
schemaInfo, err := s.required()
if err != nil {
diff --git a/internal/manager/task_clean.go b/internal/manager/task_clean.go
index 9a20b3990..67b7038b6 100644
--- a/internal/manager/task_clean.go
+++ b/internal/manager/task_clean.go
@@ -40,9 +40,10 @@ func (j *cleanJob) Execute(ctx context.Context, progress *job.Progress) error {
}
j.cleaner.Clean(ctx, file.CleanOptions{
- Paths: j.input.Paths,
- DryRun: j.input.DryRun,
- PathFilter: newCleanFilter(instance.Config),
+ Paths: j.input.Paths,
+ DryRun: j.input.DryRun,
+ IgnoreZipFileContents: j.input.IgnoreZipFileContents,
+ PathFilter: newCleanFilter(instance.Config),
}, progress)
if job.IsCancelled(ctx) {
@@ -159,7 +160,7 @@ func newCleanFilter(c *config.Config) *cleanFilter {
}
}
-func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
+func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
// #1102 - clean anything in generated path
generatedPath := f.generatedPath
@@ -184,7 +185,7 @@ func (f *cleanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
}
// Check .stashignore files, bounded to the library root.
- if !f.stashIgnoreFilter.Accept(ctx, path, info, stash.Path) {
+ if !f.stashIgnoreFilter.Accept(ctx, path, info, stash.Path, zipFilePath) {
logger.Infof("%s is excluded due to .stashignore. Marking to clean: %q", fileOrFolder, path)
return false
}
diff --git a/internal/manager/task_scan.go b/internal/manager/task_scan.go
index a006abbf8..155090cd2 100644
--- a/internal/manager/task_scan.go
+++ b/internal/manager/task_scan.go
@@ -171,7 +171,12 @@ func (j *ScanJob) queueFileFunc(ctx context.Context, f models.FS, zipFile *file.
return nil
}
- if !j.scanner.AcceptEntry(ctx, path, info) {
+ zipFilePath := ""
+ if zipFile != nil {
+ zipFilePath = zipFile.Path
+ }
+
+ if !j.scanner.AcceptEntry(ctx, path, info, zipFilePath) {
if info.IsDir() {
logger.Debugf("Skipping directory %s", path)
return fs.SkipDir
@@ -278,8 +283,10 @@ func (j *ScanJob) processQueue(ctx context.Context, parallelTasks int, progress
for f := range j.fileQueue {
logger.Tracef("Processing queued file %s", f.Path)
- if err := ctx.Err(); err != nil {
- return
+ if ctx.Err() != nil {
+ // Keep receiving until queueFiles closes the channel; otherwise
+ // the walker can block on send (full buffer) and never finish.
+ continue
}
wg.Add()
@@ -565,7 +572,7 @@ func newScanFilter(c *config.Config, repo models.Repository, minModTime time.Tim
}
}
-func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo) bool {
+func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
if fsutil.IsPathInDir(f.generatedPath, path) {
logger.Warnf("Skipping %q as it overlaps with the generated folder", path)
return false
@@ -583,7 +590,7 @@ func (f *scanFilter) Accept(ctx context.Context, path string, info fs.FileInfo)
}
// Check .stashignore files, bounded to the library root.
- if !f.stashIgnoreFilter.Accept(ctx, path, info, s.Path) {
+ if !f.stashIgnoreFilter.Accept(ctx, path, info, s.Path, zipFilePath) {
logger.Debugf("Skipping %s due to .stashignore", path)
return false
}
@@ -655,8 +662,9 @@ func getScanHandlers(options ScanMetadataInput, taskQueue *job.TaskQueue, progre
&file.FilteredHandler{
Filter: file.FilterFunc(imageFileFilter),
Handler: &image.ScanHandler{
- CreatorUpdater: r.Image,
- GalleryFinder: r.Gallery,
+ CreatorUpdater: r.Image,
+ GalleryFinder: r.Gallery,
+ SceneFinderUpdater: r.Scene,
ScanGenerator: &imageGenerators{
input: options,
taskQueue: taskQueue,
@@ -685,9 +693,10 @@ func getScanHandlers(options ScanMetadataInput, taskQueue *job.TaskQueue, progre
&file.FilteredHandler{
Filter: file.FilterFunc(videoFileFilter),
Handler: &scene.ScanHandler{
- CreatorUpdater: r.Scene,
- CaptionUpdater: r.File,
- PluginCache: pluginCache,
+ CreatorUpdater: r.Scene,
+ GalleryFinderUpdater: r.Gallery,
+ CaptionUpdater: r.File,
+ PluginCache: pluginCache,
ScanGenerator: &sceneGenerators{
input: options,
taskQueue: taskQueue,
diff --git a/internal/manager/task_stash_box_tag.go b/internal/manager/task_stash_box_tag.go
index 97c766010..264e7e96c 100644
--- a/internal/manager/task_stash_box_tag.go
+++ b/internal/manager/task_stash_box_tag.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"strconv"
+ "strings"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/match"
@@ -541,6 +542,7 @@ type stashBoxBatchTagTagTask struct {
name *string
stashID *string
tag *models.Tag
+ createParent bool
excludedFields []string
}
@@ -588,8 +590,11 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
client := stashbox.NewClient(*t.box, stashbox.ExcludeTagPatterns(instance.Config.GetScraperExcludeTagPatterns()))
+ nameQuery := ""
+
switch {
case t.name != nil:
+ nameQuery = *t.name
results, err = client.QueryTag(ctx, *t.name)
case t.stashID != nil:
results, err = client.QueryTag(ctx, *t.stashID)
@@ -615,6 +620,7 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
if remoteID != "" {
results, err = client.QueryTag(ctx, remoteID)
} else {
+ nameQuery = t.tag.Name
results, err = client.QueryTag(ctx, t.tag.Name)
}
}
@@ -627,10 +633,26 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
return nil, nil
}
- result := results[0]
+ var result *models.ScrapedTag
+
+ // QueryTag returns tags that partially match the name, so find the exact match if searching by name
+ if nameQuery != "" {
+ for _, r := range results {
+ if strings.EqualFold(r.Name, nameQuery) {
+ result = r
+ break
+ }
+ }
+ } else {
+ result = results[0]
+ }
+
+ if result == nil {
+ return nil, nil
+ }
if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
- return match.ScrapedTag(ctx, r.Tag, result, t.box.Endpoint)
+ return match.ScrapedTagHierarchy(ctx, r.Tag, result, t.box.Endpoint)
}); err != nil {
return nil, err
}
@@ -638,6 +660,39 @@ func (t *stashBoxBatchTagTagTask) findStashBoxTag(ctx context.Context) (*models.
return result, nil
}
+func (t *stashBoxBatchTagTagTask) processParentTag(ctx context.Context, parent *models.ScrapedTag, excluded map[string]bool) error {
+ if parent.StoredID == nil {
+ // Create new parent tag
+ newParentTag := parent.ToTag(t.box.Endpoint, excluded)
+
+ r := instance.Repository
+ err := r.WithTxn(ctx, func(ctx context.Context) error {
+ qb := r.Tag
+
+ if err := tag.ValidateCreate(ctx, *newParentTag, qb); err != nil {
+ return err
+ }
+
+ if err := qb.Create(ctx, &models.CreateTagInput{Tag: newParentTag}); err != nil {
+ return err
+ }
+
+ storedID := strconv.Itoa(newParentTag.ID)
+ parent.StoredID = &storedID
+ return nil
+ })
+ if err != nil {
+ logger.Errorf("Failed to create parent tag %s: %v", parent.Name, err)
+ } else {
+ logger.Infof("Created parent tag %s", parent.Name)
+ }
+ return err
+ }
+
+ // Parent already exists — nothing to update for categories
+ return nil
+}
+
func (t *stashBoxBatchTagTagTask) processMatchedTag(ctx context.Context, s *models.ScrapedTag, excluded map[string]bool) {
// Determine the tag ID to update — either from the task's tag or from the
// StoredID set by match.ScrapedTag (when batch adding by name and the tag
@@ -649,6 +704,12 @@ func (t *stashBoxBatchTagTagTask) processMatchedTag(ctx context.Context, s *mode
tagID, _ = strconv.Atoi(*s.StoredID)
}
+ if s.Parent != nil && t.createParent {
+ if err := t.processParentTag(ctx, s.Parent, excluded); err != nil {
+ return
+ }
+ }
+
if tagID > 0 {
r := instance.Repository
err := r.WithTxn(ctx, func(ctx context.Context) error {
diff --git a/pkg/ffmpeg/codec_hardware.go b/pkg/ffmpeg/codec_hardware.go
index aa8c75dcc..66480c5bb 100644
--- a/pkg/ffmpeg/codec_hardware.go
+++ b/pkg/ffmpeg/codec_hardware.go
@@ -185,6 +185,12 @@ func (f *FFMpeg) hwCanFullHWTranscode(ctx context.Context, codec VideoCodec, vf
// Prepend input for hardware encoding only
func (f *FFMpeg) hwDeviceInit(args Args, toCodec VideoCodec, fullhw bool) Args {
+ // check for custom /dev/dri device #6435
+ driDevice := os.Getenv("STASH_HW_DRI_DEVICE")
+ if driDevice == "" {
+ driDevice = "/dev/dri/renderD128"
+ }
+
switch toCodec {
case VideoCodecN264,
VideoCodecN264H:
@@ -201,7 +207,7 @@ func (f *FFMpeg) hwDeviceInit(args Args, toCodec VideoCodec, fullhw bool) Args {
case VideoCodecV264,
VideoCodecVVP9:
args = append(args, "-vaapi_device")
- args = append(args, "/dev/dri/renderD128")
+ args = append(args, driDevice)
if fullhw {
args = append(args, "-hwaccel")
args = append(args, "vaapi")
diff --git a/pkg/file/clean.go b/pkg/file/clean.go
index 53b2e0612..369600f4c 100644
--- a/pkg/file/clean.go
+++ b/pkg/file/clean.go
@@ -33,6 +33,11 @@ type cleanJob struct {
type CleanOptions struct {
Paths []string
+ // IgnoreZipFileContents will skip checking the contents of zip files when determining whether to clean a file.
+ // This can significantly speed up the clean process, but will potentially miss removed files within zip files.
+ // Where users do not modify zip files contents directly, this should be safe to use.
+ IgnoreZipFileContents bool
+
// Do a dry run. Don't delete any files
DryRun bool
@@ -174,13 +179,16 @@ func (j *cleanJob) assessFiles(ctx context.Context, toDelete *deleteSet) error {
more := true
r := j.Repository
+
+ includeZipContents := !j.options.IgnoreZipFileContents
+
if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
for more {
if job.IsCancelled(ctx) {
return nil
}
- files, err := r.File.FindAllInPaths(ctx, j.options.Paths, batchSize, offset)
+ files, err := r.File.FindAllInPaths(ctx, j.options.Paths, includeZipContents, batchSize, offset)
if err != nil {
return fmt.Errorf("error querying for files: %w", err)
}
@@ -258,6 +266,8 @@ func (j *cleanJob) assessFolders(ctx context.Context, toDelete *deleteSet) error
offset := 0
progress := j.progress
+ includeZipContents := !j.options.IgnoreZipFileContents
+
more := true
r := j.Repository
if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
@@ -266,7 +276,7 @@ func (j *cleanJob) assessFolders(ctx context.Context, toDelete *deleteSet) error
return nil
}
- folders, err := r.Folder.FindAllInPaths(ctx, j.options.Paths, batchSize, offset)
+ folders, err := r.Folder.FindAllInPaths(ctx, j.options.Paths, includeZipContents, batchSize, offset)
if err != nil {
return fmt.Errorf("error querying for folders: %w", err)
}
@@ -348,8 +358,14 @@ func (j *cleanJob) shouldClean(ctx context.Context, f models.File) bool {
// run through path filter, if returns false then the file should be cleaned
filter := j.options.PathFilter
+ // need to get the zip file path if present
+ zipFilePath := ""
+ if f.Base().ZipFile != nil {
+ zipFilePath = f.Base().ZipFile.Base().Path
+ }
+
// don't log anything - assume filter will have logged the reason
- return !filter.Accept(ctx, path, info)
+ return !filter.Accept(ctx, path, info, zipFilePath)
}
func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool {
@@ -387,8 +403,14 @@ func (j *cleanJob) shouldCleanFolder(ctx context.Context, f *models.Folder) bool
// run through path filter, if returns false then the file should be cleaned
filter := j.options.PathFilter
+ // need to get the zip file path if present
+ zipFilePath := ""
+ if f.ZipFile != nil {
+ zipFilePath = f.ZipFile.Base().Path
+ }
+
// don't log anything - assume filter will have logged the reason
- return !filter.Accept(ctx, path, info)
+ return !filter.Accept(ctx, path, info, zipFilePath)
}
func (j *cleanJob) deleteFile(ctx context.Context, fileID models.FileID, fn string) {
diff --git a/pkg/file/folder_rename_detect.go b/pkg/file/folder_rename_detect.go
index cfae7e4fb..d45593b28 100644
--- a/pkg/file/folder_rename_detect.go
+++ b/pkg/file/folder_rename_detect.go
@@ -2,7 +2,6 @@ package file
import (
"context"
- "errors"
"fmt"
"io/fs"
@@ -88,6 +87,11 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
r := s.Repository
+ zipFilePath := ""
+ if file.ZipFile != nil {
+ zipFilePath = file.ZipFile.Base().Path
+ }
+
if err := SymWalk(file.FS, file.Path, func(path string, d fs.DirEntry, err error) error {
if err != nil {
// don't let errors prevent scanning
@@ -111,7 +115,7 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
return nil
}
- if !s.AcceptEntry(ctx, path, info) {
+ if !s.AcceptEntry(ctx, path, info, zipFilePath) {
return nil
}
@@ -161,9 +165,7 @@ func (s *Scanner) detectFolderMove(ctx context.Context, file ScannedFile) (*mode
continue
}
- if !errors.Is(err, fs.ErrNotExist) {
- return fmt.Errorf("checking for parent folder %q: %w", pf.Path, err)
- }
+ // treat any error as missing folder
// parent folder is missing, possible candidate
// count the total number of files in the existing folder
diff --git a/pkg/file/handler.go b/pkg/file/handler.go
index 10616eefa..b4056f195 100644
--- a/pkg/file/handler.go
+++ b/pkg/file/handler.go
@@ -9,7 +9,7 @@ import (
// PathFilter provides a filter function for paths.
type PathFilter interface {
- Accept(ctx context.Context, path string, info fs.FileInfo) bool
+ Accept(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool
}
type PathFilterFunc func(path string) bool
diff --git a/pkg/file/scan.go b/pkg/file/scan.go
index 8ff51b359..4cfcaf7ae 100644
--- a/pkg/file/scan.go
+++ b/pkg/file/scan.go
@@ -111,12 +111,12 @@ type ScannedFile struct {
}
// AcceptEntry determines if the file entry should be accepted for scanning
-func (s *Scanner) AcceptEntry(ctx context.Context, path string, info fs.FileInfo) bool {
+func (s *Scanner) AcceptEntry(ctx context.Context, path string, info fs.FileInfo, zipFilePath string) bool {
// always accept if there's no filters
accept := len(s.ScanFilters) == 0
for _, filter := range s.ScanFilters {
// accept if any filter accepts the file
- if filter.Accept(ctx, path, info) {
+ if filter.Accept(ctx, path, info, zipFilePath) {
accept = true
break
}
@@ -462,7 +462,11 @@ func (s *Scanner) onNewFile(ctx context.Context, f ScannedFile) (*ScanFileResult
// determine if the file is renamed from an existing file in the store
// do this after decoration so that missing fields can be populated
- renamed, err := s.handleRename(ctx, file, fp)
+ zipFilePath := ""
+ if f.ZipFile != nil {
+ zipFilePath = f.ZipFile.Base().Path
+ }
+ renamed, err := s.handleRename(ctx, file, fp, zipFilePath)
if err != nil {
return nil, err
}
@@ -572,7 +576,7 @@ func (s *Scanner) getFileFS(f *models.BaseFile) (models.FS, error) {
return fs.OpenZip(zipPath, zipSize)
}
-func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint) (models.File, error) {
+func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.Fingerprint, zipFilePath string) (models.File, error) {
var others []models.File
for _, tfp := range fp {
@@ -614,7 +618,7 @@ func (s *Scanner) handleRename(ctx context.Context, f models.File, fp []models.F
// treat as a move
missing = append(missing, other)
}
- case !s.AcceptEntry(ctx, other.Base().Path, info):
+ case !s.AcceptEntry(ctx, other.Base().Path, info, zipFilePath):
// #4393 - if the file is no longer in the configured library paths, treat it as a move
logger.Debugf("File %q no longer in library paths. Treating as a move.", other.Base().Path)
missing = append(missing, other)
diff --git a/pkg/file/stashignore.go b/pkg/file/stashignore.go
index 160b5c224..681ccf795 100644
--- a/pkg/file/stashignore.go
+++ b/pkg/file/stashignore.go
@@ -53,7 +53,9 @@ func NewStashIgnoreFilter() *StashIgnoreFilter {
// applies gitignore-style pattern matching.
// The libraryRoot parameter bounds the search for .stashignore files -
// only directories within the library root are checked.
-func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.FileInfo, libraryRoot string) bool {
+// zipFilepath is the path of the zip file if the file is inside a zip.
+// .stashignore files will not be read within zip files.
+func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.FileInfo, libraryRoot string, zipFilePath string) bool {
// If no library root provided, accept the file (safety fallback).
if libraryRoot == "" {
return true
@@ -62,6 +64,11 @@ func (f *StashIgnoreFilter) Accept(ctx context.Context, path string, info fs.Fil
// Get the directory containing this path.
dir := filepath.Dir(path)
+ // If the file is inside a zip, use the zip file's directory as the base for .stashignore lookup.
+ if zipFilePath != "" {
+ dir = filepath.Dir(zipFilePath)
+ }
+
// Collect all applicable ignore entries from library root to this directory.
entries := f.collectIgnoreEntries(dir, libraryRoot)
diff --git a/pkg/file/stashignore_test.go b/pkg/file/stashignore_test.go
index 5297f544b..41668b51b 100644
--- a/pkg/file/stashignore_test.go
+++ b/pkg/file/stashignore_test.go
@@ -64,7 +64,7 @@ func walkAndFilter(t *testing.T, root string, filter *StashIgnoreFilter) []strin
return err
}
- if filter.Accept(ctx, path, info, root) {
+ if filter.Accept(ctx, path, info, root, "") {
relPath, _ := filepath.Rel(root, path)
accepted = append(accepted, relPath)
} else if info.IsDir() {
diff --git a/pkg/fsutil/file.go b/pkg/fsutil/file.go
index 1d0c0c473..05a127129 100644
--- a/pkg/fsutil/file.go
+++ b/pkg/fsutil/file.go
@@ -148,7 +148,7 @@ func Touch(path string) error {
var (
replaceCharsRE = regexp.MustCompile(`[&=\\/:*"?_ ]`)
- removeCharsRE = regexp.MustCompile(`[^[:alnum:]-.]`)
+ removeCharsRE = regexp.MustCompile(`[^\p{L}\p{N}\-.]`)
multiHyphenRE = regexp.MustCompile(`\-+`)
)
diff --git a/pkg/fsutil/file_test.go b/pkg/fsutil/file_test.go
index 4d84f8a47..df1077df2 100644
--- a/pkg/fsutil/file_test.go
+++ b/pkg/fsutil/file_test.go
@@ -15,6 +15,9 @@ func TestSanitiseBasename(t *testing.T) {
{"multi-hyphen", `hyphened--name`, "hyphened-name-2da2a58f"},
{"replaced characters", `a&b=c\d/:e*"f?_ g`, "a-b-c-d-e-f-g-ffca6fb0"},
{"removed characters", `foo!!bar@@and, more`, "foobarand-more-7cee02ab"},
+ {"unicode cjk", `テスト`, "テスト-63b560db"},
+ {"unicode korean", `시험`, "시험-3fcc7beb"},
+ {"mixed unicode", `Test テスト`, "Test-テスト-366aff1e"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
diff --git a/pkg/gallery/scan.go b/pkg/gallery/scan.go
index b3e5d2c3c..7689bb9b6 100644
--- a/pkg/gallery/scan.go
+++ b/pkg/gallery/scan.go
@@ -24,7 +24,6 @@ type ScanCreatorUpdater interface {
type ScanSceneFinderUpdater interface {
FindByPath(ctx context.Context, p string) ([]*models.Scene, error)
- Update(ctx context.Context, updatedScene *models.Scene) error
AddGalleryIDs(ctx context.Context, sceneID int, galleryIDs []int) error
}
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
index 99b31f698..682641e66 100644
--- a/pkg/image/scan.go
+++ b/pkg/image/scan.go
@@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"slices"
+ "strings"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
@@ -39,6 +40,11 @@ type GalleryFinderCreator interface {
UpdatePartial(ctx context.Context, id int, updatedGallery models.GalleryPartial) (*models.Gallery, error)
}
+type ScanSceneFinderUpdater interface {
+ FindByPath(ctx context.Context, p string) ([]*models.Scene, error)
+ AddGalleryIDs(ctx context.Context, sceneID int, galleryIDs []int) error
+}
+
type ScanConfig interface {
GetCreateGalleriesFromFolders() bool
}
@@ -48,8 +54,9 @@ type ScanGenerator interface {
}
type ScanHandler struct {
- CreatorUpdater ScanCreatorUpdater
- GalleryFinder GalleryFinderCreator
+ CreatorUpdater ScanCreatorUpdater
+ GalleryFinder GalleryFinderCreator
+ SceneFinderUpdater ScanSceneFinderUpdater
ScanGenerator ScanGenerator
@@ -322,11 +329,39 @@ func (h *ScanHandler) getOrCreateZipBasedGallery(ctx context.Context, zipFile mo
return nil, fmt.Errorf("creating zip-based gallery: %w", err)
}
+ // try to associate with scene
+ if err := h.associateScene(ctx, &newGallery, zipFile); err != nil {
+ return nil, fmt.Errorf("associating scene: %w", err)
+ }
+
h.PluginCache.RegisterPostHooks(ctx, newGallery.ID, hook.GalleryCreatePost, nil, nil)
return &newGallery, nil
}
+func (h *ScanHandler) associateScene(ctx context.Context, existing *models.Gallery, zipFile models.File) error {
+ galleryIDs := []int{existing.ID}
+
+ path := zipFile.Base().Path
+ withoutExt := strings.TrimSuffix(path, filepath.Ext(path)) + ".*"
+
+ // find scenes with a file that matches
+ scenes, err := h.SceneFinderUpdater.FindByPath(ctx, withoutExt)
+ if err != nil {
+ return err
+ }
+
+ for _, scene := range scenes {
+ // found related Scene
+ logger.Infof("associate: Gallery %s is related to scene: %d", path, scene.ID)
+ if err := h.SceneFinderUpdater.AddGalleryIDs(ctx, scene.ID, galleryIDs); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
func (h *ScanHandler) getOrCreateGallery(ctx context.Context, f models.File) (*models.Gallery, error) {
// don't create folder-based galleries for files in zip file
if f.Base().ZipFile != nil {
diff --git a/pkg/job/job.go b/pkg/job/job.go
index 48b5e7b13..835cf18ca 100644
--- a/pkg/job/job.go
+++ b/pkg/job/job.go
@@ -66,6 +66,23 @@ type Job struct {
cancelFunc context.CancelFunc
}
+// statusCopy returns a copy of the Job with only the fields needed for
+// status reporting. Internal fields (exec, cancelFunc, outerCtx) are
+// excluded so that subscription channels don't retain heavy resources.
+func (j *Job) statusCopy() Job {
+ return Job{
+ ID: j.ID,
+ Status: j.Status,
+ Details: j.Details,
+ Description: j.Description,
+ Progress: j.Progress,
+ StartTime: j.StartTime,
+ EndTime: j.EndTime,
+ AddTime: j.AddTime,
+ Error: j.Error,
+ }
+}
+
// TimeElapsed returns the total time elapsed for the job.
// If the EndTime is set, then it uses this to calculate the elapsed time, otherwise it uses time.Now.
func (j *Job) TimeElapsed() time.Duration {
diff --git a/pkg/job/manager.go b/pkg/job/manager.go
index 3e47d842b..ba62d102c 100644
--- a/pkg/job/manager.go
+++ b/pkg/job/manager.go
@@ -105,7 +105,7 @@ func (m *Manager) notifyNewJob(j *Job) {
for _, s := range m.subscriptions {
// don't block if channel is full
select {
- case s.newJob <- *j:
+ case s.newJob <- j.statusCopy():
default:
}
}
@@ -232,7 +232,9 @@ func (m *Manager) removeJob(job *Job) {
return
}
- // clear any subtasks
+ // release the executor and subtask details so they can be GC'd
+ // while the job remains in the graveyard for status reporting
+ job.exec = nil
job.Details = nil
m.queue = append(m.queue[:index], m.queue[index+1:]...)
@@ -246,7 +248,7 @@ func (m *Manager) removeJob(job *Job) {
for _, s := range m.subscriptions {
// don't block if channel is full
select {
- case s.removedJob <- *job:
+ case s.removedJob <- job.statusCopy():
default:
}
}
@@ -310,8 +312,7 @@ func (m *Manager) GetJob(id int) *Job {
// get from the queue or graveyard
_, j := m.getJob(append(m.queue, m.graveyard...), id)
if j != nil {
- // make a copy of the job and return the pointer
- jCopy := *j
+ jCopy := j.statusCopy()
return &jCopy
}
@@ -326,8 +327,7 @@ func (m *Manager) GetQueue() []Job {
var ret []Job
for _, j := range m.queue {
- jCopy := *j
- ret = append(ret, jCopy)
+ ret = append(ret, j.statusCopy())
}
return ret
@@ -372,7 +372,7 @@ func (m *Manager) notifyJobUpdate(j *Job) {
for _, s := range m.subscriptions {
// don't block if channel is full
select {
- case s.updatedJob <- *j:
+ case s.updatedJob <- j.statusCopy():
default:
}
}
diff --git a/pkg/job/task.go b/pkg/job/task.go
index fa0891e6f..6dd2cf02b 100644
--- a/pkg/job/task.go
+++ b/pkg/job/task.go
@@ -51,7 +51,7 @@ func (tq *TaskQueue) executer(ctx context.Context) {
defer tq.wg.Wait()
for task := range tq.tasks {
if IsCancelled(ctx) {
- return
+ continue // allow channel to continue draining until Close()
}
tt := task
diff --git a/pkg/match/scraped.go b/pkg/match/scraped.go
index d3039f4c6..32759a2a4 100644
--- a/pkg/match/scraped.go
+++ b/pkg/match/scraped.go
@@ -22,7 +22,7 @@ type GroupNamesFinder interface {
type SceneRelationships struct {
PerformerFinder PerformerFinder
- TagFinder models.TagQueryer
+ TagFinder models.TagNameFinder
StudioFinder StudioFinder
}
@@ -188,9 +188,23 @@ func ScrapedGroup(ctx context.Context, qb GroupNamesFinder, storedID *string, na
return
}
+// ScrapedTagHierarchy executes ScrapedTag for the provided tag and its parent.
+func ScrapedTagHierarchy(ctx context.Context, qb models.TagNameFinder, s *models.ScrapedTag, stashBoxEndpoint string) error {
+ if err := ScrapedTag(ctx, qb, s, stashBoxEndpoint); err != nil {
+ return err
+ }
+
+ if s.Parent == nil {
+ return nil
+ }
+
+ // Match parent by name only (categories don't have StashDB tag IDs)
+ return ScrapedTag(ctx, qb, s.Parent, "")
+}
+
// ScrapedTag matches the provided tag with the tags
// in the database and sets the ID field if one is found.
-func ScrapedTag(ctx context.Context, qb models.TagQueryer, s *models.ScrapedTag, stashBoxEndpoint string) error {
+func ScrapedTag(ctx context.Context, qb models.TagNameFinder, s *models.ScrapedTag, stashBoxEndpoint string) error {
if s.StoredID != nil {
return nil
}
diff --git a/pkg/models/date.go b/pkg/models/date.go
index dbd5c4ec6..912361507 100644
--- a/pkg/models/date.go
+++ b/pkg/models/date.go
@@ -2,6 +2,7 @@ package models
import (
"fmt"
+ "strings"
"time"
"github.com/stashapp/stash/pkg/utils"
@@ -61,3 +62,114 @@ func ParseDate(s string) (Date, error) {
return Date{}, fmt.Errorf("failed to parse date %q: %v", s, errs)
}
+
+func DateFromYear(year int) Date {
+ return Date{
+ Time: time.Date(year, 1, 1, 0, 0, 0, 0, time.UTC),
+ Precision: DatePrecisionYear,
+ }
+}
+
+func FormatYearRange(start *Date, end *Date) string {
+ var (
+ startStr, endStr string
+ )
+
+ if start != nil {
+ startStr = start.Format(dateFormatPrecision[DatePrecisionYear])
+ }
+
+ if end != nil {
+ endStr = end.Format(dateFormatPrecision[DatePrecisionYear])
+ }
+
+ switch {
+ case startStr == "" && endStr == "":
+ return ""
+ case endStr == "":
+ return fmt.Sprintf("%s -", startStr)
+ case startStr == "":
+ return fmt.Sprintf("- %s", endStr)
+ default:
+ return fmt.Sprintf("%s - %s", startStr, endStr)
+ }
+}
+
+func FormatYearRangeString(start *string, end *string) string {
+ switch {
+ case start == nil && end == nil:
+ return ""
+ case end == nil:
+ return fmt.Sprintf("%s -", *start)
+ case start == nil:
+ return fmt.Sprintf("- %s", *end)
+ default:
+ return fmt.Sprintf("%s - %s", *start, *end)
+ }
+}
+
+// ParseYearRangeString parses a year range string into start and end year integers.
+// Supported formats: "YYYY", "YYYY - YYYY", "YYYY-YYYY", "YYYY -", "- YYYY", "YYYY-present".
+// Returns nil for start/end if not present in the string.
+func ParseYearRangeString(s string) (start *Date, end *Date, err error) {
+ s = strings.TrimSpace(s)
+ if s == "" {
+ return nil, nil, fmt.Errorf("empty year range string")
+ }
+
+ // normalize "present" to empty end
+ lower := strings.ToLower(s)
+ lower = strings.ReplaceAll(lower, "present", "")
+
+ // split on "-" if it contains one
+ var parts []string
+ if strings.Contains(lower, "-") {
+ parts = strings.SplitN(lower, "-", 2)
+ } else {
+ // single value, treat as start year
+ year, err := parseYear(lower)
+ if err != nil {
+ return nil, nil, fmt.Errorf("invalid year range %q: %w", s, err)
+ }
+ return year, nil, nil
+ }
+
+ startStr := strings.TrimSpace(parts[0])
+ endStr := strings.TrimSpace(parts[1])
+
+ if startStr != "" {
+ y, err := parseYear(startStr)
+ if err != nil {
+ return nil, nil, fmt.Errorf("invalid start year in %q: %w", s, err)
+ }
+ start = y
+ }
+
+ if endStr != "" {
+ y, err := parseYear(endStr)
+ if err != nil {
+ return nil, nil, fmt.Errorf("invalid end year in %q: %w", s, err)
+ }
+ end = y
+ }
+
+ if start == nil && end == nil {
+ return nil, nil, fmt.Errorf("could not parse year range %q", s)
+ }
+
+ return start, end, nil
+}
+
+func parseYear(s string) (*Date, error) {
+ ret, err := ParseDate(s)
+ if err != nil {
+ return nil, fmt.Errorf("parsing year %q: %w", s, err)
+ }
+
+ year := ret.Time.Year()
+ if year < 1900 || year > 2200 {
+ return nil, fmt.Errorf("year %d out of reasonable range", year)
+ }
+
+ return &ret, nil
+}
diff --git a/pkg/models/date_test.go b/pkg/models/date_test.go
index b6cca9ee1..3b2962e28 100644
--- a/pkg/models/date_test.go
+++ b/pkg/models/date_test.go
@@ -3,6 +3,8 @@ package models
import (
"testing"
"time"
+
+ "github.com/stretchr/testify/assert"
)
func TestParseDateStringAsTime(t *testing.T) {
@@ -48,3 +50,102 @@ func TestParseDateStringAsTime(t *testing.T) {
})
}
}
+
+func TestFormatYearRange(t *testing.T) {
+ datePtr := func(v int) *Date {
+ date := DateFromYear(v)
+ return &date
+ }
+
+ tests := []struct {
+ name string
+ start *Date
+ end *Date
+ want string
+ }{
+ {"both nil", nil, nil, ""},
+ {"only start", datePtr(2005), nil, "2005 -"},
+ {"only end", nil, datePtr(2010), "- 2010"},
+ {"start and end", datePtr(2005), datePtr(2010), "2005 - 2010"},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got := FormatYearRange(tt.start, tt.end)
+ assert.Equal(t, tt.want, got)
+ })
+ }
+}
+
+func TestFormatYearRangeString(t *testing.T) {
+ stringPtr := func(v string) *string { return &v }
+
+ tests := []struct {
+ name string
+ start *string
+ end *string
+ want string
+ }{
+ {"both nil", nil, nil, ""},
+ {"only start", stringPtr("2005"), nil, "2005 -"},
+ {"only end", nil, stringPtr("2010"), "- 2010"},
+ {"start and end", stringPtr("2005"), stringPtr("2010"), "2005 - 2010"},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got := FormatYearRangeString(tt.start, tt.end)
+ assert.Equal(t, tt.want, got)
+ })
+ }
+}
+
+func TestParseYearRangeString(t *testing.T) {
+ intPtr := func(v int) *int { return &v }
+
+ tests := []struct {
+ name string
+ input string
+ wantStart *int
+ wantEnd *int
+ wantErr bool
+ }{
+ {"single year", "2005", intPtr(2005), nil, false},
+ {"year range with spaces", "2005 - 2010", intPtr(2005), intPtr(2010), false},
+ {"year range no spaces", "2005-2010", intPtr(2005), intPtr(2010), false},
+ {"year dash open", "2005 -", intPtr(2005), nil, false},
+ {"year dash open no space", "2005-", intPtr(2005), nil, false},
+ {"dash year", "- 2010", nil, intPtr(2010), false},
+ {"year present", "2005-present", intPtr(2005), nil, false},
+ {"year Present caps", "2005 - Present", intPtr(2005), nil, false},
+ {"whitespace padding", " 2005 - 2010 ", intPtr(2005), intPtr(2010), false},
+ {"empty string", "", nil, nil, true},
+ {"garbage", "not a year", nil, nil, true},
+ {"partial garbage start", "abc - 2010", nil, nil, true},
+ {"partial garbage end", "2005 - abc", nil, nil, true},
+ {"year out of range", "1800", nil, nil, true},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ start, end, err := ParseYearRangeString(tt.input)
+ if tt.wantErr {
+ assert.Error(t, err)
+ return
+ }
+ assert.NoError(t, err)
+ if tt.wantStart != nil {
+ assert.NotNil(t, start)
+ assert.Equal(t, *tt.wantStart, start.Time.Year())
+ } else {
+ assert.Nil(t, start)
+ }
+ if tt.wantEnd != nil {
+ assert.NotNil(t, end)
+ assert.Equal(t, *tt.wantEnd, end.Time.Year())
+ } else {
+ assert.Nil(t, end)
+ }
+ })
+ }
+}
diff --git a/pkg/models/jsonschema/performer.go b/pkg/models/jsonschema/performer.go
index b738fbfac..1a8acd5f3 100644
--- a/pkg/models/jsonschema/performer.go
+++ b/pkg/models/jsonschema/performer.go
@@ -49,8 +49,8 @@ type Performer struct {
PenisLength float64 `json:"penis_length,omitempty"`
Circumcised string `json:"circumcised,omitempty"`
CareerLength string `json:"career_length,omitempty"` // deprecated - for import only
- CareerStart *int `json:"career_start,omitempty"`
- CareerEnd *int `json:"career_end,omitempty"`
+ CareerStart string `json:"career_start,omitempty"`
+ CareerEnd string `json:"career_end,omitempty"`
Tattoos string `json:"tattoos,omitempty"`
Piercings string `json:"piercings,omitempty"`
Aliases StringOrStringList `json:"aliases,omitempty"`
diff --git a/pkg/models/mocks/FileReaderWriter.go b/pkg/models/mocks/FileReaderWriter.go
index 97a0136e6..4b370459e 100644
--- a/pkg/models/mocks/FileReaderWriter.go
+++ b/pkg/models/mocks/FileReaderWriter.go
@@ -153,13 +153,13 @@ func (_m *FileReaderWriter) FindAllByPath(ctx context.Context, path string, case
return r0, r1
}
-// FindAllInPaths provides a mock function with given fields: ctx, p, limit, offset
-func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, limit int, offset int) ([]models.File, error) {
- ret := _m.Called(ctx, p, limit, offset)
+// FindAllInPaths provides a mock function with given fields: ctx, p, includeZipContents, limit, offset
+func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit int, offset int) ([]models.File, error) {
+ ret := _m.Called(ctx, p, includeZipContents, limit, offset)
var r0 []models.File
- if rf, ok := ret.Get(0).(func(context.Context, []string, int, int) []models.File); ok {
- r0 = rf(ctx, p, limit, offset)
+ if rf, ok := ret.Get(0).(func(context.Context, []string, bool, int, int) []models.File); ok {
+ r0 = rf(ctx, p, includeZipContents, limit, offset)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]models.File)
@@ -167,8 +167,8 @@ func (_m *FileReaderWriter) FindAllInPaths(ctx context.Context, p []string, limi
}
var r1 error
- if rf, ok := ret.Get(1).(func(context.Context, []string, int, int) error); ok {
- r1 = rf(ctx, p, limit, offset)
+ if rf, ok := ret.Get(1).(func(context.Context, []string, bool, int, int) error); ok {
+ r1 = rf(ctx, p, includeZipContents, limit, offset)
} else {
r1 = ret.Error(1)
}
diff --git a/pkg/models/mocks/FolderReaderWriter.go b/pkg/models/mocks/FolderReaderWriter.go
index 5d4d95027..d2230c645 100644
--- a/pkg/models/mocks/FolderReaderWriter.go
+++ b/pkg/models/mocks/FolderReaderWriter.go
@@ -86,13 +86,13 @@ func (_m *FolderReaderWriter) Find(ctx context.Context, id models.FolderID) (*mo
return r0, r1
}
-// FindAllInPaths provides a mock function with given fields: ctx, p, limit, offset
-func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, limit int, offset int) ([]*models.Folder, error) {
- ret := _m.Called(ctx, p, limit, offset)
+// FindAllInPaths provides a mock function with given fields: ctx, p, includeZipContents, limit, offset
+func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit int, offset int) ([]*models.Folder, error) {
+ ret := _m.Called(ctx, p, includeZipContents, limit, offset)
var r0 []*models.Folder
- if rf, ok := ret.Get(0).(func(context.Context, []string, int, int) []*models.Folder); ok {
- r0 = rf(ctx, p, limit, offset)
+ if rf, ok := ret.Get(0).(func(context.Context, []string, bool, int, int) []*models.Folder); ok {
+ r0 = rf(ctx, p, includeZipContents, limit, offset)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*models.Folder)
@@ -100,8 +100,8 @@ func (_m *FolderReaderWriter) FindAllInPaths(ctx context.Context, p []string, li
}
var r1 error
- if rf, ok := ret.Get(1).(func(context.Context, []string, int, int) error); ok {
- r1 = rf(ctx, p, limit, offset)
+ if rf, ok := ret.Get(1).(func(context.Context, []string, bool, int, int) error); ok {
+ r1 = rf(ctx, p, includeZipContents, limit, offset)
} else {
r1 = ret.Error(1)
}
@@ -224,6 +224,29 @@ func (_m *FolderReaderWriter) GetManyParentFolderIDs(ctx context.Context, folder
return r0, r1
}
+// GetManySubFolderIDs provides a mock function with given fields: ctx, folderIDs
+func (_m *FolderReaderWriter) GetManySubFolderIDs(ctx context.Context, folderIDs []models.FolderID) ([][]models.FolderID, error) {
+ ret := _m.Called(ctx, folderIDs)
+
+ var r0 [][]models.FolderID
+ if rf, ok := ret.Get(0).(func(context.Context, []models.FolderID) [][]models.FolderID); ok {
+ r0 = rf(ctx, folderIDs)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([][]models.FolderID)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(context.Context, []models.FolderID) error); ok {
+ r1 = rf(ctx, folderIDs)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// Query provides a mock function with given fields: ctx, options
func (_m *FolderReaderWriter) Query(ctx context.Context, options models.FolderQueryOptions) (*models.FolderQueryResult, error) {
ret := _m.Called(ctx, options)
diff --git a/pkg/models/mocks/GalleryReaderWriter.go b/pkg/models/mocks/GalleryReaderWriter.go
index f20d9f76e..e835ea2bc 100644
--- a/pkg/models/mocks/GalleryReaderWriter.go
+++ b/pkg/models/mocks/GalleryReaderWriter.go
@@ -49,6 +49,20 @@ func (_m *GalleryReaderWriter) AddImages(ctx context.Context, galleryID int, ima
return r0
}
+// AddSceneIDs provides a mock function with given fields: ctx, galleryID, sceneIDs
+func (_m *GalleryReaderWriter) AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error {
+ ret := _m.Called(ctx, galleryID, sceneIDs)
+
+ var r0 error
+ if rf, ok := ret.Get(0).(func(context.Context, int, []int) error); ok {
+ r0 = rf(ctx, galleryID, sceneIDs)
+ } else {
+ r0 = ret.Error(0)
+ }
+
+ return r0
+}
+
// All provides a mock function with given fields: ctx
func (_m *GalleryReaderWriter) All(ctx context.Context) ([]*models.Gallery, error) {
ret := _m.Called(ctx)
diff --git a/pkg/models/mocks/TagReaderWriter.go b/pkg/models/mocks/TagReaderWriter.go
index c4423ee52..194f475c8 100644
--- a/pkg/models/mocks/TagReaderWriter.go
+++ b/pkg/models/mocks/TagReaderWriter.go
@@ -197,6 +197,29 @@ func (_m *TagReaderWriter) FindAllDescendants(ctx context.Context, tagID int, ex
return r0, r1
}
+// FindByAlias provides a mock function with given fields: ctx, alias, nocase
+func (_m *TagReaderWriter) FindByAlias(ctx context.Context, alias string, nocase bool) (*models.Tag, error) {
+ ret := _m.Called(ctx, alias, nocase)
+
+ var r0 *models.Tag
+ if rf, ok := ret.Get(0).(func(context.Context, string, bool) *models.Tag); ok {
+ r0 = rf(ctx, alias, nocase)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).(*models.Tag)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
+ r1 = rf(ctx, alias, nocase)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// FindByChildTagID provides a mock function with given fields: ctx, childID
func (_m *TagReaderWriter) FindByChildTagID(ctx context.Context, childID int) ([]*models.Tag, error) {
ret := _m.Called(ctx, childID)
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index a30eafa0a..7bc3b3174 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -6,26 +6,26 @@ import (
)
type Performer struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Disambiguation string `json:"disambiguation"`
- Gender *GenderEnum `json:"gender"`
- Birthdate *Date `json:"birthdate"`
- Ethnicity string `json:"ethnicity"`
- Country string `json:"country"`
- EyeColor string `json:"eye_color"`
- Height *int `json:"height"`
- Measurements string `json:"measurements"`
- FakeTits string `json:"fake_tits"`
- PenisLength *float64 `json:"penis_length"`
- Circumcised *CircumisedEnum `json:"circumcised"`
- CareerStart *int `json:"career_start"`
- CareerEnd *int `json:"career_end"`
- Tattoos string `json:"tattoos"`
- Piercings string `json:"piercings"`
- Favorite bool `json:"favorite"`
- CreatedAt time.Time `json:"created_at"`
- UpdatedAt time.Time `json:"updated_at"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Disambiguation string `json:"disambiguation"`
+ Gender *GenderEnum `json:"gender"`
+ Birthdate *Date `json:"birthdate"`
+ Ethnicity string `json:"ethnicity"`
+ Country string `json:"country"`
+ EyeColor string `json:"eye_color"`
+ Height *int `json:"height"`
+ Measurements string `json:"measurements"`
+ FakeTits string `json:"fake_tits"`
+ PenisLength *float64 `json:"penis_length"`
+ Circumcised *CircumcisedEnum `json:"circumcised"`
+ CareerStart *Date `json:"career_start"`
+ CareerEnd *Date `json:"career_end"`
+ Tattoos string `json:"tattoos"`
+ Piercings string `json:"piercings"`
+ Favorite bool `json:"favorite"`
+ CreatedAt time.Time `json:"created_at"`
+ UpdatedAt time.Time `json:"updated_at"`
// Rating expressed in 1-100 scale
Rating *int `json:"rating"`
Details string `json:"details"`
@@ -76,8 +76,8 @@ type PerformerPartial struct {
FakeTits OptionalString
PenisLength OptionalFloat64
Circumcised OptionalString
- CareerStart OptionalInt
- CareerEnd OptionalInt
+ CareerStart OptionalDate
+ CareerEnd OptionalDate
Tattoos OptionalString
Piercings OptionalString
Favorite OptionalBool
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index 1367003cb..d20fbd589 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -177,8 +177,8 @@ type ScrapedPerformer struct {
PenisLength *string `json:"penis_length"`
Circumcised *string `json:"circumcised"`
CareerLength *string `json:"career_length"` // deprecated: use CareerStart/CareerEnd
- CareerStart *int `json:"career_start"`
- CareerEnd *int `json:"career_end"`
+ CareerStart *string `json:"career_start"`
+ CareerEnd *string `json:"career_end"`
Tattoos *string `json:"tattoos"`
Piercings *string `json:"piercings"`
Aliases *string `json:"aliases"`
@@ -225,12 +225,16 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
// assume that career length is _not_ populated in favour of start/end
if p.CareerStart != nil && !excluded["career_start"] {
- cs := *p.CareerStart
- ret.CareerStart = &cs
+ date, err := ParseDate(*p.CareerStart)
+ if err == nil {
+ ret.CareerStart = &date
+ }
}
if p.CareerEnd != nil && !excluded["career_end"] {
- ce := *p.CareerEnd
- ret.CareerEnd = &ce
+ date, err := ParseDate(*p.CareerEnd)
+ if err == nil {
+ ret.CareerEnd = &date
+ }
}
if p.Country != nil && !excluded["country"] {
ret.Country = *p.Country
@@ -288,7 +292,7 @@ func (p *ScrapedPerformer) ToPerformer(endpoint string, excluded map[string]bool
}
}
if p.Circumcised != nil && !excluded["circumcised"] {
- v := CircumisedEnum(*p.Circumcised)
+ v := CircumcisedEnum(*p.Circumcised)
if v.IsValid() {
ret.Circumcised = &v
}
@@ -367,13 +371,13 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
}
if p.CareerLength != nil && !excluded["career_length"] {
// parse career_length into career_start/career_end
- start, end, err := utils.ParseYearRangeString(*p.CareerLength)
+ start, end, err := ParseYearRangeString(*p.CareerLength)
if err == nil {
if start != nil {
- ret.CareerStart = NewOptionalInt(*start)
+ ret.CareerStart = NewOptionalDate(*start)
}
if end != nil {
- ret.CareerEnd = NewOptionalInt(*end)
+ ret.CareerEnd = NewOptionalDate(*end)
}
}
}
@@ -471,11 +475,12 @@ func (p *ScrapedPerformer) ToPartial(endpoint string, excluded map[string]bool,
type ScrapedTag struct {
// Set if tag matched
- StoredID *string `json:"stored_id"`
- Name string `json:"name"`
- Description *string `json:"description"`
- AliasList []string `json:"alias_list"`
- RemoteSiteID *string `json:"remote_site_id"`
+ StoredID *string `json:"stored_id"`
+ Name string `json:"name"`
+ Description *string `json:"description"`
+ AliasList []string `json:"alias_list"`
+ RemoteSiteID *string `json:"remote_site_id"`
+ Parent *ScrapedTag `json:"parent"`
}
func (ScrapedTag) IsScrapedContent() {}
@@ -496,6 +501,13 @@ func (t *ScrapedTag) ToTag(endpoint string, excluded map[string]bool) *Tag {
ret.Aliases = NewRelatedStrings(t.AliasList)
}
+ if t.Parent != nil && t.Parent.StoredID != nil {
+ parentID, err := strconv.Atoi(*t.Parent.StoredID)
+ if err == nil && parentID > 0 {
+ ret.ParentIDs = NewRelatedIDs([]int{parentID})
+ }
+ }
+
if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
ret.StashIDs = NewRelatedStashIDs([]StashID{
{
@@ -527,6 +539,16 @@ func (t *ScrapedTag) ToPartial(storedID string, endpoint string, excluded map[st
}
}
+ if t.Parent != nil && t.Parent.StoredID != nil {
+ parentID, err := strconv.Atoi(*t.Parent.StoredID)
+ if err == nil && parentID > 0 {
+ ret.ParentIDs = &UpdateIDs{
+ IDs: []int{parentID},
+ Mode: RelationshipUpdateModeAdd,
+ }
+ }
+ }
+
if t.RemoteSiteID != nil && endpoint != "" && *t.RemoteSiteID != "" {
ret.StashIDs = &UpdateStashIDs{
StashIDs: existingStashIDs,
diff --git a/pkg/models/model_scraped_item_test.go b/pkg/models/model_scraped_item_test.go
index 09d8fbb32..1956d8a0b 100644
--- a/pkg/models/model_scraped_item_test.go
+++ b/pkg/models/model_scraped_item_test.go
@@ -8,8 +8,6 @@ import (
"github.com/stretchr/testify/assert"
)
-func intPtr(i int) *int { return &i }
-
func Test_scrapedToStudioInput(t *testing.T) {
const name = "name"
url := "url"
@@ -186,8 +184,8 @@ func Test_scrapedToPerformerInput(t *testing.T) {
Weight: nextVal(),
Measurements: nextVal(),
FakeTits: nextVal(),
- CareerStart: intPtr(2005),
- CareerEnd: intPtr(2015),
+ CareerStart: dateStrFromInt(2005),
+ CareerEnd: dateStrFromInt(2015),
Tattoos: nextVal(),
Piercings: nextVal(),
Aliases: nextVal(),
@@ -212,8 +210,8 @@ func Test_scrapedToPerformerInput(t *testing.T) {
Weight: nextIntVal(),
Measurements: *nextVal(),
FakeTits: *nextVal(),
- CareerStart: intPtr(2005),
- CareerEnd: intPtr(2015),
+ CareerStart: dateFromInt(2005),
+ CareerEnd: dateFromInt(2015),
Tattoos: *nextVal(), // skip CareerLength counter slot
Piercings: *nextVal(),
Aliases: NewRelatedStrings([]string{*nextVal()}),
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 8de5d94f4..606b87f9f 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -61,49 +61,49 @@ type GenderCriterionInput struct {
Modifier CriterionModifier `json:"modifier"`
}
-type CircumisedEnum string
+type CircumcisedEnum string
const (
- CircumisedEnumCut CircumisedEnum = "CUT"
- CircumisedEnumUncut CircumisedEnum = "UNCUT"
+ CircumcisedEnumCut CircumcisedEnum = "CUT"
+ CircumcisedEnumUncut CircumcisedEnum = "UNCUT"
)
-var AllCircumcisionEnum = []CircumisedEnum{
- CircumisedEnumCut,
- CircumisedEnumUncut,
+var AllCircumcisionEnum = []CircumcisedEnum{
+ CircumcisedEnumCut,
+ CircumcisedEnumUncut,
}
-func (e CircumisedEnum) IsValid() bool {
+func (e CircumcisedEnum) IsValid() bool {
switch e {
- case CircumisedEnumCut, CircumisedEnumUncut:
+ case CircumcisedEnumCut, CircumcisedEnumUncut:
return true
}
return false
}
-func (e CircumisedEnum) String() string {
+func (e CircumcisedEnum) String() string {
return string(e)
}
-func (e *CircumisedEnum) UnmarshalGQL(v interface{}) error {
+func (e *CircumcisedEnum) UnmarshalGQL(v interface{}) error {
str, ok := v.(string)
if !ok {
return fmt.Errorf("enums must be strings")
}
- *e = CircumisedEnum(str)
+ *e = CircumcisedEnum(str)
if !e.IsValid() {
- return fmt.Errorf("%s is not a valid CircumisedEnum", str)
+ return fmt.Errorf("%s is not a valid CircumcisedEnum", str)
}
return nil
}
-func (e CircumisedEnum) MarshalGQL(w io.Writer) {
+func (e CircumcisedEnum) MarshalGQL(w io.Writer) {
fmt.Fprint(w, strconv.Quote(e.String()))
}
type CircumcisionCriterionInput struct {
- Value []CircumisedEnum `json:"value"`
+ Value []CircumcisedEnum `json:"value"`
Modifier CriterionModifier `json:"modifier"`
}
@@ -139,9 +139,9 @@ type PerformerFilterType struct {
// Filter by career length
CareerLength *StringCriterionInput `json:"career_length"` // deprecated
// Filter by career start year
- CareerStart *IntCriterionInput `json:"career_start"`
+ CareerStart *DateCriterionInput `json:"career_start"`
// Filter by career end year
- CareerEnd *IntCriterionInput `json:"career_end"`
+ CareerEnd *DateCriterionInput `json:"career_end"`
// Filter by tattoos
Tattoos *StringCriterionInput `json:"tattoos"`
// Filter by piercings
@@ -216,32 +216,32 @@ type PerformerFilterType struct {
}
type PerformerCreateInput struct {
- Name string `json:"name"`
- Disambiguation *string `json:"disambiguation"`
- URL *string `json:"url"` // deprecated
- Urls []string `json:"urls"`
- Gender *GenderEnum `json:"gender"`
- Birthdate *string `json:"birthdate"`
- Ethnicity *string `json:"ethnicity"`
- Country *string `json:"country"`
- EyeColor *string `json:"eye_color"`
- Height *string `json:"height"`
- HeightCm *int `json:"height_cm"`
- Measurements *string `json:"measurements"`
- FakeTits *string `json:"fake_tits"`
- PenisLength *float64 `json:"penis_length"`
- Circumcised *CircumisedEnum `json:"circumcised"`
- CareerLength *string `json:"career_length"`
- CareerStart *int `json:"career_start"`
- CareerEnd *int `json:"career_end"`
- Tattoos *string `json:"tattoos"`
- Piercings *string `json:"piercings"`
- Aliases *string `json:"aliases"`
- AliasList []string `json:"alias_list"`
- Twitter *string `json:"twitter"` // deprecated
- Instagram *string `json:"instagram"` // deprecated
- Favorite *bool `json:"favorite"`
- TagIds []string `json:"tag_ids"`
+ Name string `json:"name"`
+ Disambiguation *string `json:"disambiguation"`
+ URL *string `json:"url"` // deprecated
+ Urls []string `json:"urls"`
+ Gender *GenderEnum `json:"gender"`
+ Birthdate *string `json:"birthdate"`
+ Ethnicity *string `json:"ethnicity"`
+ Country *string `json:"country"`
+ EyeColor *string `json:"eye_color"`
+ Height *string `json:"height"`
+ HeightCm *int `json:"height_cm"`
+ Measurements *string `json:"measurements"`
+ FakeTits *string `json:"fake_tits"`
+ PenisLength *float64 `json:"penis_length"`
+ Circumcised *CircumcisedEnum `json:"circumcised"`
+ CareerLength *string `json:"career_length"`
+ CareerStart *string `json:"career_start"`
+ CareerEnd *string `json:"career_end"`
+ Tattoos *string `json:"tattoos"`
+ Piercings *string `json:"piercings"`
+ Aliases *string `json:"aliases"`
+ AliasList []string `json:"alias_list"`
+ Twitter *string `json:"twitter"` // deprecated
+ Instagram *string `json:"instagram"` // deprecated
+ Favorite *bool `json:"favorite"`
+ TagIds []string `json:"tag_ids"`
// This should be a URL or a base64 encoded data URL
Image *string `json:"image"`
StashIds []StashIDInput `json:"stash_ids"`
@@ -256,33 +256,33 @@ type PerformerCreateInput struct {
}
type PerformerUpdateInput struct {
- ID string `json:"id"`
- Name *string `json:"name"`
- Disambiguation *string `json:"disambiguation"`
- URL *string `json:"url"` // deprecated
- Urls []string `json:"urls"`
- Gender *GenderEnum `json:"gender"`
- Birthdate *string `json:"birthdate"`
- Ethnicity *string `json:"ethnicity"`
- Country *string `json:"country"`
- EyeColor *string `json:"eye_color"`
- Height *string `json:"height"`
- HeightCm *int `json:"height_cm"`
- Measurements *string `json:"measurements"`
- FakeTits *string `json:"fake_tits"`
- PenisLength *float64 `json:"penis_length"`
- Circumcised *CircumisedEnum `json:"circumcised"`
- CareerLength *string `json:"career_length"`
- CareerStart *int `json:"career_start"`
- CareerEnd *int `json:"career_end"`
- Tattoos *string `json:"tattoos"`
- Piercings *string `json:"piercings"`
- Aliases *string `json:"aliases"`
- AliasList []string `json:"alias_list"`
- Twitter *string `json:"twitter"` // deprecated
- Instagram *string `json:"instagram"` // deprecated
- Favorite *bool `json:"favorite"`
- TagIds []string `json:"tag_ids"`
+ ID string `json:"id"`
+ Name *string `json:"name"`
+ Disambiguation *string `json:"disambiguation"`
+ URL *string `json:"url"` // deprecated
+ Urls []string `json:"urls"`
+ Gender *GenderEnum `json:"gender"`
+ Birthdate *string `json:"birthdate"`
+ Ethnicity *string `json:"ethnicity"`
+ Country *string `json:"country"`
+ EyeColor *string `json:"eye_color"`
+ Height *string `json:"height"`
+ HeightCm *int `json:"height_cm"`
+ Measurements *string `json:"measurements"`
+ FakeTits *string `json:"fake_tits"`
+ PenisLength *float64 `json:"penis_length"`
+ Circumcised *CircumcisedEnum `json:"circumcised"`
+ CareerLength *string `json:"career_length"`
+ CareerStart *string `json:"career_start"`
+ CareerEnd *string `json:"career_end"`
+ Tattoos *string `json:"tattoos"`
+ Piercings *string `json:"piercings"`
+ Aliases *string `json:"aliases"`
+ AliasList []string `json:"alias_list"`
+ Twitter *string `json:"twitter"` // deprecated
+ Instagram *string `json:"instagram"` // deprecated
+ Favorite *bool `json:"favorite"`
+ TagIds []string `json:"tag_ids"`
// This should be a URL or a base64 encoded data URL
Image *string `json:"image"`
StashIds []StashIDInput `json:"stash_ids"`
diff --git a/pkg/models/repository_file.go b/pkg/models/repository_file.go
index c851ce08c..e1ac0b213 100644
--- a/pkg/models/repository_file.go
+++ b/pkg/models/repository_file.go
@@ -14,7 +14,7 @@ type FileGetter interface {
type FileFinder interface {
FileGetter
FindAllByPath(ctx context.Context, path string, caseSensitive bool) ([]File, error)
- FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]File, error)
+ FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]File, error)
FindByPath(ctx context.Context, path string, caseSensitive bool) (File, error)
FindByFingerprint(ctx context.Context, fp Fingerprint) ([]File, error)
FindByZipFileID(ctx context.Context, zipFileID FileID) ([]File, error)
diff --git a/pkg/models/repository_folder.go b/pkg/models/repository_folder.go
index 539d51cb9..1169e53ac 100644
--- a/pkg/models/repository_folder.go
+++ b/pkg/models/repository_folder.go
@@ -11,11 +11,12 @@ type FolderGetter interface {
// FolderFinder provides methods to find folders.
type FolderFinder interface {
FolderGetter
- FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]*Folder, error)
+ FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]*Folder, error)
FindByPath(ctx context.Context, path string, caseSensitive bool) (*Folder, error)
FindByZipFileID(ctx context.Context, zipFileID FileID) ([]*Folder, error)
FindByParentFolderID(ctx context.Context, parentFolderID FolderID) ([]*Folder, error)
GetManyParentFolderIDs(ctx context.Context, folderIDs []FolderID) ([][]FolderID, error)
+ GetManySubFolderIDs(ctx context.Context, folderIDs []FolderID) ([][]FolderID, error)
}
type FolderQueryer interface {
diff --git a/pkg/models/repository_gallery.go b/pkg/models/repository_gallery.go
index b8f1452f3..8fc3b29d5 100644
--- a/pkg/models/repository_gallery.go
+++ b/pkg/models/repository_gallery.go
@@ -83,6 +83,7 @@ type GalleryWriter interface {
CustomFieldsWriter
+ AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error
AddFileID(ctx context.Context, id int, fileID FileID) error
AddImages(ctx context.Context, galleryID int, imageIDs ...int) error
RemoveImages(ctx context.Context, galleryID int, imageIDs ...int) error
diff --git a/pkg/models/repository_tag.go b/pkg/models/repository_tag.go
index 02dfe0cb6..bd2ab2592 100644
--- a/pkg/models/repository_tag.go
+++ b/pkg/models/repository_tag.go
@@ -9,9 +9,16 @@ type TagGetter interface {
Find(ctx context.Context, id int) (*Tag, error)
}
+type TagNameFinder interface {
+ FindByName(ctx context.Context, name string, nocase bool) (*Tag, error)
+ FindByNames(ctx context.Context, names []string, nocase bool) ([]*Tag, error)
+ FindByAlias(ctx context.Context, alias string, nocase bool) (*Tag, error)
+}
+
// TagFinder provides methods to find tags.
type TagFinder interface {
TagGetter
+ TagNameFinder
FindAllAncestors(ctx context.Context, tagID int, excludeIDs []int) ([]*TagPath, error)
FindAllDescendants(ctx context.Context, tagID int, excludeIDs []int) ([]*TagPath, error)
FindByParentTagID(ctx context.Context, parentID int) ([]*Tag, error)
@@ -23,8 +30,6 @@ type TagFinder interface {
FindByGroupID(ctx context.Context, groupID int) ([]*Tag, error)
FindBySceneMarkerID(ctx context.Context, sceneMarkerID int) ([]*Tag, error)
FindByStudioID(ctx context.Context, studioID int) ([]*Tag, error)
- FindByName(ctx context.Context, name string, nocase bool) (*Tag, error)
- FindByNames(ctx context.Context, names []string, nocase bool) ([]*Tag, error)
FindByStashID(ctx context.Context, stashID StashID) ([]*Tag, error)
FindByStashIDStatus(ctx context.Context, hasStashID bool, stashboxEndpoint string) ([]*Tag, error)
}
diff --git a/pkg/performer/export.go b/pkg/performer/export.go
index 691175b1f..d7807f651 100644
--- a/pkg/performer/export.go
+++ b/pkg/performer/export.go
@@ -71,10 +71,10 @@ func ToJSON(ctx context.Context, reader ImageAliasStashIDGetter, performer *mode
}
if performer.CareerStart != nil {
- newPerformerJSON.CareerStart = performer.CareerStart
+ newPerformerJSON.CareerStart = performer.CareerStart.String()
}
if performer.CareerEnd != nil {
- newPerformerJSON.CareerEnd = performer.CareerEnd
+ newPerformerJSON.CareerEnd = performer.CareerEnd.String()
}
if err := performer.LoadAliases(ctx, reader); err != nil {
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index 1a87bc2b1..2cf476321 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -48,10 +48,10 @@ var (
rating = 5
height = 123
weight = 60
- careerStart = 2005
- careerEnd = 2015
+ careerStart, _ = models.ParseDate("2005")
+ careerEnd, _ = models.ParseDate("2015")
penisLength = 1.23
- circumcisedEnum = models.CircumisedEnumCut
+ circumcisedEnum = models.CircumcisedEnumCut
circumcised = circumcisedEnum.String()
emptyCustomFields = make(map[string]interface{})
@@ -134,8 +134,8 @@ func createFullJSONPerformer(name string, image string, withCustomFields bool) *
URLs: []string{url, twitter, instagram},
Aliases: aliases,
Birthdate: birthDate.String(),
- CareerStart: &careerStart,
- CareerEnd: &careerEnd,
+ CareerStart: careerStart.String(),
+ CareerEnd: careerEnd.String(),
Country: country,
Ethnicity: ethnicity,
EyeColor: eyeColor,
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 1df69521a..62b4d87d0 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -247,7 +247,7 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) (models.Perfor
}
if performerJSON.Circumcised != "" {
- v := models.CircumisedEnum(performerJSON.Circumcised)
+ v := models.CircumcisedEnum(performerJSON.Circumcised)
newPerformer.Circumcised = &v
}
@@ -285,11 +285,17 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) (models.Perfor
}
// prefer explicit career_start/career_end, fall back to parsing legacy career_length
- if performerJSON.CareerStart != nil || performerJSON.CareerEnd != nil {
- newPerformer.CareerStart = performerJSON.CareerStart
- newPerformer.CareerEnd = performerJSON.CareerEnd
+ if performerJSON.CareerStart != "" || performerJSON.CareerEnd != "" {
+ careerStart, err := models.ParseDate(performerJSON.CareerStart)
+ if err == nil {
+ newPerformer.CareerStart = &careerStart
+ }
+ careerEnd, err := models.ParseDate(performerJSON.CareerEnd)
+ if err == nil {
+ newPerformer.CareerEnd = &careerEnd
+ }
} else if performerJSON.CareerLength != "" {
- start, end, err := utils.ParseYearRangeString(performerJSON.CareerLength)
+ start, end, err := models.ParseYearRangeString(performerJSON.CareerLength)
if err != nil {
return models.Performer{}, fmt.Errorf("invalid career_length %q: %w", performerJSON.CareerLength, err)
}
diff --git a/pkg/performer/import_test.go b/pkg/performer/import_test.go
index ca28c1990..0d5f80d01 100644
--- a/pkg/performer/import_test.go
+++ b/pkg/performer/import_test.go
@@ -317,15 +317,15 @@ func TestUpdate(t *testing.T) {
}
func TestImportCareerFields(t *testing.T) {
- startYear := 2005
- endYear := 2015
+ startYear, _ := models.ParseDate("2005")
+ endYear, _ := models.ParseDate("2015")
// explicit career_start/career_end should be used directly
t.Run("explicit fields", func(t *testing.T) {
input := jsonschema.Performer{
Name: "test",
- CareerStart: &startYear,
- CareerEnd: &endYear,
+ CareerStart: startYear.String(),
+ CareerEnd: endYear.String(),
}
p, err := performerJSONToPerformer(input)
@@ -338,8 +338,8 @@ func TestImportCareerFields(t *testing.T) {
t.Run("explicit fields override legacy", func(t *testing.T) {
input := jsonschema.Performer{
Name: "test",
- CareerStart: &startYear,
- CareerEnd: &endYear,
+ CareerStart: startYear.String(),
+ CareerEnd: endYear.String(),
CareerLength: "1990 - 1995",
}
diff --git a/pkg/pkg/cache.go b/pkg/pkg/cache.go
index 9d36bdd1d..e94b2cb41 100644
--- a/pkg/pkg/cache.go
+++ b/pkg/pkg/cache.go
@@ -1,6 +1,7 @@
package pkg
import (
+ "sync"
"time"
)
@@ -10,22 +11,23 @@ type cacheEntry struct {
}
type repositoryCache struct {
+ mu sync.RWMutex
// cache maps the URL to the last modified time and the data
cache map[string]cacheEntry
}
-func (c *repositoryCache) ensureCache() {
- if c.cache == nil {
- c.cache = make(map[string]cacheEntry)
- }
-}
-
func (c *repositoryCache) lastModified(url string) *time.Time {
if c == nil {
return nil
}
- c.ensureCache()
+ c.mu.RLock()
+ defer c.mu.RUnlock()
+
+ if c.cache == nil {
+ return nil
+ }
+
e, found := c.cache[url]
if !found {
@@ -36,7 +38,13 @@ func (c *repositoryCache) lastModified(url string) *time.Time {
}
func (c *repositoryCache) getPackageList(url string) []RemotePackage {
- c.ensureCache()
+ c.mu.RLock()
+ defer c.mu.RUnlock()
+
+ if c.cache == nil {
+ return nil
+ }
+
e, found := c.cache[url]
if !found {
@@ -51,7 +59,13 @@ func (c *repositoryCache) cacheList(url string, lastModified time.Time, data []R
return
}
- c.ensureCache()
+ c.mu.Lock()
+ defer c.mu.Unlock()
+
+ if c.cache == nil {
+ c.cache = make(map[string]cacheEntry)
+ }
+
c.cache[url] = cacheEntry{
lastModified: lastModified,
data: data,
diff --git a/pkg/pkg/manager.go b/pkg/pkg/manager.go
index 18fa4e0d1..4024191ad 100644
--- a/pkg/pkg/manager.go
+++ b/pkg/pkg/manager.go
@@ -10,6 +10,7 @@ import (
"net/http"
"net/url"
"path/filepath"
+ "sync"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
@@ -31,13 +32,14 @@ type Manager struct {
Client *http.Client
- cache *repositoryCache
+ cacheOnce sync.Once
+ cache *repositoryCache
}
func (m *Manager) getCache() *repositoryCache {
- if m.cache == nil {
+ m.cacheOnce.Do(func() {
m.cache = &repositoryCache{}
- }
+ })
return m.cache
}
diff --git a/pkg/scene/filename_parser.go b/pkg/scene/filename_parser.go
index b8dff89d7..1ce6e7b4a 100644
--- a/pkg/scene/filename_parser.go
+++ b/pkg/scene/filename_parser.go
@@ -456,7 +456,7 @@ type FilenameParserRepository struct {
Performer PerformerNamesFinder
Studio models.StudioQueryer
Group GroupNameFinder
- Tag models.TagQueryer
+ Tag models.TagNameFinder
}
func NewFilenameParserRepository(repo models.Repository) FilenameParserRepository {
@@ -599,7 +599,7 @@ func (p *FilenameParser) queryGroup(ctx context.Context, qb GroupNameFinder, gro
return ret
}
-func (p *FilenameParser) queryTag(ctx context.Context, qb models.TagQueryer, tagName string) *models.Tag {
+func (p *FilenameParser) queryTag(ctx context.Context, qb models.TagNameFinder, tagName string) *models.Tag {
// massage the tag name
tagName = delimiterRE.ReplaceAllString(tagName, " ")
@@ -638,7 +638,7 @@ func (p *FilenameParser) setPerformers(ctx context.Context, qb PerformerNamesFin
}
}
-func (p *FilenameParser) setTags(ctx context.Context, qb models.TagQueryer, h sceneHolder, result *models.SceneParserResult) {
+func (p *FilenameParser) setTags(ctx context.Context, qb models.TagNameFinder, h sceneHolder, result *models.SceneParserResult) {
// query for each performer
tagsSet := make(map[int]bool)
for _, tagName := range h.tags {
diff --git a/pkg/scene/scan.go b/pkg/scene/scan.go
index c70c44a9e..c9cc2c567 100644
--- a/pkg/scene/scan.go
+++ b/pkg/scene/scan.go
@@ -4,6 +4,8 @@ import (
"context"
"errors"
"fmt"
+ "path/filepath"
+ "strings"
"github.com/stashapp/stash/pkg/file/video"
"github.com/stashapp/stash/pkg/logger"
@@ -32,12 +34,18 @@ type ScanCreatorUpdater interface {
AddFileID(ctx context.Context, id int, fileID models.FileID) error
}
+type ScanGalleryFinderUpdater interface {
+ FindByPath(ctx context.Context, p string) ([]*models.Gallery, error)
+ AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error
+}
+
type ScanGenerator interface {
Generate(ctx context.Context, s *models.Scene, f *models.VideoFile) error
}
type ScanHandler struct {
- CreatorUpdater ScanCreatorUpdater
+ CreatorUpdater ScanCreatorUpdater
+ GalleryFinderUpdater ScanGalleryFinderUpdater
ScanGenerator ScanGenerator
CaptionUpdater video.CaptionUpdater
@@ -127,6 +135,10 @@ func (h *ScanHandler) Handle(ctx context.Context, f models.File, oldFile models.
}
}
+ if err := h.associateGallery(ctx, existing, f); err != nil {
+ return err
+ }
+
// do this after the commit so that cover generation doesn't hold up the transaction
txn.AddPostCommitHook(ctx, func(ctx context.Context) {
for _, s := range existing {
@@ -175,3 +187,29 @@ func (h *ScanHandler) associateExisting(ctx context.Context, existing []*models.
return nil
}
+
+func (h *ScanHandler) associateGallery(ctx context.Context, existing []*models.Scene, f models.File) error {
+ sceneIDs := make([]int, len(existing))
+ for i, s := range existing {
+ sceneIDs[i] = s.ID
+ }
+
+ path := f.Base().Path
+ zipPath := strings.TrimSuffix(path, filepath.Ext(path)) + ".zip"
+
+ // find galleries with a file that matches
+ galleries, err := h.GalleryFinderUpdater.FindByPath(ctx, zipPath)
+ if err != nil {
+ return err
+ }
+
+ for _, gallery := range galleries {
+ // found related Scene
+ logger.Infof("associate: Scene %s is related to gallery: %d", path, gallery.ID)
+ if err := h.GalleryFinderUpdater.AddSceneIDs(ctx, gallery.ID, sceneIDs); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/scraper/cache.go b/pkg/scraper/cache.go
index 6aeb95fcf..83a590b3e 100644
--- a/pkg/scraper/cache.go
+++ b/pkg/scraper/cache.go
@@ -70,6 +70,7 @@ type StudioFinder interface {
type TagFinder interface {
models.TagGetter
+ models.TagNameFinder
models.TagAutoTagQueryer
}
diff --git a/pkg/scraper/mapped_result.go b/pkg/scraper/mapped_result.go
index 1260f3082..64cc97ec7 100644
--- a/pkg/scraper/mapped_result.go
+++ b/pkg/scraper/mapped_result.go
@@ -140,8 +140,8 @@ func (r mappedResult) scrapedPerformer() *models.ScrapedPerformer {
PenisLength: r.stringPtr("PenisLength"),
Circumcised: r.stringPtr("Circumcised"),
CareerLength: r.stringPtr("CareerLength"),
- CareerStart: r.IntPtr("CareerStart"),
- CareerEnd: r.IntPtr("CareerEnd"),
+ CareerStart: r.stringPtr("CareerStart"),
+ CareerEnd: r.stringPtr("CareerEnd"),
Tattoos: r.stringPtr("Tattoos"),
Piercings: r.stringPtr("Piercings"),
Aliases: r.stringPtr("Aliases"),
diff --git a/pkg/scraper/performer.go b/pkg/scraper/performer.go
index 4684a6683..e05240453 100644
--- a/pkg/scraper/performer.go
+++ b/pkg/scraper/performer.go
@@ -20,8 +20,8 @@ type ScrapedPerformerInput struct {
PenisLength *string `json:"penis_length"`
Circumcised *string `json:"circumcised"`
CareerLength *string `json:"career_length"`
- CareerStart *int `json:"career_start"`
- CareerEnd *int `json:"career_end"`
+ CareerStart *string `json:"career_start"`
+ CareerEnd *string `json:"career_end"`
Tattoos *string `json:"tattoos"`
Piercings *string `json:"piercings"`
Aliases *string `json:"aliases"`
diff --git a/pkg/scraper/post_processing_test.go b/pkg/scraper/post_processing_test.go
new file mode 100644
index 000000000..2eb9385e1
--- /dev/null
+++ b/pkg/scraper/post_processing_test.go
@@ -0,0 +1,144 @@
+package scraper
+
+import (
+ "context"
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+)
+
+func TestPostScrapePerformerCareerLength(t *testing.T) {
+ ctx := context.Background()
+ const related = false
+
+ strPtr := func(s string) *string {
+ return &s
+ }
+
+ tests := []struct {
+ name string
+ input models.ScrapedPerformer
+ want models.ScrapedPerformer
+ }{
+ {
+ "start = 2000",
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ },
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ CareerLength: strPtr("2000 -"),
+ },
+ },
+ {
+ "end = 2000",
+ models.ScrapedPerformer{
+ CareerEnd: strPtr("2000"),
+ },
+ models.ScrapedPerformer{
+ CareerEnd: strPtr("2000"),
+ CareerLength: strPtr("- 2000"),
+ },
+ },
+ {
+ "start = 2000, end = 2020",
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ CareerEnd: strPtr("2020"),
+ },
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ CareerEnd: strPtr("2020"),
+ CareerLength: strPtr("2000 - 2020"),
+ },
+ },
+ {
+ "length = 2000 -",
+ models.ScrapedPerformer{
+ CareerLength: strPtr("2000 -"),
+ },
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ CareerLength: strPtr("2000 -"),
+ },
+ },
+ {
+ "length = - 2010",
+ models.ScrapedPerformer{
+ CareerLength: strPtr("- 2010"),
+ },
+ models.ScrapedPerformer{
+ CareerEnd: strPtr("2010"),
+ CareerLength: strPtr("- 2010"),
+ },
+ },
+ {
+ "length = 2000 - 2010",
+ models.ScrapedPerformer{
+ CareerLength: strPtr("2000 - 2010"),
+ },
+ models.ScrapedPerformer{
+ CareerStart: strPtr("2000"),
+ CareerEnd: strPtr("2010"),
+ CareerLength: strPtr("2000 - 2010"),
+ },
+ },
+ {
+ "invalid start",
+ models.ScrapedPerformer{
+ CareerStart: strPtr("two thousand"),
+ },
+ models.ScrapedPerformer{
+ CareerStart: strPtr("two thousand"),
+ },
+ },
+ {
+ "invalid end",
+ models.ScrapedPerformer{
+ CareerEnd: strPtr("two thousand"),
+ },
+ models.ScrapedPerformer{
+ CareerEnd: strPtr("two thousand"),
+ },
+ },
+ {
+ "invalid career length",
+ models.ScrapedPerformer{
+ CareerLength: strPtr("1234 - 4567 - 9224"),
+ },
+ models.ScrapedPerformer{
+ CareerLength: strPtr("1234 - 4567 - 9224"),
+ },
+ },
+ }
+
+ compareStrPtr := func(a, b *string) bool {
+ if a == b {
+ return true
+ }
+ if a == nil || b == nil {
+ return false
+ }
+ return *a == *b
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ c := &postScraper{}
+ got, err := c.postScrapePerformer(ctx, tt.input, related)
+ if err != nil {
+ t.Fatalf("postScrapePerformer returned error: %v", err)
+ }
+ postScraped := got.(models.ScrapedPerformer)
+ if !compareStrPtr(postScraped.CareerStart, tt.want.CareerStart) {
+ t.Errorf("CareerStart = %v, want %v", postScraped.CareerStart, tt.want.CareerStart)
+ }
+ if !compareStrPtr(postScraped.CareerEnd, tt.want.CareerEnd) {
+ t.Errorf("CareerEnd = %v, want %v", postScraped.CareerEnd, tt.want.CareerEnd)
+ }
+ if !compareStrPtr(postScraped.CareerLength, tt.want.CareerLength) {
+ t.Errorf("CareerLength = %v, want %v", postScraped.CareerLength, tt.want.CareerLength)
+ }
+ })
+ }
+}
diff --git a/pkg/scraper/postprocessing.go b/pkg/scraper/postprocessing.go
index 8a4d4de7d..4b8f7e022 100644
--- a/pkg/scraper/postprocessing.go
+++ b/pkg/scraper/postprocessing.go
@@ -125,23 +125,64 @@ func (c *postScraper) postScrapePerformer(ctx context.Context, p models.ScrapedP
}
}
- isEmptyStr := func(s *string) bool { return s == nil || *s == "" }
- isEmptyInt := func(s *int) bool { return s == nil || *s == 0 }
-
- // populate career start/end from career length and vice versa
- if !isEmptyStr(p.CareerLength) && isEmptyInt(p.CareerStart) && isEmptyInt(p.CareerEnd) {
- p.CareerStart, p.CareerEnd, err = utils.ParseYearRangeString(*p.CareerLength)
- if err != nil {
- logger.Warnf("Could not parse career length %s: %v", *p.CareerLength, err)
- }
- } else if isEmptyStr(p.CareerLength) && (!isEmptyInt(p.CareerStart) || !isEmptyInt(p.CareerEnd)) {
- v := utils.FormatYearRange(p.CareerStart, p.CareerEnd)
- p.CareerLength = &v
- }
+ c.postProcessCareerLength(&p)
return p, nil
}
+func (c *postScraper) postProcessCareerLength(p *models.ScrapedPerformer) {
+ isEmptyStr := func(s *string) bool { return s == nil || *s == "" }
+
+ // populate career start/end from career length and vice versa
+ if !isEmptyStr(p.CareerLength) && isEmptyStr(p.CareerStart) && isEmptyStr(p.CareerEnd) {
+ start, end, err := models.ParseYearRangeString(*p.CareerLength)
+ if err != nil {
+ logger.Warnf("Could not parse career length %s: %v", *p.CareerLength, err)
+ return
+ }
+
+ if start != nil {
+ startStr := start.String()
+ p.CareerStart = &startStr
+ }
+ if end != nil {
+ endStr := end.String()
+ p.CareerEnd = &endStr
+ }
+
+ return
+ }
+
+ // populate career length from career start/end if career length is missing
+ if isEmptyStr(p.CareerLength) {
+ var (
+ start *models.Date
+ end *models.Date
+ )
+
+ if !isEmptyStr(p.CareerStart) {
+ date, err := models.ParseDate(*p.CareerStart)
+ if err != nil {
+ logger.Warnf("Could not parse career start %s: %v", *p.CareerStart, err)
+ return
+ }
+ start = &date
+ }
+
+ if !isEmptyStr(p.CareerEnd) {
+ date, err := models.ParseDate(*p.CareerEnd)
+ if err != nil {
+ logger.Warnf("Could not parse career end %s: %v", *p.CareerEnd, err)
+ return
+ }
+ end = &date
+ }
+
+ v := models.FormatYearRange(start, end)
+ p.CareerLength = &v
+ }
+}
+
func (c *postScraper) postScrapeMovie(ctx context.Context, m models.ScrapedMovie, related bool) (_ ScrapedContent, err error) {
r := c.repository
tqb := r.TagFinder
diff --git a/pkg/scraper/query_url.go b/pkg/scraper/query_url.go
index 2cd9f683e..7fe874947 100644
--- a/pkg/scraper/query_url.go
+++ b/pkg/scraper/query_url.go
@@ -17,6 +17,12 @@ func queryURLParametersFromScene(scene *models.Scene) queryURLParameters {
ret["oshash"] = scene.OSHash
ret["filename"] = filepath.Base(scene.Path)
+ // pull phash from primary file
+ phashFingerprints := scene.Files.Primary().Base().Fingerprints.Filter(models.FingerprintTypePhash)
+ if len(phashFingerprints) > 0 {
+ ret["phash"] = phashFingerprints[0].Value()
+ }
+
if scene.Title != "" {
ret["title"] = scene.Title
}
diff --git a/pkg/scraper/tag.go b/pkg/scraper/tag.go
index 14f02e397..c9c2530de 100644
--- a/pkg/scraper/tag.go
+++ b/pkg/scraper/tag.go
@@ -11,7 +11,7 @@ import (
"github.com/stashapp/stash/pkg/sliceutil"
)
-func postProcessTags(ctx context.Context, tqb models.TagQueryer, scrapedTags []*models.ScrapedTag) (ret []*models.ScrapedTag, err error) {
+func postProcessTags(ctx context.Context, tqb models.TagNameFinder, scrapedTags []*models.ScrapedTag) (ret []*models.ScrapedTag, err error) {
ret = make([]*models.ScrapedTag, 0, len(scrapedTags))
for _, t := range scrapedTags {
diff --git a/pkg/sqlite/custom_fields.go b/pkg/sqlite/custom_fields.go
index d78e3f9ab..22dbbfeb2 100644
--- a/pkg/sqlite/custom_fields.go
+++ b/pkg/sqlite/custom_fields.go
@@ -261,8 +261,8 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
h.innerJoin(f, joinAs, cc.Field)
f.addWhere(fmt.Sprintf("%[1]s.value IN %s", joinAs, getInBinding(len(cv))), cv...)
case models.CriterionModifierNotEquals:
- h.innerJoin(f, joinAs, cc.Field)
- f.addWhere(fmt.Sprintf("%[1]s.value NOT IN %s", joinAs, getInBinding(len(cv))), cv...)
+ h.leftJoin(f, joinAs, cc.Field)
+ f.addWhere(fmt.Sprintf("(%[1]s.value NOT IN %s OR %[1]s.value IS NULL)", joinAs, getInBinding(len(cv))), cv...)
case models.CriterionModifierIncludes:
clauses := make([]sqlClause, len(cv))
for i, v := range cv {
@@ -272,7 +272,7 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
f.whereClauses = append(f.whereClauses, clauses...)
case models.CriterionModifierExcludes:
for _, v := range cv {
- f.addWhere(fmt.Sprintf("%[1]s.value NOT LIKE ?", joinAs), fmt.Sprintf("%%%v%%", v))
+ f.addWhere(fmt.Sprintf("(%[1]s.value NOT LIKE ? OR %[1]s.value IS NULL)", joinAs), fmt.Sprintf("%%%v%%", v))
}
h.leftJoin(f, joinAs, cc.Field)
case models.CriterionModifierMatchesRegex:
@@ -315,8 +315,8 @@ func (h *customFieldsFilterHandler) handleCriterion(f *filterBuilder, joinAs str
h.innerJoin(f, joinAs, cc.Field)
f.addWhere(fmt.Sprintf("%s.value BETWEEN ? AND ?", joinAs), cv[0], cv[1])
case models.CriterionModifierNotBetween:
- h.innerJoin(f, joinAs, cc.Field)
- f.addWhere(fmt.Sprintf("%s.value NOT BETWEEN ? AND ?", joinAs), cv[0], cv[1])
+ h.leftJoin(f, joinAs, cc.Field)
+ f.addWhere(fmt.Sprintf("(%s.value NOT BETWEEN ? AND ? OR %[1]s.value IS NULL)", joinAs), cv[0], cv[1])
case models.CriterionModifierLessThan:
if len(cv) != 1 {
f.setError(fmt.Errorf("expected 1 value for custom field criterion modifier LESS_THAN, got %d", len(cv)))
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index f8c2cdef7..7c383dc4c 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -34,7 +34,7 @@ const (
cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE"
)
-var appSchemaVersion uint = 84
+var appSchemaVersion uint = 85
//go:embed migrations/*.sql
var migrationsBox embed.FS
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index ba925a448..b8e807e37 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -695,7 +695,7 @@ func (qb *FileStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.SelectD
// FindAllByPaths returns the all files that are within any of the given paths.
// Returns all if limit is < 0.
// Returns all files if p is empty.
-func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]models.File, error) {
+func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]models.File, error) {
table := qb.table()
folderTable := folderTableMgr.table
@@ -706,6 +706,10 @@ func (qb *FileStore) FindAllInPaths(ctx context.Context, p []string, limit, offs
q = qb.allInPaths(q, p)
+ if !includeZipContents {
+ q = q.Where(table.Col("zip_file_id").IsNull())
+ }
+
if limit > -1 {
q = q.Limit(uint(limit))
}
diff --git a/pkg/sqlite/file_filter.go b/pkg/sqlite/file_filter.go
index 157efb1d8..29946a8ce 100644
--- a/pkg/sqlite/file_filter.go
+++ b/pkg/sqlite/file_filter.go
@@ -238,22 +238,32 @@ func (qb *fileFilterHandler) hashesCriterionHandler(hashes []*models.Fingerprint
t := fmt.Sprintf("file_fingerprints_%d", i)
f.addLeftJoin(fingerprintTable, t, fmt.Sprintf("files.id = %s.file_id AND %s.type = ?", t, t), hash.Type)
- value, _ := utils.StringToPhash(hash.Value)
distance := 0
if hash.Distance != nil {
distance = *hash.Distance
}
- if distance > 0 {
- // needed to avoid a type mismatch
- f.addWhere(fmt.Sprintf("typeof(%s.fingerprint) = 'integer'", t))
- f.addWhere(fmt.Sprintf("phash_distance(%s.fingerprint, ?) < ?", t), value, distance)
+ // Only phash supports distance matching and is stored as integer
+ if hash.Type == models.FingerprintTypePhash {
+ value, err := utils.StringToPhash(hash.Value)
+ if err != nil {
+ f.setError(fmt.Errorf("invalid phash value: %w", err))
+ return
+ }
+ if distance > 0 {
+ // needed to avoid a type mismatch
+ f.addWhere(fmt.Sprintf("typeof(%s.fingerprint) = 'integer'", t))
+ f.addWhere(fmt.Sprintf("phash_distance(%s.fingerprint, ?) < ?", t), value, distance)
+ } else {
+ intCriterionHandler(&models.IntCriterionInput{
+ Value: int(value),
+ Modifier: models.CriterionModifierEquals,
+ }, t+".fingerprint", nil)(ctx, f)
+ }
} else {
- // use the default handler
- intCriterionHandler(&models.IntCriterionInput{
- Value: int(value),
- Modifier: models.CriterionModifierEquals,
- }, t+".fingerprint", nil)(ctx, f)
+ // All other fingerprint types (md5, oshash, sha1, etc.) are stored as strings
+ // Use exact match for string-based fingerprints
+ f.addWhere(fmt.Sprintf("%s.fingerprint = ?", t), hash.Value)
}
}
}
diff --git a/pkg/sqlite/file_filter_test.go b/pkg/sqlite/file_filter_test.go
index 50eed0129..648e502f7 100644
--- a/pkg/sqlite/file_filter_test.go
+++ b/pkg/sqlite/file_filter_test.go
@@ -9,6 +9,7 @@ import (
"testing"
"github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/utils"
"github.com/stretchr/testify/assert"
)
@@ -81,7 +82,45 @@ func TestFileQuery(t *testing.T) {
includeIDs: []models.FileID{fileIDs[fileIdxInZip]},
excludeIdxs: []int{fileIdxStartImageFiles},
},
- // TODO - add more tests for other file filters
+ {
+ name: "hashes md5",
+ filter: &models.FileFilterType{
+ Hashes: []*models.FingerprintFilterInput{
+ {
+ Type: models.FingerprintTypeMD5,
+ Value: getPrefixedStringValue("file", fileIdxStartVideoFiles, "md5"),
+ },
+ },
+ },
+ includeIdxs: []int{fileIdxStartVideoFiles},
+ excludeIdxs: []int{fileIdxStartImageFiles},
+ },
+ {
+ name: "hashes oshash",
+ filter: &models.FileFilterType{
+ Hashes: []*models.FingerprintFilterInput{
+ {
+ Type: models.FingerprintTypeOshash,
+ Value: getPrefixedStringValue("file", fileIdxStartVideoFiles, "oshash"),
+ },
+ },
+ },
+ includeIdxs: []int{fileIdxStartVideoFiles},
+ excludeIdxs: []int{fileIdxStartImageFiles},
+ },
+ {
+ name: "hashes phash",
+ filter: &models.FileFilterType{
+ Hashes: []*models.FingerprintFilterInput{
+ {
+ Type: models.FingerprintTypePhash,
+ Value: utils.PhashToString(getFilePhash(fileIdxStartImageFiles)),
+ },
+ },
+ },
+ includeIdxs: []int{fileIdxStartImageFiles},
+ excludeIdxs: []int{fileIdxStartVideoFiles},
+ },
}
for _, tt := range tests {
diff --git a/pkg/sqlite/file_test.go b/pkg/sqlite/file_test.go
index 8422390c0..55c41f4f7 100644
--- a/pkg/sqlite/file_test.go
+++ b/pkg/sqlite/file_test.go
@@ -572,7 +572,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
{
"by MD5",
models.Fingerprint{
- Type: "MD5",
+ Type: models.FingerprintTypeMD5,
Fingerprint: getPrefixedStringValue("file", fileIdxZip, "md5"),
},
[]models.File{makeFileWithID(fileIdxZip)},
@@ -581,7 +581,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
{
"by OSHASH",
models.Fingerprint{
- Type: "OSHASH",
+ Type: models.FingerprintTypeOshash,
Fingerprint: getPrefixedStringValue("file", fileIdxZip, "oshash"),
},
[]models.File{makeFileWithID(fileIdxZip)},
@@ -590,7 +590,7 @@ func TestFileStore_FindByFingerprint(t *testing.T) {
{
"non-existing",
models.Fingerprint{
- Type: "OSHASH",
+ Type: models.FingerprintTypeOshash,
Fingerprint: "foo",
},
nil,
diff --git a/pkg/sqlite/folder.go b/pkg/sqlite/folder.go
index 549b40d31..6cd1e0ade 100644
--- a/pkg/sqlite/folder.go
+++ b/pkg/sqlite/folder.go
@@ -409,6 +409,42 @@ func (qb *FolderStore) GetManyParentFolderIDs(ctx context.Context, folderIDs []m
return ret, nil
}
+func (qb *FolderStore) GetManySubFolderIDs(ctx context.Context, parentFolderIDs []models.FolderID) ([][]models.FolderID, error) {
+ table := qb.table()
+ q := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("parent_folder_id"),
+ ).Where(qb.table().Col("parent_folder_id").In(parentFolderIDs))
+
+ sql, args, err := q.ToSQL()
+ if err != nil {
+ return nil, fmt.Errorf("building query: %w", err)
+ }
+
+ var results []struct {
+ FolderID int `db:"id"`
+ ParentFolderID models.FolderID `db:"parent_folder_id"`
+ }
+
+ if err := querySelect(ctx, sql, args, &results); err != nil {
+ return nil, fmt.Errorf("getting folders by parent folder ids %v: %w", parentFolderIDs, err)
+ }
+
+ retMap := make(map[models.FolderID][]models.FolderID)
+
+ for _, v := range results {
+ retMap[v.ParentFolderID] = append(retMap[v.ParentFolderID], models.FolderID(v.FolderID))
+ }
+
+ ret := make([][]models.FolderID, len(parentFolderIDs))
+
+ for i, parentID := range parentFolderIDs {
+ ret[i] = retMap[parentID]
+ }
+
+ return ret, nil
+}
+
func (qb *FolderStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.SelectDataset {
table := qb.table()
@@ -427,10 +463,14 @@ func (qb *FolderStore) allInPaths(q *goqu.SelectDataset, p []string) *goqu.Selec
// FindAllInPaths returns the all folders that are or are within any of the given paths.
// Returns all if limit is < 0.
// Returns all folders if p is empty.
-func (qb *FolderStore) FindAllInPaths(ctx context.Context, p []string, limit, offset int) ([]*models.Folder, error) {
+func (qb *FolderStore) FindAllInPaths(ctx context.Context, p []string, includeZipContents bool, limit, offset int) ([]*models.Folder, error) {
q := qb.selectDataset().Prepared(true)
q = qb.allInPaths(q, p)
+ if !includeZipContents {
+ q = q.Where(qb.table().Col("zip_file_id").IsNull())
+ }
+
if limit > -1 {
q = q.Limit(uint(limit))
}
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 305b1fe09..ad7a94b04 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -926,3 +926,7 @@ func (qb *GalleryStore) ResetCover(ctx context.Context, galleryID int) error {
func (qb *GalleryStore) GetSceneIDs(ctx context.Context, id int) ([]int, error) {
return galleryRepository.scenes.getIDs(ctx, id)
}
+
+func (qb *GalleryStore) AddSceneIDs(ctx context.Context, galleryID int, sceneIDs []int) error {
+ return galleriesScenesTableMgr.insertJoins(ctx, galleryID, sceneIDs)
+}
diff --git a/pkg/sqlite/gallery_filter.go b/pkg/sqlite/gallery_filter.go
index 28f3b8fac..0435f3f57 100644
--- a/pkg/sqlite/gallery_filter.go
+++ b/pkg/sqlite/gallery_filter.go
@@ -285,7 +285,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
return
}
- galleryRepository.addFoldersTable(f)
+ galleryRepository.addFilesTable(f)
f.addLeftJoin(folderTable, "gallery_folder", "galleries.folder_id = gallery_folder.id")
criterion := *folder
@@ -320,7 +320,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
}
// combine clauses with OR to handle zip file or folder
- c1 := makeClause(fmt.Sprintf("folders.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
+ c1 := makeClause(fmt.Sprintf("files.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
c2 := makeClause(fmt.Sprintf("gallery_folder.parent_folder_id IN (SELECT column2 FROM (%s))", valuesClause))
f.whereClauses = append(f.whereClauses, orClauses(c1, c2))
}
@@ -332,7 +332,7 @@ func (qb *galleryFilterHandler) parentFolderCriterionHandler(folder *models.Hier
return
}
- f.addWhere(fmt.Sprintf("folders.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR folders.parent_folder_id IS NULL", valuesClause))
+ f.addWhere(fmt.Sprintf("files.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR folders.parent_folder_id IS NULL", valuesClause))
f.addWhere(fmt.Sprintf("gallery_folder.parent_folder_id NOT IN (SELECT column2 FROM (%s)) OR gallery_folder.parent_folder_id IS NULL", valuesClause))
}
}
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index b92a1c073..e0ac576d8 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -837,7 +837,7 @@ func (qb *ImageStore) makeQuery(ctx context.Context, imageFilter *models.ImageFi
)
filepathColumn := "folders.path || '" + string(filepath.Separator) + "' || files.basename"
- searchColumns := []string{"images.title", filepathColumn, "files_fingerprints.fingerprint"}
+ searchColumns := []string{"images.title", "images.details", filepathColumn, "files_fingerprints.fingerprint"}
query.parseQueryString(searchColumns, *q)
}
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index 3bad40b3b..85337c911 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -1596,6 +1596,20 @@ func TestImageQueryQ(t *testing.T) {
})
}
+func TestImageQueryQ_Details(t *testing.T) {
+ withTxn(func(ctx context.Context) error {
+ const imageIdx = 3
+
+ q := getImageStringValue(imageIdx, detailsField)
+
+ sqb := db.Image
+
+ imageQueryQ(ctx, t, sqb, q, imageIdx)
+
+ return nil
+ })
+}
+
func queryImagesWithCount(ctx context.Context, sqb models.ImageReader, imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
result, err := sqb.Query(ctx, models.ImageQueryOptions{
QueryOptions: models.QueryOptions{
diff --git a/pkg/sqlite/migrations/78_postmigrate.go b/pkg/sqlite/migrations/78_postmigrate.go
index 15d040457..34dbe6eb3 100644
--- a/pkg/sqlite/migrations/78_postmigrate.go
+++ b/pkg/sqlite/migrations/78_postmigrate.go
@@ -7,8 +7,8 @@ import (
"github.com/jmoiron/sqlx"
"github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/sqlite"
- "github.com/stashapp/stash/pkg/utils"
)
type schema78Migrator struct {
@@ -76,7 +76,7 @@ func (m *schema78Migrator) migrateCareerLength(ctx context.Context) error {
lastID = id
gotSome = true
- start, end, err := utils.ParseYearRangeString(careerLength)
+ start, end, err := models.ParseYearRangeString(careerLength)
if err != nil {
logger.Warnf("Could not parse career_length %q for performer %d: %v — preserving as custom field", careerLength, id, err)
@@ -107,10 +107,23 @@ func (m *schema78Migrator) migrateCareerLength(ctx context.Context) error {
return nil
}
-func (m *schema78Migrator) updateCareerFields(tx *sqlx.Tx, id int, start *int, end *int) error {
+func (m *schema78Migrator) updateCareerFields(tx *sqlx.Tx, id int, start *models.Date, end *models.Date) error {
+ var (
+ startYear, endYear *int
+ )
+
+ if start != nil {
+ year := start.Year()
+ startYear = &year
+ }
+ if end != nil {
+ year := end.Year()
+ endYear = &year
+ }
+
_, err := tx.Exec(
"UPDATE performers SET career_start = ?, career_end = ? WHERE id = ?",
- start, end, id,
+ startYear, endYear, id,
)
return err
}
diff --git a/pkg/sqlite/migrations/84_postmigrate.go b/pkg/sqlite/migrations/84_migrate.go
similarity index 63%
rename from pkg/sqlite/migrations/84_postmigrate.go
rename to pkg/sqlite/migrations/84_migrate.go
index 3be0dd22e..4e4276782 100644
--- a/pkg/sqlite/migrations/84_postmigrate.go
+++ b/pkg/sqlite/migrations/84_migrate.go
@@ -16,8 +16,8 @@ import (
"gopkg.in/guregu/null.v4"
)
-func post84(ctx context.Context, db *sqlx.DB) error {
- logger.Info("Running post-migration for schema version 84")
+func pre84(ctx context.Context, db *sqlx.DB) error {
+ logger.Info("Running pre-migration for schema version 84")
m := schema84Migrator{
migrator: migrator{
@@ -36,6 +36,23 @@ func post84(ctx context.Context, db *sqlx.DB) error {
return fmt.Errorf("fixing incorrect parent folders: %w", err)
}
+ if err := m.deduplicateFolders(ctx); err != nil {
+ return fmt.Errorf("deduplicating folders: %w", err)
+ }
+
+ return nil
+}
+
+func post84(ctx context.Context, db *sqlx.DB) error {
+ logger.Info("Running post-migration for schema version 84")
+
+ m := schema84Migrator{
+ migrator: migrator{
+ db: db,
+ },
+ folderCache: make(map[string]folderInfo),
+ }
+
if err := m.migrateFolders(ctx); err != nil {
return fmt.Errorf("migrating folders: %w", err)
}
@@ -188,7 +205,7 @@ func (m *schema84Migrator) getOrCreateFolderHierarchy(tx *sqlx.Tx, path string,
logger.Debugf("%s doesn't exist. Creating new folder entry...", path)
// we need to set basename to path, which will be addressed in the next step
- const insertSQL = "INSERT INTO `folders` (`path`,`basename`,`parent_folder_id`,`mod_time`,`created_at`,`updated_at`) VALUES (?,?,?,?,?,?)"
+ const insertSQL = "INSERT INTO `folders` (`path`,`parent_folder_id`,`mod_time`,`created_at`,`updated_at`) VALUES (?,?,?,?,?)"
var parentFolderID null.Int
if parentID != nil {
@@ -196,7 +213,7 @@ func (m *schema84Migrator) getOrCreateFolderHierarchy(tx *sqlx.Tx, path string,
}
now := time.Now()
- result, err := tx.Exec(insertSQL, path, path, parentFolderID, time.Time{}, now, now)
+ result, err := tx.Exec(insertSQL, path, parentFolderID, time.Time{}, now, now)
if err != nil {
return nil, fmt.Errorf("creating folder %s: %w", path, err)
}
@@ -264,11 +281,6 @@ func (m *schema84Migrator) fixIncorrectParents(ctx context.Context, rootPaths []
continue
}
- if !logged {
- logger.Info("Fixing folders with incorrect parent folder assignments...")
- logged = true
- }
-
correctParentID, err := m.getOrCreateFolderHierarchy(tx, expectedParent, rootPaths)
if err != nil {
return fmt.Errorf("error getting/creating correct parent for folder %d %q: %w", id, p, err)
@@ -278,6 +290,11 @@ func (m *schema84Migrator) fixIncorrectParents(ctx context.Context, rootPaths []
continue
}
+ if !logged {
+ logger.Info("Fixing folders with incorrect parent folder assignments...")
+ logged = true
+ }
+
logger.Debugf("Fixing folder %d %q: changing parent_folder_id from %d to %d", id, p, parentFolderID, *correctParentID)
_, err = tx.Exec("UPDATE `folders` SET `parent_folder_id` = ? WHERE `id` = ?", *correctParentID, id)
@@ -309,6 +326,136 @@ func (m *schema84Migrator) fixIncorrectParents(ctx context.Context, rootPaths []
return nil
}
+// deduplicateFolders finds folders that would have the same (parent_folder_id, basename) after
+// migrateFolders sets basename = filepath.Base(path), and merges the duplicates.
+// This can happen when the database contains entries for the same physical folder with different
+// path representations (e.g., mixed separators like "\data/movies" vs "\data\movies" on Windows).
+func (m *schema84Migrator) deduplicateFolders(ctx context.Context) error {
+ for {
+ n, err := m.deduplicateFoldersPass(ctx)
+ if err != nil {
+ return err
+ }
+ // repeat until no more duplicates are found, since merging child folders
+ // from a duplicate parent into the canonical parent may create new conflicts
+ if n == 0 {
+ break
+ }
+ }
+ return nil
+}
+
+func (m *schema84Migrator) deduplicateFoldersPass(ctx context.Context) (int, error) {
+ type folderRow struct {
+ ID int `db:"id"`
+ Path string `db:"path"`
+ ParentFolderID int `db:"parent_folder_id"`
+ }
+
+ var folders []folderRow
+ if err := m.db.SelectContext(ctx, &folders,
+ "SELECT id, path, parent_folder_id FROM folders WHERE parent_folder_id IS NOT NULL ORDER BY id"); err != nil {
+ return 0, fmt.Errorf("loading folders: %w", err)
+ }
+
+ // group by (parent_folder_id, computed basename)
+ type groupKey struct {
+ parentID int
+ basename string
+ }
+ groups := make(map[groupKey][]folderRow)
+ for _, f := range folders {
+ key := groupKey{
+ parentID: f.ParentFolderID,
+ basename: filepath.Base(f.Path),
+ }
+ groups[key] = append(groups[key], f)
+ }
+
+ deduped := 0
+ for _, group := range groups {
+ if len(group) <= 1 {
+ continue
+ }
+
+ if deduped == 0 {
+ logger.Info("Deduplicating folders with conflicting basenames...")
+ }
+
+ // prefer the folder whose path is already normalized for the current OS,
+ // falling back to the newest entry (highest ID) since it's most likely
+ // from the current filesystem
+ keep := group[len(group)-1]
+ for _, f := range group {
+ if f.Path == filepath.Clean(f.Path) {
+ keep = f
+ break
+ }
+ }
+
+ for _, dup := range group {
+ if dup.ID == keep.ID {
+ continue
+ }
+
+ logger.Infof("Merging duplicate folder %d %q into folder %d %q", dup.ID, dup.Path, keep.ID, keep.Path)
+
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ return m.mergeFolder(tx, keep.ID, dup.ID)
+ }); err != nil {
+ return 0, fmt.Errorf("merging folder %d into %d: %w", dup.ID, keep.ID, err)
+ }
+
+ deduped++
+ }
+ }
+
+ if deduped > 0 {
+ logger.Infof("Deduplicated %d folder entries", deduped)
+ }
+
+ return deduped, nil
+}
+
+func (m *schema84Migrator) mergeFolder(tx *sqlx.Tx, keepID, dupID int) error {
+ // Re-parent child folders from the duplicate to the canonical folder.
+ // At this point basenames are still full paths (unique), so this won't cause
+ // UNIQUE constraint violations on (parent_folder_id, basename).
+ if _, err := tx.Exec("UPDATE folders SET parent_folder_id = ? WHERE parent_folder_id = ?", keepID, dupID); err != nil {
+ return fmt.Errorf("re-parenting child folders: %w", err)
+ }
+
+ // re-parent any files under the duplicate folder to the canonical folder.
+ if _, err := tx.Exec("UPDATE files SET parent_folder_id = ? WHERE parent_folder_id = ?", keepID, dupID); err != nil {
+ return fmt.Errorf("re-parenting files: %w", err)
+ }
+
+ // delete the duplicate folder entry only if it is not referenced by any galleries
+ var count int
+ if err := tx.Get(&count, "SELECT COUNT(*) FROM galleries WHERE folder_id = ?", dupID); err != nil {
+ return fmt.Errorf("checking for gallery references: %w", err)
+ }
+
+ if count > 0 {
+ logger.Warnf("Duplicate folder %d is still referenced by %d galleries. Orphaning instead of deleting.", dupID, count)
+
+ // Orphan the stale duplicate folder by clearing its parent so the UNIQUE
+ // constraint on (parent_folder_id, basename) won't be violated when
+ // migrateFolders sets basenames. Any stale file entries under it are left
+ // untouched — the clean task will handle them on the next scan.
+ if _, err := tx.Exec("UPDATE folders SET parent_folder_id = NULL WHERE id = ?", dupID); err != nil {
+ return fmt.Errorf("orphaning duplicate folder: %w", err)
+ }
+ } else {
+ // delete the duplicate folder entry
+ if _, err := tx.Exec("DELETE FROM folders WHERE id = ?", dupID); err != nil {
+ return fmt.Errorf("deleting duplicate folder: %w", err)
+ }
+ }
+
+ return nil
+}
+
func (m *schema84Migrator) migrateFolders(ctx context.Context) error {
const (
limit = 1000
@@ -381,5 +528,6 @@ func (m *schema84Migrator) migrateFolders(ctx context.Context) error {
}
func init() {
+ sqlite.RegisterPreMigration(84, pre84)
sqlite.RegisterPostMigration(84, post84)
}
diff --git a/pkg/sqlite/migrations/85_performer_career_dates.up.sql b/pkg/sqlite/migrations/85_performer_career_dates.up.sql
new file mode 100644
index 000000000..1ce1cc97e
--- /dev/null
+++ b/pkg/sqlite/migrations/85_performer_career_dates.up.sql
@@ -0,0 +1,112 @@
+-- have to change the type of the career start/end columns so need to recreate the table
+PRAGMA foreign_keys=OFF;
+
+CREATE TABLE IF NOT EXISTS "performers_new" (
+ `id` integer not null primary key autoincrement,
+ `name` varchar(255) not null,
+ `disambiguation` varchar(255),
+ `gender` varchar(20),
+ `birthdate` date,
+ `birthdate_precision` TINYINT,
+ `ethnicity` varchar(255),
+ `country` varchar(255),
+ `eye_color` varchar(255),
+ `height` int,
+ `measurements` varchar(255),
+ `fake_tits` varchar(255),
+ `tattoos` varchar(255),
+ `piercings` varchar(255),
+ `favorite` boolean not null default '0',
+ `created_at` datetime not null,
+ `updated_at` datetime not null,
+ `details` text,
+ `death_date` date,
+ `death_date_precision` TINYINT,
+ `hair_color` varchar(255),
+ `weight` integer,
+ `rating` tinyint,
+ `ignore_auto_tag` boolean not null default '0',
+ `penis_length` float,
+ `circumcised` varchar[10],
+ `career_start` date,
+ `career_start_precision` TINYINT,
+ `career_end` date,
+ `career_end_precision` TINYINT,
+ `image_blob` varchar(255) REFERENCES `blobs`(`checksum`)
+);
+
+INSERT INTO `performers_new` (
+ `id`,
+ `name`,
+ `disambiguation`,
+ `gender`,
+ `birthdate`,
+ `ethnicity`,
+ `country`,
+ `eye_color`,
+ `height`,
+ `measurements`,
+ `fake_tits`,
+ `tattoos`,
+ `piercings`,
+ `favorite`,
+ `created_at`,
+ `updated_at`,
+ `details`,
+ `death_date`,
+ `hair_color`,
+ `weight`,
+ `rating`,
+ `ignore_auto_tag`,
+ `image_blob`,
+ `penis_length`,
+ `circumcised`,
+ `birthdate_precision`,
+ `death_date_precision`,
+ `career_start`,
+ `career_end`
+) SELECT
+ `id`,
+ `name`,
+ `disambiguation`,
+ `gender`,
+ `birthdate`,
+ `ethnicity`,
+ `country`,
+ `eye_color`,
+ `height`,
+ `measurements`,
+ `fake_tits`,
+ `tattoos`,
+ `piercings`,
+ `favorite`,
+ `created_at`,
+ `updated_at`,
+ `details`,
+ `death_date`,
+ `hair_color`,
+ `weight`,
+ `rating`,
+ `ignore_auto_tag`,
+ `image_blob`,
+ `penis_length`,
+ `circumcised`,
+ `birthdate_precision`,
+ `death_date_precision`,
+ CAST(`career_start` AS TEXT),
+ CAST(`career_end` AS TEXT)
+FROM `performers`;
+
+DROP INDEX IF EXISTS `performers_name_disambiguation_unique`;
+DROP INDEX IF EXISTS `performers_name_unique`;
+DROP TABLE `performers`;
+
+ALTER TABLE `performers_new` RENAME TO `performers`;
+
+UPDATE "performers" SET `career_start` = CONCAT(`career_start`, '-01-01'), "career_start_precision" = 2 WHERE "career_start" IS NOT NULL;
+UPDATE "performers" SET `career_end` = CONCAT(`career_end`, '-01-01'), "career_end_precision" = 2 WHERE "career_end" IS NOT NULL;
+
+CREATE UNIQUE INDEX `performers_name_disambiguation_unique` on `performers` (`name`, `disambiguation`) WHERE `disambiguation` IS NOT NULL;
+CREATE UNIQUE INDEX `performers_name_unique` on `performers` (`name`) WHERE `disambiguation` IS NULL;
+
+PRAGMA foreign_keys=ON;
\ No newline at end of file
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 298a681fd..aacd9172f 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -30,27 +30,29 @@ const (
)
type performerRow struct {
- ID int `db:"id" goqu:"skipinsert"`
- Name null.String `db:"name"` // TODO: make schema non-nullable
- Disambigation zero.String `db:"disambiguation"`
- Gender zero.String `db:"gender"`
- Birthdate NullDate `db:"birthdate"`
- BirthdatePrecision null.Int `db:"birthdate_precision"`
- Ethnicity zero.String `db:"ethnicity"`
- Country zero.String `db:"country"`
- EyeColor zero.String `db:"eye_color"`
- Height null.Int `db:"height"`
- Measurements zero.String `db:"measurements"`
- FakeTits zero.String `db:"fake_tits"`
- PenisLength null.Float `db:"penis_length"`
- Circumcised zero.String `db:"circumcised"`
- CareerStart null.Int `db:"career_start"`
- CareerEnd null.Int `db:"career_end"`
- Tattoos zero.String `db:"tattoos"`
- Piercings zero.String `db:"piercings"`
- Favorite bool `db:"favorite"`
- CreatedAt Timestamp `db:"created_at"`
- UpdatedAt Timestamp `db:"updated_at"`
+ ID int `db:"id" goqu:"skipinsert"`
+ Name null.String `db:"name"` // TODO: make schema non-nullable
+ Disambigation zero.String `db:"disambiguation"`
+ Gender zero.String `db:"gender"`
+ Birthdate NullDate `db:"birthdate"`
+ BirthdatePrecision null.Int `db:"birthdate_precision"`
+ Ethnicity zero.String `db:"ethnicity"`
+ Country zero.String `db:"country"`
+ EyeColor zero.String `db:"eye_color"`
+ Height null.Int `db:"height"`
+ Measurements zero.String `db:"measurements"`
+ FakeTits zero.String `db:"fake_tits"`
+ PenisLength null.Float `db:"penis_length"`
+ Circumcised zero.String `db:"circumcised"`
+ CareerStart NullDate `db:"career_start"`
+ CareerStartPrecision null.Int `db:"career_start_precision"`
+ CareerEnd NullDate `db:"career_end"`
+ CareerEndPrecision null.Int `db:"career_end_precision"`
+ Tattoos zero.String `db:"tattoos"`
+ Piercings zero.String `db:"piercings"`
+ Favorite bool `db:"favorite"`
+ CreatedAt Timestamp `db:"created_at"`
+ UpdatedAt Timestamp `db:"updated_at"`
// expressed as 1-100
Rating null.Int `db:"rating"`
Details zero.String `db:"details"`
@@ -83,8 +85,10 @@ func (r *performerRow) fromPerformer(o models.Performer) {
if o.Circumcised != nil && o.Circumcised.IsValid() {
r.Circumcised = zero.StringFrom(o.Circumcised.String())
}
- r.CareerStart = intFromPtr(o.CareerStart)
- r.CareerEnd = intFromPtr(o.CareerEnd)
+ r.CareerStart = NullDateFromDatePtr(o.CareerStart)
+ r.CareerStartPrecision = datePrecisionFromDatePtr(o.CareerStart)
+ r.CareerEnd = NullDateFromDatePtr(o.CareerEnd)
+ r.CareerEndPrecision = datePrecisionFromDatePtr(o.CareerEnd)
r.Tattoos = zero.StringFrom(o.Tattoos)
r.Piercings = zero.StringFrom(o.Piercings)
r.Favorite = o.Favorite
@@ -112,8 +116,8 @@ func (r *performerRow) resolve() *models.Performer {
Measurements: r.Measurements.String,
FakeTits: r.FakeTits.String,
PenisLength: nullFloatPtr(r.PenisLength),
- CareerStart: nullIntPtr(r.CareerStart),
- CareerEnd: nullIntPtr(r.CareerEnd),
+ CareerStart: r.CareerStart.DatePtr(r.CareerStartPrecision),
+ CareerEnd: r.CareerEnd.DatePtr(r.CareerEndPrecision),
Tattoos: r.Tattoos.String,
Piercings: r.Piercings.String,
Favorite: r.Favorite,
@@ -134,7 +138,7 @@ func (r *performerRow) resolve() *models.Performer {
}
if r.Circumcised.ValueOrZero() != "" {
- v := models.CircumisedEnum(r.Circumcised.String)
+ v := models.CircumcisedEnum(r.Circumcised.String)
ret.Circumcised = &v
}
@@ -158,8 +162,8 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
r.setNullString("fake_tits", o.FakeTits)
r.setNullFloat64("penis_length", o.PenisLength)
r.setNullString("circumcised", o.Circumcised)
- r.setNullInt("career_start", o.CareerStart)
- r.setNullInt("career_end", o.CareerEnd)
+ r.setNullDate("career_start", "career_start_precision", o.CareerStart)
+ r.setNullDate("career_end", "career_end_precision", o.CareerEnd)
r.setNullString("tattoos", o.Tattoos)
r.setNullString("piercings", o.Piercings)
r.setBool("favorite", o.Favorite)
@@ -778,6 +782,28 @@ func (qb *PerformerStore) sortByScenesDuration(direction string) string {
return " ORDER BY (" + selectPerformerScenesDurationSQL + ") " + direction
}
+// used for sorting by total scene file size
+var selectPerformerScenesSizeSQL = utils.StrFormat(
+ "SELECT COALESCE(SUM({files}.size), 0) FROM {performers_scenes} s "+
+ "LEFT JOIN {scenes} ON {scenes}.id = s.{scene_id} "+
+ "LEFT JOIN {scenes_files} ON {scenes_files}.{scene_id} = {scenes}.id "+
+ "LEFT JOIN {files} ON {files}.id = {scenes_files}.file_id "+
+ "WHERE s.{performer_id} = {performers}.id",
+ map[string]interface{}{
+ "performer_id": performerIDColumn,
+ "performers": performerTable,
+ "performers_scenes": performersScenesTable,
+ "scenes": sceneTable,
+ "scene_id": sceneIDColumn,
+ "scenes_files": scenesFilesTable,
+ "files": fileTable,
+ },
+)
+
+func (qb *PerformerStore) sortByScenesSize(direction string) string {
+ return " ORDER BY (" + selectPerformerScenesSizeSQL + ") " + direction
+}
+
var performerSortOptions = sortOptions{
"birthdate",
"career_start",
@@ -799,6 +825,7 @@ var performerSortOptions = sortOptions{
"rating",
"scenes_count",
"scenes_duration",
+ "scenes_size",
"tag_count",
"updated_at",
"weight",
@@ -828,6 +855,8 @@ func (qb *PerformerStore) getPerformerSort(findFilter *models.FindFilterType) (s
sortQuery += getCountSort(performerTable, performersScenesTable, performerIDColumn, direction)
case "scenes_duration":
sortQuery += qb.sortByScenesDuration(direction)
+ case "scenes_size":
+ sortQuery += qb.sortByScenesSize(direction)
case "images_count":
sortQuery += getCountSort(performerTable, performersImagesTable, performerIDColumn, direction)
case "galleries_count":
diff --git a/pkg/sqlite/performer_filter.go b/pkg/sqlite/performer_filter.go
index fdcc283ab..4336e998c 100644
--- a/pkg/sqlite/performer_filter.go
+++ b/pkg/sqlite/performer_filter.go
@@ -52,7 +52,7 @@ func (qb *performerFilterHandler) validate() error {
careerLength := filter.CareerLength
switch careerLength.Modifier {
case models.CriterionModifierEquals:
- start, end, err := utils.ParseYearRangeString(careerLength.Value)
+ start, end, err := models.ParseYearRangeString(careerLength.Value)
if err != nil {
return fmt.Errorf("invalid career length value: %s", careerLength.Value)
}
@@ -70,6 +70,28 @@ func (qb *performerFilterHandler) validate() error {
}
}
+ // validate date formats
+ if filter.Birthdate != nil && filter.Birthdate.Value != "" {
+ if _, err := models.ParseDate(filter.Birthdate.Value); err != nil {
+ return fmt.Errorf("invalid birthdate value: %s", filter.Birthdate.Value)
+ }
+ }
+ if filter.DeathDate != nil && filter.DeathDate.Value != "" {
+ if _, err := models.ParseDate(filter.DeathDate.Value); err != nil {
+ return fmt.Errorf("invalid death date value: %s", filter.DeathDate.Value)
+ }
+ }
+ if filter.CareerStart != nil && filter.CareerStart.Value != "" {
+ if _, err := models.ParseDate(filter.CareerStart.Value); err != nil {
+ return fmt.Errorf("invalid career start value: %s", filter.CareerStart.Value)
+ }
+ }
+ if filter.CareerEnd != nil && filter.CareerEnd.Value != "" {
+ if _, err := models.ParseDate(filter.CareerEnd.Value); err != nil {
+ return fmt.Errorf("invalid career end value: %s", filter.CareerEnd.Value)
+ }
+ }
+
return nil
}
@@ -156,8 +178,8 @@ func (qb *performerFilterHandler) criterionHandler() criterionHandler {
}),
// CareerLength filter is deprecated and non-functional (column removed in schema 78)
- intCriterionHandler(filter.CareerStart, tableName+".career_start", nil),
- intCriterionHandler(filter.CareerEnd, tableName+".career_end", nil),
+ &dateCriterionHandler{filter.CareerStart, tableName + ".career_start", nil},
+ &dateCriterionHandler{filter.CareerEnd, tableName + ".career_end", nil},
stringCriterionHandler(filter.Tattoos, tableName+".tattoos"),
stringCriterionHandler(filter.Piercings, tableName+".piercings"),
intCriterionHandler(filter.Rating100, tableName+".rating", nil),
@@ -266,31 +288,39 @@ func convertLegacyCareerLengthFilter(filter *models.PerformerFilterType) {
careerLength := filter.CareerLength
switch careerLength.Modifier {
case models.CriterionModifierEquals:
- start, end, _ := utils.ParseYearRangeString(careerLength.Value)
+ start, end, _ := models.ParseYearRangeString(careerLength.Value)
if start != nil {
- filter.CareerStart = &models.IntCriterionInput{
- Value: (*start) - 1, // minus one to make it exclusive
+ start = &models.Date{
+ Time: start.AddDate(0, 0, -1), // make exclusive
+ Precision: models.DatePrecisionDay,
+ }
+ filter.CareerStart = &models.DateCriterionInput{
+ Value: start.String(),
Modifier: models.CriterionModifierGreaterThan,
}
}
if end != nil {
- filter.CareerEnd = &models.IntCriterionInput{
- Value: (*end) + 1, // plus one to make it exclusive
+ end = &models.Date{
+ Time: end.AddDate(1, 0, 0), // make exclusive
+ Precision: models.DatePrecisionDay,
+ }
+ filter.CareerEnd = &models.DateCriterionInput{
+ Value: end.String(), // plus one to make it exclusive
Modifier: models.CriterionModifierLessThan,
}
}
case models.CriterionModifierIsNull:
- filter.CareerStart = &models.IntCriterionInput{
+ filter.CareerStart = &models.DateCriterionInput{
Modifier: models.CriterionModifierIsNull,
}
- filter.CareerEnd = &models.IntCriterionInput{
+ filter.CareerEnd = &models.DateCriterionInput{
Modifier: models.CriterionModifierIsNull,
}
case models.CriterionModifierNotNull:
- filter.CareerStart = &models.IntCriterionInput{
+ filter.CareerStart = &models.DateCriterionInput{
Modifier: models.CriterionModifierNotNull,
}
- filter.CareerEnd = &models.IntCriterionInput{
+ filter.CareerEnd = &models.DateCriterionInput{
Modifier: models.CriterionModifierNotNull,
}
}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 46a5febee..ebe1b9eab 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -65,9 +65,9 @@ func Test_PerformerStore_Create(t *testing.T) {
measurements = "measurements"
fakeTits = "fakeTits"
penisLength = 1.23
- circumcised = models.CircumisedEnumCut
- careerStart = 2005
- careerEnd = 2015
+ circumcised = models.CircumcisedEnumCut
+ careerStart = models.DateFromYear(2005)
+ careerEnd = models.DateFromYear(2015)
tattoos = "tattoos"
piercings = "piercings"
aliases = []string{"alias1", "alias2"}
@@ -228,9 +228,9 @@ func Test_PerformerStore_Update(t *testing.T) {
measurements = "measurements"
fakeTits = "fakeTits"
penisLength = 1.23
- circumcised = models.CircumisedEnumCut
- careerStart = 2005
- careerEnd = 2015
+ circumcised = models.CircumcisedEnumCut
+ careerStart = models.DateFromYear(2005)
+ careerEnd = models.DateFromYear(2015)
tattoos = "tattoos"
piercings = "piercings"
aliases = []string{"alias1", "alias2"}
@@ -424,8 +424,8 @@ func clearPerformerPartial() models.PerformerPartial {
FakeTits: nullString,
PenisLength: nullFloat,
Circumcised: nullString,
- CareerStart: nullInt,
- CareerEnd: nullInt,
+ CareerStart: nullDate,
+ CareerEnd: nullDate,
Tattoos: nullString,
Piercings: nullString,
Aliases: &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
@@ -457,9 +457,9 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
measurements = "measurements"
fakeTits = "fakeTits"
penisLength = 1.23
- circumcised = models.CircumisedEnumCut
- careerStart = 2005
- careerEnd = 2015
+ circumcised = models.CircumcisedEnumCut
+ careerStart = models.DateFromYear(2005)
+ careerEnd = models.DateFromYear(2015)
tattoos = "tattoos"
piercings = "piercings"
aliases = []string{"alias1", "alias2"}
@@ -505,8 +505,8 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
FakeTits: models.NewOptionalString(fakeTits),
PenisLength: models.NewOptionalFloat64(penisLength),
Circumcised: models.NewOptionalString(circumcised.String()),
- CareerStart: models.NewOptionalInt(careerStart),
- CareerEnd: models.NewOptionalInt(careerEnd),
+ CareerStart: models.NewOptionalDate(careerStart),
+ CareerEnd: models.NewOptionalDate(careerEnd),
Tattoos: models.NewOptionalString(tattoos),
Piercings: models.NewOptionalString(piercings),
Aliases: &models.UpdateStrings{
@@ -1200,7 +1200,7 @@ func TestPerformerQuery(t *testing.T) {
nil,
&models.PerformerFilterType{
Circumcised: &models.CircumcisionCriterionInput{
- Value: []models.CircumisedEnum{models.CircumisedEnumCut},
+ Value: []models.CircumcisedEnum{models.CircumcisedEnumCut},
Modifier: models.CriterionModifierIncludes,
},
},
@@ -1213,7 +1213,7 @@ func TestPerformerQuery(t *testing.T) {
nil,
&models.PerformerFilterType{
Circumcised: &models.CircumcisionCriterionInput{
- Value: []models.CircumisedEnum{models.CircumisedEnumCut},
+ Value: []models.CircumcisedEnum{models.CircumcisedEnumCut},
Modifier: models.CriterionModifierExcludes,
},
},
@@ -1778,8 +1778,8 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
tests := []struct {
name string
c models.StringCriterionInput
- careerStartCrit *models.IntCriterionInput
- careerEndCrit *models.IntCriterionInput
+ careerStartCrit *models.DateCriterionInput
+ careerEndCrit *models.DateCriterionInput
err bool
}{
{
@@ -1788,13 +1788,13 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
Value: value,
Modifier: models.CriterionModifierEquals,
},
- careerStartCrit: &models.IntCriterionInput{
- Value: 2002,
- Modifier: models.CriterionModifierEquals,
+ careerStartCrit: &models.DateCriterionInput{
+ Value: "2001-12-31",
+ Modifier: models.CriterionModifierGreaterThan,
},
- careerEndCrit: &models.IntCriterionInput{
- Value: 2012,
- Modifier: models.CriterionModifierEquals,
+ careerEndCrit: &models.DateCriterionInput{
+ Value: "2013-01-01",
+ Modifier: models.CriterionModifierLessThan,
},
err: false,
},
@@ -1811,10 +1811,10 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
c: models.StringCriterionInput{
Modifier: models.CriterionModifierIsNull,
},
- careerStartCrit: &models.IntCriterionInput{
+ careerStartCrit: &models.DateCriterionInput{
Modifier: models.CriterionModifierIsNull,
},
- careerEndCrit: &models.IntCriterionInput{
+ careerEndCrit: &models.DateCriterionInput{
Modifier: models.CriterionModifierIsNull,
},
err: false,
@@ -1824,10 +1824,10 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
c: models.StringCriterionInput{
Modifier: models.CriterionModifierNotNull,
},
- careerStartCrit: &models.IntCriterionInput{
+ careerStartCrit: &models.DateCriterionInput{
Modifier: models.CriterionModifierNotNull,
},
- careerEndCrit: &models.IntCriterionInput{
+ careerEndCrit: &models.DateCriterionInput{
Modifier: models.CriterionModifierNotNull,
},
err: false,
@@ -1865,16 +1865,16 @@ func TestPerformerQueryLegacyCareerLength(t *testing.T) {
}
for _, performer := range performers {
- verifyIntPtr(t, performer.CareerStart, *tt.careerStartCrit)
- verifyIntPtr(t, performer.CareerEnd, *tt.careerEndCrit)
+ verifyDatePtr(t, performer.CareerStart, *tt.careerStartCrit)
+ verifyDatePtr(t, performer.CareerEnd, *tt.careerEndCrit)
}
})
}
}
func TestPerformerQueryCareerStart(t *testing.T) {
- const value = 2002
- criterion := models.IntCriterionInput{
+ const value = "2002"
+ criterion := models.DateCriterionInput{
Value: value,
Modifier: models.CriterionModifierEquals,
}
@@ -1891,7 +1891,7 @@ func TestPerformerQueryCareerStart(t *testing.T) {
}
for _, performer := range performers {
- verifyIntPtr(t, performer.CareerStart, criterion)
+ verifyDatePtr(t, performer.CareerStart, criterion)
}
return nil
@@ -1899,8 +1899,8 @@ func TestPerformerQueryCareerStart(t *testing.T) {
}
func TestPerformerQueryCareerEnd(t *testing.T) {
- const value = 2012
- criterion := models.IntCriterionInput{
+ const value = "2012"
+ criterion := models.DateCriterionInput{
Value: value,
Modifier: models.CriterionModifierEquals,
}
@@ -1917,7 +1917,7 @@ func TestPerformerQueryCareerEnd(t *testing.T) {
}
for _, performer := range performers {
- verifyIntPtr(t, performer.CareerEnd, criterion)
+ verifyDatePtr(t, performer.CareerEnd, criterion)
}
return nil
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index d386175c7..67bf227a2 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2821,6 +2821,33 @@ func verifyIntPtr(t *testing.T, value *int, criterion models.IntCriterionInput)
}
}
+func verifyDatePtr(t *testing.T, value *models.Date, criterion models.DateCriterionInput) {
+ t.Helper()
+ assert := assert.New(t)
+ if criterion.Modifier == models.CriterionModifierIsNull {
+ assert.Nil(value, "expect is null values to be null")
+ }
+ if criterion.Modifier == models.CriterionModifierNotNull {
+ assert.NotNil(value, "expect not null values to be not null")
+ }
+ if criterion.Modifier == models.CriterionModifierEquals {
+ date, _ := models.ParseDate(criterion.Value)
+ assert.Equal(date, *value)
+ }
+ if criterion.Modifier == models.CriterionModifierNotEquals {
+ date, _ := models.ParseDate(criterion.Value)
+ assert.NotEqual(date, *value)
+ }
+ if criterion.Modifier == models.CriterionModifierGreaterThan {
+ date, _ := models.ParseDate(criterion.Value)
+ assert.True(value.After(date))
+ }
+ if criterion.Modifier == models.CriterionModifierLessThan {
+ date, _ := models.ParseDate(criterion.Value)
+ assert.True(date.After(*value))
+ }
+}
+
func TestSceneQueryOCounter(t *testing.T) {
const oCounter = 1
oCounterCriterion := models.IntCriterionInput{
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index d8baae3b8..4ab310ee7 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -306,6 +306,7 @@ const (
pathField = "Path"
checksumField = "Checksum"
titleField = "Title"
+ detailsField = "Details"
urlField = "URL"
zipPath = "zipPath.zip"
firstSavedFilterName = "firstSavedFilterName"
@@ -865,16 +866,24 @@ func getFileModTime(index int) time.Time {
return getFolderModTime(index)
}
+func getFilePhash(index int) int64 {
+ return int64(index * 567)
+}
+
func getFileFingerprints(index int) []models.Fingerprint {
return []models.Fingerprint{
{
- Type: "MD5",
+ Type: models.FingerprintTypeMD5,
Fingerprint: getPrefixedStringValue("file", index, "md5"),
},
{
- Type: "OSHASH",
+ Type: models.FingerprintTypeOshash,
Fingerprint: getPrefixedStringValue("file", index, "oshash"),
},
+ {
+ Type: models.FingerprintTypePhash,
+ Fingerprint: getFilePhash(index),
+ },
}
}
@@ -1297,9 +1306,10 @@ func makeImage(i int) *models.Image {
tids := indexesToIDs(tagIDs, imageTags[i])
return &models.Image{
- Title: title,
- Rating: getIntPtr(getRating(i)),
- Date: getObjectDate(i),
+ Title: title,
+ Details: getImageStringValue(i, detailsField),
+ Rating: getIntPtr(getRating(i)),
+ Date: getObjectDate(i),
URLs: models.NewRelatedStrings([]string{
getImageEmptyString(i, urlField),
}),
@@ -1587,24 +1597,24 @@ func getPerformerDeathDate(index int) *models.Date {
return &ret
}
-func getPerformerCareerStart(index int) *int {
+func getPerformerCareerStart(index int) *models.Date {
if index%5 == 0 {
return nil
}
- ret := 2000 + index
- return &ret
+ date := models.DateFromYear(2000 + index)
+ return &date
}
-func getPerformerCareerEnd(index int) *int {
+func getPerformerCareerEnd(index int) *models.Date {
if index%5 == 0 {
return nil
}
// only set career_end for even indices
if index%2 == 0 {
- ret := 2010 + index
- return &ret
+ date := models.DateFromYear(2010 + index)
+ return &date
}
return nil
}
@@ -1618,15 +1628,15 @@ func getPerformerPenisLength(index int) *float64 {
return &ret
}
-func getPerformerCircumcised(index int) *models.CircumisedEnum {
- var ret models.CircumisedEnum
+func getPerformerCircumcised(index int) *models.CircumcisedEnum {
+ var ret models.CircumcisedEnum
switch {
case index%3 == 0:
return nil
case index%3 == 1:
- ret = models.CircumisedEnumCut
+ ret = models.CircumcisedEnumCut
default:
- ret = models.CircumisedEnumUncut
+ ret = models.CircumcisedEnumUncut
}
return &ret
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 70d86ab5e..87376c2c1 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -269,8 +269,11 @@ func getDateWhereClause(column string, modifier models.CriterionModifier, value
upper = &u
}
- args := []interface{}{value}
- betweenArgs := []interface{}{value, *upper}
+ valueDate, _ := models.ParseDate(value)
+ date := Date{Date: valueDate.Time}
+
+ args := []interface{}{date}
+ betweenArgs := []interface{}{date, *upper}
switch modifier {
case models.CriterionModifierIsNull:
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index a866a94ab..87f905935 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -629,6 +629,16 @@ func (qb *StudioStore) sortByScenesDuration(direction string) string {
) %s`, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
}
+func (qb *StudioStore) sortByScenesSize(direction string) string {
+ return fmt.Sprintf(` ORDER BY (
+ SELECT COALESCE(SUM(%s.size), 0)
+ FROM %s
+ LEFT JOIN %s ON %s.%s = %s.id
+ LEFT JOIN %s ON %s.id = %s.file_id
+ WHERE %s.%s = %s.id
+ ) %s`, fileTable, sceneTable, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, fileTable, fileTable, scenesFilesTable, sceneTable, studioIDColumn, studioTable, getSortDirection(direction))
+}
+
// used for sorting on performer latest scene
var selectStudioLatestSceneSQL = utils.StrFormat(
"SELECT MAX(date) FROM ("+
@@ -658,6 +668,7 @@ var studioSortOptions = sortOptions{
"name",
"scenes_count",
"scenes_duration",
+ "scenes_size",
"random",
"rating",
"tag_count",
@@ -688,6 +699,8 @@ func (qb *StudioStore) getStudioSort(findFilter *models.FindFilterType) (string,
sortQuery += getCountSort(studioTable, sceneTable, studioIDColumn, direction)
case "scenes_duration":
sortQuery += qb.sortByScenesDuration(direction)
+ case "scenes_size":
+ sortQuery += qb.sortByScenesSize(direction)
case "images_count":
sortQuery += getCountSort(studioTable, imageTable, studioIDColumn, direction)
case "galleries_count":
diff --git a/pkg/sqlite/table.go b/pkg/sqlite/table.go
index 790e84e94..3f8dfb70f 100644
--- a/pkg/sqlite/table.go
+++ b/pkg/sqlite/table.go
@@ -1209,6 +1209,14 @@ func querySimple(ctx context.Context, query *goqu.SelectDataset, out interface{}
return nil
}
+func querySelect(ctx context.Context, query string, args []interface{}, dest interface{}) error {
+ if err := dbWrapper.Select(ctx, dest, query, args...); err != nil && !errors.Is(err, sql.ErrNoRows) {
+ return fmt.Errorf("running query: %s [%v]: %w", query, args, err)
+ }
+
+ return nil
+}
+
// func cols(table exp.IdentifierExpression, cols []string) []interface{} {
// var ret []interface{}
// for _, c := range cols {
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 750836516..4ee69cc46 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -416,6 +416,18 @@ func (qb *TagStore) find(ctx context.Context, id int) (*models.Tag, error) {
return ret, nil
}
+func (qb *TagStore) findBySubquery(ctx context.Context, sq *goqu.SelectDataset) ([]*models.Tag, error) {
+ table := qb.table()
+
+ q := qb.selectDataset().Prepared(true).Where(
+ table.Col(idColumn).Eq(
+ sq,
+ ),
+ )
+
+ return qb.getMany(ctx, q)
+}
+
// returns nil, sql.ErrNoRows if not found
func (qb *TagStore) get(ctx context.Context, q *goqu.SelectDataset) (*models.Tag, error) {
ret, err := qb.getMany(ctx, q)
@@ -579,6 +591,27 @@ func (qb *TagStore) FindByNames(ctx context.Context, names []string, nocase bool
return ret, nil
}
+func (qb *TagStore) FindByAlias(ctx context.Context, alias string, nocase bool) (*models.Tag, error) {
+ where := fmt.Sprintf("%s = ?", tagAliasColumn)
+ if nocase {
+ where += " COLLATE NOCASE"
+ }
+ sq := dialect.From(tagsAliasesJoinTable).Select(
+ tagsAliasesJoinTable.Col(tagIDColumn),
+ ).Prepared(true).Where(goqu.L(where, alias)).Limit(1)
+ ret, err := qb.findBySubquery(ctx, sq)
+
+ if err != nil && !errors.Is(err, sql.ErrNoRows) {
+ return nil, err
+ }
+
+ if len(ret) == 0 {
+ return nil, nil
+ }
+
+ return ret[0], nil
+}
+
func (qb *TagStore) FindByStashID(ctx context.Context, stashID models.StashID) ([]*models.Tag, error) {
sq := dialect.From(tagsStashIDsJoinTable).Select(tagsStashIDsJoinTable.Col(tagIDColumn)).Where(
tagsStashIDsJoinTable.Col("stash_id").Eq(stashID.StashID),
@@ -770,6 +803,7 @@ var tagSortOptions = sortOptions{
"scene_markers_count",
"scenes_count",
"scenes_duration",
+ "scenes_size",
"updated_at",
}
@@ -784,6 +818,17 @@ func (qb *TagStore) sortByScenesDuration(direction string) string {
) %s`, scenesTagsTable, sceneTable, sceneTable, scenesTagsTable, sceneIDColumn, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, scenesFilesTable, scenesTagsTable, tagIDColumn, tagTable, getSortDirection(direction))
}
+func (qb *TagStore) sortByScenesSize(direction string) string {
+ return fmt.Sprintf(` ORDER BY (
+ SELECT COALESCE(SUM(%s.size), 0)
+ FROM %s
+ LEFT JOIN %s ON %s.id = %s.%s
+ LEFT JOIN %s ON %s.%s = %s.id
+ LEFT JOIN %s ON %s.id = %s.file_id
+ WHERE %s.%s = %s.id
+ ) %s`, fileTable, scenesTagsTable, sceneTable, sceneTable, scenesTagsTable, sceneIDColumn, scenesFilesTable, scenesFilesTable, sceneIDColumn, sceneTable, fileTable, fileTable, scenesFilesTable, scenesTagsTable, tagIDColumn, tagTable, getSortDirection(direction))
+}
+
func (qb *TagStore) getDefaultTagSort() string {
return getSort("name", "ASC", "tags")
}
@@ -812,6 +857,8 @@ func (qb *TagStore) getTagSort(query *queryBuilder, findFilter *models.FindFilte
sortQuery += getCountSort(tagTable, scenesTagsTable, tagIDColumn, direction)
case "scenes_duration":
sortQuery += qb.sortByScenesDuration(direction)
+ case "scenes_size":
+ sortQuery += qb.sortByScenesSize(direction)
case "scene_markers_count":
sortQuery += fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM scene_markers_tags WHERE tags.id = scene_markers_tags.tag_id)+(SELECT COUNT(*) FROM scene_markers WHERE tags.id = scene_markers.primary_tag_id) %s", getSortDirection(direction))
case "images_count":
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 179969fd6..b7f61a158 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -100,6 +100,24 @@ func TestTagFindByName(t *testing.T) {
})
}
+func TestTagFindByAlias(t *testing.T) {
+ withTxn(func(ctx context.Context) error {
+ tqb := db.Tag
+
+ alias := getTagStringValue(tagIdxWithScene, "Alias")
+
+ tag, err := tqb.FindByAlias(ctx, alias, false)
+
+ if err != nil {
+ t.Errorf("Error finding tags: %s", err.Error())
+ }
+
+ assert.Equal(t, tagIDs[tagIdxWithScene], tag.ID)
+
+ return nil
+ })
+}
+
func TestTagQueryIgnoreAutoTag(t *testing.T) {
withTxn(func(ctx context.Context) error {
ignoreAutoTag := true
diff --git a/pkg/stashbox/graphql/generated_client.go b/pkg/stashbox/graphql/generated_client.go
index acb2202dc..bc9a6ce89 100644
--- a/pkg/stashbox/graphql/generated_client.go
+++ b/pkg/stashbox/graphql/generated_client.go
@@ -128,10 +128,11 @@ func (t *StudioFragment) GetImages() []*ImageFragment {
}
type TagFragment struct {
- Name string "json:\"name\" graphql:\"name\""
- ID string "json:\"id\" graphql:\"id\""
- Description *string "json:\"description,omitempty\" graphql:\"description\""
- Aliases []string "json:\"aliases\" graphql:\"aliases\""
+ Name string "json:\"name\" graphql:\"name\""
+ ID string "json:\"id\" graphql:\"id\""
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ Aliases []string "json:\"aliases\" graphql:\"aliases\""
+ Category *TagFragment_Category "json:\"category,omitempty\" graphql:\"category\""
}
func (t *TagFragment) GetName() string {
@@ -158,6 +159,12 @@ func (t *TagFragment) GetAliases() []string {
}
return t.Aliases
}
+func (t *TagFragment) GetCategory() *TagFragment_Category {
+ if t == nil {
+ t = &TagFragment{}
+ }
+ return t.Category
+}
type MeasurementsFragment struct {
BandSize *int "json:\"band_size,omitempty\" graphql:\"band_size\""
@@ -530,6 +537,31 @@ func (t *StudioFragment_Parent) GetName() string {
return t.Name
}
+type TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &TagFragment_Category{}
+ }
+ return t.Name
+}
+
type SceneFragment_Studio_StudioFragment_Parent struct {
ID string "json:\"id\" graphql:\"id\""
Name string "json:\"name\" graphql:\"name\""
@@ -548,6 +580,31 @@ func (t *SceneFragment_Studio_StudioFragment_Parent) GetName() string {
return t.Name
}
+type SceneFragment_Tags_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *SceneFragment_Tags_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *SceneFragment_Tags_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Name
+}
+
type FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Studio_StudioFragment_Parent struct {
ID string "json:\"id\" graphql:\"id\""
Name string "json:\"name\" graphql:\"name\""
@@ -566,6 +623,31 @@ func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragme
return t.Name
}
+type FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &FindScenesBySceneFingerprints_FindScenesBySceneFingerprints_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Name
+}
+
type SearchScene_SearchScene_SceneFragment_Studio_StudioFragment_Parent struct {
ID string "json:\"id\" graphql:\"id\""
Name string "json:\"name\" graphql:\"name\""
@@ -584,6 +666,31 @@ func (t *SearchScene_SearchScene_SceneFragment_Studio_StudioFragment_Parent) Get
return t.Name
}
+type SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &SearchScene_SearchScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Name
+}
+
type FindSceneByID_FindScene_SceneFragment_Studio_StudioFragment_Parent struct {
ID string "json:\"id\" graphql:\"id\""
Name string "json:\"name\" graphql:\"name\""
@@ -602,6 +709,31 @@ func (t *FindSceneByID_FindScene_SceneFragment_Studio_StudioFragment_Parent) Get
return t.Name
}
+type FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &FindSceneByID_FindScene_SceneFragment_Tags_TagFragment_Category{}
+ }
+ return t.Name
+}
+
type FindStudio_FindStudio_StudioFragment_Parent struct {
ID string "json:\"id\" graphql:\"id\""
Name string "json:\"name\" graphql:\"name\""
@@ -620,6 +752,56 @@ func (t *FindStudio_FindStudio_StudioFragment_Parent) GetName() string {
return t.Name
}
+type FindTag_FindTag_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *FindTag_FindTag_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &FindTag_FindTag_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *FindTag_FindTag_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &FindTag_FindTag_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *FindTag_FindTag_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &FindTag_FindTag_TagFragment_Category{}
+ }
+ return t.Name
+}
+
+type QueryTags_QueryTags_Tags_TagFragment_Category struct {
+ Description *string "json:\"description,omitempty\" graphql:\"description\""
+ ID string "json:\"id\" graphql:\"id\""
+ Name string "json:\"name\" graphql:\"name\""
+}
+
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetDescription() *string {
+ if t == nil {
+ t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+ }
+ return t.Description
+}
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetID() string {
+ if t == nil {
+ t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+ }
+ return t.ID
+}
+func (t *QueryTags_QueryTags_Tags_TagFragment_Category) GetName() string {
+ if t == nil {
+ t = &QueryTags_QueryTags_Tags_TagFragment_Category{}
+ }
+ return t.Name
+}
+
type QueryTags_QueryTags struct {
Count int "json:\"count\" graphql:\"count\""
Tags []*TagFragment "json:\"tags\" graphql:\"tags\""
@@ -865,6 +1047,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
fragment PerformerAppearanceFragment on PerformerAppearance {
as
@@ -1003,6 +1190,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
fragment PerformerAppearanceFragment on PerformerAppearance {
as
@@ -1299,6 +1491,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
fragment PerformerAppearanceFragment on PerformerAppearance {
as
@@ -1435,6 +1632,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
`
@@ -1469,6 +1671,11 @@ fragment TagFragment on Tag {
id
description
aliases
+ category {
+ id
+ name
+ description
+ }
}
`
diff --git a/pkg/stashbox/performer.go b/pkg/stashbox/performer.go
index 231b936d6..5b25b4a59 100644
--- a/pkg/stashbox/performer.go
+++ b/pkg/stashbox/performer.go
@@ -232,21 +232,21 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
}
if p.CareerStartYear != nil {
- cs := *p.CareerStartYear
+ cs := strconv.Itoa(*p.CareerStartYear)
sp.CareerStart = &cs
}
if p.CareerEndYear != nil {
- ce := *p.CareerEndYear
+ ce := strconv.Itoa(*p.CareerEndYear)
sp.CareerEnd = &ce
}
if p.BirthDate != nil {
- sp.Birthdate = padFuzzyDate(p.BirthDate)
+ sp.Birthdate = p.BirthDate
}
if p.DeathDate != nil {
- sp.DeathDate = padFuzzyDate(p.DeathDate)
+ sp.DeathDate = p.DeathDate
}
if p.Gender != nil {
@@ -290,23 +290,6 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
return sp
}
-func padFuzzyDate(date *string) *string {
- if date == nil {
- return nil
- }
-
- var paddedDate string
- switch len(*date) {
- case 10:
- paddedDate = *date
- case 7:
- paddedDate = fmt.Sprintf("%s-01", *date)
- case 4:
- paddedDate = fmt.Sprintf("%s-01-01", *date)
- }
- return &paddedDate
-}
-
// FindPerformerByID queries stash-box for a performer by ID.
func (c Client) FindPerformerByID(ctx context.Context, id string) (*models.ScrapedPerformer, error) {
performer, err := c.client.FindPerformerByID(ctx, id)
@@ -399,10 +382,12 @@ func (c Client) SubmitPerformerDraft(ctx context.Context, performer *models.Perf
draft.Aliases = &aliases
}
if performer.CareerStart != nil {
- draft.CareerStartYear = performer.CareerStart
+ year := performer.CareerStart.Year()
+ draft.CareerStartYear = &year
}
if performer.CareerEnd != nil {
- draft.CareerEndYear = performer.CareerEnd
+ year := performer.CareerEnd.Year()
+ draft.CareerEndYear = &year
}
if len(performer.URLs.List()) > 0 {
diff --git a/pkg/stashbox/tag.go b/pkg/stashbox/tag.go
index 452dd9928..45bcf96c4 100644
--- a/pkg/stashbox/tag.go
+++ b/pkg/stashbox/tag.go
@@ -72,5 +72,12 @@ func tagFragmentToScrapedTag(t graphql.TagFragment) *models.ScrapedTag {
ret.AliasList = t.Aliases
}
+ if t.Category != nil {
+ ret.Parent = &models.ScrapedTag{
+ Name: t.Category.Name,
+ Description: t.Category.Description,
+ }
+ }
+
return ret
}
diff --git a/pkg/tag/query.go b/pkg/tag/query.go
index 76567434d..eb8b6acf0 100644
--- a/pkg/tag/query.go
+++ b/pkg/tag/query.go
@@ -6,50 +6,24 @@ import (
"github.com/stashapp/stash/pkg/models"
)
-func ByName(ctx context.Context, qb models.TagQueryer, name string) (*models.Tag, error) {
- f := &models.TagFilterType{
- Name: &models.StringCriterionInput{
- Value: name,
- Modifier: models.CriterionModifierEquals,
- },
- }
-
- pp := 1
- ret, count, err := qb.Query(ctx, f, &models.FindFilterType{
- PerPage: &pp,
- })
+func ByName(ctx context.Context, qb models.TagNameFinder, name string) (*models.Tag, error) {
+ const nocase = true
+ ret, err := qb.FindByName(ctx, name, nocase)
if err != nil {
return nil, err
}
- if count > 0 {
- return ret[0], nil
- }
-
- return nil, nil
+ return ret, nil
}
-func ByAlias(ctx context.Context, qb models.TagQueryer, alias string) (*models.Tag, error) {
- f := &models.TagFilterType{
- Aliases: &models.StringCriterionInput{
- Value: alias,
- Modifier: models.CriterionModifierEquals,
- },
- }
-
- pp := 1
- ret, count, err := qb.Query(ctx, f, &models.FindFilterType{
- PerPage: &pp,
- })
+func ByAlias(ctx context.Context, qb models.TagNameFinder, alias string) (*models.Tag, error) {
+ const nocase = true
+ ret, err := qb.FindByAlias(ctx, alias, nocase)
if err != nil {
return nil, err
}
- if count > 0 {
- return ret[0], nil
- }
-
- return nil, nil
+ return ret, nil
}
diff --git a/pkg/tag/update.go b/pkg/tag/update.go
index 4a3a2901a..264420af9 100644
--- a/pkg/tag/update.go
+++ b/pkg/tag/update.go
@@ -42,7 +42,7 @@ func (e *InvalidTagHierarchyError) Error() string {
// EnsureTagNameUnique returns an error if the tag name provided
// is used as a name or alias of another existing tag.
-func EnsureTagNameUnique(ctx context.Context, id int, name string, qb models.TagQueryer) error {
+func EnsureTagNameUnique(ctx context.Context, id int, name string, qb models.TagNameFinder) error {
// ensure name is unique
sameNameTag, err := ByName(ctx, qb, name)
if err != nil {
@@ -71,7 +71,7 @@ func EnsureTagNameUnique(ctx context.Context, id int, name string, qb models.Tag
return nil
}
-func EnsureAliasesUnique(ctx context.Context, id int, aliases []string, qb models.TagQueryer) error {
+func EnsureAliasesUnique(ctx context.Context, id int, aliases []string, qb models.TagNameFinder) error {
for _, a := range aliases {
if err := EnsureTagNameUnique(ctx, id, a, qb); err != nil {
return err
diff --git a/pkg/tag/validate_test.go b/pkg/tag/validate_test.go
index 539086a6d..439acc082 100644
--- a/pkg/tag/validate_test.go
+++ b/pkg/tag/validate_test.go
@@ -1,71 +1,60 @@
package tag
import (
+ "context"
"testing"
"github.com/stashapp/stash/pkg/models"
- "github.com/stashapp/stash/pkg/models/mocks"
"github.com/stretchr/testify/assert"
)
-func nameFilter(n string) *models.TagFilterType {
- return &models.TagFilterType{
- Name: &models.StringCriterionInput{
- Value: n,
- Modifier: models.CriterionModifierEquals,
- },
- }
+type tagNameFinderMock struct {
+ existingTags []*models.Tag
}
-func aliasFilter(n string) *models.TagFilterType {
- return &models.TagFilterType{
- Aliases: &models.StringCriterionInput{
- Value: n,
- Modifier: models.CriterionModifierEquals,
- },
+func (m tagNameFinderMock) FindByName(ctx context.Context, name string, nocase bool) (*models.Tag, error) {
+ for _, n := range m.existingTags {
+ if n.Name == name {
+ return n, nil
+ }
}
+
+ return nil, nil
+}
+
+func (m tagNameFinderMock) FindByNames(ctx context.Context, names []string, nocase bool) ([]*models.Tag, error) {
+ panic("not implemented")
+}
+
+func (m tagNameFinderMock) FindByAlias(ctx context.Context, alias string, nocase bool) (*models.Tag, error) {
+ for _, n := range m.existingTags {
+ for _, a := range n.Aliases.List() {
+ if a == alias {
+ return n, nil
+ }
+ }
+ }
+
+ return nil, nil
}
func TestEnsureAliasesUnique(t *testing.T) {
- db := mocks.NewDatabase()
-
const (
name1 = "name 1"
name2 = "name 2"
+ name3 = "name 3"
alias1 = "alias 1"
newAlias = "new alias"
)
- existing2 := models.Tag{
- ID: 2,
- Name: name2,
+ tagMock := tagNameFinderMock{
+ existingTags: []*models.Tag{
+ {Name: name1, Aliases: models.NewRelatedStrings([]string{})},
+ {Name: name2, Aliases: models.NewRelatedStrings([]string{})},
+ {Name: name3, Aliases: models.NewRelatedStrings([]string{newAlias})},
+ },
}
- pp := 1
- findFilter := &models.FindFilterType{
- PerPage: &pp,
- }
-
- // name1 matches existing1 name - ok
- // EnsureAliasesUnique calls EnsureTagNameUnique.
- // EnsureTagNameUnique calls ByName then ByAlias.
-
- // Case 1: valid alias
- // ByName "alias 1" -> nil
- // ByAlias "alias 1" -> nil
- db.Tag.On("Query", testCtx, nameFilter(alias1), findFilter).Return(nil, 0, nil)
- db.Tag.On("Query", testCtx, aliasFilter(alias1), findFilter).Return(nil, 0, nil)
-
- // Case 2: alias duplicates existing2 name
- // ByName "name 2" -> existing2
- db.Tag.On("Query", testCtx, nameFilter(name2), findFilter).Return([]*models.Tag{&existing2}, 1, nil)
-
- // Case 3: alias duplicates existing2 alias
- // ByName "new alias" -> nil
- // ByAlias "new alias" -> existing2
- db.Tag.On("Query", testCtx, nameFilter(newAlias), findFilter).Return(nil, 0, nil)
- db.Tag.On("Query", testCtx, aliasFilter(newAlias), findFilter).Return([]*models.Tag{&existing2}, 1, nil)
-
tests := []struct {
tName string
id int
@@ -74,12 +63,12 @@ func TestEnsureAliasesUnique(t *testing.T) {
}{
{"valid alias", 1, []string{alias1}, nil},
{"alias duplicates other name", 1, []string{name2}, &NameExistsError{name2}},
- {"alias duplicates other alias", 1, []string{newAlias}, &NameUsedByAliasError{newAlias, existing2.Name}},
+ {"alias duplicates other alias", 1, []string{newAlias}, &NameUsedByAliasError{newAlias, tagMock.existingTags[2].Name}},
}
for _, tt := range tests {
t.Run(tt.tName, func(t *testing.T) {
- got := EnsureAliasesUnique(testCtx, tt.id, tt.aliases, db.Tag)
+ got := EnsureAliasesUnique(testCtx, tt.id, tt.aliases, tagMock)
assert.Equal(t, tt.want, got)
})
}
diff --git a/pkg/utils/date.go b/pkg/utils/date.go
index 4b805862a..de5566e4d 100644
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -2,8 +2,6 @@ package utils
import (
"fmt"
- "strconv"
- "strings"
"time"
)
@@ -27,80 +25,3 @@ func ParseDateStringAsTime(dateString string) (time.Time, error) {
return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
}
-
-// ParseYearRangeString parses a year range string into start and end year integers.
-// Supported formats: "YYYY", "YYYY - YYYY", "YYYY-YYYY", "YYYY -", "- YYYY", "YYYY-present".
-// Returns nil for start/end if not present in the string.
-func ParseYearRangeString(s string) (start *int, end *int, err error) {
- s = strings.TrimSpace(s)
- if s == "" {
- return nil, nil, fmt.Errorf("empty year range string")
- }
-
- // normalize "present" to empty end
- lower := strings.ToLower(s)
- lower = strings.ReplaceAll(lower, "present", "")
-
- // split on "-" if it contains one
- var parts []string
- if strings.Contains(lower, "-") {
- parts = strings.SplitN(lower, "-", 2)
- } else {
- // single value, treat as start year
- year, err := parseYear(lower)
- if err != nil {
- return nil, nil, fmt.Errorf("invalid year range %q: %w", s, err)
- }
- return &year, nil, nil
- }
-
- startStr := strings.TrimSpace(parts[0])
- endStr := strings.TrimSpace(parts[1])
-
- if startStr != "" {
- y, err := parseYear(startStr)
- if err != nil {
- return nil, nil, fmt.Errorf("invalid start year in %q: %w", s, err)
- }
- start = &y
- }
-
- if endStr != "" {
- y, err := parseYear(endStr)
- if err != nil {
- return nil, nil, fmt.Errorf("invalid end year in %q: %w", s, err)
- }
- end = &y
- }
-
- if start == nil && end == nil {
- return nil, nil, fmt.Errorf("could not parse year range %q", s)
- }
-
- return start, end, nil
-}
-
-func parseYear(s string) (int, error) {
- s = strings.TrimSpace(s)
- year, err := strconv.Atoi(s)
- if err != nil {
- return 0, fmt.Errorf("invalid year %q: %w", s, err)
- }
- if year < 1900 || year > 2200 {
- return 0, fmt.Errorf("year %d out of reasonable range", year)
- }
- return year, nil
-}
-
-func FormatYearRange(start *int, end *int) string {
- switch {
- case start == nil && end == nil:
- return ""
- case end == nil:
- return fmt.Sprintf("%d -", *start)
- case start == nil:
- return fmt.Sprintf("- %d", *end)
- default:
- return fmt.Sprintf("%d - %d", *start, *end)
- }
-}
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
index a9e174094..ae077c21e 100644
--- a/pkg/utils/date_test.go
+++ b/pkg/utils/date_test.go
@@ -2,8 +2,6 @@ package utils
import (
"testing"
-
- "github.com/stretchr/testify/assert"
)
func TestParseDateStringAsTime(t *testing.T) {
@@ -43,66 +41,3 @@ func TestParseDateStringAsTime(t *testing.T) {
})
}
}
-
-func TestParseYearRangeString(t *testing.T) {
- intPtr := func(v int) *int { return &v }
-
- tests := []struct {
- name string
- input string
- wantStart *int
- wantEnd *int
- wantErr bool
- }{
- {"single year", "2005", intPtr(2005), nil, false},
- {"year range with spaces", "2005 - 2010", intPtr(2005), intPtr(2010), false},
- {"year range no spaces", "2005-2010", intPtr(2005), intPtr(2010), false},
- {"year dash open", "2005 -", intPtr(2005), nil, false},
- {"year dash open no space", "2005-", intPtr(2005), nil, false},
- {"dash year", "- 2010", nil, intPtr(2010), false},
- {"year present", "2005-present", intPtr(2005), nil, false},
- {"year Present caps", "2005 - Present", intPtr(2005), nil, false},
- {"whitespace padding", " 2005 - 2010 ", intPtr(2005), intPtr(2010), false},
- {"empty string", "", nil, nil, true},
- {"garbage", "not a year", nil, nil, true},
- {"partial garbage start", "abc - 2010", nil, nil, true},
- {"partial garbage end", "2005 - abc", nil, nil, true},
- {"year out of range", "1800", nil, nil, true},
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- start, end, err := ParseYearRangeString(tt.input)
- if tt.wantErr {
- assert.Error(t, err)
- return
- }
- assert.NoError(t, err)
- assert.Equal(t, tt.wantStart, start)
- assert.Equal(t, tt.wantEnd, end)
- })
- }
-}
-
-func TestFormatYearRange(t *testing.T) {
- intPtr := func(v int) *int { return &v }
-
- tests := []struct {
- name string
- start *int
- end *int
- want string
- }{
- {"both nil", nil, nil, ""},
- {"only start", intPtr(2005), nil, "2005 -"},
- {"only end", nil, intPtr(2010), "- 2010"},
- {"start and end", intPtr(2005), intPtr(2010), "2005 - 2010"},
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- got := FormatYearRange(tt.start, tt.end)
- assert.Equal(t, tt.want, got)
- })
- }
-}
diff --git a/ui/v2.5/graphql/data/scrapers.graphql b/ui/v2.5/graphql/data/scrapers.graphql
index 7214c2064..0dae3c2d5 100644
--- a/ui/v2.5/graphql/data/scrapers.graphql
+++ b/ui/v2.5/graphql/data/scrapers.graphql
@@ -162,6 +162,11 @@ fragment ScrapedSceneTagData on ScrapedTag {
name
description
alias_list
+ parent {
+ stored_id
+ name
+ description
+ }
remote_site_id
}
diff --git a/ui/v2.5/graphql/queries/folder.graphql b/ui/v2.5/graphql/queries/folder.graphql
index a42f5eb84..b1119cd61 100644
--- a/ui/v2.5/graphql/queries/folder.graphql
+++ b/ui/v2.5/graphql/queries/folder.graphql
@@ -1,7 +1,10 @@
-query FindRootFoldersForSelect {
+query FindRootFoldersForSelect($zip_file_filter: MultiCriterionInput) {
findFolders(
filter: { per_page: -1, sort: "path", direction: ASC }
- folder_filter: { parent_folder: { modifier: IS_NULL } }
+ folder_filter: {
+ parent_folder: { modifier: IS_NULL }
+ zip_file: $zip_file_filter
+ }
) {
count
folders {
@@ -22,3 +25,24 @@ query FindFoldersForQuery(
}
}
}
+
+query FindFolderHierarchyForIDs($ids: [ID!]!) {
+ findFolders(ids: $ids) {
+ count
+ folders {
+ ...SelectFolderData
+
+ parent_folders {
+ ...SelectFolderData
+ # the parent folders will be expanded, so we need the child folders
+ sub_folders {
+ ...SelectFolderData
+ # get zip file so we can filter out zip folders if needed
+ zip_file {
+ id
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index e024a0053..001e7fb60 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -3,6 +3,7 @@
"private": true,
"homepage": "./",
"type": "module",
+ "packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017",
"scripts": {
"start": "vite",
"build": "vite build",
diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 7e4207dce..df7517f7d 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -35,6 +35,7 @@ import V0270 from "src/docs/en/Changelog/v0270.md";
import V0280 from "src/docs/en/Changelog/v0280.md";
import V0290 from "src/docs/en/Changelog/v0290.md";
import V0300 from "src/docs/en/Changelog/v0300.md";
+import V0310 from "src/docs/en/Changelog/v0310.md";
import V0290ReleaseNotes from "src/docs/en/ReleaseNotes/v0290.md";
@@ -75,9 +76,9 @@ const Changelog: React.FC = () => {
// after new release:
// add entry to releases, using the current* fields
// then update the current fields.
- const currentVersion = stashVersion || "v0.30.0";
+ const currentVersion = stashVersion || "v0.31.0";
const currentDate = buildDate;
- const currentPage = V0300;
+ const currentPage = V0310;
const releases: IStashRelease[] = [
{
@@ -86,6 +87,12 @@ const Changelog: React.FC = () => {
page: currentPage,
defaultOpen: true,
},
+ {
+ version: "v0.30.1",
+ date: "2025-12-18",
+ page: V0300,
+ releaseNotes: V0290ReleaseNotes,
+ },
{
version: "v0.29.3",
date: "2025-11-06",
diff --git a/ui/v2.5/src/components/Changelog/styles.scss b/ui/v2.5/src/components/Changelog/styles.scss
index 07c88f698..9d79e7d3b 100644
--- a/ui/v2.5/src/components/Changelog/styles.scss
+++ b/ui/v2.5/src/components/Changelog/styles.scss
@@ -20,11 +20,6 @@
padding: 0;
}
- ul {
- list-style-type: none;
- padding-left: 0.5rem;
- }
-
&-version {
&-body {
padding: 1rem 2rem;
diff --git a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
index 9ff7e00f2..cec44abf1 100644
--- a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
@@ -1,100 +1,129 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
-import isEqual from "lodash-es/isEqual";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
import { useBulkGalleryUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { StudioSelect } from "../Shared/Select";
import { ModalComponent } from "../Shared/Modal";
-import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
- getAggregateInputIDs,
getAggregateInputValue,
getAggregatePerformerIds,
- getAggregateRating,
- getAggregateStudioId,
+ getAggregateStateObject,
getAggregateTagIds,
+ getAggregateStudioId,
+ getAggregateSceneIds,
} from "src/utils/bulkUpdate";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
interface IListOperationProps {
selected: GQL.SlimGalleryDataFragment[];
onClose: (applied: boolean) => void;
}
+const galleryFields = [
+ "code",
+ "rating100",
+ "details",
+ "organized",
+ "photographer",
+ "date",
+];
+
export const EditGalleriesDialog: React.FC
- {gallery.studio && (
-
-
-
- )}
+
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 6fbb12f15..e0c115f34 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
import * as GQL from "src/core/generated-graphql";
import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -24,40 +24,43 @@ export const GalleryAddPanel: React.FC
-
- 
-
-
- )}
+
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 6fbb12f15..e0c115f34 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
import * as GQL from "src/core/generated-graphql";
import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -24,40 +24,43 @@ export const GalleryAddPanel: React.FC = PatchComponent(
const Toast = useToast();
const intl = useIntl();
- function filterHook(filter: ListFilterModel) {
- const galleryValue = {
- id: gallery.id,
- label: galleryTitle(gallery),
- };
- // if galleries is already present, then we modify it, otherwise add
- let galleryCriterion = filter.criteria.find((c) => {
- return c.criterionOption.type === "galleries";
- }) as GalleriesCriterion | undefined;
+ const filterHook = useCallback(
+ (filter: ListFilterModel) => {
+ const galleryValue = {
+ id: gallery.id,
+ label: galleryTitle(gallery),
+ };
+ // if galleries is already present, then we modify it, otherwise add
+ let galleryCriterion = filter.criteria.find((c) => {
+ return c.criterionOption.type === "galleries";
+ }) as GalleriesCriterion | undefined;
- if (
- galleryCriterion &&
- galleryCriterion.modifier === GQL.CriterionModifier.Excludes
- ) {
- // add the gallery if not present
if (
- !galleryCriterion.value.find((p) => {
- return p.id === gallery.id;
- })
+ galleryCriterion &&
+ galleryCriterion.modifier === GQL.CriterionModifier.Excludes
) {
- galleryCriterion.value.push(galleryValue);
+ // add the gallery if not present
+ if (
+ !galleryCriterion.value.find((p) => {
+ return p.id === gallery.id;
+ })
+ ) {
+ galleryCriterion.value.push(galleryValue);
+ }
+
+ galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+ } else {
+ // overwrite
+ galleryCriterion = new GalleriesCriterion();
+ galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
+ galleryCriterion.value = [galleryValue];
+ filter.criteria.push(galleryCriterion);
}
- galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
- } else {
- // overwrite
- galleryCriterion = new GalleriesCriterion();
- galleryCriterion.modifier = GQL.CriterionModifier.Excludes;
- galleryCriterion.value = [galleryValue];
- filter.criteria.push(galleryCriterion);
- }
-
- return filter;
- }
+ return filter;
+ },
+ [gallery]
+ );
async function addImages(
result: GQL.FindImagesQueryResult,
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
index 174e507a8..c555116b5 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
import * as GQL from "src/core/generated-graphql";
import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -32,40 +32,43 @@ export const GalleryImagesPanel: React.FC =
const intl = useIntl();
const Toast = useToast();
- function filterHook(filter: ListFilterModel) {
- const galleryValue = {
- id: gallery.id!,
- label: galleryTitle(gallery),
- };
- // if galleries is already present, then we modify it, otherwise add
- let galleryCriterion = filter.criteria.find((c) => {
- return c.criterionOption.type === "galleries";
- }) as GalleriesCriterion | undefined;
+ const filterHook = useCallback(
+ (filter: ListFilterModel) => {
+ const galleryValue = {
+ id: gallery.id!,
+ label: galleryTitle(gallery),
+ };
+ // if galleries is already present, then we modify it, otherwise add
+ let galleryCriterion = filter.criteria.find((c) => {
+ return c.criterionOption.type === "galleries";
+ }) as GalleriesCriterion | undefined;
- if (
- galleryCriterion &&
- (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
- galleryCriterion.modifier === GQL.CriterionModifier.Includes)
- ) {
- // add the gallery if not present
if (
- !galleryCriterion.value.find((p) => {
- return p.id === gallery.id;
- })
+ galleryCriterion &&
+ (galleryCriterion.modifier === GQL.CriterionModifier.IncludesAll ||
+ galleryCriterion.modifier === GQL.CriterionModifier.Includes)
) {
- galleryCriterion.value.push(galleryValue);
+ // add the gallery if not present
+ if (
+ !galleryCriterion.value.find((p) => {
+ return p.id === gallery.id;
+ })
+ ) {
+ galleryCriterion.value.push(galleryValue);
+ }
+
+ galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
+ } else {
+ // overwrite
+ galleryCriterion = new GalleriesCriterion();
+ galleryCriterion.value = [galleryValue];
+ filter.criteria.push(galleryCriterion);
}
- galleryCriterion.modifier = GQL.CriterionModifier.IncludesAll;
- } else {
- // overwrite
- galleryCriterion = new GalleriesCriterion();
- galleryCriterion.value = [galleryValue];
- filter.criteria.push(galleryCriterion);
- }
-
- return filter;
- }
+ return filter;
+ },
+ [gallery]
+ );
async function setCover(
result: GQL.FindImagesQueryResult,
diff --git a/ui/v2.5/src/components/Galleries/styles.scss b/ui/v2.5/src/components/Galleries/styles.scss
index b59da415e..b05be7856 100644
--- a/ui/v2.5/src/components/Galleries/styles.scss
+++ b/ui/v2.5/src/components/Galleries/styles.scss
@@ -17,7 +17,7 @@
order: 1;
}
- .gallery-studio-image {
+ .studio-logo {
flex: 0 0 25%;
order: 2;
}
diff --git a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
index ef3171de2..99c482aba 100644
--- a/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
+++ b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
@@ -1,26 +1,26 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
import { useBulkGroupUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { ModalComponent } from "../Shared/Modal";
import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { MultiSet } from "../Shared/MultiSet";
import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
- getAggregateIds,
- getAggregateInputIDs,
getAggregateInputValue,
- getAggregateRating,
- getAggregateStudioId,
+ getAggregateStateObject,
getAggregateTagIds,
+ getAggregateStudioId,
+ getAggregateIds,
} from "src/utils/bulkUpdate";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import { isEqual } from "lodash-es";
-import { MultiSet } from "../Shared/MultiSet";
-import { ContainingGroupsMultiSet } from "./ContainingGroupsMultiSet";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
import { IRelatedGroupEntry } from "./GroupDetails/RelatedGroupTable";
+import { ContainingGroupsMultiSet } from "./ContainingGroupsMultiSet";
+import { getDateError } from "src/utils/yup";
interface IListOperationProps {
selected: GQL.ListGroupDataFragment[];
@@ -67,50 +67,86 @@ function getAggregateContainingGroupInput(
return undefined;
}
+const groupFields = ["rating100", "synopsis", "director", "date"];
+
export const EditGroupsDialog: React.FC = (
props: IListOperationProps
) => {
const intl = useIntl();
const Toast = useToast();
- const [rating100, setRating] = useState();
- const [studioId, setStudioId] = useState();
- const [director, setDirector] = useState();
- const [tagMode, setTagMode] = React.useState(
- GQL.BulkUpdateIdMode.Add
- );
- const [tagIds, setTagIds] = useState();
- const [existingTagIds, setExistingTagIds] = useState();
+ const [updateInput, setUpdateInput] = useState({
+ ids: props.selected.map((group) => {
+ return group.id;
+ }),
+ });
+ const [tagIds, setTagIds] = useState({
+ mode: GQL.BulkUpdateIdMode.Add,
+ });
const [containingGroupsMode, setGroupMode] =
React.useState(GQL.BulkUpdateIdMode.Add);
const [containingGroups, setGroups] = useState();
- const [existingContainingGroups, setExistingContainingGroups] =
- useState();
- const [updateGroups] = useBulkGroupUpdate(getGroupInput());
+ const unsetDisabled = props.selected.length < 2;
+ const [updateGroups] = useBulkGroupUpdate();
+
+ const [dateError, setDateError] = useState();
+
+ // Network state
const [isUpdating, setIsUpdating] = useState(false);
- function getGroupInput(): GQL.BulkGroupUpdateInput {
- const aggregateRating = getAggregateRating(props.selected);
- const aggregateStudioId = getAggregateStudioId(props.selected);
- const aggregateTagIds = getAggregateTagIds(props.selected);
+ const aggregateState = useMemo(() => {
+ const updateState: Partial = {};
+ const state = props.selected;
+ updateState.studio_id = getAggregateStudioId(props.selected);
+ const updateTagIds = getAggregateTagIds(props.selected);
const aggregateGroups = getAggregateContainingGroups(props.selected);
+ let first = true;
+ state.forEach((group: GQL.ListGroupDataFragment) => {
+ getAggregateStateObject(updateState, group, groupFields, first);
+ first = false;
+ });
+
+ return {
+ state: updateState,
+ tagIds: updateTagIds,
+ containingGroups: aggregateGroups,
+ };
+ }, [props.selected]);
+
+ // update initial state from aggregate
+ useEffect(() => {
+ setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+ }, [aggregateState]);
+
+ useEffect(() => {
+ setDateError(getDateError(updateInput.date ?? "", intl));
+ }, [updateInput.date, intl]);
+
+ function setUpdateField(input: Partial) {
+ setUpdateInput((current) => ({ ...current, ...input }));
+ }
+
+ function getGroupInput(): GQL.BulkGroupUpdateInput {
const groupInput: GQL.BulkGroupUpdateInput = {
- ids: props.selected.map((group) => group.id),
- director,
+ ...updateInput,
+ tag_ids: tagIds,
};
- groupInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
- groupInput.studio_id = getAggregateInputValue(studioId, aggregateStudioId);
- groupInput.tag_ids = getAggregateInputIDs(tagMode, tagIds, aggregateTagIds);
+ // we don't have unset functionality for the rating star control
+ // so need to determine if we are setting a rating or not
+ groupInput.rating100 = getAggregateInputValue(
+ updateInput.rating100,
+ aggregateState.state.rating100
+ );
groupInput.containing_groups = getAggregateContainingGroupInput(
containingGroupsMode,
containingGroups,
- aggregateGroups
+ aggregateState.containingGroups
);
return groupInput;
@@ -119,13 +155,11 @@ export const EditGroupsDialog: React.FC = (
async function onSave() {
setIsUpdating(true);
try {
- await updateGroups();
+ await updateGroups({ variables: { input: getGroupInput() } });
Toast.success(
intl.formatMessage(
{ id: "toast.updated_entity" },
- {
- entity: intl.formatMessage({ id: "groups" }).toLocaleLowerCase(),
- }
+ { entity: intl.formatMessage({ id: "groups" }).toLocaleLowerCase() }
)
);
props.onClose(true);
@@ -135,67 +169,24 @@ export const EditGroupsDialog: React.FC = (
setIsUpdating(false);
}
- useEffect(() => {
- const state = props.selected;
- let updateRating: number | undefined;
- let updateStudioId: string | undefined;
- let updateTagIds: string[] = [];
- let updateContainingGroupIds: IRelatedGroupEntry[] = [];
- let updateDirector: string | undefined;
- let first = true;
-
- state.forEach((group: GQL.ListGroupDataFragment) => {
- const groupTagIDs = (group.tags ?? []).map((p) => p.id).sort();
- const groupContainingGroupIDs = (group.containing_groups ?? []).sort(
- (a, b) => a.group.id.localeCompare(b.group.id)
- );
-
- if (first) {
- first = false;
- updateRating = group.rating100 ?? undefined;
- updateStudioId = group.studio?.id ?? undefined;
- updateTagIds = groupTagIDs;
- updateContainingGroupIds = groupContainingGroupIDs;
- updateDirector = group.director ?? undefined;
- } else {
- if (group.rating100 !== updateRating) {
- updateRating = undefined;
- }
- if (group.studio?.id !== updateStudioId) {
- updateStudioId = undefined;
- }
- if (group.director !== updateDirector) {
- updateDirector = undefined;
- }
- if (!isEqual(groupTagIDs, updateTagIds)) {
- updateTagIds = [];
- }
- if (!isEqual(groupContainingGroupIDs, updateContainingGroupIds)) {
- updateTagIds = [];
- }
- }
- });
-
- setRating(updateRating);
- setStudioId(updateStudioId);
- setExistingTagIds(updateTagIds);
- setExistingContainingGroups(updateContainingGroupIds);
- setDirector(updateDirector);
- }, [props.selected]);
-
function render() {
return (
props.onClose(false),
text: intl.formatMessage({ id: "actions.cancel" }),
@@ -204,74 +195,90 @@ export const EditGroupsDialog: React.FC = (
isRunning={isUpdating}
>
);
diff --git a/ui/v2.5/src/components/Images/EditImagesDialog.tsx b/ui/v2.5/src/components/Images/EditImagesDialog.tsx
index 275ff1556..a90ef922e 100644
--- a/ui/v2.5/src/components/Images/EditImagesDialog.tsx
+++ b/ui/v2.5/src/components/Images/EditImagesDialog.tsx
@@ -1,96 +1,121 @@
-import React, { useEffect, useState } from "react";
-import { Form, Col, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
-import isEqual from "lodash-es/isEqual";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
import { useBulkImageUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { StudioSelect } from "src/components/Shared/Select";
-import { ModalComponent } from "src/components/Shared/Modal";
-import { useToast } from "src/hooks/Toast";
-import * as FormUtils from "src/utils/form";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
- getAggregateGalleryIds,
- getAggregateInputIDs,
getAggregateInputValue,
getAggregatePerformerIds,
- getAggregateRating,
- getAggregateStudioId,
+ getAggregateStateObject,
getAggregateTagIds,
+ getAggregateStudioId,
+ getAggregateGalleryIds,
} from "src/utils/bulkUpdate";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
interface IListOperationProps {
selected: GQL.SlimImageDataFragment[];
onClose: (applied: boolean) => void;
}
+const imageFields = [
+ "code",
+ "rating100",
+ "details",
+ "organized",
+ "photographer",
+ "date",
+];
+
export const EditImagesDialog: React.FC = (
props: IListOperationProps
) => {
const intl = useIntl();
const Toast = useToast();
- const [rating100, setRating] = useState();
- const [studioId, setStudioId] = useState();
- const [performerMode, setPerformerMode] =
- React.useState(GQL.BulkUpdateIdMode.Add);
- const [performerIds, setPerformerIds] = useState();
- const [existingPerformerIds, setExistingPerformerIds] = useState();
- const [tagMode, setTagMode] = React.useState(
- GQL.BulkUpdateIdMode.Add
- );
- const [tagIds, setTagIds] = useState();
- const [existingTagIds, setExistingTagIds] = useState();
+ const [updateInput, setUpdateInput] = useState({
+ ids: props.selected.map((image) => {
+ return image.id;
+ }),
+ });
- const [galleryMode, setGalleryMode] = React.useState(
- GQL.BulkUpdateIdMode.Add
- );
- const [galleryIds, setGalleryIds] = useState();
- const [existingGalleryIds, setExistingGalleryIds] = useState();
+ const [performerIds, setPerformerIds] = useState({
+ mode: GQL.BulkUpdateIdMode.Add,
+ });
+ const [tagIds, setTagIds] = useState({
+ mode: GQL.BulkUpdateIdMode.Add,
+ });
+ const [galleryIds, setGalleryIds] = useState({
+ mode: GQL.BulkUpdateIdMode.Add,
+ });
- const [organized, setOrganized] = useState();
+ const unsetDisabled = props.selected.length < 2;
+
+ const [dateError, setDateError] = useState();
const [updateImages] = useBulkImageUpdate();
// Network state
const [isUpdating, setIsUpdating] = useState(false);
- const checkboxRef = React.createRef();
+ const aggregateState = useMemo(() => {
+ const updateState: Partial = {};
+ const state = props.selected;
+ updateState.studio_id = getAggregateStudioId(props.selected);
+ const updateTagIds = getAggregateTagIds(props.selected);
+ const updatePerformerIds = getAggregatePerformerIds(props.selected);
+ const updateGalleryIds = getAggregateGalleryIds(props.selected);
+ let first = true;
+
+ state.forEach((image: GQL.SlimImageDataFragment) => {
+ getAggregateStateObject(updateState, image, imageFields, first);
+ first = false;
+ });
+
+ return {
+ state: updateState,
+ tagIds: updateTagIds,
+ performerIds: updatePerformerIds,
+ galleryIds: updateGalleryIds,
+ };
+ }, [props.selected]);
+
+ // update initial state from aggregate
+ useEffect(() => {
+ setUpdateInput((current) => ({ ...current, ...aggregateState.state }));
+ }, [aggregateState]);
+
+ useEffect(() => {
+ setDateError(getDateError(updateInput.date ?? "", intl));
+ }, [updateInput.date, intl]);
+
+ function setUpdateField(input: Partial) {
+ setUpdateInput((current) => ({ ...current, ...input }));
+ }
function getImageInput(): GQL.BulkImageUpdateInput {
- // need to determine what we are actually setting on each image
- const aggregateRating = getAggregateRating(props.selected);
- const aggregateStudioId = getAggregateStudioId(props.selected);
- const aggregatePerformerIds = getAggregatePerformerIds(props.selected);
- const aggregateTagIds = getAggregateTagIds(props.selected);
- const aggregateGalleryIds = getAggregateGalleryIds(props.selected);
-
const imageInput: GQL.BulkImageUpdateInput = {
- ids: props.selected.map((image) => {
- return image.id;
- }),
+ ...updateInput,
+ tag_ids: tagIds,
+ performer_ids: performerIds,
+ gallery_ids: galleryIds,
};
- imageInput.rating100 = getAggregateInputValue(rating100, aggregateRating);
- imageInput.studio_id = getAggregateInputValue(studioId, aggregateStudioId);
-
- imageInput.performer_ids = getAggregateInputIDs(
- performerMode,
- performerIds,
- aggregatePerformerIds
+ // we don't have unset functionality for the rating star control
+ // so need to determine if we are setting a rating or not
+ imageInput.rating100 = getAggregateInputValue(
+ updateInput.rating100,
+ aggregateState.state.rating100
);
- imageInput.tag_ids = getAggregateInputIDs(tagMode, tagIds, aggregateTagIds);
- imageInput.gallery_ids = getAggregateInputIDs(
- galleryMode,
- galleryIds,
- aggregateGalleryIds
- );
-
- if (organized !== undefined) {
- imageInput.organized = organized;
- }
return imageInput;
}
@@ -98,11 +123,7 @@ export const EditImagesDialog: React.FC = (
async function onSave() {
setIsUpdating(true);
try {
- await updateImages({
- variables: {
- input: getImageInput(),
- },
- });
+ await updateImages({ variables: { input: getImageInput() } });
Toast.success(
intl.formatMessage(
{ id: "toast.updated_entity" },
@@ -116,86 +137,13 @@ export const EditImagesDialog: React.FC = (
setIsUpdating(false);
}
- useEffect(() => {
- const state = props.selected;
- let updateRating: number | undefined;
- let updateStudioID: string | undefined;
- let updatePerformerIds: string[] = [];
- let updateTagIds: string[] = [];
- let updateGalleryIds: string[] = [];
- let updateOrganized: boolean | undefined;
- let first = true;
-
- state.forEach((image: GQL.SlimImageDataFragment) => {
- const imageRating = image.rating100;
- const imageStudioID = image?.studio?.id;
- const imagePerformerIDs = (image.performers ?? [])
- .map((p) => p.id)
- .sort();
- const imageTagIDs = (image.tags ?? []).map((p) => p.id).sort();
- const imageGalleryIDs = (image.galleries ?? []).map((p) => p.id).sort();
-
- if (first) {
- updateRating = imageRating ?? undefined;
- updateStudioID = imageStudioID;
- updatePerformerIds = imagePerformerIDs;
- updateTagIds = imageTagIDs;
- updateGalleryIds = imageGalleryIDs;
- updateOrganized = image.organized;
- first = false;
- } else {
- if (imageRating !== updateRating) {
- updateRating = undefined;
- }
- if (imageStudioID !== updateStudioID) {
- updateStudioID = undefined;
- }
- if (!isEqual(imagePerformerIDs, updatePerformerIds)) {
- updatePerformerIds = [];
- }
- if (!isEqual(imageTagIDs, updateTagIds)) {
- updateTagIds = [];
- }
- if (!isEqual(imageGalleryIDs, updateGalleryIds)) {
- updateGalleryIds = [];
- }
- if (image.organized !== updateOrganized) {
- updateOrganized = undefined;
- }
- }
- });
-
- setRating(updateRating);
- setStudioId(updateStudioID);
- setExistingPerformerIds(updatePerformerIds);
- setExistingTagIds(updateTagIds);
- setExistingGalleryIds(updateGalleryIds);
- setOrganized(updateOrganized);
- }, [props.selected]);
-
- useEffect(() => {
- if (checkboxRef.current) {
- checkboxRef.current.indeterminate = organized === undefined;
- }
- }, [organized, checkboxRef]);
-
- function cycleOrganized() {
- if (organized) {
- setOrganized(undefined);
- } else if (organized === undefined) {
- setOrganized(false);
- } else {
- setOrganized(true);
- }
- }
-
function render() {
return (
= (
onClick: onSave,
text: intl.formatMessage({ id: "actions.apply" }),
}}
+ disabled={isUpdating || !!dateError}
cancel={{
onClick: () => props.onClose(false),
text: intl.formatMessage({ id: "actions.cancel" }),
@@ -214,89 +163,120 @@ export const EditImagesDialog: React.FC = (
isRunning={isUpdating}
>
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index f79d95fca..f885c21bb 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -1,7 +1,7 @@
import { Tab, Nav, Dropdown } from "react-bootstrap";
import React, { useEffect, useMemo, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory, Link, RouteComponentProps } from "react-router-dom";
+import { useHistory, RouteComponentProps } from "react-router-dom";
import { Helmet } from "react-helmet";
import {
useFindImage,
@@ -37,6 +37,7 @@ import { TruncatedText } from "src/components/Shared/TruncatedText";
import { goBackOrReplace } from "src/utils/history";
import { FormattedDate } from "src/components/Shared/Date";
import { GenerateDialog } from "src/components/Dialogs/GenerateDialog";
+import { StudioLogo } from "src/components/Shared/StudioLogo";
interface IProps {
image: GQL.ImageDataFragment;
@@ -51,6 +52,7 @@ const ImagePage: React.FC = ({ image }) => {
const Toast = useToast();
const intl = useIntl();
const { configuration } = useConfigurationContext();
+ const { showStudioText } = configuration?.ui ?? {};
const [incrementO] = useImageIncrementO(image.id);
const [decrementO] = useImageDecrementO(image.id);
@@ -326,17 +328,7 @@ const ImagePage: React.FC = ({ image }) => {
- {image.studio && (
-
-
- 
-
-
- )}
+
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 35c367a8a..00b23b0aa 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -751,7 +751,7 @@ export const FilteredImageList = PatchComponent(
currentPage={filter.currentPage}
itemsPerPage={filter.itemsPerPage}
totalItems={totalCount}
- onChangePage={(page) => setFilter(filter.changePage(page))}
+ onChangePage={setPage}
/>
setFilter(filter.changePage(page))}
+ onChangePage={setPage}
onSelectChange={onSelectChange}
pageCount={pageCount}
selectedIds={selectedIds}
diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 43ac56590..0a8ca760e 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -9,7 +9,7 @@
order: 1;
}
- .image-studio-image {
+ .studio-logo {
flex: 0 0 25%;
order: 2;
}
diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
index 38e9d21ec..3eaaf0427 100644
--- a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -1,6 +1,10 @@
import React, { useCallback, useEffect, useMemo, useState } from "react";
import {
+ CriterionModifier,
+ FilterMode,
FolderDataFragment,
+ MultiCriterionInput,
+ useFindFolderHierarchyForIDsQuery,
useFindFoldersForQueryQuery,
useFindRootFoldersForSelectQuery,
} from "src/core/generated-graphql";
@@ -141,15 +145,71 @@ function replaceFolder(folder: IFolder): (f: IFolder) => IFolder {
};
}
-function useFolderMap(query: string, skip?: boolean) {
+function mergeFolderMaps(base: IFolder[], update: IFolder[]): IFolder[] {
+ const ret = [...base];
+
+ update.forEach((updateFolder) => {
+ const existingIndex = ret.findIndex((f) => f.id === updateFolder.id);
+ if (existingIndex === -1) {
+ // not found, add to the end
+ ret.push(updateFolder);
+ } else {
+ // found, replace
+ ret[existingIndex] = updateFolder;
+ }
+ });
+
+ return ret;
+}
+
+function useFolderMap(props: {
+ query: string;
+ skip?: boolean;
+ initialSelected?: string[];
+ mode?: FilterMode;
+}) {
+ const { query, skip = false, initialSelected, mode } = props;
+
+ const [cachedInitialSelected] = useState(initialSelected ?? []);
+
+ // exclude zip folders for scenes and galleries
+ const excludeZipFolders =
+ mode === FilterMode.Scenes || mode === FilterMode.Galleries;
+
+ const zipFileFilter: MultiCriterionInput | undefined = useMemo(
+ () =>
+ excludeZipFolders
+ ? {
+ modifier: CriterionModifier.IsNull,
+ }
+ : undefined,
+ [excludeZipFolders]
+ );
+
+ const folderFilterForQuery = useMemo(
+ () => (zipFileFilter ? { zip_file: zipFileFilter } : undefined),
+ [zipFileFilter]
+ );
+
const { data: rootFoldersResult } = useFindRootFoldersForSelectQuery({
skip,
+ variables: {
+ zip_file_filter: zipFileFilter,
+ },
});
const { data: queryFoldersResult } = useFindFoldersForQueryQuery({
skip: !query,
variables: {
filter: { q: query, per_page: 200 },
+ folder_filter: folderFilterForQuery,
+ },
+ });
+
+ const { data: initialSelectedResult } = useFindFolderHierarchyForIDsQuery({
+ skip: !initialSelected || cachedInitialSelected.length === 0,
+ variables: {
+ ids: cachedInitialSelected ?? [],
},
});
@@ -158,6 +218,88 @@ function useFolderMap(query: string, skip?: boolean) {
return ret.map((f) => ({ ...f, expanded: false, children: undefined }));
}, [rootFoldersResult]);
+ const initialSelectedFolders: IFolder[] = useMemo(() => {
+ const ret: IFolder[] = [];
+ (initialSelectedResult?.findFolders.folders ?? []).forEach((folder) => {
+ if (!folder.parent_folders.length) {
+ // add root folder if not present
+ if (!ret.find((f) => f.id === folder.id)) {
+ ret.push({ ...folder, expanded: true, children: [] });
+ }
+ return;
+ }
+
+ let currentParent: IFolder | undefined;
+
+ for (let i = folder.parent_folders.length - 1; i >= 0; i--) {
+ const thisFolder = folder.parent_folders[i];
+ let existing: IFolder | undefined;
+
+ if (i === folder.parent_folders.length - 1) {
+ // last parent, add the folder as root if not present
+ existing = ret.find((f) => f.id === thisFolder.id);
+ if (!existing) {
+ existing = {
+ ...folder.parent_folders[i],
+ expanded: true,
+ children: folder.parent_folders[i].sub_folders
+ // filter out zip folders if needed
+ .filter((f) => f.zip_file === null || !excludeZipFolders)
+ .map((f) => ({
+ ...f,
+ expanded: false,
+ children: undefined,
+ })),
+ };
+ ret.push(existing);
+ }
+ currentParent = existing;
+ continue;
+ }
+
+ const existingIndex =
+ currentParent!.children?.findIndex((f) => f.id === thisFolder.id) ??
+ -1;
+ if (existingIndex === -1) {
+ // should be guaranteed
+ throw new Error(
+ `Parent folder ${thisFolder.id} not found in children of ${
+ currentParent!.id
+ }`
+ );
+ }
+
+ existing = currentParent!.children![existingIndex];
+
+ // replace children
+ existing = {
+ ...existing,
+ expanded: true,
+ // filter out zip folders if needed
+ children: thisFolder.sub_folders
+ .filter((f) => f.zip_file === null || !excludeZipFolders)
+ .map((f) => ({
+ ...f,
+ expanded: false,
+ children: undefined,
+ })),
+ };
+
+ currentParent!.children![existingIndex] = existing;
+ currentParent = existing;
+ }
+ });
+ return ret;
+ }, [initialSelectedResult, excludeZipFolders]);
+
+ const mergedRootFolders = useMemo(() => {
+ if (query) {
+ return rootFolders;
+ }
+
+ return mergeFolderMaps(rootFolders, initialSelectedFolders);
+ }, [rootFolders, initialSelectedFolders, query]);
+
const queryFolders: IFolder[] = useMemo(() => {
// construct the folder list from the query result
const ret: IFolder[] = [];
@@ -229,18 +371,21 @@ function useFolderMap(query: string, skip?: boolean) {
useEffect(() => {
if (!query) {
- setFolderMap(rootFolders);
+ setFolderMap(mergedRootFolders);
} else {
setFolderMap(queryFolders);
}
- }, [query, rootFolders, queryFolders]);
+ }, [query, mergedRootFolders, queryFolders]);
async function onToggleExpanded(folder: IFolder) {
setFolderMap(folderMap.map(toggleExpandedFn(folder)));
// query children folders if not already loaded
if (folder.children === undefined) {
- const subFolderResult = await queryFindSubFolders(folder.id);
+ const subFolderResult = await queryFindSubFolders(
+ folder.id,
+ excludeZipFolders
+ );
setFolderMap((current) =>
current.map(
replaceFolder({
@@ -312,17 +457,19 @@ export const FolderSelector: React.FC<{
interface IInputFilterProps {
criterion: FolderCriterion;
setCriterion: (c: FolderCriterion) => void;
+ mode?: FilterMode;
}
export const FolderFilter: React.FC = ({
criterion,
setCriterion,
+ mode,
}) => {
const intl = useIntl();
const [query, setQuery] = useState("");
const [displayQuery, onQueryChange] = useDebouncedState(query, setQuery, 250);
- const { folderMap, onToggleExpanded } = useFolderMap(query);
+ const { folderMap, onToggleExpanded } = useFolderMap({ query, mode });
const messages = defineMessages({
sub_folder_depth: {
@@ -472,8 +619,6 @@ export const SidebarFolderFilter: React.FC<
props.onOpen?.();
}
- const { folderMap, onToggleExpanded } = useFolderMap(query, skip);
-
const option = props.criterionOption ?? FolderCriterionOption;
const { filter, setFilter } = props;
@@ -487,16 +632,28 @@ export const SidebarFolderFilter: React.FC<
return newCriterion;
}, [option.type, filter]);
+ const subDirsSelected = criterion.value?.depth === -1;
+
// if there are multiple values or excluded values, then we show none of the
// current values
const multipleSelected =
criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
+ const { folderMap, onToggleExpanded } = useFolderMap({
+ query,
+ skip,
+ initialSelected: criterion.value.items.map((i) => i.id),
+ mode: filter.mode,
+ });
+
function onSelect(folder: IFolder) {
+ // maintain sub-folder select if present
+ const depth = subDirsSelected ? -1 : 0;
+
const c = criterion.clone() as FolderCriterion;
c.value = {
items: [{ id: folder.id, label: folder.path }],
- depth: 0,
+ depth,
excluded: [],
};
@@ -550,8 +707,6 @@ export const SidebarFolderFilter: React.FC<
}
}
- const subDirsSelected = criterion.value?.depth === -1;
-
const selectedList = useMemo(() => {
if (multipleSelected) {
return null;
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 89c32222f..da52ea765 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import Mousetrap from "mousetrap";
import { ListFilterModel } from "src/models/list-filter/filter";
import { useHistory, useLocation } from "react-router-dom";
@@ -489,20 +489,20 @@ export function useCachedQueryResult(
result: T
) {
const [cachedResult, setCachedResult] = useState(result);
- const [lastFilter, setLastFilter] = useState(filter);
+ const lastFilterRef = useRef(filter);
// if we are only changing the page or sort, don't update the result count
useEffect(() => {
if (!result.loading) {
setCachedResult(result);
} else {
- if (totalCountImpacted(lastFilter, filter)) {
+ if (totalCountImpacted(lastFilterRef.current, filter)) {
setCachedResult(result);
}
}
- setLastFilter(filter);
- }, [filter, result, lastFilter]);
+ lastFilterRef.current = filter;
+ }, [filter, result]);
return cachedResult;
}
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index d60118d4b..06ae2834a 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
-import { Col, Form, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { ModalComponent } from "../Shared/Modal";
@@ -23,12 +23,13 @@ import {
stringToCircumcised,
} from "src/utils/circumcised";
import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import * as FormUtils from "src/utils/form";
import { CountrySelect } from "../Shared/CountrySelect";
import { useConfigurationContext } from "src/hooks/Config";
import cx from "classnames";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@@ -75,17 +76,42 @@ export const EditPerformersDialog: React.FC = (
const [aggregateState, setAggregateState] =
useState({});
// height and weight needs conversion to/from number
- const [height, setHeight] = useState();
- const [weight, setWeight] = useState();
- const [penis_length, setPenisLength] = useState();
+ const [height, setHeight] = useState();
+ const [weight, setWeight] = useState();
+ const [penis_length, setPenisLength] = useState();
const [updateInput, setUpdateInput] = useState(
{}
);
const genderOptions = [""].concat(genderStrings);
const circumcisedOptions = [""].concat(circumcisedStrings);
+ const unsetDisabled = props.selected.length < 2;
+
const [updatePerformers] = useBulkPerformerUpdate(getPerformerInput());
+ const [birthdateError, setBirthdateError] = useState();
+ const [deathDateError, setDeathDateError] = useState();
+ const [careerStartError, setCareerStartError] = useState<
+ string | undefined
+ >();
+ const [careerEndError, setCareerEndError] = useState();
+
+ useEffect(() => {
+ setBirthdateError(getDateError(updateInput.birthdate ?? "", intl));
+ }, [updateInput.birthdate, intl]);
+
+ useEffect(() => {
+ setDeathDateError(getDateError(updateInput.death_date ?? "", intl));
+ }, [updateInput.death_date, intl]);
+
+ useEffect(() => {
+ setCareerStartError(getDateError(updateInput.career_start ?? "", intl));
+ }, [updateInput.career_start, intl]);
+
+ useEffect(() => {
+ setCareerEndError(getDateError(updateInput.career_end ?? "", intl));
+ }, [updateInput.career_end, intl]);
+
// Network state
const [isUpdating, setIsUpdating] = useState(false);
@@ -121,14 +147,14 @@ export const EditPerformersDialog: React.FC = (
);
if (height !== undefined) {
- performerInput.height_cm = parseFloat(height);
+ performerInput.height_cm = height === null ? null : parseFloat(height);
}
if (weight !== undefined) {
- performerInput.weight = parseFloat(weight);
+ performerInput.weight = weight === null ? null : parseFloat(weight);
}
-
if (penis_length !== undefined) {
- performerInput.penis_length = parseFloat(penis_length);
+ performerInput.penis_length =
+ penis_length === null ? null : parseFloat(penis_length);
}
return performerInput;
@@ -205,25 +231,6 @@ export const EditPerformersDialog: React.FC = (
setUpdateInput(updateState);
}, [props.selected]);
- function renderTextField(
- name: string,
- value: string | undefined | null,
- setter: (newValue: string | undefined) => void
- ) {
- return (
-
-
-
- setter(newValue)}
- unsetDisabled={props.selected.length < 2}
- />
-
- );
- }
-
function render() {
// sfw class needs to be set because it is outside body
@@ -235,13 +242,18 @@ export const EditPerformersDialog: React.FC = (
show
icon={faPencilAlt}
header={intl.formatMessage(
- { id: "actions.edit_entity" },
- { entityType: intl.formatMessage({ id: "performers" }) }
+ { id: "dialogs.edit_entity_count_title" },
+ {
+ count: props?.selected?.length ?? 1,
+ singularEntity: intl.formatMessage({ id: "performer" }),
+ pluralEntity: intl.formatMessage({ id: "performers" }),
+ }
)}
accept={{
onClick: onSave,
text: intl.formatMessage({ id: "actions.apply" }),
}}
+ disabled={isUpdating || !!birthdateError || !!deathDateError}
cancel={{
onClick: () => props.onClose(false),
text: intl.formatMessage({ id: "actions.cancel" }),
@@ -249,11 +261,8 @@ export const EditPerformersDialog: React.FC = (
}}
isRunning={isUpdating}
>
-
- {FormUtils.renderLabel({
- title: intl.formatMessage({ id: "rating" }),
- })}
-
-
- {image.studio && (
-
-
-
- )}
+
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 35c367a8a..00b23b0aa 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -751,7 +751,7 @@ export const FilteredImageList = PatchComponent(
currentPage={filter.currentPage}
itemsPerPage={filter.itemsPerPage}
totalItems={totalCount}
- onChangePage={(page) => setFilter(filter.changePage(page))}
+ onChangePage={setPage}
/>
setFilter(filter.changePage(page))}
+ onChangePage={setPage}
onSelectChange={onSelectChange}
pageCount={pageCount}
selectedIds={selectedIds}
diff --git a/ui/v2.5/src/components/Images/styles.scss b/ui/v2.5/src/components/Images/styles.scss
index 43ac56590..0a8ca760e 100644
--- a/ui/v2.5/src/components/Images/styles.scss
+++ b/ui/v2.5/src/components/Images/styles.scss
@@ -9,7 +9,7 @@
order: 1;
}
- .image-studio-image {
+ .studio-logo {
flex: 0 0 25%;
order: 2;
}
diff --git a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
index 38e9d21ec..3eaaf0427 100644
--- a/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
+++ b/ui/v2.5/src/components/List/Filters/FolderFilter.tsx
@@ -1,6 +1,10 @@
import React, { useCallback, useEffect, useMemo, useState } from "react";
import {
+ CriterionModifier,
+ FilterMode,
FolderDataFragment,
+ MultiCriterionInput,
+ useFindFolderHierarchyForIDsQuery,
useFindFoldersForQueryQuery,
useFindRootFoldersForSelectQuery,
} from "src/core/generated-graphql";
@@ -141,15 +145,71 @@ function replaceFolder(folder: IFolder): (f: IFolder) => IFolder {
};
}
-function useFolderMap(query: string, skip?: boolean) {
+function mergeFolderMaps(base: IFolder[], update: IFolder[]): IFolder[] {
+ const ret = [...base];
+
+ update.forEach((updateFolder) => {
+ const existingIndex = ret.findIndex((f) => f.id === updateFolder.id);
+ if (existingIndex === -1) {
+ // not found, add to the end
+ ret.push(updateFolder);
+ } else {
+ // found, replace
+ ret[existingIndex] = updateFolder;
+ }
+ });
+
+ return ret;
+}
+
+function useFolderMap(props: {
+ query: string;
+ skip?: boolean;
+ initialSelected?: string[];
+ mode?: FilterMode;
+}) {
+ const { query, skip = false, initialSelected, mode } = props;
+
+ const [cachedInitialSelected] = useState(initialSelected ?? []);
+
+ // exclude zip folders for scenes and galleries
+ const excludeZipFolders =
+ mode === FilterMode.Scenes || mode === FilterMode.Galleries;
+
+ const zipFileFilter: MultiCriterionInput | undefined = useMemo(
+ () =>
+ excludeZipFolders
+ ? {
+ modifier: CriterionModifier.IsNull,
+ }
+ : undefined,
+ [excludeZipFolders]
+ );
+
+ const folderFilterForQuery = useMemo(
+ () => (zipFileFilter ? { zip_file: zipFileFilter } : undefined),
+ [zipFileFilter]
+ );
+
const { data: rootFoldersResult } = useFindRootFoldersForSelectQuery({
skip,
+ variables: {
+ zip_file_filter: zipFileFilter,
+ },
});
const { data: queryFoldersResult } = useFindFoldersForQueryQuery({
skip: !query,
variables: {
filter: { q: query, per_page: 200 },
+ folder_filter: folderFilterForQuery,
+ },
+ });
+
+ const { data: initialSelectedResult } = useFindFolderHierarchyForIDsQuery({
+ skip: !initialSelected || cachedInitialSelected.length === 0,
+ variables: {
+ ids: cachedInitialSelected ?? [],
},
});
@@ -158,6 +218,88 @@ function useFolderMap(query: string, skip?: boolean) {
return ret.map((f) => ({ ...f, expanded: false, children: undefined }));
}, [rootFoldersResult]);
+ const initialSelectedFolders: IFolder[] = useMemo(() => {
+ const ret: IFolder[] = [];
+ (initialSelectedResult?.findFolders.folders ?? []).forEach((folder) => {
+ if (!folder.parent_folders.length) {
+ // add root folder if not present
+ if (!ret.find((f) => f.id === folder.id)) {
+ ret.push({ ...folder, expanded: true, children: [] });
+ }
+ return;
+ }
+
+ let currentParent: IFolder | undefined;
+
+ for (let i = folder.parent_folders.length - 1; i >= 0; i--) {
+ const thisFolder = folder.parent_folders[i];
+ let existing: IFolder | undefined;
+
+ if (i === folder.parent_folders.length - 1) {
+ // last parent, add the folder as root if not present
+ existing = ret.find((f) => f.id === thisFolder.id);
+ if (!existing) {
+ existing = {
+ ...folder.parent_folders[i],
+ expanded: true,
+ children: folder.parent_folders[i].sub_folders
+ // filter out zip folders if needed
+ .filter((f) => f.zip_file === null || !excludeZipFolders)
+ .map((f) => ({
+ ...f,
+ expanded: false,
+ children: undefined,
+ })),
+ };
+ ret.push(existing);
+ }
+ currentParent = existing;
+ continue;
+ }
+
+ const existingIndex =
+ currentParent!.children?.findIndex((f) => f.id === thisFolder.id) ??
+ -1;
+ if (existingIndex === -1) {
+ // should be guaranteed
+ throw new Error(
+ `Parent folder ${thisFolder.id} not found in children of ${
+ currentParent!.id
+ }`
+ );
+ }
+
+ existing = currentParent!.children![existingIndex];
+
+ // replace children
+ existing = {
+ ...existing,
+ expanded: true,
+ // filter out zip folders if needed
+ children: thisFolder.sub_folders
+ .filter((f) => f.zip_file === null || !excludeZipFolders)
+ .map((f) => ({
+ ...f,
+ expanded: false,
+ children: undefined,
+ })),
+ };
+
+ currentParent!.children![existingIndex] = existing;
+ currentParent = existing;
+ }
+ });
+ return ret;
+ }, [initialSelectedResult, excludeZipFolders]);
+
+ const mergedRootFolders = useMemo(() => {
+ if (query) {
+ return rootFolders;
+ }
+
+ return mergeFolderMaps(rootFolders, initialSelectedFolders);
+ }, [rootFolders, initialSelectedFolders, query]);
+
const queryFolders: IFolder[] = useMemo(() => {
// construct the folder list from the query result
const ret: IFolder[] = [];
@@ -229,18 +371,21 @@ function useFolderMap(query: string, skip?: boolean) {
useEffect(() => {
if (!query) {
- setFolderMap(rootFolders);
+ setFolderMap(mergedRootFolders);
} else {
setFolderMap(queryFolders);
}
- }, [query, rootFolders, queryFolders]);
+ }, [query, mergedRootFolders, queryFolders]);
async function onToggleExpanded(folder: IFolder) {
setFolderMap(folderMap.map(toggleExpandedFn(folder)));
// query children folders if not already loaded
if (folder.children === undefined) {
- const subFolderResult = await queryFindSubFolders(folder.id);
+ const subFolderResult = await queryFindSubFolders(
+ folder.id,
+ excludeZipFolders
+ );
setFolderMap((current) =>
current.map(
replaceFolder({
@@ -312,17 +457,19 @@ export const FolderSelector: React.FC<{
interface IInputFilterProps {
criterion: FolderCriterion;
setCriterion: (c: FolderCriterion) => void;
+ mode?: FilterMode;
}
export const FolderFilter: React.FC = ({
criterion,
setCriterion,
+ mode,
}) => {
const intl = useIntl();
const [query, setQuery] = useState("");
const [displayQuery, onQueryChange] = useDebouncedState(query, setQuery, 250);
- const { folderMap, onToggleExpanded } = useFolderMap(query);
+ const { folderMap, onToggleExpanded } = useFolderMap({ query, mode });
const messages = defineMessages({
sub_folder_depth: {
@@ -472,8 +619,6 @@ export const SidebarFolderFilter: React.FC<
props.onOpen?.();
}
- const { folderMap, onToggleExpanded } = useFolderMap(query, skip);
-
const option = props.criterionOption ?? FolderCriterionOption;
const { filter, setFilter } = props;
@@ -487,16 +632,28 @@ export const SidebarFolderFilter: React.FC<
return newCriterion;
}, [option.type, filter]);
+ const subDirsSelected = criterion.value?.depth === -1;
+
// if there are multiple values or excluded values, then we show none of the
// current values
const multipleSelected =
criterion.value.items.length > 1 || criterion.value.excluded.length > 0;
+ const { folderMap, onToggleExpanded } = useFolderMap({
+ query,
+ skip,
+ initialSelected: criterion.value.items.map((i) => i.id),
+ mode: filter.mode,
+ });
+
function onSelect(folder: IFolder) {
+ // maintain sub-folder select if present
+ const depth = subDirsSelected ? -1 : 0;
+
const c = criterion.clone() as FolderCriterion;
c.value = {
items: [{ id: folder.id, label: folder.path }],
- depth: 0,
+ depth,
excluded: [],
};
@@ -550,8 +707,6 @@ export const SidebarFolderFilter: React.FC<
}
}
- const subDirsSelected = criterion.value?.depth === -1;
-
const selectedList = useMemo(() => {
if (multipleSelected) {
return null;
diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts
index 89c32222f..da52ea765 100644
--- a/ui/v2.5/src/components/List/util.ts
+++ b/ui/v2.5/src/components/List/util.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import Mousetrap from "mousetrap";
import { ListFilterModel } from "src/models/list-filter/filter";
import { useHistory, useLocation } from "react-router-dom";
@@ -489,20 +489,20 @@ export function useCachedQueryResult(
result: T
) {
const [cachedResult, setCachedResult] = useState(result);
- const [lastFilter, setLastFilter] = useState(filter);
+ const lastFilterRef = useRef(filter);
// if we are only changing the page or sort, don't update the result count
useEffect(() => {
if (!result.loading) {
setCachedResult(result);
} else {
- if (totalCountImpacted(lastFilter, filter)) {
+ if (totalCountImpacted(lastFilterRef.current, filter)) {
setCachedResult(result);
}
}
- setLastFilter(filter);
- }, [filter, result, lastFilter]);
+ lastFilterRef.current = filter;
+ }, [filter, result]);
return cachedResult;
}
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index d60118d4b..06ae2834a 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
-import { Col, Form, Row } from "react-bootstrap";
-import { FormattedMessage, useIntl } from "react-intl";
+import { Form } from "react-bootstrap";
+import { useIntl } from "react-intl";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { ModalComponent } from "../Shared/Modal";
@@ -23,12 +23,13 @@ import {
stringToCircumcised,
} from "src/utils/circumcised";
import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
-import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
+import { BulkUpdateFormGroup, BulkUpdateTextInput } from "../Shared/BulkUpdate";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import * as FormUtils from "src/utils/form";
import { CountrySelect } from "../Shared/CountrySelect";
import { useConfigurationContext } from "src/hooks/Config";
import cx from "classnames";
+import { BulkUpdateDateInput } from "../Shared/DateInput";
+import { getDateError } from "src/utils/yup";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@@ -75,17 +76,42 @@ export const EditPerformersDialog: React.FC = (
const [aggregateState, setAggregateState] =
useState({});
// height and weight needs conversion to/from number
- const [height, setHeight] = useState();
- const [weight, setWeight] = useState();
- const [penis_length, setPenisLength] = useState();
+ const [height, setHeight] = useState();
+ const [weight, setWeight] = useState();
+ const [penis_length, setPenisLength] = useState();
const [updateInput, setUpdateInput] = useState(
{}
);
const genderOptions = [""].concat(genderStrings);
const circumcisedOptions = [""].concat(circumcisedStrings);
+ const unsetDisabled = props.selected.length < 2;
+
const [updatePerformers] = useBulkPerformerUpdate(getPerformerInput());
+ const [birthdateError, setBirthdateError] = useState();
+ const [deathDateError, setDeathDateError] = useState();
+ const [careerStartError, setCareerStartError] = useState<
+ string | undefined
+ >();
+ const [careerEndError, setCareerEndError] = useState();
+
+ useEffect(() => {
+ setBirthdateError(getDateError(updateInput.birthdate ?? "", intl));
+ }, [updateInput.birthdate, intl]);
+
+ useEffect(() => {
+ setDeathDateError(getDateError(updateInput.death_date ?? "", intl));
+ }, [updateInput.death_date, intl]);
+
+ useEffect(() => {
+ setCareerStartError(getDateError(updateInput.career_start ?? "", intl));
+ }, [updateInput.career_start, intl]);
+
+ useEffect(() => {
+ setCareerEndError(getDateError(updateInput.career_end ?? "", intl));
+ }, [updateInput.career_end, intl]);
+
// Network state
const [isUpdating, setIsUpdating] = useState(false);
@@ -121,14 +147,14 @@ export const EditPerformersDialog: React.FC = (
);
if (height !== undefined) {
- performerInput.height_cm = parseFloat(height);
+ performerInput.height_cm = height === null ? null : parseFloat(height);
}
if (weight !== undefined) {
- performerInput.weight = parseFloat(weight);
+ performerInput.weight = weight === null ? null : parseFloat(weight);
}
-
if (penis_length !== undefined) {
- performerInput.penis_length = parseFloat(penis_length);
+ performerInput.penis_length =
+ penis_length === null ? null : parseFloat(penis_length);
}
return performerInput;
@@ -205,25 +231,6 @@ export const EditPerformersDialog: React.FC = (
setUpdateInput(updateState);
}, [props.selected]);
- function renderTextField(
- name: string,
- value: string | undefined | null,
- setter: (newValue: string | undefined) => void
- ) {
- return (
-
-
-
- setter(newValue)}
- unsetDisabled={props.selected.length < 2}
- />
-
- );
- }
-
function render() {
// sfw class needs to be set because it is outside body
@@ -235,13 +242,18 @@ export const EditPerformersDialog: React.FC = (
show
icon={faPencilAlt}
header={intl.formatMessage(
- { id: "actions.edit_entity" },
- { entityType: intl.formatMessage({ id: "performers" }) }
+ { id: "dialogs.edit_entity_count_title" },
+ {
+ count: props?.selected?.length ?? 1,
+ singularEntity: intl.formatMessage({ id: "performer" }),
+ pluralEntity: intl.formatMessage({ id: "performers" }),
+ }
)}
accept={{
onClick: onSave,
text: intl.formatMessage({ id: "actions.apply" }),
}}
+ disabled={isUpdating || !!birthdateError || !!deathDateError}
cancel={{
onClick: () => props.onClose(false),
text: intl.formatMessage({ id: "actions.cancel" }),
@@ -249,11 +261,8 @@ export const EditPerformersDialog: React.FC = (
}}
isRunning={isUpdating}
>
-
- {FormUtils.renderLabel({
- title: intl.formatMessage({ id: "rating" }),
- })}
-
-