-
{props.scene.date}
diff --git a/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx b/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx
new file mode 100644
index 000000000..8d9fb68c6
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/SceneCardsGrid.tsx
@@ -0,0 +1,43 @@
+import React from "react";
+import * as GQL from "src/core/generated-graphql";
+import { SceneCard } from "./SceneCard";
+
+interface ISceneCardsGrid {
+ scenes: GQL.SlimSceneDataFragment[];
+ selectedIds: Set
+ {scenes.map((scene, index) => (
+
+ );
+};
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
new file mode 100644
index 000000000..8ecf615cd
--- /dev/null
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
@@ -0,0 +1,153 @@
+import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
+import cx from "classnames";
+import * as GQL from "src/core/generated-graphql";
+import { TextUtils } from "src/utils";
+import { Button, Spinner } from "react-bootstrap";
+import { Icon } from "src/components/Shared";
+
+export interface IPlaylistViewer {
+ scenes?: GQL.SlimSceneDataFragment[];
+ currentID?: string;
+ start?: number;
+ hasMoreScenes: boolean;
+ onSceneClicked: (id: string) => void;
+ onNext: () => void;
+ onPrevious: () => void;
+ onRandom: () => void;
+ onMoreScenes: () => void;
+ onLessScenes: () => void;
+}
+
+export const QueueViewer: React.FC
+
+
+
+
+
+
+
+ {scene.title ?? TextUtils.fileNameFromPath(scene.path)}
+
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 3c8ed2fec..599d2502e 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -12,6 +12,8 @@ import {
useSceneStreams,
useSceneGenerateScreenshot,
useSceneUpdate,
+ queryFindScenes,
+ queryFindScenesByID,
} from "src/core/StashService";
import { GalleryViewer } from "src/components/Galleries/GalleryViewer";
import { ErrorMessage, LoadingIndicator, Icon } from "src/components/Shared";
@@ -19,6 +21,10 @@ import { useToast } from "src/hooks";
import { ScenePlayer } from "src/components/ScenePlayer";
import { TextUtils, JWUtils } from "src/utils";
import Mousetrap from "mousetrap";
+import { ListFilterModel } from "src/models/list-filter/filter";
+import { FilterMode } from "src/models/list-filter/types";
+import { SceneQueue } from "src/models/sceneQueue";
+import { QueueViewer } from "./QueueViewer";
import { SceneMarkersPanel } from "./SceneMarkersPanel";
import { SceneFileInfoPanel } from "./SceneFileInfoPanel";
import { SceneEditPanel } from "./SceneEditPanel";
@@ -65,8 +71,59 @@ export const Scene: React.FC = () => {
const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState
+
+
+ {(currentIndex ?? 0) > 0 ? (
+
+ ) : (
+ ""
+ )}
+ {(currentIndex ?? 0) < (scenes ?? []).length - 1 ? (
+
+ ) : (
+ ""
+ )}
+
+
+
+ {(start ?? 0) > 1 ? (
+
+
+
+
+ ) : undefined}
+ {(scenes ?? []).map(renderPlaylistEntry)}
+ {hasMoreScenes ? (
+
+
+
+ ) : undefined}
+
-
);
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index e0667e26a..7dc01c2c6 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -12,13 +12,14 @@ import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import Tagger from "src/components/Tagger";
+import { SceneQueue } from "src/models/sceneQueue";
import { WallPanel } from "../Wall/WallPanel";
-import { SceneCard } from "./SceneCard";
import { SceneListTable } from "./SceneListTable";
import { EditScenesDialog } from "./EditScenesDialog";
import { DeleteScenesDialog } from "./DeleteScenesDialog";
import { SceneGenerateDialog } from "./SceneGenerateDialog";
import { ExportDialog } from "../Shared/ExportDialog";
+import { SceneCardsGrid } from "./SceneCardsGrid";
interface ISceneList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
@@ -35,6 +36,11 @@ export const SceneList: React.FC
- {result.data.findScenes.scenes.map((scene) =>
- renderSceneCard(scene, selectedIds, zoomIndex)
- )}
-
+ Are you sure you want to delete {name ?? "movie"}?
+Are you sure you want to delete {movie?.name ?? "movie"}?
); } @@ -314,153 +211,42 @@ export const Movie: React.FC = () => { ); } - function updateMovieEditStateFromScraper( - state: Partial
+ 
+
+ );
+ }
+ }
+
+ function renderBackImage() {
+ let image = movie?.back_image_path;
+ if (isEditing) {
+ if (backImage === null) {
+ image = undefined;
+ } else if (backImage) {
+ image = backImage;
}
- } catch (e) {
- Toast.error(e);
- } finally {
- setIsLoading(false);
- }
- }
-
- function urlScrapable(scrapedUrl: string) {
- return (
- !!scrapedUrl &&
- (Scrapers?.data?.listMovieScrapers ?? []).some((s) =>
- (s?.movie?.urls ?? []).some((u) => scrapedUrl.includes(u))
- )
- );
- }
-
- function maybeRenderScrapeButton() {
- if (!url || !isEditing || !urlScrapable(url)) {
- return undefined;
- }
- return (
-
- );
- }
-
- function maybeRenderScrapeDialog() {
- if (!scrapedMovie) {
- return;
}
- const currentMovie = getMovieInput();
-
- // Get image paths for scrape gui
- currentMovie.front_image = movie.front_image_path;
- currentMovie.back_image = movie.back_image_path;
-
- return (
-
+
+
+ );
}
- setScrapedMovie(undefined);
- }
-
- function onClearFrontImage() {
- setFrontImage(null);
- setImagePreview(
- movie.front_image_path
- ? `${movie.front_image_path}?default=true`
- : undefined
- );
- }
-
- function onClearBackImage() {
- setBackImage(null);
- setBackImagePreview(
- movie.back_image_path
- ? `${movie.back_image_path}?default=true`
- : undefined
- );
}
if (isLoading) return
-
diff --git a/ui/v2.5/src/docs/en/Deduplication.md b/ui/v2.5/src/docs/en/Deduplication.md
new file mode 100644
index 000000000..e44d535e6
--- /dev/null
+++ b/ui/v2.5/src/docs/en/Deduplication.md
@@ -0,0 +1,9 @@
+# Dupe Checker
+
+[The dupe checker](/settings?tab=duplicates) searches your collection for scenes that are perceptually similar. This means that the files don't need to be identical, and will be identified even with different bitrates, resolutions, and intros/outros.
+
+To achieve this stash needs to generate what's called a phash, or perceptual hash. Similar to sprite generation stash will generate a set of 25 images from fixed points in the scene. These images will be stitched together, and then hashed using the phash algorithm. The phash can then be used to find scenes that are the same or similar to others in the database. Phash generation can be run during scan, or as a separate task. Note that generation can take a while due to the work involved with extracting screenshots.
+
+The dupe checker can be run with four different levels of accuracy. `Exact` looks for scenes that have exactly the same phash. This is a fast and accurate operation that should not yield any false positives except in very rare cases. The other accuracy levels look for duplicate files within a set distance of each other. This means the scenes don't have exactly the same phash, but are very similar. `High` and `Medium` should still yield very good results with few or no false positives. `Low` is likely to produce some false positives, but might still be useful for finding dupes.
+
+Note that to generate a phash stash requires an uncorrupted file. If any errors are encountered during sprite generation the phash will not be generated. This is to prevent false positives.
diff --git a/vendor/github.com/corona10/goimagehash/.gitignore b/vendor/github.com/corona10/goimagehash/.gitignore
new file mode 100644
index 000000000..a1338d685
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/.gitignore
@@ -0,0 +1,14 @@
+# Binaries for programs and plugins
+*.exe
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
+.glide/
diff --git a/vendor/github.com/corona10/goimagehash/AUTHORS.md b/vendor/github.com/corona10/goimagehash/AUTHORS.md
new file mode 100644
index 000000000..832d2331f
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/AUTHORS.md
@@ -0,0 +1,5 @@
+## AUTHORS
+- [Dominik Honnef](https://github.com/dominikh) dominik@honnef.co
+- [Dong-hee Na](https://github.com/corona10/) donghee.na92@gmail.com
+- [Gustavo Brunoro](https://github.com/brunoro/) git@hitnail.net
+- [Alex Higashino](https://github.com/TokyoWolFrog/) TokyoWolFrog@mayxyou.com
\ No newline at end of file
diff --git a/vendor/github.com/corona10/goimagehash/CODEOWNERS b/vendor/github.com/corona10/goimagehash/CODEOWNERS
new file mode 100644
index 000000000..4da23f706
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/CODEOWNERS
@@ -0,0 +1 @@
+*.go @corona10
diff --git a/vendor/github.com/corona10/goimagehash/Gopkg.lock b/vendor/github.com/corona10/goimagehash/Gopkg.lock
new file mode 100644
index 000000000..c51994eb6
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/Gopkg.lock
@@ -0,0 +1,17 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+ branch = "master"
+ digest = "1:34534b73e925d20cc72cf202f8b482fdcbe3a1b113e19375f31aadabd0f0f97d"
+ name = "github.com/nfnt/resize"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "83c6a9932646f83e3267f353373d47347b6036b2"
+
+[solve-meta]
+ analyzer-name = "dep"
+ analyzer-version = 1
+ input-imports = ["github.com/nfnt/resize"]
+ solver-name = "gps-cdcl"
+ solver-version = 1
diff --git a/vendor/github.com/corona10/goimagehash/Gopkg.toml b/vendor/github.com/corona10/goimagehash/Gopkg.toml
new file mode 100644
index 000000000..7d0d6d5e7
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/Gopkg.toml
@@ -0,0 +1,34 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+# name = "github.com/user/project"
+# version = "1.0.0"
+#
+# [[constraint]]
+# name = "github.com/user/project2"
+# branch = "dev"
+# source = "github.com/myfork/project2"
+#
+# [[override]]
+# name = "github.com/x/y"
+# version = "2.4.0"
+#
+# [prune]
+# non-go = false
+# go-tests = true
+# unused-packages = true
+
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/nfnt/resize"
+
+[prune]
+ go-tests = true
+ unused-packages = true
diff --git a/vendor/github.com/corona10/goimagehash/LICENSE b/vendor/github.com/corona10/goimagehash/LICENSE
new file mode 100644
index 000000000..37b5a9609
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2017, Dong-hee Na
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/corona10/goimagehash/README.md b/vendor/github.com/corona10/goimagehash/README.md
new file mode 100644
index 000000000..07bab1435
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/README.md
@@ -0,0 +1,93 @@
+
+[](https://godoc.org/github.com/corona10/goimagehash)
+[](https://goreportcard.com/report/github.com/corona10/goimagehash)
+
+# goimagehash
+> Inspired by [imagehash](https://github.com/JohannesBuchner/imagehash)
+
+A image hashing library written in Go. ImageHash supports:
+* [Average hashing](http://www.hackerfactor.com/blog/index.php?/archives/432-Looks-Like-It.html)
+* [Difference hashing](http://www.hackerfactor.com/blog/index.php?/archives/529-Kind-of-Like-That.html)
+* [Perception hashing](http://www.hackerfactor.com/blog/index.php?/archives/432-Looks-Like-It.html)
+* [Wavelet hashing](https://fullstackml.com/wavelet-image-hash-in-python-3504fdd282b5) [TODO]
+
+## Installation
+```
+go get github.com/corona10/goimagehash
+```
+## Special thanks to
+* [Haeun Kim](https://github.com/haeungun/)
+
+## Usage
+
+``` Go
+func main() {
+ file1, _ := os.Open("sample1.jpg")
+ file2, _ := os.Open("sample2.jpg")
+ defer file1.Close()
+ defer file2.Close()
+
+ img1, _ := jpeg.Decode(file1)
+ img2, _ := jpeg.Decode(file2)
+ hash1, _ := goimagehash.AverageHash(img1)
+ hash2, _ := goimagehash.AverageHash(img2)
+ distance, _ := hash1.Distance(hash2)
+ fmt.Printf("Distance between images: %v\n", distance)
+
+ hash1, _ = goimagehash.DifferenceHash(img1)
+ hash2, _ = goimagehash.DifferenceHash(img2)
+ distance, _ = hash1.Distance(hash2)
+ fmt.Printf("Distance between images: %v\n", distance)
+ width, height := 8, 8
+ hash3, _ = goimagehash.ExtAverageHash(img1, width, height)
+ hash4, _ = goimagehash.ExtAverageHash(img2, width, height)
+ distance, _ = hash3.Distance(hash4)
+ fmt.Printf("Distance between images: %v\n", distance)
+ fmt.Printf("hash3 bit size: %v\n", hash3.Bits())
+ fmt.Printf("hash4 bit size: %v\n", hash4.Bits())
+
+ var b bytes.Buffer
+ foo := bufio.NewWriter(&b)
+ _ = hash4.Dump(foo)
+ foo.Flush()
+ bar := bufio.NewReader(&b)
+ hash5, _ := goimagehash.LoadExtImageHash(bar)
+}
+```
+
+## Release Note
+### v1.0.3
+- Add workflow for GithubAction
+- Fix typo on the GoDoc for LoadImageHash
+
+### v1.0.2
+- go.mod is now used for install goimagehash
+
+### v1.0.1
+- Perception/ExtPerception hash creation times are reduced
+
+### v1.0.0
+**IMPORTANT**
+goimagehash v1.0.0 does not have compatible with the before version for future features
+
+- More flexible extended hash APIs are provided ([ExtAverageHash](https://godoc.org/github.com/corona10/goimagehash#ExtAverageHash), [ExtPerceptionHash](https://godoc.org/github.com/corona10/goimagehash#ExtPerceptionHash), [ExtDifferenceHash](https://godoc.org/github.com/corona10/goimagehash#ExtDifferenceHash))
+- New serialization APIs are provided([ImageHash.Dump](https://godoc.org/github.com/corona10/goimagehash#ImageHash.Dump), [ExtImageHash.Dump](https://godoc.org/github.com/corona10/goimagehash#ExtImageHash.Dump))
+- [ExtImageHashFromString](https://godoc.org/github.com/corona10/goimagehash#ExtImageHashFromString), [ImageHashFromString](https://godoc.org/github.com/corona10/goimagehash#ImageHashFromString) is deprecated and will be removed
+- New deserialization APIs are provided([LoadImageHash](https://godoc.org/github.com/corona10/goimagehash#LoadImageHash), [LoadExtImageHash](https://godoc.org/github.com/corona10/goimagehash#LoadExtImageHash))
+- Bits APIs are provided to measure actual bit size of hash
+
+### v0.3.0
+- Support DifferenceHashExtend.
+- Support AverageHashExtend.
+- Support PerceptionHashExtend by @TokyoWolFrog.
+
+### v0.2.0
+- Perception Hash is updated.
+- Fix a critical bug of finding median value.
+
+### v0.1.0
+- Support Average hashing
+- Support Difference hashing
+- Support Perception hashing
+- Use bits.OnesCount64 for computing Hamming distance by @dominikh
+- Support hex serialization methods to ImageHash by @brunoro
diff --git a/vendor/github.com/corona10/goimagehash/doc.go b/vendor/github.com/corona10/goimagehash/doc.go
new file mode 100644
index 000000000..39e655de0
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/doc.go
@@ -0,0 +1,5 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package goimagehash
diff --git a/vendor/github.com/corona10/goimagehash/etcs/doc.go b/vendor/github.com/corona10/goimagehash/etcs/doc.go
new file mode 100644
index 000000000..0c1485dbc
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/etcs/doc.go
@@ -0,0 +1,5 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package etcs
diff --git a/vendor/github.com/corona10/goimagehash/etcs/utils.go b/vendor/github.com/corona10/goimagehash/etcs/utils.go
new file mode 100644
index 000000000..795c75fa6
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/etcs/utils.go
@@ -0,0 +1,61 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package etcs
+
+// MeanOfPixels function returns a mean of pixels.
+func MeanOfPixels(pixels []float64) float64 {
+ m := 0.0
+ lens := len(pixels)
+ if lens == 0 {
+ return 0
+ }
+
+ for _, p := range pixels {
+ m += p
+ }
+
+ return m / float64(lens)
+}
+
+// MedianOfPixels function returns a median value of pixels.
+// It uses quick selection algorithm.
+func MedianOfPixels(pixels []float64) float64 {
+ tmp := make([]float64, len(pixels))
+ copy(tmp, pixels)
+ l := len(tmp)
+ pos := l / 2
+ v := quickSelectMedian(tmp, 0, l-1, pos)
+ return v
+}
+
+func quickSelectMedian(sequence []float64, low int, hi int, k int) float64 {
+ if low == hi {
+ return sequence[k]
+ }
+
+ for low < hi {
+ pivot := low/2 + hi/2
+ pivotValue := sequence[pivot]
+ storeIdx := low
+ sequence[pivot], sequence[hi] = sequence[hi], sequence[pivot]
+ for i := low; i < hi; i++ {
+ if sequence[i] < pivotValue {
+ sequence[storeIdx], sequence[i] = sequence[i], sequence[storeIdx]
+ storeIdx++
+ }
+ }
+ sequence[hi], sequence[storeIdx] = sequence[storeIdx], sequence[hi]
+ if k <= storeIdx {
+ hi = storeIdx
+ } else {
+ low = storeIdx + 1
+ }
+ }
+
+ if len(sequence)%2 == 0 {
+ return sequence[k-1]/2 + sequence[k]/2
+ }
+ return sequence[k]
+}
diff --git a/vendor/github.com/corona10/goimagehash/go.mod b/vendor/github.com/corona10/goimagehash/go.mod
new file mode 100644
index 000000000..681fdc2bf
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/go.mod
@@ -0,0 +1,3 @@
+module github.com/corona10/goimagehash
+
+require github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
diff --git a/vendor/github.com/corona10/goimagehash/go.sum b/vendor/github.com/corona10/goimagehash/go.sum
new file mode 100644
index 000000000..96adbed66
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/go.sum
@@ -0,0 +1,2 @@
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
diff --git a/vendor/github.com/corona10/goimagehash/hashcompute.go b/vendor/github.com/corona10/goimagehash/hashcompute.go
new file mode 100644
index 000000000..9b1fcbfe3
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/hashcompute.go
@@ -0,0 +1,183 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package goimagehash
+
+import (
+ "errors"
+ "image"
+
+ "github.com/corona10/goimagehash/etcs"
+ "github.com/corona10/goimagehash/transforms"
+ "github.com/nfnt/resize"
+)
+
+// AverageHash fuction returns a hash computation of average hash.
+// Implementation follows
+// http://www.hackerfactor.com/blog/index.php?/archives/432-Looks-Like-It.html
+func AverageHash(img image.Image) (*ImageHash, error) {
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+
+ // Create 64bits hash.
+ ahash := NewImageHash(0, AHash)
+ resized := resize.Resize(8, 8, img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+ flattens := transforms.FlattenPixels(pixels, 8, 8)
+ avg := etcs.MeanOfPixels(flattens)
+
+ for idx, p := range flattens {
+ if p > avg {
+ ahash.leftShiftSet(len(flattens) - idx - 1)
+ }
+ }
+
+ return ahash, nil
+}
+
+// DifferenceHash function returns a hash computation of difference hash.
+// Implementation follows
+// http://www.hackerfactor.com/blog/?/archives/529-Kind-of-Like-That.html
+func DifferenceHash(img image.Image) (*ImageHash, error) {
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+
+ dhash := NewImageHash(0, DHash)
+ resized := resize.Resize(9, 8, img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+ idx := 0
+ for i := 0; i < len(pixels); i++ {
+ for j := 0; j < len(pixels[i])-1; j++ {
+ if pixels[i][j] < pixels[i][j+1] {
+ dhash.leftShiftSet(64 - idx - 1)
+ }
+ idx++
+ }
+ }
+
+ return dhash, nil
+}
+
+// PerceptionHash function returns a hash computation of phash.
+// Implementation follows
+// http://www.hackerfactor.com/blog/index.php?/archives/432-Looks-Like-It.html
+func PerceptionHash(img image.Image) (*ImageHash, error) {
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+
+ phash := NewImageHash(0, PHash)
+ resized := resize.Resize(64, 64, img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+ dct := transforms.DCT2D(pixels, 64, 64)
+ flattens := transforms.FlattenPixels(dct, 8, 8)
+ median := etcs.MedianOfPixels(flattens)
+
+ for idx, p := range flattens {
+ if p > median {
+ phash.leftShiftSet(len(flattens) - idx - 1)
+ }
+ }
+ return phash, nil
+}
+
+// ExtPerceptionHash function returns phash of which the size can be set larger than uint64
+// Some variable name refer to https://github.com/JohannesBuchner/imagehash/blob/master/imagehash/__init__.py
+// Support 64bits phash (width=8, height=8) and 256bits phash (width=16, height=16)
+// Important: width * height should be the power of 2
+func ExtPerceptionHash(img image.Image, width, height int) (*ExtImageHash, error) {
+ imgSize := width * height
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+ if imgSize <= 0 || imgSize&(imgSize-1) != 0 {
+ return nil, errors.New("width * height should be power of 2")
+ }
+ var phash []uint64
+ resized := resize.Resize(uint(imgSize), uint(imgSize), img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+ dct := transforms.DCT2D(pixels, imgSize, imgSize)
+ flattens := transforms.FlattenPixels(dct, width, height)
+ median := etcs.MedianOfPixels(flattens)
+
+ lenOfUnit := 64
+ if imgSize%lenOfUnit == 0 {
+ phash = make([]uint64, imgSize/lenOfUnit)
+ } else {
+ phash = make([]uint64, imgSize/lenOfUnit+1)
+ }
+ for idx, p := range flattens {
+ indexOfArray := idx / lenOfUnit
+ indexOfBit := lenOfUnit - idx%lenOfUnit - 1
+ if p > median {
+ phash[indexOfArray] |= 1 << uint(indexOfBit)
+ }
+ }
+ return NewExtImageHash(phash, PHash, imgSize), nil
+}
+
+// ExtAverageHash function returns ahash of which the size can be set larger than uint64
+// Support 64bits ahash (width=8, height=8) and 256bits ahash (width=16, height=16)
+func ExtAverageHash(img image.Image, width, height int) (*ExtImageHash, error) {
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+ var ahash []uint64
+ imgSize := width * height
+
+ resized := resize.Resize(uint(width), uint(height), img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+ flattens := transforms.FlattenPixels(pixels, width, height)
+ avg := etcs.MeanOfPixels(flattens)
+
+ lenOfUnit := 64
+ if imgSize%lenOfUnit == 0 {
+ ahash = make([]uint64, imgSize/lenOfUnit)
+ } else {
+ ahash = make([]uint64, imgSize/lenOfUnit+1)
+ }
+ for idx, p := range flattens {
+ indexOfArray := idx / lenOfUnit
+ indexOfBit := lenOfUnit - idx%lenOfUnit - 1
+ if p > avg {
+ ahash[indexOfArray] |= 1 << uint(indexOfBit)
+ }
+ }
+ return NewExtImageHash(ahash, AHash, imgSize), nil
+}
+
+// ExtDifferenceHash function returns dhash of which the size can be set larger than uint64
+// Support 64bits dhash (width=8, height=8) and 256bits dhash (width=16, height=16)
+func ExtDifferenceHash(img image.Image, width, height int) (*ExtImageHash, error) {
+ if img == nil {
+ return nil, errors.New("Image object can not be nil")
+ }
+
+ var dhash []uint64
+ imgSize := width * height
+
+ resized := resize.Resize(uint(width)+1, uint(height), img, resize.Bilinear)
+ pixels := transforms.Rgb2Gray(resized)
+
+ lenOfUnit := 64
+ if imgSize%lenOfUnit == 0 {
+ dhash = make([]uint64, imgSize/lenOfUnit)
+ } else {
+ dhash = make([]uint64, imgSize/lenOfUnit+1)
+ }
+ idx := 0
+ for i := 0; i < len(pixels); i++ {
+ for j := 0; j < len(pixels[i])-1; j++ {
+ indexOfArray := idx / lenOfUnit
+ indexOfBit := lenOfUnit - idx%lenOfUnit - 1
+ if pixels[i][j] < pixels[i][j+1] {
+ dhash[indexOfArray] |= 1 << uint(indexOfBit)
+ }
+ idx++
+ }
+ }
+ return NewExtImageHash(dhash, DHash, imgSize), nil
+}
diff --git a/vendor/github.com/corona10/goimagehash/imagehash.go b/vendor/github.com/corona10/goimagehash/imagehash.go
new file mode 100644
index 000000000..9cc384a4e
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/imagehash.go
@@ -0,0 +1,294 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package goimagehash
+
+import (
+ "encoding/binary"
+ "encoding/gob"
+ "encoding/hex"
+ "errors"
+ "fmt"
+ "io"
+)
+
+// Kind describes the kinds of hash.
+type Kind int
+
+// ImageHash is a struct of hash computation.
+type ImageHash struct {
+ hash uint64
+ kind Kind
+}
+
+// ExtImageHash is a struct of big hash computation.
+type ExtImageHash struct {
+ hash []uint64
+ kind Kind
+ bits int
+}
+
+const (
+ // Unknown is a enum value of the unknown hash.
+ Unknown Kind = iota
+ // AHash is a enum value of the average hash.
+ AHash
+ //PHash is a enum value of the perceptual hash.
+ PHash
+ // DHash is a enum value of the difference hash.
+ DHash
+ // WHash is a enum value of the wavelet hash.
+ WHash
+)
+
+// NewImageHash function creates a new image hash.
+func NewImageHash(hash uint64, kind Kind) *ImageHash {
+ return &ImageHash{hash: hash, kind: kind}
+}
+
+// Bits method returns an actual hash bit size
+func (h *ImageHash) Bits() int {
+ return 64
+}
+
+// Distance method returns a distance between two hashes.
+func (h *ImageHash) Distance(other *ImageHash) (int, error) {
+ if h.GetKind() != other.GetKind() {
+ return -1, errors.New("Image hashes's kind should be identical")
+ }
+
+ lhash := h.GetHash()
+ rhash := other.GetHash()
+
+ hamming := lhash ^ rhash
+ return popcnt(hamming), nil
+}
+
+// GetHash method returns a 64bits hash value.
+func (h *ImageHash) GetHash() uint64 {
+ return h.hash
+}
+
+// GetKind method returns a kind of image hash.
+func (h *ImageHash) GetKind() Kind {
+ return h.kind
+}
+
+func (h *ImageHash) leftShiftSet(idx int) {
+ h.hash |= 1 << uint(idx)
+}
+
+const strFmt = "%1s:%016x"
+
+// Dump method writes a binary serialization into w io.Writer.
+func (h *ImageHash) Dump(w io.Writer) error {
+ type D struct {
+ Hash uint64
+ Kind Kind
+ }
+ enc := gob.NewEncoder(w)
+ err := enc.Encode(D{Hash: h.hash, Kind: h.kind})
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
+// LoadImageHash method loads a ImageHash from io.Reader.
+func LoadImageHash(b io.Reader) (*ImageHash, error) {
+ type E struct {
+ Hash uint64
+ Kind Kind
+ }
+ var e E
+ dec := gob.NewDecoder(b)
+ err := dec.Decode(&e)
+ if err != nil {
+ return nil, err
+ }
+ return &ImageHash{hash: e.Hash, kind: e.Kind}, nil
+}
+
+// ImageHashFromString returns an image hash from a hex representation
+//
+// Deprecated: Use goimagehash.LoadImageHash instead.
+func ImageHashFromString(s string) (*ImageHash, error) {
+ var kindStr string
+ var hash uint64
+ _, err := fmt.Sscanf(s, strFmt, &kindStr, &hash)
+ if err != nil {
+ return nil, errors.New("Couldn't parse string " + s)
+ }
+
+ kind := Unknown
+ switch kindStr {
+ case "a":
+ kind = AHash
+ case "p":
+ kind = PHash
+ case "d":
+ kind = DHash
+ case "w":
+ kind = WHash
+ }
+ return NewImageHash(hash, kind), nil
+}
+
+// ToString returns a hex representation of the hash
+func (h *ImageHash) ToString() string {
+ kindStr := ""
+ switch h.kind {
+ case AHash:
+ kindStr = "a"
+ case PHash:
+ kindStr = "p"
+ case DHash:
+ kindStr = "d"
+ case WHash:
+ kindStr = "w"
+ }
+ return fmt.Sprintf(strFmt, kindStr, h.hash)
+}
+
+// NewExtImageHash function creates a new big hash
+func NewExtImageHash(hash []uint64, kind Kind, bits int) *ExtImageHash {
+ return &ExtImageHash{hash: hash, kind: kind, bits: bits}
+}
+
+// Bits method returns an actual hash bit size
+func (h *ExtImageHash) Bits() int {
+ return h.bits
+}
+
+// Distance method returns a distance between two big hashes
+func (h *ExtImageHash) Distance(other *ExtImageHash) (int, error) {
+ if h.GetKind() != other.GetKind() {
+ return -1, errors.New("Extended Image hashes's kind should be identical")
+ }
+
+ if h.Bits() != other.Bits() {
+ msg := fmt.Sprintf("Extended image hash should has an identical bit size but got %v vs %v", h.Bits(), other.Bits())
+ return -1, errors.New(msg)
+ }
+
+ lHash := h.GetHash()
+ rHash := other.GetHash()
+ if len(lHash) != len(rHash) {
+ return -1, errors.New("Extended Image hashes's size should be identical")
+ }
+
+ distance := 0
+ for idx, lh := range lHash {
+ rh := rHash[idx]
+ hamming := lh ^ rh
+ distance += popcnt(hamming)
+ }
+ return distance, nil
+}
+
+// GetHash method returns a big hash value
+func (h *ExtImageHash) GetHash() []uint64 {
+ return h.hash
+}
+
+// GetKind method returns a kind of big hash
+func (h *ExtImageHash) GetKind() Kind {
+ return h.kind
+}
+
+// Dump method writes a binary serialization into w io.Writer.
+func (h *ExtImageHash) Dump(w io.Writer) error {
+ type D struct {
+ Hash []uint64
+ Kind Kind
+ Bits int
+ }
+ enc := gob.NewEncoder(w)
+ err := enc.Encode(D{Hash: h.hash, Kind: h.kind, Bits: h.bits})
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
+// LoadExtImageHash method loads a ExtImageHash from io.Reader.
+func LoadExtImageHash(b io.Reader) (*ExtImageHash, error) {
+ type E struct {
+ Hash []uint64
+ Kind Kind
+ Bits int
+ }
+ var e E
+ dec := gob.NewDecoder(b)
+ err := dec.Decode(&e)
+ if err != nil {
+ return nil, err
+ }
+ return &ExtImageHash{hash: e.Hash, kind: e.Kind, bits: e.Bits}, nil
+}
+
+const extStrFmt = "%1s:%s"
+
+// ExtImageHashFromString returns a big hash from a hex representation
+//
+// Deprecated: Use goimagehash.LoadExtImageHash instead.
+func ExtImageHashFromString(s string) (*ExtImageHash, error) {
+ var kindStr string
+ var hashStr string
+ _, err := fmt.Sscanf(s, extStrFmt, &kindStr, &hashStr)
+ if err != nil {
+ return nil, errors.New("Couldn't parse string " + s)
+ }
+
+ hexBytes, err := hex.DecodeString(hashStr)
+ if err != nil {
+ return nil, err
+ }
+
+ var hash []uint64
+ lenOfByte := 8
+ for i := 0; i < len(hexBytes)/lenOfByte; i++ {
+ startIndex := i * lenOfByte
+ endIndex := startIndex + lenOfByte
+ hashUint64 := binary.BigEndian.Uint64(hexBytes[startIndex:endIndex])
+ hash = append(hash, hashUint64)
+ }
+
+ kind := Unknown
+ switch kindStr {
+ case "a":
+ kind = AHash
+ case "p":
+ kind = PHash
+ case "d":
+ kind = DHash
+ case "w":
+ kind = WHash
+ }
+ return NewExtImageHash(hash, kind, len(hash)*64), nil
+}
+
+// ToString returns a hex representation of big hash
+func (h *ExtImageHash) ToString() string {
+ var hexBytes []byte
+ for _, hash := range h.hash {
+ hashBytes := make([]byte, 8)
+ binary.BigEndian.PutUint64(hashBytes, hash)
+ hexBytes = append(hexBytes, hashBytes...)
+ }
+ hexStr := hex.EncodeToString(hexBytes)
+
+ kindStr := ""
+ switch h.kind {
+ case AHash:
+ kindStr = "a"
+ case PHash:
+ kindStr = "p"
+ case DHash:
+ kindStr = "d"
+ case WHash:
+ kindStr = "w"
+ }
+ return fmt.Sprintf(extStrFmt, kindStr, hexStr)
+}
diff --git a/vendor/github.com/corona10/goimagehash/imagehash18.go b/vendor/github.com/corona10/goimagehash/imagehash18.go
new file mode 100644
index 000000000..e8d3fd62a
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/imagehash18.go
@@ -0,0 +1,13 @@
+// +build !go1.9
+
+package goimagehash
+
+func popcnt(x uint64) int {
+ diff := 0
+ for x != 0 {
+ diff += int(x & 1)
+ x >>= 1
+ }
+
+ return diff
+}
diff --git a/vendor/github.com/corona10/goimagehash/imagehash19.go b/vendor/github.com/corona10/goimagehash/imagehash19.go
new file mode 100644
index 000000000..c1d47be36
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/imagehash19.go
@@ -0,0 +1,9 @@
+// +build go1.9
+
+package goimagehash
+
+import (
+ "math/bits"
+)
+
+func popcnt(x uint64) int { return bits.OnesCount64(x) }
diff --git a/vendor/github.com/corona10/goimagehash/transforms/dct.go b/vendor/github.com/corona10/goimagehash/transforms/dct.go
new file mode 100644
index 000000000..b0976a3bc
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/transforms/dct.go
@@ -0,0 +1,75 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package transforms
+
+import (
+ "math"
+ "sync"
+)
+
+// DCT1D function returns result of DCT-II.
+// DCT type II, unscaled. Algorithm by Byeong Gi Lee, 1984.
+func DCT1D(input []float64) []float64 {
+ temp := make([]float64, len(input))
+ forwardTransform(input, temp, len(input))
+ return input
+}
+
+func forwardTransform(input, temp []float64, Len int) {
+ if Len == 1 {
+ return
+ }
+
+ halfLen := Len / 2
+ for i := 0; i < halfLen; i++ {
+ x, y := input[i], input[Len-1-i]
+ temp[i] = x + y
+ temp[i+halfLen] = (x - y) / (math.Cos((float64(i)+0.5)*math.Pi/float64(Len)) * 2)
+ }
+ forwardTransform(temp, input, halfLen)
+ forwardTransform(temp[halfLen:], input, halfLen)
+ for i := 0; i < halfLen-1; i++ {
+ input[i*2+0] = temp[i]
+ input[i*2+1] = temp[i+halfLen] + temp[i+halfLen+1]
+ }
+ input[Len-2], input[Len-1] = temp[halfLen-1], temp[Len-1]
+}
+
+// DCT2D function returns a result of DCT2D by using the seperable property.
+func DCT2D(input [][]float64, w int, h int) [][]float64 {
+ output := make([][]float64, h)
+ for i := range output {
+ output[i] = make([]float64, w)
+ }
+
+ wg := new(sync.WaitGroup)
+ for i := 0; i < h; i++ {
+ wg.Add(1)
+ go func(i int) {
+ cols := DCT1D(input[i])
+ output[i] = cols
+ wg.Done()
+ }(i)
+ }
+
+ wg.Wait()
+ for i := 0; i < w; i++ {
+ wg.Add(1)
+ in := make([]float64, h)
+ go func(i int) {
+ for j := 0; j < h; j++ {
+ in[j] = output[j][i]
+ }
+ rows := DCT1D(in)
+ for j := 0; j < len(rows); j++ {
+ output[j][i] = rows[j]
+ }
+ wg.Done()
+ }(i)
+ }
+
+ wg.Wait()
+ return output
+}
diff --git a/vendor/github.com/corona10/goimagehash/transforms/doc.go b/vendor/github.com/corona10/goimagehash/transforms/doc.go
new file mode 100644
index 000000000..01bd0e839
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/transforms/doc.go
@@ -0,0 +1,5 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package transforms
diff --git a/vendor/github.com/corona10/goimagehash/transforms/pixels.go b/vendor/github.com/corona10/goimagehash/transforms/pixels.go
new file mode 100644
index 000000000..378e1b559
--- /dev/null
+++ b/vendor/github.com/corona10/goimagehash/transforms/pixels.go
@@ -0,0 +1,39 @@
+// Copyright 2017 The goimagehash Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package transforms
+
+import (
+ "image"
+)
+
+// Rgb2Gray function converts RGB to a gray scale array.
+func Rgb2Gray(colorImg image.Image) [][]float64 {
+ bounds := colorImg.Bounds()
+ w, h := bounds.Max.X-bounds.Min.X, bounds.Max.Y-bounds.Min.Y
+ pixels := make([][]float64, h)
+
+ for i := range pixels {
+ pixels[i] = make([]float64, w)
+ for j := range pixels[i] {
+ color := colorImg.At(j, i)
+ r, g, b, _ := color.RGBA()
+ lum := 0.299*float64(r/257) + 0.587*float64(g/257) + 0.114*float64(b/256)
+ pixels[i][j] = lum
+ }
+ }
+
+ return pixels
+}
+
+// FlattenPixels function flattens 2d array into 1d array.
+func FlattenPixels(pixels [][]float64, x int, y int) []float64 {
+ flattens := make([]float64, x*y)
+ for i := 0; i < y; i++ {
+ for j := 0; j < x; j++ {
+ flattens[y*i+j] = pixels[i][j]
+ }
+ }
+ return flattens
+}
diff --git a/vendor/github.com/nfnt/resize/.travis.yml b/vendor/github.com/nfnt/resize/.travis.yml
new file mode 100644
index 000000000..5ff08e7e4
--- /dev/null
+++ b/vendor/github.com/nfnt/resize/.travis.yml
@@ -0,0 +1,7 @@
+language: go
+
+go:
+ - "1.x"
+ - "1.1"
+ - "1.4"
+ - "1.10"
diff --git a/vendor/github.com/nfnt/resize/LICENSE b/vendor/github.com/nfnt/resize/LICENSE
new file mode 100644
index 000000000..7836cad5f
--- /dev/null
+++ b/vendor/github.com/nfnt/resize/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2012, Jan Schlicht
- {isNew &&
-
- {TableUtils.renderInputGroup({
- title: "Name",
- value: name ?? "",
- isEditing: !!isEditing,
- onChange: setName,
- })}
- {TableUtils.renderInputGroup({
- title: "Aliases",
- value: aliases,
- isEditing,
- onChange: setAliases,
- })}
- {TableUtils.renderDurationInput({
- title: "Duration",
- value: duration ? duration.toString() : "",
- isEditing,
- onChange: (value: string | undefined) =>
- setDuration(value ? Number.parseInt(value, 10) : undefined),
- })}
- {TableUtils.renderInputGroup({
- title: `Date ${isEditing ? "(YYYY-MM-DD)" : ""}`,
- value: isEditing ? date : TextUtils.formatDate(intl, date),
- isEditing,
- onChange: setDate,
- })}
-
-
-
- URL {maybeRenderScrapeButton()}
-
-
-
- Synopsis
- ) =>
- setSynopsis(newValue.currentTarget.value)
- }
- value={synopsis}
+ {!isEditing && movie ? (
+ <>
+ {}}
+ onImageChange={() => {}}
+ onDelete={onDelete}
+ />
+
+ ) : (
+
-
- ;
+}
+
+export const MovieDetailsPanel: React.FC = ({ movie }) => {
+ // Network state
+ const intl = useIntl();
+
+ function maybeRenderAliases() {
+ if (movie.aliases) {
+ return (
+ ;
+ onSubmit: (
+ movie: Partial
+ ) => void;
+ onCancel: () => void;
+ onDelete: () => void;
+ setFrontImage: (image?: string | null) => void;
+ setBackImage: (image?: string | null) => void;
+}
+
+export const MovieEditPanel: React.FC = ({
+ movie,
+ onSubmit,
+ onCancel,
+ onDelete,
+ setFrontImage,
+ setBackImage,
+}) => {
+ const Toast = useToast();
+
+ const isNew = movie === undefined;
+
+ const [isLoading, setIsLoading] = useState(false);
+
+ const Scrapers = useListMovieScrapers();
+ const [scrapedMovie, setScrapedMovie] = useState<
+ GQL.ScrapedMovie | undefined
+ >();
+
+ const labelXS = 3;
+ const labelXL = 3;
+ const fieldXS = 9;
+ const fieldXL = 9;
+
+ const schema = yup.object({
+ name: yup.string().required(),
+ aliases: yup.string().optional().nullable(),
+ duration: yup.string().optional().nullable(),
+ date: yup
+ .string()
+ .optional()
+ .nullable()
+ .matches(/^\d{4}-\d{2}-\d{2}$/),
+ rating: yup.number().optional().nullable(),
+ studio_id: yup.string().optional().nullable(),
+ director: yup.string().optional().nullable(),
+ synopsis: yup.string().optional().nullable(),
+ url: yup.string().optional().nullable(),
+ });
+
+ const initialValues = {
+ name: movie?.name,
+ aliases: movie?.aliases,
+ duration: movie?.duration,
+ date: movie?.date,
+ rating: movie?.rating,
+ studio_id: movie?.studio?.id,
+ director: movie?.director,
+ synopsis: movie?.synopsis,
+ url: movie?.url,
+ };
+
+ type InputValues = typeof initialValues;
+
+ const formik = useFormik({
+ initialValues,
+ validationSchema: schema,
+ onSubmit: (values) => onSubmit(getMovieInput(values)),
+ });
+
+ function setRating(v: number) {
+ formik.setFieldValue("rating", v);
+ }
+
+ // set up hotkeys
+ useEffect(() => {
+ Mousetrap.bind("r 0", () => setRating(NaN));
+ Mousetrap.bind("r 1", () => setRating(1));
+ Mousetrap.bind("r 2", () => setRating(2));
+ Mousetrap.bind("r 3", () => setRating(3));
+ Mousetrap.bind("r 4", () => setRating(4));
+ Mousetrap.bind("r 5", () => setRating(5));
+ // Mousetrap.bind("u", (e) => {
+ // setStudioFocus()
+ // e.preventDefault();
+ // });
+ Mousetrap.bind("s s", () => formik.handleSubmit());
+
+ return () => {
+ Mousetrap.unbind("r 0");
+ Mousetrap.unbind("r 1");
+ Mousetrap.unbind("r 2");
+ Mousetrap.unbind("r 3");
+ Mousetrap.unbind("r 4");
+ Mousetrap.unbind("r 5");
+ // Mousetrap.unbind("u");
+ Mousetrap.unbind("s s");
+ };
+ });
+
+ function getMovieInput(values: InputValues) {
+ const input: Partial = {
+ ...values,
+ rating: values.rating ?? null,
+ studio_id: values.studio_id ?? null,
+ };
+
+ if (movie && movie.id) {
+ (input as GQL.MovieUpdateInput).id = movie.id;
+ }
+ return input;
+ }
+
+ function updateMovieEditStateFromScraper(
+ state: Partial
+ ) {
+ if (state.name) {
+ formik.setFieldValue("name", state.name);
+ }
+
+ if (state.aliases) {
+ formik.setFieldValue("aliases", state.aliases ?? undefined);
+ }
+
+ if (state.duration) {
+ formik.setFieldValue(
+ "duration",
+ DurationUtils.stringToSeconds(state.duration) ?? undefined
+ );
+ }
+
+ if (state.date) {
+ formik.setFieldValue("date", state.date ?? undefined);
+ }
+
+ if (state.studio && state.studio.id) {
+ formik.setFieldValue("studio_id", state.studio.id ?? undefined);
+ }
+
+ if (state.director) {
+ formik.setFieldValue("director", state.director ?? undefined);
+ }
+ if (state.synopsis) {
+ formik.setFieldValue("synopsis", state.synopsis ?? undefined);
+ }
+ if (state.url) {
+ formik.setFieldValue("url", state.url ?? undefined);
+ }
+
+ const imageStr = (state as GQL.ScrapedMovieDataFragment).front_image;
+ setFrontImage(imageStr ?? undefined);
+
+ const backImageStr = (state as GQL.ScrapedMovieDataFragment).back_image;
+ setBackImage(backImageStr ?? undefined);
+ }
+
+ async function onScrapeMovieURL() {
+ const { url } = formik.values;
+ if (!url) return;
+ setIsLoading(true);
+
+ try {
+ const result = await queryScrapeMovieURL(url);
+ if (!result.data || !result.data.scrapeMovieURL) {
+ return;
+ }
+
+ // if this is a new movie, just dump the data
+ if (isNew) {
+ updateMovieEditStateFromScraper(result.data.scrapeMovieURL);
+ } else {
+ setScrapedMovie(result.data.scrapeMovieURL);
+ }
+ } catch (e) {
+ Toast.error(e);
+ } finally {
+ setIsLoading(false);
+ }
+ }
+
+ function urlScrapable(scrapedUrl: string) {
+ return (
+ !!scrapedUrl &&
+ (Scrapers?.data?.listMovieScrapers ?? []).some((s) =>
+ (s?.movie?.urls ?? []).some((u) => scrapedUrl.includes(u))
+ )
+ );
+ }
+
+ function maybeRenderScrapeButton() {
+ const { url } = formik.values;
+ if (!url || !urlScrapable(url)) {
+ return undefined;
+ }
+ return (
+
+ );
+ }
+
+ function maybeRenderScrapeDialog() {
+ if (!scrapedMovie) {
+ return;
+ }
+
+ const currentMovie = getMovieInput(formik.values);
+
+ // Get image paths for scrape gui
+ currentMovie.front_image = movie?.front_image_path;
+ currentMovie.back_image = movie?.back_image_path;
+
+ return (
+ {
+ onScrapeDialogClosed(m);
+ }}
+ />
+ );
+ }
+
+ function onScrapeDialogClosed(p?: GQL.ScrapedMovieDataFragment) {
+ if (p) {
+ updateMovieEditStateFromScraper(p);
+ }
+ setScrapedMovie(undefined);
+ }
+
+ function onFrontImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, setFrontImage);
+ }
+
+ function onBackImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, setBackImage);
+ }
+
+ if (isLoading) return
+
+ {title}
+
+
+ );
+ }
+
+ // TODO: CSS class
+ return (
+ = (
const [createStudio] = useStudioCreate({ name: "" });
const [createPerformer] = usePerformerCreate();
- const [createMovie] = useMovieCreate({ name: "" });
+ const [createMovie] = useMovieCreate();
const [createTag] = useTagCreate({ name: "" });
const Toast = useToast();
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 10832462d..b35da8123 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -602,9 +602,8 @@ export const movieMutationImpactedQueries = [
GQL.AllMoviesForFilterDocument,
];
-export const useMovieCreate = (input: GQL.MovieCreateInput) =>
+export const useMovieCreate = () =>
GQL.useMovieCreateMutation({
- variables: input,
update: deleteCache([
GQL.FindMoviesDocument,
GQL.AllMoviesForFilterDocument,
diff --git a/ui/v2.5/src/utils/field.tsx b/ui/v2.5/src/utils/field.tsx
index 9833d87c9..14fd5b9e9 100644
--- a/ui/v2.5/src/utils/field.tsx
+++ b/ui/v2.5/src/utils/field.tsx
@@ -29,7 +29,7 @@ export const URLField: React.FC = ({ name, value, url }) => {
return null;
}
return (
-
Add Movie
} +
{encodingImage ? (
- 
-
+
-
+ {renderFrontImage()}
+ {renderBackImage()}
+
)}
| Studio | -
- |
-
| Rating | -
- |
-
- {EditableTextUtils.renderInputGroup({
- isEditing,
- onChange: setUrl,
- value: url,
- url: TextUtils.sanitiseURL(url),
- })}
-
-
+
+ {!isNew && movie && (
+
);
};
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
new file mode 100644
index 000000000..5f3c27fe0
--- /dev/null
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+import { useIntl } from "react-intl";
+import * as GQL from "src/core/generated-graphql";
+import { DurationUtils, TextUtils } from "src/utils";
+import { RatingStars } from "src/components/Scenes/SceneDetails/RatingStars";
+import { TextField, URLField } from "src/utils/field";
+
+interface IMovieDetailsPanel {
+ movie: Partial
+ Also known as
+ {movie.aliases}
+
+ );
+ }
+ }
+
+ function renderRatingField() {
+ if (!movie.rating) {
+ return;
+ }
+
+ return (
+ -
+
- Rating +
-
+
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
new file mode 100644
index 000000000..4c9a71aa0
--- /dev/null
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
@@ -0,0 +1,418 @@
+import React, { useEffect, useState } from "react";
+import * as GQL from "src/core/generated-graphql";
+import * as yup from "yup";
+import Mousetrap from "mousetrap";
+import {
+ queryScrapeMovieURL,
+ useListMovieScrapers,
+} from "src/core/StashService";
+import {
+ LoadingIndicator,
+ StudioSelect,
+ Icon,
+ DetailsEditNavbar,
+ DurationInput,
+} from "src/components/Shared";
+import { useToast } from "src/hooks";
+import { Form, Button, Col, Row, InputGroup } from "react-bootstrap";
+import { DurationUtils, ImageUtils } from "src/utils";
+import { RatingStars } from "src/components/Scenes/SceneDetails/RatingStars";
+import { useFormik } from "formik";
+import { Prompt } from "react-router-dom";
+import { MovieScrapeDialog } from "./MovieScrapeDialog";
+
+interface IMovieEditPanel {
+ movie?: Partial
+
+
+ {maybeRenderAliases()}
+
+ {movie.name}
+
+
+
+ {isNew && formik.handleSubmit()}
+ onImageChange={onFrontImageChange}
+ onImageChangeURL={setFrontImage}
+ onClearImage={() => {
+ setFrontImage(null);
+ }}
+ onBackImageChange={onBackImageChange}
+ onBackImageChangeURL={setBackImage}
+ onClearBackImage={() => {
+ setBackImage(null);
+ }}
+ onDelete={onDelete}
+ />
+
+ {maybeRenderScrapeDialog()}
+
+ );
+};
diff --git a/ui/v2.5/src/components/Movies/styles.scss b/ui/v2.5/src/components/Movies/styles.scss
index 45fb9c14b..c87122a55 100644
--- a/ui/v2.5/src/components/Movies/styles.scss
+++ b/ui/v2.5/src/components/Movies/styles.scss
@@ -18,3 +18,21 @@
width: 100%;
}
}
+
+.movie-images {
+ align-items: center;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-evenly;
+ margin: 1rem;
+ max-width: 100%;
+
+ .movie-image-container {
+ margin: 1rem;
+ }
+
+ img {
+ max-width: 100%;
+ object-fit: contain;
+ }
+}
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index b2ed6f860..77838220c 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -317,7 +317,7 @@ export const SceneScrapeDialog: React.FCAdd Movie
} + +-
+
- {name}:
-
{url ? (
From 2c2e56d33aaa8121ce5d0495d89580de18c843ba Mon Sep 17 00:00:00 2001
From: UncleRoger33 <66418211+UncleRoger33@users.noreply.github.com>
Date: Wed, 31 Mar 2021 07:55:15 +0300
Subject: [PATCH 06/66] Add format to performer field placeholder (#1232)
* Update README.md
Extra letter "p" in the title removed and "(FAQ)" suffix added.
Co-authored-by: peolic <66393006+peolic@users.noreply.github.com>
---
README.md | 2 +-
.../Performers/PerformerDetails/PerformerEditPanel.tsx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 6d0513996..5282f936c 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ There is a [directory of themes](https://github.com/stashapp/stash/wiki/Themes)
## CSS Customization
You can make Stash interface fit your desired style with [Custom CSS snippets](https://github.com/stashapp/stash/wiki/Custom-CSS-snippets) and [CSS Tweaks](https://github.com/stashapp/stash/wiki/CSS-Tweaks).
-# Suppport
+# Support (FAQ)
Answers to frequently asked questions can be found [on our Wiki](https://github.com/stashapp/stash/wiki/FAQ)
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index e4ebe7c08..0f0ddc0eb 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -725,7 +725,7 @@ export const PerformerEditPanel: React.FC
= ({ ); } - function renderTextField(field: string, title: string) { + function renderTextField(field: string, title: string, placeholder?: string) { return ( @@ -734,7 +734,7 @@ export const PerformerEditPanel: React.FC = ({ @@ -805,7 +805,7 @@ export const PerformerEditPanel: React.FC = ({ + +API Key
++ ++ + + + ++ API key for external systems. Only required when username/password + is configured. Username must be saved before generating API key. + +Maximum Session Age
update: deleteCache([GQL.ConfigurationDocument]), }); +export const useGenerateAPIKey = () => + GQL.useGenerateApiKeyMutation({ + refetchQueries: getQueryNames([GQL.ConfigurationDocument]), + update: deleteCache([GQL.ConfigurationDocument]), + }); + export const useMetadataUpdate = () => GQL.useMetadataUpdateSubscription(); export const useLoggingSubscribe = () => GQL.useLoggingSubscribeSubscription(); diff --git a/ui/v2.5/src/docs/en/Configuration.md b/ui/v2.5/src/docs/en/Configuration.md index ac5f7d596..ed5ab5edb 100644 --- a/ui/v2.5/src/docs/en/Configuration.md +++ b/ui/v2.5/src/docs/en/Configuration.md @@ -91,6 +91,12 @@ Some scrapers require a Chrome instance to function correctly. If left empty, st By default, stash is not configured with any sort of password protection. To enable password protection, both `Username` and `Password` must be populated. Note that when entering a new username and password where none was set previously, the system will immediately request these credentials to log you in. +## API key + +If password protection is enabled, you may also generate an API key. An API key is used by external systems to access your stash system without needing to login first. + +External systems using the API key must set the `ApiKey` header value to the configured API key in order to bypass the login requirement. + ### Logging out The logout button is situated in the upper-right part of the screen when you are logged in. diff --git a/vendor/github.com/dgrijalva/jwt-go/.gitignore b/vendor/github.com/dgrijalva/jwt-go/.gitignore new file mode 100644 index 000000000..80bed650e --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +bin + + diff --git a/vendor/github.com/dgrijalva/jwt-go/.travis.yml b/vendor/github.com/dgrijalva/jwt-go/.travis.yml new file mode 100644 index 000000000..1027f56cd --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/.travis.yml @@ -0,0 +1,13 @@ +language: go + +script: + - go vet ./... + - go test -v ./... + +go: + - 1.3 + - 1.4 + - 1.5 + - 1.6 + - 1.7 + - tip diff --git a/vendor/github.com/dgrijalva/jwt-go/LICENSE b/vendor/github.com/dgrijalva/jwt-go/LICENSE new file mode 100644 index 000000000..df83a9c2f --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/LICENSE @@ -0,0 +1,8 @@ +Copyright (c) 2012 Dave Grijalva + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md b/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md new file mode 100644 index 000000000..7fc1f793c --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md @@ -0,0 +1,97 @@ +## Migration Guide from v2 -> v3 + +Version 3 adds several new, frequently requested features. To do so, it introduces a few breaking changes. We've worked to keep these as minimal as possible. This guide explains the breaking changes and how you can quickly update your code. + +### `Token.Claims` is now an interface type + +The most requested feature from the 2.0 verison of this library was the ability to provide a custom type to the JSON parser for claims. This was implemented by introducing a new interface, `Claims`, to replace `map[string]interface{}`. We also included two concrete implementations of `Claims`: `MapClaims` and `StandardClaims`. + +`MapClaims` is an alias for `map[string]interface{}` with built in validation behavior. It is the default claims type when using `Parse`. The usage is unchanged except you must type cast the claims property. + +The old example for parsing a token looked like this.. + +```go + if token, err := jwt.Parse(tokenString, keyLookupFunc); err == nil { + fmt.Printf("Token for user %v expires %v", token.Claims["user"], token.Claims["exp"]) + } +``` + +is now directly mapped to... + +```go + if token, err := jwt.Parse(tokenString, keyLookupFunc); err == nil { + claims := token.Claims.(jwt.MapClaims) + fmt.Printf("Token for user %v expires %v", claims["user"], claims["exp"]) + } +``` + +`StandardClaims` is designed to be embedded in your custom type. You can supply a custom claims type with the new `ParseWithClaims` function. Here's an example of using a custom claims type. + +```go + type MyCustomClaims struct { + User string + *StandardClaims + } + + if token, err := jwt.ParseWithClaims(tokenString, &MyCustomClaims{}, keyLookupFunc); err == nil { + claims := token.Claims.(*MyCustomClaims) + fmt.Printf("Token for user %v expires %v", claims.User, claims.StandardClaims.ExpiresAt) + } +``` + +### `ParseFromRequest` has been moved + +To keep this library focused on the tokens without becoming overburdened with complex request processing logic, `ParseFromRequest` and its new companion `ParseFromRequestWithClaims` have been moved to a subpackage, `request`. The method signatues have also been augmented to receive a new argument: `Extractor`. + +`Extractors` do the work of picking the token string out of a request. The interface is simple and composable. + +This simple parsing example: + +```go + if token, err := jwt.ParseFromRequest(tokenString, req, keyLookupFunc); err == nil { + fmt.Printf("Token for user %v expires %v", token.Claims["user"], token.Claims["exp"]) + } +``` + +is directly mapped to: + +```go + if token, err := request.ParseFromRequest(req, request.OAuth2Extractor, keyLookupFunc); err == nil { + claims := token.Claims.(jwt.MapClaims) + fmt.Printf("Token for user %v expires %v", claims["user"], claims["exp"]) + } +``` + +There are several concrete `Extractor` types provided for your convenience: + +* `HeaderExtractor` will search a list of headers until one contains content. +* `ArgumentExtractor` will search a list of keys in request query and form arguments until one contains content. +* `MultiExtractor` will try a list of `Extractors` in order until one returns content. +* `AuthorizationHeaderExtractor` will look in the `Authorization` header for a `Bearer` token. +* `OAuth2Extractor` searches the places an OAuth2 token would be specified (per the spec): `Authorization` header and `access_token` argument +* `PostExtractionFilter` wraps an `Extractor`, allowing you to process the content before it's parsed. A simple example is stripping the `Bearer ` text from a header + + +### RSA signing methods no longer accept `[]byte` keys + +Due to a [critical vulnerability](https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/), we've decided the convenience of accepting `[]byte` instead of `rsa.PublicKey` or `rsa.PrivateKey` isn't worth the risk of misuse. + +To replace this behavior, we've added two helper methods: `ParseRSAPrivateKeyFromPEM(key []byte) (*rsa.PrivateKey, error)` and `ParseRSAPublicKeyFromPEM(key []byte) (*rsa.PublicKey, error)`. These are just simple helpers for unpacking PEM encoded PKCS1 and PKCS8 keys. If your keys are encoded any other way, all you need to do is convert them to the `crypto/rsa` package's types. + +```go + func keyLookupFunc(*Token) (interface{}, error) { + // Don't forget to validate the alg is what you expect: + if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok { + return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"]) + } + + // Look up key + key, err := lookupPublicKey(token.Header["kid"]) + if err != nil { + return nil, err + } + + // Unpack key from PEM encoded PKCS8 + return jwt.ParseRSAPublicKeyFromPEM(key) + } +``` diff --git a/vendor/github.com/dgrijalva/jwt-go/README.md b/vendor/github.com/dgrijalva/jwt-go/README.md new file mode 100644 index 000000000..d358d881b --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/README.md @@ -0,0 +1,100 @@ +# jwt-go + +[](https://travis-ci.org/dgrijalva/jwt-go) +[](https://godoc.org/github.com/dgrijalva/jwt-go) + +A [go](http://www.golang.org) (or 'golang' for search engine friendliness) implementation of [JSON Web Tokens](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html) + +**NEW VERSION COMING:** There have been a lot of improvements suggested since the version 3.0.0 released in 2016. I'm working now on cutting two different releases: 3.2.0 will contain any non-breaking changes or enhancements. 4.0.0 will follow shortly which will include breaking changes. See the 4.0.0 milestone to get an idea of what's coming. If you have other ideas, or would like to participate in 4.0.0, now's the time. If you depend on this library and don't want to be interrupted, I recommend you use your dependency mangement tool to pin to version 3. + +**SECURITY NOTICE:** Some older versions of Go have a security issue in the cryotp/elliptic. Recommendation is to upgrade to at least 1.8.3. See issue #216 for more detail. + +**SECURITY NOTICE:** It's important that you [validate the `alg` presented is what you expect](https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/). This library attempts to make it easy to do the right thing by requiring key types match the expected alg, but you should take the extra step to verify it in your usage. See the examples provided. + +## What the heck is a JWT? + +JWT.io has [a great introduction](https://jwt.io/introduction) to JSON Web Tokens. + +In short, it's a signed JSON object that does something useful (for example, authentication). It's commonly used for `Bearer` tokens in Oauth 2. A token is made of three parts, separated by `.`'s. The first two parts are JSON objects, that have been [base64url](http://tools.ietf.org/html/rfc4648) encoded. The last part is the signature, encoded the same way. + +The first part is called the header. It contains the necessary information for verifying the last part, the signature. For example, which encryption method was used for signing and what key was used. + +The part in the middle is the interesting bit. It's called the Claims and contains the actual stuff you care about. Refer to [the RFC](http://self-issued.info/docs/draft-jones-json-web-token.html) for information about reserved keys and the proper way to add your own. + +## What's in the box? + +This library supports the parsing and verification as well as the generation and signing of JWTs. Current supported signing algorithms are HMAC SHA, RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own. + +## Examples + +See [the project documentation](https://godoc.org/github.com/dgrijalva/jwt-go) for examples of usage: + +* [Simple example of parsing and validating a token](https://godoc.org/github.com/dgrijalva/jwt-go#example-Parse--Hmac) +* [Simple example of building and signing a token](https://godoc.org/github.com/dgrijalva/jwt-go#example-New--Hmac) +* [Directory of Examples](https://godoc.org/github.com/dgrijalva/jwt-go#pkg-examples) + +## Extensions + +This library publishes all the necessary components for adding your own signing methods. Simply implement the `SigningMethod` interface and register a factory method using `RegisterSigningMethod`. + +Here's an example of an extension that integrates with the Google App Engine signing tools: https://github.com/someone1/gcp-jwt-go + +## Compliance + +This library was last reviewed to comply with [RTF 7519](http://www.rfc-editor.org/info/rfc7519) dated May 2015 with a few notable differences: + +* In order to protect against accidental use of [Unsecured JWTs](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#UnsecuredJWT), tokens using `alg=none` will only be accepted if the constant `jwt.UnsafeAllowNoneSignatureType` is provided as the key. + +## Project Status & Versioning + +This library is considered production ready. Feedback and feature requests are appreciated. The API should be considered stable. There should be very few backwards-incompatible changes outside of major version updates (and only with good reason). + +This project uses [Semantic Versioning 2.0.0](http://semver.org). Accepted pull requests will land on `master`. Periodically, versions will be tagged from `master`. You can find all the releases on [the project releases page](https://github.com/dgrijalva/jwt-go/releases). + +While we try to make it obvious when we make breaking changes, there isn't a great mechanism for pushing announcements out to users. You may want to use this alternative package include: `gopkg.in/dgrijalva/jwt-go.v3`. It will do the right thing WRT semantic versioning. + +**BREAKING CHANGES:*** +* Version 3.0.0 includes _a lot_ of changes from the 2.x line, including a few that break the API. We've tried to break as few things as possible, so there should just be a few type signature changes. A full list of breaking changes is available in `VERSION_HISTORY.md`. See `MIGRATION_GUIDE.md` for more information on updating your code. + +## Usage Tips + +### Signing vs Encryption + +A token is simply a JSON object that is signed by its author. this tells you exactly two things about the data: + +* The author of the token was in the possession of the signing secret +* The data has not been modified since it was signed + +It's important to know that JWT does not provide encryption, which means anyone who has access to the token can read its contents. If you need to protect (encrypt) the data, there is a companion spec, `JWE`, that provides this functionality. JWE is currently outside the scope of this library. + +### Choosing a Signing Method + +There are several signing methods available, and you should probably take the time to learn about the various options before choosing one. The principal design decision is most likely going to be symmetric vs asymmetric. + +Symmetric signing methods, such as HSA, use only a single secret. This is probably the simplest signing method to use since any `[]byte` can be used as a valid secret. They are also slightly computationally faster to use, though this rarely is enough to matter. Symmetric signing methods work the best when both producers and consumers of tokens are trusted, or even the same system. Since the same secret is used to both sign and validate tokens, you can't easily distribute the key for validation. + +Asymmetric signing methods, such as RSA, use different keys for signing and verifying tokens. This makes it possible to produce tokens with a private key, and allow any consumer to access the public key for verification. + +### Signing Methods and Key Types + +Each signing method expects a different object type for its signing keys. See the package documentation for details. Here are the most common ones: + +* The [HMAC signing method](https://godoc.org/github.com/dgrijalva/jwt-go#SigningMethodHMAC) (`HS256`,`HS384`,`HS512`) expect `[]byte` values for signing and validation +* The [RSA signing method](https://godoc.org/github.com/dgrijalva/jwt-go#SigningMethodRSA) (`RS256`,`RS384`,`RS512`) expect `*rsa.PrivateKey` for signing and `*rsa.PublicKey` for validation +* The [ECDSA signing method](https://godoc.org/github.com/dgrijalva/jwt-go#SigningMethodECDSA) (`ES256`,`ES384`,`ES512`) expect `*ecdsa.PrivateKey` for signing and `*ecdsa.PublicKey` for validation + +### JWT and OAuth + +It's worth mentioning that OAuth and JWT are not the same thing. A JWT token is simply a signed JSON object. It can be used anywhere such a thing is useful. There is some confusion, though, as JWT is the most common type of bearer token used in OAuth2 authentication. + +Without going too far down the rabbit hole, here's a description of the interaction of these technologies: + +* OAuth is a protocol for allowing an identity provider to be separate from the service a user is logging in to. For example, whenever you use Facebook to log into a different service (Yelp, Spotify, etc), you are using OAuth. +* OAuth defines several options for passing around authentication data. One popular method is called a "bearer token". A bearer token is simply a string that _should_ only be held by an authenticated user. Thus, simply presenting this token proves your identity. You can probably derive from here why a JWT might make a good bearer token. +* Because bearer tokens are used for authentication, it's important they're kept secret. This is why transactions that use bearer tokens typically happen over SSL. + +## More + +Documentation can be found [on godoc.org](http://godoc.org/github.com/dgrijalva/jwt-go). + +The command line utility included in this project (cmd/jwt) provides a straightforward example of token creation and parsing as well as a useful tool for debugging your own integration. You'll also find several implementation examples in the documentation. diff --git a/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md b/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md new file mode 100644 index 000000000..637029831 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md @@ -0,0 +1,118 @@ +## `jwt-go` Version History + +#### 3.2.0 + +* Added method `ParseUnverified` to allow users to split up the tasks of parsing and validation +* HMAC signing method returns `ErrInvalidKeyType` instead of `ErrInvalidKey` where appropriate +* Added options to `request.ParseFromRequest`, which allows for an arbitrary list of modifiers to parsing behavior. Initial set include `WithClaims` and `WithParser`. Existing usage of this function will continue to work as before. +* Deprecated `ParseFromRequestWithClaims` to simplify API in the future. + +#### 3.1.0 + +* Improvements to `jwt` command line tool +* Added `SkipClaimsValidation` option to `Parser` +* Documentation updates + +#### 3.0.0 + +* **Compatibility Breaking Changes**: See MIGRATION_GUIDE.md for tips on updating your code + * Dropped support for `[]byte` keys when using RSA signing methods. This convenience feature could contribute to security vulnerabilities involving mismatched key types with signing methods. + * `ParseFromRequest` has been moved to `request` subpackage and usage has changed + * The `Claims` property on `Token` is now type `Claims` instead of `map[string]interface{}`. The default value is type `MapClaims`, which is an alias to `map[string]interface{}`. This makes it possible to use a custom type when decoding claims. +* Other Additions and Changes + * Added `Claims` interface type to allow users to decode the claims into a custom type + * Added `ParseWithClaims`, which takes a third argument of type `Claims`. Use this function instead of `Parse` if you have a custom type you'd like to decode into. + * Dramatically improved the functionality and flexibility of `ParseFromRequest`, which is now in the `request` subpackage + * Added `ParseFromRequestWithClaims` which is the `FromRequest` equivalent of `ParseWithClaims` + * Added new interface type `Extractor`, which is used for extracting JWT strings from http requests. Used with `ParseFromRequest` and `ParseFromRequestWithClaims`. + * Added several new, more specific, validation errors to error type bitmask + * Moved examples from README to executable example files + * Signing method registry is now thread safe + * Added new property to `ValidationError`, which contains the raw error returned by calls made by parse/verify (such as those returned by keyfunc or json parser) + +#### 2.7.0 + +This will likely be the last backwards compatible release before 3.0.0, excluding essential bug fixes. + +* Added new option `-show` to the `jwt` command that will just output the decoded token without verifying +* Error text for expired tokens includes how long it's been expired +* Fixed incorrect error returned from `ParseRSAPublicKeyFromPEM` +* Documentation updates + +#### 2.6.0 + +* Exposed inner error within ValidationError +* Fixed validation errors when using UseJSONNumber flag +* Added several unit tests + +#### 2.5.0 + +* Added support for signing method none. You shouldn't use this. The API tries to make this clear. +* Updated/fixed some documentation +* Added more helpful error message when trying to parse tokens that begin with `BEARER ` + +#### 2.4.0 + +* Added new type, Parser, to allow for configuration of various parsing parameters + * You can now specify a list of valid signing methods. Anything outside this set will be rejected. + * You can now opt to use the `json.Number` type instead of `float64` when parsing token JSON +* Added support for [Travis CI](https://travis-ci.org/dgrijalva/jwt-go) +* Fixed some bugs with ECDSA parsing + +#### 2.3.0 + +* Added support for ECDSA signing methods +* Added support for RSA PSS signing methods (requires go v1.4) + +#### 2.2.0 + +* Gracefully handle a `nil` `Keyfunc` being passed to `Parse`. Result will now be the parsed token and an error, instead of a panic. + +#### 2.1.0 + +Backwards compatible API change that was missed in 2.0.0. + +* The `SignedString` method on `Token` now takes `interface{}` instead of `[]byte` + +#### 2.0.0 + +There were two major reasons for breaking backwards compatibility with this update. The first was a refactor required to expand the width of the RSA and HMAC-SHA signing implementations. There will likely be no required code changes to support this change. + +The second update, while unfortunately requiring a small change in integration, is required to open up this library to other signing methods. Not all keys used for all signing methods have a single standard on-disk representation. Requiring `[]byte` as the type for all keys proved too limiting. Additionally, this implementation allows for pre-parsed tokens to be reused, which might matter in an application that parses a high volume of tokens with a small set of keys. Backwards compatibilty has been maintained for passing `[]byte` to the RSA signing methods, but they will also accept `*rsa.PublicKey` and `*rsa.PrivateKey`. + +It is likely the only integration change required here will be to change `func(t *jwt.Token) ([]byte, error)` to `func(t *jwt.Token) (interface{}, error)` when calling `Parse`. + +* **Compatibility Breaking Changes** + * `SigningMethodHS256` is now `*SigningMethodHMAC` instead of `type struct` + * `SigningMethodRS256` is now `*SigningMethodRSA` instead of `type struct` + * `KeyFunc` now returns `interface{}` instead of `[]byte` + * `SigningMethod.Sign` now takes `interface{}` instead of `[]byte` for the key + * `SigningMethod.Verify` now takes `interface{}` instead of `[]byte` for the key +* Renamed type `SigningMethodHS256` to `SigningMethodHMAC`. Specific sizes are now just instances of this type. + * Added public package global `SigningMethodHS256` + * Added public package global `SigningMethodHS384` + * Added public package global `SigningMethodHS512` +* Renamed type `SigningMethodRS256` to `SigningMethodRSA`. Specific sizes are now just instances of this type. + * Added public package global `SigningMethodRS256` + * Added public package global `SigningMethodRS384` + * Added public package global `SigningMethodRS512` +* Moved sample private key for HMAC tests from an inline value to a file on disk. Value is unchanged. +* Refactored the RSA implementation to be easier to read +* Exposed helper methods `ParseRSAPrivateKeyFromPEM` and `ParseRSAPublicKeyFromPEM` + +#### 1.0.2 + +* Fixed bug in parsing public keys from certificates +* Added more tests around the parsing of keys for RS256 +* Code refactoring in RS256 implementation. No functional changes + +#### 1.0.1 + +* Fixed panic if RS256 signing method was passed an invalid key + +#### 1.0.0 + +* First versioned release +* API stabilized +* Supports creating, signing, parsing, and validating JWT tokens +* Supports RS256 and HS256 signing methods \ No newline at end of file diff --git a/vendor/github.com/dgrijalva/jwt-go/claims.go b/vendor/github.com/dgrijalva/jwt-go/claims.go new file mode 100644 index 000000000..f0228f02e --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/claims.go @@ -0,0 +1,134 @@ +package jwt + +import ( + "crypto/subtle" + "fmt" + "time" +) + +// For a type to be a Claims object, it must just have a Valid method that determines +// if the token is invalid for any supported reason +type Claims interface { + Valid() error +} + +// Structured version of Claims Section, as referenced at +// https://tools.ietf.org/html/rfc7519#section-4.1 +// See examples for how to use this with your own claim types +type StandardClaims struct { + Audience string `json:"aud,omitempty"` + ExpiresAt int64 `json:"exp,omitempty"` + Id string `json:"jti,omitempty"` + IssuedAt int64 `json:"iat,omitempty"` + Issuer string `json:"iss,omitempty"` + NotBefore int64 `json:"nbf,omitempty"` + Subject string `json:"sub,omitempty"` +} + +// Validates time based claims "exp, iat, nbf". +// There is no accounting for clock skew. +// As well, if any of the above claims are not in the token, it will still +// be considered a valid claim. +func (c StandardClaims) Valid() error { + vErr := new(ValidationError) + now := TimeFunc().Unix() + + // The claims below are optional, by default, so if they are set to the + // default value in Go, let's not fail the verification for them. + if c.VerifyExpiresAt(now, false) == false { + delta := time.Unix(now, 0).Sub(time.Unix(c.ExpiresAt, 0)) + vErr.Inner = fmt.Errorf("token is expired by %v", delta) + vErr.Errors |= ValidationErrorExpired + } + + if c.VerifyIssuedAt(now, false) == false { + vErr.Inner = fmt.Errorf("Token used before issued") + vErr.Errors |= ValidationErrorIssuedAt + } + + if c.VerifyNotBefore(now, false) == false { + vErr.Inner = fmt.Errorf("token is not valid yet") + vErr.Errors |= ValidationErrorNotValidYet + } + + if vErr.valid() { + return nil + } + + return vErr +} + +// Compares the aud claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (c *StandardClaims) VerifyAudience(cmp string, req bool) bool { + return verifyAud(c.Audience, cmp, req) +} + +// Compares the exp claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (c *StandardClaims) VerifyExpiresAt(cmp int64, req bool) bool { + return verifyExp(c.ExpiresAt, cmp, req) +} + +// Compares the iat claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (c *StandardClaims) VerifyIssuedAt(cmp int64, req bool) bool { + return verifyIat(c.IssuedAt, cmp, req) +} + +// Compares the iss claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (c *StandardClaims) VerifyIssuer(cmp string, req bool) bool { + return verifyIss(c.Issuer, cmp, req) +} + +// Compares the nbf claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (c *StandardClaims) VerifyNotBefore(cmp int64, req bool) bool { + return verifyNbf(c.NotBefore, cmp, req) +} + +// ----- helpers + +func verifyAud(aud string, cmp string, required bool) bool { + if aud == "" { + return !required + } + if subtle.ConstantTimeCompare([]byte(aud), []byte(cmp)) != 0 { + return true + } else { + return false + } +} + +func verifyExp(exp int64, now int64, required bool) bool { + if exp == 0 { + return !required + } + return now <= exp +} + +func verifyIat(iat int64, now int64, required bool) bool { + if iat == 0 { + return !required + } + return now >= iat +} + +func verifyIss(iss string, cmp string, required bool) bool { + if iss == "" { + return !required + } + if subtle.ConstantTimeCompare([]byte(iss), []byte(cmp)) != 0 { + return true + } else { + return false + } +} + +func verifyNbf(nbf int64, now int64, required bool) bool { + if nbf == 0 { + return !required + } + return now >= nbf +} diff --git a/vendor/github.com/dgrijalva/jwt-go/doc.go b/vendor/github.com/dgrijalva/jwt-go/doc.go new file mode 100644 index 000000000..a86dc1a3b --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/doc.go @@ -0,0 +1,4 @@ +// Package jwt is a Go implementation of JSON Web Tokens: http://self-issued.info/docs/draft-jones-json-web-token.html +// +// See README.md for more info. +package jwt diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa.go new file mode 100644 index 000000000..f97738124 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/ecdsa.go @@ -0,0 +1,148 @@ +package jwt + +import ( + "crypto" + "crypto/ecdsa" + "crypto/rand" + "errors" + "math/big" +) + +var ( + // Sadly this is missing from crypto/ecdsa compared to crypto/rsa + ErrECDSAVerification = errors.New("crypto/ecdsa: verification error") +) + +// Implements the ECDSA family of signing methods signing methods +// Expects *ecdsa.PrivateKey for signing and *ecdsa.PublicKey for verification +type SigningMethodECDSA struct { + Name string + Hash crypto.Hash + KeySize int + CurveBits int +} + +// Specific instances for EC256 and company +var ( + SigningMethodES256 *SigningMethodECDSA + SigningMethodES384 *SigningMethodECDSA + SigningMethodES512 *SigningMethodECDSA +) + +func init() { + // ES256 + SigningMethodES256 = &SigningMethodECDSA{"ES256", crypto.SHA256, 32, 256} + RegisterSigningMethod(SigningMethodES256.Alg(), func() SigningMethod { + return SigningMethodES256 + }) + + // ES384 + SigningMethodES384 = &SigningMethodECDSA{"ES384", crypto.SHA384, 48, 384} + RegisterSigningMethod(SigningMethodES384.Alg(), func() SigningMethod { + return SigningMethodES384 + }) + + // ES512 + SigningMethodES512 = &SigningMethodECDSA{"ES512", crypto.SHA512, 66, 521} + RegisterSigningMethod(SigningMethodES512.Alg(), func() SigningMethod { + return SigningMethodES512 + }) +} + +func (m *SigningMethodECDSA) Alg() string { + return m.Name +} + +// Implements the Verify method from SigningMethod +// For this verify method, key must be an ecdsa.PublicKey struct +func (m *SigningMethodECDSA) Verify(signingString, signature string, key interface{}) error { + var err error + + // Decode the signature + var sig []byte + if sig, err = DecodeSegment(signature); err != nil { + return err + } + + // Get the key + var ecdsaKey *ecdsa.PublicKey + switch k := key.(type) { + case *ecdsa.PublicKey: + ecdsaKey = k + default: + return ErrInvalidKeyType + } + + if len(sig) != 2*m.KeySize { + return ErrECDSAVerification + } + + r := big.NewInt(0).SetBytes(sig[:m.KeySize]) + s := big.NewInt(0).SetBytes(sig[m.KeySize:]) + + // Create hasher + if !m.Hash.Available() { + return ErrHashUnavailable + } + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + // Verify the signature + if verifystatus := ecdsa.Verify(ecdsaKey, hasher.Sum(nil), r, s); verifystatus == true { + return nil + } else { + return ErrECDSAVerification + } +} + +// Implements the Sign method from SigningMethod +// For this signing method, key must be an ecdsa.PrivateKey struct +func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) (string, error) { + // Get the key + var ecdsaKey *ecdsa.PrivateKey + switch k := key.(type) { + case *ecdsa.PrivateKey: + ecdsaKey = k + default: + return "", ErrInvalidKeyType + } + + // Create the hasher + if !m.Hash.Available() { + return "", ErrHashUnavailable + } + + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + // Sign the string and return r, s + if r, s, err := ecdsa.Sign(rand.Reader, ecdsaKey, hasher.Sum(nil)); err == nil { + curveBits := ecdsaKey.Curve.Params().BitSize + + if m.CurveBits != curveBits { + return "", ErrInvalidKey + } + + keyBytes := curveBits / 8 + if curveBits%8 > 0 { + keyBytes += 1 + } + + // We serialize the outpus (r and s) into big-endian byte arrays and pad + // them with zeros on the left to make sure the sizes work out. Both arrays + // must be keyBytes long, and the output must be 2*keyBytes long. + rBytes := r.Bytes() + rBytesPadded := make([]byte, keyBytes) + copy(rBytesPadded[keyBytes-len(rBytes):], rBytes) + + sBytes := s.Bytes() + sBytesPadded := make([]byte, keyBytes) + copy(sBytesPadded[keyBytes-len(sBytes):], sBytes) + + out := append(rBytesPadded, sBytesPadded...) + + return EncodeSegment(out), nil + } else { + return "", err + } +} diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go new file mode 100644 index 000000000..d19624b72 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go @@ -0,0 +1,67 @@ +package jwt + +import ( + "crypto/ecdsa" + "crypto/x509" + "encoding/pem" + "errors" +) + +var ( + ErrNotECPublicKey = errors.New("Key is not a valid ECDSA public key") + ErrNotECPrivateKey = errors.New("Key is not a valid ECDSA private key") +) + +// Parse PEM encoded Elliptic Curve Private Key Structure +func ParseECPrivateKeyFromPEM(key []byte) (*ecdsa.PrivateKey, error) { + var err error + + // Parse PEM block + var block *pem.Block + if block, _ = pem.Decode(key); block == nil { + return nil, ErrKeyMustBePEMEncoded + } + + // Parse the key + var parsedKey interface{} + if parsedKey, err = x509.ParseECPrivateKey(block.Bytes); err != nil { + return nil, err + } + + var pkey *ecdsa.PrivateKey + var ok bool + if pkey, ok = parsedKey.(*ecdsa.PrivateKey); !ok { + return nil, ErrNotECPrivateKey + } + + return pkey, nil +} + +// Parse PEM encoded PKCS1 or PKCS8 public key +func ParseECPublicKeyFromPEM(key []byte) (*ecdsa.PublicKey, error) { + var err error + + // Parse PEM block + var block *pem.Block + if block, _ = pem.Decode(key); block == nil { + return nil, ErrKeyMustBePEMEncoded + } + + // Parse the key + var parsedKey interface{} + if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil { + if cert, err := x509.ParseCertificate(block.Bytes); err == nil { + parsedKey = cert.PublicKey + } else { + return nil, err + } + } + + var pkey *ecdsa.PublicKey + var ok bool + if pkey, ok = parsedKey.(*ecdsa.PublicKey); !ok { + return nil, ErrNotECPublicKey + } + + return pkey, nil +} diff --git a/vendor/github.com/dgrijalva/jwt-go/errors.go b/vendor/github.com/dgrijalva/jwt-go/errors.go new file mode 100644 index 000000000..1c93024aa --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/errors.go @@ -0,0 +1,59 @@ +package jwt + +import ( + "errors" +) + +// Error constants +var ( + ErrInvalidKey = errors.New("key is invalid") + ErrInvalidKeyType = errors.New("key is of invalid type") + ErrHashUnavailable = errors.New("the requested hash function is unavailable") +) + +// The errors that might occur when parsing and validating a token +const ( + ValidationErrorMalformed uint32 = 1 << iota // Token is malformed + ValidationErrorUnverifiable // Token could not be verified because of signing problems + ValidationErrorSignatureInvalid // Signature validation failed + + // Standard Claim validation errors + ValidationErrorAudience // AUD validation failed + ValidationErrorExpired // EXP validation failed + ValidationErrorIssuedAt // IAT validation failed + ValidationErrorIssuer // ISS validation failed + ValidationErrorNotValidYet // NBF validation failed + ValidationErrorId // JTI validation failed + ValidationErrorClaimsInvalid // Generic claims validation error +) + +// Helper for constructing a ValidationError with a string error message +func NewValidationError(errorText string, errorFlags uint32) *ValidationError { + return &ValidationError{ + text: errorText, + Errors: errorFlags, + } +} + +// The error from Parse if token is not valid +type ValidationError struct { + Inner error // stores the error returned by external dependencies, i.e.: KeyFunc + Errors uint32 // bitfield. see ValidationError... constants + text string // errors that do not have a valid error just have text +} + +// Validation error is an error type +func (e ValidationError) Error() string { + if e.Inner != nil { + return e.Inner.Error() + } else if e.text != "" { + return e.text + } else { + return "token is invalid" + } +} + +// No errors +func (e *ValidationError) valid() bool { + return e.Errors == 0 +} diff --git a/vendor/github.com/dgrijalva/jwt-go/hmac.go b/vendor/github.com/dgrijalva/jwt-go/hmac.go new file mode 100644 index 000000000..addbe5d40 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/hmac.go @@ -0,0 +1,95 @@ +package jwt + +import ( + "crypto" + "crypto/hmac" + "errors" +) + +// Implements the HMAC-SHA family of signing methods signing methods +// Expects key type of []byte for both signing and validation +type SigningMethodHMAC struct { + Name string + Hash crypto.Hash +} + +// Specific instances for HS256 and company +var ( + SigningMethodHS256 *SigningMethodHMAC + SigningMethodHS384 *SigningMethodHMAC + SigningMethodHS512 *SigningMethodHMAC + ErrSignatureInvalid = errors.New("signature is invalid") +) + +func init() { + // HS256 + SigningMethodHS256 = &SigningMethodHMAC{"HS256", crypto.SHA256} + RegisterSigningMethod(SigningMethodHS256.Alg(), func() SigningMethod { + return SigningMethodHS256 + }) + + // HS384 + SigningMethodHS384 = &SigningMethodHMAC{"HS384", crypto.SHA384} + RegisterSigningMethod(SigningMethodHS384.Alg(), func() SigningMethod { + return SigningMethodHS384 + }) + + // HS512 + SigningMethodHS512 = &SigningMethodHMAC{"HS512", crypto.SHA512} + RegisterSigningMethod(SigningMethodHS512.Alg(), func() SigningMethod { + return SigningMethodHS512 + }) +} + +func (m *SigningMethodHMAC) Alg() string { + return m.Name +} + +// Verify the signature of HSXXX tokens. Returns nil if the signature is valid. +func (m *SigningMethodHMAC) Verify(signingString, signature string, key interface{}) error { + // Verify the key is the right type + keyBytes, ok := key.([]byte) + if !ok { + return ErrInvalidKeyType + } + + // Decode signature, for comparison + sig, err := DecodeSegment(signature) + if err != nil { + return err + } + + // Can we use the specified hashing method? + if !m.Hash.Available() { + return ErrHashUnavailable + } + + // This signing method is symmetric, so we validate the signature + // by reproducing the signature from the signing string and key, then + // comparing that against the provided signature. + hasher := hmac.New(m.Hash.New, keyBytes) + hasher.Write([]byte(signingString)) + if !hmac.Equal(sig, hasher.Sum(nil)) { + return ErrSignatureInvalid + } + + // No validation errors. Signature is good. + return nil +} + +// Implements the Sign method from SigningMethod for this signing method. +// Key must be []byte +func (m *SigningMethodHMAC) Sign(signingString string, key interface{}) (string, error) { + if keyBytes, ok := key.([]byte); ok { + if !m.Hash.Available() { + return "", ErrHashUnavailable + } + + hasher := hmac.New(m.Hash.New, keyBytes) + hasher.Write([]byte(signingString)) + + return EncodeSegment(hasher.Sum(nil)), nil + } + + return "", ErrInvalidKeyType +} diff --git a/vendor/github.com/dgrijalva/jwt-go/map_claims.go b/vendor/github.com/dgrijalva/jwt-go/map_claims.go new file mode 100644 index 000000000..291213c46 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/map_claims.go @@ -0,0 +1,94 @@ +package jwt + +import ( + "encoding/json" + "errors" + // "fmt" +) + +// Claims type that uses the map[string]interface{} for JSON decoding +// This is the default claims type if you don't supply one +type MapClaims map[string]interface{} + +// Compares the aud claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (m MapClaims) VerifyAudience(cmp string, req bool) bool { + aud, _ := m["aud"].(string) + return verifyAud(aud, cmp, req) +} + +// Compares the exp claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (m MapClaims) VerifyExpiresAt(cmp int64, req bool) bool { + switch exp := m["exp"].(type) { + case float64: + return verifyExp(int64(exp), cmp, req) + case json.Number: + v, _ := exp.Int64() + return verifyExp(v, cmp, req) + } + return req == false +} + +// Compares the iat claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (m MapClaims) VerifyIssuedAt(cmp int64, req bool) bool { + switch iat := m["iat"].(type) { + case float64: + return verifyIat(int64(iat), cmp, req) + case json.Number: + v, _ := iat.Int64() + return verifyIat(v, cmp, req) + } + return req == false +} + +// Compares the iss claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (m MapClaims) VerifyIssuer(cmp string, req bool) bool { + iss, _ := m["iss"].(string) + return verifyIss(iss, cmp, req) +} + +// Compares the nbf claim against cmp. +// If required is false, this method will return true if the value matches or is unset +func (m MapClaims) VerifyNotBefore(cmp int64, req bool) bool { + switch nbf := m["nbf"].(type) { + case float64: + return verifyNbf(int64(nbf), cmp, req) + case json.Number: + v, _ := nbf.Int64() + return verifyNbf(v, cmp, req) + } + return req == false +} + +// Validates time based claims "exp, iat, nbf". +// There is no accounting for clock skew. +// As well, if any of the above claims are not in the token, it will still +// be considered a valid claim. +func (m MapClaims) Valid() error { + vErr := new(ValidationError) + now := TimeFunc().Unix() + + if m.VerifyExpiresAt(now, false) == false { + vErr.Inner = errors.New("Token is expired") + vErr.Errors |= ValidationErrorExpired + } + + if m.VerifyIssuedAt(now, false) == false { + vErr.Inner = errors.New("Token used before issued") + vErr.Errors |= ValidationErrorIssuedAt + } + + if m.VerifyNotBefore(now, false) == false { + vErr.Inner = errors.New("Token is not valid yet") + vErr.Errors |= ValidationErrorNotValidYet + } + + if vErr.valid() { + return nil + } + + return vErr +} diff --git a/vendor/github.com/dgrijalva/jwt-go/none.go b/vendor/github.com/dgrijalva/jwt-go/none.go new file mode 100644 index 000000000..f04d189d0 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/none.go @@ -0,0 +1,52 @@ +package jwt + +// Implements the none signing method. This is required by the spec +// but you probably should never use it. +var SigningMethodNone *signingMethodNone + +const UnsafeAllowNoneSignatureType unsafeNoneMagicConstant = "none signing method allowed" + +var NoneSignatureTypeDisallowedError error + +type signingMethodNone struct{} +type unsafeNoneMagicConstant string + +func init() { + SigningMethodNone = &signingMethodNone{} + NoneSignatureTypeDisallowedError = NewValidationError("'none' signature type is not allowed", ValidationErrorSignatureInvalid) + + RegisterSigningMethod(SigningMethodNone.Alg(), func() SigningMethod { + return SigningMethodNone + }) +} + +func (m *signingMethodNone) Alg() string { + return "none" +} + +// Only allow 'none' alg type if UnsafeAllowNoneSignatureType is specified as the key +func (m *signingMethodNone) Verify(signingString, signature string, key interface{}) (err error) { + // Key must be UnsafeAllowNoneSignatureType to prevent accidentally + // accepting 'none' signing method + if _, ok := key.(unsafeNoneMagicConstant); !ok { + return NoneSignatureTypeDisallowedError + } + // If signing method is none, signature must be an empty string + if signature != "" { + return NewValidationError( + "'none' signing method with non-empty signature", + ValidationErrorSignatureInvalid, + ) + } + + // Accept 'none' signing method. + return nil +} + +// Only allow 'none' signing if UnsafeAllowNoneSignatureType is specified as the key +func (m *signingMethodNone) Sign(signingString string, key interface{}) (string, error) { + if _, ok := key.(unsafeNoneMagicConstant); ok { + return "", nil + } + return "", NoneSignatureTypeDisallowedError +} diff --git a/vendor/github.com/dgrijalva/jwt-go/parser.go b/vendor/github.com/dgrijalva/jwt-go/parser.go new file mode 100644 index 000000000..d6901d9ad --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/parser.go @@ -0,0 +1,148 @@ +package jwt + +import ( + "bytes" + "encoding/json" + "fmt" + "strings" +) + +type Parser struct { + ValidMethods []string // If populated, only these methods will be considered valid + UseJSONNumber bool // Use JSON Number format in JSON decoder + SkipClaimsValidation bool // Skip claims validation during token parsing +} + +// Parse, validate, and return a token. +// keyFunc will receive the parsed token and should return the key for validating. +// If everything is kosher, err will be nil +func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { + return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) +} + +func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { + token, parts, err := p.ParseUnverified(tokenString, claims) + if err != nil { + return token, err + } + + // Verify signing method is in the required set + if p.ValidMethods != nil { + var signingMethodValid = false + var alg = token.Method.Alg() + for _, m := range p.ValidMethods { + if m == alg { + signingMethodValid = true + break + } + } + if !signingMethodValid { + // signing method is not in the listed set + return token, NewValidationError(fmt.Sprintf("signing method %v is invalid", alg), ValidationErrorSignatureInvalid) + } + } + + // Lookup key + var key interface{} + if keyFunc == nil { + // keyFunc was not provided. short circuiting validation + return token, NewValidationError("no Keyfunc was provided.", ValidationErrorUnverifiable) + } + if key, err = keyFunc(token); err != nil { + // keyFunc returned an error + if ve, ok := err.(*ValidationError); ok { + return token, ve + } + return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} + } + + vErr := &ValidationError{} + + // Validate Claims + if !p.SkipClaimsValidation { + if err := token.Claims.Valid(); err != nil { + + // If the Claims Valid returned an error, check if it is a validation error, + // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set + if e, ok := err.(*ValidationError); !ok { + vErr = &ValidationError{Inner: err, Errors: ValidationErrorClaimsInvalid} + } else { + vErr = e + } + } + } + + // Perform validation + token.Signature = parts[2] + if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { + vErr.Inner = err + vErr.Errors |= ValidationErrorSignatureInvalid + } + + if vErr.valid() { + token.Valid = true + return token, nil + } + + return token, vErr +} + +// WARNING: Don't use this method unless you know what you're doing +// +// This method parses the token but doesn't validate the signature. It's only +// ever useful in cases where you know the signature is valid (because it has +// been checked previously in the stack) and you want to extract values from +// it. +func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) { + parts = strings.Split(tokenString, ".") + if len(parts) != 3 { + return nil, parts, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed) + } + + token = &Token{Raw: tokenString} + + // parse Header + var headerBytes []byte + if headerBytes, err = DecodeSegment(parts[0]); err != nil { + if strings.HasPrefix(strings.ToLower(tokenString), "bearer ") { + return token, parts, NewValidationError("tokenstring should not contain 'bearer '", ValidationErrorMalformed) + } + return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed} + } + if err = json.Unmarshal(headerBytes, &token.Header); err != nil { + return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed} + } + + // parse Claims + var claimBytes []byte + token.Claims = claims + + if claimBytes, err = DecodeSegment(parts[1]); err != nil { + return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed} + } + dec := json.NewDecoder(bytes.NewBuffer(claimBytes)) + if p.UseJSONNumber { + dec.UseNumber() + } + // JSON Decode. Special case for map type to avoid weird pointer behavior + if c, ok := token.Claims.(MapClaims); ok { + err = dec.Decode(&c) + } else { + err = dec.Decode(&claims) + } + // Handle decode error + if err != nil { + return token, parts, &ValidationError{Inner: err, Errors: ValidationErrorMalformed} + } + + // Lookup signature method + if method, ok := token.Header["alg"].(string); ok { + if token.Method = GetSigningMethod(method); token.Method == nil { + return token, parts, NewValidationError("signing method (alg) is unavailable.", ValidationErrorUnverifiable) + } + } else { + return token, parts, NewValidationError("signing method (alg) is unspecified.", ValidationErrorUnverifiable) + } + + return token, parts, nil +} diff --git a/vendor/github.com/dgrijalva/jwt-go/rsa.go b/vendor/github.com/dgrijalva/jwt-go/rsa.go new file mode 100644 index 000000000..e4caf1ca4 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/rsa.go @@ -0,0 +1,101 @@ +package jwt + +import ( + "crypto" + "crypto/rand" + "crypto/rsa" +) + +// Implements the RSA family of signing methods signing methods +// Expects *rsa.PrivateKey for signing and *rsa.PublicKey for validation +type SigningMethodRSA struct { + Name string + Hash crypto.Hash +} + +// Specific instances for RS256 and company +var ( + SigningMethodRS256 *SigningMethodRSA + SigningMethodRS384 *SigningMethodRSA + SigningMethodRS512 *SigningMethodRSA +) + +func init() { + // RS256 + SigningMethodRS256 = &SigningMethodRSA{"RS256", crypto.SHA256} + RegisterSigningMethod(SigningMethodRS256.Alg(), func() SigningMethod { + return SigningMethodRS256 + }) + + // RS384 + SigningMethodRS384 = &SigningMethodRSA{"RS384", crypto.SHA384} + RegisterSigningMethod(SigningMethodRS384.Alg(), func() SigningMethod { + return SigningMethodRS384 + }) + + // RS512 + SigningMethodRS512 = &SigningMethodRSA{"RS512", crypto.SHA512} + RegisterSigningMethod(SigningMethodRS512.Alg(), func() SigningMethod { + return SigningMethodRS512 + }) +} + +func (m *SigningMethodRSA) Alg() string { + return m.Name +} + +// Implements the Verify method from SigningMethod +// For this signing method, must be an *rsa.PublicKey structure. +func (m *SigningMethodRSA) Verify(signingString, signature string, key interface{}) error { + var err error + + // Decode the signature + var sig []byte + if sig, err = DecodeSegment(signature); err != nil { + return err + } + + var rsaKey *rsa.PublicKey + var ok bool + + if rsaKey, ok = key.(*rsa.PublicKey); !ok { + return ErrInvalidKeyType + } + + // Create hasher + if !m.Hash.Available() { + return ErrHashUnavailable + } + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + // Verify the signature + return rsa.VerifyPKCS1v15(rsaKey, m.Hash, hasher.Sum(nil), sig) +} + +// Implements the Sign method from SigningMethod +// For this signing method, must be an *rsa.PrivateKey structure. +func (m *SigningMethodRSA) Sign(signingString string, key interface{}) (string, error) { + var rsaKey *rsa.PrivateKey + var ok bool + + // Validate type of key + if rsaKey, ok = key.(*rsa.PrivateKey); !ok { + return "", ErrInvalidKey + } + + // Create the hasher + if !m.Hash.Available() { + return "", ErrHashUnavailable + } + + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + // Sign the string and return the encoded bytes + if sigBytes, err := rsa.SignPKCS1v15(rand.Reader, rsaKey, m.Hash, hasher.Sum(nil)); err == nil { + return EncodeSegment(sigBytes), nil + } else { + return "", err + } +} diff --git a/vendor/github.com/dgrijalva/jwt-go/rsa_pss.go b/vendor/github.com/dgrijalva/jwt-go/rsa_pss.go new file mode 100644 index 000000000..10ee9db8a --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/rsa_pss.go @@ -0,0 +1,126 @@ +// +build go1.4 + +package jwt + +import ( + "crypto" + "crypto/rand" + "crypto/rsa" +) + +// Implements the RSAPSS family of signing methods signing methods +type SigningMethodRSAPSS struct { + *SigningMethodRSA + Options *rsa.PSSOptions +} + +// Specific instances for RS/PS and company +var ( + SigningMethodPS256 *SigningMethodRSAPSS + SigningMethodPS384 *SigningMethodRSAPSS + SigningMethodPS512 *SigningMethodRSAPSS +) + +func init() { + // PS256 + SigningMethodPS256 = &SigningMethodRSAPSS{ + &SigningMethodRSA{ + Name: "PS256", + Hash: crypto.SHA256, + }, + &rsa.PSSOptions{ + SaltLength: rsa.PSSSaltLengthAuto, + Hash: crypto.SHA256, + }, + } + RegisterSigningMethod(SigningMethodPS256.Alg(), func() SigningMethod { + return SigningMethodPS256 + }) + + // PS384 + SigningMethodPS384 = &SigningMethodRSAPSS{ + &SigningMethodRSA{ + Name: "PS384", + Hash: crypto.SHA384, + }, + &rsa.PSSOptions{ + SaltLength: rsa.PSSSaltLengthAuto, + Hash: crypto.SHA384, + }, + } + RegisterSigningMethod(SigningMethodPS384.Alg(), func() SigningMethod { + return SigningMethodPS384 + }) + + // PS512 + SigningMethodPS512 = &SigningMethodRSAPSS{ + &SigningMethodRSA{ + Name: "PS512", + Hash: crypto.SHA512, + }, + &rsa.PSSOptions{ + SaltLength: rsa.PSSSaltLengthAuto, + Hash: crypto.SHA512, + }, + } + RegisterSigningMethod(SigningMethodPS512.Alg(), func() SigningMethod { + return SigningMethodPS512 + }) +} + +// Implements the Verify method from SigningMethod +// For this verify method, key must be an rsa.PublicKey struct +func (m *SigningMethodRSAPSS) Verify(signingString, signature string, key interface{}) error { + var err error + + // Decode the signature + var sig []byte + if sig, err = DecodeSegment(signature); err != nil { + return err + } + + var rsaKey *rsa.PublicKey + switch k := key.(type) { + case *rsa.PublicKey: + rsaKey = k + default: + return ErrInvalidKey + } + + // Create hasher + if !m.Hash.Available() { + return ErrHashUnavailable + } + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + return rsa.VerifyPSS(rsaKey, m.Hash, hasher.Sum(nil), sig, m.Options) +} + +// Implements the Sign method from SigningMethod +// For this signing method, key must be an rsa.PrivateKey struct +func (m *SigningMethodRSAPSS) Sign(signingString string, key interface{}) (string, error) { + var rsaKey *rsa.PrivateKey + + switch k := key.(type) { + case *rsa.PrivateKey: + rsaKey = k + default: + return "", ErrInvalidKeyType + } + + // Create the hasher + if !m.Hash.Available() { + return "", ErrHashUnavailable + } + + hasher := m.Hash.New() + hasher.Write([]byte(signingString)) + + // Sign the string and return the encoded bytes + if sigBytes, err := rsa.SignPSS(rand.Reader, rsaKey, m.Hash, hasher.Sum(nil), m.Options); err == nil { + return EncodeSegment(sigBytes), nil + } else { + return "", err + } +} diff --git a/vendor/github.com/dgrijalva/jwt-go/rsa_utils.go b/vendor/github.com/dgrijalva/jwt-go/rsa_utils.go new file mode 100644 index 000000000..a5ababf95 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/rsa_utils.go @@ -0,0 +1,101 @@ +package jwt + +import ( + "crypto/rsa" + "crypto/x509" + "encoding/pem" + "errors" +) + +var ( + ErrKeyMustBePEMEncoded = errors.New("Invalid Key: Key must be PEM encoded PKCS1 or PKCS8 private key") + ErrNotRSAPrivateKey = errors.New("Key is not a valid RSA private key") + ErrNotRSAPublicKey = errors.New("Key is not a valid RSA public key") +) + +// Parse PEM encoded PKCS1 or PKCS8 private key +func ParseRSAPrivateKeyFromPEM(key []byte) (*rsa.PrivateKey, error) { + var err error + + // Parse PEM block + var block *pem.Block + if block, _ = pem.Decode(key); block == nil { + return nil, ErrKeyMustBePEMEncoded + } + + var parsedKey interface{} + if parsedKey, err = x509.ParsePKCS1PrivateKey(block.Bytes); err != nil { + if parsedKey, err = x509.ParsePKCS8PrivateKey(block.Bytes); err != nil { + return nil, err + } + } + + var pkey *rsa.PrivateKey + var ok bool + if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok { + return nil, ErrNotRSAPrivateKey + } + + return pkey, nil +} + +// Parse PEM encoded PKCS1 or PKCS8 private key protected with password +func ParseRSAPrivateKeyFromPEMWithPassword(key []byte, password string) (*rsa.PrivateKey, error) { + var err error + + // Parse PEM block + var block *pem.Block + if block, _ = pem.Decode(key); block == nil { + return nil, ErrKeyMustBePEMEncoded + } + + var parsedKey interface{} + + var blockDecrypted []byte + if blockDecrypted, err = x509.DecryptPEMBlock(block, []byte(password)); err != nil { + return nil, err + } + + if parsedKey, err = x509.ParsePKCS1PrivateKey(blockDecrypted); err != nil { + if parsedKey, err = x509.ParsePKCS8PrivateKey(blockDecrypted); err != nil { + return nil, err + } + } + + var pkey *rsa.PrivateKey + var ok bool + if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok { + return nil, ErrNotRSAPrivateKey + } + + return pkey, nil +} + +// Parse PEM encoded PKCS1 or PKCS8 public key +func ParseRSAPublicKeyFromPEM(key []byte) (*rsa.PublicKey, error) { + var err error + + // Parse PEM block + var block *pem.Block + if block, _ = pem.Decode(key); block == nil { + return nil, ErrKeyMustBePEMEncoded + } + + // Parse the key + var parsedKey interface{} + if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil { + if cert, err := x509.ParseCertificate(block.Bytes); err == nil { + parsedKey = cert.PublicKey + } else { + return nil, err + } + } + + var pkey *rsa.PublicKey + var ok bool + if pkey, ok = parsedKey.(*rsa.PublicKey); !ok { + return nil, ErrNotRSAPublicKey + } + + return pkey, nil +} diff --git a/vendor/github.com/dgrijalva/jwt-go/signing_method.go b/vendor/github.com/dgrijalva/jwt-go/signing_method.go new file mode 100644 index 000000000..ed1f212b2 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/signing_method.go @@ -0,0 +1,35 @@ +package jwt + +import ( + "sync" +) + +var signingMethods = map[string]func() SigningMethod{} +var signingMethodLock = new(sync.RWMutex) + +// Implement SigningMethod to add new methods for signing or verifying tokens. +type SigningMethod interface { + Verify(signingString, signature string, key interface{}) error // Returns nil if signature is valid + Sign(signingString string, key interface{}) (string, error) // Returns encoded signature or error + Alg() string // returns the alg identifier for this method (example: 'HS256') +} + +// Register the "alg" name and a factory function for signing method. +// This is typically done during init() in the method's implementation +func RegisterSigningMethod(alg string, f func() SigningMethod) { + signingMethodLock.Lock() + defer signingMethodLock.Unlock() + + signingMethods[alg] = f +} + +// Get a signing method from an "alg" string +func GetSigningMethod(alg string) (method SigningMethod) { + signingMethodLock.RLock() + defer signingMethodLock.RUnlock() + + if methodF, ok := signingMethods[alg]; ok { + method = methodF() + } + return +} diff --git a/vendor/github.com/dgrijalva/jwt-go/token.go b/vendor/github.com/dgrijalva/jwt-go/token.go new file mode 100644 index 000000000..d637e0867 --- /dev/null +++ b/vendor/github.com/dgrijalva/jwt-go/token.go @@ -0,0 +1,108 @@ +package jwt + +import ( + "encoding/base64" + "encoding/json" + "strings" + "time" +) + +// TimeFunc provides the current time when parsing token to validate "exp" claim (expiration time). +// You can override it to use another time value. This is useful for testing or if your +// server uses a different time zone than your tokens. +var TimeFunc = time.Now + +// Parse methods use this callback function to supply +// the key for verification. The function receives the parsed, +// but unverified Token. This allows you to use properties in the +// Header of the token (such as `kid`) to identify which key to use. +type Keyfunc func(*Token) (interface{}, error) + +// A JWT Token. Different fields will be used depending on whether you're +// creating or parsing/verifying a token. +type Token struct { + Raw string // The raw token. Populated when you Parse a token + Method SigningMethod // The signing method used or to be used + Header map[string]interface{} // The first segment of the token + Claims Claims // The second segment of the token + Signature string // The third segment of the token. Populated when you Parse a token + Valid bool // Is the token valid? Populated when you Parse/Verify a token +} + +// Create a new Token. Takes a signing method +func New(method SigningMethod) *Token { + return NewWithClaims(method, MapClaims{}) +} + +func NewWithClaims(method SigningMethod, claims Claims) *Token { + return &Token{ + Header: map[string]interface{}{ + "typ": "JWT", + "alg": method.Alg(), + }, + Claims: claims, + Method: method, + } +} + +// Get the complete, signed token +func (t *Token) SignedString(key interface{}) (string, error) { + var sig, sstr string + var err error + if sstr, err = t.SigningString(); err != nil { + return "", err + } + if sig, err = t.Method.Sign(sstr, key); err != nil { + return "", err + } + return strings.Join([]string{sstr, sig}, "."), nil +} + +// Generate the signing string. This is the +// most expensive part of the whole deal. Unless you +// need this for something special, just go straight for +// the SignedString. +func (t *Token) SigningString() (string, error) { + var err error + parts := make([]string, 2) + for i, _ := range parts { + var jsonValue []byte + if i == 0 { + if jsonValue, err = json.Marshal(t.Header); err != nil { + return "", err + } + } else { + if jsonValue, err = json.Marshal(t.Claims); err != nil { + return "", err + } + } + + parts[i] = EncodeSegment(jsonValue) + } + return strings.Join(parts, "."), nil +} + +// Parse, validate, and return a token. +// keyFunc will receive the parsed token and should return the key for validating. +// If everything is kosher, err will be nil +func Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { + return new(Parser).Parse(tokenString, keyFunc) +} + +func ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { + return new(Parser).ParseWithClaims(tokenString, claims, keyFunc) +} + +// Encode JWT specific base64url encoding with padding stripped +func EncodeSegment(seg []byte) string { + return strings.TrimRight(base64.URLEncoding.EncodeToString(seg), "=") +} + +// Decode JWT specific base64url encoding with padding stripped +func DecodeSegment(seg string) ([]byte, error) { + if l := len(seg) % 4; l > 0 { + seg += strings.Repeat("=", 4-l) + } + + return base64.URLEncoding.DecodeString(seg) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index f298753e6..30d132c26 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -94,6 +94,8 @@ github.com/chromedp/chromedp/kb github.com/cpuguy83/go-md2man/v2/md2man # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew +# github.com/dgrijalva/jwt-go v3.2.0+incompatible +github.com/dgrijalva/jwt-go # github.com/disintegration/imaging v1.6.0 github.com/disintegration/imaging # github.com/fsnotify/fsnotify v1.4.7 From 35718ce59aba6e6c09cfc6f0e40cb9cca0b6e802 Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Thu, 1 Apr 2021 08:10:56 +0300 Subject: [PATCH 08/66] Disable sounds on scene/marker wall previews by default (#1247) --- pkg/manager/config/config.go | 2 +- ui/v2.5/src/components/Changelog/versions/v070.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go index ea63cd06d..46fd0c2c5 100644 --- a/pkg/manager/config/config.go +++ b/pkg/manager/config/config.go @@ -494,7 +494,7 @@ func GetMenuItems() []string { } func GetSoundOnPreview() bool { - viper.SetDefault(SoundOnPreview, true) + viper.SetDefault(SoundOnPreview, false) return viper.GetBool(SoundOnPreview) } diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 09ca8dee5..0e204e29a 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,8 +3,9 @@ * Added scene queue. ### 🎨 Improvements +* Disable sounds on scene/marker wall previews by default. * Improve Movie UI. * Change performer text query to search by name and alias only. ### 🐛 Bug fixes -* Fix incorrect performer age calculation in UI. \ No newline at end of file +* Fix incorrect performer age calculation in UI. From 2c1300cae0c5b53d4ad2a553f40c395d8f322a93 Mon Sep 17 00:00:00 2001 From: bnkai <48220860+bnkai@users.noreply.github.com> Date: Thu, 1 Apr 2021 08:43:42 +0300 Subject: [PATCH 09/66] Upgrade x/image (#1248) --- go.mod | 2 +- go.sum | 4 +- .../src/components/Changelog/versions/v070.md | 1 + vendor/golang.org/x/image/bmp/reader.go | 6 + vendor/golang.org/x/image/ccitt/reader.go | 260 +++++++++++++----- vendor/golang.org/x/image/ccitt/table.go | 41 +-- vendor/golang.org/x/image/tiff/fuzz.go | 1 + vendor/golang.org/x/image/tiff/lzw/reader.go | 2 +- vendor/golang.org/x/image/tiff/reader.go | 3 + vendor/golang.org/x/image/webp/decode.go | 17 +- vendor/modules.txt | 2 +- 11 files changed, 233 insertions(+), 106 deletions(-) diff --git a/go.mod b/go.mod index 2c32d3e80..c4d9865bf 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/vektah/gqlparser/v2 v2.0.1 github.com/vektra/mockery/v2 v2.2.1 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/image v0.0.0-20190802002840-cff245a6509b + golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb golang.org/x/net v0.0.0-20200822124328-c89045814202 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd golang.org/x/tools v0.0.0-20200915031644-64986481280e // indirect diff --git a/go.sum b/go.sum index 9c3bf7c37..d08261d70 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,6 @@ github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c= -github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -805,6 +803,8 @@ golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86h golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk= +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 0e204e29a..82964822c 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -8,4 +8,5 @@ * Change performer text query to search by name and alias only. ### 🐛 Bug fixes +* Fix processing some webp files. * Fix incorrect performer age calculation in UI. diff --git a/vendor/golang.org/x/image/bmp/reader.go b/vendor/golang.org/x/image/bmp/reader.go index c10a022f6..52e25205c 100644 --- a/vendor/golang.org/x/image/bmp/reader.go +++ b/vendor/golang.org/x/image/bmp/reader.go @@ -144,6 +144,9 @@ func decodeConfig(r io.Reader) (config image.Config, bitsPerPixel int, topDown b ) var b [1024]byte if _, err := io.ReadFull(r, b[:fileHeaderLen+4]); err != nil { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } return image.Config{}, 0, false, err } if string(b[:2]) != "BM" { @@ -155,6 +158,9 @@ func decodeConfig(r io.Reader) (config image.Config, bitsPerPixel int, topDown b return image.Config{}, 0, false, ErrUnsupported } if _, err := io.ReadFull(r, b[fileHeaderLen+4:fileHeaderLen+infoLen]); err != nil { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } return image.Config{}, 0, false, err } width := int(int32(readUint32(b[18:22]))) diff --git a/vendor/golang.org/x/image/ccitt/reader.go b/vendor/golang.org/x/image/ccitt/reader.go index 62986f977..340de0536 100644 --- a/vendor/golang.org/x/image/ccitt/reader.go +++ b/vendor/golang.org/x/image/ccitt/reader.go @@ -16,6 +16,7 @@ import ( ) var ( + errIncompleteCode = errors.New("ccitt: incomplete code") errInvalidBounds = errors.New("ccitt: invalid bounds") errInvalidCode = errors.New("ccitt: invalid code") errInvalidMode = errors.New("ccitt: invalid mode") @@ -48,6 +49,10 @@ const ( Group4 ) +// AutoDetectHeight is passed as the height argument to NewReader to indicate +// that the image height (the number of rows) is not known in advance. +const AutoDetectHeight = -1 + // Options are optional parameters. type Options struct { // Align means that some variable-bit-width codes are byte-aligned. @@ -73,6 +78,56 @@ func reverseBitsWithinBytes(b []byte) { } } +// highBits writes to dst (1 bit per pixel, most significant bit first) the +// high (0x80) bits from src (1 byte per pixel). It returns the number of bytes +// written and read such that dst[:d] is the packed form of src[:s]. +// +// For example, if src starts with the 8 bytes [0x7D, 0x7E, 0x7F, 0x80, 0x81, +// 0x82, 0x00, 0xFF] then 0x1D will be written to dst[0]. +// +// If src has (8 * len(dst)) or more bytes then only len(dst) bytes are +// written, (8 * len(dst)) bytes are read, and invert is ignored. +// +// Otherwise, if len(src) is not a multiple of 8 then the final byte written to +// dst is padded with 1 bits (if invert is true) or 0 bits. If inverted, the 1s +// are typically temporary, e.g. they will be flipped back to 0s by an +// invertBytes call in the highBits caller, reader.Read. +func highBits(dst []byte, src []byte, invert bool) (d int, s int) { + // Pack as many complete groups of 8 src bytes as we can. + n := len(src) / 8 + if n > len(dst) { + n = len(dst) + } + dstN := dst[:n] + for i := range dstN { + src8 := src[i*8 : i*8+8] + dstN[i] = ((src8[0] & 0x80) >> 0) | + ((src8[1] & 0x80) >> 1) | + ((src8[2] & 0x80) >> 2) | + ((src8[3] & 0x80) >> 3) | + ((src8[4] & 0x80) >> 4) | + ((src8[5] & 0x80) >> 5) | + ((src8[6] & 0x80) >> 6) | + ((src8[7] & 0x80) >> 7) + } + d, s = n, 8*n + dst, src = dst[d:], src[s:] + + // Pack up to 7 remaining src bytes, if there's room in dst. + if (len(dst) > 0) && (len(src) > 0) { + dstByte := byte(0) + if invert { + dstByte = 0xFF >> uint(len(src)) + } + for n, srcByte := range src { + dstByte |= (srcByte & 0x80) >> uint(n) + } + dst[0] = dstByte + d, s = d+1, s+len(src) + } + return d, s +} + type bitReader struct { r io.Reader @@ -84,7 +139,7 @@ type bitReader struct { // order is whether to process r's bytes LSB first or MSB first. order Order - // The low nBits bits of the bits field hold upcoming bits in LSB order. + // The high nBits bits of the bits field hold upcoming bits in MSB order. bits uint64 nBits uint32 @@ -96,7 +151,7 @@ type bitReader struct { func (b *bitReader) alignToByteBoundary() { n := b.nBits & 7 - b.bits >>= n + b.bits <<= n b.nBits -= n } @@ -108,11 +163,11 @@ func (b *bitReader) alignToByteBoundary() { // bitReader.nBits value above nextBitMaxNBits. const nextBitMaxNBits = 31 -func (b *bitReader) nextBit() (uint32, error) { +func (b *bitReader) nextBit() (uint64, error) { for { if b.nBits > 0 { - bit := uint32(b.bits) & 1 - b.bits >>= 1 + bit := b.bits >> 63 + b.bits <<= 1 b.nBits-- return bit, nil } @@ -124,12 +179,12 @@ func (b *bitReader) nextBit() (uint32, error) { // checks that the generated maxCodeLength constant fits. // // If changing the Uint32 call, also change nextBitMaxNBits. - b.bits = uint64(binary.LittleEndian.Uint32(b.bytes[b.br:])) + b.bits = uint64(binary.BigEndian.Uint32(b.bytes[b.br:])) << 32 b.br += 4 b.nBits = 32 continue } else if available > 0 { - b.bits = uint64(b.bytes[b.br]) + b.bits = uint64(b.bytes[b.br]) << (7 * 8) b.br++ b.nBits = 8 continue @@ -144,34 +199,67 @@ func (b *bitReader) nextBit() (uint32, error) { b.bw = uint32(n) b.readErr = err - if b.order != LSB { + if b.order != MSB { reverseBitsWithinBytes(b.bytes[:b.bw]) } } } func decode(b *bitReader, decodeTable [][2]int16) (uint32, error) { - nBitsRead, bitsRead, state := uint32(0), uint32(0), int32(1) + nBitsRead, bitsRead, state := uint32(0), uint64(0), int32(1) for { bit, err := b.nextBit() if err != nil { + if err == io.EOF { + err = errIncompleteCode + } return 0, err } - bitsRead |= bit << nBitsRead + bitsRead |= bit << (63 - nBitsRead) nBitsRead++ + // The "&1" is redundant, but can eliminate a bounds check. state = int32(decodeTable[state][bit&1]) if state < 0 { return uint32(^state), nil } else if state == 0 { // Unread the bits we've read, then return errInvalidCode. - b.bits = (b.bits << nBitsRead) | uint64(bitsRead) + b.bits = (b.bits >> nBitsRead) | bitsRead b.nBits += nBitsRead return 0, errInvalidCode } } } +// decodeEOL decodes the 12-bit EOL code 0000_0000_0001. +func decodeEOL(b *bitReader) error { + nBitsRead, bitsRead := uint32(0), uint64(0) + for { + bit, err := b.nextBit() + if err != nil { + if err == io.EOF { + err = errMissingEOL + } + return err + } + bitsRead |= bit << (63 - nBitsRead) + nBitsRead++ + + if nBitsRead < 12 { + if bit&1 == 0 { + continue + } + } else if bit&1 != 0 { + return nil + } + + // Unread the bits we've read, then return errMissingEOL. + b.bits = (b.bits >> nBitsRead) | bitsRead + b.nBits += nBitsRead + return errMissingEOL + } +} + type reader struct { br bitReader subFormat SubFormat @@ -181,7 +269,10 @@ type reader struct { // rowsRemaining starts at the image height in pixels, when the reader is // driven through the io.Reader interface, and decrements to zero as rows - // are decoded. When driven through DecodeIntoGray, this field is unused. + // are decoded. Alternatively, it may be negative if the image height is + // not known in advance at the time of the NewReader call. + // + // When driven through DecodeIntoGray, this field is unused. rowsRemaining int // curr and prev hold the current and previous rows. Each element is either @@ -219,6 +310,19 @@ type reader struct { // seenStartOfImage is whether we've called the startDecode method. seenStartOfImage bool + // truncated is whether the input is missing the final 6 consecutive EOL's + // (for Group3) or 2 consecutive EOL's (for Group4). Omitting that trailer + // (but otherwise padding to a byte boundary, with either all 0 bits or all + // 1 bits) is invalid according to the spec, but happens in practice when + // exporting from Adobe Acrobat to TIFF + CCITT. This package silently + // ignores the format error for CCITT input that has been truncated in that + // fashion, returning the full decoded image. + // + // Detecting trailer truncation (just after the final row of pixels) + // requires knowing which row is the final row, and therefore does not + // trigger if the image height is not known in advance. + truncated bool + // readErr is a sticky error for the Read method. readErr error } @@ -244,38 +348,56 @@ func (z *reader) Read(p []byte) (int, error) { // Decode the next row, if necessary. if z.atStartOfRow { - if z.rowsRemaining <= 0 { - if z.readErr = z.finishDecode(); z.readErr != nil { + if z.rowsRemaining < 0 { + // We do not know the image height in advance. See if the next + // code is an EOL. If it is, it is consumed. If it isn't, the + // bitReader shouldn't advance along the bit stream, and we + // simply decode another row of pixel data. + // + // For the Group4 subFormat, we may need to align to a byte + // boundary. For the Group3 subFormat, the previous z.decodeRow + // call (or z.startDecode call) has already consumed one of the + // 6 consecutive EOL's. The next EOL is actually the second of + // 6, in the middle, and we shouldn't align at that point. + if z.align && (z.subFormat == Group4) { + z.br.alignToByteBoundary() + } + + if err := z.decodeEOL(); err == errMissingEOL { + // No-op. It's another row of pixel data. + } else if err != nil { + z.readErr = err + break + } else { + if z.readErr = z.finishDecode(true); z.readErr != nil { + break + } + z.readErr = io.EOF + break + } + + } else if z.rowsRemaining == 0 { + // We do know the image height in advance, and we have already + // decoded exactly that many rows. + if z.readErr = z.finishDecode(false); z.readErr != nil { break } z.readErr = io.EOF break - } - if z.readErr = z.decodeRow(); z.readErr != nil { - break - } - z.rowsRemaining-- - } - // Pack from z.curr (1 byte per pixel) to p (1 bit per pixel), up to 8 - // elements per iteration. - i := 0 - for ; i < len(p); i++ { - numToPack := len(z.curr) - z.ri - if numToPack <= 0 { - break - } else if numToPack > 8 { - numToPack = 8 + } else { + z.rowsRemaining-- } - byteValue := byte(0) - for j := 0; j < numToPack; j++ { - byteValue |= (z.curr[z.ri] & 0x80) >> uint(j) - z.ri++ + if z.readErr = z.decodeRow(z.rowsRemaining == 0); z.readErr != nil { + break } - p[i] = byteValue } - p = p[i:] + + // Pack from z.curr (1 byte per pixel) to p (1 bit per pixel). + packD, packS := highBits(p, z.curr[z.ri:], z.invert) + p = p[packD:] + z.ri += packS // Prepare to decode the next row, if necessary. if z.ri == len(z.curr) { @@ -285,7 +407,6 @@ func (z *reader) Read(p []byte) (int, error) { } n := len(originalP) - len(p) - // TODO: when invert is true, should the end-of-row padding bits be 0 or 1? if z.invert { invertBytes(originalP[:n]) } @@ -317,32 +438,44 @@ func (z *reader) startDecode() error { return nil } -func (z *reader) finishDecode() error { +func (z *reader) finishDecode(alreadySeenEOL bool) error { numberOfEOLs := 0 switch z.subFormat { case Group3: + if z.truncated { + return nil + } // The stream ends with a RTC (Return To Control) of 6 consecutive // EOL's, but we should have already just seen an EOL, either in // z.startDecode (for a zero-height image) or in z.decodeRow. numberOfEOLs = 5 case Group4: - // The stream ends with two EOL's, the first of which is possibly - // byte-aligned. - numberOfEOLs = 2 - if err := z.decodeEOL(); err == nil { - numberOfEOLs-- - } else if err == errInvalidCode { - // Try again, this time starting from a byte boundary. + autoDetectHeight := z.rowsRemaining < 0 + if autoDetectHeight { + // Aligning to a byte boundary was already handled by reader.Read. + } else if z.align { z.br.alignToByteBoundary() - } else { + } + // The stream ends with two EOL's. If the first one is missing, and we + // had an explicit image height, we just assume that the trailing two + // EOL's were truncated and return a nil error. + if err := z.decodeEOL(); err != nil { + if (err == errMissingEOL) && !autoDetectHeight { + z.truncated = true + return nil + } return err } + numberOfEOLs = 1 default: return errUnsupportedSubFormat } + if alreadySeenEOL { + numberOfEOLs-- + } for ; numberOfEOLs > 0; numberOfEOLs-- { if err := z.decodeEOL(); err != nil { return err @@ -352,23 +485,18 @@ func (z *reader) finishDecode() error { } func (z *reader) decodeEOL() error { - // TODO: EOL doesn't have to be in the modeDecodeTable. It could be in its - // own table, or we could just hard-code it, especially if we might need to - // cater for optional byte-alignment, or an arbitrary number (potentially - // more than 8) of 0-valued padding bits. - if mode, err := decode(&z.br, modeDecodeTable[:]); err != nil { - return err - } else if mode != modeEOL { - return errMissingEOL - } - return nil + return decodeEOL(&z.br) } -func (z *reader) decodeRow() error { +func (z *reader) decodeRow(finalRow bool) error { z.wi = 0 z.atStartOfRow = true z.penColorIsWhite = true + if z.align { + z.br.alignToByteBoundary() + } + switch z.subFormat { case Group3: for ; z.wi < len(z.curr); z.atStartOfRow = false { @@ -376,13 +504,14 @@ func (z *reader) decodeRow() error { return err } } - return z.decodeEOL() + err := z.decodeEOL() + if finalRow && (err == errMissingEOL) { + z.truncated = true + return nil + } + return err case Group4: - if z.align { - z.br.alignToByteBoundary() - } - for ; z.wi < len(z.curr); z.atStartOfRow = false { mode, err := decode(&z.br, modeDecodeTable[:]) if err != nil { @@ -620,13 +749,13 @@ func DecodeIntoGray(dst *image.Gray, r io.Reader, order Order, sf SubFormat, opt for y := bounds.Min.Y; y < bounds.Max.Y; y++ { p := (y - bounds.Min.Y) * dst.Stride z.curr = dst.Pix[p : p+width] - if err := z.decodeRow(); err != nil { + if err := z.decodeRow(y+1 == bounds.Max.Y); err != nil { return err } z.curr, z.prev = nil, z.curr } - if err := z.finishDecode(); err != nil { + if err := z.finishDecode(false); err != nil { return err } @@ -643,9 +772,12 @@ func DecodeIntoGray(dst *image.Gray, r io.Reader, order Order, sf SubFormat, opt // NewReader returns an io.Reader that decodes the CCITT-formatted data in r. // The resultant byte stream is one bit per pixel (MSB first), with 1 meaning // white and 0 meaning black. Each row in the result is byte-aligned. +// +// A negative height, such as passing AutoDetectHeight, means that the image +// height is not known in advance. A negative width is invalid. func NewReader(r io.Reader, order Order, sf SubFormat, width int, height int, opts *Options) io.Reader { readErr := error(nil) - if (width < 0) || (height < 0) { + if width < 0 { readErr = errInvalidBounds } else if width > maxWidth { readErr = errUnsupportedWidth diff --git a/vendor/golang.org/x/image/ccitt/table.go b/vendor/golang.org/x/image/ccitt/table.go index f01cc12b5..ef7ea9d40 100644 --- a/vendor/golang.org/x/image/ccitt/table.go +++ b/vendor/golang.org/x/image/ccitt/table.go @@ -31,17 +31,7 @@ package ccitt // modeDecodeTable represents Table 1 and the End-of-Line code. // -// +=XXXXX -// b015 +-+ -// | +=v0010 -// b014 +-+ -// | +=XXXXX -// b013 +-+ -// | +=XXXXX -// b012 +-+ -// | +=XXXXX -// b011 +-+ -// | +=XXXXX +// +=XXXXX // b009 +-+ // | +=v0009 // b007 +-+ @@ -72,13 +62,8 @@ var modeDecodeTable = [...][2]int16{ 6: {7, 8}, 7: {9, 10}, 8: {^7, ^4}, - 9: {11, ^9}, + 9: {0, ^9}, 10: {^8, ^5}, - 11: {12, 0}, - 12: {13, 0}, - 13: {14, 0}, - 14: {15, 0}, - 15: {0, ^10}, } // whiteDecodeTable represents Tables 2 and 3 for a white run. @@ -733,17 +718,16 @@ type bitString struct { // modeEncodeTable represents Table 1 and the End-of-Line code. var modeEncodeTable = [...]bitString{ - 0: {0x0001, 4}, // "0001" - 1: {0x0001, 3}, // "001" - 2: {0x0001, 1}, // "1" - 3: {0x0003, 3}, // "011" - 4: {0x0003, 6}, // "000011" - 5: {0x0003, 7}, // "0000011" - 6: {0x0002, 3}, // "010" - 7: {0x0002, 6}, // "000010" - 8: {0x0002, 7}, // "0000010" - 9: {0x0001, 7}, // "0000001" - 10: {0x0001, 12}, // "000000000001" + 0: {0x0001, 4}, // "0001" + 1: {0x0001, 3}, // "001" + 2: {0x0001, 1}, // "1" + 3: {0x0003, 3}, // "011" + 4: {0x0003, 6}, // "000011" + 5: {0x0003, 7}, // "0000011" + 6: {0x0002, 3}, // "010" + 7: {0x0002, 6}, // "000010" + 8: {0x0002, 7}, // "0000010" + 9: {0x0001, 7}, // "0000001" } // whiteEncodeTable2 represents Table 2 for a white run. @@ -983,7 +967,6 @@ const ( modeVL2 // Vertical-Left-2 modeVL3 // Vertical-Left-3 modeExt // Extension - modeEOL // End-of-Line ) // COPY PASTE table.go END diff --git a/vendor/golang.org/x/image/tiff/fuzz.go b/vendor/golang.org/x/image/tiff/fuzz.go index ec52c7882..b27c54004 100644 --- a/vendor/golang.org/x/image/tiff/fuzz.go +++ b/vendor/golang.org/x/image/tiff/fuzz.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build gofuzz // +build gofuzz package tiff diff --git a/vendor/golang.org/x/image/tiff/lzw/reader.go b/vendor/golang.org/x/image/tiff/lzw/reader.go index 51ae39f8a..78204ba92 100644 --- a/vendor/golang.org/x/image/tiff/lzw/reader.go +++ b/vendor/golang.org/x/image/tiff/lzw/reader.go @@ -178,7 +178,7 @@ loop: break loop case code <= d.hi: c, i := code, len(d.output)-1 - if code == d.hi { + if code == d.hi && d.last != decoderInvalidCode { // code == hi is a special case which expands to the last expansion // followed by the head of the last expansion. To find the head, we walk // the prefix chain until we find a literal code. diff --git a/vendor/golang.org/x/image/tiff/reader.go b/vendor/golang.org/x/image/tiff/reader.go index c26ec36bb..de73f4b99 100644 --- a/vendor/golang.org/x/image/tiff/reader.go +++ b/vendor/golang.org/x/image/tiff/reader.go @@ -404,6 +404,9 @@ func newDecoder(r io.Reader) (*decoder, error) { p := make([]byte, 8) if _, err := d.r.ReadAt(p, 0); err != nil { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } return nil, err } switch string(p[0:4]) { diff --git a/vendor/golang.org/x/image/webp/decode.go b/vendor/golang.org/x/image/webp/decode.go index f77a4ebf8..d6eefd596 100644 --- a/vendor/golang.org/x/image/webp/decode.go +++ b/vendor/golang.org/x/image/webp/decode.go @@ -126,22 +126,23 @@ func decode(r io.Reader, configOnly bool) (image.Image, image.Config, error) { alphaBit = 1 << 4 iccProfileBit = 1 << 5 ) - if buf[0] != alphaBit { - return nil, image.Config{}, errors.New("webp: non-Alpha VP8X is not implemented") - } + wantAlpha = (buf[0] & alphaBit) != 0 widthMinusOne = uint32(buf[4]) | uint32(buf[5])<<8 | uint32(buf[6])<<16 heightMinusOne = uint32(buf[7]) | uint32(buf[8])<<8 | uint32(buf[9])<<16 if configOnly { + if wantAlpha { + return nil, image.Config{ + ColorModel: color.NYCbCrAModel, + Width: int(widthMinusOne) + 1, + Height: int(heightMinusOne) + 1, + }, nil + } return nil, image.Config{ - ColorModel: color.NYCbCrAModel, + ColorModel: color.YCbCrModel, Width: int(widthMinusOne) + 1, Height: int(heightMinusOne) + 1, }, nil } - wantAlpha = true - - default: - return nil, image.Config{}, errInvalidFormat } } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 30d132c26..b9ea5e2e0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -307,7 +307,7 @@ github.com/vektra/mockery/v2/pkg/logging golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish golang.org/x/crypto/ssh/terminal -# golang.org/x/image v0.0.0-20190802002840-cff245a6509b +# golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb golang.org/x/image/bmp golang.org/x/image/ccitt golang.org/x/image/riff From 76714653342887f249159cd14b5554882455807f Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Fri, 2 Apr 2021 02:09:10 +0300 Subject: [PATCH 10/66] Fix performer age timezone issues (#1251) * Parse date string manually --- ui/v2.5/src/utils/text.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ui/v2.5/src/utils/text.ts b/ui/v2.5/src/utils/text.ts index 1c7407a86..b69c440dc 100644 --- a/ui/v2.5/src/utils/text.ts +++ b/ui/v2.5/src/utils/text.ts @@ -69,11 +69,27 @@ const fileNameFromPath = (path: string) => { return path.replace(/^.*[\\/]/, ""); }; +const stringToDate = (dateString: string) => { + if (!dateString) return null; + + const parts = dateString.split("-"); + // Invalid date string + if (parts.length !== 3) return null; + + const year = Number(parts[0]); + const monthIndex = Math.max(0, Number(parts[1]) - 1); + const day = Number(parts[2]); + + return new Date(year, monthIndex, day, 0, 0, 0, 0); +}; + const getAge = (dateString?: string | null, fromDateString?: string) => { if (!dateString) return 0; - const birthdate = new Date(dateString); - const fromDate = fromDateString ? new Date(fromDateString) : new Date(); + const birthdate = stringToDate(dateString); + const fromDate = fromDateString ? stringToDate(fromDateString) : new Date(); + + if (!birthdate || !fromDate) return 0; let age = fromDate.getFullYear() - birthdate.getFullYear(); if ( @@ -176,6 +192,7 @@ const TextUtils = { fileSizeFractionalDigits, secondsToTimestamp, fileNameFromPath, + stringToDate, age: getAge, bitRate, resolution, From 72b027a887b04a1d1bb064ec32716ac29a5f82bd Mon Sep 17 00:00:00 2001 From: julien0221 <68500525+julien0221@users.noreply.github.com> Date: Tue, 6 Apr 2021 23:32:20 +0100 Subject: [PATCH 11/66] Added random for studios, movies and tags (#1250) --- ui/v2.5/src/components/Changelog/versions/v070.md | 1 + ui/v2.5/src/models/list-filter/filter.ts | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 82964822c..6b00a36dc 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,6 +3,7 @@ * Added scene queue. ### 🎨 Improvements +* Add random sorting option for galleries, studios, movies and tags. * Disable sounds on scene/marker wall previews by default. * Improve Movie UI. * Change performer text query to search by name and alias only. diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts index afcb5aadf..68306518d 100644 --- a/ui/v2.5/src/models/list-filter/filter.ts +++ b/ui/v2.5/src/models/list-filter/filter.ts @@ -219,7 +219,7 @@ export class ListFilterModel { } case FilterMode.Studios: this.sortBy = "name"; - this.sortByOptions = ["name", "scenes_count"]; + this.sortByOptions = ["name", "scenes_count", "random"]; this.displayModeOptions = [DisplayMode.Grid]; this.criterionOptions = [ new NoneCriterionOption(), @@ -229,7 +229,7 @@ export class ListFilterModel { break; case FilterMode.Movies: this.sortBy = "name"; - this.sortByOptions = ["name", "scenes_count"]; + this.sortByOptions = ["name", "scenes_count", "random"]; this.displayModeOptions = [DisplayMode.Grid]; this.criterionOptions = [ new NoneCriterionOption(), @@ -239,7 +239,12 @@ export class ListFilterModel { break; case FilterMode.Galleries: this.sortBy = "path"; - this.sortByOptions = ["path", "file_mod_time", "images_count"]; + this.sortByOptions = [ + "path", + "file_mod_time", + "images_count", + "random", + ]; this.displayModeOptions = [DisplayMode.Grid, DisplayMode.List]; this.criterionOptions = [ new NoneCriterionOption(), @@ -286,6 +291,7 @@ export class ListFilterModel { "images_count", "galleries_count", "performers_count", + "random", /* "scene_markers_count" */ ]; this.displayModeOptions = [DisplayMode.Grid, DisplayMode.List]; From d8ba4a08c0b2340ef052c4bc97ba2735179a45d4 Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Wed, 7 Apr 2021 01:58:41 +0300 Subject: [PATCH 12/66] Update various GQL `image` fields' comments (#1271) --- graphql/schema/types/movie.graphql | 6 ++++-- graphql/schema/types/performer.graphql | 4 ++-- graphql/schema/types/scene.graphql | 2 +- graphql/schema/types/scraped-movie.graphql | 3 ++- graphql/schema/types/scraped-performer.graphql | 2 +- graphql/schema/types/scraper.graphql | 2 +- graphql/schema/types/studio.graphql | 4 ++-- graphql/schema/types/tag.graphql | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/graphql/schema/types/movie.graphql b/graphql/schema/types/movie.graphql index 0b41af0c8..cc25b9e02 100644 --- a/graphql/schema/types/movie.graphql +++ b/graphql/schema/types/movie.graphql @@ -28,8 +28,9 @@ input MovieCreateInput { director: String synopsis: String url: String - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" front_image: String + """This should be a URL or a base64 encoded data URL""" back_image: String } @@ -44,8 +45,9 @@ input MovieUpdateInput { director: String synopsis: String url: String - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" front_image: String + """This should be a URL or a base64 encoded data URL""" back_image: String } diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql index 1324f4f81..e9ea68519 100644 --- a/graphql/schema/types/performer.graphql +++ b/graphql/schema/types/performer.graphql @@ -54,7 +54,7 @@ input PerformerCreateInput { instagram: String favorite: Boolean tag_ids: [ID!] - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String stash_ids: [StashIDInput!] } @@ -79,7 +79,7 @@ input PerformerUpdateInput { instagram: String favorite: Boolean tag_ids: [ID!] - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String stash_ids: [StashIDInput!] } diff --git a/graphql/schema/types/scene.graphql b/graphql/schema/types/scene.graphql index c72ae17ef..f37c0bfd9 100644 --- a/graphql/schema/types/scene.graphql +++ b/graphql/schema/types/scene.graphql @@ -67,7 +67,7 @@ input SceneUpdateInput { performer_ids: [ID!] movies: [SceneMovieInput!] tag_ids: [ID!] - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" cover_image: String stash_ids: [StashIDInput!] } diff --git a/graphql/schema/types/scraped-movie.graphql b/graphql/schema/types/scraped-movie.graphql index ac221fb88..d1546dfb9 100644 --- a/graphql/schema/types/scraped-movie.graphql +++ b/graphql/schema/types/scraped-movie.graphql @@ -17,8 +17,9 @@ type ScrapedMovie { synopsis: String studio: ScrapedMovieStudio - """This should be base64 encoded""" + """This should be a base64 encoded data URL""" front_image: String + """This should be a base64 encoded data URL""" back_image: String } diff --git a/graphql/schema/types/scraped-performer.graphql b/graphql/schema/types/scraped-performer.graphql index eadc19160..9f4583600 100644 --- a/graphql/schema/types/scraped-performer.graphql +++ b/graphql/schema/types/scraped-performer.graphql @@ -19,7 +19,7 @@ type ScrapedPerformer { # Should be ScrapedPerformerTag - but would be identical types tags: [ScrapedSceneTag!] - """This should be base64 encoded""" + """This should be a base64 encoded data URL""" image: String } diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql index 65a474600..929c13f2b 100644 --- a/graphql/schema/types/scraper.graphql +++ b/graphql/schema/types/scraper.graphql @@ -85,7 +85,7 @@ type ScrapedScene { url: String date: String - """This should be base64 encoded""" + """This should be a base64 encoded data URL""" image: String file: SceneFileType # Resolver diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql index 051776e03..8eca28659 100644 --- a/graphql/schema/types/studio.graphql +++ b/graphql/schema/types/studio.graphql @@ -15,7 +15,7 @@ input StudioCreateInput { name: String! url: String parent_id: ID - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String stash_ids: [StashIDInput!] } @@ -25,7 +25,7 @@ input StudioUpdateInput { name: String url: String parent_id: ID, - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String stash_ids: [StashIDInput!] } diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql index 2cb6765c8..2f1f0d0d5 100644 --- a/graphql/schema/types/tag.graphql +++ b/graphql/schema/types/tag.graphql @@ -11,7 +11,7 @@ type Tag { input TagCreateInput { name: String! - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String } @@ -19,7 +19,7 @@ input TagUpdateInput { id: ID! name: String! - """This should be base64 encoded""" + """This should be a URL or a base64 encoded data URL""" image: String } From 2edcdeaeb97198072cdb84527b1d359a2d659bdb Mon Sep 17 00:00:00 2001 From: bnkai <48220860+bnkai@users.noreply.github.com> Date: Wed, 7 Apr 2021 02:09:04 +0300 Subject: [PATCH 13/66] Support today, yesterday when using parseDate in scrapers (#1261) --- pkg/scraper/mapped.go | 12 +++++++++++- ui/v2.5/src/components/Changelog/versions/v070.md | 1 + ui/v2.5/src/docs/en/Scraping.md | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go index 6b25e4850..f6c076e66 100644 --- a/pkg/scraper/mapped.go +++ b/pkg/scraper/mapped.go @@ -362,6 +362,17 @@ type postProcessParseDate string func (p *postProcessParseDate) Apply(value string, q mappedQuery) string { parseDate := string(*p) + const internalDateFormat = "2006-01-02" + + value = strings.ToLower(value) + if value == "today" || value == "yesterday" { // handle today, yesterday + dt := time.Now() + if value == "yesterday" { // subtract 1 day from now + dt = dt.AddDate(0, 0, -1) + } + return dt.Format(internalDateFormat) + } + if parseDate == "" { return value } @@ -375,7 +386,6 @@ func (p *postProcessParseDate) Apply(value string, q mappedQuery) string { } // convert it into our date format - const internalDateFormat = "2006-01-02" return parsedValue.Format(internalDateFormat) } diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 6b00a36dc..249ab61a1 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,6 +3,7 @@ * Added scene queue. ### 🎨 Improvements +* Support `today` and `yesterday` for `parseDate` in scrapers. * Add random sorting option for galleries, studios, movies and tags. * Disable sounds on scene/marker wall previews by default. * Improve Movie UI. diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md index edf73bc03..6f47d0070 100644 --- a/ui/v2.5/src/docs/en/Scraping.md +++ b/ui/v2.5/src/docs/en/Scraping.md @@ -360,7 +360,7 @@ performer: ``` Gets the contents of the selected div element, and sets the returned value to `Female` if the scraped value is `F`; `Male` if the scraped value is `M`. -* `parseDate`: if present, the value is the date format using go's reference date (2006-01-02). For example, if an example date was `14-Mar-2003`, then the date format would be `02-Jan-2006`. See the [time.Parse documentation](https://golang.org/pkg/time/#Parse) for details. When present, the scraper will convert the input string into a date, then convert it to the string format used by stash (`YYYY-MM-DD`). +* `parseDate`: if present, the value is the date format using go's reference date (2006-01-02). For example, if an example date was `14-Mar-2003`, then the date format would be `02-Jan-2006`. See the [time.Parse documentation](https://golang.org/pkg/time/#Parse) for details. When present, the scraper will convert the input string into a date, then convert it to the string format used by stash (`YYYY-MM-DD`). Strings "Today", "Yesterday" are matched (case insensitive) and converted by the scraper so you don't need to edit/replace them. * `replace`: contains an array of sub-objects. Each sub-object must have a `regex` and `with` field. The `regex` field is the regex pattern to replace, and `with` is the string to replace it with. `$` is used to reference capture groups - `$1` is the first capture group, `$2` the second and so on. Replacements are performed in order of the array. From 4462b3cc8e50eb6a2ba84142a762f771f98f2528 Mon Sep 17 00:00:00 2001 From: stashist <81412921+stashist@users.noreply.github.com> Date: Fri, 9 Apr 2021 02:06:02 +0200 Subject: [PATCH 14/66] Handle /healthz for liveness checks. (#1264) --- pkg/api/server.go | 1 + ui/v2.5/src/components/Changelog/versions/v070.md | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/api/server.go b/pkg/api/server.go index 605e108d9..e4e3a1fea 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -124,6 +124,7 @@ func Start() { r := chi.NewRouter() + r.Use(middleware.Heartbeat("/healthz")) r.Use(authenticateHandler()) r.Use(middleware.Recoverer) diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 249ab61a1..f6144bfee 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,6 +3,7 @@ * Added scene queue. ### 🎨 Improvements +* Add HTTP endpoint for health checking at /healthz. * Support `today` and `yesterday` for `parseDate` in scrapers. * Add random sorting option for galleries, studios, movies and tags. * Disable sounds on scene/marker wall previews by default. From 60af076fffaca66ba80827f1e113370f62a93687 Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Fri, 9 Apr 2021 07:41:28 +0300 Subject: [PATCH 15/66] Fix "Clear Image" button (#1249) * Fix "Clear Image" button (Performer Edit) * Fix "Clear Image" button (New Performer) * Fix "Clear Image" button (Edit Studio) * Fix "Clear Image" button (Edit Tag) --- ui/v2.5/src/components/Changelog/versions/v070.md | 1 + .../src/components/Performers/PerformerDetails/Performer.tsx | 2 +- ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx | 2 +- ui/v2.5/src/components/Tags/TagDetails/Tag.tsx | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index f6144bfee..e3452b69a 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -11,5 +11,6 @@ * Change performer text query to search by name and alias only. ### 🐛 Bug fixes +* Fix `Clear Image` button not updating image preview. * Fix processing some webp files. * Fix incorrect performer age calculation in UI. diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx index ccc56531b..b4e2699c0 100644 --- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx +++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx @@ -47,7 +47,7 @@ export const Performer: React.FC = () => { const activeImage = imagePreview === undefined ? performer.image_path ?? "" - : imagePreview ?? `${performer.image_path}?default=true`; + : imagePreview ?? (isNew ? "" : `${performer.image_path}&default=true`); const lightboxImages = useMemo( () => [{ paths: { thumbnail: activeImage, image: activeImage } }], [activeImage] diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx index 048f199b3..67dc73454 100644 --- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx +++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx @@ -231,7 +231,7 @@ export const Studio: React.FC = () => { function onClearImage() { setImage(null); setImagePreview( - studio.image_path ? `${studio.image_path}?default=true` : undefined + studio.image_path ? `${studio.image_path}&default=true` : undefined ); } diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx index c1ec1d63f..e5dc7d14d 100644 --- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx +++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx @@ -204,7 +204,7 @@ export const Tag: React.FC = () => { function onClearImage() { setImage(null); setImagePreview( - tag?.image_path ? `${tag.image_path}?default=true` : undefined + tag?.image_path ? `${tag.image_path}&default=true` : undefined ); } From 25311247ed8ae3255c8ed5de3c8ff30929272d6b Mon Sep 17 00:00:00 2001 From: julien0221 <68500525+julien0221@users.noreply.github.com> Date: Fri, 9 Apr 2021 06:05:11 +0100 Subject: [PATCH 16/66] added an url filter option in scenes (#1266) * added an url filter option in scenes * added url filter on gallery, movies, performers and studios * Add empty string filter to stringCriterionHandler * Add unit tests Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com> --- graphql/schema/types/filters.graphql | 10 +++ pkg/sqlite/filter.go | 4 + pkg/sqlite/filter_internal_test.go | 4 +- pkg/sqlite/gallery.go | 1 + pkg/sqlite/gallery_test.go | 56 ++++++++++++++ pkg/sqlite/movies.go | 39 +++++----- pkg/sqlite/movies_test.go | 65 ++++++++++++++++ pkg/sqlite/performer.go | 1 + pkg/sqlite/performer_test.go | 56 ++++++++++++++ pkg/sqlite/scene.go | 1 + pkg/sqlite/scene_test.go | 61 +++++++++++++++ pkg/sqlite/setup_test.go | 75 ++++++++++++++++--- pkg/sqlite/studio.go | 40 +++++----- pkg/sqlite/studio_test.go | 65 ++++++++++++++++ .../src/components/Changelog/versions/v070.md | 3 +- .../models/list-filter/criteria/criterion.ts | 5 +- .../src/models/list-filter/criteria/utils.ts | 1 + ui/v2.5/src/models/list-filter/filter.ts | 45 +++++++++++ 18 files changed, 480 insertions(+), 52 deletions(-) diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql index 750cb6c89..ae51f1091 100644 --- a/graphql/schema/types/filters.graphql +++ b/graphql/schema/types/filters.graphql @@ -63,6 +63,8 @@ input PerformerFilterType { tags: MultiCriterionInput """Filter by StashID""" stash_id: String + """Filter by url""" + url: StringCriterionInput } input SceneMarkerFilterType { @@ -109,6 +111,8 @@ input SceneFilterType { performers: MultiCriterionInput """Filter by StashID""" stash_id: String + """Filter by url""" + url: StringCriterionInput } input MovieFilterType { @@ -116,6 +120,8 @@ input MovieFilterType { studios: MultiCriterionInput """Filter to only include movies missing this property""" is_missing: String + """Filter by url""" + url: StringCriterionInput } input StudioFilterType { @@ -125,6 +131,8 @@ input StudioFilterType { stash_id: String """Filter to only include studios missing this property""" is_missing: String + """Filter by url""" + url: StringCriterionInput } input GalleryFilterType { @@ -150,6 +158,8 @@ input GalleryFilterType { performers: MultiCriterionInput """Filter by number of images in this gallery""" image_count: IntCriterionInput + """Filter by url""" + url: StringCriterionInput } input TagFilterType { diff --git a/pkg/sqlite/filter.go b/pkg/sqlite/filter.go index bae383825..a781e70fc 100644 --- a/pkg/sqlite/filter.go +++ b/pkg/sqlite/filter.go @@ -321,6 +321,10 @@ func stringCriterionHandler(c *models.StringCriterionInput, column string) crite return } f.addWhere(fmt.Sprintf("(%s IS NULL OR %[1]s NOT regexp ?)", column), c.Value) + case models.CriterionModifierIsNull: + f.addWhere("(" + column + " IS NULL OR TRIM(" + column + ") = '')") + case models.CriterionModifierNotNull: + f.addWhere("(" + column + " IS NOT NULL AND TRIM(" + column + ") != '')") default: clause, count := getSimpleCriterionClause(modifier, "?") diff --git a/pkg/sqlite/filter_internal_test.go b/pkg/sqlite/filter_internal_test.go index 302aff0db..20ca571e1 100644 --- a/pkg/sqlite/filter_internal_test.go +++ b/pkg/sqlite/filter_internal_test.go @@ -594,7 +594,7 @@ func TestStringCriterionHandlerIsNull(t *testing.T) { }, column)) assert.Len(f.whereClauses, 1) - assert.Equal(fmt.Sprintf("%[1]s IS NULL", column), f.whereClauses[0].sql) + assert.Equal(fmt.Sprintf("(%[1]s IS NULL OR TRIM(%[1]s) = '')", column), f.whereClauses[0].sql) assert.Len(f.whereClauses[0].args, 0) } @@ -609,6 +609,6 @@ func TestStringCriterionHandlerNotNull(t *testing.T) { }, column)) assert.Len(f.whereClauses, 1) - assert.Equal(fmt.Sprintf("%[1]s IS NOT NULL", column), f.whereClauses[0].sql) + assert.Equal(fmt.Sprintf("(%[1]s IS NOT NULL AND TRIM(%[1]s) != '')", column), f.whereClauses[0].sql) assert.Len(f.whereClauses[0].args, 0) } diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go index 2f2e8fef7..77ddabc24 100644 --- a/pkg/sqlite/gallery.go +++ b/pkg/sqlite/gallery.go @@ -198,6 +198,7 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi query.handleStringCriterionInput(galleryFilter.Path, "galleries.path") query.handleIntCriterionInput(galleryFilter.Rating, "galleries.rating") + query.handleStringCriterionInput(galleryFilter.URL, "galleries.url") qb.handleAverageResolutionFilter(&query, galleryFilter.AverageResolution) if Organized := galleryFilter.Organized; Organized != nil { diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go index f34328ecd..a715d7d5c 100644 --- a/pkg/sqlite/gallery_test.go +++ b/pkg/sqlite/gallery_test.go @@ -193,6 +193,62 @@ func verifyGalleriesPath(t *testing.T, sqb models.GalleryReader, pathCriterion m } } +func TestGalleryQueryURL(t *testing.T) { + const sceneIdx = 1 + galleryURL := getGalleryStringValue(sceneIdx, urlField) + + urlCriterion := models.StringCriterionInput{ + Value: galleryURL, + Modifier: models.CriterionModifierEquals, + } + + filter := models.GalleryFilterType{ + URL: &urlCriterion, + } + + verifyFn := func(g *models.Gallery) { + t.Helper() + verifyNullString(t, g.URL, urlCriterion) + } + + verifyGalleryQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotEquals + verifyGalleryQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierMatchesRegex + urlCriterion.Value = "gallery_.*1_URL" + verifyGalleryQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex + verifyGalleryQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierIsNull + urlCriterion.Value = "" + verifyGalleryQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotNull + verifyGalleryQuery(t, filter, verifyFn) +} + +func verifyGalleryQuery(t *testing.T, filter models.GalleryFilterType, verifyFn func(s *models.Gallery)) { + withTxn(func(r models.Repository) error { + t.Helper() + sqb := r.Gallery() + + galleries := queryGallery(t, sqb, &filter, nil) + + // assume it should find at least one + assert.Greater(t, len(galleries), 0) + + for _, gallery := range galleries { + verifyFn(gallery) + } + + return nil + }) +} + func TestGalleryQueryRating(t *testing.T) { const rating = 3 ratingCriterion := models.IntCriterionInput{ diff --git a/pkg/sqlite/movies.go b/pkg/sqlite/movies.go index 567c8c1b7..cec607c5f 100644 --- a/pkg/sqlite/movies.go +++ b/pkg/sqlite/movies.go @@ -122,11 +122,10 @@ func (qb *movieQueryBuilder) Query(movieFilter *models.MovieFilterType, findFilt movieFilter = &models.MovieFilterType{} } - var whereClauses []string - var havingClauses []string - var args []interface{} - body := selectDistinctIDs("movies") - body += ` + query := qb.newQuery() + + query.body = selectDistinctIDs("movies") + query.body += ` left join movies_scenes as scenes_join on scenes_join.movie_id = movies.id left join scenes on scenes_join.scene_id = scenes.id left join studios as studio on studio.id = movies.studio_id @@ -135,41 +134,43 @@ func (qb *movieQueryBuilder) Query(movieFilter *models.MovieFilterType, findFilt if q := findFilter.Q; q != nil && *q != "" { searchColumns := []string{"movies.name"} clause, thisArgs := getSearchBinding(searchColumns, *q, false) - whereClauses = append(whereClauses, clause) - args = append(args, thisArgs...) + query.addWhere(clause) + query.addArg(thisArgs...) } if studiosFilter := movieFilter.Studios; studiosFilter != nil && len(studiosFilter.Value) > 0 { for _, studioID := range studiosFilter.Value { - args = append(args, studioID) + query.addArg(studioID) } whereClause, havingClause := getMultiCriterionClause("movies", "studio", "", "", "studio_id", studiosFilter) - whereClauses = appendClause(whereClauses, whereClause) - havingClauses = appendClause(havingClauses, havingClause) + query.addWhere(whereClause) + query.addHaving(havingClause) } if isMissingFilter := movieFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" { switch *isMissingFilter { case "front_image": - body += `left join movies_images on movies_images.movie_id = movies.id + query.body += `left join movies_images on movies_images.movie_id = movies.id ` - whereClauses = appendClause(whereClauses, "movies_images.front_image IS NULL") + query.addWhere("movies_images.front_image IS NULL") case "back_image": - body += `left join movies_images on movies_images.movie_id = movies.id + query.body += `left join movies_images on movies_images.movie_id = movies.id ` - whereClauses = appendClause(whereClauses, "movies_images.back_image IS NULL") + query.addWhere("movies_images.back_image IS NULL") case "scenes": - body += `left join movies_scenes on movies_scenes.movie_id = movies.id + query.body += `left join movies_scenes on movies_scenes.movie_id = movies.id ` - whereClauses = appendClause(whereClauses, "movies_scenes.scene_id IS NULL") + query.addWhere("movies_scenes.scene_id IS NULL") default: - whereClauses = appendClause(whereClauses, "movies."+*isMissingFilter+" IS NULL") + query.addWhere("movies." + *isMissingFilter + " IS NULL") } } - sortAndPagination := qb.getMovieSort(findFilter) + getPagination(findFilter) - idsResult, countResult, err := qb.executeFindQuery(body, args, sortAndPagination, whereClauses, havingClauses) + query.handleStringCriterionInput(movieFilter.URL, "movies.url") + + query.sortAndPagination = qb.getMovieSort(findFilter) + getPagination(findFilter) + idsResult, countResult, err := query.executeFind() if err != nil { return nil, 0, err } diff --git a/pkg/sqlite/movies_test.go b/pkg/sqlite/movies_test.go index 235f0184c..5ba543798 100644 --- a/pkg/sqlite/movies_test.go +++ b/pkg/sqlite/movies_test.go @@ -119,6 +119,71 @@ func TestMovieQueryStudio(t *testing.T) { }) } +func TestMovieQueryURL(t *testing.T) { + const sceneIdx = 1 + movieURL := getMovieStringValue(sceneIdx, urlField) + + urlCriterion := models.StringCriterionInput{ + Value: movieURL, + Modifier: models.CriterionModifierEquals, + } + + filter := models.MovieFilterType{ + URL: &urlCriterion, + } + + verifyFn := func(n *models.Movie) { + t.Helper() + verifyNullString(t, n.URL, urlCriterion) + } + + verifyMovieQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotEquals + verifyMovieQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierMatchesRegex + urlCriterion.Value = "movie_.*1_URL" + verifyMovieQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex + verifyMovieQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierIsNull + urlCriterion.Value = "" + verifyMovieQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotNull + verifyMovieQuery(t, filter, verifyFn) +} + +func verifyMovieQuery(t *testing.T, filter models.MovieFilterType, verifyFn func(s *models.Movie)) { + withTxn(func(r models.Repository) error { + t.Helper() + sqb := r.Movie() + + movies := queryMovie(t, sqb, &filter, nil) + + // assume it should find at least one + assert.Greater(t, len(movies), 0) + + for _, m := range movies { + verifyFn(m) + } + + return nil + }) +} + +func queryMovie(t *testing.T, sqb models.MovieReader, movieFilter *models.MovieFilterType, findFilter *models.FindFilterType) []*models.Movie { + movies, _, err := sqb.Query(movieFilter, findFilter) + if err != nil { + t.Errorf("Error querying movie: %s", err.Error()) + } + + return movies +} + func TestMovieUpdateMovieImages(t *testing.T) { if err := withTxn(func(r models.Repository) error { mqb := r.Movie() diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go index 342fe8c63..2daa22b89 100644 --- a/pkg/sqlite/performer.go +++ b/pkg/sqlite/performer.go @@ -254,6 +254,7 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy query.handleStringCriterionInput(performerFilter.CareerLength, tableName+".career_length") query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos") query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings") + query.handleStringCriterionInput(performerFilter.URL, tableName+".url") // TODO - need better handling of aliases query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases") diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go index c5c7dc6cd..bf9024017 100644 --- a/pkg/sqlite/performer_test.go +++ b/pkg/sqlite/performer_test.go @@ -268,6 +268,62 @@ func verifyPerformerCareerLength(t *testing.T, criterion models.StringCriterionI }) } +func TestPerformerQueryURL(t *testing.T) { + const sceneIdx = 1 + performerURL := getPerformerStringValue(sceneIdx, urlField) + + urlCriterion := models.StringCriterionInput{ + Value: performerURL, + Modifier: models.CriterionModifierEquals, + } + + filter := models.PerformerFilterType{ + URL: &urlCriterion, + } + + verifyFn := func(g *models.Performer) { + t.Helper() + verifyNullString(t, g.URL, urlCriterion) + } + + verifyPerformerQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotEquals + verifyPerformerQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierMatchesRegex + urlCriterion.Value = "performer_.*1_URL" + verifyPerformerQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex + verifyPerformerQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierIsNull + urlCriterion.Value = "" + verifyPerformerQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotNull + verifyPerformerQuery(t, filter, verifyFn) +} + +func verifyPerformerQuery(t *testing.T, filter models.PerformerFilterType, verifyFn func(s *models.Performer)) { + withTxn(func(r models.Repository) error { + t.Helper() + sqb := r.Performer() + + performers := queryPerformers(t, sqb, &filter, nil) + + // assume it should find at least one + assert.Greater(t, len(performers), 0) + + for _, p := range performers { + verifyFn(p) + } + + return nil + }) +} + func queryPerformers(t *testing.T, qb models.PerformerReader, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) []*models.Performer { performers, _, err := qb.Query(performerFilter, findFilter) if err != nil { diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go index 8dd954322..1cce0c344 100644 --- a/pkg/sqlite/scene.go +++ b/pkg/sqlite/scene.go @@ -345,6 +345,7 @@ func (qb *sceneQueryBuilder) makeFilter(sceneFilter *models.SceneFilterType) *fi query.handleCriterionFunc(resolutionCriterionHandler(sceneFilter.Resolution, "scenes.height", "scenes.width")) query.handleCriterionFunc(hasMarkersCriterionHandler(sceneFilter.HasMarkers)) query.handleCriterionFunc(sceneIsMissingCriterionHandler(qb, sceneFilter.IsMissing)) + query.handleCriterionFunc(stringCriterionHandler(sceneFilter.URL, "scenes.url")) query.handleCriterionFunc(sceneTagsCriterionHandler(qb, sceneFilter.Tags)) query.handleCriterionFunc(scenePerformersCriterionHandler(qb, sceneFilter.Performers)) diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go index ac34403fb..5f30ce4ac 100644 --- a/pkg/sqlite/scene_test.go +++ b/pkg/sqlite/scene_test.go @@ -187,6 +187,44 @@ func TestSceneQueryPath(t *testing.T) { verifyScenesPath(t, pathCriterion) } +func TestSceneQueryURL(t *testing.T) { + const sceneIdx = 1 + scenePath := getSceneStringValue(sceneIdx, urlField) + + urlCriterion := models.StringCriterionInput{ + Value: scenePath, + Modifier: models.CriterionModifierEquals, + } + + filter := models.SceneFilterType{ + URL: &urlCriterion, + } + + verifyFn := func(s *models.Scene) { + t.Helper() + verifyNullString(t, s.URL, urlCriterion) + } + + verifySceneQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotEquals + verifySceneQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierMatchesRegex + urlCriterion.Value = "scene_.*1_URL" + verifySceneQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex + verifySceneQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierIsNull + urlCriterion.Value = "" + verifySceneQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotNull + verifySceneQuery(t, filter, verifyFn) +} + func TestSceneQueryPathOr(t *testing.T) { const scene1Idx = 1 const scene2Idx = 2 @@ -324,6 +362,24 @@ func TestSceneIllegalQuery(t *testing.T) { }) } +func verifySceneQuery(t *testing.T, filter models.SceneFilterType, verifyFn func(s *models.Scene)) { + withTxn(func(r models.Repository) error { + t.Helper() + sqb := r.Scene() + + scenes := queryScene(t, sqb, &filter, nil) + + // assume it should find at least one + assert.Greater(t, len(scenes), 0) + + for _, scene := range scenes { + verifyFn(scene) + } + + return nil + }) +} + func verifyScenesPath(t *testing.T, pathCriterion models.StringCriterionInput) { withTxn(func(r models.Repository) error { sqb := r.Scene() @@ -345,10 +401,15 @@ func verifyNullString(t *testing.T, value sql.NullString, criterion models.Strin t.Helper() assert := assert.New(t) if criterion.Modifier == models.CriterionModifierIsNull { + if value.Valid && value.String == "" { + // correct + return + } assert.False(value.Valid, "expect is null values to be null") } if criterion.Modifier == models.CriterionModifierNotNull { assert.True(value.Valid, "expect is null values to be null") + assert.Greater(len(value.String), 0) } if criterion.Modifier == models.CriterionModifierEquals { assert.Equal(criterion.Value, value.String) diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go index 323bb113c..f178bac09 100644 --- a/pkg/sqlite/setup_test.go +++ b/pkg/sqlite/setup_test.go @@ -76,7 +76,8 @@ const ( movieIdxWithScene = iota movieIdxWithStudio // movies with dup names start from the end - movieIdxWithDupName + // create 10 more basic movies (can remove this if we add more indexes) + movieIdxWithDupName = movieIdxWithStudio + 10 moviesNameCase = movieIdxWithDupName moviesNameNoCase = 1 @@ -146,6 +147,7 @@ const ( pathField = "Path" checksumField = "Checksum" titleField = "Title" + urlField = "URL" zipPath = "zipPath.zip" ) @@ -407,8 +409,32 @@ func populateDB() error { return nil } +func getPrefixedStringValue(prefix string, index int, field string) string { + return fmt.Sprintf("%s_%04d_%s", prefix, index, field) +} + +func getPrefixedNullStringValue(prefix string, index int, field string) sql.NullString { + if index > 0 && index%5 == 0 { + return sql.NullString{} + } + if index > 0 && index%6 == 0 { + return sql.NullString{ + String: "", + Valid: true, + } + } + return sql.NullString{ + String: getPrefixedStringValue(prefix, index, field), + Valid: true, + } +} + func getSceneStringValue(index int, field string) string { - return fmt.Sprintf("scene_%04d_%s", index, field) + return getPrefixedStringValue("scene", index, field) +} + +func getSceneNullStringValue(index int, field string) sql.NullString { + return getPrefixedNullStringValue("scene", index, field) } func getRating(index int) sql.NullInt64 { @@ -455,6 +481,7 @@ func createScenes(sqb models.SceneReaderWriter, n int) error { Title: sql.NullString{String: getSceneStringValue(i, titleField), Valid: true}, Checksum: sql.NullString{String: getSceneStringValue(i, checksumField), Valid: true}, Details: sql.NullString{String: getSceneStringValue(i, "Details"), Valid: true}, + URL: getSceneNullStringValue(i, urlField), Rating: getRating(i), OCounter: getOCounter(i), Duration: getSceneDuration(i), @@ -511,13 +538,18 @@ func createImages(qb models.ImageReaderWriter, n int) error { } func getGalleryStringValue(index int, field string) string { - return "gallery_" + strconv.FormatInt(int64(index), 10) + "_" + field + return getPrefixedStringValue("gallery", index, field) +} + +func getGalleryNullStringValue(index int, field string) sql.NullString { + return getPrefixedNullStringValue("gallery", index, field) } func createGalleries(gqb models.GalleryReaderWriter, n int) error { for i := 0; i < n; i++ { gallery := models.Gallery{ Path: models.NullString(getGalleryStringValue(i, pathField)), + URL: getGalleryNullStringValue(i, urlField), Checksum: getGalleryStringValue(i, checksumField), } @@ -534,10 +566,14 @@ func createGalleries(gqb models.GalleryReaderWriter, n int) error { } func getMovieStringValue(index int, field string) string { - return "movie_" + strconv.FormatInt(int64(index), 10) + "_" + field + return getPrefixedStringValue("movie", index, field) } -//createMoviees creates n movies with plain Name and o movies with camel cased NaMe included +func getMovieNullStringValue(index int, field string) sql.NullString { + return getPrefixedNullStringValue("movie", index, field) +} + +// createMoviees creates n movies with plain Name and o movies with camel cased NaMe included func createMovies(mqb models.MovieReaderWriter, n int, o int) error { const namePlain = "Name" const nameNoCase = "NaMe" @@ -555,6 +591,7 @@ func createMovies(mqb models.MovieReaderWriter, n int, o int) error { name = getMovieStringValue(index, name) movie := models.Movie{ Name: sql.NullString{String: name, Valid: true}, + URL: getMovieNullStringValue(index, urlField), Checksum: utils.MD5FromString(name), } @@ -572,7 +609,11 @@ func createMovies(mqb models.MovieReaderWriter, n int, o int) error { } func getPerformerStringValue(index int, field string) string { - return "performer_" + strconv.FormatInt(int64(index), 10) + "_" + field + return getPrefixedStringValue("performer", index, field) +} + +func getPerformerNullStringValue(index int, field string) sql.NullString { + return getPrefixedNullStringValue("performer", index, field) } func getPerformerBoolValue(index int) bool { @@ -596,7 +637,7 @@ func getPerformerCareerLength(index int) *string { return &ret } -//createPerformers creates n performers with plain Name and o performers with camel cased NaMe included +// createPerformers creates n performers with plain Name and o performers with camel cased NaMe included func createPerformers(pqb models.PerformerReaderWriter, n int, o int) error { const namePlain = "Name" const nameNoCase = "NaMe" @@ -615,6 +656,7 @@ func createPerformers(pqb models.PerformerReaderWriter, n int, o int) error { performer := models.Performer{ Name: sql.NullString{String: getPerformerStringValue(index, name), Valid: true}, Checksum: getPerformerStringValue(i, checksumField), + URL: getPerformerNullStringValue(i, urlField), Favorite: sql.NullBool{Bool: getPerformerBoolValue(i), Valid: true}, Birthdate: models.SQLiteDate{ String: getPerformerBirthdate(i), @@ -718,7 +760,11 @@ func createTags(tqb models.TagReaderWriter, n int, o int) error { } func getStudioStringValue(index int, field string) string { - return "studio_" + strconv.FormatInt(int64(index), 10) + "_" + field + return getPrefixedStringValue("studio", index, field) +} + +func getStudioNullStringValue(index int, field string) sql.NullString { + return getPrefixedNullStringValue("studio", index, field) } func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) (*models.Studio, error) { @@ -731,6 +777,10 @@ func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) ( studio.ParentID = sql.NullInt64{Int64: *parentID, Valid: true} } + return createStudioFromModel(sqb, studio) +} + +func createStudioFromModel(sqb models.StudioReaderWriter, studio models.Studio) (*models.Studio, error) { created, err := sqb.Create(studio) if err != nil { @@ -740,7 +790,7 @@ func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) ( return created, nil } -//createStudios creates n studios with plain Name and o studios with camel cased NaMe included +// createStudios creates n studios with plain Name and o studios with camel cased NaMe included func createStudios(sqb models.StudioReaderWriter, n int, o int) error { const namePlain = "Name" const nameNoCase = "NaMe" @@ -756,7 +806,12 @@ func createStudios(sqb models.StudioReaderWriter, n int, o int) error { // studios [ i ] and [ n + o - i - 1 ] should have similar names with only the Name!=NaMe part different name = getStudioStringValue(index, name) - created, err := createStudio(sqb, name, nil) + studio := models.Studio{ + Name: sql.NullString{String: name, Valid: true}, + Checksum: utils.MD5FromString(name), + URL: getStudioNullStringValue(index, urlField), + } + created, err := createStudioFromModel(sqb, studio) if err != nil { return err diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go index fa08017a1..c3a984c03 100644 --- a/pkg/sqlite/studio.go +++ b/pkg/sqlite/studio.go @@ -129,11 +129,10 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF findFilter = &models.FindFilterType{} } - var whereClauses []string - var havingClauses []string - var args []interface{} - body := selectDistinctIDs("studios") - body += ` + query := qb.newQuery() + + query.body = selectDistinctIDs("studios") + query.body += ` left join scenes on studios.id = scenes.studio_id left join studio_stash_ids on studio_stash_ids.studio_id = studios.id ` @@ -142,44 +141,47 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF searchColumns := []string{"studios.name"} clause, thisArgs := getSearchBinding(searchColumns, *q, false) - whereClauses = append(whereClauses, clause) - args = append(args, thisArgs...) + query.addWhere(clause) + query.addArg(thisArgs...) } if parentsFilter := studioFilter.Parents; parentsFilter != nil && len(parentsFilter.Value) > 0 { - body += ` + query.body += ` left join studios as parent_studio on parent_studio.id = studios.parent_id ` for _, studioID := range parentsFilter.Value { - args = append(args, studioID) + query.addArg(studioID) } whereClause, havingClause := getMultiCriterionClause("studios", "parent_studio", "", "", "parent_id", parentsFilter) - whereClauses = appendClause(whereClauses, whereClause) - havingClauses = appendClause(havingClauses, havingClause) + + query.addWhere(whereClause) + query.addHaving(havingClause) } if stashIDFilter := studioFilter.StashID; stashIDFilter != nil { - whereClauses = append(whereClauses, "studio_stash_ids.stash_id = ?") - args = append(args, stashIDFilter) + query.addWhere("studio_stash_ids.stash_id = ?") + query.addArg(stashIDFilter) } + query.handleStringCriterionInput(studioFilter.URL, "studios.url") + if isMissingFilter := studioFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" { switch *isMissingFilter { case "image": - body += `left join studios_image on studios_image.studio_id = studios.id + query.body += `left join studios_image on studios_image.studio_id = studios.id ` - whereClauses = appendClause(whereClauses, "studios_image.studio_id IS NULL") + query.addWhere("studios_image.studio_id IS NULL") case "stash_id": - whereClauses = appendClause(whereClauses, "studio_stash_ids.studio_id IS NULL") + query.addWhere("studio_stash_ids.studio_id IS NULL") default: - whereClauses = appendClause(whereClauses, "studios."+*isMissingFilter+" IS NULL") + query.addWhere("studios." + *isMissingFilter + " IS NULL") } } - sortAndPagination := qb.getStudioSort(findFilter) + getPagination(findFilter) - idsResult, countResult, err := qb.executeFindQuery(body, args, sortAndPagination, whereClauses, havingClauses) + query.sortAndPagination = qb.getStudioSort(findFilter) + getPagination(findFilter) + idsResult, countResult, err := query.executeFind() if err != nil { return nil, 0, err } diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go index 0dd3e4585..9325c720a 100644 --- a/pkg/sqlite/studio_test.go +++ b/pkg/sqlite/studio_test.go @@ -283,6 +283,71 @@ func TestStudioStashIDs(t *testing.T) { } } +func TestStudioQueryURL(t *testing.T) { + const sceneIdx = 1 + studioURL := getStudioStringValue(sceneIdx, urlField) + + urlCriterion := models.StringCriterionInput{ + Value: studioURL, + Modifier: models.CriterionModifierEquals, + } + + filter := models.StudioFilterType{ + URL: &urlCriterion, + } + + verifyFn := func(g *models.Studio) { + t.Helper() + verifyNullString(t, g.URL, urlCriterion) + } + + verifyStudioQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotEquals + verifyStudioQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierMatchesRegex + urlCriterion.Value = "studio_.*1_URL" + verifyStudioQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex + verifyStudioQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierIsNull + urlCriterion.Value = "" + verifyStudioQuery(t, filter, verifyFn) + + urlCriterion.Modifier = models.CriterionModifierNotNull + verifyStudioQuery(t, filter, verifyFn) +} + +func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn func(s *models.Studio)) { + withTxn(func(r models.Repository) error { + t.Helper() + sqb := r.Studio() + + galleries := queryStudio(t, sqb, &filter, nil) + + // assume it should find at least one + assert.Greater(t, len(galleries), 0) + + for _, studio := range galleries { + verifyFn(studio) + } + + return nil + }) +} + +func queryStudio(t *testing.T, sqb models.StudioReader, studioFilter *models.StudioFilterType, findFilter *models.FindFilterType) []*models.Studio { + studios, _, err := sqb.Query(studioFilter, findFilter) + if err != nil { + t.Errorf("Error querying studio: %s", err.Error()) + } + + return studios +} + // TODO Create // TODO Update // TODO Destroy diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index e3452b69a..2ad53bfff 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,7 +3,8 @@ * Added scene queue. ### 🎨 Improvements -* Add HTTP endpoint for health checking at /healthz. +* Add URL filter criteria for scenes, galleries, movies, performers and studios. +* Add HTTP endpoint for health checking at `/healthz`. * Support `today` and `yesterday` for `parseDate` in scrapers. * Add random sorting option for galleries, studios, movies and tags. * Disable sounds on scene/marker wall previews by default. diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts index 213ca8263..f18a22366 100644 --- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts +++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts @@ -47,7 +47,8 @@ export type CriterionType = | "marker_count" | "image_count" | "gallery_count" - | "performer_count"; + | "performer_count" + | "url"; type Option = string | number | IOptionType; export type CriterionValue = string | number | ILabeledId[]; @@ -135,6 +136,8 @@ export abstract class Criterion { return "Gallery Count"; case "performer_count": return "Performer Count"; + case "url": + return "URL"; } } diff --git a/ui/v2.5/src/models/list-filter/criteria/utils.ts b/ui/v2.5/src/models/list-filter/criteria/utils.ts index 171b72e52..011574546 100644 --- a/ui/v2.5/src/models/list-filter/criteria/utils.ts +++ b/ui/v2.5/src/models/list-filter/criteria/utils.ts @@ -112,6 +112,7 @@ export function makeCriteria(type: CriterionType = "none") { case "tattoos": case "piercings": case "aliases": + case "url": return new StringCriterion(type, type); } } diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts index 68306518d..5ede1dee1 100644 --- a/ui/v2.5/src/models/list-filter/filter.ts +++ b/ui/v2.5/src/models/list-filter/filter.ts @@ -151,6 +151,7 @@ export class ListFilterModel { new PerformersCriterionOption(), new StudiosCriterionOption(), new MoviesCriterionOption(), + ListFilterModel.createCriterionOption("url"), ]; break; case FilterMode.Images: @@ -210,6 +211,7 @@ export class ListFilterModel { new GenderCriterionOption(), new PerformerIsMissingCriterionOption(), new TagsCriterionOption(), + ListFilterModel.createCriterionOption("url"), ...numberCriteria .concat(stringCriteria) .map((c) => ListFilterModel.createCriterionOption(c)), @@ -225,6 +227,7 @@ export class ListFilterModel { new NoneCriterionOption(), new ParentStudiosCriterionOption(), new StudioIsMissingCriterionOption(), + ListFilterModel.createCriterionOption("url"), ]; break; case FilterMode.Movies: @@ -235,6 +238,7 @@ export class ListFilterModel { new NoneCriterionOption(), new StudiosCriterionOption(), new MovieIsMissingCriterionOption(), + ListFilterModel.createCriterionOption("url"), ]; break; case FilterMode.Galleries: @@ -257,6 +261,7 @@ export class ListFilterModel { new PerformerTagsCriterionOption(), new PerformersCriterionOption(), new StudiosCriterionOption(), + ListFilterModel.createCriterionOption("url"), ]; this.displayModeOptions = [ DisplayMode.Grid, @@ -582,6 +587,14 @@ export class ListFilterModel { }; break; } + case "url": { + const urlCrit = criterion as StringCriterion; + result.url = { + value: urlCrit.value, + modifier: urlCrit.modifier, + }; + break; + } // no default } }); @@ -690,6 +703,14 @@ export class ListFilterModel { }; break; } + case "url": { + const urlCrit = criterion as StringCriterion; + result.url = { + value: urlCrit.value, + modifier: urlCrit.modifier, + }; + break; + } // no default } }); @@ -868,6 +889,14 @@ export class ListFilterModel { }; break; } + case "url": { + const urlCrit = criterion as StringCriterion; + result.url = { + value: urlCrit.value, + modifier: urlCrit.modifier, + }; + break; + } case "movieIsMissing": result.is_missing = (criterion as IsMissingCriterion).value; // no default @@ -888,6 +917,14 @@ export class ListFilterModel { }; break; } + case "url": { + const urlCrit = criterion as StringCriterion; + result.url = { + value: urlCrit.value, + modifier: urlCrit.modifier, + }; + break; + } case "studioIsMissing": result.is_missing = (criterion as IsMissingCriterion).value; // no default @@ -1001,6 +1038,14 @@ export class ListFilterModel { }; break; } + case "url": { + const urlCrit = criterion as StringCriterion; + result.url = { + value: urlCrit.value, + modifier: urlCrit.modifier, + }; + break; + } // no default } }); From d042ec42ee0fb57df6956fd1701dd2c2444ae0ad Mon Sep 17 00:00:00 2001 From: julien0221 <68500525+julien0221@users.noreply.github.com> Date: Fri, 9 Apr 2021 06:27:48 +0100 Subject: [PATCH 17/66] Added Auto scroll user back to the top when page navigation is clicked (#1270) --- ui/v2.5/src/components/Changelog/versions/v070.md | 1 + ui/v2.5/src/hooks/ListHook.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 2ad53bfff..1ba1099ae 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -3,6 +3,7 @@ * Added scene queue. ### 🎨 Improvements +* Scroll to top when changing page number. * Add URL filter criteria for scenes, galleries, movies, performers and studios. * Add HTTP endpoint for health checking at `/healthz`. * Support `today` and `yesterday` for `parseDate` in scrapers. diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx index 2e6579115..1365da170 100644 --- a/ui/v2.5/src/hooks/ListHook.tsx +++ b/ui/v2.5/src/hooks/ListHook.tsx @@ -534,6 +534,7 @@ const useList = ( const newFilter = _.cloneDeep(filter); newFilter.currentPage = page; updateQueryParams(newFilter); + window.scrollTo(0, 0); }; const renderFilter = !options.filterHook From 6a0c73b3a1d63492e32a1c2c2eedd0fbb2b4d386 Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Fri, 9 Apr 2021 09:42:52 +0300 Subject: [PATCH 18/66] Remove external resource from Login page (#1275) --- ui/login/login.css | 2 +- ui/login/login.html | 5 ++--- ui/v2.5/src/components/Changelog/versions/v070.md | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/login/login.css b/ui/login/login.css index e0ed5f797..cddf4c8d3 100644 --- a/ui/login/login.css +++ b/ui/login/login.css @@ -9,7 +9,7 @@ html { body { background-color: #202b33; color: #f5f8fa; - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; margin: 0; diff --git a/ui/login/login.html b/ui/login/login.html index c8ad61256..ea552bba8 100644 --- a/ui/login/login.html +++ b/ui/login/login.html @@ -5,7 +5,6 @@ Login - @@ -26,9 +25,9 @@{{.Error}}- + - +diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index 1ba1099ae..35e591f1f 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -13,6 +13,7 @@ * Change performer text query to search by name and alias only. ### 🐛 Bug fixes +* Fix hang on Login page when not connected to internet. * Fix `Clear Image` button not updating image preview. * Fix processing some webp files. * Fix incorrect performer age calculation in UI. From a2582047ca69087a69774fb32509be2167a71b6a Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Fri, 9 Apr 2021 18:46:00 +1000 Subject: [PATCH 19/66] Join count filter criteria (#1254) Co-authored-by: mrbrdo= ({ title: "Scene Tagger", content: Tagger, }, + { + key: "Deduplication.md", + title: "Dupe Checker", + content: Deduplication, + }, { key: "KeyboardShortcuts.md", title: "Keyboard Shortcuts", diff --git a/ui/v2.5/src/components/List/styles.scss b/ui/v2.5/src/components/List/styles.scss index 8ea230bc4..6cdea51aa 100644 --- a/ui/v2.5/src/components/List/styles.scss +++ b/ui/v2.5/src/components/List/styles.scss @@ -6,6 +6,14 @@ padding-left: 15px; padding-right: 15px; transition: none; + + &:first-child { + border-left: none; + } + + &:last-child { + border-right: none; + } } } diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx index 6a41e67ed..343cd77a8 100644 --- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx +++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx @@ -219,10 +219,24 @@ export const SceneFileInfoPanel: React.FC = ( ); } + function renderPhash() { + if (props.scene.phash) { + return ( + + + PHash + ++ ); + } + } + return (+ {renderOSHash()} {renderChecksum()} + {renderPhash()} {renderPath()} {renderStream()} {renderFileSize()} diff --git a/ui/v2.5/src/components/Scenes/SceneGenerateDialog.tsx b/ui/v2.5/src/components/Scenes/SceneGenerateDialog.tsx index abf950e9e..72a1601ee 100644 --- a/ui/v2.5/src/components/Scenes/SceneGenerateDialog.tsx +++ b/ui/v2.5/src/components/Scenes/SceneGenerateDialog.tsx @@ -19,6 +19,7 @@ export const SceneGenerateDialog: React.FC{getDurationStatus(scene, stashScene.file?.duration)} - {getFingerprintStatus( - scene, - stashScene.checksum ?? stashScene.oshash ?? undefined - )} + {getFingerprintStatus(scene, stashScene)}= ( const { data, error, loading } = useConfiguration(); const [sprites, setSprites] = useState(true); + const [phashes, setPhashes] = useState(true); const [previews, setPreviews] = useState(true); const [markers, setMarkers] = useState(true); const [transcodes, setTranscodes] = useState(false); @@ -60,6 +61,7 @@ export const SceneGenerateDialog: React.FC = ( try { await mutateMetadataGenerate({ sprites, + phashes, previews, imagePreviews: previews && imagePreviews, markers, @@ -243,6 +245,12 @@ export const SceneGenerateDialog: React.FC = ( label="Transcodes (MP4 conversions of unsupported video formats)" onChange={() => setTranscodes(!transcodes)} /> + setPhashes(!phashes)} + />
{ const location = useLocation(); @@ -45,6 +46,9 @@ export const Settings: React.FC = () => { Logs + Dupe Checker +About + + ; + if (!data) return ; + + const scenes = data?.findDuplicateScenes ?? []; + const filteredScenes = scenes.slice( + (currentPage - 1) * pageSize, + currentPage * pageSize + ); + const checkCount = Object.keys(checkedScenes).filter( + (id) => checkedScenes[id] + ).length; + + const setQuery = (q: Record + ); + }; + + return ( + + {deletingScene && ( ++ ); +}; diff --git a/ui/v2.5/src/components/Settings/SettingsTasksPanel/GenerateButton.tsx b/ui/v2.5/src/components/Settings/SettingsTasksPanel/GenerateButton.tsx index 77ced445b..69d8f46cd 100644 --- a/ui/v2.5/src/components/Settings/SettingsTasksPanel/GenerateButton.tsx +++ b/ui/v2.5/src/components/Settings/SettingsTasksPanel/GenerateButton.tsx @@ -6,6 +6,7 @@ import { useToast } from "src/hooks"; export const GenerateButton: React.FC = () => { const Toast = useToast(); const [sprites, setSprites] = useState(true); + const [phashes, setPhashes] = useState(true); const [previews, setPreviews] = useState(true); const [markers, setMarkers] = useState(true); const [transcodes, setTranscodes] = useState(false); @@ -15,6 +16,7 @@ export const GenerateButton: React.FC = () => { try { await mutateMetadataGenerate({ sprites, + phashes, previews, imagePreviews: previews && imagePreviews, markers, @@ -64,6 +66,12 @@ export const GenerateButton: React.FC = () => { label="Transcodes (MP4 conversions of unsupported video formats)" onChange={() => setTranscodes(!transcodes)} /> ++ )} + Duplicate Scenes
++ ++
+Search Accuracy ++ + setQuery({ + distance: + e.currentTarget.value === "0" + ? undefined + : e.currentTarget.value, + page: undefined, + }) + } + defaultValue={distance ?? 0} + className="ml-4" + > + + + + + + ++ Levels below “Exact” can take longer to calculate. False + positives might also be returned on lower accuracy levels. + ++++ {scenes.length} sets of duplicates found. +
+ {checkCount > 0 && ( + + )} ++ setQuery({ page: newPage === 1 ? undefined : newPage }) + } + /> + + setQuery({ + size: + e.currentTarget.value === "20" + ? undefined + : e.currentTarget.value, + }) + } + > + + + + + + ++
+ {scenes.length === 0 && ( ++ + ++ + + + + + + + + + + + + {filteredScenes.map((group) => + group.map((scene, i) => ( +Title +Duration +Filesize +Resolution +Bitrate +Codec +Delete ++ + )) + )} + ++ ++ handleCheck(e.currentTarget.checked, scene.id) + } + /> + + ++ } + placement="right" + > + + +
+ + {scene.title ?? TextUtils.fileNameFromPath(scene.path)} + + ++ {scene.file.duration && + TextUtils.secondsToTimestamp(scene.file.duration)} + +{renderFilesize(scene.file.size)} +{`${scene.file.width}x${scene.file.height}`} ++ ++ mbps + {scene.file.video_codec} ++ + ++ No duplicates found. Make sure the phash task has been run. +
+ )} +setPhashes(!phashes)} + />
 Nearest-Neighbor |
+ Bilinear |
+
|---|---|
 Bicubic |
+ Mitchell-Netravali |
+
 Lanczos2 |
+ Lanczos3 |
+
 Nearest-Neighbor |
+ Bilinear |
+
|---|---|
 Bicubic |
+ Mitchell-Netravali |
+
 Lanczos2 |
+ Lanczos3 |
+
@@ -805,7 +823,7 @@ xPathScrapers:
return
}
- globalConfig := GlobalConfig{}
+ globalConfig := mockGlobalConfig{}
performer, err := c.ScrapePerformerURL(ts.URL, nil, globalConfig)
diff --git a/pkg/sqlite/transaction.go b/pkg/sqlite/transaction.go
index 50016db45..b9d3157ff 100644
--- a/pkg/sqlite/transaction.go
+++ b/pkg/sqlite/transaction.go
@@ -29,6 +29,10 @@ func (t *transaction) Begin() error {
return errors.New("transaction already begun")
}
+ if err := database.Ready(); err != nil {
+ return err
+ }
+
var err error
t.tx, err = database.DB.BeginTxx(t.Ctx, nil)
if err != nil {
@@ -124,6 +128,10 @@ func (t *transaction) Tag() models.TagReaderWriter {
type ReadTransaction struct{}
func (t *ReadTransaction) Begin() error {
+ if err := database.Ready(); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/ui/setup/index.html b/ui/setup/index.html
deleted file mode 100644
index 38825d717..000000000
--- a/ui/setup/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- Stash
-
-
-
-
-
-
-
-Stash
-
-
-
-
-
-
-
-
+
+ );
+ }
+
return (
-
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 9dbfdf5ab..14accf8ab 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Revamped setup wizard and migration UI.
* Add various `count` filter criteria and sort options.
* Scroll to top when changing page number.
* Add URL filter criteria for scenes, galleries, movies, performers and studios.
diff --git a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
index ffba16f41..f4f371e24 100644
--- a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
@@ -116,9 +116,13 @@ export const SettingsTasksPanel: React.FC = () => {
function onImport() {
setIsImportAlertOpen(false);
- mutateMetadataImport().then(() => {
- jobStatus.refetch();
- });
+ mutateMetadataImport()
+ .then(() => {
+ jobStatus.refetch();
+ })
+ .catch((e) => {
+ Toast.error(e);
+ });
}
function renderImportAlert() {
@@ -535,9 +539,11 @@ export const SettingsTasksPanel: React.FC = () => {
variant="secondary"
type="submit"
onClick={() =>
- mutateMetadataExport().then(() => {
- jobStatus.refetch();
- })
+ mutateMetadataExport()
+ .then(() => {
+ jobStatus.refetch();
+ })
+ .catch((e) => Toast.error(e))
}
>
Full Export
diff --git a/ui/v2.5/src/components/Setup/Migrate.tsx b/ui/v2.5/src/components/Setup/Migrate.tsx
new file mode 100644
index 000000000..c84405d58
--- /dev/null
+++ b/ui/v2.5/src/components/Setup/Migrate.tsx
@@ -0,0 +1,158 @@
+import React, { useEffect, useState } from "react";
+import { Button, Card, Container, Form } from "react-bootstrap";
+import * as GQL from "src/core/generated-graphql";
+import { useSystemStatus, mutateMigrate } from "src/core/StashService";
+import { LoadingIndicator } from "../Shared";
+
+export const Migrate: React.FC = () => {
+ const { data: systemStatus, loading } = useSystemStatus();
+ const [backupPath, setBackupPath] = useState();
+ const [migrateLoading, setMigrateLoading] = useState(false);
+ const [migrateError, setMigrateError] = useState("");
+
+ // make suffix based on current time
+ const now = new Date()
+ .toISOString()
+ .replace(/T/g, "_")
+ .replace(/-/g, "")
+ .replace(/:/g, "")
+ .replace(/\..*/, "");
+ const defaultBackupPath = systemStatus
+ ? `${systemStatus.systemStatus.databasePath}.${systemStatus.systemStatus.databaseSchema}.${now}`
+ : "";
+
+ const discordLink = (
+
+ Discord
+
+ );
+ const githubLink = (
+
+ Github repository
+
+ );
+
+ useEffect(() => {
+ if (backupPath === undefined && defaultBackupPath) {
+ setBackupPath(defaultBackupPath);
+ }
+ }, [defaultBackupPath, backupPath]);
+
+ // only display setup wizard if system is not setup
+ if (loading || !systemStatus) {
+ return
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+
+
+
+
+ Backup database path (leave empty to disable backup):
+
+ ) =>
+ setBackupPath(e.currentTarget.value)
+ }
+ />
+
+
+
+
+
+
+ {maybeRenderError()}
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Setup/Setup.tsx b/ui/v2.5/src/components/Setup/Setup.tsx
new file mode 100644
index 000000000..14fb46aa3
--- /dev/null
+++ b/ui/v2.5/src/components/Setup/Setup.tsx
@@ -0,0 +1,460 @@
+import React, { useState } from "react";
+import {
+ Alert,
+ Button,
+ Card,
+ Container,
+ Form,
+ InputGroup,
+} from "react-bootstrap";
+import * as GQL from "src/core/generated-graphql";
+import { mutateSetup, useSystemStatus } from "src/core/StashService";
+import { Link } from "react-router-dom";
+import StashConfiguration from "../Settings/StashConfiguration";
+import { Icon, LoadingIndicator } from "../Shared";
+import { FolderSelectDialog } from "../Shared/FolderSelect/FolderSelectDialog";
+
+export const Setup: React.FC = () => {
+ const [step, setStep] = useState(0);
+ const [configLocation, setConfigLocation] = useState("");
+ const [stashes, setStashes] = useState([]);
+ const [generatedLocation, setGeneratedLocation] = useState("");
+ const [databaseFile, setDatabaseFile] = useState("");
+ const [loading, setLoading] = useState(false);
+ const [setupError, setSetupError] = useState("");
+
+ const [showGeneratedDialog, setShowGeneratedDialog] = useState(false);
+
+ const { data: systemStatus, loading: statusLoading } = useSystemStatus();
+
+ const discordLink = (
+
+ Discord
+
+ );
+ const githubLink = (
+
+ Github repository
+
+ );
+
+ function onConfigLocationChosen(loc: string) {
+ setConfigLocation(loc);
+ next();
+ }
+
+ function goBack(n?: number) {
+ let dec = n;
+ if (!dec) {
+ dec = 1;
+ }
+ setStep(Math.max(0, step - dec));
+ }
+
+ function next() {
+ setStep(step + 1);
+ }
+
+ function renderWelcome() {
+ return (
+ <>
+
+
+ If you're getting this screen unexpectedly, please try
+ restarting Stash in the correct working directory or with the{" "}
+
+
+
+
+
+
+ );
+ }
+
+ function onGeneratedClosed(d?: string) {
+ if (d) {
+ setGeneratedLocation(d);
+ }
+
+ setShowGeneratedDialog(false);
+ }
+
+ function maybeRenderGeneratedSelectDialog() {
+ if (!showGeneratedDialog) {
+ return;
+ }
+
+ return
+
+
+
+
+ setStashes(s)}
+ />
+
+
+
+ ) =>
+ setDatabaseFile(e.currentTarget.value)
+ }
+ />
+
+
+
+ ) =>
+ setGeneratedLocation(e.currentTarget.value)
+ }
+ />
+
+
+
+
+
+
+
+
+
+ );
+ }
+
+ function renderConfigLocation() {
+ if (configLocation === "config.yml") {
+ return
+
+
+
+
+ );
+ }
+
+ function renderError() {
+ return (
+ <>
+
+
+
+
+
+ );
+ }
+
+ function renderSuccess() {
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+
+ function renderFinish() {
+ if (setupError) {
+ return renderError();
+ }
+
+ return renderSuccess();
+ }
+
+ const steps = [renderWelcome, renderSetPaths, renderConfirm, renderFinish];
+
+ // only display setup wizard if system is not setup
+ if (statusLoading) {
+ return
+ {maybeRenderGeneratedSelectDialog()}
+ {steps[step]()}
+ )}
+
+ );
+};
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index e13e49bae..1ac8e6d80 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -281,6 +281,20 @@ export const useLatestVersion = () =>
});
export const useConfiguration = () => GQL.useConfigurationQuery();
+export const mutateSetup = (input: GQL.SetupInput) =>
+ client.mutate({
+ mutation: GQL.SetupDocument,
+ variables: { input },
+ refetchQueries: getQueryNames([GQL.ConfigurationDocument]),
+ update: deleteCache([GQL.ConfigurationDocument]),
+ });
+
+export const mutateMigrate = (input: GQL.MigrateInput) =>
+ client.mutate({
+ mutation: GQL.MigrateDocument,
+ variables: { input },
+ });
+
export const useDirectory = (path?: string) =>
GQL.useDirectoryQuery({ variables: { path } });
@@ -690,6 +704,17 @@ export const useMetadataUpdate = () => GQL.useMetadataUpdateSubscription();
export const useLoggingSubscribe = () => GQL.useLoggingSubscribeSubscription();
+export const querySystemStatus = () =>
+ client.query({
+ query: GQL.SystemStatusDocument,
+ fetchPolicy: "no-cache",
+ });
+
+export const useSystemStatus = () =>
+ GQL.useSystemStatusQuery({
+ fetchPolicy: "no-cache",
+ });
+
export const useLogs = () =>
GQL.useLogsQuery({
fetchPolicy: "no-cache",
From f5dc654f6bb665e7f09aa5f56ca553bf5ae28206 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 12 Apr 2021 11:05:49 +1000
Subject: [PATCH 22/66] Support streaming via API key (#1279)
* Support api key via url query parameter
* Add api key to stream URL
---
pkg/api/resolver_model_scene.go | 2 ++
pkg/api/server.go | 10 +++++++++-
pkg/api/urlbuilders/scene.go | 8 +++++++-
ui/v2.5/src/components/Changelog/versions/v070.md | 1 +
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pkg/api/resolver_model_scene.go b/pkg/api/resolver_model_scene.go
index dcec7fa86..f657d8371 100644
--- a/pkg/api/resolver_model_scene.go
+++ b/pkg/api/resolver_model_scene.go
@@ -4,6 +4,7 @@ import (
"context"
"github.com/stashapp/stash/pkg/api/urlbuilders"
+ "github.com/stashapp/stash/pkg/manager/config"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/utils"
)
@@ -78,6 +79,7 @@ func (r *sceneResolver) File(ctx context.Context, obj *models.Scene) (*models.Sc
func (r *sceneResolver) Paths(ctx context.Context, obj *models.Scene) (*models.ScenePathsType, error) {
baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
builder := urlbuilders.NewSceneURLBuilder(baseURL, obj.ID)
+ builder.APIKey = config.GetInstance().GetAPIKey()
screenshotPath := builder.GetScreenshotURL(obj.UpdatedAt.Timestamp)
previewPath := builder.GetStreamPreviewURL()
streamPath := builder.GetStreamURL()
diff --git a/pkg/api/server.go b/pkg/api/server.go
index 26dd34fbe..a59ef4cee 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -37,7 +37,10 @@ var uiBox *packr.Box
//var legacyUiBox *packr.Box
var loginUIBox *packr.Box
-const ApiKeyHeader = "ApiKey"
+const (
+ ApiKeyHeader = "ApiKey"
+ ApiKeyParameter = "apikey"
+)
func allowUnauthenticated(r *http.Request) bool {
return strings.HasPrefix(r.URL.Path, "/login") || r.URL.Path == "/css"
@@ -54,6 +57,11 @@ func authenticateHandler() func(http.Handler) http.Handler {
apiKey := r.Header.Get(ApiKeyHeader)
var err error
+ // try getting the api key as a query parameter
+ if apiKey == "" {
+ apiKey = r.URL.Query().Get(ApiKeyParameter)
+ }
+
if apiKey != "" {
// match against configured API and set userID to the
// configured username. In future, we'll want to
diff --git a/pkg/api/urlbuilders/scene.go b/pkg/api/urlbuilders/scene.go
index 5d7af407c..9a31e504f 100644
--- a/pkg/api/urlbuilders/scene.go
+++ b/pkg/api/urlbuilders/scene.go
@@ -1,6 +1,7 @@
package urlbuilders
import (
+ "fmt"
"strconv"
"time"
)
@@ -8,6 +9,7 @@ import (
type SceneURLBuilder struct {
BaseURL string
SceneID string
+ APIKey string
}
func NewSceneURLBuilder(baseURL string, sceneID int) SceneURLBuilder {
@@ -18,7 +20,11 @@ func NewSceneURLBuilder(baseURL string, sceneID int) SceneURLBuilder {
}
func (b SceneURLBuilder) GetStreamURL() string {
- return b.BaseURL + "/scene/" + b.SceneID + "/stream"
+ var apiKeyParam string
+ if b.APIKey != "" {
+ apiKeyParam = fmt.Sprintf("?apikey=%s", b.APIKey)
+ }
+ return fmt.Sprintf("%s/scene/%s/stream%s", b.BaseURL, b.SceneID, apiKeyParam)
}
func (b SceneURLBuilder) GetStreamPreviewURL() string {
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 14accf8ab..f005c915a 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
* Revamped setup wizard and migration UI.
* Add various `count` filter criteria and sort options.
* Scroll to top when changing page number.
From 6a4421f8e15b4f0bede153730f12e4027d9aa3b7 Mon Sep 17 00:00:00 2001
From: julien0221 <68500525+julien0221@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:32:52 +0100
Subject: [PATCH 23/66] Whitespace is not trimmed from the end of query strings
(#1263)
* fixed whitespace not trimmed query string
* fixed whitespace trimming on backend
* added query trim tests and fixed double space
---
pkg/sqlite/scene_test.go | 47 ++++++++++++++++++-
pkg/sqlite/setup_test.go | 16 ++++++-
pkg/sqlite/sql.go | 7 ++-
.../src/components/Changelog/versions/v070.md | 1 +
ui/v2.5/src/models/list-filter/filter.ts | 2 +-
5 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index cb4927523..c61f71eb0 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -1164,7 +1164,7 @@ func TestSceneQuerySorting(t *testing.T) {
lastScene := scenes[len(scenes)-1]
assert.Equal(t, sceneIDs[0], firstScene.ID)
- assert.Equal(t, sceneIDs[len(sceneIDs)-1], lastScene.ID)
+ assert.Equal(t, sceneIDs[sceneIdxWithSpacedName], lastScene.ID)
// sort in descending order
direction = models.SortDirectionEnumDesc
@@ -1173,7 +1173,7 @@ func TestSceneQuerySorting(t *testing.T) {
firstScene = scenes[0]
lastScene = scenes[len(scenes)-1]
- assert.Equal(t, sceneIDs[len(sceneIDs)-1], firstScene.ID)
+ assert.Equal(t, sceneIDs[sceneIdxWithSpacedName], firstScene.ID)
assert.Equal(t, sceneIDs[0], lastScene.ID)
return nil
@@ -1519,6 +1519,49 @@ func TestSceneStashIDs(t *testing.T) {
}
}
+func TestSceneQueryQTrim(t *testing.T) {
+ if err := withTxn(func(r models.Repository) error {
+ qb := r.Scene()
+
+ expectedID := sceneIDs[sceneIdxWithSpacedName]
+
+ type test struct {
+ query string
+ id int
+ count int
+ }
+ tests := []test{
+ {query: " zzz yyy ", id: expectedID, count: 1},
+ {query: " \"zzz yyy xxx\" ", id: expectedID, count: 1},
+ {query: "zzz", id: expectedID, count: 1},
+ {query: "\" zzz yyy \"", count: 0},
+ {query: "\"zzz yyy\"", count: 0},
+ {query: "\" zzz yyy\"", count: 0},
+ {query: "\"zzz yyy \"", count: 0},
+ }
+
+ for _, tst := range tests {
+ f := models.FindFilterType{
+ Q: &tst.query,
+ }
+ scenes := queryScene(t, qb, nil, &f)
+
+ assert.Len(t, scenes, tst.count)
+ if len(scenes) > 0 {
+ assert.Equal(t, tst.id, scenes[0].ID)
+ }
+ }
+
+ findFilter := models.FindFilterType{}
+ scenes := queryScene(t, qb, nil, &findFilter)
+ assert.NotEqual(t, 0, len(scenes))
+
+ return nil
+ }); err != nil {
+ t.Error(err.Error())
+ }
+}
+
// TODO Update
// TODO IncrementOCounter
// TODO DecrementOCounter
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index de5930fd4..7996f9516 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -20,6 +20,10 @@ import (
"github.com/stashapp/stash/pkg/utils"
)
+const (
+ spacedSceneTitle = "zzz yyy xxx"
+)
+
const (
sceneIdxWithMovie = iota
sceneIdxWithGallery
@@ -33,6 +37,7 @@ const (
sceneIdxWithMarker
sceneIdxWithPerformerTag
sceneIdxWithPerformerTwoTags
+ sceneIdxWithSpacedName
// new indexes above
lastSceneIdx
@@ -452,6 +457,15 @@ func getSceneNullStringValue(index int, field string) sql.NullString {
return getPrefixedNullStringValue("scene", index, field)
}
+func getSceneTitle(index int) string {
+ switch index {
+ case sceneIdxWithSpacedName:
+ return spacedSceneTitle
+ default:
+ return getSceneStringValue(index, titleField)
+ }
+}
+
func getRating(index int) sql.NullInt64 {
rating := index % 6
return sql.NullInt64{Int64: int64(rating), Valid: rating > 0}
@@ -493,7 +507,7 @@ func createScenes(sqb models.SceneReaderWriter, n int) error {
for i := 0; i < n; i++ {
scene := models.Scene{
Path: getSceneStringValue(i, pathField),
- Title: sql.NullString{String: getSceneStringValue(i, titleField), Valid: true},
+ Title: sql.NullString{String: getSceneTitle(i), Valid: true},
Checksum: sql.NullString{String: getSceneStringValue(i, checksumField), Valid: true},
Details: sql.NullString{String: getSceneStringValue(i, "Details"), Valid: true},
URL: getSceneNullStringValue(i, urlField),
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index bbd8fde13..b683e1a07 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -4,6 +4,7 @@ import (
"database/sql"
"fmt"
"math/rand"
+ "regexp"
"strconv"
"strings"
@@ -116,10 +117,12 @@ func getSearchBinding(columns []string, q string, not bool) (string, []interface
notStr = " NOT"
binaryType = " AND "
}
-
- queryWords := strings.Split(q, " ")
+ q = strings.TrimSpace(q)
trimmedQuery := strings.Trim(q, "\"")
+
if trimmedQuery == q {
+ q = regexp.MustCompile(`\s+`).ReplaceAllString(q, " ")
+ queryWords := strings.Split(q, " ")
// Search for any word
for _, word := range queryWords {
for _, column := range columns {
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index f005c915a..c3bfdd6e4 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -17,6 +17,7 @@
* Change performer text query to search by name and alias only.
### 🐛 Bug fixes
+* Fix whitespace in query string returning all objects.
* Fix hang on Login page when not connected to internet.
* Fix `Clear Image` button not updating image preview.
* Fix processing some webp files.
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 58116771b..fe775f41e 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -366,7 +366,7 @@ export class ListFilterModel {
this.displayMode = Number.parseInt(params.disp, 10);
}
if (params.q) {
- this.searchTerm = params.q;
+ this.searchTerm = params.q.trim();
}
if (params.p) {
this.currentPage = Number.parseInt(params.p, 10);
From f443223d16629db83d4af31b8f76f68fb9ef497b Mon Sep 17 00:00:00 2001
From: Elad Lachmi
Date: Tue, 13 Apr 2021 07:59:37 +0300
Subject: [PATCH 24/66] [Feature] Added slideshow to gallery in wall display
mode (#1224)
---
graphql/documents/data/config.graphql | 3 +-
graphql/schema/types/config.graphql | 4 +
pkg/api/resolver_mutation_configure.go | 4 +
pkg/api/resolver_query_configuration.go | 2 +
pkg/manager/config/config.go | 6 +
.../src/components/Changelog/versions/v070.md | 1 +
ui/v2.5/src/components/Images/ImageList.tsx | 32 ++-
.../SettingsInterfacePanel.tsx | 22 ++
ui/v2.5/src/hooks/Interval.ts | 65 +++++
ui/v2.5/src/hooks/Lightbox/Lightbox.tsx | 266 +++++++++++++++---
ui/v2.5/src/hooks/Lightbox/context.tsx | 15 +-
ui/v2.5/src/hooks/Lightbox/hooks.ts | 7 +-
ui/v2.5/src/hooks/Lightbox/lightbox.scss | 39 ++-
ui/v2.5/src/hooks/PageVisibility.ts | 50 ++++
ui/v2.5/src/hooks/index.ts | 2 +
15 files changed, 463 insertions(+), 55 deletions(-)
create mode 100644 ui/v2.5/src/hooks/Interval.ts
create mode 100644 ui/v2.5/src/hooks/PageVisibility.ts
diff --git a/graphql/documents/data/config.graphql b/graphql/documents/data/config.graphql
index 250c937b4..e1597c0ca 100644
--- a/graphql/documents/data/config.graphql
+++ b/graphql/documents/data/config.graphql
@@ -2,7 +2,7 @@ fragment ConfigGeneralData on ConfigGeneralResult {
stashes {
path
excludeVideo
- excludeImage
+ excludeImage
}
databasePath
generatedPath
@@ -52,6 +52,7 @@ fragment ConfigInterfaceData on ConfigInterfaceResult {
css
cssEnabled
language
+ slideshowDelay
}
fragment ConfigData on ConfigResult {
diff --git a/graphql/schema/types/config.graphql b/graphql/schema/types/config.graphql
index 9cf463125..fd13b7419 100644
--- a/graphql/schema/types/config.graphql
+++ b/graphql/schema/types/config.graphql
@@ -188,6 +188,8 @@ input ConfigInterfaceInput {
cssEnabled: Boolean
"""Interface language"""
language: String
+ """Slideshow Delay"""
+ slideshowDelay: Int
}
type ConfigInterfaceResult {
@@ -210,6 +212,8 @@ type ConfigInterfaceResult {
cssEnabled: Boolean
"""Interface language"""
language: String
+ """Slideshow Delay"""
+ slideshowDelay: Int
}
"""All configuration settings"""
diff --git a/pkg/api/resolver_mutation_configure.go b/pkg/api/resolver_mutation_configure.go
index e5cd71c9e..b3734dfc7 100644
--- a/pkg/api/resolver_mutation_configure.go
+++ b/pkg/api/resolver_mutation_configure.go
@@ -219,6 +219,10 @@ func (r *mutationResolver) ConfigureInterface(ctx context.Context, input models.
c.Set(config.Language, *input.Language)
}
+ if input.SlideshowDelay != nil {
+ c.Set(config.SlideshowDelay, *input.SlideshowDelay)
+ }
+
css := ""
if input.CSS != nil {
diff --git a/pkg/api/resolver_query_configuration.go b/pkg/api/resolver_query_configuration.go
index c11d8dc0c..1d47acb38 100644
--- a/pkg/api/resolver_query_configuration.go
+++ b/pkg/api/resolver_query_configuration.go
@@ -93,6 +93,7 @@ func makeConfigInterfaceResult() *models.ConfigInterfaceResult {
css := config.GetCSS()
cssEnabled := config.GetCSSEnabled()
language := config.GetLanguage()
+ slideshowDelay := config.GetSlideshowDelay()
return &models.ConfigInterfaceResult{
MenuItems: menuItems,
@@ -105,5 +106,6 @@ func makeConfigInterfaceResult() *models.ConfigInterfaceResult {
CSS: &css,
CSSEnabled: &cssEnabled,
Language: &language,
+ SlideshowDelay: &slideshowDelay,
}
}
diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go
index 1ce880b1a..b852ca835 100644
--- a/pkg/manager/config/config.go
+++ b/pkg/manager/config/config.go
@@ -118,6 +118,7 @@ const AutostartVideo = "autostart_video"
const ShowStudioAsText = "show_studio_as_text"
const CSSEnabled = "cssEnabled"
const WallPlayback = "wall_playback"
+const SlideshowDelay = "slideshow_delay"
// Logging options
const LogFile = "logFile"
@@ -560,6 +561,11 @@ func (i *Instance) GetShowStudioAsText() bool {
return viper.GetBool(ShowStudioAsText)
}
+func (i *Instance) GetSlideshowDelay() int {
+ viper.SetDefault(SlideshowDelay, 5000)
+ return viper.GetInt(SlideshowDelay)
+}
+
func (i *Instance) GetCSSPath() string {
// use custom.css in the same directory as the config file
configFileUsed := viper.ConfigFileUsed()
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index c3bfdd6e4..acce2e74c 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Add slideshow to image wall view.
* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
* Revamped setup wizard and migration UI.
* Add various `count` filter criteria and sort options.
diff --git a/ui/v2.5/src/components/Images/ImageList.tsx b/ui/v2.5/src/components/Images/ImageList.tsx
index 103e1799f..b304e12a7 100644
--- a/ui/v2.5/src/components/Images/ImageList.tsx
+++ b/ui/v2.5/src/components/Images/ImageList.tsx
@@ -17,6 +17,7 @@ import {
showWhenSelected,
PersistanceLevel,
} from "src/hooks/ListHook";
+
import { ImageCard } from "./ImageCard";
import { EditImagesDialog } from "./EditImagesDialog";
import { DeleteImagesDialog } from "./DeleteImagesDialog";
@@ -36,34 +37,57 @@ const ImageWall: React.FC = ({
currentPage,
pageCount,
}) => {
+ const [slideshowRunning, setSlideshowRunning] = useState(false);
const handleLightBoxPage = useCallback(
(direction: number) => {
if (direction === -1) {
if (currentPage === 1) return false;
onChangePage(currentPage - 1);
} else {
- if (currentPage === pageCount) return false;
+ if (currentPage === pageCount) {
+ // if the slideshow is running
+ // return to the first page
+ if (slideshowRunning) {
+ onChangePage(0);
+ return true;
+ }
+ return false;
+ }
onChangePage(currentPage + 1);
}
return direction === -1 || direction === 1;
},
- [onChangePage, currentPage, pageCount]
+ [onChangePage, currentPage, pageCount, slideshowRunning]
);
+ const handleClose = useCallback(() => {
+ setSlideshowRunning(false);
+ }, [setSlideshowRunning]);
+
const showLightbox = useLightbox({
images,
showNavigation: false,
pageCallback: handleLightBoxPage,
pageHeader: `Page ${currentPage} / ${pageCount}`,
+ slideshowEnabled: slideshowRunning,
+ onClose: handleClose,
});
+ const handleImageOpen = useCallback(
+ (index) => {
+ setSlideshowRunning(true);
+ showLightbox(index, true);
+ },
+ [showLightbox]
+ );
+
const thumbs = images.map((image, index) => (
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/setup/migrate.html b/ui/setup/migrate.html
deleted file mode 100644
index 632f30144..000000000
--- a/ui/setup/migrate.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/setup/milligram.min.css b/ui/setup/milligram.min.css
deleted file mode 100755
index 85f877b9f..000000000
--- a/ui/setup/milligram.min.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * Milligram v1.3.0
- * https://milligram.github.io
- *
- * Copyright (c) 2017 CJ Patoilo
- * Licensed under the MIT license
- */
-
-*,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#606c76;font-family:'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;font-size:1.6em;font-weight:300;letter-spacing:.01em;line-height:1.6}blockquote{border-left:0.3rem solid #d1d1d1;margin-left:0;margin-right:0;padding:1rem 1.5rem}blockquote *:last-child{margin-bottom:0}.button,button,input[type='button'],input[type='reset'],input[type='submit']{background-color:#9b4dca;border:0.1rem solid #9b4dca;border-radius:.4rem;color:#fff;cursor:pointer;display:inline-block;font-size:1.1rem;font-weight:700;height:3.8rem;letter-spacing:.1rem;line-height:3.8rem;padding:0 3.0rem;text-align:center;text-decoration:none;text-transform:uppercase;white-space:nowrap}.button:focus,.button:hover,button:focus,button:hover,input[type='button']:focus,input[type='button']:hover,input[type='reset']:focus,input[type='reset']:hover,input[type='submit']:focus,input[type='submit']:hover{background-color:#606c76;border-color:#606c76;color:#fff;outline:0}.button[disabled],button[disabled],input[type='button'][disabled],input[type='reset'][disabled],input[type='submit'][disabled]{cursor:default;opacity:.5}.button[disabled]:focus,.button[disabled]:hover,button[disabled]:focus,button[disabled]:hover,input[type='button'][disabled]:focus,input[type='button'][disabled]:hover,input[type='reset'][disabled]:focus,input[type='reset'][disabled]:hover,input[type='submit'][disabled]:focus,input[type='submit'][disabled]:hover{background-color:#9b4dca;border-color:#9b4dca}.button.button-outline,button.button-outline,input[type='button'].button-outline,input[type='reset'].button-outline,input[type='submit'].button-outline{background-color:transparent;color:#9b4dca}.button.button-outline:focus,.button.button-outline:hover,button.button-outline:focus,button.button-outline:hover,input[type='button'].button-outline:focus,input[type='button'].button-outline:hover,input[type='reset'].button-outline:focus,input[type='reset'].button-outline:hover,input[type='submit'].button-outline:focus,input[type='submit'].button-outline:hover{background-color:transparent;border-color:#606c76;color:#606c76}.button.button-outline[disabled]:focus,.button.button-outline[disabled]:hover,button.button-outline[disabled]:focus,button.button-outline[disabled]:hover,input[type='button'].button-outline[disabled]:focus,input[type='button'].button-outline[disabled]:hover,input[type='reset'].button-outline[disabled]:focus,input[type='reset'].button-outline[disabled]:hover,input[type='submit'].button-outline[disabled]:focus,input[type='submit'].button-outline[disabled]:hover{border-color:inherit;color:#9b4dca}.button.button-clear,button.button-clear,input[type='button'].button-clear,input[type='reset'].button-clear,input[type='submit'].button-clear{background-color:transparent;border-color:transparent;color:#9b4dca}.button.button-clear:focus,.button.button-clear:hover,button.button-clear:focus,button.button-clear:hover,input[type='button'].button-clear:focus,input[type='button'].button-clear:hover,input[type='reset'].button-clear:focus,input[type='reset'].button-clear:hover,input[type='submit'].button-clear:focus,input[type='submit'].button-clear:hover{background-color:transparent;border-color:transparent;color:#606c76}.button.button-clear[disabled]:focus,.button.button-clear[disabled]:hover,button.button-clear[disabled]:focus,button.button-clear[disabled]:hover,input[type='button'].button-clear[disabled]:focus,input[type='button'].button-clear[disabled]:hover,input[type='reset'].button-clear[disabled]:focus,input[type='reset'].button-clear[disabled]:hover,input[type='submit'].button-clear[disabled]:focus,input[type='submit'].button-clear[disabled]:hover{color:#9b4dca}code{background:#f4f5f6;border-radius:.4rem;font-size:86%;margin:0 .2rem;padding:.2rem .5rem;white-space:nowrap}pre{background:#f4f5f6;border-left:0.3rem solid #9b4dca;overflow-y:hidden}pre>code{border-radius:0;display:block;padding:1rem 1.5rem;white-space:pre}hr{border:0;border-top:0.1rem solid #f4f5f6;margin:3.0rem 0}input[type='email'],input[type='number'],input[type='password'],input[type='search'],input[type='tel'],input[type='text'],input[type='url'],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:transparent;border:0.1rem solid #d1d1d1;border-radius:.4rem;box-shadow:none;box-sizing:inherit;height:3.8rem;padding:.6rem 1.0rem;width:100%}input[type='email']:focus,input[type='number']:focus,input[type='password']:focus,input[type='search']:focus,input[type='tel']:focus,input[type='text']:focus,input[type='url']:focus,textarea:focus,select:focus{border-color:#9b4dca;outline:0}select{background:url('data:image/svg+xml;utf8,') center right no-repeat;padding-right:3.0rem}select:focus{background-image:url('data:image/svg+xml;utf8,')}textarea{min-height:6.5rem}label,legend{display:block;font-size:1.6rem;font-weight:700;margin-bottom:.5rem}fieldset{border-width:0;padding:0}input[type='checkbox'],input[type='radio']{display:inline}.label-inline{display:inline-block;font-weight:normal;margin-left:.5rem}.container{margin:0 auto;max-width:112.0rem;padding:0 2.0rem;position:relative;width:100%}.row{display:flex;flex-direction:column;padding:0;width:100%}.row.row-no-padding{padding:0}.row.row-no-padding>.column{padding:0}.row.row-wrap{flex-wrap:wrap}.row.row-top{align-items:flex-start}.row.row-bottom{align-items:flex-end}.row.row-center{align-items:center}.row.row-stretch{align-items:stretch}.row.row-baseline{align-items:baseline}.row .column{display:block;flex:1 1 auto;margin-left:0;max-width:100%;width:100%}.row .column.column-offset-10{margin-left:10%}.row .column.column-offset-20{margin-left:20%}.row .column.column-offset-25{margin-left:25%}.row .column.column-offset-33,.row .column.column-offset-34{margin-left:33.3333%}.row .column.column-offset-50{margin-left:50%}.row .column.column-offset-66,.row .column.column-offset-67{margin-left:66.6666%}.row .column.column-offset-75{margin-left:75%}.row .column.column-offset-80{margin-left:80%}.row .column.column-offset-90{margin-left:90%}.row .column.column-10{flex:0 0 10%;max-width:10%}.row .column.column-20{flex:0 0 20%;max-width:20%}.row .column.column-25{flex:0 0 25%;max-width:25%}.row .column.column-33,.row .column.column-34{flex:0 0 33.3333%;max-width:33.3333%}.row .column.column-40{flex:0 0 40%;max-width:40%}.row .column.column-50{flex:0 0 50%;max-width:50%}.row .column.column-60{flex:0 0 60%;max-width:60%}.row .column.column-66,.row .column.column-67{flex:0 0 66.6666%;max-width:66.6666%}.row .column.column-75{flex:0 0 75%;max-width:75%}.row .column.column-80{flex:0 0 80%;max-width:80%}.row .column.column-90{flex:0 0 90%;max-width:90%}.row .column .column-top{align-self:flex-start}.row .column .column-bottom{align-self:flex-end}.row .column .column-center{-ms-grid-row-align:center;align-self:center}@media (min-width: 40rem){.row{flex-direction:row;margin-left:-1.0rem;width:calc(100% + 2.0rem)}.row .column{margin-bottom:inherit;padding:0 1.0rem}}a{color:#9b4dca;text-decoration:none}a:focus,a:hover{color:#606c76}dl,ol,ul{list-style:none;margin-top:0;padding-left:0}dl dl,dl ol,dl ul,ol dl,ol ol,ol ul,ul dl,ul ol,ul ul{font-size:90%;margin:1.5rem 0 1.5rem 3.0rem}ol{list-style:decimal inside}ul{list-style:circle inside}.button,button,dd,dt,li{margin-bottom:1.0rem}fieldset,input,select,textarea{margin-bottom:1.5rem}blockquote,dl,figure,form,ol,p,pre,table,ul{margin-bottom:2.5rem}table{border-spacing:0;width:100%}td,th{border-bottom:0.1rem solid #e1e1e1;padding:1.2rem 1.5rem;text-align:left}td:first-child,th:first-child{padding-left:0}td:last-child,th:last-child{padding-right:0}b,strong{font-weight:bold}p{margin-top:0}h1,h2,h3,h4,h5,h6{font-weight:300;letter-spacing:-.1rem;margin-bottom:2.0rem;margin-top:0}h1{font-size:4.6rem;line-height:1.2}h2{font-size:3.6rem;line-height:1.25}h3{font-size:2.8rem;line-height:1.3}h4{font-size:2.2rem;letter-spacing:-.08rem;line-height:1.35}h5{font-size:1.8rem;letter-spacing:-.05rem;line-height:1.5}h6{font-size:1.6rem;letter-spacing:0;line-height:1.4}img{max-width:100%}.clearfix:after{clear:both;content:' ';display:table}.float-left{float:left}.float-right{float:right}
-
-/*# sourceMappingURL=milligram.min.css.map */
\ No newline at end of file
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 5be2b0268..efee69e4a 100755
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import { Route, Switch } from "react-router-dom";
+import React, { useEffect } from "react";
+import { Route, Switch, useRouteMatch } from "react-router-dom";
import { IntlProvider } from "react-intl";
import { ToastProvider } from "src/hooks/Toast";
import LightboxProvider from "src/hooks/Lightbox/context";
@@ -8,7 +8,7 @@ import { fas } from "@fortawesome/free-solid-svg-icons";
import { initPolyfills } from "src/polyfills";
import locales from "src/locale";
-import { useConfiguration } from "src/core/StashService";
+import { useConfiguration, useSystemStatus } from "src/core/StashService";
import { flattenMessages } from "src/utils";
import Mousetrap from "mousetrap";
import MousetrapPause from "mousetrap-pause";
@@ -25,6 +25,10 @@ import { SceneFilenameParser } from "./components/SceneFilenameParser/SceneFilen
import Movies from "./components/Movies/Movies";
import Tags from "./components/Tags/Tags";
import Images from "./components/Images/Images";
+import { Setup } from "./components/Setup/Setup";
+import { Migrate } from "./components/Setup/Migrate";
+import * as GQL from "./core/generated-graphql";
+import { LoadingIndicator } from "./components/Shared";
initPolyfills();
@@ -41,35 +45,78 @@ const intlFormats = {
export const App: React.FC = () => {
const config = useConfiguration();
+ const { data: systemStatusData } = useSystemStatus();
const language = config.data?.configuration?.interface?.language ?? "en-GB";
const messageLanguage = language.replace(/-/, "");
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const messages = flattenMessages((locales as any)[messageLanguage]);
+ const setupMatch = useRouteMatch(["/setup", "/migrate"]);
+
+ // redirect to setup or migrate as needed
+ useEffect(() => {
+ if (!systemStatusData) {
+ return;
+ }
+
+ if (
+ window.location.pathname !== "/setup" &&
+ systemStatusData.systemStatus.status === GQL.SystemStatusEnum.Setup
+ ) {
+ // redirect to setup page
+ const newURL = new URL("/setup", window.location.toString());
+ window.location.href = newURL.toString();
+ }
+
+ if (
+ window.location.pathname !== "/migrate" &&
+ systemStatusData.systemStatus.status ===
+ GQL.SystemStatusEnum.NeedsMigration
+ ) {
+ // redirect to setup page
+ const newURL = new URL("/migrate", window.location.toString());
+ window.location.href = newURL.toString();
+ }
+ }, [systemStatusData]);
+
+ function maybeRenderNavbar() {
+ // don't render navbar for setup views
+ if (!setupMatch) {
+ return - Your current stash database is schema version {{.ExistingVersion}} and needs to be migrated to version {{.MigrateVersion}}. - This version of Stash will not function without migrating the database. The schema migration process is not reversible. Once the migration is - performed, your database will be incompatible with previous versions of stash. -
- -
- It is recommended that you backup your existing database before you migrate. We can do this for you, writing a backup to {{.BackupPath}} if required.
-
-
-
-
+ {maybeRenderNavbar()}
+ {renderContent()}
Migration failed
+ +The following error was encountered while migrating the database:
+ +{migrateError}
+ + Please make any necessary corrections and try again. Otherwise, raise + a bug on the {githubLink} or seek help in the {discordLink}. +
+Migration required
++ Your current stash database is schema version{" "} + {status.databaseSchema} and needs to be migrated to + version {status.appSchema}. This version of Stash + will not function without migrating the database. +
+ ++ The schema migration process is not reversible. Once the migration + is performed, your database will be incompatible with previous + versions of stash. +
+ +
+ It is recommended that you backup your existing database before you
+ migrate. We can do this for you, making a copy of your writing a
+ backup to {defaultBackupPath} if required.
+
+
+
+ Welcome to Stash
++ If you're reading this, then Stash couldn't find an + existing configuration. This wizard will guide you through the + process of setting up a new configuration. +
+
+ Stash tries to find its configuration file (config.yml)
+ from the current working directory first, and if it does not find it
+ there, it falls back to $HOME/.stash/config.yml (on
+ Windows, this will be %USERPROFILE%\.stash\config.yml).
+ You can also make Stash read from a specific configuration file by
+ running it with the -c <path to config file> or{" "}
+ --config <path to config file> options.
+
-c flag.
+ + With all of that out of the way, if you're ready to proceed + with setting up a new system, choose where you'd like to store + your configuration file and click Next. +
++ Where do you want to store your Stash configuration? +
+ +
+
+
+
+ Set up your paths
++ Next up, we need to determine where to find your porn collection, + where to store the stash database and generated files. These + settings can be changed later if needed. +
+Where is your porn located?
++ Add directories containing your porn videos and images. Stash will + use these directories to find videos and images during scanning. +
+Where can Stash store its database?
+
+ Stash uses an sqlite database to store your porn metadata. By
+ default, this will be created as stash-go.sqlite in
+ the directory containing your config file. If you want to change
+ this, please enter an absolute or relative (to the current working
+ directory) filename.
+
Where can Stash store its generated content?
+
+ In order to provide thumbnails, previews and sprites, Stash
+ generates images and videos. This also includes transcodes for
+ unsupported file formats. By default, Stash will create a{" "}
+ generated directory within the directory containing
+ your config file. If you want to change where this generated media
+ will be stored, please enter an absolute or relative (to the
+ current working directory) path. Stash will create this directory
+ if it does not already exist.
+
+
+
+
+ <current working directory>/config.yml;
+ }
+
+ return {configLocation};
+ }
+
+ function maybeRenderExclusions(s: GQL.StashConfig) {
+ if (!s.excludeImage && !s.excludeVideo) {
+ return;
+ }
+
+ const excludes = [];
+ if (s.excludeVideo) {
+ excludes.push("videos");
+ }
+ if (s.excludeImage) {
+ excludes.push("images");
+ }
+
+ return `(excludes ${excludes.join(" and ")})`;
+ }
+
+ function renderStashLibraries() {
+ return (
+ -
+ {stashes.map((s) => (
+
-
+
{s.path}+ {maybeRenderExclusions(s)} +
+ ))}
+
Nearly there!
++ We're almost ready to complete the configuration. Please + confirm the following settings. You can click back to change + anything incorrect. If everything looks good, click Confirm to + create your system. +
+-
+
- Configuration file location: +
- {renderConfigLocation()} +
-
+
- Stash library directories +
- {renderStashLibraries()} +
-
+
- Database file path +
-
+
+ {databaseFile !== "" + ? databaseFile + : `+/stash-go.sqlite`} +
+
-
+
- Generated directory +
-
+
+ {generatedLocation !== "" + ? generatedLocation + : `+/generated`} +
+
+
+
+
+ Oh no! Something went wrong!
++ Something went wrong while setting up your system. Here is the error + we received: +
{setupError}
+
+ + If this looks like a problem with your inputs, go ahead and click + back to fix them up. Otherwise, raise a bug on the {githubLink} + or seek help in the {discordLink}. +
+
+
+
+ Success! Your system has been created!
++ You will be taken to the Configuration page next. This page will + allow you to customize what files to include and exclude, set a + username and password to protect your system, and a whole bunch of + other options. +
+
+ When you are satisfied with these settings, you can begin scanning
+ your content into Stash by clicking on Tasks, then{" "}
+ Scan.
+
Getting help
+
+ You are encouraged to check out the in-app manual which can be
+ accessed from the icon in the top-right corner of the screen that
+ looks like this:
+ If you run into issues or have any questions or suggestions, feel + free to open an issue in the {githubLink}, or ask the community in + the {discordLink}. +
+Support us
++ Check out our{" "} + + OpenCollective + {" "} + to see how you can contribute to the continued development of Stash. +
++ We also welcome contributions in the form of code (bug fixes, + improvements and new features), testing, bug reports, improvement + and feature requests, and user support. Details can be found in the + Contribution section of the in-app manual. +
+Thanks for trying Stash!
+
+
+
+
+
+ Stash Setup Wizard
+ {loading ? ( + showLightbox(index)}
- onKeyPress={() => showLightbox(index)}
+ onClick={() => handleImageOpen(index)}
+ onKeyPress={() => handleImageOpen(index)}
>
{
const Toast = useToast();
const { data: config, error, loading } = useConfiguration();
@@ -27,6 +29,7 @@ export const SettingsInterfacePanel: React.FC = () => {
const [wallPlayback, setWallPlayback] = useState("video");
const [maximumLoopDuration, setMaximumLoopDuration] = useState(0);
const [autostartVideo, setAutostartVideo] = useState(false);
+ const [slideshowDelay, setSlideshowDelay] = useState(0);
const [showStudioAsText, setShowStudioAsText] = useState(false);
const [css, setCSS] = useState();
const [cssEnabled, setCSSEnabled] = useState(false);
@@ -43,6 +46,7 @@ export const SettingsInterfacePanel: React.FC = () => {
css,
cssEnabled,
language,
+ slideshowDelay,
});
useEffect(() => {
@@ -57,6 +61,7 @@ export const SettingsInterfacePanel: React.FC = () => {
setCSS(iCfg?.css ?? "");
setCSSEnabled(iCfg?.cssEnabled ?? false);
setLanguage(iCfg?.language ?? "en-US");
+ setSlideshowDelay(iCfg?.slideshowDelay ?? 5000);
}, [config]);
async function onSave() {
@@ -187,6 +192,23 @@ export const SettingsInterfacePanel: React.FC = () => {
+
+ ) => {
+ setSlideshowDelay(
+ Number.parseInt(e.currentTarget.value, 10) * SECONDS_TO_MS
+ );
+ }}
+ />
+
+ Slideshow is available in galleries when in wall view mode
+
+
+
void,
+ delay: number | null = 5000
+): (() => void)[] => {
+ const savedCallback = useRef<() => void>();
+ const savedIntervalId = useRef();
+ const [savedDelay, setSavedDelay] = useState(delay);
+
+ useEffect(() => {
+ savedCallback.current = callback;
+ }, [callback]);
+
+ useEffect(() => {
+ let validDelay;
+ if (delay !== null) {
+ validDelay = delay >= MIN_VALID_INTERVAL ? delay : MIN_VALID_INTERVAL;
+ } else {
+ validDelay = delay;
+ }
+
+ setSavedDelay(validDelay);
+ }, [delay]);
+
+ const cancel = () => {
+ const intervalId = savedIntervalId.current;
+ if (intervalId) {
+ savedIntervalId.current = undefined;
+ clearInterval(intervalId);
+ }
+ };
+
+ const reset = () => {
+ cancel();
+
+ const tick = () => {
+ if (savedCallback.current) savedCallback.current();
+ };
+
+ if (savedDelay !== null) {
+ savedIntervalId.current = setInterval(tick, savedDelay);
+ }
+ };
+
+ useEffect(() => {
+ cancel();
+
+ const tick = () => {
+ if (savedCallback.current) savedCallback.current();
+ };
+
+ if (savedDelay !== null) {
+ savedIntervalId.current = setInterval(tick, savedDelay);
+ return cancel;
+ }
+ }, [callback, savedDelay]);
+
+ return delay ? [cancel, reset] : [noop, noop];
+};
+
+export default useInterval;
diff --git a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
index 43e429935..0ee1a342a 100644
--- a/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
@@ -1,15 +1,30 @@
import React, { useCallback, useEffect, useRef, useState } from "react";
import * as GQL from "src/core/generated-graphql";
-import { Button } from "react-bootstrap";
+import {
+ Button,
+ Col,
+ FormControl,
+ InputGroup,
+ FormLabel,
+ OverlayTrigger,
+ Popover,
+} from "react-bootstrap";
import cx from "classnames";
import Mousetrap from "mousetrap";
-import { debounce } from "lodash";
+import debounce from "lodash/debounce";
import { Icon, LoadingIndicator } from "src/components/Shared";
+import { useInterval, usePageVisibility } from "src/hooks";
+import { useConfiguration } from "src/core/StashService";
const CLASSNAME = "Lightbox";
const CLASSNAME_HEADER = `${CLASSNAME}-header`;
+const CLASSNAME_LEFT_SPACER = `${CLASSNAME_HEADER}-left-spacer`;
const CLASSNAME_INDICATOR = `${CLASSNAME_HEADER}-indicator`;
+const CLASSNAME_DELAY = `${CLASSNAME_HEADER}-delay`;
+const CLASSNAME_DELAY_ICON = `${CLASSNAME_DELAY}-icon`;
+const CLASSNAME_DELAY_INLINE = `${CLASSNAME_DELAY}-inline`;
+const CLASSNAME_RIGHT = `${CLASSNAME_HEADER}-right`;
const CLASSNAME_DISPLAY = `${CLASSNAME}-display`;
const CLASSNAME_CAROUSEL = `${CLASSNAME}-carousel`;
const CLASSNAME_INSTANT = `${CLASSNAME_CAROUSEL}-instant`;
@@ -19,6 +34,10 @@ const CLASSNAME_NAV = `${CLASSNAME}-nav`;
const CLASSNAME_NAVIMAGE = `${CLASSNAME_NAV}-image`;
const CLASSNAME_NAVSELECTED = `${CLASSNAME_NAV}-selected`;
+const DEFAULT_SLIDESHOW_DELAY = 5000;
+const SECONDS_TO_MS = 1000;
+const MIN_VALID_INTERVAL_SECONDS = 1;
+
type Image = Pick;
interface IProps {
images: Image[];
@@ -26,6 +45,7 @@ interface IProps {
isLoading: boolean;
initialIndex?: number;
showNavigation: boolean;
+ slideshowEnabled?: boolean;
pageHeader?: string;
pageCallback?: (direction: number) => boolean;
hide: () => void;
@@ -37,6 +57,7 @@ export const LightboxComponent: React.FC = ({
isLoading,
initialIndex = 0,
showNavigation,
+ slideshowEnabled = false,
pageHeader,
pageCallback,
hide,
@@ -49,6 +70,27 @@ export const LightboxComponent: React.FC = ({
const carouselRef = useRef(null);
const indicatorRef = useRef(null);
const navRef = useRef(null);
+ const clearIntervalCallback = useRef<() => void>();
+ const resetIntervalCallback = useRef<() => void>();
+ const config = useConfiguration();
+
+ const userSelectedSlideshowDelayOrDefault =
+ config?.data?.configuration.interface.slideshowDelay ??
+ DEFAULT_SLIDESHOW_DELAY;
+
+ // slideshowInterval is used for controlling the logic
+ // displaySlideshowInterval is for display purposes only
+ // keeping them separate and independant allows us to handle the logic however we want
+ // while still displaying something that makes sense to the user
+ const [slideshowInterval, setSlideshowInterval] = useState(
+ null
+ );
+ const [
+ displayedSlideshowInterval,
+ setDisplayedSlideshowInterval,
+ ] = useState(
+ (userSelectedSlideshowDelayOrDefault / SECONDS_TO_MS).toString()
+ );
useEffect(() => {
setIsSwitchingPage(false);
@@ -59,6 +101,7 @@ export const LightboxComponent: React.FC = ({
() => setInstantTransition(false),
400
);
+
const setInstant = useCallback(() => {
setInstantTransition(true);
disableInstantTransition();
@@ -108,6 +151,28 @@ export const LightboxComponent: React.FC = ({
}
}, [initialIndex, isVisible, setIndex]);
+ const toggleSlideshow = useCallback(() => {
+ if (slideshowInterval) {
+ setSlideshowInterval(null);
+ } else if (
+ displayedSlideshowInterval !== null &&
+ typeof displayedSlideshowInterval !== "undefined"
+ ) {
+ const intervalNumber = Number.parseInt(displayedSlideshowInterval, 10);
+ setSlideshowInterval(intervalNumber * SECONDS_TO_MS);
+ } else {
+ setSlideshowInterval(userSelectedSlideshowDelayOrDefault);
+ }
+ }, [
+ slideshowInterval,
+ userSelectedSlideshowDelayOrDefault,
+ displayedSlideshowInterval,
+ ]);
+
+ usePageVisibility(() => {
+ toggleSlideshow();
+ });
+
const close = useCallback(() => {
if (!isFullscreen) {
hide();
@@ -122,37 +187,52 @@ export const LightboxComponent: React.FC = ({
if (nodeName === "DIV" || nodeName === "PICTURE") close();
};
- const handleLeft = useCallback(() => {
- if (isSwitchingPage || index.current === -1) return;
+ const handleLeft = useCallback(
+ (isUserAction = true) => {
+ if (isSwitchingPage || index.current === -1) return;
- if (index.current === 0) {
- if (pageCallback) {
- setIsSwitchingPage(true);
- setIndex(-1);
- // Check if calling page wants to swap page
- const repage = pageCallback(-1);
- if (!repage) {
- setIsSwitchingPage(false);
+ if (index.current === 0) {
+ if (pageCallback) {
+ setIsSwitchingPage(true);
+ setIndex(-1);
+ // Check if calling page wants to swap page
+ const repage = pageCallback(-1);
+ if (!repage) {
+ setIsSwitchingPage(false);
+ setIndex(0);
+ }
+ } else setIndex(images.length - 1);
+ } else setIndex((index.current ?? 0) - 1);
+
+ if (isUserAction && resetIntervalCallback.current) {
+ resetIntervalCallback.current();
+ }
+ },
+ [images, setIndex, pageCallback, isSwitchingPage, resetIntervalCallback]
+ );
+
+ const handleRight = useCallback(
+ (isUserAction = true) => {
+ if (isSwitchingPage) return;
+
+ if (index.current === images.length - 1) {
+ if (pageCallback) {
+ setIsSwitchingPage(true);
setIndex(0);
- }
- } else setIndex(images.length - 1);
- } else setIndex((index.current ?? 0) - 1);
- }, [images, setIndex, pageCallback, isSwitchingPage]);
- const handleRight = useCallback(() => {
- if (isSwitchingPage) return;
+ const repage = pageCallback?.(1);
+ if (!repage) {
+ setIsSwitchingPage(false);
+ setIndex(images.length - 1);
+ }
+ } else setIndex(0);
+ } else setIndex((index.current ?? 0) + 1);
- if (index.current === images.length - 1) {
- if (pageCallback) {
- setIsSwitchingPage(true);
- setIndex(0);
- const repage = pageCallback?.(1);
- if (!repage) {
- setIsSwitchingPage(false);
- setIndex(images.length - 1);
- }
- } else setIndex(0);
- } else setIndex((index.current ?? 0) + 1);
- }, [images, setIndex, pageCallback, isSwitchingPage]);
+ if (isUserAction && resetIntervalCallback.current) {
+ resetIntervalCallback.current();
+ }
+ },
+ [images, setIndex, pageCallback, isSwitchingPage, resetIntervalCallback]
+ );
const handleKey = useCallback(
(e: KeyboardEvent) => {
@@ -164,8 +244,12 @@ export const LightboxComponent: React.FC = ({
},
[setInstant, handleLeft, handleRight, close]
);
- const handleFullScreenChange = () =>
+ const handleFullScreenChange = () => {
+ if (clearIntervalCallback.current) {
+ clearIntervalCallback.current();
+ }
setFullscreen(document.fullscreenElement !== null);
+ };
const handleTouchStart = (ev: React.TouchEvent) => {
setInstantTransition(true);
@@ -212,6 +296,16 @@ export const LightboxComponent: React.FC = ({
el.addEventListener("touchcancel", handleCancel);
};
+ const [clearCallback, resetCallback] = useInterval(
+ () => {
+ handleRight(false);
+ },
+ slideshowEnabled ? slideshowInterval : null
+ );
+
+ resetIntervalCallback.current = resetCallback;
+ clearIntervalCallback.current = clearCallback;
+
useEffect(() => {
if (isVisible) {
document.addEventListener("keydown", handleKey);
@@ -228,6 +322,10 @@ export const LightboxComponent: React.FC = ({
else document.exitFullscreen();
}, [isFullscreen]);
+ const handleSlideshowIntervalChange = (newSlideshowInterval: number) => {
+ setSlideshowInterval(newSlideshowInterval);
+ };
+
const navItems = images.map((image, i) => (
= ({
/>
));
+ const onDelayChange = (e: React.ChangeEvent) => {
+ let numberValue = Number.parseInt(e.currentTarget.value, 10);
+ // Without this exception, the blocking of updates for invalid values is even weirder
+ if (e.currentTarget.value === "-" || e.currentTarget.value === "") {
+ setDisplayedSlideshowInterval(e.currentTarget.value);
+ return;
+ }
+
+ setDisplayedSlideshowInterval(e.currentTarget.value);
+ if (slideshowInterval !== null) {
+ numberValue =
+ numberValue >= MIN_VALID_INTERVAL_SECONDS
+ ? numberValue
+ : MIN_VALID_INTERVAL_SECONDS;
+ handleSlideshowIntervalChange(numberValue * SECONDS_TO_MS);
+ }
+ };
+
const currentIndex = index.current === null ? initialIndex : index.current;
+ const DelayForm: React.FC<{}> = () => (
+ <>
+
+ Delay (Sec)
+
+
+ Set slideshow delay
+
+
+
+
+
+ );
+
const element = isVisible ? (
Slideshow Delay
+Custom CSS
{images.length > 0 && !isLoading && !isSwitchingPage ? (
<>
+
{pageHeader}
{`${currentIndex + 1} / ${images.length}`}
- {document.fullscreenEnabled && (
+
+ {slideshowEnabled && (
+ <>
+
+
+
+
+
+
+ )}
+ {document.fullscreenEnabled && (
+
+ )}
- )}
-
+
+
+
+
+
+
{images.length > 1 && (
diff --git a/ui/v2.5/src/hooks/Lightbox/context.tsx b/ui/v2.5/src/hooks/Lightbox/context.tsx
index cff2e2e28..8a54ccf93 100644
--- a/ui/v2.5/src/hooks/Lightbox/context.tsx
+++ b/ui/v2.5/src/hooks/Lightbox/context.tsx
@@ -12,6 +12,8 @@ export interface IState {
initialIndex?: number;
pageCallback?: (direction: number) => boolean;
pageHeader?: string;
+ slideshowEnabled: boolean;
+ onClose?: () => void;
}
interface IContext {
setLightboxState: (state: Partial) => void;
@@ -26,6 +28,7 @@ const Lightbox: React.FC = ({ children }) => {
isVisible: false,
isLoading: false,
showNavigation: true,
+ slideshowEnabled: false,
});
const setPartialState = useCallback(
@@ -38,14 +41,18 @@ const Lightbox: React.FC = ({ children }) => {
[setLightboxState]
);
+ const onHide = () => {
+ setLightboxState({ ...lightboxState, isVisible: false });
+ if (lightboxState.onClose) {
+ lightboxState.onClose();
+ }
+ };
+
return (
{children}
{lightboxState.isVisible && (
- setLightboxState({ ...lightboxState, isVisible: false })}
- />
+
);
diff --git a/ui/v2.5/src/hooks/Lightbox/hooks.ts b/ui/v2.5/src/hooks/Lightbox/hooks.ts
index fa5685e17..f2863b55b 100644
--- a/ui/v2.5/src/hooks/Lightbox/hooks.ts
+++ b/ui/v2.5/src/hooks/Lightbox/hooks.ts
@@ -12,6 +12,8 @@ export const useLightbox = (state: Partial>) => {
pageCallback: state.pageCallback,
initialIndex: state.initialIndex,
pageHeader: state.pageHeader,
+ slideshowEnabled: state.slideshowEnabled,
+ onClose: state.onClose,
});
}, [
setLightboxState,
@@ -20,13 +22,16 @@ export const useLightbox = (state: Partial>) => {
state.pageCallback,
state.initialIndex,
state.pageHeader,
+ state.slideshowEnabled,
+ state.onClose,
]);
const show = useCallback(
- (index?: number) => {
+ (index?: number, slideshowEnabled = false) => {
setLightboxState({
initialIndex: index,
isVisible: true,
+ slideshowEnabled,
});
},
[setLightboxState]
diff --git a/ui/v2.5/src/hooks/Lightbox/lightbox.scss b/ui/v2.5/src/hooks/Lightbox/lightbox.scss
index 895c7bd80..fa83980d0 100644
--- a/ui/v2.5/src/hooks/Lightbox/lightbox.scss
+++ b/ui/v2.5/src/hooks/Lightbox/lightbox.scss
@@ -26,14 +26,51 @@
flex-shrink: 0;
height: 4rem;
+ &-left-spacer {
+ display: flex;
+ flex: 1;
+ justify-content: center;
+ }
+
&-indicator {
display: flex;
+ flex: 1;
flex-direction: column;
- margin-left: 49%;
margin-right: auto;
text-align: center;
}
+ &-delay {
+ display: flex;
+ flex-direction: column;
+ margin-left: 100px;
+ text-align: left;
+
+ &-icon {
+ display: inline-block;
+ }
+
+ &-inline {
+ display: none;
+ }
+
+ @media screen and (min-width: 1300px) {
+ &-icon {
+ display: none;
+ }
+
+ &-inline {
+ display: flex;
+ }
+ }
+ }
+
+ &-right {
+ display: flex;
+ flex: 1;
+ justify-content: flex-end;
+ }
+
.fa-icon {
height: 1.5rem;
opacity: 1;
diff --git a/ui/v2.5/src/hooks/PageVisibility.ts b/ui/v2.5/src/hooks/PageVisibility.ts
new file mode 100644
index 000000000..afc7c6af1
--- /dev/null
+++ b/ui/v2.5/src/hooks/PageVisibility.ts
@@ -0,0 +1,50 @@
+import { useEffect, useRef } from "react";
+
+const usePageVisibility = (visibilityChangeCallback: () => void): void => {
+ const savedVisibilityChangedCallback = useRef<() => void>();
+
+ useEffect(() => {
+ // resolve event names for different browsers
+ let hidden = "";
+ let visibilityChange = "";
+
+ if (typeof document.hidden !== "undefined") {
+ hidden = "hidden";
+ visibilityChange = "visibilitychange";
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } else if (typeof (document as any).msHidden !== "undefined") {
+ hidden = "msHidden";
+ visibilityChange = "msvisibilitychange";
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } else if (typeof (document as any).webkitHidden !== "undefined") {
+ hidden = "webkitHidden";
+ visibilityChange = "webkitvisibilitychange";
+ }
+
+ if (
+ typeof document.addEventListener === "undefined" ||
+ hidden === undefined
+ ) {
+ // this browser doesn't have support for modern event listeners or the Page Visibility API
+ return;
+ }
+
+ savedVisibilityChangedCallback.current = visibilityChangeCallback;
+
+ document.addEventListener(
+ visibilityChange,
+ savedVisibilityChangedCallback.current
+ );
+
+ return () => {
+ if (savedVisibilityChangedCallback.current) {
+ document.removeEventListener(
+ visibilityChange,
+ savedVisibilityChangedCallback.current
+ );
+ }
+ };
+ }, [visibilityChangeCallback]);
+};
+
+export default usePageVisibility;
diff --git a/ui/v2.5/src/hooks/index.ts b/ui/v2.5/src/hooks/index.ts
index 55f5ddeba..457ce6cd0 100644
--- a/ui/v2.5/src/hooks/index.ts
+++ b/ui/v2.5/src/hooks/index.ts
@@ -1,4 +1,6 @@
export { default as useToast } from "./Toast";
+export { default as useInterval } from "./Interval";
+export { default as usePageVisibility } from "./PageVisibility";
export {
useInterfaceLocalForage,
useChangelogStorage,
From 34f114faff046839daa4f684f7679d1d1cd12ec9 Mon Sep 17 00:00:00 2001
From: stashist <81412921+stashist@users.noreply.github.com>
Date: Tue, 13 Apr 2021 08:11:19 +0200
Subject: [PATCH 25/66] Simplify GH build pipeline. (#1268)
The toolchain is already bundled in the stashapp/compiler image.
Rather than introducing a second one via GH actions standardize on that
one instead.
Also
* Clear up what "Cross Compile" actually does
* Still pull stashapp/compiler separately for easier debugability.
---
.github/workflows/build.yml | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6bbaf07bb..7a90be6f4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,9 @@ on:
release:
types: [ published ]
+env:
+ COMPILER_IMAGE: stashapp/compiler:4
+
jobs:
build:
runs-on: ubuntu-20.04
@@ -17,44 +20,32 @@ jobs:
- name: Checkout
run: git fetch --prune --unshallow --tags
- - name: Set up Go
- uses: actions/setup-go@v2
- with:
- go-version: 1.13
+ - name: Pull compiler image
+ run: docker pull $COMPILER_IMAGE
- - name: Set up Node
- uses: actions/setup-node@v2
- with:
- node-version: '12'
-
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node_modules
with:
path: ui/v2.5/node_modules
- key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
- ${{ runner.os }}-build-${{ env.cache-name }}-
- ${{ runner.os }}-build-
- ${{ runner.os }}-
+ key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('ui/v2.5/yarn.lock') }}
- name: Pre-install
- run: make pre-ui
+ run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make pre-ui"
- name: Generate
- run: make generate
+ run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make generate"
+ # TODO: Replace with `make validate` once `revive` is bundled in COMPILER_IMAGE
- name: Validate
- run: make ui-validate fmt-check vet it
+ run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make ui-validate fmt-check vet it"
- name: Build UI
- run: make ui-only
+ run: docker run --rm --mount type=bind,source="$(pwd)",target=/stash,consistency=delegated -w /stash $COMPILER_IMAGE /bin/bash -c "make ui-only"
- - name: Cross Compile
- run: |
- docker pull stashapp/compiler:4
- ./scripts/cross-compile.sh
+ - name: Compile for all supported platforms
+ run: ./scripts/cross-compile.sh
- name: Generate checksums
run: |
From e6aaa196f35fd135879a4ba056188e6509341014 Mon Sep 17 00:00:00 2001
From: InfiniteTF
Date: Thu, 15 Apr 2021 02:01:44 +0200
Subject: [PATCH 26/66] Load settings panels on demand (#1302)
---
ui/v2.5/src/components/Settings/Settings.tsx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/v2.5/src/components/Settings/Settings.tsx b/ui/v2.5/src/components/Settings/Settings.tsx
index 043d073a7..7fa3e200f 100644
--- a/ui/v2.5/src/components/Settings/Settings.tsx
+++ b/ui/v2.5/src/components/Settings/Settings.tsx
@@ -66,19 +66,19 @@ export const Settings: React.FC = () => {
-
+
-
+
-
+
-
+
-
+
From ea54a6779857c95945e3814e7068bd5658c69b2b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:46:31 +1000
Subject: [PATCH 27/66] Add scene/image/gallery popover count buttons for
performer/studio/tag cards (#1293)
* Add counts to graphql schema
* Add count resolvers and query refactor
* Add count popover buttons
---
graphql/documents/data/performer.graphql | 2 +
graphql/documents/data/studio.graphql | 6 ++
graphql/documents/data/tag.graphql | 2 +
graphql/schema/types/performer.graphql | 2 +
graphql/schema/types/studio.graphql | 2 +
graphql/schema/types/tag.graphql | 2 +
pkg/api/resolver_model_performer.go | 26 +++++++
pkg/api/resolver_model_studio.go | 26 +++++++
pkg/api/resolver_model_tag.go | 26 +++++++
pkg/gallery/query.go | 40 +++++++++++
pkg/image/query.go | 40 +++++++++++
pkg/models/gallery.go | 1 +
pkg/models/image.go | 1 +
pkg/models/mocks/GalleryReaderWriter.go | 21 ++++++
pkg/models/mocks/ImageReaderWriter.go | 21 ++++++
pkg/models/mocks/SceneReaderWriter.go | 70 ++++++-------------
pkg/sqlite/gallery.go | 15 +++-
pkg/sqlite/image.go | 15 +++-
pkg/sqlite/image_test.go | 6 ++
pkg/sqlite/query.go | 13 ++++
pkg/sqlite/repository.go | 8 ++-
.../src/components/Changelog/versions/v070.md | 1 +
.../components/Performers/PerformerCard.tsx | 45 ++++++++++--
.../components/Shared/PopoverCountButton.tsx | 64 +++++++++++++++++
ui/v2.5/src/components/Studios/StudioCard.tsx | 64 ++++++++++++++---
ui/v2.5/src/components/Tags/TagCard.tsx | 38 ++++++++--
ui/v2.5/src/utils/navigation.ts | 52 ++++++++++++++
27 files changed, 536 insertions(+), 73 deletions(-)
create mode 100644 pkg/gallery/query.go
create mode 100644 pkg/image/query.go
create mode 100644 ui/v2.5/src/components/Shared/PopoverCountButton.tsx
diff --git a/graphql/documents/data/performer.graphql b/graphql/documents/data/performer.graphql
index 253412b8a..2048da256 100644
--- a/graphql/documents/data/performer.graphql
+++ b/graphql/documents/data/performer.graphql
@@ -20,6 +20,8 @@ fragment PerformerData on Performer {
favorite
image_path
scene_count
+ image_count
+ gallery_count
tags {
...TagData
diff --git a/graphql/documents/data/studio.graphql b/graphql/documents/data/studio.graphql
index d2f60a44b..2c6c8d0a3 100644
--- a/graphql/documents/data/studio.graphql
+++ b/graphql/documents/data/studio.graphql
@@ -10,6 +10,8 @@ fragment StudioData on Studio {
url
image_path
scene_count
+ image_count
+ gallery_count
}
child_studios {
id
@@ -18,9 +20,13 @@ fragment StudioData on Studio {
url
image_path
scene_count
+ image_count
+ gallery_count
}
image_path
scene_count
+ image_count
+ gallery_count
stash_ids {
stash_id
endpoint
diff --git a/graphql/documents/data/tag.graphql b/graphql/documents/data/tag.graphql
index 3a0e84e1c..17d65b908 100644
--- a/graphql/documents/data/tag.graphql
+++ b/graphql/documents/data/tag.graphql
@@ -4,5 +4,7 @@ fragment TagData on Tag {
image_path
scene_count
scene_marker_count
+ image_count
+ gallery_count
performer_count
}
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index e9ea68519..1c6d642e0 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -31,6 +31,8 @@ type Performer {
image_path: String # Resolver
scene_count: Int # Resolver
+ image_count: Int # Resolver
+ gallery_count: Int # Resolver
scenes: [Scene!]!
stash_ids: [StashID!]!
}
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 8eca28659..1adb0aa63 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -8,6 +8,8 @@ type Studio {
image_path: String # Resolver
scene_count: Int # Resolver
+ image_count: Int # Resolver
+ gallery_count: Int # Resolver
stash_ids: [StashID!]!
}
diff --git a/graphql/schema/types/tag.graphql b/graphql/schema/types/tag.graphql
index 2f1f0d0d5..1b855fd36 100644
--- a/graphql/schema/types/tag.graphql
+++ b/graphql/schema/types/tag.graphql
@@ -5,6 +5,8 @@ type Tag {
image_path: String # Resolver
scene_count: Int # Resolver
scene_marker_count: Int # Resolver
+ image_count: Int # Resolver
+ gallery_count: Int # Resolver
performer_count: Int
}
diff --git a/pkg/api/resolver_model_performer.go b/pkg/api/resolver_model_performer.go
index cef67c22a..ab3d2363f 100644
--- a/pkg/api/resolver_model_performer.go
+++ b/pkg/api/resolver_model_performer.go
@@ -4,6 +4,8 @@ import (
"context"
"github.com/stashapp/stash/pkg/api/urlbuilders"
+ "github.com/stashapp/stash/pkg/gallery"
+ "github.com/stashapp/stash/pkg/image"
"github.com/stashapp/stash/pkg/models"
)
@@ -161,6 +163,30 @@ func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performe
return &res, nil
}
+func (r *performerResolver) ImageCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = image.CountByPerformerID(repo.Image(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
+func (r *performerResolver) GalleryCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = gallery.CountByPerformerID(repo.Gallery(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
func (r *performerResolver) Scenes(ctx context.Context, obj *models.Performer) (ret []*models.Scene, err error) {
if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
ret, err = repo.Scene().FindByPerformerID(obj.ID)
diff --git a/pkg/api/resolver_model_studio.go b/pkg/api/resolver_model_studio.go
index 1f866b004..553c8cc5c 100644
--- a/pkg/api/resolver_model_studio.go
+++ b/pkg/api/resolver_model_studio.go
@@ -4,6 +4,8 @@ import (
"context"
"github.com/stashapp/stash/pkg/api/urlbuilders"
+ "github.com/stashapp/stash/pkg/gallery"
+ "github.com/stashapp/stash/pkg/image"
"github.com/stashapp/stash/pkg/models"
)
@@ -54,6 +56,30 @@ func (r *studioResolver) SceneCount(ctx context.Context, obj *models.Studio) (re
return &res, err
}
+func (r *studioResolver) ImageCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = image.CountByStudioID(repo.Image(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
+func (r *studioResolver) GalleryCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = gallery.CountByStudioID(repo.Gallery(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (ret *models.Studio, err error) {
if !obj.ParentID.Valid {
return nil, nil
diff --git a/pkg/api/resolver_model_tag.go b/pkg/api/resolver_model_tag.go
index 1cbb3acf3..a4fb2cc4e 100644
--- a/pkg/api/resolver_model_tag.go
+++ b/pkg/api/resolver_model_tag.go
@@ -4,6 +4,8 @@ import (
"context"
"github.com/stashapp/stash/pkg/api/urlbuilders"
+ "github.com/stashapp/stash/pkg/gallery"
+ "github.com/stashapp/stash/pkg/image"
"github.com/stashapp/stash/pkg/models"
)
@@ -31,6 +33,30 @@ func (r *tagResolver) SceneMarkerCount(ctx context.Context, obj *models.Tag) (re
return &count, err
}
+func (r *tagResolver) ImageCount(ctx context.Context, obj *models.Tag) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = image.CountByTagID(repo.Image(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
+func (r *tagResolver) GalleryCount(ctx context.Context, obj *models.Tag) (ret *int, err error) {
+ var res int
+ if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+ res, err = gallery.CountByTagID(repo.Gallery(), obj.ID)
+ return err
+ }); err != nil {
+ return nil, err
+ }
+
+ return &res, nil
+}
+
func (r *tagResolver) PerformerCount(ctx context.Context, obj *models.Tag) (ret *int, err error) {
var count int
if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
diff --git a/pkg/gallery/query.go b/pkg/gallery/query.go
new file mode 100644
index 000000000..6cae24321
--- /dev/null
+++ b/pkg/gallery/query.go
@@ -0,0 +1,40 @@
+package gallery
+
+import (
+ "strconv"
+
+ "github.com/stashapp/stash/pkg/models"
+)
+
+func CountByPerformerID(r models.GalleryReader, id int) (int, error) {
+ filter := &models.GalleryFilterType{
+ Performers: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
+
+func CountByStudioID(r models.GalleryReader, id int) (int, error) {
+ filter := &models.GalleryFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
+
+func CountByTagID(r models.GalleryReader, id int) (int, error) {
+ filter := &models.GalleryFilterType{
+ Tags: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
diff --git a/pkg/image/query.go b/pkg/image/query.go
new file mode 100644
index 000000000..58e276632
--- /dev/null
+++ b/pkg/image/query.go
@@ -0,0 +1,40 @@
+package image
+
+import (
+ "strconv"
+
+ "github.com/stashapp/stash/pkg/models"
+)
+
+func CountByPerformerID(r models.ImageReader, id int) (int, error) {
+ filter := &models.ImageFilterType{
+ Performers: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
+
+func CountByStudioID(r models.ImageReader, id int) (int, error) {
+ filter := &models.ImageFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
+
+func CountByTagID(r models.ImageReader, id int) (int, error) {
+ filter := &models.ImageFilterType{
+ Tags: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(id)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }
+
+ return r.QueryCount(filter, nil)
+}
diff --git a/pkg/models/gallery.go b/pkg/models/gallery.go
index 71f19a666..75fcfc896 100644
--- a/pkg/models/gallery.go
+++ b/pkg/models/gallery.go
@@ -11,6 +11,7 @@ type GalleryReader interface {
Count() (int, error)
All() ([]*Gallery, error)
Query(galleryFilter *GalleryFilterType, findFilter *FindFilterType) ([]*Gallery, int, error)
+ QueryCount(galleryFilter *GalleryFilterType, findFilter *FindFilterType) (int, error)
GetPerformerIDs(galleryID int) ([]int, error)
GetTagIDs(galleryID int) ([]int, error)
GetSceneIDs(galleryID int) ([]int, error)
diff --git a/pkg/models/image.go b/pkg/models/image.go
index d160aeba5..c3f3c5b2e 100644
--- a/pkg/models/image.go
+++ b/pkg/models/image.go
@@ -17,6 +17,7 @@ type ImageReader interface {
// CountByTagID(tagID int) (int, error)
All() ([]*Image, error)
Query(imageFilter *ImageFilterType, findFilter *FindFilterType) ([]*Image, int, error)
+ QueryCount(imageFilter *ImageFilterType, findFilter *FindFilterType) (int, error)
GetGalleryIDs(imageID int) ([]int, error)
GetTagIDs(imageID int) ([]int, error)
GetPerformerIDs(imageID int) ([]int, error)
diff --git a/pkg/models/mocks/GalleryReaderWriter.go b/pkg/models/mocks/GalleryReaderWriter.go
index 3585c3036..8bbd2e78b 100644
--- a/pkg/models/mocks/GalleryReaderWriter.go
+++ b/pkg/models/mocks/GalleryReaderWriter.go
@@ -376,6 +376,27 @@ func (_m *GalleryReaderWriter) Query(galleryFilter *models.GalleryFilterType, fi
return r0, r1, r2
}
+// QueryCount provides a mock function with given fields: galleryFilter, findFilter
+func (_m *GalleryReaderWriter) QueryCount(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) (int, error) {
+ ret := _m.Called(galleryFilter, findFilter)
+
+ var r0 int
+ if rf, ok := ret.Get(0).(func(*models.GalleryFilterType, *models.FindFilterType) int); ok {
+ r0 = rf(galleryFilter, findFilter)
+ } else {
+ r0 = ret.Get(0).(int)
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(*models.GalleryFilterType, *models.FindFilterType) error); ok {
+ r1 = rf(galleryFilter, findFilter)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// Update provides a mock function with given fields: updatedGallery
func (_m *GalleryReaderWriter) Update(updatedGallery models.Gallery) (*models.Gallery, error) {
ret := _m.Called(updatedGallery)
diff --git a/pkg/models/mocks/ImageReaderWriter.go b/pkg/models/mocks/ImageReaderWriter.go
index b00cacfc9..a8a8c4b4a 100644
--- a/pkg/models/mocks/ImageReaderWriter.go
+++ b/pkg/models/mocks/ImageReaderWriter.go
@@ -370,6 +370,27 @@ func (_m *ImageReaderWriter) Query(imageFilter *models.ImageFilterType, findFilt
return r0, r1, r2
}
+// QueryCount provides a mock function with given fields: imageFilter, findFilter
+func (_m *ImageReaderWriter) QueryCount(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) (int, error) {
+ ret := _m.Called(imageFilter, findFilter)
+
+ var r0 int
+ if rf, ok := ret.Get(0).(func(*models.ImageFilterType, *models.FindFilterType) int); ok {
+ r0 = rf(imageFilter, findFilter)
+ } else {
+ r0 = ret.Get(0).(int)
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(*models.ImageFilterType, *models.FindFilterType) error); ok {
+ r1 = rf(imageFilter, findFilter)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// ResetOCounter provides a mock function with given fields: id
func (_m *ImageReaderWriter) ResetOCounter(id int) (int, error) {
ret := _m.Called(id)
diff --git a/pkg/models/mocks/SceneReaderWriter.go b/pkg/models/mocks/SceneReaderWriter.go
index b5c3af191..796c23878 100644
--- a/pkg/models/mocks/SceneReaderWriter.go
+++ b/pkg/models/mocks/SceneReaderWriter.go
@@ -415,6 +415,29 @@ func (_m *SceneReaderWriter) FindByPerformerID(performerID int) ([]*models.Scene
return r0, r1
}
+// FindDuplicates provides a mock function with given fields: distance
+func (_m *SceneReaderWriter) FindDuplicates(distance int) ([][]*models.Scene, error) {
+ ret := _m.Called(distance)
+
+ var r0 [][]*models.Scene
+ if rf, ok := ret.Get(0).(func(int) [][]*models.Scene); ok {
+ r0 = rf(distance)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([][]*models.Scene)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func(int) error); ok {
+ r1 = rf(distance)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// FindMany provides a mock function with given fields: ids
func (_m *SceneReaderWriter) FindMany(ids []int) ([]*models.Scene, error) {
ret := _m.Called(ids)
@@ -438,30 +461,6 @@ func (_m *SceneReaderWriter) FindMany(ids []int) ([]*models.Scene, error) {
return r0, r1
}
-// FindDuplicates provides a mock function with given fields: distance
-func (_m *SceneReaderWriter) FindDuplicates(distance int) ([][]*models.Scene, error) {
- ret := _m.Called(distance)
-
- var r0 [][]*models.Scene
- if rf, ok := ret.Get(0).(func(int) [][]*models.Scene); ok {
- r0 = rf(distance)
-
- } else {
- if ret.Get(0) != nil {
- r0 = ret.Get(0).([][]*models.Scene)
- }
- }
-
- var r1 error
- if rf, ok := ret.Get(1).(func(int) error); ok {
- r1 = rf(distance)
- } else {
- r1 = ret.Error(1)
- }
-
- return r0, r1
-}
-
// GetCover provides a mock function with given fields: sceneID
func (_m *SceneReaderWriter) GetCover(sceneID int) ([]byte, error) {
ret := _m.Called(sceneID)
@@ -651,29 +650,6 @@ func (_m *SceneReaderWriter) Query(sceneFilter *models.SceneFilterType, findFilt
return r0, r1, r2
}
-// QueryForAutoTag provides a mock function with given fields: regex, pathPrefixes
-func (_m *SceneReaderWriter) QueryForAutoTag(regex string, pathPrefixes []string) ([]*models.Scene, error) {
- ret := _m.Called(regex, pathPrefixes)
-
- var r0 []*models.Scene
- if rf, ok := ret.Get(0).(func(string, []string) []*models.Scene); ok {
- r0 = rf(regex, pathPrefixes)
- } else {
- if ret.Get(0) != nil {
- r0 = ret.Get(0).([]*models.Scene)
- }
- }
-
- var r1 error
- if rf, ok := ret.Get(1).(func(string, []string) error); ok {
- r1 = rf(regex, pathPrefixes)
- } else {
- r1 = ret.Error(1)
- }
-
- return r0, r1
-}
-
// ResetOCounter provides a mock function with given fields: id
func (_m *SceneReaderWriter) ResetOCounter(id int) (int, error) {
ret := _m.Called(id)
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 2fb59bcc0..d2e475ffe 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -159,7 +159,7 @@ func (qb *galleryQueryBuilder) All() ([]*models.Gallery, error) {
return qb.queryGalleries(selectAll("galleries")+qb.getGallerySort(nil), nil)
}
-func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) ([]*models.Gallery, int, error) {
+func (qb *galleryQueryBuilder) makeQuery(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) queryBuilder {
if galleryFilter == nil {
galleryFilter = &models.GalleryFilterType{}
}
@@ -283,6 +283,13 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi
handleGalleryPerformerTagsCriterion(&query, galleryFilter.PerformerTags)
query.sortAndPagination = qb.getGallerySort(findFilter) + getPagination(findFilter)
+
+ return query
+}
+
+func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) ([]*models.Gallery, int, error) {
+ query := qb.makeQuery(galleryFilter, findFilter)
+
idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
@@ -301,6 +308,12 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi
return galleries, countResult, nil
}
+func (qb *galleryQueryBuilder) QueryCount(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) (int, error) {
+ query := qb.makeQuery(galleryFilter, findFilter)
+
+ return query.executeCount()
+}
+
func (qb *galleryQueryBuilder) handleAverageResolutionFilter(query *queryBuilder, resolutionFilter *models.ResolutionEnum) {
if resolutionFilter == nil {
return
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index bf7815bb5..261fedd95 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -216,7 +216,7 @@ func (qb *imageQueryBuilder) All() ([]*models.Image, error) {
return qb.queryImages(selectAll(imageTable)+qb.getImageSort(nil), nil)
}
-func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
+func (qb *imageQueryBuilder) makeQuery(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) queryBuilder {
if imageFilter == nil {
imageFilter = &models.ImageFilterType{}
}
@@ -383,6 +383,13 @@ func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilt
handleImagePerformerTagsCriterion(&query, imageFilter.PerformerTags)
query.sortAndPagination = qb.getImageSort(findFilter) + getPagination(findFilter)
+
+ return query
+}
+
+func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
+ query := qb.makeQuery(imageFilter, findFilter)
+
idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
@@ -401,6 +408,12 @@ func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilt
return images, countResult, nil
}
+func (qb *imageQueryBuilder) QueryCount(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) (int, error) {
+ query := qb.makeQuery(imageFilter, findFilter)
+
+ return query.executeCount()
+}
+
func handleImagePerformerTagsCriterion(query *queryBuilder, performerTagsFilter *models.MultiCriterionInput) {
if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
for _, tagID := range performerTagsFilter.Value {
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index 153162420..d7260e477 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -95,6 +95,12 @@ func imageQueryQ(t *testing.T, sqb models.ImageReader, q string, expectedImageId
image := images[0]
assert.Equal(t, imageIDs[expectedImageIdx], image.ID)
+ count, err := sqb.QueryCount(nil, &filter)
+ if err != nil {
+ t.Errorf("Error querying image: %s", err.Error())
+ }
+ assert.Equal(t, len(images), count)
+
// no Q should return all results
filter.Q = nil
images, _, err = sqb.Query(nil, &filter)
diff --git a/pkg/sqlite/query.go b/pkg/sqlite/query.go
index cf4cf0b5f..4c549cdf1 100644
--- a/pkg/sqlite/query.go
+++ b/pkg/sqlite/query.go
@@ -33,6 +33,19 @@ func (qb queryBuilder) executeFind() ([]int, int, error) {
return qb.repository.executeFindQuery(body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses)
}
+func (qb queryBuilder) executeCount() (int, error) {
+ if qb.err != nil {
+ return 0, qb.err
+ }
+
+ body := qb.body
+ body += qb.joins.toSQL()
+
+ body = qb.repository.buildQueryBody(body, qb.whereClauses, qb.havingClauses)
+ countQuery := qb.repository.buildCountQuery(body)
+ return qb.repository.runCountQuery(countQuery, qb.args)
+}
+
func (qb *queryBuilder) addWhere(clauses ...string) {
for _, clause := range clauses {
if len(clause) > 0 {
diff --git a/pkg/sqlite/repository.go b/pkg/sqlite/repository.go
index 681e68376..568d9c30b 100644
--- a/pkg/sqlite/repository.go
+++ b/pkg/sqlite/repository.go
@@ -234,7 +234,7 @@ func (r *repository) querySimple(query string, args []interface{}, out interface
return nil
}
-func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPagination string, whereClauses []string, havingClauses []string) ([]int, int, error) {
+func (r *repository) buildQueryBody(body string, whereClauses []string, havingClauses []string) string {
if len(whereClauses) > 0 {
body = body + " WHERE " + strings.Join(whereClauses, " AND ") // TODO handle AND or OR
}
@@ -243,6 +243,12 @@ func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPa
body = body + " HAVING " + strings.Join(havingClauses, " AND ") // TODO handle AND or OR
}
+ return body
+}
+
+func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPagination string, whereClauses []string, havingClauses []string) ([]int, int, error) {
+ body = r.buildQueryBody(body, whereClauses, havingClauses)
+
countQuery := r.buildCountQuery(body)
idsQuery := body + sortAndPagination
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index acce2e74c..680e64e81 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Add popover buttons for scenes/images/galleries on performer/studio/tag cards.
* Add slideshow to image wall view.
* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
* Revamped setup wizard and migration UI.
diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index cff36a880..4abf9bcf4 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -12,6 +12,7 @@ import {
TruncatedText,
} from "src/components/Shared";
import { Button, ButtonGroup } from "react-bootstrap";
+import { PopoverCountButton } from "../Shared/PopoverCountButton";
interface IPerformerCardProps {
performer: GQL.PerformerDataFragment;
@@ -46,12 +47,35 @@ export const PerformerCard: React.FC = ({
if (!performer.scene_count) return;
return (
-
-
-
+ = ({
}
function maybeRenderPopoverButtonGroup() {
- if (performer.scene_count || performer.tags.length > 0) {
+ if (
+ performer.scene_count ||
+ performer.image_count ||
+ performer.gallery_count ||
+ performer.tags.length > 0
+ ) {
return (
<>
{maybeRenderScenesPopoverButton()}
+ {maybeRenderImagesPopoverButton()}
+ {maybeRenderGalleriesPopoverButton()}
{maybeRenderTagPopoverButton()}
diff --git a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
new file mode 100644
index 000000000..6031e23fe
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
@@ -0,0 +1,64 @@
+import React from "react";
+import { Button } from "react-bootstrap";
+import { useIntl } from "react-intl";
+import { Link } from "react-router-dom";
+import Icon from "./Icon";
+
+type PopoverLinkType = "scene" | "image" | "gallery";
+
+interface IProps {
+ url: string;
+ type: PopoverLinkType;
+ count: number;
+}
+
+export const PopoverCountButton: React.FC = ({ url, type, count }) => {
+ const intl = useIntl();
+
+ function getIcon() {
+ switch (type) {
+ case "scene":
+ return "play-circle";
+ case "image":
+ return "image";
+ case "gallery":
+ return "images";
+ }
+ }
+
+ function getPluralOptions() {
+ switch (type) {
+ case "scene":
+ return {
+ one: "scene",
+ other: "scenes",
+ };
+ case "image":
+ return {
+ one: "image",
+ other: "images",
+ };
+ case "gallery":
+ return {
+ one: "gallery",
+ other: "galleries",
+ };
+ }
+ }
+
+ function getTitle() {
+ const pluralCategory = intl.formatPlural(count);
+ const options = getPluralOptions();
+ const plural = options[pluralCategory as "one"] || options.other;
+ return `${count} ${plural}`;
+ }
+
+ return (
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Studios/StudioCard.tsx b/ui/v2.5/src/components/Studios/StudioCard.tsx
index 5e8db8fa9..da6cb03ee 100644
--- a/ui/v2.5/src/components/Studios/StudioCard.tsx
+++ b/ui/v2.5/src/components/Studios/StudioCard.tsx
@@ -1,9 +1,10 @@
import React from "react";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
-import { FormattedPlural } from "react-intl";
import { NavUtils } from "src/utils";
import { BasicCard, TruncatedText } from "src/components/Shared";
+import { ButtonGroup } from "react-bootstrap";
+import { PopoverCountButton } from "../Shared/PopoverCountButton";
interface IProps {
studio: GQL.StudioDataFragment;
@@ -51,6 +52,57 @@ export const StudioCard: React.FC = ({
selected,
onSelectedChanged,
}) => {
+ function maybeRenderScenesPopoverButton() {
+ if (!studio.scene_count) return;
+
+ return (
+
+
+ {maybeRenderScenesPopoverButton()}
+ {maybeRenderImagesPopoverButton()}
+ {maybeRenderGalleriesPopoverButton()}
+
+
+ );
+ }
+ }
+
return (
= ({
-
- {studio.scene_count}
- = ({
if (!tag.scene_count) return;
return (
-
-
-
+ = ({
);
}
+ function maybeRenderImagesPopoverButton() {
+ if (!tag.image_count) return;
+
+ return (
+ = ({
{maybeRenderScenesPopoverButton()}
+ {maybeRenderImagesPopoverButton()}
+ {maybeRenderGalleriesPopoverButton()}
{maybeRenderSceneMarkersPopoverButton()}
{maybeRenderPerformersPopoverButton()}
diff --git a/ui/v2.5/src/utils/navigation.ts b/ui/v2.5/src/utils/navigation.ts
index a85e54be7..31f420987 100644
--- a/ui/v2.5/src/utils/navigation.ts
+++ b/ui/v2.5/src/utils/navigation.ts
@@ -23,6 +23,32 @@ const makePerformerScenesUrl = (
return `/scenes?${filter.makeQueryParameters()}`;
};
+const makePerformerImagesUrl = (
+ performer: Partial
+) => {
+ if (!performer.id) return "#";
+ const filter = new ListFilterModel(FilterMode.Images);
+ const criterion = new PerformersCriterion();
+ criterion.value = [
+ { id: performer.id, label: performer.name || `Performer ${performer.id}` },
+ ];
+ filter.criteria.push(criterion);
+ return `/images?${filter.makeQueryParameters()}`;
+};
+
+const makePerformerGalleriesUrl = (
+ performer: Partial
+) => {
+ if (!performer.id) return "#";
+ const filter = new ListFilterModel(FilterMode.Galleries);
+ const criterion = new PerformersCriterion();
+ criterion.value = [
+ { id: performer.id, label: performer.name || `Performer ${performer.id}` },
+ ];
+ filter.criteria.push(criterion);
+ return `/galleries?${filter.makeQueryParameters()}`;
+};
+
const makePerformersCountryUrl = (
performer: Partial
) => {
@@ -45,6 +71,28 @@ const makeStudioScenesUrl = (studio: Partial) => {
return `/scenes?${filter.makeQueryParameters()}`;
};
+const makeStudioImagesUrl = (studio: Partial) => {
+ if (!studio.id) return "#";
+ const filter = new ListFilterModel(FilterMode.Images);
+ const criterion = new StudiosCriterion();
+ criterion.value = [
+ { id: studio.id, label: studio.name || `Studio ${studio.id}` },
+ ];
+ filter.criteria.push(criterion);
+ return `/images?${filter.makeQueryParameters()}`;
+};
+
+const makeStudioGalleriesUrl = (studio: Partial) => {
+ if (!studio.id) return "#";
+ const filter = new ListFilterModel(FilterMode.Galleries);
+ const criterion = new StudiosCriterion();
+ criterion.value = [
+ { id: studio.id, label: studio.name || `Studio ${studio.id}` },
+ ];
+ filter.criteria.push(criterion);
+ return `/galleries?${filter.makeQueryParameters()}`;
+};
+
const makeChildStudiosUrl = (studio: Partial) => {
if (!studio.id) return "#";
const filter = new ListFilterModel(FilterMode.Studios);
@@ -121,8 +169,12 @@ const makeSceneMarkerUrl = (
export default {
makePerformerScenesUrl,
+ makePerformerImagesUrl,
+ makePerformerGalleriesUrl,
makePerformersCountryUrl,
makeStudioScenesUrl,
+ makeStudioImagesUrl,
+ makeStudioGalleriesUrl,
makeTagSceneMarkersUrl,
makeTagScenesUrl,
makeTagPerformersUrl,
From e59018acfb92d5a4107579864a9326014daa40a3 Mon Sep 17 00:00:00 2001
From: InfiniteTF
Date: Thu, 15 Apr 2021 03:01:31 +0200
Subject: [PATCH 28/66] Skip validation of existing paths when adding new paths
(#1301)
---
pkg/api/resolver_mutation_configure.go | 17 ++++++++++++++---
.../src/components/Changelog/versions/v070.md | 1 +
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pkg/api/resolver_mutation_configure.go b/pkg/api/resolver_mutation_configure.go
index b3734dfc7..ea4ae082c 100644
--- a/pkg/api/resolver_mutation_configure.go
+++ b/pkg/api/resolver_mutation_configure.go
@@ -25,11 +25,22 @@ func (r *mutationResolver) Migrate(ctx context.Context, input models.MigrateInpu
func (r *mutationResolver) ConfigureGeneral(ctx context.Context, input models.ConfigGeneralInput) (*models.ConfigGeneralResult, error) {
c := config.GetInstance()
+ existingPaths := c.GetStashPaths()
if len(input.Stashes) > 0 {
for _, s := range input.Stashes {
- exists, err := utils.DirExists(s.Path)
- if !exists {
- return makeConfigGeneralResult(), err
+ // Only validate existence of new paths
+ isNew := true
+ for _, path := range existingPaths {
+ if path.Path == s.Path {
+ isNew = false
+ break
+ }
+ }
+ if isNew {
+ exists, err := utils.DirExists(s.Path)
+ if !exists {
+ return makeConfigGeneralResult(), err
+ }
}
}
c.Set(config.Stash, input.Stashes)
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 680e64e81..132a6f8ac 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -19,6 +19,7 @@
* Change performer text query to search by name and alias only.
### 🐛 Bug fixes
+* Fix error preventing adding a new library path when an existing library path is missing.
* Fix whitespace in query string returning all objects.
* Fix hang on Login page when not connected to internet.
* Fix `Clear Image` button not updating image preview.
From 0b40017b098a931a79f9c81b882cfe8747b43389 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 15 Apr 2021 11:33:20 +1000
Subject: [PATCH 29/66] Sort performers in popover and card views (#1294)
---
graphql/documents/data/image-slim.graphql | 1 +
graphql/documents/data/scene-slim.graphql | 1 +
.../src/components/Changelog/versions/v070.md | 1 +
.../src/components/Galleries/GalleryCard.tsx | 26 +-----------
.../GalleryDetails/GalleryDetailPanel.tsx | 4 +-
ui/v2.5/src/components/Images/ImageCard.tsx | 26 +-----------
.../Images/ImageDetails/ImageDetailPanel.tsx | 4 +-
ui/v2.5/src/components/Scenes/SceneCard.tsx | 26 +-----------
.../Scenes/SceneDetails/SceneDetailPanel.tsx | 4 +-
.../Shared/PerformerPopoverButton.tsx | 40 +++++++++++++++++++
ui/v2.5/src/core/performers.ts | 35 ++++++++++++++++
11 files changed, 93 insertions(+), 75 deletions(-)
create mode 100644 ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
diff --git a/graphql/documents/data/image-slim.graphql b/graphql/documents/data/image-slim.graphql
index ce80786ee..b1c066ee2 100644
--- a/graphql/documents/data/image-slim.graphql
+++ b/graphql/documents/data/image-slim.graphql
@@ -38,6 +38,7 @@ fragment SlimImageData on Image {
performers {
id
name
+ gender
favorite
image_path
}
diff --git a/graphql/documents/data/scene-slim.graphql b/graphql/documents/data/scene-slim.graphql
index f427eb904..4aacf27e4 100644
--- a/graphql/documents/data/scene-slim.graphql
+++ b/graphql/documents/data/scene-slim.graphql
@@ -68,6 +68,7 @@ fragment SlimSceneData on Scene {
performers {
id
name
+ gender
favorite
image_path
}
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 132a6f8ac..6a76e8fb4 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Sort performers by gender in scene/image/gallery cards and details.
* Add popover buttons for scenes/images/galleries on performer/studio/tag cards.
* Add slideshow to image wall view.
* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
diff --git a/ui/v2.5/src/components/Galleries/GalleryCard.tsx b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
index 7bfb14398..6bbb4a952 100644
--- a/ui/v2.5/src/components/Galleries/GalleryCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
@@ -12,6 +12,7 @@ import {
TruncatedText,
} from "src/components/Shared";
import { TextUtils } from "src/utils";
+import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
interface IProps {
gallery: GQL.GallerySlimDataFragment;
@@ -63,30 +64,7 @@ export const GalleryCard: React.FC = (props) => {
function maybeRenderPerformerPopoverButton() {
if (props.gallery.performers.length <= 0) return;
- const popoverContent = props.gallery.performers.map((performer) => (
-
-
-
- );
+ return ;
@@ -38,7 +39,8 @@ export const GalleryDetailPanel: React.FC = (props) => {
function renderPerformers() {
if (!props.gallery.performers || props.gallery.performers.length === 0)
return;
- const cards = props.gallery.performers.map((performer) => (
+ const performers = sortPerformers(props.gallery.performers);
+ const cards = performers.map((performer) => (
= (
function maybeRenderPerformerPopoverButton() {
if (props.image.performers.length <= 0) return;
- const popoverContent = props.image.performers.map((performer) => (
-
-
-
- );
+ return = (props) => {
function renderPerformers() {
if (props.image.performers.length === 0) return;
- const cards = props.image.performers.map((performer) => (
+ const performers = sortPerformers(props.image.performers);
+ const cards = performers.map((performer) => (
= (
function maybeRenderPerformerPopoverButton() {
if (props.scene.performers.length <= 0) return;
- const popoverContent = props.scene.performers.map((performer) => (
-
-
-
- );
+ return = (props) => {
function renderPerformers() {
if (props.scene.performers.length === 0) return;
- const cards = props.scene.performers.map((performer) => (
+ const performers = sortPerformers(props.scene.performers);
+ const cards = performers.map((performer) => (
[];
+}
+
+export const PerformerPopoverButton: React.FC = ({ performers }) => {
+ const sorted = sortPerformers(performers);
+ const popoverContent = sorted.map((performer) => (
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/core/performers.ts b/ui/v2.5/src/core/performers.ts
index e7552b447..ecada4495 100644
--- a/ui/v2.5/src/core/performers.ts
+++ b/ui/v2.5/src/core/performers.ts
@@ -37,3 +37,38 @@ export const performerFilterHook = (
return filter;
};
};
+
+interface IPerformerFragment {
+ name?: GQL.Maybe;
+ gender?: GQL.Maybe;
+}
+
+export function sortPerformers(performers: T[]) {
+ const ret = performers.slice();
+ ret.sort((a, b) => {
+ if (a.gender === b.gender) {
+ // sort by name
+ return (a.name ?? "").localeCompare(b.name ?? "");
+ }
+
+ // TODO - may want to customise gender order
+ const genderOrder = [
+ GQL.GenderEnum.Female,
+ GQL.GenderEnum.TransgenderFemale,
+ GQL.GenderEnum.Male,
+ GQL.GenderEnum.TransgenderMale,
+ GQL.GenderEnum.Intersex,
+ GQL.GenderEnum.NonBinary,
+ ];
+
+ const aIndex = a.gender
+ ? genderOrder.indexOf(a.gender)
+ : genderOrder.length;
+ const bIndex = b.gender
+ ? genderOrder.indexOf(b.gender)
+ : genderOrder.length;
+ return aIndex - bIndex;
+ });
+
+ return ret;
+}
From cd6b6b74eb48f7f79451b7f61637ee942aab2158 Mon Sep 17 00:00:00 2001
From: bnkai <48220860+bnkai@users.noreply.github.com>
Date: Fri, 16 Apr 2021 08:42:56 +0300
Subject: [PATCH 30/66] Add http headers support to scraper (#1273)
---
pkg/scraper/config.go | 6 ++
pkg/scraper/url.go | 27 +++++++-
.../src/components/Changelog/versions/v070.md | 1 +
ui/v2.5/src/docs/en/Scraping.md | 61 ++++++++++++++++---
4 files changed, 84 insertions(+), 11 deletions(-)
diff --git a/pkg/scraper/config.go b/pkg/scraper/config.go
index 7d5d49ebf..4eeb97af3 100644
--- a/pkg/scraper/config.go
+++ b/pkg/scraper/config.go
@@ -175,11 +175,17 @@ type clickOptions struct {
Sleep int `yaml:"sleep"`
}
+type header struct {
+ Key string `yaml:"Key"`
+ Value string `yaml:"Value"`
+}
+
type scraperDriverOptions struct {
UseCDP bool `yaml:"useCDP"`
Sleep int `yaml:"sleep"`
Clicks []*clickOptions `yaml:"clicks"`
Cookies []*cookieOptions `yaml:"cookies"`
+ Headers []*header `yaml:"headers"`
}
func loadScraperFromYAML(id string, reader io.Reader) (*config, error) {
diff --git a/pkg/scraper/url.go b/pkg/scraper/url.go
index 4404dc067..baa35b07e 100644
--- a/pkg/scraper/url.go
+++ b/pkg/scraper/url.go
@@ -74,12 +74,21 @@ func loadURL(url string, scraperConfig config, globalConfig GlobalConfig) (io.Re
req.Header.Set("User-Agent", userAgent)
}
+ if driverOptions != nil { // setting the Headers after the UA allows us to override it from inside the scraper
+ for _, h := range driverOptions.Headers {
+ if h.Key != "" {
+ req.Header.Set(h.Key, h.Value)
+ logger.Debugf("[scraper] adding header <%s:%s>", h.Key, h.Value)
+ }
+ }
+ }
+
resp, err := client.Do(req)
if err != nil {
return nil, err
}
if resp.StatusCode >= 400 {
- return nil, fmt.Errorf("http error %d", resp.StatusCode)
+ return nil, fmt.Errorf("http error %d:%s", resp.StatusCode, http.StatusText(resp.StatusCode))
}
defer resp.Body.Close()
@@ -156,10 +165,13 @@ func urlFromCDP(url string, driverOptions scraperDriverOptions, globalConfig Glo
defer cancel()
var res string
+ headers := cdpHeaders(driverOptions)
+
err := chromedp.Run(ctx,
network.Enable(),
setCDPCookies(driverOptions),
printCDPCookies(driverOptions, "Cookies found"),
+ network.SetExtraHTTPHeaders(network.Headers(headers)),
chromedp.Navigate(url),
chromedp.Sleep(sleepDuration),
setCDPClicks(driverOptions),
@@ -241,3 +253,16 @@ func cdpNetwork(enable bool) chromedp.Action {
return nil
})
}
+
+func cdpHeaders(driverOptions scraperDriverOptions) map[string]interface{} {
+ headers := map[string]interface{}{}
+ if driverOptions.Headers != nil {
+ for _, h := range driverOptions.Headers {
+ if h.Key != "" {
+ headers[h.Key] = h.Value
+ logger.Debugf("[scraper] adding header <%s:%s>", h.Key, h.Value)
+ }
+ }
+ }
+ return headers
+}
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 6a76e8fb4..f0e5ebffa 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -4,6 +4,7 @@
* Added scene queue.
### 🎨 Improvements
+* Support http request headers in scrapers.
* Sort performers by gender in scene/image/gallery cards and details.
* Add popover buttons for scenes/images/galleries on performer/studio/tag cards.
* Add slideshow to image wall view.
diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md
index 6f47d0070..43a4407e3 100644
--- a/ui/v2.5/src/docs/en/Scraping.md
+++ b/ui/v2.5/src/docs/en/Scraping.md
@@ -544,6 +544,24 @@ When developing a scraper you can have a look at the cookies set by a site by ad
and having a look at the log / console in debug mode.
+### Headers
+
+Sending request headers is possible when using a scraper.
+Headers can be set in the `driver` section and are supported for plain, CDP enabled and JSON scrapers.
+They consist of a Key and a Value. If the the Key is empty or not defined then the header is ignored.
+
+```yaml
+driver:
+ headers:
+ - Key: User-Agent
+ Value: My Stash Scraper
+ - Key: Authorization
+ Value: Bearer ds3sdfcFdfY17p4qBkTVF03zscUU2glSjWF17bZyoe8
+```
+
+* headers are set after stash's `User-Agent` configuration option is applied.
+This means setting a `User-Agent` header from the scraper overrides the one in the configuration settings.
+
### XPath scraper example
A performer and scene xpath scraper is shown as an example below:
@@ -614,31 +632,42 @@ A performer and scene scraper for ThePornDB is shown below:
name: ThePornDB
performerByName:
action: scrapeJson
- queryURL: https://metadataapi.net/api/performers?q={}
+ queryURL: https://api.metadataapi.net/performers?q={}
scraper: performerSearch
performerByURL:
- action: scrapeJson
url:
- - https://metadataapi.net/api/performers/
+ - https://api.metadataapi.net/performers/
scraper: performerScraper
sceneByURL:
- action: scrapeJson
url:
- - https://metadataapi.net/api/scenes/
+ - https://api.metadataapi.net/scenes/
scraper: sceneScraper
sceneByFragment:
action: scrapeJson
- queryURL: https://metadataapi.net/api/scenes?parse={filename}&limit=1
+ queryURL: https://api.metadataapi.net/scenes?parse={filename}&hash={oshash}&limit=1
scraper: sceneQueryScraper
+ queryURLReplace:
+ filename:
+ - regex: "[^a-zA-Z\\d\\-._~]" # clean filename so that it can contruct a valid url
+ with: "." # "%20"
+ - regex: HEVC
+ with:
+ - regex: x265
+ with:
+ - regex: \.+
+ with: "."
jsonScrapers:
performerSearch:
performer:
Name: data.#.name
URL:
selector: data.#.id
- replace:
- - regex: ^
- with: https://metadataapi.net/api/performers/
+ postProcess:
+ - replace:
+ - regex: ^
+ with: https://api.metadataapi.net/performers/
performerScraper:
common:
@@ -648,7 +677,12 @@ jsonScrapers:
Gender: $extras.gender
Birthdate: $extras.birthday
Ethnicity: $extras.ethnicity
- Height: $extras.height
+ Height:
+ selector: $extras.height
+ postProcess:
+ - replace:
+ - regex: cm
+ with:
Measurements: $extras.measurements
Tattoos: $extras.tattoos
Piercings: $extras.piercings
@@ -670,7 +704,7 @@ jsonScrapers:
Name: data.site.name
Tags:
Name: data.tags.#.tag
-
+
sceneQueryScraper:
common:
$data: data.0
@@ -686,7 +720,14 @@ jsonScrapers:
Studio:
Name: $data.site.name
Tags:
- Name: $data.tags.#.tag
+ Name: $data.tags.#.tag
+driver:
+ headers:
+ - Key: User-Agent
+ Value: Stash JSON Scraper
+ - Key: Authorization
+ Value: Bearer lPdwFdfY17p4qBkTVF03zscUU2glSjdf17bZyoe # use an actual API Key here
+# Last Updated April 7, 2021
```
## Object fields
From d673c4ce033a139f085763555ae7643368d011ad Mon Sep 17 00:00:00 2001
From: julien0221 <68500525+julien0221@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:06:35 +0100
Subject: [PATCH 31/66] added details, deathdate, hair color, weight to
performers and added details to studios (#1274)
* added details to performers and studios
* added deathdate, hair_color and weight to performers
* Simplify performer/studio create mutations
* Add changelog and recategorised
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
graphql/documents/data/performer.graphql | 4 +
graphql/documents/data/scrapers.graphql | 8 ++
graphql/documents/data/studio-slim.graphql | 1 +
graphql/documents/data/studio.graphql | 1 +
graphql/documents/mutations/performer.graphql | 44 +----------
graphql/documents/mutations/studio.graphql | 8 +-
.../queries/scrapers/freeones.graphql | 4 +
graphql/schema/types/filters.graphql | 6 ++
graphql/schema/types/performer.graphql | 16 ++++
.../schema/types/scraped-performer.graphql | 8 ++
graphql/schema/types/scraper.graphql | 4 +
graphql/schema/types/studio.graphql | 3 +
graphql/stash-box/query.graphql | 5 ++
pkg/api/resolver_model_performer.go | 29 ++++++++
pkg/api/resolver_model_studio.go | 7 ++
pkg/api/resolver_mutation_performer.go | 74 +++++++++++++++++--
pkg/api/resolver_mutation_studio.go | 5 ++
pkg/database/database.go | 2 +-
.../21_performers_studios_details.up.sql | 5 ++
pkg/manager/jsonschema/performer.go | 4 +
pkg/manager/jsonschema/studio.go | 1 +
pkg/models/model_performer.go | 8 ++
pkg/models/model_scraped_item.go | 12 +++
pkg/models/model_studio.go | 2 +
pkg/performer/export.go | 12 +++
pkg/performer/export_test.go | 20 ++++-
pkg/performer/import.go | 12 +++
pkg/performer/validate.go | 37 ++++++++++
pkg/performer/validate_test.go | 70 ++++++++++++++++++
pkg/scraper/freeones.go | 18 ++++-
pkg/scraper/json_test.go | 8 +-
pkg/scraper/xpath_test.go | 25 +++++++
pkg/sqlite/performer.go | 63 ++++++++--------
pkg/sqlite/performer_test.go | 10 ++-
pkg/sqlite/scene_test.go | 4 +-
pkg/sqlite/setup_test.go | 15 ++++
pkg/studio/export.go | 4 +
pkg/studio/export_test.go | 34 ++++++---
pkg/studio/import.go | 1 +
pkg/studio/import_test.go | 12 +++
.../src/components/Changelog/versions/v070.md | 10 ++-
.../GalleryDetails/GalleryScrapeDialog.tsx | 8 +-
.../components/Performers/PerformerCard.tsx | 5 +-
.../Performers/PerformerDetails/Performer.tsx | 4 +-
.../PerformerDetailsPanel.tsx | 18 +++++
.../PerformerDetails/PerformerEditPanel.tsx | 41 +++++++++-
.../PerformerScrapeDialog.tsx | 49 ++++++++++++
.../Scenes/SceneDetails/SceneScrapeDialog.tsx | 8 +-
ui/v2.5/src/components/Shared/Select.tsx | 8 +-
.../Studios/StudioDetails/Studio.tsx | 9 +++
.../src/components/Tagger/PerformerModal.tsx | 18 +++++
.../components/Tagger/StashSearchResult.tsx | 4 +
ui/v2.5/src/components/Tagger/queries.ts | 4 +-
ui/v2.5/src/components/Tagger/utils.ts | 7 ++
ui/v2.5/src/core/StashService.ts | 2 +-
ui/v2.5/src/docs/en/JSONSpec.md | 27 ++++++-
ui/v2.5/src/docs/en/Scraping.md | 4 +
.../models/list-filter/criteria/criterion.ts | 9 +++
.../models/list-filter/criteria/is-missing.ts | 5 +-
.../src/models/list-filter/criteria/utils.ts | 3 +
ui/v2.5/src/models/list-filter/filter.ts | 29 +++++++-
ui/v2.5/src/utils/text.ts | 2 +-
62 files changed, 748 insertions(+), 132 deletions(-)
create mode 100644 pkg/database/migrations/21_performers_studios_details.up.sql
create mode 100644 pkg/performer/validate.go
create mode 100644 pkg/performer/validate_test.go
diff --git a/graphql/documents/data/performer.graphql b/graphql/documents/data/performer.graphql
index 2048da256..09b9e1e68 100644
--- a/graphql/documents/data/performer.graphql
+++ b/graphql/documents/data/performer.graphql
@@ -31,4 +31,8 @@ fragment PerformerData on Performer {
stash_id
endpoint
}
+ details
+ death_date
+ hair_color
+ weight
}
diff --git a/graphql/documents/data/scrapers.graphql b/graphql/documents/data/scrapers.graphql
index b4397cdf3..cda034f73 100644
--- a/graphql/documents/data/scrapers.graphql
+++ b/graphql/documents/data/scrapers.graphql
@@ -19,6 +19,10 @@ fragment ScrapedPerformerData on ScrapedPerformer {
...ScrapedSceneTagData
}
image
+ details
+ death_date
+ hair_color
+ weight
}
fragment ScrapedScenePerformerData on ScrapedScenePerformer {
@@ -44,6 +48,10 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
}
remote_site_id
images
+ details
+ death_date
+ hair_color
+ weight
}
fragment ScrapedMovieStudioData on ScrapedMovieStudio {
diff --git a/graphql/documents/data/studio-slim.graphql b/graphql/documents/data/studio-slim.graphql
index a247b4e34..563375e78 100644
--- a/graphql/documents/data/studio-slim.graphql
+++ b/graphql/documents/data/studio-slim.graphql
@@ -9,4 +9,5 @@ fragment SlimStudioData on Studio {
parent_studio {
id
}
+ details
}
diff --git a/graphql/documents/data/studio.graphql b/graphql/documents/data/studio.graphql
index 2c6c8d0a3..ae8d1d0d8 100644
--- a/graphql/documents/data/studio.graphql
+++ b/graphql/documents/data/studio.graphql
@@ -31,4 +31,5 @@ fragment StudioData on Studio {
stash_id
endpoint
}
+ details
}
diff --git a/graphql/documents/mutations/performer.graphql b/graphql/documents/mutations/performer.graphql
index e4ccf442e..0e2ad9fa3 100644
--- a/graphql/documents/mutations/performer.graphql
+++ b/graphql/documents/mutations/performer.graphql
@@ -1,47 +1,7 @@
mutation PerformerCreate(
- $name: String!,
- $url: String,
- $gender: GenderEnum,
- $birthdate: String,
- $ethnicity: String,
- $country: String,
- $eye_color: String,
- $height: String,
- $measurements: String,
- $fake_tits: String,
- $career_length: String,
- $tattoos: String,
- $piercings: String,
- $aliases: String,
- $twitter: String,
- $instagram: String,
- $favorite: Boolean,
- $tag_ids: [ID!],
- $stash_ids: [StashIDInput!],
- $image: String) {
+ $input: PerformerCreateInput!) {
- performerCreate(input: {
- name: $name,
- url: $url,
- gender: $gender,
- birthdate: $birthdate,
- ethnicity: $ethnicity,
- country: $country,
- eye_color: $eye_color,
- height: $height,
- measurements: $measurements,
- fake_tits: $fake_tits,
- career_length: $career_length,
- tattoos: $tattoos,
- piercings: $piercings,
- aliases: $aliases,
- twitter: $twitter,
- instagram: $instagram,
- favorite: $favorite,
- tag_ids: $tag_ids,
- stash_ids: $stash_ids,
- image: $image
- }) {
+ performerCreate(input: $input) {
...PerformerData
}
}
diff --git a/graphql/documents/mutations/studio.graphql b/graphql/documents/mutations/studio.graphql
index d2d11d222..e4cffae84 100644
--- a/graphql/documents/mutations/studio.graphql
+++ b/graphql/documents/mutations/studio.graphql
@@ -1,11 +1,7 @@
mutation StudioCreate(
- $name: String!,
- $url: String,
- $image: String,
- $stash_ids: [StashIDInput!],
- $parent_id: ID) {
+ $input: StudioCreateInput!) {
- studioCreate(input: { name: $name, url: $url, image: $image, stash_ids: $stash_ids, parent_id: $parent_id }) {
+ studioCreate(input: $input) {
...StudioData
}
}
diff --git a/graphql/documents/queries/scrapers/freeones.graphql b/graphql/documents/queries/scrapers/freeones.graphql
index 27f6eb926..9f366786d 100644
--- a/graphql/documents/queries/scrapers/freeones.graphql
+++ b/graphql/documents/queries/scrapers/freeones.graphql
@@ -15,6 +15,10 @@ query ScrapeFreeones($performer_name: String!) {
tattoos
piercings
aliases
+ details
+ death_date
+ hair_color
+ weight
}
}
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index db4c6c426..6152174eb 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -73,6 +73,12 @@ input PerformerFilterType {
stash_id: String
"""Filter by url"""
url: StringCriterionInput
+ """Filter by hair color"""
+ hair_color: StringCriterionInput
+ """Filter by weight"""
+ weight: StringCriterionInput
+ """Filter by death year"""
+ death_year: IntCriterionInput
}
input SceneMarkerFilterType {
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index 1c6d642e0..e85bb5d9c 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -35,6 +35,10 @@ type Performer {
gallery_count: Int # Resolver
scenes: [Scene!]!
stash_ids: [StashID!]!
+ details: String
+ death_date: String
+ hair_color: String
+ weight: Int
}
input PerformerCreateInput {
@@ -59,6 +63,10 @@ input PerformerCreateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ details: String
+ death_date: String
+ hair_color: String
+ weight: Int
}
input PerformerUpdateInput {
@@ -84,6 +92,10 @@ input PerformerUpdateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ details: String
+ death_date: String
+ hair_color: String
+ weight: Int
}
input BulkPerformerUpdateInput {
@@ -106,6 +118,10 @@ input BulkPerformerUpdateInput {
instagram: String
favorite: Boolean
tag_ids: BulkUpdateIds
+ details: String
+ death_date: String
+ hair_color: String
+ weight: Int
}
input PerformerDestroyInput {
diff --git a/graphql/schema/types/scraped-performer.graphql b/graphql/schema/types/scraped-performer.graphql
index 9f4583600..db6c216a3 100644
--- a/graphql/schema/types/scraped-performer.graphql
+++ b/graphql/schema/types/scraped-performer.graphql
@@ -21,6 +21,10 @@ type ScrapedPerformer {
"""This should be a base64 encoded data URL"""
image: String
+ details: String
+ death_date: String
+ hair_color: String
+ weight: String
}
input ScrapedPerformerInput {
@@ -43,4 +47,8 @@ input ScrapedPerformerInput {
# not including tags for the input
# not including image for the input
+ details: String
+ death_date: String
+ hair_color: String
+ weight: String
}
\ No newline at end of file
diff --git a/graphql/schema/types/scraper.graphql b/graphql/schema/types/scraper.graphql
index 929c13f2b..0a0cec8c5 100644
--- a/graphql/schema/types/scraper.graphql
+++ b/graphql/schema/types/scraper.graphql
@@ -49,6 +49,10 @@ type ScrapedScenePerformer {
remote_site_id: String
images: [String!]
+ details: String
+ death_date: String
+ hair_color: String
+ weight: String
}
type ScrapedSceneMovie {
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 1adb0aa63..25145b823 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -11,6 +11,7 @@ type Studio {
image_count: Int # Resolver
gallery_count: Int # Resolver
stash_ids: [StashID!]!
+ details: String
}
input StudioCreateInput {
@@ -20,6 +21,7 @@ input StudioCreateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ details: String
}
input StudioUpdateInput {
@@ -30,6 +32,7 @@ input StudioUpdateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ details: String
}
input StudioDestroyInput {
diff --git a/graphql/stash-box/query.graphql b/graphql/stash-box/query.graphql
index 4424ce8db..0e74c92c3 100644
--- a/graphql/stash-box/query.graphql
+++ b/graphql/stash-box/query.graphql
@@ -75,6 +75,11 @@ fragment PerformerFragment on Performer {
piercings {
...BodyModificationFragment
}
+ details
+ death_date {
+ ...FuzzyDateFragment
+ }
+ weight
}
fragment PerformerAppearanceFragment on PerformerAppearance {
diff --git a/pkg/api/resolver_model_performer.go b/pkg/api/resolver_model_performer.go
index ab3d2363f..c74ffe95d 100644
--- a/pkg/api/resolver_model_performer.go
+++ b/pkg/api/resolver_model_performer.go
@@ -208,3 +208,32 @@ func (r *performerResolver) StashIds(ctx context.Context, obj *models.Performer)
return ret, nil
}
+
+func (r *performerResolver) Details(ctx context.Context, obj *models.Performer) (*string, error) {
+ if obj.Details.Valid {
+ return &obj.Details.String, nil
+ }
+ return nil, nil
+}
+
+func (r *performerResolver) DeathDate(ctx context.Context, obj *models.Performer) (*string, error) {
+ if obj.DeathDate.Valid {
+ return &obj.DeathDate.String, nil
+ }
+ return nil, nil
+}
+
+func (r *performerResolver) HairColor(ctx context.Context, obj *models.Performer) (*string, error) {
+ if obj.HairColor.Valid {
+ return &obj.HairColor.String, nil
+ }
+ return nil, nil
+}
+
+func (r *performerResolver) Weight(ctx context.Context, obj *models.Performer) (*int, error) {
+ if obj.Weight.Valid {
+ weight := int(obj.Weight.Int64)
+ return &weight, nil
+ }
+ return nil, nil
+}
diff --git a/pkg/api/resolver_model_studio.go b/pkg/api/resolver_model_studio.go
index 553c8cc5c..da5a1b8b7 100644
--- a/pkg/api/resolver_model_studio.go
+++ b/pkg/api/resolver_model_studio.go
@@ -116,3 +116,10 @@ func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) (ret
return ret, nil
}
+
+func (r *studioResolver) Details(ctx context.Context, obj *models.Studio) (*string, error) {
+ if obj.Details.Valid {
+ return &obj.Details.String, nil
+ }
+ return nil, nil
+}
diff --git a/pkg/api/resolver_mutation_performer.go b/pkg/api/resolver_mutation_performer.go
index 69eb5832c..9b7feee5c 100644
--- a/pkg/api/resolver_mutation_performer.go
+++ b/pkg/api/resolver_mutation_performer.go
@@ -3,10 +3,12 @@ package api
import (
"context"
"database/sql"
+ "fmt"
"strconv"
"time"
"github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/performer"
"github.com/stashapp/stash/pkg/utils"
)
@@ -83,6 +85,25 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
} else {
newPerformer.Favorite = sql.NullBool{Bool: false, Valid: true}
}
+ if input.Details != nil {
+ newPerformer.Details = sql.NullString{String: *input.Details, Valid: true}
+ }
+ if input.DeathDate != nil {
+ newPerformer.DeathDate = models.SQLiteDate{String: *input.DeathDate, Valid: true}
+ }
+ if input.HairColor != nil {
+ newPerformer.HairColor = sql.NullString{String: *input.HairColor, Valid: true}
+ }
+ if input.Weight != nil {
+ weight := int64(*input.Weight)
+ newPerformer.Weight = sql.NullInt64{Int64: weight, Valid: true}
+ }
+
+ if err := performer.ValidateDeathDate(nil, input.Birthdate, input.DeathDate); err != nil {
+ if err != nil {
+ return nil, err
+ }
+ }
// Start the transaction and save the performer
var performer *models.Performer
@@ -177,33 +198,52 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+ updatedPerformer.Details = translator.nullString(input.Details, "details")
+ updatedPerformer.DeathDate = translator.sqliteDate(input.DeathDate, "death_date")
+ updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
+ updatedPerformer.Weight = translator.nullInt64(input.Weight, "weight")
- // Start the transaction and save the performer
- var performer *models.Performer
+ // Start the transaction and save the p
+ var p *models.Performer
if err := r.withTxn(ctx, func(repo models.Repository) error {
qb := repo.Performer()
- var err error
- performer, err = qb.Update(updatedPerformer)
+ // need to get existing performer
+ existing, err := qb.Find(updatedPerformer.ID)
+ if err != nil {
+ return err
+ }
+
+ if existing == nil {
+ return fmt.Errorf("performer with id %d not found", updatedPerformer.ID)
+ }
+
+ if err := performer.ValidateDeathDate(existing, input.Birthdate, input.DeathDate); err != nil {
+ if err != nil {
+ return err
+ }
+ }
+
+ p, err = qb.Update(updatedPerformer)
if err != nil {
return err
}
// Save the tags
if translator.hasField("tag_ids") {
- if err := r.updatePerformerTags(qb, performer.ID, input.TagIds); err != nil {
+ if err := r.updatePerformerTags(qb, p.ID, input.TagIds); err != nil {
return err
}
}
// update image table
if len(imageData) > 0 {
- if err := qb.UpdateImage(performer.ID, imageData); err != nil {
+ if err := qb.UpdateImage(p.ID, imageData); err != nil {
return err
}
} else if imageIncluded {
// must be unsetting
- if err := qb.DestroyImage(performer.ID); err != nil {
+ if err := qb.DestroyImage(p.ID); err != nil {
return err
}
}
@@ -221,7 +261,7 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
return nil, err
}
- return performer, nil
+ return p, nil
}
func (r *mutationResolver) updatePerformerTags(qb models.PerformerReaderWriter, performerID int, tagsIDs []string) error {
@@ -264,6 +304,10 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input models
updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+ updatedPerformer.Details = translator.nullString(input.Details, "details")
+ updatedPerformer.DeathDate = translator.sqliteDate(input.DeathDate, "death_date")
+ updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
+ updatedPerformer.Weight = translator.nullInt64(input.Weight, "weight")
if translator.hasField("gender") {
if input.Gender != nil {
@@ -282,6 +326,20 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input models
for _, performerID := range performerIDs {
updatedPerformer.ID = performerID
+ // need to get existing performer
+ existing, err := qb.Find(performerID)
+ if err != nil {
+ return err
+ }
+
+ if existing == nil {
+ return fmt.Errorf("performer with id %d not found", performerID)
+ }
+
+ if err := performer.ValidateDeathDate(existing, input.Birthdate, input.DeathDate); err != nil {
+ return err
+ }
+
performer, err := qb.Update(updatedPerformer)
if err != nil {
return err
diff --git a/pkg/api/resolver_mutation_studio.go b/pkg/api/resolver_mutation_studio.go
index 82be5d1e9..8ec804765 100644
--- a/pkg/api/resolver_mutation_studio.go
+++ b/pkg/api/resolver_mutation_studio.go
@@ -42,6 +42,10 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
newStudio.ParentID = sql.NullInt64{Int64: parentID, Valid: true}
}
+ if input.Details != nil {
+ newStudio.Details = sql.NullString{String: *input.Details, Valid: true}
+ }
+
// Start the transaction and save the studio
var studio *models.Studio
if err := r.withTxn(ctx, func(repo models.Repository) error {
@@ -109,6 +113,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
}
updatedStudio.URL = translator.nullString(input.URL, "url")
+ updatedStudio.Details = translator.nullString(input.Details, "details")
updatedStudio.ParentID = translator.nullInt64FromString(input.ParentID, "parent_id")
// Start the transaction and save the studio
diff --git a/pkg/database/database.go b/pkg/database/database.go
index 95bcb9081..d210e1215 100644
--- a/pkg/database/database.go
+++ b/pkg/database/database.go
@@ -23,7 +23,7 @@ import (
var DB *sqlx.DB
var WriteMu *sync.Mutex
var dbPath string
-var appSchemaVersion uint = 20
+var appSchemaVersion uint = 21
var databaseSchemaVersion uint
var (
diff --git a/pkg/database/migrations/21_performers_studios_details.up.sql b/pkg/database/migrations/21_performers_studios_details.up.sql
new file mode 100644
index 000000000..d41cf4779
--- /dev/null
+++ b/pkg/database/migrations/21_performers_studios_details.up.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `performers` ADD COLUMN `details` text;
+ALTER TABLE `performers` ADD COLUMN `death_date` date;
+ALTER TABLE `performers` ADD COLUMN `hair_color` varchar(255);
+ALTER TABLE `performers` ADD COLUMN `weight` integer;
+ALTER TABLE `studios` ADD COLUMN `details` text;
\ No newline at end of file
diff --git a/pkg/manager/jsonschema/performer.go b/pkg/manager/jsonschema/performer.go
index a145f9bce..a12a617db 100644
--- a/pkg/manager/jsonschema/performer.go
+++ b/pkg/manager/jsonschema/performer.go
@@ -30,6 +30,10 @@ type Performer struct {
Image string `json:"image,omitempty"`
CreatedAt models.JSONTime `json:"created_at,omitempty"`
UpdatedAt models.JSONTime `json:"updated_at,omitempty"`
+ Details string `json:"details,omitempty"`
+ DeathDate string `json:"death_date,omitempty"`
+ HairColor string `json:"hair_color,omitempty"`
+ Weight int `json:"weight,omitempty"`
}
func LoadPerformerFile(filePath string) (*Performer, error) {
diff --git a/pkg/manager/jsonschema/studio.go b/pkg/manager/jsonschema/studio.go
index ed1f7dea0..d3e55cb08 100644
--- a/pkg/manager/jsonschema/studio.go
+++ b/pkg/manager/jsonschema/studio.go
@@ -15,6 +15,7 @@ type Studio struct {
Image string `json:"image,omitempty"`
CreatedAt models.JSONTime `json:"created_at,omitempty"`
UpdatedAt models.JSONTime `json:"updated_at,omitempty"`
+ Details string `json:"details,omitempty"`
}
func LoadStudioFile(filePath string) (*Studio, error) {
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index 4d6134b8a..0a0ce3f09 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -29,6 +29,10 @@ type Performer struct {
Favorite sql.NullBool `db:"favorite" json:"favorite"`
CreatedAt SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Details sql.NullString `db:"details" json:"details"`
+ DeathDate SQLiteDate `db:"death_date" json:"death_date"`
+ HairColor sql.NullString `db:"hair_color" json:"hair_color"`
+ Weight sql.NullInt64 `db:"weight" json:"weight"`
}
type PerformerPartial struct {
@@ -53,6 +57,10 @@ type PerformerPartial struct {
Favorite *sql.NullBool `db:"favorite" json:"favorite"`
CreatedAt *SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt *SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Details *sql.NullString `db:"details" json:"details"`
+ DeathDate *SQLiteDate `db:"death_date" json:"death_date"`
+ HairColor *sql.NullString `db:"hair_color" json:"hair_color"`
+ Weight *sql.NullInt64 `db:"weight" json:"weight"`
}
func NewPerformer(name string) *Performer {
diff --git a/pkg/models/model_scraped_item.go b/pkg/models/model_scraped_item.go
index e9fa33118..0c102bcbe 100644
--- a/pkg/models/model_scraped_item.go
+++ b/pkg/models/model_scraped_item.go
@@ -42,6 +42,10 @@ type ScrapedPerformer struct {
Aliases *string `graphql:"aliases" json:"aliases"`
Tags []*ScrapedSceneTag `graphql:"tags" json:"tags"`
Image *string `graphql:"image" json:"image"`
+ Details *string `graphql:"details" json:"details"`
+ DeathDate *string `graphql:"death_date" json:"death_date"`
+ HairColor *string `graphql:"hair_color" json:"hair_color"`
+ Weight *string `graphql:"weight" json:"weight"`
}
// this type has no Image field
@@ -63,6 +67,10 @@ type ScrapedPerformerStash struct {
Piercings *string `graphql:"piercings" json:"piercings"`
Aliases *string `graphql:"aliases" json:"aliases"`
Tags []*ScrapedSceneTag `graphql:"tags" json:"tags"`
+ Details *string `graphql:"details" json:"details"`
+ DeathDate *string `graphql:"death_date" json:"death_date"`
+ HairColor *string `graphql:"hair_color" json:"hair_color"`
+ Weight *string `graphql:"weight" json:"weight"`
}
type ScrapedScene struct {
@@ -128,6 +136,10 @@ type ScrapedScenePerformer struct {
Tags []*ScrapedSceneTag `graphql:"tags" json:"tags"`
RemoteSiteID *string `graphql:"remote_site_id" json:"remote_site_id"`
Images []string `graphql:"images" json:"images"`
+ Details *string `graphql:"details" json:"details"`
+ DeathDate *string `graphql:"death_date" json:"death_date"`
+ HairColor *string `graphql:"hair_color" json:"hair_color"`
+ Weight *string `graphql:"weight" json:"weight"`
}
type ScrapedSceneStudio struct {
diff --git a/pkg/models/model_studio.go b/pkg/models/model_studio.go
index 4bc687526..6336d9163 100644
--- a/pkg/models/model_studio.go
+++ b/pkg/models/model_studio.go
@@ -15,6 +15,7 @@ type Studio struct {
ParentID sql.NullInt64 `db:"parent_id,omitempty" json:"parent_id"`
CreatedAt SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Details sql.NullString `db:"details" json:"details"`
}
type StudioPartial struct {
@@ -25,6 +26,7 @@ type StudioPartial struct {
ParentID *sql.NullInt64 `db:"parent_id,omitempty" json:"parent_id"`
CreatedAt *SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt *SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Details *sql.NullString `db:"details" json:"details"`
}
var DefaultStudioImage = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH4wgVBQsJl1CMZAAAASJJREFUeNrt3N0JwyAYhlEj3cj9R3Cm5rbkqtAP+qrnGaCYHPwJpLlaa++mmLpbAERAgAgIEAEBIiBABERAgAgIEAEBIiBABERAgAgIEAHZuVflj40x4i94zhk9vqsVvEq6AsQqMP1EjORx20OACAgQRRx7T+zzcFBxcjNDfoB4ntQqTm5Awo7MlqywZxcgYQ+RlqywJ3ozJAQCSBiEJSsQA0gYBpDAgAARECACAkRAgAgIEAERECACAmSjUv6eAOSB8m8YIGGzBUjYbAESBgMkbBkDEjZbgITBAClcxiqQvEoatreYIWEBASIgJ4Gkf11ntXH3nS9uxfGWfJ5J9hAgAgJEQAQEiIAAERAgAgJEQAQEiIAAERAgAgJEQAQEiL7qBuc6RKLHxr0CAAAAAElFTkSuQmCC"
diff --git a/pkg/performer/export.go b/pkg/performer/export.go
index a038a2560..8433353a7 100644
--- a/pkg/performer/export.go
+++ b/pkg/performer/export.go
@@ -66,6 +66,18 @@ func ToJSON(reader models.PerformerReader, performer *models.Performer) (*jsonsc
if performer.Favorite.Valid {
newPerformerJSON.Favorite = performer.Favorite.Bool
}
+ if performer.Details.Valid {
+ newPerformerJSON.Details = performer.Details.String
+ }
+ if performer.DeathDate.Valid {
+ newPerformerJSON.DeathDate = utils.GetYMDFromDatabaseDate(performer.DeathDate.String)
+ }
+ if performer.HairColor.Valid {
+ newPerformerJSON.HairColor = performer.HairColor.String
+ }
+ if performer.Weight.Valid {
+ newPerformerJSON.Weight = int(performer.Weight.Int64)
+ }
image, err := reader.GetImage(performer.ID)
if err != nil {
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index aa880e40c..0f082163e 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -36,6 +36,9 @@ const (
piercings = "piercings"
tattoos = "tattoos"
twitter = "twitter"
+ details = "details"
+ hairColor = "hairColor"
+ weight = 60
)
var imageBytes = []byte("imageBytes")
@@ -46,6 +49,10 @@ var birthDate = models.SQLiteDate{
String: "2001-01-01",
Valid: true,
}
+var deathDate = models.SQLiteDate{
+ String: "2021-02-02",
+ Valid: true,
+}
var createTime time.Time = time.Date(2001, 01, 01, 0, 0, 0, 0, time.Local)
var updateTime time.Time = time.Date(2002, 01, 01, 0, 0, 0, 0, time.Local)
@@ -79,6 +86,13 @@ func createFullPerformer(id int, name string) *models.Performer {
UpdatedAt: models.SQLiteTimestamp{
Timestamp: updateTime,
},
+ Details: models.NullString(details),
+ DeathDate: deathDate,
+ HairColor: models.NullString(hairColor),
+ Weight: sql.NullInt64{
+ Int64: weight,
+ Valid: true,
+ },
}
}
@@ -119,7 +133,11 @@ func createFullJSONPerformer(name string, image string) *jsonschema.Performer {
UpdatedAt: models.JSONTime{
Time: updateTime,
},
- Image: image,
+ Image: image,
+ Details: details,
+ DeathDate: deathDate.String,
+ HairColor: hairColor,
+ Weight: weight,
}
}
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 2131b1e57..09e0a56a2 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -224,6 +224,18 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Perform
if performerJSON.Instagram != "" {
newPerformer.Instagram = sql.NullString{String: performerJSON.Instagram, Valid: true}
}
+ if performerJSON.Details != "" {
+ newPerformer.Details = sql.NullString{String: performerJSON.Details, Valid: true}
+ }
+ if performerJSON.DeathDate != "" {
+ newPerformer.DeathDate = models.SQLiteDate{String: performerJSON.DeathDate, Valid: true}
+ }
+ if performerJSON.HairColor != "" {
+ newPerformer.HairColor = sql.NullString{String: performerJSON.HairColor, Valid: true}
+ }
+ if performerJSON.Weight != 0 {
+ newPerformer.Weight = sql.NullInt64{Int64: int64(performerJSON.Weight), Valid: true}
+ }
return newPerformer
}
diff --git a/pkg/performer/validate.go b/pkg/performer/validate.go
new file mode 100644
index 000000000..374262590
--- /dev/null
+++ b/pkg/performer/validate.go
@@ -0,0 +1,37 @@
+package performer
+
+import (
+ "errors"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/utils"
+)
+
+func ValidateDeathDate(performer *models.Performer, birthdate *string, deathDate *string) error {
+ // don't validate existing values
+ if birthdate == nil && deathDate == nil {
+ return nil
+ }
+
+ if performer != nil {
+ if birthdate == nil && performer.Birthdate.Valid {
+ birthdate = &performer.Birthdate.String
+ }
+ if deathDate == nil && performer.DeathDate.Valid {
+ deathDate = &performer.DeathDate.String
+ }
+ }
+
+ if birthdate == nil || deathDate == nil || *birthdate == "" || *deathDate == "" {
+ return nil
+ }
+
+ f, _ := utils.ParseDateStringAsTime(*birthdate)
+ t, _ := utils.ParseDateStringAsTime(*deathDate)
+
+ if f.After(t) {
+ return errors.New("the date of death should be higher than the date of birth")
+ }
+
+ return nil
+}
diff --git a/pkg/performer/validate_test.go b/pkg/performer/validate_test.go
new file mode 100644
index 000000000..33616e184
--- /dev/null
+++ b/pkg/performer/validate_test.go
@@ -0,0 +1,70 @@
+package performer
+
+import (
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestValidateDeathDate(t *testing.T) {
+ assert := assert.New(t)
+
+ date1 := "2001-01-01"
+ date2 := "2002-01-01"
+ date3 := "2003-01-01"
+ date4 := "2004-01-01"
+ empty := ""
+
+ emptyPerformer := models.Performer{}
+ invalidPerformer := models.Performer{
+ Birthdate: models.SQLiteDate{
+ String: date3,
+ Valid: true,
+ },
+ DeathDate: models.SQLiteDate{
+ String: date2,
+ Valid: true,
+ },
+ }
+ validPerformer := models.Performer{
+ Birthdate: models.SQLiteDate{
+ String: date2,
+ Valid: true,
+ },
+ DeathDate: models.SQLiteDate{
+ String: date3,
+ Valid: true,
+ },
+ }
+
+ // nil values should always return nil
+ assert.Nil(ValidateDeathDate(nil, nil, &date1))
+ assert.Nil(ValidateDeathDate(nil, &date2, nil))
+ assert.Nil(ValidateDeathDate(&emptyPerformer, nil, &date1))
+ assert.Nil(ValidateDeathDate(&emptyPerformer, &date2, nil))
+
+ // empty strings should always return nil
+ assert.Nil(ValidateDeathDate(nil, &empty, &date1))
+ assert.Nil(ValidateDeathDate(nil, &date2, &empty))
+ assert.Nil(ValidateDeathDate(&emptyPerformer, &empty, &date1))
+ assert.Nil(ValidateDeathDate(&emptyPerformer, &date2, &empty))
+ assert.Nil(ValidateDeathDate(&validPerformer, &empty, &date1))
+ assert.Nil(ValidateDeathDate(&validPerformer, &date2, &empty))
+
+ // nil inputs should return nil even if performer is invalid
+ assert.Nil(ValidateDeathDate(&invalidPerformer, nil, nil))
+
+ // invalid input values should return error
+ assert.NotNil(ValidateDeathDate(nil, &date2, &date1))
+ assert.NotNil(ValidateDeathDate(&validPerformer, &date2, &date1))
+
+ // valid input values should return nil
+ assert.Nil(ValidateDeathDate(nil, &date1, &date2))
+
+ // use performer values if performer set and values available
+ assert.NotNil(ValidateDeathDate(&validPerformer, nil, &date1))
+ assert.NotNil(ValidateDeathDate(&validPerformer, &date4, nil))
+ assert.Nil(ValidateDeathDate(&validPerformer, nil, &date4))
+ assert.Nil(ValidateDeathDate(&validPerformer, &date1, nil))
+}
diff --git a/pkg/scraper/freeones.go b/pkg/scraper/freeones.go
index 8b72e9df3..c229e874a 100644
--- a/pkg/scraper/freeones.go
+++ b/pkg/scraper/freeones.go
@@ -103,7 +103,23 @@ xPathScrapers:
selector: //div[contains(@class,'image-container')]//a/img/@src
Gender:
fixed: "Female"
-# Last updated March 24, 2021
+ Details: //div[@data-test="biography"]
+ DeathDate:
+ selector: //div[contains(text(),'Passed away on')]
+ postProcess:
+ - replace:
+ - regex: Passed away on (.+) at the age of \d+
+ with: $1
+ - parseDate: January 2, 2006
+ HairColor: //span[text()='Hair Color']/following-sibling::span/a
+ Weight:
+ selector: //span[text()='Weight']/following-sibling::span/a
+ postProcess:
+ - replace:
+ - regex: \D+[\s\S]+
+ with: ""
+
+# Last updated April 13, 2021
`
func getFreeonesScraper() config {
diff --git a/pkg/scraper/json_test.go b/pkg/scraper/json_test.go
index 6145cc88b..271d83235 100644
--- a/pkg/scraper/json_test.go
+++ b/pkg/scraper/json_test.go
@@ -23,6 +23,9 @@ jsonScrapers:
Piercings: $extras.piercings
Aliases: data.aliases
Image: data.image
+ Details: data.bio
+ HairColor: $extras.hair_colour
+ Weight: $extras.weight
`
const json = `
@@ -41,7 +44,7 @@ jsonScrapers:
"ethnicity": "Caucasian",
"nationality": "United States",
"hair_colour": "Blonde",
- "weight": "126 lbs (or 57 kg)",
+ "weight": 57,
"height": "5'6\" (or 167 cm)",
"measurements": "34-26-36",
"cupsize": "34C (75C)",
@@ -90,4 +93,7 @@ jsonScrapers:
verifyField(t, "5'6\" (or 167 cm)", scrapedPerformer.Height, "Height")
verifyField(t, "None", scrapedPerformer.Tattoos, "Tattoos")
verifyField(t, "Navel", scrapedPerformer.Piercings, "Piercings")
+ verifyField(t, "Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the ... arrow_drop_down Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the VR Porn movies – trust us. Ankles behind her neck and feet over her back so she can kiss her toes, turned, twisted and gyrating, she can fuck any which way she wants (and that ass!), will surely make you fall in love with this hot Virtual Reality Porn slut, as she is one of the finest of them all. Talking about perfection, maybe it’s all the acrobatic work that keeps it in such gorgeous shape? Who cares really, because you just want to take a big bite out of it and never let go. But it’s not all about the body. Mia’s also got a great smile, which might not sound kinky, but believe us, it is a smile that will heat up your innards and drop your pants. Is it her golden skin, her innocent pink lips or that heart-shaped face? There is just too much good stuff going on with Mia Malkova, which is maybe why these past few years have heaped awards upon awards on this Southern California native. Mia came to VR Bangers for her first VR Porn video, so you know she’s only going for top-notch scenes with top-game performers, men, and women. Better hit up that yoga studio if you ever dream of being able to bang a flexible and talented chick like lady Malkova. arrow_drop_up", scrapedPerformer.Details, "Details")
+ verifyField(t, "Blonde", scrapedPerformer.HairColor, "HairColor")
+ verifyField(t, "57", scrapedPerformer.Weight, "Weight")
}
diff --git a/pkg/scraper/xpath_test.go b/pkg/scraper/xpath_test.go
index efc5968a5..d0883e16f 100644
--- a/pkg/scraper/xpath_test.go
+++ b/pkg/scraper/xpath_test.go
@@ -100,6 +100,14 @@ const htmlDoc1 = `
5ft7
+
+
+ Weight:
+
+
+ 57
+
+
Measurements:
@@ -141,6 +149,14 @@ const htmlDoc1 = `
;
+
+
+ Details:
+
+
+ Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the ... arrow_drop_down Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the VR Porn movies – trust us. Ankles behind her neck and feet over her back so she can kiss her toes, turned, twisted and gyrating, she can fuck any which way she wants (and that ass!), will surely make you fall in love with this hot Virtual Reality Porn slut, as she is one of the finest of them all. Talking about perfection, maybe it’s all the acrobatic work that keeps it in such gorgeous shape? Who cares really, because you just want to take a big bite out of it and never let go. But it’s not all about the body. Mia’s also got a great smile, which might not sound kinky, but believe us, it is a smile that will heat up your innards and drop your pants. Is it her golden skin, her innocent pink lips or that heart-shaped face? There is just too much good stuff going on with Mia Malkova, which is maybe why these past few years have heaped awards upon awards on this Southern California native. Mia came to VR Bangers for her first VR Porn video, so you know she’s only going for top-notch scenes with top-game performers, men, and women. Better hit up that yoga studio if you ever dream of being able to bang a flexible and talented chick like lady Malkova.
+
+
= (
try {
const result = await createStudio({
variables: {
- name: toCreate.name,
- url: toCreate.url,
+ input: {
+ name: toCreate.name,
+ url: toCreate.url,
+ },
},
});
@@ -299,7 +301,7 @@ export const GalleryScrapeDialog: React.FC = (
try {
performerInput = Object.assign(performerInput, toCreate);
const result = await createPerformer({
- variables: performerInput,
+ variables: { input: performerInput },
});
// add the new performer to the new performers value
diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index 4abf9bcf4..298f5c0d6 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -29,7 +29,10 @@ export const PerformerCard: React.FC = ({
selected,
onSelectedChanged,
}) => {
- const age = TextUtils.age(performer.birthdate, ageFromDate);
+ const age = TextUtils.age(
+ performer.birthdate,
+ ageFromDate ?? performer.death_date
+ );
const ageString = `${age} years old${ageFromDate ? " in this scene." : "."}`;
function maybeRenderFavoriteBanner() {
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index b4e2699c0..5cf92383f 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -160,7 +160,9 @@ export const Performer: React.FC = () => {
// provided by the server
return (
= ({
});
};
+ const formatWeight = (weight?: number | null) => {
+ if (!weight) {
+ return "";
+ }
+ return intl.formatNumber(weight, {
+ style: "unit",
+ unit: "kilogram",
+ unitDisplay: "narrow",
+ });
+ };
+
return (
<>
= ({
name="Birthdate"
value={TextUtils.formatDate(intl, performer.birthdate ?? undefined)}
/>
+ = ({
tag_ids: yup.array(yup.string().required()).optional(),
stash_ids: yup.mixed().optional(),
image: yup.string().optional().nullable(),
+ details: yup.string().optional(),
+ death_date: yup.string().optional(),
+ hair_color: yup.string().optional(),
+ weight: yup.number().optional(),
});
const initialValues = {
@@ -131,6 +135,10 @@ export const PerformerEditPanel: React.FC = ({
tag_ids: (performer.tags ?? []).map((t) => t.id),
stash_ids: performer.stash_ids ?? undefined,
image: undefined,
+ details: performer.details ?? "",
+ death_date: performer.death_date ?? "",
+ hair_color: performer.hair_color ?? "",
+ weight: performer.weight ?? "",
};
type InputValues = typeof initialValues;
@@ -306,6 +314,18 @@ export const PerformerEditPanel: React.FC = ({
const imageStr = (state as GQL.ScrapedPerformerDataFragment).image;
formik.setFieldValue("image", imageStr ?? undefined);
}
+ if (state.details) {
+ formik.setFieldValue("details", state.details);
+ }
+ if (state.death_date) {
+ formik.setFieldValue("death_date", state.death_date);
+ }
+ if (state.hair_color) {
+ formik.setFieldValue("hair_color", state.hair_color);
+ }
+ if (state.weight) {
+ formik.setFieldValue("weight", state.weight);
+ }
}
function onImageLoad(imageData: string) {
@@ -334,7 +354,7 @@ export const PerformerEditPanel: React.FC = ({
history.push(`/performers/${performer.id}`);
} else {
const result = await createPerformer({
- variables: performerInput as GQL.PerformerCreateInput,
+ variables: { input: performerInput as GQL.PerformerCreateInput },
});
if (result.data?.performerCreate) {
history.push(`/performers/${result.data.performerCreate.id}`);
@@ -399,6 +419,7 @@ export const PerformerEditPanel: React.FC = ({
> = {
...values,
gender: stringToGender(values.gender),
+ weight: Number(values.weight),
};
if (!isNew) {
@@ -550,6 +571,7 @@ export const PerformerEditPanel: React.FC = ({
...formik.values,
gender: stringToGender(formik.values.gender),
image: formik.values.image ?? performer.image_path,
+ weight: Number(formik.values.weight),
};
return (
@@ -806,10 +828,13 @@ export const PerformerEditPanel: React.FC = ({
{renderTextField("birthdate", "Birthdate", "YYYY-MM-DD")}
+ {renderTextField("death_date", "Death Date", "YYYY-MM-DD")}
{renderTextField("country", "Country")}
{renderTextField("ethnicity", "Ethnicity")}
+ {renderTextField("hair_color", "Hair Color")}
{renderTextField("eye_color", "Eye Color")}
{renderTextField("height", "Height (cm)")}
+ {renderTextField("weight", "Weight (kg)")}
{renderTextField("measurements", "Measurements")}
{renderTextField("fake_tits", "Fake Tits")}
@@ -861,7 +886,19 @@ export const PerformerEditPanel: React.FC = ({
{renderTextField("twitter", "Twitter")}
{renderTextField("instagram", "Instagram")}
-
+
+
+ Details
+
+
{renderTagsField()}
{renderStashIDs()}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
index 4e6305cbb..204a52811 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -153,18 +153,36 @@ export const PerformerScrapeDialog: React.FC = (
const [birthdate, setBirthdate] = useState>(
new ScrapeResult(props.performer.birthdate, props.scraped.birthdate)
);
+ const [deathDate, setDeathDate] = useState>(
+ new ScrapeResult(
+ props.performer.death_date,
+ props.scraped.death_date
+ )
+ );
const [ethnicity, setEthnicity] = useState>(
new ScrapeResult(props.performer.ethnicity, props.scraped.ethnicity)
);
const [country, setCountry] = useState>(
new ScrapeResult(props.performer.country, props.scraped.country)
);
+ const [hairColor, setHairColor] = useState>(
+ new ScrapeResult(
+ props.performer.hair_color,
+ props.scraped.hair_color
+ )
+ );
const [eyeColor, setEyeColor] = useState>(
new ScrapeResult(props.performer.eye_color, props.scraped.eye_color)
);
const [height, setHeight] = useState>(
new ScrapeResult(props.performer.height, props.scraped.height)
);
+ const [weight, setWeight] = useState>(
+ new ScrapeResult(
+ props.performer.weight?.toString(),
+ props.scraped.weight
+ )
+ );
const [measurements, setMeasurements] = useState>(
new ScrapeResult(
props.performer.measurements,
@@ -201,6 +219,9 @@ export const PerformerScrapeDialog: React.FC = (
translateScrapedGender(props.scraped.gender)
)
);
+ const [details, setDetails] = useState>(
+ new ScrapeResult(props.performer.details, props.scraped.details)
+ );
const [createTag] = useTagCreate({ name: "" });
const Toast = useToast();
@@ -281,6 +302,10 @@ export const PerformerScrapeDialog: React.FC = (
gender,
image,
tags,
+ details,
+ deathDate,
+ hairColor,
+ weight,
];
// don't show the dialog if nothing was scraped
if (allFields.every((r) => !r.scraped)) {
@@ -348,6 +373,10 @@ export const PerformerScrapeDialog: React.FC = (
};
}),
image: image.getNewValue(),
+ details: details.getNewValue(),
+ death_date: deathDate.getNewValue(),
+ hair_color: hairColor.getNewValue(),
+ weight: weight.getNewValue(),
};
}
@@ -370,6 +399,11 @@ export const PerformerScrapeDialog: React.FC = (
result={birthdate}
onChange={(value) => setBirthdate(value)}
/>
+ setDeathDate(value)}
+ />
= (
result={country}
onChange={(value) => setCountry(value)}
/>
+ setHairColor(value)}
+ />
setEyeColor(value)}
/>
+ setWeight(value)}
+ />
= (
result={instagram}
onChange={(value) => setInstagram(value)}
/>
+ setDetails(value)}
+ />
{renderScrapedTagsRow(
tags,
(value) => setTags(value),
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 77838220c..70b5db8d5 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -336,8 +336,10 @@ export const SceneScrapeDialog: React.FC = (
try {
const result = await createStudio({
variables: {
- name: toCreate.name,
- url: toCreate.url,
+ input: {
+ name: toCreate.name,
+ url: toCreate.url,
+ },
},
});
@@ -362,7 +364,7 @@ export const SceneScrapeDialog: React.FC = (
try {
performerInput = Object.assign(performerInput, toCreate);
const result = await createPerformer({
- variables: performerInput,
+ variables: { input: performerInput },
});
// add the new performer to the new performers value
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 8ed94b245..e89840bca 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -381,7 +381,7 @@ export const PerformerSelect: React.FC = (props) => {
const onCreate = async (name: string) => {
const result = await createPerformer({
- variables: { name },
+ variables: { input: { name } },
});
return {
item: result.data!.performerCreate!,
@@ -415,7 +415,11 @@ export const StudioSelect: React.FC<
);
const onCreate = async (name: string) => {
- const result = await createStudio({ variables: { name } });
+ const result = await createStudio({
+ variables: {
+ input: { name },
+ },
+ });
return { item: result.data!.studioCreate!, message: "Created studio" };
};
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 67dc73454..0cd7c3813 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -45,6 +45,7 @@ export const Studio: React.FC = () => {
const [name, setName] = useState();
const [url, setUrl] = useState();
const [parentStudioId, setParentStudioId] = useState();
+ const [details, setDetails] = useState();
// Studio state
const [studio, setStudio] = useState>({});
@@ -63,6 +64,7 @@ export const Studio: React.FC = () => {
setName(state.name);
setUrl(state.url ?? undefined);
setParentStudioId(state?.parent_studio?.id ?? undefined);
+ setDetails(state.details ?? undefined);
}
function updateStudioData(studioData: Partial) {
@@ -117,6 +119,7 @@ export const Studio: React.FC = () => {
name,
url,
image,
+ details,
parent_id: parentStudioId ?? null,
};
@@ -301,6 +304,12 @@ export const Studio: React.FC = () => {
isEditing: !!isEditing,
onChange: setUrl,
})}
+ {TableUtils.renderTextArea({
+ title: "Details",
+ value: details,
+ isEditing: !!isEditing,
+ onChange: setDetails,
+ })}
Parent Studio
{renderStudio()}
diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
index c5deb3eee..41233e2ad 100755
--- a/ui/v2.5/src/components/Tagger/PerformerModal.tsx
+++ b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -85,6 +85,13 @@ const PerformerModal: React.FC = ({
text={performer.birthdate ?? "Unknown"}
/>
+
@@ -212,7 +212,6 @@ func makeXPathConfig() mappedPerformerScraperConfig {
config.mappedConfig["Piercings"] = makeSimpleAttrConfig(makeCommonXPath("Piercings:") + "/comment()")
config.mappedConfig["Details"] = makeSimpleAttrConfig(makeCommonXPath("Details:"))
config.mappedConfig["HairColor"] = makeSimpleAttrConfig(makeCommonXPath("Hair Color:"))
- config.mappedConfig["Weight"] = makeSimpleAttrConfig(makeCommonXPath("Weight:"))
// special handling for birthdate
birthdateAttrConfig := makeSimpleAttrConfig(makeCommonXPath("Date of Birth:"))
@@ -252,7 +251,7 @@ func makeXPathConfig() mappedPerformerScraperConfig {
config.mappedConfig["Gender"] = genderConfig
- // use fixed for height
+ // use fixed for Country
config.mappedConfig["Country"] = mappedScraperAttrConfig{
Fixed: "United States",
}
@@ -264,6 +263,13 @@ func makeXPathConfig() mappedPerformerScraperConfig {
}
config.mappedConfig["Height"] = heightConfig
+ weightConfig := makeSimpleAttrConfig(makeCommonXPath("Weight:"))
+ weightConvAction := postProcessLbToKg(true)
+ weightConfig.postProcessActions = []postProcessAction{
+ &weightConvAction,
+ }
+ config.mappedConfig["Weight"] = weightConfig
+
return config
}
@@ -317,10 +323,10 @@ func TestScrapePerformerXPath(t *testing.T) {
const tattoos = "None"
const piercings = ""
const gender = "Female"
- const height = "170"
+ const height = "170" // 5ft7
const details = "Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the ... arrow_drop_down Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the VR Porn movies – trust us. Ankles behind her neck and feet over her back so she can kiss her toes, turned, twisted and gyrating, she can fuck any which way she wants (and that ass!), will surely make you fall in love with this hot Virtual Reality Porn slut, as she is one of the finest of them all. Talking about perfection, maybe it’s all the acrobatic work that keeps it in such gorgeous shape? Who cares really, because you just want to take a big bite out of it and never let go. But it’s not all about the body. Mia’s also got a great smile, which might not sound kinky, but believe us, it is a smile that will heat up your innards and drop your pants. Is it her golden skin, her innocent pink lips or that heart-shaped face? There is just too much good stuff going on with Mia Malkova, which is maybe why these past few years have heaped awards upon awards on this Southern California native. Mia came to VR Bangers for her first VR Porn video, so you know she’s only going for top-notch scenes with top-game performers, men, and women. Better hit up that yoga studio if you ever dream of being able to bang a flexible and talented chick like lady Malkova."
const hairColor = "Blonde"
- const weight = "57"
+ const weight = "57" // 126 lb
verifyField(t, performerName, performer.Name, "Name")
verifyField(t, gender, performer.Gender, "Gender")
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index ceae9c844..18b534cff 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -1,6 +1,7 @@
### ✨ New Features
* Support serving UI from specific directory location.
* Added details, death date, hair color, and weight to Performers.
+* Added `lbToKg` post-process action for performer scrapers.
* Added details to Studios.
* Added [perceptual dupe checker](/sceneDuplicateChecker).
* Add various `count` filter criteria and sort options.
diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md
index 40171b62d..4d38b4fd9 100644
--- a/ui/v2.5/src/docs/en/Scraping.md
+++ b/ui/v2.5/src/docs/en/Scraping.md
@@ -346,19 +346,29 @@ The `Measurements` xpath string will replace `$infoPiece` with `//div[@class="in
Post-processing operations are contained in the `postProcess` key. Post-processing operations are performed in the order they are specified. The following post-processing operations are available:
* `feetToCm`: converts a string containing feet and inches numbers into centimetres. Looks for up to two separate integers and interprets the first as the number of feet, and the second as the number of inches. The numbers can be separated by any non-numeric character including the `.` character. It does not handle decimal numbers. For example `6.3` and `6ft3.3` would both be interpreted as 6 feet, 3 inches before converting into centimetres.
+* `lbToKg`: converts a string containing lbs to kg.
* `map`: contains a map of input values to output values. Where a value matches one of the input values, it is replaced with the matching output value. If no value is matched, then value is unmodified.
Example:
```yaml
performer:
Gender:
- selector: //div[class="example element"]
+ selector: //div[@class="example element"]
postProcess:
- map:
F: Female
M: Male
+ Height:
+ selector: //span[@id="height"]
+ postProcess:
+ - feetToCm: true
+ Weight:
+ selector: //span[@id="weight"]
+ postProcess:
+ - lbToKg: true
```
Gets the contents of the selected div element, and sets the returned value to `Female` if the scraped value is `F`; `Male` if the scraped value is `M`.
+Height and weight are extracted from the selected spans and converted to `cm` and `kg`.
* `parseDate`: if present, the value is the date format using go's reference date (2006-01-02). For example, if an example date was `14-Mar-2003`, then the date format would be `02-Jan-2006`. See the [time.Parse documentation](https://golang.org/pkg/time/#Parse) for details. When present, the scraper will convert the input string into a date, then convert it to the string format used by stash (`YYYY-MM-DD`). Strings "Today", "Yesterday" are matched (case insensitive) and converted by the scraper so you don't need to edit/replace them.
From eefc628cf06d16025a89f8b01de821e768134f2f Mon Sep 17 00:00:00 2001
From: stg-annon <14135675+stg-annon@users.noreply.github.com>
Date: Sun, 25 Apr 2021 23:37:31 -0400
Subject: [PATCH 46/66] update docs to match current functionality (#1339)
was wondering why `per_page:0` was not working it seems to have been updated to `per_page:-1` to return all results
---
graphql/schema/types/filters.graphql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index b0d124bbe..f62a61c52 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -6,7 +6,7 @@ enum SortDirectionEnum {
input FindFilterType {
q: String
page: Int
- """use per_page = 0 to indicate all results. Defaults to 25."""
+ """use per_page = -1 to indicate all results. Defaults to 25."""
per_page: Int
sort: String
direction: SortDirectionEnum
From 70b66d91a07b9166707b196db84e86362dd14927 Mon Sep 17 00:00:00 2001
From: julien0221 <68500525+julien0221@users.noreply.github.com>
Date: Mon, 26 Apr 2021 04:48:32 +0100
Subject: [PATCH 47/66] Added rating to performers and studios (#1308)
---
graphql/documents/data/performer-slim.graphql | 1 +
graphql/documents/data/performer.graphql | 1 +
graphql/documents/data/studio-slim.graphql | 1 +
graphql/documents/data/studio.graphql | 1 +
graphql/documents/mutations/studio.graphql | 8 +-
graphql/schema/types/filters.graphql | 4 +
graphql/schema/types/performer.graphql | 4 +
graphql/schema/types/studio.graphql | 3 +
pkg/api/resolver_model_performer.go | 8 ++
pkg/api/resolver_model_studio.go | 8 ++
pkg/api/resolver_mutation_performer.go | 7 ++
pkg/api/resolver_mutation_studio.go | 6 ++
pkg/database/database.go | 2 +-
.../22_performers_studios_rating.up.sql | 2 +
pkg/manager/jsonschema/performer.go | 1 +
pkg/manager/jsonschema/studio.go | 1 +
pkg/models/model_performer.go | 2 +
pkg/models/model_studio.go | 2 +
pkg/performer/export.go | 3 +
pkg/performer/export_test.go | 3 +
pkg/performer/import.go | 3 +
pkg/sqlite/performer.go | 1 +
pkg/sqlite/performer_test.go | 61 +++++++++++++++
pkg/sqlite/studio.go | 4 +-
pkg/sqlite/studio_test.go | 76 ++++++++++++++++++-
pkg/studio/export.go | 4 +
pkg/studio/export_test.go | 10 ++-
pkg/studio/import.go | 1 +
.../src/components/Changelog/versions/v070.md | 1 +
.../Performers/EditPerformersDialog.tsx | 55 +++++++++++++-
.../components/Performers/PerformerCard.tsx | 25 ++++--
.../PerformerDetailsPanel.tsx | 17 +++++
.../PerformerDetails/PerformerEditPanel.tsx | 45 ++++++++++-
ui/v2.5/src/components/Performers/styles.scss | 8 ++
ui/v2.5/src/components/Shared/Icon.tsx | 6 +-
ui/v2.5/src/components/Studios/StudioCard.tsx | 16 ++++
.../Studios/StudioDetails/Studio.tsx | 39 ++++++++++
ui/v2.5/src/docs/en/JSONSpec.md | 2 +
ui/v2.5/src/models/list-filter/filter.ts | 21 +++++
39 files changed, 438 insertions(+), 25 deletions(-)
create mode 100644 pkg/database/migrations/22_performers_studios_rating.up.sql
diff --git a/graphql/documents/data/performer-slim.graphql b/graphql/documents/data/performer-slim.graphql
index 603744d33..1420d15c4 100644
--- a/graphql/documents/data/performer-slim.graphql
+++ b/graphql/documents/data/performer-slim.graphql
@@ -12,4 +12,5 @@ fragment SlimPerformerData on Performer {
endpoint
stash_id
}
+ rating
}
diff --git a/graphql/documents/data/performer.graphql b/graphql/documents/data/performer.graphql
index 09b9e1e68..ef0dde256 100644
--- a/graphql/documents/data/performer.graphql
+++ b/graphql/documents/data/performer.graphql
@@ -31,6 +31,7 @@ fragment PerformerData on Performer {
stash_id
endpoint
}
+ rating
details
death_date
hair_color
diff --git a/graphql/documents/data/studio-slim.graphql b/graphql/documents/data/studio-slim.graphql
index 563375e78..f840ad2fb 100644
--- a/graphql/documents/data/studio-slim.graphql
+++ b/graphql/documents/data/studio-slim.graphql
@@ -10,4 +10,5 @@ fragment SlimStudioData on Studio {
id
}
details
+ rating
}
diff --git a/graphql/documents/data/studio.graphql b/graphql/documents/data/studio.graphql
index ae8d1d0d8..a9515c32d 100644
--- a/graphql/documents/data/studio.graphql
+++ b/graphql/documents/data/studio.graphql
@@ -32,4 +32,5 @@ fragment StudioData on Studio {
endpoint
}
details
+ rating
}
diff --git a/graphql/documents/mutations/studio.graphql b/graphql/documents/mutations/studio.graphql
index e4cffae84..6d1944dc1 100644
--- a/graphql/documents/mutations/studio.graphql
+++ b/graphql/documents/mutations/studio.graphql
@@ -1,14 +1,10 @@
-mutation StudioCreate(
- $input: StudioCreateInput!) {
-
+mutation StudioCreate($input: StudioCreateInput!) {
studioCreate(input: $input) {
...StudioData
}
}
-mutation StudioUpdate(
- $input: StudioUpdateInput!) {
-
+mutation StudioUpdate($input: StudioUpdateInput!) {
studioUpdate(input: $input) {
...StudioData
}
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index f62a61c52..8d8eb06a3 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -71,6 +71,8 @@ input PerformerFilterType {
gallery_count: IntCriterionInput
"""Filter by StashID"""
stash_id: String
+ """Filter by rating"""
+ rating: IntCriterionInput
"""Filter by url"""
url: StringCriterionInput
"""Filter by hair color"""
@@ -149,6 +151,8 @@ input StudioFilterType {
stash_id: String
"""Filter to only include studios missing this property"""
is_missing: String
+ """Filter by rating"""
+ rating: IntCriterionInput
"""Filter by scene count"""
scene_count: IntCriterionInput
"""Filter by image count"""
diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql
index e85bb5d9c..1e1fe3c03 100644
--- a/graphql/schema/types/performer.graphql
+++ b/graphql/schema/types/performer.graphql
@@ -35,6 +35,7 @@ type Performer {
gallery_count: Int # Resolver
scenes: [Scene!]!
stash_ids: [StashID!]!
+ rating: Int
details: String
death_date: String
hair_color: String
@@ -63,6 +64,7 @@ input PerformerCreateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ rating: Int
details: String
death_date: String
hair_color: String
@@ -92,6 +94,7 @@ input PerformerUpdateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ rating: Int
details: String
death_date: String
hair_color: String
@@ -118,6 +121,7 @@ input BulkPerformerUpdateInput {
instagram: String
favorite: Boolean
tag_ids: BulkUpdateIds
+ rating: Int
details: String
death_date: String
hair_color: String
diff --git a/graphql/schema/types/studio.graphql b/graphql/schema/types/studio.graphql
index 25145b823..26d280f06 100644
--- a/graphql/schema/types/studio.graphql
+++ b/graphql/schema/types/studio.graphql
@@ -11,6 +11,7 @@ type Studio {
image_count: Int # Resolver
gallery_count: Int # Resolver
stash_ids: [StashID!]!
+ rating: Int
details: String
}
@@ -21,6 +22,7 @@ input StudioCreateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ rating: Int
details: String
}
@@ -32,6 +34,7 @@ input StudioUpdateInput {
"""This should be a URL or a base64 encoded data URL"""
image: String
stash_ids: [StashIDInput!]
+ rating: Int
details: String
}
diff --git a/pkg/api/resolver_model_performer.go b/pkg/api/resolver_model_performer.go
index c74ffe95d..a5f8e4811 100644
--- a/pkg/api/resolver_model_performer.go
+++ b/pkg/api/resolver_model_performer.go
@@ -209,6 +209,14 @@ func (r *performerResolver) StashIds(ctx context.Context, obj *models.Performer)
return ret, nil
}
+func (r *performerResolver) Rating(ctx context.Context, obj *models.Performer) (*int, error) {
+ if obj.Rating.Valid {
+ rating := int(obj.Rating.Int64)
+ return &rating, nil
+ }
+ return nil, nil
+}
+
func (r *performerResolver) Details(ctx context.Context, obj *models.Performer) (*string, error) {
if obj.Details.Valid {
return &obj.Details.String, nil
diff --git a/pkg/api/resolver_model_studio.go b/pkg/api/resolver_model_studio.go
index da5a1b8b7..89d2c2bea 100644
--- a/pkg/api/resolver_model_studio.go
+++ b/pkg/api/resolver_model_studio.go
@@ -117,6 +117,14 @@ func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) (ret
return ret, nil
}
+func (r *studioResolver) Rating(ctx context.Context, obj *models.Studio) (*int, error) {
+ if obj.Rating.Valid {
+ rating := int(obj.Rating.Int64)
+ return &rating, nil
+ }
+ return nil, nil
+}
+
func (r *studioResolver) Details(ctx context.Context, obj *models.Studio) (*string, error) {
if obj.Details.Valid {
return &obj.Details.String, nil
diff --git a/pkg/api/resolver_mutation_performer.go b/pkg/api/resolver_mutation_performer.go
index 9b7feee5c..60af02780 100644
--- a/pkg/api/resolver_mutation_performer.go
+++ b/pkg/api/resolver_mutation_performer.go
@@ -85,6 +85,11 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
} else {
newPerformer.Favorite = sql.NullBool{Bool: false, Valid: true}
}
+ if input.Rating != nil {
+ newPerformer.Rating = sql.NullInt64{Int64: int64(*input.Rating), Valid: true}
+ } else {
+ newPerformer.Rating = sql.NullInt64{Valid: false}
+ }
if input.Details != nil {
newPerformer.Details = sql.NullString{String: *input.Details, Valid: true}
}
@@ -198,6 +203,7 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+ updatedPerformer.Rating = translator.nullInt64(input.Rating, "rating")
updatedPerformer.Details = translator.nullString(input.Details, "details")
updatedPerformer.DeathDate = translator.sqliteDate(input.DeathDate, "death_date")
updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
@@ -304,6 +310,7 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input models
updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+ updatedPerformer.Rating = translator.nullInt64(input.Rating, "rating")
updatedPerformer.Details = translator.nullString(input.Details, "details")
updatedPerformer.DeathDate = translator.sqliteDate(input.DeathDate, "death_date")
updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
diff --git a/pkg/api/resolver_mutation_studio.go b/pkg/api/resolver_mutation_studio.go
index 8ec804765..7b06485b4 100644
--- a/pkg/api/resolver_mutation_studio.go
+++ b/pkg/api/resolver_mutation_studio.go
@@ -42,6 +42,11 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
newStudio.ParentID = sql.NullInt64{Int64: parentID, Valid: true}
}
+ if input.Rating != nil {
+ newStudio.Rating = sql.NullInt64{Int64: int64(*input.Rating), Valid: true}
+ } else {
+ newStudio.Rating = sql.NullInt64{Valid: false}
+ }
if input.Details != nil {
newStudio.Details = sql.NullString{String: *input.Details, Valid: true}
}
@@ -115,6 +120,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
updatedStudio.URL = translator.nullString(input.URL, "url")
updatedStudio.Details = translator.nullString(input.Details, "details")
updatedStudio.ParentID = translator.nullInt64FromString(input.ParentID, "parent_id")
+ updatedStudio.Rating = translator.nullInt64(input.Rating, "rating")
// Start the transaction and save the studio
var studio *models.Studio
diff --git a/pkg/database/database.go b/pkg/database/database.go
index d210e1215..e3ddff607 100644
--- a/pkg/database/database.go
+++ b/pkg/database/database.go
@@ -23,7 +23,7 @@ import (
var DB *sqlx.DB
var WriteMu *sync.Mutex
var dbPath string
-var appSchemaVersion uint = 21
+var appSchemaVersion uint = 22
var databaseSchemaVersion uint
var (
diff --git a/pkg/database/migrations/22_performers_studios_rating.up.sql b/pkg/database/migrations/22_performers_studios_rating.up.sql
new file mode 100644
index 000000000..d87d08f65
--- /dev/null
+++ b/pkg/database/migrations/22_performers_studios_rating.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `performers` ADD COLUMN `rating` tinyint;
+ALTER TABLE `studios` ADD COLUMN `rating` tinyint;
diff --git a/pkg/manager/jsonschema/performer.go b/pkg/manager/jsonschema/performer.go
index a12a617db..0ff38bff6 100644
--- a/pkg/manager/jsonschema/performer.go
+++ b/pkg/manager/jsonschema/performer.go
@@ -30,6 +30,7 @@ type Performer struct {
Image string `json:"image,omitempty"`
CreatedAt models.JSONTime `json:"created_at,omitempty"`
UpdatedAt models.JSONTime `json:"updated_at,omitempty"`
+ Rating int `json:"rating,omitempty"`
Details string `json:"details,omitempty"`
DeathDate string `json:"death_date,omitempty"`
HairColor string `json:"hair_color,omitempty"`
diff --git a/pkg/manager/jsonschema/studio.go b/pkg/manager/jsonschema/studio.go
index d3e55cb08..82a7e740a 100644
--- a/pkg/manager/jsonschema/studio.go
+++ b/pkg/manager/jsonschema/studio.go
@@ -15,6 +15,7 @@ type Studio struct {
Image string `json:"image,omitempty"`
CreatedAt models.JSONTime `json:"created_at,omitempty"`
UpdatedAt models.JSONTime `json:"updated_at,omitempty"`
+ Rating int `json:"rating,omitempty"`
Details string `json:"details,omitempty"`
}
diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go
index 0a0ce3f09..eefce07de 100644
--- a/pkg/models/model_performer.go
+++ b/pkg/models/model_performer.go
@@ -29,6 +29,7 @@ type Performer struct {
Favorite sql.NullBool `db:"favorite" json:"favorite"`
CreatedAt SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Rating sql.NullInt64 `db:"rating" json:"rating"`
Details sql.NullString `db:"details" json:"details"`
DeathDate SQLiteDate `db:"death_date" json:"death_date"`
HairColor sql.NullString `db:"hair_color" json:"hair_color"`
@@ -57,6 +58,7 @@ type PerformerPartial struct {
Favorite *sql.NullBool `db:"favorite" json:"favorite"`
CreatedAt *SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt *SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Rating *sql.NullInt64 `db:"rating" json:"rating"`
Details *sql.NullString `db:"details" json:"details"`
DeathDate *SQLiteDate `db:"death_date" json:"death_date"`
HairColor *sql.NullString `db:"hair_color" json:"hair_color"`
diff --git a/pkg/models/model_studio.go b/pkg/models/model_studio.go
index 6336d9163..769acb8e2 100644
--- a/pkg/models/model_studio.go
+++ b/pkg/models/model_studio.go
@@ -15,6 +15,7 @@ type Studio struct {
ParentID sql.NullInt64 `db:"parent_id,omitempty" json:"parent_id"`
CreatedAt SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Rating sql.NullInt64 `db:"rating" json:"rating"`
Details sql.NullString `db:"details" json:"details"`
}
@@ -26,6 +27,7 @@ type StudioPartial struct {
ParentID *sql.NullInt64 `db:"parent_id,omitempty" json:"parent_id"`
CreatedAt *SQLiteTimestamp `db:"created_at" json:"created_at"`
UpdatedAt *SQLiteTimestamp `db:"updated_at" json:"updated_at"`
+ Rating *sql.NullInt64 `db:"rating" json:"rating"`
Details *sql.NullString `db:"details" json:"details"`
}
diff --git a/pkg/performer/export.go b/pkg/performer/export.go
index 8433353a7..555abe58d 100644
--- a/pkg/performer/export.go
+++ b/pkg/performer/export.go
@@ -66,6 +66,9 @@ func ToJSON(reader models.PerformerReader, performer *models.Performer) (*jsonsc
if performer.Favorite.Valid {
newPerformerJSON.Favorite = performer.Favorite.Bool
}
+ if performer.Rating.Valid {
+ newPerformerJSON.Rating = int(performer.Rating.Int64)
+ }
if performer.Details.Valid {
newPerformerJSON.Details = performer.Details.String
}
diff --git a/pkg/performer/export_test.go b/pkg/performer/export_test.go
index 0f082163e..0d143b2d5 100644
--- a/pkg/performer/export_test.go
+++ b/pkg/performer/export_test.go
@@ -36,6 +36,7 @@ const (
piercings = "piercings"
tattoos = "tattoos"
twitter = "twitter"
+ rating = 5
details = "details"
hairColor = "hairColor"
weight = 60
@@ -86,6 +87,7 @@ func createFullPerformer(id int, name string) *models.Performer {
UpdatedAt: models.SQLiteTimestamp{
Timestamp: updateTime,
},
+ Rating: models.NullInt64(rating),
Details: models.NullString(details),
DeathDate: deathDate,
HairColor: models.NullString(hairColor),
@@ -133,6 +135,7 @@ func createFullJSONPerformer(name string, image string) *jsonschema.Performer {
UpdatedAt: models.JSONTime{
Time: updateTime,
},
+ Rating: rating,
Image: image,
Details: details,
DeathDate: deathDate.String,
diff --git a/pkg/performer/import.go b/pkg/performer/import.go
index 09e0a56a2..db32e1286 100644
--- a/pkg/performer/import.go
+++ b/pkg/performer/import.go
@@ -224,6 +224,9 @@ func performerJSONToPerformer(performerJSON jsonschema.Performer) models.Perform
if performerJSON.Instagram != "" {
newPerformer.Instagram = sql.NullString{String: performerJSON.Instagram, Valid: true}
}
+ if performerJSON.Rating != 0 {
+ newPerformer.Rating = sql.NullInt64{Int64: int64(performerJSON.Rating), Valid: true}
+ }
if performerJSON.Details != "" {
newPerformer.Details = sql.NullString{String: performerJSON.Details, Valid: true}
}
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index a631f1ad1..1fbf8a87b 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -279,6 +279,7 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.handleStringCriterionInput(performerFilter.CareerLength, tableName+".career_length")
query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos")
query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings")
+ query.handleIntCriterionInput(performerFilter.Rating, tableName+".rating")
query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color")
query.handleStringCriterionInput(performerFilter.URL, tableName+".url")
query.handleIntCriterionInput(performerFilter.Weight, tableName+".weight")
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 71237831c..4d7833b3d 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -617,6 +617,67 @@ func TestPerformerStashIDs(t *testing.T) {
t.Error(err.Error())
}
}
+func TestPerformerQueryRating(t *testing.T) {
+ const rating = 3
+ ratingCriterion := models.IntCriterionInput{
+ Value: rating,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierIsNull
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotNull
+ verifyPerformersRating(t, ratingCriterion)
+}
+
+func verifyPerformersRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ Rating: &ratingCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+
+ for _, performer := range performers {
+ verifyInt64(t, performer.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestPerformerQueryIsMissingRating(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ isMissing := "rating"
+ performerFilter := models.PerformerFilterType{
+ IsMissing: &isMissing,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+
+ assert.True(t, len(performers) > 0)
+
+ for _, performer := range performers {
+ assert.True(t, !performer.Rating.Valid)
+ }
+
+ return nil
+ })
+}
// TODO Update
// TODO Destroy
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 2ec5f82c2..be9c6eca1 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -183,10 +183,12 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF
query.addArg(stashIDFilter)
}
+ if rating := studioFilter.Rating; rating != nil {
+ query.handleIntCriterionInput(studioFilter.Rating, "studios.rating")
+ }
query.handleCountCriterion(studioFilter.SceneCount, studioTable, sceneTable, studioIDColumn)
query.handleCountCriterion(studioFilter.ImageCount, studioTable, imageTable, studioIDColumn)
query.handleCountCriterion(studioFilter.GalleryCount, studioTable, galleryTable, studioIDColumn)
-
query.handleStringCriterionInput(studioFilter.URL, "studios.url")
if isMissingFilter := studioFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index de947ee82..cf0fc5096 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -482,17 +482,42 @@ func TestStudioQueryURL(t *testing.T) {
verifyStudioQuery(t, filter, verifyFn)
}
+func TestStudioQueryRating(t *testing.T) {
+ const rating = 3
+ ratingCriterion := models.IntCriterionInput{
+ Value: rating,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierIsNull
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotNull
+ verifyStudiosRating(t, ratingCriterion)
+}
+
func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn func(s *models.Studio)) {
withTxn(func(r models.Repository) error {
t.Helper()
sqb := r.Studio()
- galleries := queryStudio(t, sqb, &filter, nil)
+ studios := queryStudio(t, sqb, &filter, nil)
// assume it should find at least one
- assert.Greater(t, len(galleries), 0)
+ assert.Greater(t, len(studios), 0)
- for _, studio := range galleries {
+ for _, studio := range studios {
verifyFn(studio)
}
@@ -500,6 +525,51 @@ func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn fu
})
}
+func verifyStudiosRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ Rating: &ratingCriterion,
+ }
+
+ studios, _, err := sqb.Query(&studioFilter, nil)
+
+ if err != nil {
+ t.Errorf("Error querying studio: %s", err.Error())
+ }
+
+ for _, studio := range studios {
+ verifyInt64(t, studio.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryIsMissingRating(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ isMissing := "rating"
+ studioFilter := models.StudioFilterType{
+ IsMissing: &isMissing,
+ }
+
+ studios, _, err := sqb.Query(&studioFilter, nil)
+
+ if err != nil {
+ t.Errorf("Error querying studio: %s", err.Error())
+ }
+
+ assert.True(t, len(studios) > 0)
+
+ for _, studio := range studios {
+ assert.True(t, !studio.Rating.Valid)
+ }
+
+ return nil
+ })
+}
+
func queryStudio(t *testing.T, sqb models.StudioReader, studioFilter *models.StudioFilterType, findFilter *models.FindFilterType) []*models.Studio {
studios, _, err := sqb.Query(studioFilter, findFilter)
if err != nil {
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index 5f1e3008f..dc71fd915 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -38,6 +38,10 @@ func ToJSON(reader models.StudioReader, studio *models.Studio) (*jsonschema.Stud
}
}
+ if studio.Rating.Valid {
+ newStudioJSON.Rating = int(studio.Rating.Int64)
+ }
+
image, err := reader.GetImage(studio.ID)
if err != nil {
return nil, fmt.Errorf("error getting studio image: %s", err.Error())
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index 1a453ec2d..516c3714e 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -25,10 +25,10 @@ const (
)
const (
- studioName = "testStudio"
- url = "url"
- details = "details"
-
+ studioName = "testStudio"
+ url = "url"
+ details = "details"
+ rating = 5
parentStudioName = "parentStudio"
)
@@ -55,6 +55,7 @@ func createFullStudio(id int, parentID int) models.Studio {
UpdatedAt: models.SQLiteTimestamp{
Timestamp: updateTime,
},
+ Rating: models.NullInt64(rating),
}
if parentID != 0 {
@@ -89,6 +90,7 @@ func createFullJSONStudio(parentStudio, image string) *jsonschema.Studio {
},
ParentStudio: parentStudio,
Image: image,
+ Rating: rating,
}
}
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index 6e38290f6..f509c0626 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -31,6 +31,7 @@ func (i *Importer) PreImport() error {
Details: sql.NullString{String: i.Input.Details, Valid: true},
CreatedAt: models.SQLiteTimestamp{Timestamp: i.Input.CreatedAt.GetTime()},
UpdatedAt: models.SQLiteTimestamp{Timestamp: i.Input.UpdatedAt.GetTime()},
+ Rating: sql.NullInt64{Int64: int64(i.Input.Rating), Valid: true},
}
if err := i.populateParentStudio(); err != nil {
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 18b534cff..f4c0aa656 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -1,4 +1,5 @@
### ✨ New Features
+* Added rating field to performers and studios.
* Support serving UI from specific directory location.
* Added details, death date, hair color, and weight to Performers.
* Added `lbToKg` post-process action for performer scrapers.
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index e0f6d03a3..aecde2db2 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -1,11 +1,13 @@
import React, { useEffect, useState } from "react";
-import { Form } from "react-bootstrap";
+import { Form, Col, Row } from "react-bootstrap";
import _ from "lodash";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
+import { FormUtils } from "src/utils";
import MultiSet from "../Shared/MultiSet";
+import { RatingStars } from "../Scenes/SceneDetails/RatingStars";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@@ -16,7 +18,7 @@ export const EditPerformersDialog: React.FC = (
props: IListOperationProps
) => {
const Toast = useToast();
-
+ const [rating, setRating] = useState();
const [tagMode, setTagMode] = React.useState(
GQL.BulkUpdateIdMode.Add
);
@@ -43,6 +45,7 @@ export const EditPerformersDialog: React.FC = (
function getPerformerInput(): GQL.BulkPerformerUpdateInput {
// need to determine what we are actually setting on each performer
const aggregateTagIds = getTagIds(props.selected);
+ const aggregateRating = getRating(props.selected);
const performerInput: GQL.BulkPerformerUpdateInput = {
ids: props.selected.map((performer) => {
@@ -50,6 +53,19 @@ export const EditPerformersDialog: React.FC = (
}),
};
+ // if rating is undefined
+ if (rating === undefined) {
+ // and all galleries have the same rating, then we are unsetting the rating.
+ if (aggregateRating) {
+ // null to unset rating
+ performerInput.rating = null;
+ }
+ // otherwise not setting the rating
+ } else {
+ // if rating is set, then we are setting the rating for all
+ performerInput.rating = rating;
+ }
+
// if tagIds non-empty, then we are setting them
if (
tagMode === GQL.BulkUpdateIdMode.Set &&
@@ -106,19 +122,38 @@ export const EditPerformersDialog: React.FC = (
return ret;
}
+ function getRating(state: GQL.SlimPerformerDataFragment[]) {
+ let ret: number | undefined;
+ let first = true;
+
+ state.forEach((performer) => {
+ if (first) {
+ ret = performer.rating ?? undefined;
+ first = false;
+ } else if (ret !== performer.rating) {
+ ret = undefined;
+ }
+ });
+
+ return ret;
+ }
+
useEffect(() => {
const state = props.selected;
let updateTagIds: string[] = [];
let updateFavorite: boolean | undefined;
+ let updateRating: number | undefined;
let first = true;
state.forEach((performer: GQL.SlimPerformerDataFragment) => {
const performerTagIDs = (performer.tags ?? []).map((p) => p.id).sort();
+ const performerRating = performer.rating;
if (first) {
updateTagIds = performerTagIDs;
first = false;
updateFavorite = performer.favorite;
+ updateRating = performerRating ?? undefined;
} else {
if (!_.isEqual(performerTagIDs, updateTagIds)) {
updateTagIds = [];
@@ -126,6 +161,9 @@ export const EditPerformersDialog: React.FC = (
if (performer.favorite !== updateFavorite) {
updateFavorite = undefined;
}
+ if (performerRating !== updateRating) {
+ updateRating = undefined;
+ }
}
});
@@ -133,6 +171,7 @@ export const EditPerformersDialog: React.FC = (
setTagIds(updateTagIds);
}
setFavorite(updateFavorite);
+ setRating(updateRating);
}, [props.selected, tagMode]);
useEffect(() => {
@@ -201,6 +240,18 @@ export const EditPerformersDialog: React.FC = (
}}
isRunning={isUpdating}
>
+
+ {FormUtils.renderLabel({
+ title: "Rating",
+ })}
+ setRating(value)}
+ disabled={isUpdating}
+ />
+
+
+
+ Rating:
+
+ setRating(value ?? NaN)}
+ />
+
+
{!isEditing && renderStashIDs()}
diff --git a/ui/v2.5/src/docs/en/JSONSpec.md b/ui/v2.5/src/docs/en/JSONSpec.md
index e83141891..9d65970fe 100644
--- a/ui/v2.5/src/docs/en/JSONSpec.md
+++ b/ui/v2.5/src/docs/en/JSONSpec.md
@@ -67,6 +67,7 @@ piercings
image (base64 encoding of the image file)
created_at
updated_at
+rating (integer)
details
```
@@ -77,6 +78,7 @@ url
image (base64 encoding of the image file)
created_at
updated_at
+rating (integer)
details
```
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 70dc2fee1..0d3fe79b6 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -202,6 +202,7 @@ export class ListFilterModel {
"scenes_count",
"tag_count",
"random",
+ "rating",
];
this.displayModeOptions = [DisplayMode.Grid, DisplayMode.List];
@@ -231,6 +232,7 @@ export class ListFilterModel {
new GenderCriterionOption(),
new PerformerIsMissingCriterionOption(),
new TagsCriterionOption(),
+ new RatingCriterionOption(),
ListFilterModel.createCriterionOption("url"),
ListFilterModel.createCriterionOption("tag_count"),
ListFilterModel.createCriterionOption("scene_count"),
@@ -244,6 +246,8 @@ export class ListFilterModel {
break;
}
case FilterMode.Studios:
+ this.sortBy = "name";
+ this.sortByOptions = ["name", "random", "rating", "scenes_count"];
this.sortBy = defaultSort ?? "name";
this.sortByOptions = [
"name",
@@ -257,6 +261,7 @@ export class ListFilterModel {
new NoneCriterionOption(),
new ParentStudiosCriterionOption(),
new StudioIsMissingCriterionOption(),
+ new RatingCriterionOption(),
ListFilterModel.createCriterionOption("scene_count"),
ListFilterModel.createCriterionOption("image_count"),
ListFilterModel.createCriterionOption("gallery_count"),
@@ -777,6 +782,14 @@ export class ListFilterModel {
};
break;
}
+ case "rating": {
+ const ratingCrit = criterion as RatingCriterion;
+ result.rating = {
+ value: ratingCrit.value,
+ modifier: ratingCrit.modifier,
+ };
+ break;
+ }
case "url": {
const urlCrit = criterion as StringCriterion;
result.url = {
@@ -1040,6 +1053,14 @@ export class ListFilterModel {
};
break;
}
+ case "rating": {
+ const ratingCrit = criterion as RatingCriterion;
+ result.rating = {
+ value: ratingCrit.value,
+ modifier: ratingCrit.modifier,
+ };
+ break;
+ }
case "url": {
const urlCrit = criterion as StringCriterion;
result.url = {
From fe0c5615a66156b861b0810259afe7edfe501e7b Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:12:35 +1000
Subject: [PATCH 48/66] Memo-ise list hook functions (#1329)
---
ui/v2.5/src/hooks/ListHook.tsx | 52 +++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index 5aec643ff..c2891c4ff 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -1,6 +1,12 @@
import _ from "lodash";
import queryString from "query-string";
-import React, { useCallback, useRef, useState, useEffect } from "react";
+import React, {
+ useCallback,
+ useRef,
+ useState,
+ useEffect,
+ useMemo,
+} from "react";
import { ApolloError } from "@apollo/client";
import { useHistory, useLocation } from "react-router-dom";
import Mousetrap from "mousetrap";
@@ -525,26 +531,34 @@ const useList = (
options.persistState,
]);
- function updateQueryParams(listFilter: ListFilterModel) {
- setFilter(listFilter);
- const newLocation = { ...location };
- newLocation.search = listFilter.makeQueryParameters();
- history.replace(newLocation);
- if (options.persistState) {
- updateInterfaceConfig(listFilter, options.persistState);
- }
- }
+ const updateQueryParams = useCallback(
+ (listFilter: ListFilterModel) => {
+ setFilter(listFilter);
+ const newLocation = { ...location };
+ newLocation.search = listFilter.makeQueryParameters();
+ history.replace(newLocation);
+ if (options.persistState) {
+ updateInterfaceConfig(listFilter, options.persistState);
+ }
+ },
+ [setFilter, history, location, options.persistState, updateInterfaceConfig]
+ );
- const onChangePage = (page: number) => {
- const newFilter = _.cloneDeep(filter);
- newFilter.currentPage = page;
- updateQueryParams(newFilter);
- window.scrollTo(0, 0);
- };
+ const onChangePage = useCallback(
+ (page: number) => {
+ const newFilter = _.cloneDeep(filter);
+ newFilter.currentPage = page;
+ updateQueryParams(newFilter);
+ window.scrollTo(0, 0);
+ },
+ [filter, updateQueryParams]
+ );
- const renderFilter = !options.filterHook
- ? filter
- : options.filterHook(_.cloneDeep(filter));
+ const renderFilter = useMemo(() => {
+ return !options.filterHook
+ ? filter
+ : options.filterHook(_.cloneDeep(filter));
+ }, [filter, options]);
const { contentTemplate, onSelectChange } = RenderList({
...options,
From 210feb4034e1ba5c80c84ed48be63e70801f2b3d Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:27:47 +1000
Subject: [PATCH 49/66] Apply scene queuing for all scene listviews (#1332)
* Apply queue population for all scene list views
* Add missing localisation strings
---
ui/v2.5/src/components/Scenes/SceneCard.tsx | 13 ++-
.../src/components/Scenes/SceneCardsGrid.tsx | 14 +--
ui/v2.5/src/components/Scenes/SceneList.tsx | 28 +++---
.../src/components/Scenes/SceneListTable.tsx | 93 ++++++++++---------
ui/v2.5/src/components/Tagger/Tagger.tsx | 25 +++--
ui/v2.5/src/components/Wall/WallItem.tsx | 7 +-
ui/v2.5/src/components/Wall/WallPanel.tsx | 4 +
ui/v2.5/src/locale/en-GB.json | 2 +
ui/v2.5/src/locale/en-US.json | 2 +
ui/v2.5/src/models/sceneQueue.ts | 41 +++++---
10 files changed, 134 insertions(+), 95 deletions(-)
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index 49bee3148..d09697cac 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -12,6 +12,7 @@ import {
TruncatedText,
} from "src/components/Shared";
import { TextUtils } from "src/utils";
+import { SceneQueue } from "src/models/sceneQueue";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
interface IScenePreviewProps {
@@ -65,12 +66,13 @@ export const ScenePreview: React.FC = ({
interface ISceneCardProps {
scene: GQL.SlimSceneDataFragment;
+ index?: number;
+ queue?: SceneQueue;
compact?: boolean;
selecting?: boolean;
selected?: boolean | undefined;
zoomIndex?: number;
onSelectedChanged?: (selected: boolean, shiftKey: boolean) => void;
- onSceneClicked?: () => void;
}
export const SceneCard: React.FC = (
@@ -300,9 +302,6 @@ export const SceneCard: React.FC = (
if (props.selecting && props.onSelectedChanged) {
props.onSelectedChanged(!props.selected, shiftKey);
event.preventDefault();
- } else if (props.onSceneClicked) {
- props.onSceneClicked();
- event.preventDefault();
}
}
@@ -340,6 +339,10 @@ export const SceneCard: React.FC = (
let shiftKey = false;
+ const sceneLink = props.queue
+ ? props.queue.makeLink(props.scene.id, { sceneIndex: props.index })
+ : `/scenes/${props.scene.id}`;
+
return (
= (
+
-
- 
-
-
- ));
-
- return (
-
-
-
-
-
- ));
-
- return (
-
-
-
-
-
- ));
-
- return (
-
+
+
+
+
+ ));
+
+ return (
+ Social Network Links:
@@ -194,6 +210,9 @@ func makeXPathConfig() mappedPerformerScraperConfig {
config.mappedConfig["FakeTits"] = makeSimpleAttrConfig(makeCommonXPath("Fake boobs:"))
config.mappedConfig["Tattoos"] = makeSimpleAttrConfig(makeCommonXPath("Tattoos:"))
config.mappedConfig["Piercings"] = makeSimpleAttrConfig(makeCommonXPath("Piercings:") + "/comment()")
+ config.mappedConfig["Details"] = makeSimpleAttrConfig(makeCommonXPath("Details:"))
+ config.mappedConfig["HairColor"] = makeSimpleAttrConfig(makeCommonXPath("Hair Color:"))
+ config.mappedConfig["Weight"] = makeSimpleAttrConfig(makeCommonXPath("Weight:"))
// special handling for birthdate
birthdateAttrConfig := makeSimpleAttrConfig(makeCommonXPath("Date of Birth:"))
@@ -299,6 +318,9 @@ func TestScrapePerformerXPath(t *testing.T) {
const piercings = ""
const gender = "Female"
const height = "170"
+ const details = "Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the ... arrow_drop_down Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the VR Porn movies – trust us. Ankles behind her neck and feet over her back so she can kiss her toes, turned, twisted and gyrating, she can fuck any which way she wants (and that ass!), will surely make you fall in love with this hot Virtual Reality Porn slut, as she is one of the finest of them all. Talking about perfection, maybe it’s all the acrobatic work that keeps it in such gorgeous shape? Who cares really, because you just want to take a big bite out of it and never let go. But it’s not all about the body. Mia’s also got a great smile, which might not sound kinky, but believe us, it is a smile that will heat up your innards and drop your pants. Is it her golden skin, her innocent pink lips or that heart-shaped face? There is just too much good stuff going on with Mia Malkova, which is maybe why these past few years have heaped awards upon awards on this Southern California native. Mia came to VR Bangers for her first VR Porn video, so you know she’s only going for top-notch scenes with top-game performers, men, and women. Better hit up that yoga studio if you ever dream of being able to bang a flexible and talented chick like lady Malkova."
+ const hairColor = "Blonde"
+ const weight = "57"
verifyField(t, performerName, performer.Name, "Name")
verifyField(t, gender, performer.Gender, "Gender")
@@ -317,6 +339,9 @@ func TestScrapePerformerXPath(t *testing.T) {
verifyField(t, tattoos, performer.Tattoos, "Tattoos")
verifyField(t, piercings, performer.Piercings, "Piercings")
verifyField(t, height, performer.Height, "Height")
+ verifyField(t, details, performer.Details, "Details")
+ verifyField(t, hairColor, performer.HairColor, "HairColor")
+ verifyField(t, weight, performer.Weight, "Weight")
}
func TestConcatXPath(t *testing.T) {
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index fd744f983..bbfcbee92 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -4,7 +4,6 @@ import (
"database/sql"
"fmt"
"strconv"
- "time"
"github.com/stashapp/stash/pkg/models"
)
@@ -209,7 +208,13 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
}
if birthYear := performerFilter.BirthYear; birthYear != nil {
- clauses, thisArgs := getBirthYearFilterClause(birthYear.Modifier, birthYear.Value)
+ clauses, thisArgs := getYearFilterClause(birthYear.Modifier, birthYear.Value, "birthdate")
+ query.addWhere(clauses...)
+ query.addArg(thisArgs...)
+ }
+
+ if deathYear := performerFilter.DeathYear; deathYear != nil {
+ clauses, thisArgs := getYearFilterClause(deathYear.Modifier, deathYear.Value, "death_date")
query.addWhere(clauses...)
query.addArg(thisArgs...)
}
@@ -254,6 +259,8 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.handleStringCriterionInput(performerFilter.CareerLength, tableName+".career_length")
query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos")
query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings")
+ query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color")
+ query.handleStringCriterionInput(performerFilter.Weight, tableName+".weight")
query.handleStringCriterionInput(performerFilter.URL, tableName+".url")
// TODO - need better handling of aliases
@@ -294,7 +301,7 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
return performers, countResult, nil
}
-func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value int) ([]string, []interface{}) {
+func getYearFilterClause(criterionModifier models.CriterionModifier, value int, col string) ([]string, []interface{}) {
var clauses []string
var args []interface{}
@@ -306,22 +313,22 @@ func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value
switch modifier {
case "EQUALS":
// between yyyy-01-01 and yyyy-12-31
- clauses = append(clauses, "performers.birthdate >= ?")
- clauses = append(clauses, "performers.birthdate <= ?")
+ clauses = append(clauses, "performers."+col+" >= ?")
+ clauses = append(clauses, "performers."+col+" <= ?")
args = append(args, startOfYear)
args = append(args, endOfYear)
case "NOT_EQUALS":
// outside of yyyy-01-01 to yyyy-12-31
- clauses = append(clauses, "performers.birthdate < ? OR performers.birthdate > ?")
+ clauses = append(clauses, "performers."+col+" < ? OR performers."+col+" > ?")
args = append(args, startOfYear)
args = append(args, endOfYear)
case "GREATER_THAN":
// > yyyy-12-31
- clauses = append(clauses, "performers.birthdate > ?")
+ clauses = append(clauses, "performers."+col+" > ?")
args = append(args, endOfYear)
case "LESS_THAN":
// < yyyy-01-01
- clauses = append(clauses, "performers.birthdate < ?")
+ clauses = append(clauses, "performers."+col+" < ?")
args = append(args, startOfYear)
}
}
@@ -332,33 +339,23 @@ func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value
func getAgeFilterClause(criterionModifier models.CriterionModifier, value int) ([]string, []interface{}) {
var clauses []string
var args []interface{}
+ var clause string
- // get the date at which performer would turn the age specified
- dt := time.Now()
- birthDate := dt.AddDate(-value-1, 0, 0)
- yearAfter := birthDate.AddDate(1, 0, 0)
+ if criterionModifier.IsValid() {
+ switch criterionModifier {
+ case models.CriterionModifierEquals:
+ clause = " == ?"
+ case models.CriterionModifierNotEquals:
+ clause = " != ?"
+ case models.CriterionModifierGreaterThan:
+ clause = " > ?"
+ case models.CriterionModifierLessThan:
+ clause = " < ?"
+ }
- if modifier := criterionModifier.String(); criterionModifier.IsValid() {
- switch modifier {
- case "EQUALS":
- // between birthDate and yearAfter
- clauses = append(clauses, "performers.birthdate >= ?")
- clauses = append(clauses, "performers.birthdate < ?")
- args = append(args, birthDate)
- args = append(args, yearAfter)
- case "NOT_EQUALS":
- // outside of birthDate and yearAfter
- clauses = append(clauses, "performers.birthdate < ? OR performers.birthdate >= ?")
- args = append(args, birthDate)
- args = append(args, yearAfter)
- case "GREATER_THAN":
- // < birthDate
- clauses = append(clauses, "performers.birthdate < ?")
- args = append(args, birthDate)
- case "LESS_THAN":
- // > yearAfter
- clauses = append(clauses, "performers.birthdate >= ?")
- args = append(args, yearAfter)
+ if clause != "" {
+ clauses = append(clauses, "cast(IFNULL(strftime('%Y.%m%d', performers.death_date), strftime('%Y.%m%d', 'now')) - strftime('%Y.%m%d', performers.birthdate) as int)"+clause)
+ args = append(args, value)
}
}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 8fb1a7df3..d2f32182b 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -214,10 +214,16 @@ func verifyPerformerAge(t *testing.T, ageCriterion models.IntCriterionInput) {
now := time.Now()
for _, performer := range performers {
+ cd := now
+
+ if performer.DeathDate.Valid {
+ cd, _ = time.Parse("2006-01-02", performer.DeathDate.String)
+ }
+
bd := performer.Birthdate.String
d, _ := time.Parse("2006-01-02", bd)
- age := now.Year() - d.Year()
- if now.YearDay() < d.YearDay() {
+ age := cd.Year() - d.Year()
+ if cd.YearDay() < d.YearDay() {
age = age - 1
}
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index c61f71eb0..c0c36922f 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -558,10 +558,10 @@ func verifyInt(t *testing.T, value int, criterion models.IntCriterionInput) {
assert.NotEqual(criterion.Value, value)
}
if criterion.Modifier == models.CriterionModifierGreaterThan {
- assert.True(value > criterion.Value)
+ assert.Greater(value, criterion.Value)
}
if criterion.Modifier == models.CriterionModifierLessThan {
- assert.True(value < criterion.Value)
+ assert.Less(value, criterion.Value)
}
}
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 7996f9516..f8a630095 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -657,6 +657,19 @@ func getPerformerBirthdate(index int) string {
return birthdate.Format("2006-01-02")
}
+func getPerformerDeathDate(index int) models.SQLiteDate {
+ if index != 5 {
+ return models.SQLiteDate{}
+ }
+
+ deathDate := time.Now()
+ deathDate = deathDate.AddDate(-index+1, -1, -1)
+ return models.SQLiteDate{
+ String: deathDate.Format("2006-01-02"),
+ Valid: true,
+ }
+}
+
func getPerformerCareerLength(index int) *string {
if index%5 == 0 {
return nil
@@ -691,6 +704,8 @@ func createPerformers(pqb models.PerformerReaderWriter, n int, o int) error {
String: getPerformerBirthdate(i),
Valid: true,
},
+ DeathDate: getPerformerDeathDate(i),
+ Details: sql.NullString{String: getPerformerStringValue(i, "Details"), Valid: true},
}
careerLength := getPerformerCareerLength(i)
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index f7e72d53d..5f1e3008f 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -23,6 +23,10 @@ func ToJSON(reader models.StudioReader, studio *models.Studio) (*jsonschema.Stud
newStudioJSON.URL = studio.URL.String
}
+ if studio.Details.Valid {
+ newStudioJSON.Details = studio.Details.String
+ }
+
if studio.ParentID.Valid {
parent, err := reader.Find(int(studio.ParentID.Int64))
if err != nil {
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index 72807df48..1a453ec2d 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -24,10 +24,13 @@ const (
errParentStudioID = 12
)
-const studioName = "testStudio"
-const url = "url"
+const (
+ studioName = "testStudio"
+ url = "url"
+ details = "details"
-const parentStudioName = "parentStudio"
+ parentStudioName = "parentStudio"
+)
var parentStudio models.Studio = models.Studio{
Name: models.NullString(parentStudioName),
@@ -37,15 +40,15 @@ var imageBytes = []byte("imageBytes")
const image = "aW1hZ2VCeXRlcw=="
-var createTime time.Time = time.Date(2001, 01, 01, 0, 0, 0, 0, time.UTC)
-var updateTime time.Time = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
+var createTime time.Time = time.Date(2001, 01, 01, 0, 0, 0, 0, time.Local)
+var updateTime time.Time = time.Date(2002, 01, 01, 0, 0, 0, 0, time.Local)
func createFullStudio(id int, parentID int) models.Studio {
- return models.Studio{
- ID: id,
- Name: models.NullString(studioName),
- URL: models.NullString(url),
- ParentID: models.NullInt64(int64(parentID)),
+ ret := models.Studio{
+ ID: id,
+ Name: models.NullString(studioName),
+ URL: models.NullString(url),
+ Details: models.NullString(details),
CreatedAt: models.SQLiteTimestamp{
Timestamp: createTime,
},
@@ -53,6 +56,12 @@ func createFullStudio(id int, parentID int) models.Studio {
Timestamp: updateTime,
},
}
+
+ if parentID != 0 {
+ ret.ParentID = models.NullInt64(int64(parentID))
+ }
+
+ return ret
}
func createEmptyStudio(id int) models.Studio {
@@ -69,8 +78,9 @@ func createEmptyStudio(id int) models.Studio {
func createFullJSONStudio(parentStudio, image string) *jsonschema.Studio {
return &jsonschema.Studio{
- Name: studioName,
- URL: url,
+ Name: studioName,
+ URL: url,
+ Details: details,
CreatedAt: models.JSONTime{
Time: createTime,
},
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index 1e8afcc67..6e38290f6 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -28,6 +28,7 @@ func (i *Importer) PreImport() error {
Checksum: checksum,
Name: sql.NullString{String: i.Input.Name, Valid: true},
URL: sql.NullString{String: i.Input.URL, Valid: true},
+ Details: sql.NullString{String: i.Input.Details, Valid: true},
CreatedAt: models.SQLiteTimestamp{Timestamp: i.Input.CreatedAt.GetTime()},
UpdatedAt: models.SQLiteTimestamp{Timestamp: i.Input.UpdatedAt.GetTime()},
}
diff --git a/pkg/studio/import_test.go b/pkg/studio/import_test.go
index 339e8b9b6..29a0d8813 100644
--- a/pkg/studio/import_test.go
+++ b/pkg/studio/import_test.go
@@ -7,6 +7,7 @@ import (
"github.com/stashapp/stash/pkg/manager/jsonschema"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stashapp/stash/pkg/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -51,6 +52,17 @@ func TestImporterPreImport(t *testing.T) {
err = i.PreImport()
assert.Nil(t, err)
+
+ i.Input = *createFullJSONStudio(studioName, image)
+ i.Input.ParentStudio = ""
+
+ err = i.PreImport()
+
+ assert.Nil(t, err)
+ expectedStudio := createFullStudio(0, 0)
+ expectedStudio.ParentID.Valid = false
+ expectedStudio.Checksum = utils.MD5FromString(studioName)
+ assert.Equal(t, expectedStudio, i.studio)
}
func TestImporterPreImportWithParent(t *testing.T) {
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index f0e5ebffa..153372279 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -1,5 +1,11 @@
### ✨ New Features
+* Added details, death date, hair color, and weight to Performers.
+* Added details to Studios.
* Added [perceptual dupe checker](/settings?tab=duplicates).
+* Add various `count` filter criteria and sort options.
+* Add URL filter criteria for scenes, galleries, movies, performers and studios.
+* Add HTTP endpoint for health checking at `/healthz`.
+* Add random sorting option for galleries, studios, movies and tags.
* Support access to system without logging in via API key.
* Added scene queue.
@@ -10,12 +16,8 @@
* Add slideshow to image wall view.
* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
* Revamped setup wizard and migration UI.
-* Add various `count` filter criteria and sort options.
* Scroll to top when changing page number.
-* Add URL filter criteria for scenes, galleries, movies, performers and studios.
-* Add HTTP endpoint for health checking at `/healthz`.
* Support `today` and `yesterday` for `parseDate` in scrapers.
-* Add random sorting option for galleries, studios, movies and tags.
* Disable sounds on scene/marker wall previews by default.
* Improve Movie UI.
* Change performer text query to search by name and alias only.
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index 9a71b33ad..147545bae 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -273,8 +273,10 @@ export const GalleryScrapeDialog: React.FC
- {TextUtils.age(performer.birthdate)}
+
+ {TextUtils.age(performer.birthdate, performer.death_date)}
+
years old
);
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index be15b3db6..79980287c 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -81,6 +81,17 @@ export const PerformerDetailsPanel: React.FC
+ Death Date:
+
Ethnicity:
= ({
Country:
+
+ Hair Color:
+
Eye Color:
= ({
Height:
+
+ Weight:
+
Measurements:
= ({
stash_id: stashID,
},
],
+ details: performer.data.details,
+ death_date: performer.data.death_date,
+ hair_color: performer.data.hair_color,
+ weight: Number(performer.data.weight),
};
const res = await createPerformer(performerInput, stashID);
diff --git a/ui/v2.5/src/components/Tagger/queries.ts b/ui/v2.5/src/components/Tagger/queries.ts
index 66a91e106..d2ef882e4 100644
--- a/ui/v2.5/src/components/Tagger/queries.ts
+++ b/ui/v2.5/src/components/Tagger/queries.ts
@@ -55,7 +55,7 @@ export const useCreatePerformer = () => {
const handleCreate = (performer: GQL.PerformerCreateInput, stashID: string) =>
createPerformer({
- variables: performer,
+ variables: { input: performer },
update: (store, newPerformer) => {
if (!newPerformer?.data?.performerCreate) return;
@@ -159,7 +159,7 @@ export const useCreateStudio = () => {
const handleCreate = (studio: GQL.StudioCreateInput, stashID: string) =>
createStudio({
- variables: studio,
+ variables: { input: studio },
update: (store, result) => {
if (!result?.data?.studioCreate) return;
diff --git a/ui/v2.5/src/components/Tagger/utils.ts b/ui/v2.5/src/components/Tagger/utils.ts
index 39b34bd94..b5666bcf0 100644
--- a/ui/v2.5/src/components/Tagger/utils.ts
+++ b/ui/v2.5/src/components/Tagger/utils.ts
@@ -56,6 +56,10 @@ export interface IStashBoxPerformer {
piercings?: string;
aliases?: string;
images: string[];
+ details?: string;
+ death_date?: string;
+ hair_color?: string;
+ weight?: string;
}
export interface IStashBoxTag {
@@ -126,6 +130,9 @@ const selectPerformers = (
piercings: p.piercings ? toTitleCase(p.piercings) : undefined,
aliases: p.aliases ?? undefined,
images: p.images ?? [],
+ details: p.details ?? undefined,
+ death_date: p.death_date ?? undefined,
+ hair_color: p.hair_color ?? undefined,
}));
export const selectScenes = (
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 1ac8e6d80..2016da8e6 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -584,7 +584,7 @@ export const studioMutationImpactedQueries = [
export const useStudioCreate = (input: GQL.StudioCreateInput) =>
GQL.useStudioCreateMutation({
- variables: input,
+ variables: { input },
refetchQueries: getQueryNames([GQL.AllStudiosForFilterDocument]),
update: deleteCache([
GQL.FindStudiosDocument,
diff --git a/ui/v2.5/src/docs/en/JSONSpec.md b/ui/v2.5/src/docs/en/JSONSpec.md
index f8d036d0b..e83141891 100644
--- a/ui/v2.5/src/docs/en/JSONSpec.md
+++ b/ui/v2.5/src/docs/en/JSONSpec.md
@@ -52,10 +52,13 @@ url
twitter
instagram
birthdate
+death_date
ethnicity
country
+hair_color
eye_color
height
+weight
measurements
fake_tits
career_length
@@ -64,6 +67,7 @@ piercings
image (base64 encoding of the image file)
created_at
updated_at
+details
```
## Studio
@@ -72,7 +76,8 @@ name
url
image (base64 encoding of the image file)
created_at
-updated_at
+updated_at
+details
```
## Scene
@@ -229,6 +234,10 @@ For those preferring the json-format, defined [here](https://json-schema.org/),
"description": "Birthdate of the performer. Format is YYYY-MM-DD",
"type": "string"
},
+ "death_date": {
+ "description": "Death date of the performer. Format is YYYY-MM-DD",
+ "type": "string"
+ },
"ethnicity": {
"description": "Ethnicity of the Performer. Possible values are black, white, asian or hispanic",
"type": "string"
@@ -237,6 +246,10 @@ For those preferring the json-format, defined [here](https://json-schema.org/),
"description": "Country of the performer",
"type": "string"
},
+ "hair_color": {
+ "description": "Hair color of the performer",
+ "type": "string"
+ },
"eye_color": {
"description": "Eye color of the performer",
"type": "string"
@@ -245,6 +258,10 @@ For those preferring the json-format, defined [here](https://json-schema.org/),
"description": "Height of the performer in centimeters",
"type": "string"
},
+ "weight": {
+ "description": "Weight of the performer in kilograms",
+ "type": "string"
+ },
"measurements": {
"description": "Measurements of the performer",
"type": "string"
@@ -276,6 +293,10 @@ For those preferring the json-format, defined [here](https://json-schema.org/),
"updated_at": {
"description": "The time this performers data was last changed in the database. Format is YYYY-MM-DDThh:mm:ssTZD",
"type": "string"
+ },
+ "details": {
+ "description": "Description of the performer",
+ "type": "string"
}
},
"required": ["name", "ethnicity", "image", "created_at", "updated_at"]
@@ -312,6 +333,10 @@ For those preferring the json-format, defined [here](https://json-schema.org/),
"updated_at": {
"description": "The time this studios data was last changed in the database. Format is YYYY-MM-DDThh:mm:ssTZD",
"type": "string"
+ },
+ "details": {
+ "description": "Description of the studio",
+ "type": "string"
}
},
"required": ["name", "image", "created_at", "updated_at"]
diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md
index 43a4407e3..40171b62d 100644
--- a/ui/v2.5/src/docs/en/Scraping.md
+++ b/ui/v2.5/src/docs/en/Scraping.md
@@ -740,10 +740,13 @@ URL
Twitter
Instagram
Birthdate
+DeathDate
Ethnicity
Country
+HairColor
EyeColor
Height
+Weight
Measurements
FakeTits
CareerLength
@@ -752,6 +755,7 @@ Piercings
Aliases
Tags (see Tag fields)
Image
+Details
```
*Note:* - `Gender` must be one of `male`, `female`, `transgender_male`, `transgender_female`, `intersex`, `non_binary` (case insensitive).
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index ee351a3c5..382024976 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -34,8 +34,10 @@ export type CriterionType =
| "age"
| "ethnicity"
| "country"
+ | "hair_color"
| "eye_color"
| "height"
+ | "weight"
| "measurements"
| "fake_tits"
| "career_length"
@@ -49,6 +51,7 @@ export type CriterionType =
| "image_count"
| "gallery_count"
| "performer_count"
+ | "death_year"
| "url";
type Option = string | number | IOptionType;
@@ -103,16 +106,22 @@ export abstract class Criterion {
return "Galleries";
case "birth_year":
return "Birth Year";
+ case "death_year":
+ return "Death Year";
case "age":
return "Age";
case "ethnicity":
return "Ethnicity";
case "country":
return "Country";
+ case "hair_color":
+ return "Hair Color";
case "eye_color":
return "Eye Color";
case "height":
return "Height";
+ case "weight":
+ return "Weight";
case "measurements":
return "Measurements";
case "fake_tits":
diff --git a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
index 6e3cd75d6..d77557e8b 100644
--- a/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/is-missing.ts
@@ -53,8 +53,10 @@ export class PerformerIsMissingCriterion extends IsMissingCriterion {
"instagram",
"ethnicity",
"country",
+ "hair_color",
"eye_color",
"height",
+ "weight",
"measurements",
"fake_tits",
"career_length",
@@ -65,6 +67,7 @@ export class PerformerIsMissingCriterion extends IsMissingCriterion {
"scenes",
"image",
"stash_id",
+ "details",
];
}
@@ -104,7 +107,7 @@ export class TagIsMissingCriterionOption implements ICriterionOption {
export class StudioIsMissingCriterion extends IsMissingCriterion {
public type: CriterionType = "studioIsMissing";
- public options: string[] = ["image", "stash_id"];
+ public options: string[] = ["image", "stash_id", "details"];
}
export class StudioIsMissingCriterionOption implements ICriterionOption {
diff --git a/ui/v2.5/src/models/list-filter/criteria/utils.ts b/ui/v2.5/src/models/list-filter/criteria/utils.ts
index 81d37e750..2f1e82030 100644
--- a/ui/v2.5/src/models/list-filter/criteria/utils.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/utils.ts
@@ -88,6 +88,8 @@ export function makeCriteria(type: CriterionType = "none") {
case "galleries":
return new GalleriesCriterion();
case "birth_year":
+ case "death_year":
+ case "weight":
return new NumberCriterion(type, type);
case "age":
return new MandatoryNumberCriterion(type, type);
@@ -95,6 +97,7 @@ export function makeCriteria(type: CriterionType = "none") {
return new GenderCriterion();
case "ethnicity":
case "country":
+ case "hair_color":
case "eye_color":
case "height":
case "measurements":
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index fe775f41e..c17d2527f 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -200,12 +200,18 @@ export class ListFilterModel {
];
this.displayModeOptions = [DisplayMode.Grid, DisplayMode.List];
- const numberCriteria: CriterionType[] = ["birth_year", "age"];
+ const numberCriteria: CriterionType[] = [
+ "birth_year",
+ "death_year",
+ "age",
+ ];
const stringCriteria: CriterionType[] = [
"ethnicity",
"country",
+ "hair_color",
"eye_color",
"height",
+ "weight",
"measurements",
"fake_tits",
"career_length",
@@ -650,6 +656,14 @@ export class ListFilterModel {
};
break;
}
+ case "death_year": {
+ const dyCrit = criterion as NumberCriterion;
+ result.death_year = {
+ value: dyCrit.value,
+ modifier: dyCrit.modifier,
+ };
+ break;
+ }
case "age": {
const ageCrit = criterion as NumberCriterion;
result.age = { value: ageCrit.value, modifier: ageCrit.modifier };
@@ -671,6 +685,14 @@ export class ListFilterModel {
};
break;
}
+ case "hair_color": {
+ const hcCrit = criterion as StringCriterion;
+ result.hair_color = {
+ value: hcCrit.value,
+ modifier: hcCrit.modifier,
+ };
+ break;
+ }
case "eye_color": {
const ecCrit = criterion as StringCriterion;
result.eye_color = { value: ecCrit.value, modifier: ecCrit.modifier };
@@ -681,6 +703,11 @@ export class ListFilterModel {
result.height = { value: hCrit.value, modifier: hCrit.modifier };
break;
}
+ case "weight": {
+ const wCrit = criterion as StringCriterion;
+ result.weight = { value: wCrit.value, modifier: wCrit.modifier };
+ break;
+ }
case "measurements": {
const mCrit = criterion as StringCriterion;
result.measurements = {
diff --git a/ui/v2.5/src/utils/text.ts b/ui/v2.5/src/utils/text.ts
index b69c440dc..cf6c512fa 100644
--- a/ui/v2.5/src/utils/text.ts
+++ b/ui/v2.5/src/utils/text.ts
@@ -83,7 +83,7 @@ const stringToDate = (dateString: string) => {
return new Date(year, monthIndex, day, 0, 0, 0, 0);
};
-const getAge = (dateString?: string | null, fromDateString?: string) => {
+const getAge = (dateString?: string | null, fromDateString?: string | null) => {
if (!dateString) return 0;
const birthdate = stringToDate(dateString);
From a5e9e7abce196fa3831b65e72f8e16571cba47a9 Mon Sep 17 00:00:00 2001
From: bnkai <48220860+bnkai@users.noreply.github.com>
Date: Fri, 16 Apr 2021 09:20:20 +0300
Subject: [PATCH 32/66] Update README with currently used ffmpeg URLs (#1304)
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 5282f936c..14041e4ed 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,9 @@ Run the executable (double click the exe on windows or run `./stash-osx` / `./st
If stash is unable to find or download FFMPEG then download it yourself from the link for your platform:
-* [macOS](https://ffmpeg.zeranoe.com/builds/macos64/static/ffmpeg-4.0-macos64-static.zip)
-* [Windows](https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.0-win64-static.zip)
-* [Linux](https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz)
+* [macOS ffmpeg](https://evermeet.cx/ffmpeg/ffmpeg-4.3.1.zip), [macOS ffprobe](https://evermeet.cx/ffmpeg/ffprobe-4.3.1.zip)
+* [Windows](https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip)
+* [Linux](https://www.johnvansickle.com/ffmpeg/)
The `ffmpeg(.exe)` and `ffprobe(.exe)` files should be placed in `~/.stash` on macOS / Linux or `C:\Users\YourUsername\.stash` on Windows.
From e3fa8f7b248f52747fc530d4c34956806b01f274 Mon Sep 17 00:00:00 2001
From: InfiniteTF
Date: Fri, 16 Apr 2021 19:15:47 +0200
Subject: [PATCH 33/66] Fix fingerprint search when scene only has phash match
(#1312)
---
ui/v2.5/src/components/Tagger/Tagger.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ui/v2.5/src/components/Tagger/Tagger.tsx b/ui/v2.5/src/components/Tagger/Tagger.tsx
index 281996f1d..d18827b1e 100755
--- a/ui/v2.5/src/components/Tagger/Tagger.tsx
+++ b/ui/v2.5/src/components/Tagger/Tagger.tsx
@@ -290,7 +290,8 @@ const TaggerList: React.FC = ({
(s) =>
s.stash_ids.length === 0 &&
((s.checksum && fingerprints[s.checksum]) ||
- (s.oshash && fingerprints[s.oshash]))
+ (s.oshash && fingerprints[s.oshash]) ||
+ (s.phash && fingerprints[s.phash]))
).length;
};
@@ -320,6 +321,7 @@ const TaggerList: React.FC = ({
const fingerprintMatch =
fingerprints[scene.checksum ?? ""] ??
fingerprints[scene.oshash ?? ""] ??
+ fingerprints[scene.phash ?? ""] ??
null;
const isTagged = taggedScenes[scene.id];
const hasStashIDs = scene.stash_ids.length > 0;
From cd0a9a1d627285ff9d1a7dcb243262b4d5aa6030 Mon Sep 17 00:00:00 2001
From: InfiniteTF
Date: Sat, 17 Apr 2021 00:52:18 +0200
Subject: [PATCH 34/66] Fix performer scraping (#1314)
---
.../PerformerDetails/PerformerEditPanel.tsx | 56 +++++++++++--------
.../Scenes/SceneDetails/SceneScrapeDialog.tsx | 35 ++++++++++--
ui/v2.5/src/core/StashService.ts | 7 ++-
ui/v2.5/src/utils/data.ts | 2 +
ui/v2.5/src/utils/index.ts | 1 +
5 files changed, 71 insertions(+), 30 deletions(-)
create mode 100644 ui/v2.5/src/utils/data.ts
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index db57daa88..dce51dd37 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -146,7 +146,7 @@ export const PerformerEditPanel: React.FC = ({
const formik = useFormik({
initialValues,
validationSchema: schema,
- onSubmit: (values) => onSave(getPerformerInput(values)),
+ onSubmit: (values) => onSave(values),
});
function translateScrapedGender(scrapedGender?: string) {
@@ -158,7 +158,7 @@ export const PerformerEditPanel: React.FC = ({
// try to translate from enum values first
const upperGender = scrapedGender?.toUpperCase();
- const asEnum = genderToString(upperGender as GQL.GenderEnum);
+ const asEnum = genderToString(upperGender);
if (asEnum) {
retEnum = stringToGender(asEnum);
} else {
@@ -214,9 +214,14 @@ export const PerformerEditPanel: React.FC = ({
variables: tagInput,
});
+ if (!result.data?.tagCreate) {
+ Toast.error(new Error("Failed to create tag"));
+ return;
+ }
+
// add the new tag to the new tags value
const newTagIds = formik.values.tag_ids.concat([
- result.data!.tagCreate!.id,
+ result.data.tagCreate.id,
]);
formik.setFieldValue("tag_ids", newTagIds);
@@ -298,7 +303,7 @@ export const PerformerEditPanel: React.FC = ({
if (state.tags) {
// map tags to their ids and filter out those not found
const newTagIds = state.tags.map((t) => t.stored_id).filter((t) => t);
- formik.setFieldValue("tag_ids", newTagIds as string[]);
+ formik.setFieldValue("tag_ids", newTagIds);
setNewTags(state.tags.filter((t) => !t.stored_id));
}
@@ -309,9 +314,9 @@ export const PerformerEditPanel: React.FC = ({
// otherwise follow existing behaviour
if (
(!isNew || formik.values.image === undefined) &&
- (state as GQL.ScrapedPerformerDataFragment).image !== undefined
+ state.image !== undefined
) {
- const imageStr = (state as GQL.ScrapedPerformerDataFragment).image;
+ const imageStr = state.image;
formik.setFieldValue("image", imageStr ?? undefined);
}
if (state.details) {
@@ -332,29 +337,30 @@ export const PerformerEditPanel: React.FC = ({
formik.setFieldValue("image", imageData);
}
- async function onSave(
- performerInput:
- | Partial
- | Partial
- ) {
+ async function onSave(performerInput: InputValues) {
setIsLoading(true);
try {
if (!isNew) {
+ const input = getUpdateValues(performerInput);
+
await updatePerformer({
variables: {
input: {
- ...performerInput,
+ ...input,
stash_ids: performerInput?.stash_ids?.map((s) => ({
endpoint: s.endpoint,
stash_id: s.stash_id,
})),
- } as GQL.PerformerUpdateInput,
+ },
},
});
history.push(`/performers/${performer.id}`);
} else {
+ const input = getCreateValues(performerInput);
const result = await createPerformer({
- variables: { input: performerInput as GQL.PerformerCreateInput },
+ variables: {
+ input,
+ },
});
if (result.data?.performerCreate) {
history.push(`/performers/${result.data.performerCreate.id}`);
@@ -370,7 +376,7 @@ export const PerformerEditPanel: React.FC = ({
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
- onSave?.(getPerformerInput(formik.values));
+ onSave?.(formik.values);
});
if (!isNew) {
@@ -413,19 +419,21 @@ export const PerformerEditPanel: React.FC = ({
if (isLoading) return ) {
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 70b5db8d5..f05267d04 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -16,9 +16,10 @@ import {
usePerformerCreate,
useMovieCreate,
useTagCreate,
+ stringToGender,
} from "src/core/StashService";
import { useToast } from "src/hooks";
-import { DurationUtils } from "src/utils";
+import { DurationUtils, filterData } from "src/utils";
function renderScrapedStudio(
result: ScrapeResult,
@@ -360,11 +361,37 @@ export const SceneScrapeDialog: React.FC = (
}
async function createNewPerformer(toCreate: GQL.ScrapedScenePerformer) {
- let performerInput: GQL.PerformerCreateInput = { name: "" };
+ const input: GQL.PerformerCreateInput = {
+ name: toCreate.name,
+ url: toCreate.url,
+ gender: stringToGender(toCreate.gender),
+ birthdate: toCreate.birthdate,
+ ethnicity: toCreate.ethnicity,
+ country: toCreate.country,
+ eye_color: toCreate.eye_color,
+ height: toCreate.height,
+ measurements: toCreate.measurements,
+ fake_tits: toCreate.fake_tits,
+ career_length: toCreate.career_length,
+ tattoos: toCreate.tattoos,
+ piercings: toCreate.piercings,
+ aliases: toCreate.aliases,
+ twitter: toCreate.twitter,
+ instagram: toCreate.instagram,
+ tag_ids: filterData((toCreate.tags ?? []).map((t) => t.stored_id)),
+ image:
+ (toCreate.images ?? []).length > 0
+ ? (toCreate.images ?? [])[0]
+ : undefined,
+ details: toCreate.details,
+ death_date: toCreate.death_date,
+ hair_color: toCreate.hair_color,
+ weight: toCreate.weight ? Number(toCreate.weight) : undefined,
+ };
+
try {
- performerInput = Object.assign(performerInput, toCreate);
const result = await createPerformer({
- variables: { input: performerInput },
+ variables: { input },
});
// add the new performer to the new performers value
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 2016da8e6..546824921 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -933,7 +933,7 @@ export const stringGenderMap = new Map([
["Non-Binary", GQL.GenderEnum.NonBinary],
]);
-export const genderToString = (value?: GQL.GenderEnum) => {
+export const genderToString = (value?: GQL.GenderEnum | string) => {
if (!value) {
return undefined;
}
@@ -947,7 +947,10 @@ export const genderToString = (value?: GQL.GenderEnum) => {
}
};
-export const stringToGender = (value?: string, caseInsensitive?: boolean) => {
+export const stringToGender = (
+ value?: string | null,
+ caseInsensitive?: boolean
+) => {
if (!value) {
return undefined;
}
diff --git a/ui/v2.5/src/utils/data.ts b/ui/v2.5/src/utils/data.ts
new file mode 100644
index 000000000..b6b12ca0e
--- /dev/null
+++ b/ui/v2.5/src/utils/data.ts
@@ -0,0 +1,2 @@
+export const filterData = (data?: (T | null | undefined)[] | null) =>
+ data ? (data.filter((item) => item) as T[]) : [];
diff --git a/ui/v2.5/src/utils/index.ts b/ui/v2.5/src/utils/index.ts
index d9561cbfd..102c092dd 100644
--- a/ui/v2.5/src/utils/index.ts
+++ b/ui/v2.5/src/utils/index.ts
@@ -11,3 +11,4 @@ export { default as flattenMessages } from "./flattenMessages";
export { default as getISOCountry } from "./country";
export { default as useFocus } from "./focus";
export { default as downloadFile } from "./download";
+export * from "./data";
From 1759a99f65f8c4b4b94e58a454facce6b2f1229c Mon Sep 17 00:00:00 2001
From: peolic <66393006+peolic@users.noreply.github.com>
Date: Sun, 18 Apr 2021 14:22:02 +0300
Subject: [PATCH 35/66] Fix creating performer from gallery scrape dialog
(#1320)
---
.../GalleryDetails/GalleryScrapeDialog.tsx | 7 ++--
.../Scenes/SceneDetails/SceneScrapeDialog.tsx | 32 ++---------------
ui/v2.5/src/core/StashService.ts | 34 +++++++++++++++++++
3 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index 147545bae..cd8f0f93f 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -14,6 +14,7 @@ import {
useStudioCreate,
usePerformerCreate,
useTagCreate,
+ makePerformerCreateInput,
} from "src/core/StashService";
import { useToast } from "src/hooks";
@@ -297,11 +298,11 @@ export const GalleryScrapeDialog: React.FC = (
}
async function createNewPerformer(toCreate: GQL.ScrapedScenePerformer) {
- let performerInput: GQL.PerformerCreateInput = { name: "" };
+ const input = makePerformerCreateInput(toCreate);
+
try {
- performerInput = Object.assign(performerInput, toCreate);
const result = await createPerformer({
- variables: { input: performerInput },
+ variables: { input },
});
// add the new performer to the new performers value
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index f05267d04..fd829e865 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -16,10 +16,10 @@ import {
usePerformerCreate,
useMovieCreate,
useTagCreate,
- stringToGender,
+ makePerformerCreateInput,
} from "src/core/StashService";
import { useToast } from "src/hooks";
-import { DurationUtils, filterData } from "src/utils";
+import { DurationUtils } from "src/utils";
function renderScrapedStudio(
result: ScrapeResult,
@@ -361,33 +361,7 @@ export const SceneScrapeDialog: React.FC = (
}
async function createNewPerformer(toCreate: GQL.ScrapedScenePerformer) {
- const input: GQL.PerformerCreateInput = {
- name: toCreate.name,
- url: toCreate.url,
- gender: stringToGender(toCreate.gender),
- birthdate: toCreate.birthdate,
- ethnicity: toCreate.ethnicity,
- country: toCreate.country,
- eye_color: toCreate.eye_color,
- height: toCreate.height,
- measurements: toCreate.measurements,
- fake_tits: toCreate.fake_tits,
- career_length: toCreate.career_length,
- tattoos: toCreate.tattoos,
- piercings: toCreate.piercings,
- aliases: toCreate.aliases,
- twitter: toCreate.twitter,
- instagram: toCreate.instagram,
- tag_ids: filterData((toCreate.tags ?? []).map((t) => t.stored_id)),
- image:
- (toCreate.images ?? []).length > 0
- ? (toCreate.images ?? [])[0]
- : undefined,
- details: toCreate.details,
- death_date: toCreate.death_date,
- hair_color: toCreate.hair_color,
- weight: toCreate.weight ? Number(toCreate.weight) : undefined,
- };
+ const input = makePerformerCreateInput(toCreate);
try {
const result = await createPerformer({
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index 546824921..780507119 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -5,6 +5,7 @@ import {
getQueryDefinition,
getOperationName,
} from "@apollo/client/utilities";
+import { filterData } from "../utils";
import { ListFilterModel } from "../models/list-filter/filter";
import * as GQL from "./generated-graphql";
@@ -972,6 +973,39 @@ export const stringToGender = (
export const getGenderStrings = () => Array.from(stringGenderMap.keys());
+export const makePerformerCreateInput = (
+ toCreate: GQL.ScrapedScenePerformer
+) => {
+ const input: GQL.PerformerCreateInput = {
+ name: toCreate.name,
+ url: toCreate.url,
+ gender: stringToGender(toCreate.gender),
+ birthdate: toCreate.birthdate,
+ ethnicity: toCreate.ethnicity,
+ country: toCreate.country,
+ eye_color: toCreate.eye_color,
+ height: toCreate.height,
+ measurements: toCreate.measurements,
+ fake_tits: toCreate.fake_tits,
+ career_length: toCreate.career_length,
+ tattoos: toCreate.tattoos,
+ piercings: toCreate.piercings,
+ aliases: toCreate.aliases,
+ twitter: toCreate.twitter,
+ instagram: toCreate.instagram,
+ tag_ids: filterData((toCreate.tags ?? []).map((t) => t.stored_id)),
+ image:
+ (toCreate.images ?? []).length > 0
+ ? (toCreate.images ?? [])[0]
+ : undefined,
+ details: toCreate.details,
+ death_date: toCreate.death_date,
+ hair_color: toCreate.hair_color,
+ weight: toCreate.weight ? Number(toCreate.weight) : undefined,
+ };
+ return input;
+};
+
export const stashBoxQuery = (searchVal: string, stashBoxIndex: number) =>
client?.query<
GQL.QueryStashBoxSceneQuery,
From 9200f167bf0591e62480756eaed9d84f9487bcac Mon Sep 17 00:00:00 2001
From: peolic <66393006+peolic@users.noreply.github.com>
Date: Tue, 20 Apr 2021 09:48:36 +0300
Subject: [PATCH 36/66] Add studio `*_count` filters and sort options (#1307)
---
graphql/schema/types/filters.graphql | 6 +
pkg/sqlite/image_test.go | 2 +-
pkg/sqlite/setup_test.go | 55 ++++++---
pkg/sqlite/studio.go | 16 ++-
pkg/sqlite/studio_test.go | 141 +++++++++++++++++++++++
ui/v2.5/src/models/list-filter/filter.ts | 39 ++++++-
6 files changed, 237 insertions(+), 22 deletions(-)
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 6152174eb..8c1da2506 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -149,6 +149,12 @@ input StudioFilterType {
stash_id: String
"""Filter to only include studios missing this property"""
is_missing: String
+ """Filter by scene count"""
+ scene_count: IntCriterionInput
+ """Filter by image count"""
+ image_count: IntCriterionInput
+ """Filter by gallery count"""
+ gallery_count: IntCriterionInput
"""Filter by url"""
url: StringCriterionInput
}
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index d7260e477..50c3f35fc 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -126,7 +126,7 @@ func TestImageQueryPath(t *testing.T) {
verifyImagePath(t, pathCriterion, totalImages-1)
pathCriterion.Modifier = models.CriterionModifierMatchesRegex
- pathCriterion.Value = "image_.*1_Path"
+ pathCriterion.Value = "image_.*01_Path"
verifyImagePath(t, pathCriterion, 1) // TODO - 2 if zip path is included
pathCriterion.Modifier = models.CriterionModifierNotMatchesRegex
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index f8a630095..481ebc629 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -34,6 +34,8 @@ const (
sceneIdxWithTag
sceneIdxWithTwoTags
sceneIdxWithStudio
+ sceneIdx1WithStudio
+ sceneIdx2WithStudio
sceneIdxWithMarker
sceneIdxWithPerformerTag
sceneIdxWithPerformerTwoTags
@@ -53,6 +55,8 @@ const (
imageIdxWithTag
imageIdxWithTwoTags
imageIdxWithStudio
+ imageIdx1WithStudio
+ imageIdx2WithStudio
imageIdxInZip // TODO - not implemented
imageIdxWithPerformerTag
imageIdxWithPerformerTwoTags
@@ -105,6 +109,8 @@ const (
galleryIdxWithTag
galleryIdxWithTwoTags
galleryIdxWithStudio
+ galleryIdx1WithStudio
+ galleryIdx2WithStudio
galleryIdxWithPerformerTag
galleryIdxWithPerformerTwoTags
// new indexes above
@@ -140,11 +146,14 @@ const (
const (
studioIdxWithScene = iota
+ studioIdxWithTwoScenes
studioIdxWithMovie
studioIdxWithChildStudio
studioIdxWithParentStudio
studioIdxWithImage
+ studioIdxWithTwoImages
studioIdxWithGallery
+ studioIdxWithTwoGalleries
// new indexes above
// studios with dup names start from the end
studioIdxWithDupName
@@ -213,6 +222,8 @@ var (
sceneStudioLinks = [][2]int{
{sceneIdxWithStudio, studioIdxWithScene},
+ {sceneIdx1WithStudio, studioIdxWithTwoScenes},
+ {sceneIdx2WithStudio, studioIdxWithTwoScenes},
}
)
@@ -222,6 +233,8 @@ var (
}
imageStudioLinks = [][2]int{
{imageIdxWithStudio, studioIdxWithImage},
+ {imageIdx1WithStudio, studioIdxWithTwoImages},
+ {imageIdx2WithStudio, studioIdxWithTwoImages},
}
imageTagLinks = [][2]int{
{imageIdxWithTag, tagIdxWithImage},
@@ -250,6 +263,12 @@ var (
{galleryIdx2WithPerformer, performerIdxWithTwoGalleries},
}
+ galleryStudioLinks = [][2]int{
+ {galleryIdxWithStudio, studioIdxWithGallery},
+ {galleryIdx1WithStudio, studioIdxWithTwoGalleries},
+ {galleryIdx2WithStudio, studioIdxWithTwoGalleries},
+ }
+
galleryTagLinks = [][2]int{
{galleryIdxWithTag, tagIdxWithGallery},
{galleryIdxWithTwoTags, tagIdx1WithGallery},
@@ -413,8 +432,8 @@ func populateDB() error {
return fmt.Errorf("error linking gallery tags: %s", err.Error())
}
- if err := linkGalleryStudio(r.Gallery(), galleryIdxWithStudio, studioIdxWithGallery); err != nil {
- return fmt.Errorf("error linking gallery studio: %s", err.Error())
+ if err := linkGalleryStudios(r.Gallery()); err != nil {
+ return fmt.Errorf("error linking gallery studios: %s", err.Error())
}
if err := createMarker(r.SceneMarker(), sceneIdxWithMarker, tagIdxWithPrimaryMarker, []int{tagIdxWithMarker}); err != nil {
@@ -1017,7 +1036,7 @@ func linkImagePerformers(qb models.ImageReaderWriter) error {
func linkGalleryPerformers(qb models.GalleryReaderWriter) error {
return doLinks(galleryPerformerLinks, func(galleryIndex, performerIndex int) error {
- galleryID := imageIDs[galleryIndex]
+ galleryID := galleryIDs[galleryIndex]
performers, err := qb.GetPerformerIDs(galleryID)
if err != nil {
return err
@@ -1029,17 +1048,29 @@ func linkGalleryPerformers(qb models.GalleryReaderWriter) error {
})
}
-func linkGalleryTags(iqb models.GalleryReaderWriter) error {
+func linkGalleryStudios(qb models.GalleryReaderWriter) error {
+ return doLinks(galleryStudioLinks, func(galleryIndex, studioIndex int) error {
+ gallery := models.GalleryPartial{
+ ID: galleryIDs[galleryIndex],
+ StudioID: &sql.NullInt64{Int64: int64(studioIDs[studioIndex]), Valid: true},
+ }
+ _, err := qb.UpdatePartial(gallery)
+
+ return err
+ })
+}
+
+func linkGalleryTags(qb models.GalleryReaderWriter) error {
return doLinks(galleryTagLinks, func(galleryIndex, tagIndex int) error {
- galleryID := imageIDs[galleryIndex]
- tags, err := iqb.GetTagIDs(galleryID)
+ galleryID := galleryIDs[galleryIndex]
+ tags, err := qb.GetTagIDs(galleryID)
if err != nil {
return err
}
tags = append(tags, tagIDs[tagIndex])
- return iqb.UpdateTags(galleryID, tags)
+ return qb.UpdateTags(galleryID, tags)
})
}
@@ -1070,13 +1101,3 @@ func linkStudiosParent(qb models.StudioWriter) error {
func addTagImage(qb models.TagWriter, tagIndex int) error {
return qb.UpdateImage(tagIDs[tagIndex], models.DefaultTagImage)
}
-
-func linkGalleryStudio(qb models.GalleryWriter, galleryIndex, studioIndex int) error {
- gallery := models.GalleryPartial{
- ID: galleryIDs[galleryIndex],
- StudioID: &sql.NullInt64{Int64: int64(studioIDs[studioIndex]), Valid: true},
- }
- _, err := qb.UpdatePartial(gallery)
-
- return err
-}
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index c3a984c03..cbfb57f4d 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -133,7 +133,7 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF
query.body = selectDistinctIDs("studios")
query.body += `
- left join scenes on studios.id = scenes.studio_id
+ left join scenes on studios.id = scenes.studio_id
left join studio_stash_ids on studio_stash_ids.studio_id = studios.id
`
@@ -165,6 +165,10 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF
query.addArg(stashIDFilter)
}
+ query.handleCountCriterion(studioFilter.SceneCount, studioTable, sceneTable, studioIDColumn)
+ query.handleCountCriterion(studioFilter.ImageCount, studioTable, imageTable, studioIDColumn)
+ query.handleCountCriterion(studioFilter.GalleryCount, studioTable, galleryTable, studioIDColumn)
+
query.handleStringCriterionInput(studioFilter.URL, "studios.url")
if isMissingFilter := studioFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
@@ -209,7 +213,15 @@ func (qb *studioQueryBuilder) getStudioSort(findFilter *models.FindFilterType) s
sort = findFilter.GetSort("name")
direction = findFilter.GetDirection()
}
- return getSort(sort, direction, "studios")
+
+ switch sort {
+ case "images_count":
+ return getCountSort(studioTable, imageTable, studioIDColumn, direction)
+ case "galleries_count":
+ return getCountSort(studioTable, galleryTable, studioIDColumn, direction)
+ default:
+ return getSort(sort, direction, "studios")
+ }
}
func (qb *studioQueryBuilder) queryStudio(query string, args []interface{}) (*models.Studio, error) {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 9325c720a..ae17c1cf7 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -265,6 +265,147 @@ func TestStudioDestroyStudioImage(t *testing.T) {
}
}
+func TestStudioQuerySceneCount(t *testing.T) {
+ const sceneCount = 1
+ sceneCountCriterion := models.IntCriterionInput{
+ Value: sceneCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+}
+
+func verifyStudiosSceneCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ SceneCount: &sceneCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ sceneCount, err := r.Scene().CountByStudioID(studio.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, sceneCount, sceneCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryImageCount(t *testing.T) {
+ const imageCount = 1
+ imageCountCriterion := models.IntCriterionInput{
+ Value: imageCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosImageCount(t, imageCountCriterion)
+}
+
+func verifyStudiosImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ ImageCount: &imageCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ pp := 0
+
+ _, count, err := r.Image().Query(&models.ImageFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(studio.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, imageCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryGalleryCount(t *testing.T) {
+ const galleryCount = 1
+ galleryCountCriterion := models.IntCriterionInput{
+ Value: galleryCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+}
+
+func verifyStudiosGalleryCount(t *testing.T, galleryCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ GalleryCount: &galleryCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ pp := 0
+
+ _, count, err := r.Gallery().Query(&models.GalleryFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(studio.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, galleryCountCriterion)
+ }
+
+ return nil
+ })
+}
+
func TestStudioStashIDs(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
qb := r.Studio()
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index c17d2527f..2aad3672f 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -240,12 +240,21 @@ export class ListFilterModel {
}
case FilterMode.Studios:
this.sortBy = "name";
- this.sortByOptions = ["name", "scenes_count", "random"];
+ this.sortByOptions = [
+ "name",
+ "scenes_count",
+ "images_count",
+ "galleries_count",
+ "random",
+ ];
this.displayModeOptions = [DisplayMode.Grid];
this.criterionOptions = [
new NoneCriterionOption(),
new ParentStudiosCriterionOption(),
new StudioIsMissingCriterionOption(),
+ ListFilterModel.createCriterionOption("scene_count"),
+ ListFilterModel.createCriterionOption("image_count"),
+ ListFilterModel.createCriterionOption("gallery_count"),
ListFilterModel.createCriterionOption("url"),
];
break;
@@ -1034,8 +1043,34 @@ export class ListFilterModel {
};
break;
}
- case "studioIsMissing":
+ case "studioIsMissing": {
result.is_missing = (criterion as IsMissingCriterion).value;
+ break;
+ }
+ case "scene_count": {
+ const countCrit = criterion as NumberCriterion;
+ result.scene_count = {
+ value: countCrit.value,
+ modifier: countCrit.modifier,
+ };
+ break;
+ }
+ case "image_count": {
+ const countCrit = criterion as NumberCriterion;
+ result.image_count = {
+ value: countCrit.value,
+ modifier: countCrit.modifier,
+ };
+ break;
+ }
+ case "gallery_count": {
+ const countCrit = criterion as NumberCriterion;
+ result.gallery_count = {
+ value: countCrit.value,
+ modifier: countCrit.modifier,
+ };
+ break;
+ }
// no default
}
});
From 39512e1452cdbc0c14cf5110534b002451b264a1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 20 Apr 2021 17:12:40 +1000
Subject: [PATCH 37/66] Separate UI (#1299)
* Add custom_ui_location to serve UI from filesystem
---
pkg/api/server.go | 12 ++++++++++++
pkg/manager/config/config.go | 8 ++++++++
.../src/components/Changelog/versions/v070.md | 1 +
ui/v2.5/src/docs/en/Configuration.md | 16 ++++++++++++++++
4 files changed, 37 insertions(+)
diff --git a/pkg/api/server.go b/pkg/api/server.go
index a59ef4cee..db7d51855 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -234,9 +234,21 @@ func Start() {
})
}
+ customUILocation := c.GetCustomUILocation()
+
// Serve the web app
r.HandleFunc("/*", func(w http.ResponseWriter, r *http.Request) {
ext := path.Ext(r.URL.Path)
+
+ if customUILocation != "" {
+ if r.URL.Path == "index.html" || ext == "" {
+ r.URL.Path = "/"
+ }
+
+ http.FileServer(http.Dir(customUILocation)).ServeHTTP(w, r)
+ return
+ }
+
if ext == ".html" || ext == "" {
data, _ := uiBox.Find("index.html")
_, _ = w.Write(data)
diff --git a/pkg/manager/config/config.go b/pkg/manager/config/config.go
index b852ca835..1c6a17516 100644
--- a/pkg/manager/config/config.go
+++ b/pkg/manager/config/config.go
@@ -106,6 +106,10 @@ const Language = "language"
// this should be manually configured only
const CustomServedFolders = "custom_served_folders"
+// UI directory. Overrides to serve the UI from a specific location
+// rather than use the embedded UI.
+const CustomUILocation = "custom_ui_location"
+
// Interface options
const MenuItems = "menu_items"
@@ -523,6 +527,10 @@ func (i *Instance) GetCustomServedFolders() URLMap {
return viper.GetStringMapString(CustomServedFolders)
}
+func (i *Instance) GetCustomUILocation() string {
+ return viper.GetString(CustomUILocation)
+}
+
// Interface options
func (i *Instance) GetMenuItems() []string {
if viper.IsSet(MenuItems) {
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 153372279..a4a6c3bc2 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -1,4 +1,5 @@
### ✨ New Features
+* Support serving UI from specific directory location.
* Added details, death date, hair color, and weight to Performers.
* Added details to Studios.
* Added [perceptual dupe checker](/settings?tab=duplicates).
diff --git a/ui/v2.5/src/docs/en/Configuration.md b/ui/v2.5/src/docs/en/Configuration.md
index ed5ab5edb..d25377149 100644
--- a/ui/v2.5/src/docs/en/Configuration.md
+++ b/ui/v2.5/src/docs/en/Configuration.md
@@ -115,4 +115,20 @@ These options are typically not exposed in the UI and must be changed manually i
| Field | Remarks |
|-------|---------|
+| `custom_served_folders` | A map of URLs to file system folders. See below. |
+| `custom_ui_location` | The file system folder where the UI files will be served from, instead of using the embedded UI. Empty to disable. Stash must be restarted to take effect. |
| `max_upload_size` | Maximum file upload size for import files. Defaults to 1GB. |
+
+### Custom served folders
+
+Custom served folders are served when the server handles a request with the `/custom` URL prefix. The following is an example configuration:
+
+```
+custom_served_folders:
+ /: D:\stash\static
+ /foo: D:\bar
+```
+
+With the above configuration, a request for `/custom/foo/bar.png` would serve `D:\bar\bar.png`.
+
+The `/` entry matches anything that is not otherwise mapped by the other entries. For example, `/custom/baz/xyz.png` would serve `D:\stash\static\baz\xyz.png`.
From 8705f78591a8459c7ea9064fa70e7e6c77cf5d07 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 20 Apr 2021 18:58:28 +1000
Subject: [PATCH 38/66] Duplicate checker UI improvements (#1309)
* Add tools settings page
* Add tools and move dupe checker
* Make negative number get all
* Show missing phashes
* Add multi-edit button
* Show scene details
---
pkg/manager/task_autotag.go | 2 +-
pkg/models/extension_find_filter.go | 12 +-
ui/v2.5/src/App.tsx | 5 +
.../src/components/Changelog/versions/v070.md | 2 +-
.../SceneDuplicateChecker.tsx | 512 ++++++++++++++++++
.../SceneDuplicateChecker/styles.scss | 13 +
ui/v2.5/src/components/Settings/Settings.tsx | 14 +-
.../Settings/SettingsDuplicatePanel.tsx | 270 ---------
.../SettingsTasksPanel/SettingsTasksPanel.tsx | 7 -
.../Settings/SettingsToolsPanel.tsx | 19 +
ui/v2.5/src/components/Settings/styles.scss | 53 --
ui/v2.5/src/index.scss | 1 +
12 files changed, 566 insertions(+), 344 deletions(-)
create mode 100644 ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx
create mode 100644 ui/v2.5/src/components/SceneDuplicateChecker/styles.scss
delete mode 100644 ui/v2.5/src/components/Settings/SettingsDuplicatePanel.tsx
create mode 100644 ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx
diff --git a/pkg/manager/task_autotag.go b/pkg/manager/task_autotag.go
index cbd7cdc32..6632dc2b9 100644
--- a/pkg/manager/task_autotag.go
+++ b/pkg/manager/task_autotag.go
@@ -76,7 +76,7 @@ func (t *AutoTagTask) getQueryFilter(regex string) *models.SceneFilterType {
}
func (t *AutoTagTask) getFindFilter() *models.FindFilterType {
- perPage := 0
+ perPage := -1
return &models.FindFilterType{
PerPage: &perPage,
}
diff --git a/pkg/models/extension_find_filter.go b/pkg/models/extension_find_filter.go
index e2d4f8d7c..f2e7e7ab1 100644
--- a/pkg/models/extension_find_filter.go
+++ b/pkg/models/extension_find_filter.go
@@ -35,17 +35,19 @@ func (ff FindFilterType) GetPage() int {
func (ff FindFilterType) GetPageSize() int {
const defaultPerPage = 25
- const minPerPage = 1
+ const minPerPage = 0
const maxPerPage = 1000
if ff.PerPage == nil {
return defaultPerPage
}
- if *ff.PerPage > 1000 {
+ if *ff.PerPage > maxPerPage {
return maxPerPage
- } else if *ff.PerPage < 0 {
- // PerPage == 0 -> no limit
+ } else if *ff.PerPage < minPerPage {
+ // negative page sizes should return all results
+ // this is a sanity check in case GetPageSize is
+ // called with a negative page size.
return minPerPage
}
@@ -53,5 +55,5 @@ func (ff FindFilterType) GetPageSize() int {
}
func (ff FindFilterType) IsGetAll() bool {
- return ff.PerPage != nil && *ff.PerPage == 0
+ return ff.PerPage != nil && *ff.PerPage < 0
}
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index efee69e4a..96f90da63 100755
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -22,6 +22,7 @@ import { Settings } from "./components/Settings/Settings";
import { Stats } from "./components/Stats";
import Studios from "./components/Studios/Studios";
import { SceneFilenameParser } from "./components/SceneFilenameParser/SceneFilenameParser";
+import { SceneDuplicateChecker } from "./components/SceneDuplicateChecker/SceneDuplicateChecker";
import Movies from "./components/Movies/Movies";
import Tags from "./components/Tags/Tags";
import Images from "./components/Images/Images";
@@ -103,6 +104,10 @@ export const App: React.FC = () => {
>(
+ {}
+ );
+ const { data, loading, refetch } = GQL.useFindDuplicateScenesQuery({
+ fetchPolicy: "no-cache",
+ variables: { distance: hashDistance },
+ });
+ const { data: missingPhash } = GQL.useFindScenesQuery({
+ variables: {
+ filter: {
+ per_page: 0,
+ },
+ scene_filter: {
+ is_missing: "phash",
+ },
+ },
+ });
+
+ const [selectedScenes, setSelectedScenes] = useState<
+ GQL.SlimSceneDataFragment[] | null
+ >(null);
+
+ if (loading) return ) => {
+ history.push({
+ search: querystring.stringify({
+ ...querystring.parse(history.location.search),
+ ...q,
+ }),
+ });
+ };
+
+ function onDeleteDialogClosed(deleted: boolean) {
+ setDeletingScenes(false);
+ if (deleted) {
+ setSelectedScenes(null);
+ refetch();
+ if (isMultiDelete) setCheckedScenes({});
+ }
+ }
+
+ const handleCheck = (checked: boolean, sceneID: string) => {
+ setCheckedScenes({ ...checkedScenes, [sceneID]: checked });
+ };
+
+ const handleDeleteChecked = () => {
+ setSelectedScenes(scenes.flat().filter((s) => checkedScenes[s.id]));
+ setDeletingScenes(true);
+ setIsMultiDelete(true);
+ };
+
+ const handleDeleteScene = (scene: GQL.SlimSceneDataFragment) => {
+ setSelectedScenes([scene]);
+ setDeletingScenes(true);
+ setIsMultiDelete(false);
+ };
+
+ function onEdit() {
+ setSelectedScenes(scenes.flat().filter((s) => checkedScenes[s.id]));
+ setEditingScenes(true);
+ }
+
+ const renderFilesize = (filesize: string | null | undefined) => {
+ const { size: parsedSize, unit } = TextUtils.fileSize(
+ Number.parseInt(filesize ?? "0", 10)
+ );
+ return (
+ setEditingScenes(false)}
+ />
+ );
+ }
+ }
+
+ function maybeRenderTagPopoverButton(scene: GQL.SlimSceneDataFragment) {
+ if (scene.tags.length <= 0) return;
+
+ const popoverContent = scene.tags.map((tag) => (
+
+
+
+ );
+ }
+
+ function maybeRenderPerformerPopoverButton(scene: GQL.SlimSceneDataFragment) {
+ if (scene.performers.length <= 0) return;
+
+ return
+
+
+ );
+ }
+
+ function maybeRenderSceneMarkerPopoverButton(
+ scene: GQL.SlimSceneDataFragment
+ ) {
+ if (scene.scene_markers.length <= 0) return;
+
+ const popoverContent = scene.scene_markers.map((marker) => {
+ const markerPopover = { ...marker, scene: { id: scene.id } };
+ return
+
+
+ );
+ }
+
+ function maybeRenderOCounter(scene: GQL.SlimSceneDataFragment) {
+ if (scene.o_counter) {
+ return (
+
+
+
+ );
+ }
+
+ function maybeRenderOrganized(scene: GQL.SlimSceneDataFragment) {
+ if (scene.organized) {
+ return (
+
+ {maybeRenderTagPopoverButton(scene)}
+ {maybeRenderPerformerPopoverButton(scene)}
+ {maybeRenderMoviePopoverButton(scene)}
+ {maybeRenderSceneMarkerPopoverButton(scene)}
+ {maybeRenderOCounter(scene)}
+ {maybeRenderGallery(scene)}
+ {maybeRenderOrganized(scene)}
+
+
+ );
+ }
+ }
+
+ return (
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/SceneDuplicateChecker/styles.scss b/ui/v2.5/src/components/SceneDuplicateChecker/styles.scss
new file mode 100644
index 000000000..24084527a
--- /dev/null
+++ b/ui/v2.5/src/components/SceneDuplicateChecker/styles.scss
@@ -0,0 +1,13 @@
+#scene-duplicate-checker {
+ .scene-path {
+ font-size: 0.88em;
+ }
+
+ .filter-container {
+ margin: 0;
+ }
+
+ .separator {
+ height: 50px;
+ }
+}
diff --git a/ui/v2.5/src/components/Settings/Settings.tsx b/ui/v2.5/src/components/Settings/Settings.tsx
index 7fa3e200f..1c580ec6e 100644
--- a/ui/v2.5/src/components/Settings/Settings.tsx
+++ b/ui/v2.5/src/components/Settings/Settings.tsx
@@ -9,7 +9,7 @@ import { SettingsLogsPanel } from "./SettingsLogsPanel";
import { SettingsTasksPanel } from "./SettingsTasksPanel/SettingsTasksPanel";
import { SettingsPluginsPanel } from "./SettingsPluginsPanel";
import { SettingsScrapersPanel } from "./SettingsScrapersPanel";
-import { SettingsDuplicatePanel } from "./SettingsDuplicatePanel";
+import { SettingsToolsPanel } from "./SettingsToolsPanel";
export const Settings: React.FC = () => {
const location = useLocation();
@@ -37,6 +37,9 @@ export const Settings: React.FC = () => {
Tasks
+
+ Tools
+
Scrapers
@@ -46,9 +49,6 @@ export const Settings: React.FC = () => {
Logs
-
- Dupe Checker
-
About
@@ -66,6 +66,9 @@ export const Settings: React.FC = () => {
+
+
@@ -75,9 +78,6 @@ export const Settings: React.FC = () => {
-
-
diff --git a/ui/v2.5/src/components/Settings/SettingsDuplicatePanel.tsx b/ui/v2.5/src/components/Settings/SettingsDuplicatePanel.tsx
deleted file mode 100644
index 53916033a..000000000
--- a/ui/v2.5/src/components/Settings/SettingsDuplicatePanel.tsx
+++ /dev/null
@@ -1,270 +0,0 @@
-import React, { useState } from "react";
-import { Button, Col, Form, Row, Table } from "react-bootstrap";
-import { Link, useHistory } from "react-router-dom";
-import { FormattedNumber } from "react-intl";
-import querystring from "query-string";
-
-import * as GQL from "src/core/generated-graphql";
-import {
- LoadingIndicator,
- ErrorMessage,
- HoverPopover,
-} from "src/components/Shared";
-import { Pagination } from "src/components/List/Pagination";
-import { TextUtils } from "src/utils";
-import { DeleteScenesDialog } from "src/components/Scenes/DeleteScenesDialog";
-
-const CLASSNAME = "DuplicateChecker";
-
-export const SettingsDuplicatePanel: React.FC = () => {
- const history = useHistory();
- const { page, size, distance } = querystring.parse(history.location.search);
- const currentPage = Number.parseInt(
- Array.isArray(page) ? page[0] : page ?? "1",
- 10
- );
- const pageSize = Number.parseInt(
- Array.isArray(size) ? size[0] : size ?? "20",
- 10
- );
- const hashDistance = Number.parseInt(
- Array.isArray(distance) ? distance[0] : distance ?? "0",
- 10
- );
- const [isMultiDelete, setIsMultiDelete] = useState(false);
- const [checkedScenes, setCheckedScenes] = useState>(
- {}
- );
- const { data, loading, refetch } = GQL.useFindDuplicateScenesQuery({
- fetchPolicy: "no-cache",
- variables: { distance: hashDistance },
- });
- const [deletingScene, setDeletingScene] = useState<
- GQL.SlimSceneDataFragment[] | null
- >(null);
-
- if (loading) return ) => {
- history.push({
- search: querystring.stringify({
- ...querystring.parse(history.location.search),
- ...q,
- }),
- });
- };
-
- function onDeleteDialogClosed(deleted: boolean) {
- setDeletingScene(null);
- if (deleted) {
- refetch();
- if (isMultiDelete) setCheckedScenes({});
- }
- }
-
- const handleCheck = (checked: boolean, sceneID: string) => {
- setCheckedScenes({ ...checkedScenes, [sceneID]: checked });
- };
-
- const handleDeleteChecked = () => {
- setDeletingScene(scenes.flat().filter((s) => checkedScenes[s.id]));
- setIsMultiDelete(true);
- };
-
- const handleDeleteScene = (scene: GQL.SlimSceneDataFragment) => {
- setDeletingScene([scene]);
- setIsMultiDelete(false);
- };
-
- const renderFilesize = (filesize: string | null | undefined) => {
- const { size: parsedSize, unit } = TextUtils.fileSize(
- Number.parseInt(filesize ?? "0", 10)
- );
- return (
-
-
-
-
-
-
+ Scene Filename Parser
+
+
+
+ Scene Duplicate Checker
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Settings/styles.scss b/ui/v2.5/src/components/Settings/styles.scss
index 9e58835dd..89844ce14 100644
--- a/ui/v2.5/src/components/Settings/styles.scss
+++ b/ui/v2.5/src/components/Settings/styles.scss
@@ -70,56 +70,3 @@
list-style: none;
}
}
-
-.DuplicateChecker {
- min-width: 768px;
-
- .filter-container {
- margin: 0;
- }
-
- .duplicate-group {
- border-top: 50px solid #30404d;
-
- &:first-child {
- border-top: none;
- }
- }
-
- &-table {
- table-layout: fixed;
- width: 100%;
- }
-
- &-checkbox {
- width: 10px;
- }
-
- &-sprite {
- width: 110px;
- }
-
- &-duration {
- width: 80px;
- }
-
- &-filesize {
- width: 90px;
- }
-
- &-resolution {
- width: 100px;
- }
-
- &-bitrate {
- width: 100px;
- }
-
- &-codec {
- width: 70px;
- }
-
- &-operations {
- width: 70px;
- }
-}
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 44aec70b9..9efb57a8e 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -9,6 +9,7 @@
@import "src/components/Movies/styles.scss";
@import "src/components/Performers/styles.scss";
@import "src/components/Scenes/styles.scss";
+@import "src/components/SceneDuplicateChecker/styles.scss";
@import "src/components/SceneFilenameParser/styles.scss";
@import "src/components/ScenePlayer/styles.scss";
@import "src/components/Settings/styles.scss";
From 79a180ba738618abef46ffed0685850fadb34ffd Mon Sep 17 00:00:00 2001
From: Jeremy Meyers
Date: Tue, 20 Apr 2021 20:33:33 -0400
Subject: [PATCH 39/66] Fix README formatting (#1328)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 14041e4ed..ff723d81b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ https://stashapp.cc
* You can tag videos and find them later.
* It provides statistics about performers, tags, studios and other things.
-You can [watch a demo video](https://vimeo.com/275537038)to see it in action (password is stashapp).
+You can [watch a demo video](https://vimeo.com/275537038) to see it in action (password is stashapp).
For further information you can [read the in-app manual](https://github.com/stashapp/stash/tree/develop/ui/v2.5/src/docs/en).
From 1767390e0d4244fddf1069397f5cfbf13aa4ac63 Mon Sep 17 00:00:00 2001
From: peolic <66393006+peolic@users.noreply.github.com>
Date: Wed, 21 Apr 2021 07:19:40 +0300
Subject: [PATCH 40/66] Overwrite new performer image after clearing current
image (#1321)
---
ui/v2.5/src/components/Changelog/versions/v070.md | 1 +
.../Performers/PerformerDetails/PerformerEditPanel.tsx | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index a0c890aed..83c9afc60 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -24,6 +24,7 @@
* Change performer text query to search by name and alias only.
### 🐛 Bug fixes
+* Fix scraped performer image not updating after clearing the current image when creating a new performer.
* Fix error preventing adding a new library path when an existing library path is missing.
* Fix whitespace in query string returning all objects.
* Fix hang on Login page when not connected to internet.
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index dce51dd37..499f1cae7 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -311,9 +311,10 @@ export const PerformerEditPanel: React.FC = ({
// image is a base64 string
// #404: don't overwrite image if it has been modified by the user
// overwrite if not new since it came from a dialog
- // otherwise follow existing behaviour
+ // overwrite if image was cleared (`null`)
+ // otherwise follow existing behaviour (`undefined`)
if (
- (!isNew || formik.values.image === undefined) &&
+ (!isNew || [null, undefined].includes(formik.values.image)) &&
state.image !== undefined
) {
const imageStr = state.image;
From bf3f658091438b92ffa2dde7baf22ccf410af625 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 22 Apr 2021 12:22:51 +1000
Subject: [PATCH 41/66] Movie scene sort (#1325)
* Add movie_scene_number sort order
* Sort movie scenes by scene number by default
---
pkg/sqlite/scene.go | 3 +++
.../src/components/Changelog/versions/v070.md | 1 +
.../Movies/MovieDetails/MovieScenesPanel.tsx | 4 +++-
ui/v2.5/src/components/Scenes/SceneList.tsx | 3 +++
ui/v2.5/src/hooks/ListHook.tsx | 7 +++++-
ui/v2.5/src/models/list-filter/filter.ts | 23 +++++++++++--------
6 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index a727c7bfd..2ded07b9c 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -673,6 +673,9 @@ func (qb *sceneQueryBuilder) setSceneSort(query *queryBuilder, findFilter *model
sort := findFilter.GetSort("title")
direction := findFilter.GetDirection()
switch sort {
+ case "movie_scene_number":
+ query.join(moviesScenesTable, "movies_join", "scenes.id")
+ query.sortAndPagination += fmt.Sprintf(" ORDER BY movies_join.scene_index %s", getSortDirection(direction))
case "tag_count":
query.sortAndPagination += getCountSort(sceneTable, scenesTagsTable, sceneIDColumn, direction)
case "performer_count":
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 83c9afc60..170198522 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -11,6 +11,7 @@
* Added scene queue.
### 🎨 Improvements
+* Sort movie scenes by scene number by default.
* Support http request headers in scrapers.
* Sort performers by gender in scene/image/gallery cards and details.
* Add popover buttons for scenes/images/galleries on performer/studio/tag cards.
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
index 8a6f8c7be..aae203f8b 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
@@ -42,7 +42,9 @@ export const MovieScenesPanel: React.FC = ({ movie }) => {
}
if (movie && movie.id) {
- return = ({
filterHook,
+ defaultSort,
persistState,
}) => {
const history = useHistory();
@@ -83,6 +85,7 @@ export const SceneList: React.FC = ({
zoomable: true,
selectable: true,
otherOperations,
+ defaultSort,
renderContent,
renderEditDialog: renderEditScenesDialog,
renderDeleteDialog,
diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index 1365da170..5aec643ff 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -88,6 +88,7 @@ export enum PersistanceLevel {
interface IListHookOptions {
persistState?: PersistanceLevel;
persistanceKey?: string;
+ defaultSort?: string;
filterHook?: (filter: ListFilterModel) => ListFilterModel;
zoomable?: boolean;
selectable?: boolean;
@@ -431,7 +432,11 @@ const useList = (
const persistanceKey = options.persistanceKey ?? options.filterMode;
const [filter, setFilter] = useState(
- new ListFilterModel(options.filterMode, queryString.parse(location.search))
+ new ListFilterModel(
+ options.filterMode,
+ queryString.parse(location.search),
+ options.defaultSort
+ )
);
const updateInterfaceConfig = useCallback(
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 2aad3672f..917aa07e2 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -111,11 +111,15 @@ export class ListFilterModel {
return new CriterionOption(Criterion.getLabel(criterion), criterion);
}
- public constructor(filterMode: FilterMode, rawParms?: ParsedQuery) {
+ public constructor(
+ filterMode: FilterMode,
+ rawParms?: ParsedQuery,
+ defaultSort?: string
+ ) {
const params = rawParms as IQueryParameters;
switch (filterMode) {
case FilterMode.Scenes:
- this.sortBy = "date";
+ this.sortBy = defaultSort ?? "date";
this.sortByOptions = [
"title",
"path",
@@ -131,6 +135,7 @@ export class ListFilterModel {
"tag_count",
"performer_count",
"random",
+ "movie_scene_number",
];
this.displayModeOptions = [
DisplayMode.Grid,
@@ -159,7 +164,7 @@ export class ListFilterModel {
];
break;
case FilterMode.Images:
- this.sortBy = "path";
+ this.sortBy = defaultSort ?? "path";
this.sortByOptions = [
"title",
"path",
@@ -189,7 +194,7 @@ export class ListFilterModel {
];
break;
case FilterMode.Performers: {
- this.sortBy = "name";
+ this.sortBy = defaultSort ?? "name";
this.sortByOptions = [
"name",
"height",
@@ -239,7 +244,7 @@ export class ListFilterModel {
break;
}
case FilterMode.Studios:
- this.sortBy = "name";
+ this.sortBy = defaultSort ?? "name";
this.sortByOptions = [
"name",
"scenes_count",
@@ -259,7 +264,7 @@ export class ListFilterModel {
];
break;
case FilterMode.Movies:
- this.sortBy = "name";
+ this.sortBy = defaultSort ?? "name";
this.sortByOptions = ["name", "scenes_count", "random"];
this.displayModeOptions = [DisplayMode.Grid];
this.criterionOptions = [
@@ -270,7 +275,7 @@ export class ListFilterModel {
];
break;
case FilterMode.Galleries:
- this.sortBy = "path";
+ this.sortBy = defaultSort ?? "path";
this.sortByOptions = [
"path",
"file_mod_time",
@@ -302,7 +307,7 @@ export class ListFilterModel {
];
break;
case FilterMode.SceneMarkers:
- this.sortBy = "title";
+ this.sortBy = defaultSort ?? "title";
this.sortByOptions = [
"title",
"seconds",
@@ -319,7 +324,7 @@ export class ListFilterModel {
];
break;
case FilterMode.Tags:
- this.sortBy = "name";
+ this.sortBy = defaultSort ?? "name";
// scene markers count has been disabled for now due to performance
// issues
this.sortByOptions = [
From 7836a37d6ecd94df9231c199028f321bbbe0440d Mon Sep 17 00:00:00 2001
From: bnkai <48220860+bnkai@users.noreply.github.com>
Date: Thu, 22 Apr 2021 06:51:51 +0300
Subject: [PATCH 42/66] Fix various generate issues (#1322)
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
pkg/manager/generator_preview.go | 31 ++++++++++++++-----
pkg/manager/manager.go | 13 ++++++--
pkg/manager/manager_tasks.go | 26 ++++++++++------
pkg/utils/time.go | 22 +++++++++++++
.../src/components/Changelog/versions/v070.md | 2 ++
ui/v2.5/src/docs/en/Tagger.md | 6 ++--
6 files changed, 78 insertions(+), 22 deletions(-)
create mode 100644 pkg/utils/time.go
diff --git a/pkg/manager/generator_preview.go b/pkg/manager/generator_preview.go
index c777aa073..c723b9e69 100644
--- a/pkg/manager/generator_preview.go
+++ b/pkg/manager/generator_preview.go
@@ -58,11 +58,6 @@ func (g *PreviewGenerator) Generate() error {
}
encoder := ffmpeg.NewEncoder(instance.FFMPEGPath)
-
- if err := g.generateConcatFile(); err != nil {
- return err
- }
-
if g.GenerateVideo {
if err := g.generateVideo(&encoder, false); err != nil {
logger.Warnf("[generator] failed generating scene preview, trying fallback")
@@ -101,18 +96,32 @@ func (g *PreviewGenerator) generateVideo(encoder *ffmpeg.Encoder, fallback bool)
if !g.Overwrite && outputExists {
return nil
}
+ err := g.generateConcatFile()
+ if err != nil {
+ return err
+ }
+
+ var tmpFiles []string // a list of tmp files used during the preview generation
+ tmpFiles = append(tmpFiles, g.getConcatFilePath()) // add concat filename to tmpFiles
+ defer func() { removeFiles(tmpFiles) }() // remove tmpFiles when done
stepSize, offset := g.Info.getStepSizeAndOffset()
+ durationSegment := g.Info.ChunkDuration
+ if durationSegment < 0.75 { // a very short duration can create files without a video stream
+ durationSegment = 0.75 // use 0.75 in that case
+ logger.Warnf("[generator] Segment duration (%f) too short.Using 0.75 instead.", g.Info.ChunkDuration)
+ }
+
for i := 0; i < g.Info.ChunkCount; i++ {
time := offset + (float64(i) * stepSize)
num := fmt.Sprintf("%.3d", i)
filename := "preview_" + g.VideoChecksum + "_" + num + ".mp4"
chunkOutputPath := instance.Paths.Generated.GetTmpPath(filename)
-
+ tmpFiles = append(tmpFiles, chunkOutputPath) // add chunk filename to tmpFiles
options := ffmpeg.ScenePreviewChunkOptions{
StartTime: time,
- Duration: g.Info.ChunkDuration,
+ Duration: durationSegment,
Width: 640,
OutputPath: chunkOutputPath,
}
@@ -152,3 +161,11 @@ func (g *PreviewGenerator) generateImage(encoder *ffmpeg.Encoder) error {
func (g *PreviewGenerator) getConcatFilePath() string {
return instance.Paths.Generated.GetTmpPath(fmt.Sprintf("files_%s.txt", g.VideoChecksum))
}
+
+func removeFiles(list []string) {
+ for _, f := range list {
+ if err := os.Remove(f); err != nil {
+ logger.Warnf("[generator] Delete error: %s", err)
+ }
+ }
+}
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
index 9d4aabea9..1ead1e463 100644
--- a/pkg/manager/manager.go
+++ b/pkg/manager/manager.go
@@ -6,6 +6,7 @@ import (
"os"
"path/filepath"
"sync"
+ "time"
"github.com/stashapp/stash/pkg/database"
"github.com/stashapp/stash/pkg/ffmpeg"
@@ -142,8 +143,16 @@ func (s *singleton) PostInit() error {
// clear the downloads and tmp directories
// #1021 - only clear these directories if the generated folder is non-empty
if s.Config.GetGeneratedPath() != "" {
- utils.EmptyDir(instance.Paths.Generated.Downloads)
- utils.EmptyDir(instance.Paths.Generated.Tmp)
+ const deleteTimeout = 1 * time.Second
+
+ utils.Timeout(func() {
+ utils.EmptyDir(instance.Paths.Generated.Downloads)
+ utils.EmptyDir(instance.Paths.Generated.Tmp)
+ }, deleteTimeout, func(done chan struct{}) {
+ logger.Info("Please wait. Deleting temporary files...") // print
+ <-done // and wait for deletion
+ logger.Info("Temporary files deleted.")
+ })
}
if err := database.Initialize(s.Config.GetDatabasePath()); err != nil {
diff --git a/pkg/manager/manager_tasks.go b/pkg/manager/manager_tasks.go
index 182a938f3..8f1abf551 100644
--- a/pkg/manager/manager_tasks.go
+++ b/pkg/manager/manager_tasks.go
@@ -192,11 +192,12 @@ func (s *singleton) Scan(input models.ScanMetadataInput) {
i := 0
stoppingErr := errors.New("stopping")
+ var err error
var galleries []string
for _, sp := range paths {
- err := walkFilesToScan(sp, func(path string, info os.FileInfo, err error) error {
+ err = walkFilesToScan(sp, func(path string, info os.FileInfo, err error) error {
if total != nil {
s.Status.setProgress(i, *total)
i++
@@ -231,26 +232,25 @@ func (s *singleton) Scan(input models.ScanMetadataInput) {
})
if err == stoppingErr {
+ logger.Info("Stopping due to user request")
break
}
if err != nil {
logger.Errorf("Error encountered scanning files: %s", err.Error())
- return
+ break
}
}
- if s.Status.stopping {
- logger.Info("Stopping due to user request")
- return
- }
-
wg.Wait()
instance.Paths.Generated.EmptyTmpDir()
-
elapsed := time.Since(start)
logger.Info(fmt.Sprintf("Scan finished (%s)", elapsed))
+ if s.Status.stopping || err != nil {
+ return
+ }
+
for _, path := range galleries {
wg.Add()
task := ScanTask{
@@ -464,7 +464,7 @@ func (s *singleton) Generate(input models.GenerateMetadataInput) {
}
setGeneratePreviewOptionsInput(generatePreviewOptions)
- // Start measuring how long the scan has taken. (consider moving this up)
+ // Start measuring how long the generate has taken. (consider moving this up)
start := time.Now()
instance.Paths.Generated.EnsureTmpDir()
@@ -472,6 +472,8 @@ func (s *singleton) Generate(input models.GenerateMetadataInput) {
s.Status.setProgress(i, total)
if s.Status.stopping {
logger.Info("Stopping due to user request")
+ wg.Wait()
+ instance.Paths.Generated.EmptyTmpDir()
return
}
@@ -540,6 +542,10 @@ func (s *singleton) Generate(input models.GenerateMetadataInput) {
s.Status.setProgress(lenScenes+i, total)
if s.Status.stopping {
logger.Info("Stopping due to user request")
+ wg.Wait()
+ instance.Paths.Generated.EmptyTmpDir()
+ elapsed := time.Since(start)
+ logger.Info(fmt.Sprintf("Generate finished (%s)", elapsed))
return
}
@@ -616,7 +622,7 @@ func (s *singleton) generateScreenshot(sceneId string, at *float64) {
wg.Wait()
- logger.Infof("Generate finished")
+ logger.Infof("Generate screenshot finished")
}()
}
diff --git a/pkg/utils/time.go b/pkg/utils/time.go
new file mode 100644
index 000000000..59ed6bc93
--- /dev/null
+++ b/pkg/utils/time.go
@@ -0,0 +1,22 @@
+package utils
+
+import "time"
+
+// Timeout executes the provided todo function, and waits for it to return. If
+// the function does not return before the waitTime duration is elapsed, then
+// onTimeout is executed, passing a channel that will be closed when the
+// function returns.
+func Timeout(todo func(), waitTime time.Duration, onTimeout func(done chan struct{})) {
+ done := make(chan struct{})
+
+ go func() {
+ todo()
+ close(done)
+ }()
+
+ select {
+ case <-done: // on time, just exit
+ case <-time.After(waitTime):
+ onTimeout(done)
+ }
+}
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 170198522..356ef3a1b 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -11,6 +11,8 @@
* Added scene queue.
### 🎨 Improvements
+* Clean generation artifacts after generating each scene.
+* Log message at startup when cleaning the `tmp` and `downloads` generated folders takes more than one second.
* Sort movie scenes by scene number by default.
* Support http request headers in scrapers.
* Sort performers by gender in scene/image/gallery cards and details.
diff --git a/ui/v2.5/src/docs/en/Tagger.md b/ui/v2.5/src/docs/en/Tagger.md
index 9469997fa..272259021 100644
--- a/ui/v2.5/src/docs/en/Tagger.md
+++ b/ui/v2.5/src/docs/en/Tagger.md
@@ -6,16 +6,16 @@ Stash can be integrated with stash-box which acts as a centralized metadata data
The fingerprint search matches your current selection of files against the remote stash-box instance. Any scenes with a matching fingerprint will be returned, although there is currently no validation of fingerprints so it’s recommended to double-check the validity before saving.
-If no fingerprint match is found it’s possible to search by keywords. The search works by matching the query against a scene’s title_, release date_, _studio name_, and _performer names_. By default the tagger uses metadata set on the file, or parses the filename, this can be changed in the config.
+If no fingerprint match is found it’s possible to search by keywords. The search works by matching the query against a scene’s _title_, _release date_, _studio name_, and _performer names_. By default the tagger uses metadata set on the file, or parses the filename, this can be changed in the config.
An important thing to note is that it only returns a match *if all query terms are a match*. As an example, if a scene is titled `"A Trip to the Mall"` with the performer `"Jane Doe"`, a search for `"Trip to the Mall 1080p"` will *not* match, however `"trip mall doe"` would. Usually a few pieces of info is enough, for instance performer name + release date or studio name. To avoid common non-related keywords you can add them to the blacklist in the tagger config. Any items in the blacklist are stripped out of the query.
#### Saving
When a scene is matched stash will try to match the studio and performers against your local studios and performers. If you have previously matched them, they will automatically be selected. If not you either have to select the correct performer/studio from the dropdown, choose create to create a new entity, or skip to ignore it.
-Once a scene is saved the scene and the matched studio/performers will have the stash_id saved which will then be used for future tagging.
+Once a scene is saved the scene and the matched studio/performers will have the `stash_id` saved which will then be used for future tagging.
By default male performers are not shown, this can be enabled in the tagger config. Likewise scene tags are by default not saved. They can be set to either merge with existing tags on the scene, or overwrite them. It is not recommended to set tags currently since they are hard to deduplicate and can litter your data.
#### Submitting fingerprints
-After a scene is saved you will prompted to submit the fingerprint back to the stash-box instance. This is optional, but can be helpful for other users who have an identical copy who will then be able to match via the fingerprint search. No other information than the stash_id and file fingerprint is submitted.
+After a scene is saved you will prompted to submit the fingerprint back to the stash-box instance. This is optional, but can be helpful for other users who have an identical copy who will then be able to match via the fingerprint search. No other information than the `stash_id` and file fingerprint is submitted.
From f66010a367460b790bd2c85e3bd0783b293d17e0 Mon Sep 17 00:00:00 2001
From: julien0221 <68500525+julien0221@users.noreply.github.com>
Date: Mon, 26 Apr 2021 03:13:50 +0100
Subject: [PATCH 43/66] Fixed 0 for weight when a new performer is created and
fixed the search is null (#1336)
---
graphql/schema/types/filters.graphql | 2 +-
pkg/sqlite/performer.go | 2 +-
.../Performers/PerformerDetails/PerformerEditPanel.tsx | 2 +-
ui/v2.5/src/models/list-filter/filter.ts | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/graphql/schema/types/filters.graphql b/graphql/schema/types/filters.graphql
index 8c1da2506..b0d124bbe 100644
--- a/graphql/schema/types/filters.graphql
+++ b/graphql/schema/types/filters.graphql
@@ -76,7 +76,7 @@ input PerformerFilterType {
"""Filter by hair color"""
hair_color: StringCriterionInput
"""Filter by weight"""
- weight: StringCriterionInput
+ weight: IntCriterionInput
"""Filter by death year"""
death_year: IntCriterionInput
}
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index bbfcbee92..17406eb7c 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -260,8 +260,8 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos")
query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings")
query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color")
- query.handleStringCriterionInput(performerFilter.Weight, tableName+".weight")
query.handleStringCriterionInput(performerFilter.URL, tableName+".url")
+ query.handleIntCriterionInput(performerFilter.Weight, tableName+".weight")
// TODO - need better handling of aliases
query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases")
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index 499f1cae7..cf5916340 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -138,7 +138,7 @@ export const PerformerEditPanel: React.FC = ({
details: performer.details ?? "",
death_date: performer.death_date ?? "",
hair_color: performer.hair_color ?? "",
- weight: performer.weight ?? "",
+ weight: performer.weight ?? undefined,
};
type InputValues = typeof initialValues;
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index 917aa07e2..70dc2fee1 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -209,6 +209,7 @@ export class ListFilterModel {
"birth_year",
"death_year",
"age",
+ "weight",
];
const stringCriteria: CriterionType[] = [
"ethnicity",
@@ -216,7 +217,6 @@ export class ListFilterModel {
"hair_color",
"eye_color",
"height",
- "weight",
"measurements",
"fake_tits",
"career_length",
@@ -718,7 +718,7 @@ export class ListFilterModel {
break;
}
case "weight": {
- const wCrit = criterion as StringCriterion;
+ const wCrit = criterion as NumberCriterion;
result.weight = { value: wCrit.value, modifier: wCrit.modifier };
break;
}
From 2eb2d865dc41669d915ad24a4a688ed56fe3dbb2 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 26 Apr 2021 12:51:31 +1000
Subject: [PATCH 44/66] Auto tag rewrite (#1324)
---
.../integration_test.go} | 119 ++-----
pkg/autotag/performer.go | 42 +++
pkg/autotag/performer_test.go | 81 +++++
pkg/autotag/scene.go | 117 ++++++
pkg/autotag/scene_test.go | 276 +++++++++++++++
pkg/autotag/studio.go | 66 ++++
pkg/autotag/studio_test.go | 85 +++++
pkg/autotag/tag.go | 41 +++
pkg/autotag/tag_test.go | 81 +++++
pkg/autotag/tagger.go | 198 +++++++++++
pkg/manager/manager_tasks.go | 335 ++++++++++++------
pkg/manager/task_autotag.go | 198 ++---------
pkg/models/extension_find_filter.go | 4 +
pkg/models/mocks/PerformerReaderWriter.go | 23 ++
pkg/models/mocks/StudioReaderWriter.go | 23 ++
pkg/models/mocks/TagReaderWriter.go | 23 ++
pkg/models/performer.go | 3 +
pkg/models/studio.go | 3 +
pkg/models/tag.go | 3 +
pkg/sqlite/performer.go | 20 ++
pkg/sqlite/performer_test.go | 20 ++
pkg/sqlite/studio.go | 18 +
pkg/sqlite/studio_test.go | 20 ++
pkg/sqlite/tag.go | 18 +
pkg/sqlite/tag_test.go | 20 ++
.../src/components/Changelog/versions/v070.md | 2 +
26 files changed, 1469 insertions(+), 370 deletions(-)
rename pkg/{manager/task_autotag_test.go => autotag/integration_test.go} (71%)
create mode 100644 pkg/autotag/performer.go
create mode 100644 pkg/autotag/performer_test.go
create mode 100644 pkg/autotag/scene.go
create mode 100644 pkg/autotag/scene_test.go
create mode 100644 pkg/autotag/studio.go
create mode 100644 pkg/autotag/studio_test.go
create mode 100644 pkg/autotag/tag.go
create mode 100644 pkg/autotag/tag_test.go
create mode 100644 pkg/autotag/tagger.go
diff --git a/pkg/manager/task_autotag_test.go b/pkg/autotag/integration_test.go
similarity index 71%
rename from pkg/manager/task_autotag_test.go
rename to pkg/autotag/integration_test.go
index 0eb755c4d..32a0e7501 100644
--- a/pkg/manager/task_autotag_test.go
+++ b/pkg/autotag/integration_test.go
@@ -1,6 +1,6 @@
// +build integration
-package manager
+package autotag
import (
"context"
@@ -8,8 +8,6 @@ import (
"fmt"
"io/ioutil"
"os"
- "strings"
- "sync"
"testing"
"github.com/stashapp/stash/pkg/database"
@@ -22,49 +20,12 @@ import (
)
const testName = "Foo's Bar"
-const testExtension = ".mp4"
const existingStudioName = "ExistingStudio"
-const existingStudioSceneName = testName + ".dontChangeStudio" + testExtension
+const existingStudioSceneName = testName + ".dontChangeStudio.mp4"
var existingStudioID int
-var testSeparators = []string{
- ".",
- "-",
- "_",
- " ",
-}
-
-var testEndSeparators = []string{
- "{",
- "}",
- "(",
- ")",
- ",",
-}
-
-func generateNamePatterns(name, separator string) []string {
- var ret []string
- ret = append(ret, fmt.Sprintf("%s%saaa"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("aaa%s%s"+testExtension, separator, name))
- ret = append(ret, fmt.Sprintf("aaa%s%s%sbbb"+testExtension, separator, name, separator))
- ret = append(ret, fmt.Sprintf("dir/%s%saaa"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("dir\\%s%saaa"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("%s%saaa/dir/bbb"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("%s%saaa\\dir\\bbb"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("dir/%s%s/aaa"+testExtension, name, separator))
- ret = append(ret, fmt.Sprintf("dir\\%s%s\\aaa"+testExtension, name, separator))
-
- return ret
-}
-
-func generateFalseNamePattern(name string, separator string) string {
- splitted := strings.Split(name, " ")
-
- return fmt.Sprintf("%s%saaa%s%s"+testExtension, splitted[0], separator, separator, splitted[1])
-}
-
func testTeardown(databaseFile string) {
err := database.DB.Close()
@@ -126,7 +87,7 @@ func createStudio(qb models.StudioWriter, name string) (*models.Studio, error) {
// create the studio
studio := models.Studio{
Checksum: name,
- Name: sql.NullString{Valid: true, String: testName},
+ Name: sql.NullString{Valid: true, String: name},
}
return qb.Create(studio)
@@ -148,23 +109,7 @@ func createTag(qb models.TagWriter) error {
func createScenes(sqb models.SceneReaderWriter) error {
// create the scenes
- var scenePatterns []string
- var falseScenePatterns []string
-
- separators := append(testSeparators, testEndSeparators...)
-
- for _, separator := range separators {
- scenePatterns = append(scenePatterns, generateNamePatterns(testName, separator)...)
- scenePatterns = append(scenePatterns, generateNamePatterns(strings.ToLower(testName), separator)...)
- falseScenePatterns = append(falseScenePatterns, generateFalseNamePattern(testName, separator))
- }
-
- // add test cases for intra-name separators
- for _, separator := range testSeparators {
- if separator != " " {
- scenePatterns = append(scenePatterns, generateNamePatterns(strings.Replace(testName, " ", separator, -1), separator)...)
- }
- }
+ scenePatterns, falseScenePatterns := generateScenePaths(testName)
for _, fn := range scenePatterns {
err := createScene(sqb, makeScene(fn, true))
@@ -278,17 +223,14 @@ func TestParsePerformers(t *testing.T) {
return
}
- task := AutoTagPerformerTask{
- AutoTagTask: AutoTagTask{
- txnManager: sqlite.NewTransactionManager(),
- },
- performer: performers[0],
+ for _, p := range performers {
+ if err := withTxn(func(r models.Repository) error {
+ return PerformerScenes(p, nil, r.Scene())
+ }); err != nil {
+ t.Errorf("Error auto-tagging performers: %s", err)
+ }
}
- var wg sync.WaitGroup
- wg.Add(1)
- task.Start(&wg)
-
// verify that scenes were tagged correctly
withTxn(func(r models.Repository) error {
pqb := r.Performer()
@@ -328,17 +270,14 @@ func TestParseStudios(t *testing.T) {
return
}
- task := AutoTagStudioTask{
- AutoTagTask: AutoTagTask{
- txnManager: sqlite.NewTransactionManager(),
- },
- studio: studios[0],
+ for _, s := range studios {
+ if err := withTxn(func(r models.Repository) error {
+ return StudioScenes(s, nil, r.Scene())
+ }); err != nil {
+ t.Errorf("Error auto-tagging performers: %s", err)
+ }
}
- var wg sync.WaitGroup
- wg.Add(1)
- task.Start(&wg)
-
// verify that scenes were tagged correctly
withTxn(func(r models.Repository) error {
scenes, err := r.Scene().All()
@@ -354,9 +293,14 @@ func TestParseStudios(t *testing.T) {
}
} else {
// title is only set on scenes where we expect studio to be set
- if scene.Title.String == scene.Path && scene.StudioID.Int64 != int64(studios[0].ID) {
- t.Errorf("Did not set studio '%s' for path '%s'", testName, scene.Path)
- } else if scene.Title.String != scene.Path && scene.StudioID.Int64 == int64(studios[0].ID) {
+ if scene.Title.String == scene.Path {
+ if !scene.StudioID.Valid {
+ t.Errorf("Did not set studio '%s' for path '%s'", testName, scene.Path)
+ } else if scene.StudioID.Int64 != int64(studios[1].ID) {
+ t.Errorf("Incorrect studio id %d set for path '%s'", scene.StudioID.Int64, scene.Path)
+ }
+
+ } else if scene.Title.String != scene.Path && scene.StudioID.Int64 == int64(studios[1].ID) {
t.Errorf("Incorrectly set studio '%s' for path '%s'", testName, scene.Path)
}
}
@@ -377,17 +321,14 @@ func TestParseTags(t *testing.T) {
return
}
- task := AutoTagTagTask{
- AutoTagTask: AutoTagTask{
- txnManager: sqlite.NewTransactionManager(),
- },
- tag: tags[0],
+ for _, s := range tags {
+ if err := withTxn(func(r models.Repository) error {
+ return TagScenes(s, nil, r.Scene())
+ }); err != nil {
+ t.Errorf("Error auto-tagging performers: %s", err)
+ }
}
- var wg sync.WaitGroup
- wg.Add(1)
- task.Start(&wg)
-
// verify that scenes were tagged correctly
withTxn(func(r models.Repository) error {
scenes, err := r.Scene().All()
diff --git a/pkg/autotag/performer.go b/pkg/autotag/performer.go
new file mode 100644
index 000000000..b6f40c1ad
--- /dev/null
+++ b/pkg/autotag/performer.go
@@ -0,0 +1,42 @@
+package autotag
+
+import (
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/scene"
+)
+
+func getMatchingPerformers(path string, performerReader models.PerformerReader) ([]*models.Performer, error) {
+ words := getPathWords(path)
+ performers, err := performerReader.QueryForAutoTag(words)
+
+ if err != nil {
+ return nil, err
+ }
+
+ var ret []*models.Performer
+ for _, p := range performers {
+ // TODO - commenting out alias handling until both sides work correctly
+ if nameMatchesPath(p.Name.String, path) { // || nameMatchesPath(p.Aliases.String, path) {
+ ret = append(ret, p)
+ }
+ }
+
+ return ret, nil
+}
+
+func getPerformerTagger(p *models.Performer) tagger {
+ return tagger{
+ ID: p.ID,
+ Type: "performer",
+ Name: p.Name.String,
+ }
+}
+
+// PerformerScenes searches for scenes whose path matches the provided performer name and tags the scene with the performer.
+func PerformerScenes(p *models.Performer, paths []string, rw models.SceneReaderWriter) error {
+ t := getPerformerTagger(p)
+
+ return t.tagScenes(paths, rw, func(subjectID, otherID int) (bool, error) {
+ return scene.AddPerformer(rw, otherID, subjectID)
+ })
+}
diff --git a/pkg/autotag/performer_test.go b/pkg/autotag/performer_test.go
new file mode 100644
index 000000000..1e935c9d5
--- /dev/null
+++ b/pkg/autotag/performer_test.go
@@ -0,0 +1,81 @@
+package autotag
+
+import (
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestPerformerScenes(t *testing.T) {
+ type test struct {
+ performerName string
+ expectedRegex string
+ }
+
+ performerNames := []test{
+ {
+ "performer name",
+ `(?i)(?:^|_|[^\w\d])performer[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ {
+ "performer + name",
+ `(?i)(?:^|_|[^\w\d])performer[.\-_ ]*\+[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ }
+
+ for _, p := range performerNames {
+ testPerformerScenes(t, p.performerName, p.expectedRegex)
+ }
+}
+
+func testPerformerScenes(t *testing.T, performerName, expectedRegex string) {
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ const performerID = 2
+
+ var scenes []*models.Scene
+ matchingPaths, falsePaths := generateScenePaths(performerName)
+ for i, p := range append(matchingPaths, falsePaths...) {
+ scenes = append(scenes, &models.Scene{
+ ID: i + 1,
+ Path: p,
+ })
+ }
+
+ performer := models.Performer{
+ ID: performerID,
+ Name: models.NullString(performerName),
+ }
+
+ organized := false
+ perPage := models.PerPageAll
+
+ expectedSceneFilter := &models.SceneFilterType{
+ Organized: &organized,
+ Path: &models.StringCriterionInput{
+ Value: expectedRegex,
+ Modifier: models.CriterionModifierMatchesRegex,
+ },
+ }
+
+ expectedFindFilter := &models.FindFilterType{
+ PerPage: &perPage,
+ }
+
+ mockSceneReader.On("Query", expectedSceneFilter, expectedFindFilter).Return(scenes, len(scenes), nil).Once()
+
+ for i := range matchingPaths {
+ sceneID := i + 1
+ mockSceneReader.On("GetPerformerIDs", sceneID).Return(nil, nil).Once()
+ mockSceneReader.On("UpdatePerformers", sceneID, []int{performerID}).Return(nil).Once()
+ }
+
+ err := PerformerScenes(&performer, nil, mockSceneReader)
+
+ assert := assert.New(t)
+
+ assert.Nil(err)
+ mockSceneReader.AssertExpectations(t)
+}
diff --git a/pkg/autotag/scene.go b/pkg/autotag/scene.go
new file mode 100644
index 000000000..d9bffd630
--- /dev/null
+++ b/pkg/autotag/scene.go
@@ -0,0 +1,117 @@
+package autotag
+
+import (
+ "fmt"
+ "path/filepath"
+ "strings"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/scene"
+)
+
+func pathsFilter(paths []string) *models.SceneFilterType {
+ if paths == nil {
+ return nil
+ }
+
+ sep := string(filepath.Separator)
+
+ var ret *models.SceneFilterType
+ var or *models.SceneFilterType
+ for _, p := range paths {
+ newOr := &models.SceneFilterType{}
+ if or != nil {
+ or.Or = newOr
+ } else {
+ ret = newOr
+ }
+
+ or = newOr
+
+ if !strings.HasSuffix(p, sep) {
+ p = p + sep
+ }
+
+ or.Path = &models.StringCriterionInput{
+ Modifier: models.CriterionModifierEquals,
+ Value: p + "%",
+ }
+ }
+
+ return ret
+}
+
+func getMatchingScenes(name string, paths []string, sceneReader models.SceneReader) ([]*models.Scene, error) {
+ regex := getPathQueryRegex(name)
+ organized := false
+ filter := models.SceneFilterType{
+ Path: &models.StringCriterionInput{
+ Value: "(?i)" + regex,
+ Modifier: models.CriterionModifierMatchesRegex,
+ },
+ Organized: &organized,
+ }
+
+ filter.And = pathsFilter(paths)
+
+ pp := models.PerPageAll
+ scenes, _, err := sceneReader.Query(&filter, &models.FindFilterType{
+ PerPage: &pp,
+ })
+
+ if err != nil {
+ return nil, fmt.Errorf("error querying scenes with regex '%s': %s", regex, err.Error())
+ }
+
+ var ret []*models.Scene
+ for _, p := range scenes {
+ if nameMatchesPath(name, p.Path) {
+ ret = append(ret, p)
+ }
+ }
+
+ return ret, nil
+}
+
+func getSceneFileTagger(s *models.Scene) tagger {
+ return tagger{
+ ID: s.ID,
+ Type: "scene",
+ Name: s.GetTitle(),
+ Path: s.Path,
+ }
+}
+
+// ScenePerformers tags the provided scene with performers whose name matches the scene's path.
+func ScenePerformers(s *models.Scene, rw models.SceneReaderWriter, performerReader models.PerformerReader) error {
+ t := getSceneFileTagger(s)
+
+ return t.tagPerformers(performerReader, func(subjectID, otherID int) (bool, error) {
+ return scene.AddPerformer(rw, subjectID, otherID)
+ })
+}
+
+// SceneStudios tags the provided scene with the first studio whose name matches the scene's path.
+//
+// Scenes will not be tagged if studio is already set.
+func SceneStudios(s *models.Scene, rw models.SceneReaderWriter, studioReader models.StudioReader) error {
+ if s.StudioID.Valid {
+ // don't modify
+ return nil
+ }
+
+ t := getSceneFileTagger(s)
+
+ return t.tagStudios(studioReader, func(subjectID, otherID int) (bool, error) {
+ return addSceneStudio(rw, subjectID, otherID)
+ })
+}
+
+// SceneTags tags the provided scene with tags whose name matches the scene's path.
+func SceneTags(s *models.Scene, rw models.SceneReaderWriter, tagReader models.TagReader) error {
+ t := getSceneFileTagger(s)
+
+ return t.tagTags(tagReader, func(subjectID, otherID int) (bool, error) {
+ return scene.AddTag(rw, subjectID, otherID)
+ })
+}
diff --git a/pkg/autotag/scene_test.go b/pkg/autotag/scene_test.go
new file mode 100644
index 000000000..a71056885
--- /dev/null
+++ b/pkg/autotag/scene_test.go
@@ -0,0 +1,276 @@
+package autotag
+
+import (
+ "fmt"
+ "strings"
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/mock"
+)
+
+var testSeparators = []string{
+ ".",
+ "-",
+ "_",
+ " ",
+}
+
+var testEndSeparators = []string{
+ "{",
+ "}",
+ "(",
+ ")",
+ ",",
+}
+
+func generateNamePatterns(name, separator string) []string {
+ var ret []string
+ ret = append(ret, fmt.Sprintf("%s%saaa.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("aaa%s%s.mp4", separator, name))
+ ret = append(ret, fmt.Sprintf("aaa%s%s%sbbb.mp4", separator, name, separator))
+ ret = append(ret, fmt.Sprintf("dir/%s%saaa.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("dir\\%s%saaa.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("%s%saaa/dir/bbb.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("%s%saaa\\dir\\bbb.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("dir/%s%s/aaa.mp4", name, separator))
+ ret = append(ret, fmt.Sprintf("dir\\%s%s\\aaa.mp4", name, separator))
+
+ return ret
+}
+
+func generateSplitNamePatterns(name, separator string) []string {
+ var ret []string
+ splitted := strings.Split(name, " ")
+ // only do this for names that are split into two
+ if len(splitted) == 2 {
+ ret = append(ret, fmt.Sprintf("%s%s%s.mp4", splitted[0], separator, splitted[1]))
+ }
+
+ return ret
+}
+
+func generateFalseNamePatterns(name string, separator string) []string {
+ splitted := strings.Split(name, " ")
+
+ var ret []string
+ // only do this for names that are split into two
+ if len(splitted) == 2 {
+ ret = append(ret, fmt.Sprintf("%s%saaa%s%s.mp4", splitted[0], separator, separator, splitted[1]))
+ }
+
+ return ret
+}
+
+func generateScenePaths(testName string) (scenePatterns []string, falseScenePatterns []string) {
+ separators := append(testSeparators, testEndSeparators...)
+
+ for _, separator := range separators {
+ scenePatterns = append(scenePatterns, generateNamePatterns(testName, separator)...)
+ scenePatterns = append(scenePatterns, generateNamePatterns(strings.ToLower(testName), separator)...)
+ scenePatterns = append(scenePatterns, generateNamePatterns(strings.ReplaceAll(testName, " ", ""), separator)...)
+ falseScenePatterns = append(falseScenePatterns, generateFalseNamePatterns(testName, separator)...)
+ }
+
+ // add test cases for intra-name separators
+ for _, separator := range testSeparators {
+ if separator != " " {
+ scenePatterns = append(scenePatterns, generateNamePatterns(strings.Replace(testName, " ", separator, -1), separator)...)
+ }
+ }
+
+ // add basic false scenarios
+ falseScenePatterns = append(falseScenePatterns, fmt.Sprintf("aaa%s.mp4", testName))
+ falseScenePatterns = append(falseScenePatterns, fmt.Sprintf("%saaa.mp4", testName))
+
+ // add path separator false scenarios
+ falseScenePatterns = append(falseScenePatterns, generateFalseNamePatterns(testName, "/")...)
+ falseScenePatterns = append(falseScenePatterns, generateFalseNamePatterns(testName, "\\")...)
+
+ // split patterns only valid for ._- and whitespace
+ for _, separator := range testSeparators {
+ scenePatterns = append(scenePatterns, generateSplitNamePatterns(testName, separator)...)
+ }
+
+ // false patterns for other separators
+ for _, separator := range testEndSeparators {
+ falseScenePatterns = append(falseScenePatterns, generateSplitNamePatterns(testName, separator)...)
+ }
+
+ return
+}
+
+type pathTestTable struct {
+ ScenePath string
+ Matches bool
+}
+
+func generateTestTable(testName string) []pathTestTable {
+ var ret []pathTestTable
+
+ var scenePatterns []string
+ var falseScenePatterns []string
+
+ separators := append(testSeparators, testEndSeparators...)
+
+ for _, separator := range separators {
+ scenePatterns = append(scenePatterns, generateNamePatterns(testName, separator)...)
+ scenePatterns = append(scenePatterns, generateNamePatterns(strings.ToLower(testName), separator)...)
+ falseScenePatterns = append(falseScenePatterns, generateFalseNamePatterns(testName, separator)...)
+ }
+
+ for _, p := range scenePatterns {
+ t := pathTestTable{
+ ScenePath: p,
+ Matches: true,
+ }
+
+ ret = append(ret, t)
+ }
+
+ for _, p := range falseScenePatterns {
+ t := pathTestTable{
+ ScenePath: p,
+ Matches: false,
+ }
+
+ ret = append(ret, t)
+ }
+
+ return ret
+}
+
+func TestScenePerformers(t *testing.T) {
+ const sceneID = 1
+ const performerName = "performer name"
+ const performerID = 2
+ performer := models.Performer{
+ ID: performerID,
+ Name: models.NullString(performerName),
+ }
+
+ const reversedPerformerName = "name performer"
+ const reversedPerformerID = 3
+ reversedPerformer := models.Performer{
+ ID: reversedPerformerID,
+ Name: models.NullString(reversedPerformerName),
+ }
+
+ testTables := generateTestTable(performerName)
+
+ assert := assert.New(t)
+
+ for _, test := range testTables {
+ mockPerformerReader := &mocks.PerformerReaderWriter{}
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ mockPerformerReader.On("QueryForAutoTag", mock.Anything).Return([]*models.Performer{&performer, &reversedPerformer}, nil).Once()
+
+ if test.Matches {
+ mockSceneReader.On("GetPerformerIDs", sceneID).Return(nil, nil).Once()
+ mockSceneReader.On("UpdatePerformers", sceneID, []int{performerID}).Return(nil).Once()
+ }
+
+ scene := models.Scene{
+ ID: sceneID,
+ Path: test.ScenePath,
+ }
+ err := ScenePerformers(&scene, mockSceneReader, mockPerformerReader)
+
+ assert.Nil(err)
+ mockPerformerReader.AssertExpectations(t)
+ mockSceneReader.AssertExpectations(t)
+ }
+}
+
+func TestSceneStudios(t *testing.T) {
+ const sceneID = 1
+ const studioName = "studio name"
+ const studioID = 2
+ studio := models.Studio{
+ ID: studioID,
+ Name: models.NullString(studioName),
+ }
+
+ const reversedStudioName = "name studio"
+ const reversedStudioID = 3
+ reversedStudio := models.Studio{
+ ID: reversedStudioID,
+ Name: models.NullString(reversedStudioName),
+ }
+
+ testTables := generateTestTable(studioName)
+
+ assert := assert.New(t)
+
+ for _, test := range testTables {
+ mockStudioReader := &mocks.StudioReaderWriter{}
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ mockStudioReader.On("QueryForAutoTag", mock.Anything).Return([]*models.Studio{&studio, &reversedStudio}, nil).Once()
+
+ if test.Matches {
+ mockSceneReader.On("Find", sceneID).Return(&models.Scene{}, nil).Once()
+ expectedStudioID := models.NullInt64(studioID)
+ mockSceneReader.On("Update", models.ScenePartial{
+ ID: sceneID,
+ StudioID: &expectedStudioID,
+ }).Return(nil, nil).Once()
+ }
+
+ scene := models.Scene{
+ ID: sceneID,
+ Path: test.ScenePath,
+ }
+ err := SceneStudios(&scene, mockSceneReader, mockStudioReader)
+
+ assert.Nil(err)
+ mockStudioReader.AssertExpectations(t)
+ mockSceneReader.AssertExpectations(t)
+ }
+}
+
+func TestSceneTags(t *testing.T) {
+ const sceneID = 1
+ const tagName = "tag name"
+ const tagID = 2
+ tag := models.Tag{
+ ID: tagID,
+ Name: tagName,
+ }
+
+ const reversedTagName = "name tag"
+ const reversedTagID = 3
+ reversedTag := models.Tag{
+ ID: reversedTagID,
+ Name: reversedTagName,
+ }
+
+ testTables := generateTestTable(tagName)
+
+ assert := assert.New(t)
+
+ for _, test := range testTables {
+ mockTagReader := &mocks.TagReaderWriter{}
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ mockTagReader.On("QueryForAutoTag", mock.Anything).Return([]*models.Tag{&tag, &reversedTag}, nil).Once()
+
+ if test.Matches {
+ mockSceneReader.On("GetTagIDs", sceneID).Return(nil, nil).Once()
+ mockSceneReader.On("UpdateTags", sceneID, []int{tagID}).Return(nil).Once()
+ }
+
+ scene := models.Scene{
+ ID: sceneID,
+ Path: test.ScenePath,
+ }
+ err := SceneTags(&scene, mockSceneReader, mockTagReader)
+
+ assert.Nil(err)
+ mockTagReader.AssertExpectations(t)
+ mockSceneReader.AssertExpectations(t)
+ }
+}
diff --git a/pkg/autotag/studio.go b/pkg/autotag/studio.go
new file mode 100644
index 000000000..c01eedecc
--- /dev/null
+++ b/pkg/autotag/studio.go
@@ -0,0 +1,66 @@
+package autotag
+
+import (
+ "database/sql"
+
+ "github.com/stashapp/stash/pkg/models"
+)
+
+func getMatchingStudios(path string, reader models.StudioReader) ([]*models.Studio, error) {
+ words := getPathWords(path)
+ candidates, err := reader.QueryForAutoTag(words)
+
+ if err != nil {
+ return nil, err
+ }
+
+ var ret []*models.Studio
+ for _, c := range candidates {
+ if nameMatchesPath(c.Name.String, path) {
+ ret = append(ret, c)
+ }
+ }
+
+ return ret, nil
+}
+
+func addSceneStudio(sceneWriter models.SceneReaderWriter, sceneID, studioID int) (bool, error) {
+ // don't set if already set
+ scene, err := sceneWriter.Find(sceneID)
+ if err != nil {
+ return false, err
+ }
+
+ if scene.StudioID.Valid {
+ return false, nil
+ }
+
+ // set the studio id
+ s := sql.NullInt64{Int64: int64(studioID), Valid: true}
+ scenePartial := models.ScenePartial{
+ ID: sceneID,
+ StudioID: &s,
+ }
+
+ if _, err := sceneWriter.Update(scenePartial); err != nil {
+ return false, err
+ }
+ return true, nil
+}
+
+func getStudioTagger(p *models.Studio) tagger {
+ return tagger{
+ ID: p.ID,
+ Type: "studio",
+ Name: p.Name.String,
+ }
+}
+
+// StudioScenes searches for scenes whose path matches the provided studio name and tags the scene with the studio, if studio is not already set on the scene.
+func StudioScenes(p *models.Studio, paths []string, rw models.SceneReaderWriter) error {
+ t := getStudioTagger(p)
+
+ return t.tagScenes(paths, rw, func(subjectID, otherID int) (bool, error) {
+ return addSceneStudio(rw, otherID, subjectID)
+ })
+}
diff --git a/pkg/autotag/studio_test.go b/pkg/autotag/studio_test.go
new file mode 100644
index 000000000..d61ba7efb
--- /dev/null
+++ b/pkg/autotag/studio_test.go
@@ -0,0 +1,85 @@
+package autotag
+
+import (
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestStudioScenes(t *testing.T) {
+ type test struct {
+ studioName string
+ expectedRegex string
+ }
+
+ studioNames := []test{
+ {
+ "studio name",
+ `(?i)(?:^|_|[^\w\d])studio[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ {
+ "studio + name",
+ `(?i)(?:^|_|[^\w\d])studio[.\-_ ]*\+[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ }
+
+ for _, p := range studioNames {
+ testStudioScenes(t, p.studioName, p.expectedRegex)
+ }
+}
+
+func testStudioScenes(t *testing.T, studioName, expectedRegex string) {
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ const studioID = 2
+
+ var scenes []*models.Scene
+ matchingPaths, falsePaths := generateScenePaths(studioName)
+ for i, p := range append(matchingPaths, falsePaths...) {
+ scenes = append(scenes, &models.Scene{
+ ID: i + 1,
+ Path: p,
+ })
+ }
+
+ studio := models.Studio{
+ ID: studioID,
+ Name: models.NullString(studioName),
+ }
+
+ organized := false
+ perPage := models.PerPageAll
+
+ expectedSceneFilter := &models.SceneFilterType{
+ Organized: &organized,
+ Path: &models.StringCriterionInput{
+ Value: expectedRegex,
+ Modifier: models.CriterionModifierMatchesRegex,
+ },
+ }
+
+ expectedFindFilter := &models.FindFilterType{
+ PerPage: &perPage,
+ }
+
+ mockSceneReader.On("Query", expectedSceneFilter, expectedFindFilter).Return(scenes, len(scenes), nil).Once()
+
+ for i := range matchingPaths {
+ sceneID := i + 1
+ mockSceneReader.On("Find", sceneID).Return(&models.Scene{}, nil).Once()
+ expectedStudioID := models.NullInt64(studioID)
+ mockSceneReader.On("Update", models.ScenePartial{
+ ID: sceneID,
+ StudioID: &expectedStudioID,
+ }).Return(nil, nil).Once()
+ }
+
+ err := StudioScenes(&studio, nil, mockSceneReader)
+
+ assert := assert.New(t)
+
+ assert.Nil(err)
+ mockSceneReader.AssertExpectations(t)
+}
diff --git a/pkg/autotag/tag.go b/pkg/autotag/tag.go
new file mode 100644
index 000000000..4f08394cc
--- /dev/null
+++ b/pkg/autotag/tag.go
@@ -0,0 +1,41 @@
+package autotag
+
+import (
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/scene"
+)
+
+func getMatchingTags(path string, tagReader models.TagReader) ([]*models.Tag, error) {
+ words := getPathWords(path)
+ tags, err := tagReader.QueryForAutoTag(words)
+
+ if err != nil {
+ return nil, err
+ }
+
+ var ret []*models.Tag
+ for _, p := range tags {
+ if nameMatchesPath(p.Name, path) {
+ ret = append(ret, p)
+ }
+ }
+
+ return ret, nil
+}
+
+func getTagTagger(p *models.Tag) tagger {
+ return tagger{
+ ID: p.ID,
+ Type: "tag",
+ Name: p.Name,
+ }
+}
+
+// TagScenes searches for scenes whose path matches the provided tag name and tags the scene with the tag.
+func TagScenes(p *models.Tag, paths []string, rw models.SceneReaderWriter) error {
+ t := getTagTagger(p)
+
+ return t.tagScenes(paths, rw, func(subjectID, otherID int) (bool, error) {
+ return scene.AddTag(rw, otherID, subjectID)
+ })
+}
diff --git a/pkg/autotag/tag_test.go b/pkg/autotag/tag_test.go
new file mode 100644
index 000000000..47dd3356e
--- /dev/null
+++ b/pkg/autotag/tag_test.go
@@ -0,0 +1,81 @@
+package autotag
+
+import (
+ "testing"
+
+ "github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestTagScenes(t *testing.T) {
+ type test struct {
+ tagName string
+ expectedRegex string
+ }
+
+ tagNames := []test{
+ {
+ "tag name",
+ `(?i)(?:^|_|[^\w\d])tag[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ {
+ "tag + name",
+ `(?i)(?:^|_|[^\w\d])tag[.\-_ ]*\+[.\-_ ]*name(?:$|_|[^\w\d])`,
+ },
+ }
+
+ for _, p := range tagNames {
+ testTagScenes(t, p.tagName, p.expectedRegex)
+ }
+}
+
+func testTagScenes(t *testing.T, tagName, expectedRegex string) {
+ mockSceneReader := &mocks.SceneReaderWriter{}
+
+ const tagID = 2
+
+ var scenes []*models.Scene
+ matchingPaths, falsePaths := generateScenePaths(tagName)
+ for i, p := range append(matchingPaths, falsePaths...) {
+ scenes = append(scenes, &models.Scene{
+ ID: i + 1,
+ Path: p,
+ })
+ }
+
+ tag := models.Tag{
+ ID: tagID,
+ Name: tagName,
+ }
+
+ organized := false
+ perPage := models.PerPageAll
+
+ expectedSceneFilter := &models.SceneFilterType{
+ Organized: &organized,
+ Path: &models.StringCriterionInput{
+ Value: expectedRegex,
+ Modifier: models.CriterionModifierMatchesRegex,
+ },
+ }
+
+ expectedFindFilter := &models.FindFilterType{
+ PerPage: &perPage,
+ }
+
+ mockSceneReader.On("Query", expectedSceneFilter, expectedFindFilter).Return(scenes, len(scenes), nil).Once()
+
+ for i := range matchingPaths {
+ sceneID := i + 1
+ mockSceneReader.On("GetTagIDs", sceneID).Return(nil, nil).Once()
+ mockSceneReader.On("UpdateTags", sceneID, []int{tagID}).Return(nil).Once()
+ }
+
+ err := TagScenes(&tag, nil, mockSceneReader)
+
+ assert := assert.New(t)
+
+ assert.Nil(err)
+ mockSceneReader.AssertExpectations(t)
+}
diff --git a/pkg/autotag/tagger.go b/pkg/autotag/tagger.go
new file mode 100644
index 000000000..8690ffc8b
--- /dev/null
+++ b/pkg/autotag/tagger.go
@@ -0,0 +1,198 @@
+// Package autotag provides methods to auto-tag scenes with performers,
+// studios and tags.
+//
+// The autotag engine tags scenes with performers/studios/tags if the scene's
+// path matches the performer/studio/tag name. A scene's path is considered
+// a match if it contains the performer/studio/tag's full name, ignoring any
+// '.', '-', '_' characters in the path.
+//
+// For example, for a performer "foo bar", the following paths would be
+// considered a match: "foo bar.mp4", "foobar.mp4", "foo.bar.mp4",
+// "foo-bar.mp4", "aaa.foo bar.bbb.mp4".
+// The following would not be considered a match:
+// "aafoo bar.mp4", "foo barbb.mp4", "foo/bar.mp4"
+package autotag
+
+import (
+ "fmt"
+ "path/filepath"
+ "regexp"
+ "strings"
+
+ "github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/models"
+)
+
+const separatorChars = `.\-_ `
+
+// fixes #1292
+func escapePathRegex(name string) string {
+ ret := name
+
+ chars := `+*?()|[]{}^$`
+ for _, c := range chars {
+ cStr := string(c)
+ ret = strings.ReplaceAll(ret, cStr, `\`+cStr)
+ }
+
+ return ret
+}
+
+func getPathQueryRegex(name string) string {
+ // escape specific regex characters
+ name = escapePathRegex(name)
+
+ // handle path separators
+ const separator = `[` + separatorChars + `]`
+
+ ret := strings.Replace(name, " ", separator+"*", -1)
+ ret = `(?:^|_|[^\w\d])` + ret + `(?:$|_|[^\w\d])`
+ return ret
+}
+
+func nameMatchesPath(name, path string) bool {
+ // escape specific regex characters
+ name = escapePathRegex(name)
+
+ name = strings.ToLower(name)
+ path = strings.ToLower(path)
+
+ // handle path separators
+ const separator = `[` + separatorChars + `]`
+
+ reStr := strings.Replace(name, " ", separator+"*", -1)
+ reStr = `(?:^|_|[^\w\d])` + reStr + `(?:$|_|[^\w\d])`
+
+ re := regexp.MustCompile(reStr)
+ return re.MatchString(path)
+}
+
+func getPathWords(path string) []string {
+ retStr := path
+
+ // remove the extension
+ ext := filepath.Ext(retStr)
+ if ext != "" {
+ retStr = strings.TrimSuffix(retStr, ext)
+ }
+
+ // handle path separators
+ const separator = `(?:_|[^\w\d])+`
+ re := regexp.MustCompile(separator)
+ retStr = re.ReplaceAllString(retStr, " ")
+
+ words := strings.Split(retStr, " ")
+
+ // remove any single letter words
+ var ret []string
+ for _, w := range words {
+ if len(w) > 1 {
+ ret = append(ret, w)
+ }
+ }
+
+ return ret
+}
+
+type tagger struct {
+ ID int
+ Type string
+ Name string
+ Path string
+}
+
+type addLinkFunc func(subjectID, otherID int) (bool, error)
+
+func (t *tagger) addError(otherType, otherName string, err error) error {
+ return fmt.Errorf("error adding %s '%s' to %s '%s': %s", otherType, otherName, t.Type, t.Name, err.Error())
+}
+
+func (t *tagger) addLog(otherType, otherName string) {
+ logger.Infof("Added %s '%s' to %s '%s'", otherType, otherName, t.Type, t.Name)
+}
+
+func (t *tagger) tagPerformers(performerReader models.PerformerReader, addFunc addLinkFunc) error {
+ others, err := getMatchingPerformers(t.Path, performerReader)
+ if err != nil {
+ return err
+ }
+
+ for _, p := range others {
+ added, err := addFunc(t.ID, p.ID)
+
+ if err != nil {
+ return t.addError("performer", p.Name.String, err)
+ }
+
+ if added {
+ t.addLog("performer", p.Name.String)
+ }
+ }
+
+ return nil
+}
+
+func (t *tagger) tagStudios(studioReader models.StudioReader, addFunc addLinkFunc) error {
+ others, err := getMatchingStudios(t.Path, studioReader)
+ if err != nil {
+ return err
+ }
+
+ // only add first studio
+ if len(others) > 0 {
+ studio := others[0]
+ added, err := addFunc(t.ID, studio.ID)
+
+ if err != nil {
+ return t.addError("studio", studio.Name.String, err)
+ }
+
+ if added {
+ t.addLog("studio", studio.Name.String)
+ }
+ }
+
+ return nil
+}
+
+func (t *tagger) tagTags(tagReader models.TagReader, addFunc addLinkFunc) error {
+ others, err := getMatchingTags(t.Path, tagReader)
+ if err != nil {
+ return err
+ }
+
+ for _, p := range others {
+ added, err := addFunc(t.ID, p.ID)
+
+ if err != nil {
+ return t.addError("tag", p.Name, err)
+ }
+
+ if added {
+ t.addLog("tag", p.Name)
+ }
+ }
+
+ return nil
+}
+
+func (t *tagger) tagScenes(paths []string, sceneReader models.SceneReader, addFunc addLinkFunc) error {
+ others, err := getMatchingScenes(t.Name, paths, sceneReader)
+ if err != nil {
+ return err
+ }
+
+ for _, p := range others {
+ added, err := addFunc(t.ID, p.ID)
+
+ if err != nil {
+ return t.addError("scene", p.GetTitle(), err)
+ }
+
+ if added {
+ t.addLog("scene", p.GetTitle())
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/manager/manager_tasks.go b/pkg/manager/manager_tasks.go
index 8f1abf551..ffa7f1722 100644
--- a/pkg/manager/manager_tasks.go
+++ b/pkg/manager/manager_tasks.go
@@ -5,12 +5,15 @@ import (
"errors"
"fmt"
"os"
+ "path/filepath"
"strconv"
+ "strings"
"sync"
"time"
"github.com/remeh/sizedwaitgroup"
+ "github.com/stashapp/stash/pkg/autotag"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/manager/config"
"github.com/stashapp/stash/pkg/models"
@@ -626,6 +629,15 @@ func (s *singleton) generateScreenshot(sceneId string, at *float64) {
}()
}
+func (s *singleton) isFileBasedAutoTag(input models.AutoTagMetadataInput) bool {
+ const wildcard = "*"
+ performerIds := input.Performers
+ studioIds := input.Studios
+ tagIds := input.Tags
+
+ return (len(performerIds) == 0 || performerIds[0] == wildcard) && (len(studioIds) == 0 || studioIds[0] == wildcard) && (len(tagIds) == 0 || tagIds[0] == wildcard)
+}
+
func (s *singleton) AutoTag(input models.AutoTagMetadataInput) {
if s.Status.Status != Idle {
return
@@ -636,58 +648,160 @@ func (s *singleton) AutoTag(input models.AutoTagMetadataInput) {
go func() {
defer s.returnToIdleState()
- performerIds := input.Performers
- studioIds := input.Studios
- tagIds := input.Tags
-
- // calculate work load
- performerCount := len(performerIds)
- studioCount := len(studioIds)
- tagCount := len(tagIds)
-
- if err := s.TxnManager.WithReadTxn(context.TODO(), func(r models.ReaderRepository) error {
- performerQuery := r.Performer()
- studioQuery := r.Studio()
- tagQuery := r.Tag()
-
- const wildcard = "*"
- var err error
- if performerCount == 1 && performerIds[0] == wildcard {
- performerCount, err = performerQuery.Count()
- if err != nil {
- return fmt.Errorf("Error getting performer count: %s", err.Error())
- }
- }
- if studioCount == 1 && studioIds[0] == wildcard {
- studioCount, err = studioQuery.Count()
- if err != nil {
- return fmt.Errorf("Error getting studio count: %s", err.Error())
- }
- }
- if tagCount == 1 && tagIds[0] == wildcard {
- tagCount, err = tagQuery.Count()
- if err != nil {
- return fmt.Errorf("Error getting tag count: %s", err.Error())
- }
- }
-
- return nil
- }); err != nil {
- logger.Error(err.Error())
- return
+ if s.isFileBasedAutoTag(input) {
+ // doing file-based auto-tag
+ s.autoTagScenes(input.Paths, len(input.Performers) > 0, len(input.Studios) > 0, len(input.Tags) > 0)
+ } else {
+ // doing specific performer/studio/tag auto-tag
+ s.autoTagSpecific(input)
}
-
- total := performerCount + studioCount + tagCount
- s.Status.setProgress(0, total)
-
- s.autoTagPerformers(input.Paths, performerIds)
- s.autoTagStudios(input.Paths, studioIds)
- s.autoTagTags(input.Paths, tagIds)
}()
}
+func (s *singleton) autoTagScenes(paths []string, performers, studios, tags bool) {
+ if err := s.TxnManager.WithReadTxn(context.TODO(), func(r models.ReaderRepository) error {
+ ret := &models.SceneFilterType{}
+ or := ret
+ sep := string(filepath.Separator)
+
+ for _, p := range paths {
+ if !strings.HasSuffix(p, sep) {
+ p = p + sep
+ }
+
+ if ret.Path == nil {
+ or = ret
+ } else {
+ newOr := &models.SceneFilterType{}
+ or.Or = newOr
+ or = newOr
+ }
+
+ or.Path = &models.StringCriterionInput{
+ Modifier: models.CriterionModifierEquals,
+ Value: p + "%",
+ }
+ }
+
+ organized := false
+ ret.Organized = &organized
+
+ // batch process scenes
+ batchSize := 1000
+ page := 1
+ findFilter := &models.FindFilterType{
+ PerPage: &batchSize,
+ Page: &page,
+ }
+
+ more := true
+ processed := 0
+ for more {
+ scenes, total, err := r.Scene().Query(ret, findFilter)
+ if err != nil {
+ return err
+ }
+
+ if processed == 0 {
+ logger.Infof("Starting autotag of %d scenes", total)
+ }
+
+ for _, ss := range scenes {
+ if s.Status.stopping {
+ logger.Info("Stopping due to user request")
+ return nil
+ }
+
+ t := autoTagSceneTask{
+ txnManager: s.TxnManager,
+ scene: ss,
+ performers: performers,
+ studios: studios,
+ tags: tags,
+ }
+
+ var wg sync.WaitGroup
+ wg.Add(1)
+ go t.Start(&wg)
+ wg.Wait()
+
+ processed++
+ s.Status.setProgress(processed, total)
+ }
+
+ if len(scenes) != batchSize {
+ more = false
+ } else {
+ page++
+ }
+ }
+
+ return nil
+ }); err != nil {
+ logger.Error(err.Error())
+ }
+
+ logger.Info("Finished autotag")
+}
+
+func (s *singleton) autoTagSpecific(input models.AutoTagMetadataInput) {
+ performerIds := input.Performers
+ studioIds := input.Studios
+ tagIds := input.Tags
+
+ performerCount := len(performerIds)
+ studioCount := len(studioIds)
+ tagCount := len(tagIds)
+
+ if err := s.TxnManager.WithReadTxn(context.TODO(), func(r models.ReaderRepository) error {
+ performerQuery := r.Performer()
+ studioQuery := r.Studio()
+ tagQuery := r.Tag()
+
+ const wildcard = "*"
+ var err error
+ if performerCount == 1 && performerIds[0] == wildcard {
+ performerCount, err = performerQuery.Count()
+ if err != nil {
+ return fmt.Errorf("error getting performer count: %s", err.Error())
+ }
+ }
+ if studioCount == 1 && studioIds[0] == wildcard {
+ studioCount, err = studioQuery.Count()
+ if err != nil {
+ return fmt.Errorf("error getting studio count: %s", err.Error())
+ }
+ }
+ if tagCount == 1 && tagIds[0] == wildcard {
+ tagCount, err = tagQuery.Count()
+ if err != nil {
+ return fmt.Errorf("error getting tag count: %s", err.Error())
+ }
+ }
+
+ return nil
+ }); err != nil {
+ logger.Error(err.Error())
+ return
+ }
+
+ total := performerCount + studioCount + tagCount
+ s.Status.setProgress(0, total)
+
+ logger.Infof("Starting autotag of %d performers, %d studios, %d tags", performerCount, studioCount, tagCount)
+
+ s.autoTagPerformers(input.Paths, performerIds)
+ s.autoTagStudios(input.Paths, studioIds)
+ s.autoTagTags(input.Paths, tagIds)
+
+ logger.Info("Finished autotag")
+}
+
func (s *singleton) autoTagPerformers(paths []string, performerIds []string) {
- var wg sync.WaitGroup
+ if s.Status.stopping {
+ return
+ }
+
for _, performerId := range performerIds {
var performers []*models.Performer
@@ -698,46 +812,53 @@ func (s *singleton) autoTagPerformers(paths []string, performerIds []string) {
var err error
performers, err = performerQuery.All()
if err != nil {
- return fmt.Errorf("Error querying performers: %s", err.Error())
+ return fmt.Errorf("error querying performers: %s", err.Error())
}
} else {
performerIdInt, err := strconv.Atoi(performerId)
if err != nil {
- return fmt.Errorf("Error parsing performer id %s: %s", performerId, err.Error())
+ return fmt.Errorf("error parsing performer id %s: %s", performerId, err.Error())
}
performer, err := performerQuery.Find(performerIdInt)
if err != nil {
- return fmt.Errorf("Error finding performer id %s: %s", performerId, err.Error())
+ return fmt.Errorf("error finding performer id %s: %s", performerId, err.Error())
+ }
+
+ if performer == nil {
+ return fmt.Errorf("performer with id %s not found", performerId)
}
performers = append(performers, performer)
}
+ for _, performer := range performers {
+ if s.Status.stopping {
+ logger.Info("Stopping due to user request")
+ return nil
+ }
+
+ if err := s.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
+ return autotag.PerformerScenes(performer, paths, r.Scene())
+ }); err != nil {
+ return fmt.Errorf("error auto-tagging performer '%s': %s", performer.Name.String, err.Error())
+ }
+
+ s.Status.incrementProgress()
+ }
+
return nil
}); err != nil {
logger.Error(err.Error())
continue
}
-
- for _, performer := range performers {
- wg.Add(1)
- task := AutoTagPerformerTask{
- AutoTagTask: AutoTagTask{
- txnManager: s.TxnManager,
- paths: paths,
- },
- performer: performer,
- }
- go task.Start(&wg)
- wg.Wait()
-
- s.Status.incrementProgress()
- }
}
}
func (s *singleton) autoTagStudios(paths []string, studioIds []string) {
- var wg sync.WaitGroup
+ if s.Status.stopping {
+ return
+ }
+
for _, studioId := range studioIds {
var studios []*models.Studio
@@ -747,46 +868,54 @@ func (s *singleton) autoTagStudios(paths []string, studioIds []string) {
var err error
studios, err = studioQuery.All()
if err != nil {
- return fmt.Errorf("Error querying studios: %s", err.Error())
+ return fmt.Errorf("error querying studios: %s", err.Error())
}
} else {
studioIdInt, err := strconv.Atoi(studioId)
if err != nil {
- return fmt.Errorf("Error parsing studio id %s: %s", studioId, err.Error())
+ return fmt.Errorf("error parsing studio id %s: %s", studioId, err.Error())
}
studio, err := studioQuery.Find(studioIdInt)
if err != nil {
- return fmt.Errorf("Error finding studio id %s: %s", studioId, err.Error())
+ return fmt.Errorf("error finding studio id %s: %s", studioId, err.Error())
}
+
+ if studio == nil {
+ return fmt.Errorf("studio with id %s not found", studioId)
+ }
+
studios = append(studios, studio)
}
+ for _, studio := range studios {
+ if s.Status.stopping {
+ logger.Info("Stopping due to user request")
+ return nil
+ }
+
+ if err := s.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
+ return autotag.StudioScenes(studio, paths, r.Scene())
+ }); err != nil {
+ return fmt.Errorf("error auto-tagging studio '%s': %s", studio.Name.String, err.Error())
+ }
+
+ s.Status.incrementProgress()
+ }
+
return nil
}); err != nil {
logger.Error(err.Error())
continue
}
-
- for _, studio := range studios {
- wg.Add(1)
- task := AutoTagStudioTask{
- AutoTagTask: AutoTagTask{
- txnManager: s.TxnManager,
- paths: paths,
- },
- studio: studio,
- }
- go task.Start(&wg)
- wg.Wait()
-
- s.Status.incrementProgress()
- }
}
}
func (s *singleton) autoTagTags(paths []string, tagIds []string) {
- var wg sync.WaitGroup
+ if s.Status.stopping {
+ return
+ }
+
for _, tagId := range tagIds {
var tags []*models.Tag
if err := s.TxnManager.WithReadTxn(context.TODO(), func(r models.ReaderRepository) error {
@@ -795,41 +924,41 @@ func (s *singleton) autoTagTags(paths []string, tagIds []string) {
var err error
tags, err = tagQuery.All()
if err != nil {
- return fmt.Errorf("Error querying tags: %s", err.Error())
+ return fmt.Errorf("error querying tags: %s", err.Error())
}
} else {
tagIdInt, err := strconv.Atoi(tagId)
if err != nil {
- return fmt.Errorf("Error parsing tag id %s: %s", tagId, err.Error())
+ return fmt.Errorf("error parsing tag id %s: %s", tagId, err.Error())
}
tag, err := tagQuery.Find(tagIdInt)
if err != nil {
- return fmt.Errorf("Error finding tag id %s: %s", tagId, err.Error())
+ return fmt.Errorf("error finding tag id %s: %s", tagId, err.Error())
}
tags = append(tags, tag)
}
+ for _, tag := range tags {
+ if s.Status.stopping {
+ logger.Info("Stopping due to user request")
+ return nil
+ }
+
+ if err := s.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
+ return autotag.TagScenes(tag, paths, r.Scene())
+ }); err != nil {
+ return fmt.Errorf("error auto-tagging tag '%s': %s", tag.Name, err.Error())
+ }
+
+ s.Status.incrementProgress()
+ }
+
return nil
}); err != nil {
logger.Error(err.Error())
continue
}
-
- for _, tag := range tags {
- wg.Add(1)
- task := AutoTagTagTask{
- AutoTagTask: AutoTagTask{
- txnManager: s.TxnManager,
- paths: paths,
- },
- tag: tag,
- }
- go task.Start(&wg)
- wg.Wait()
-
- s.Status.incrementProgress()
- }
}
}
diff --git a/pkg/manager/task_autotag.go b/pkg/manager/task_autotag.go
index 6632dc2b9..6fb0a08e0 100644
--- a/pkg/manager/task_autotag.go
+++ b/pkg/manager/task_autotag.go
@@ -2,196 +2,38 @@ package manager
import (
"context"
- "database/sql"
- "fmt"
- "path/filepath"
- "strings"
"sync"
+ "github.com/stashapp/stash/pkg/autotag"
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
- "github.com/stashapp/stash/pkg/scene"
)
-type AutoTagTask struct {
- paths []string
+type autoTagSceneTask struct {
txnManager models.TransactionManager
+ scene *models.Scene
+
+ performers bool
+ studios bool
+ tags bool
}
-type AutoTagPerformerTask struct {
- AutoTagTask
- performer *models.Performer
-}
-
-func (t *AutoTagPerformerTask) Start(wg *sync.WaitGroup) {
+func (t *autoTagSceneTask) Start(wg *sync.WaitGroup) {
defer wg.Done()
-
- t.autoTagPerformer()
-}
-
-func (t *AutoTagTask) getQueryRegex(name string) string {
- const separatorChars = `.\-_ `
- // handle path separators
- const separator = `[` + separatorChars + `]`
-
- ret := strings.Replace(name, " ", separator+"*", -1)
- ret = `(?:^|_|[^\w\d])` + ret + `(?:$|_|[^\w\d])`
- return ret
-}
-
-func (t *AutoTagTask) getQueryFilter(regex string) *models.SceneFilterType {
- organized := false
- ret := &models.SceneFilterType{
- Path: &models.StringCriterionInput{
- Modifier: models.CriterionModifierMatchesRegex,
- Value: "(?i)" + regex,
- },
- Organized: &organized,
- }
-
- sep := string(filepath.Separator)
-
- var or *models.SceneFilterType
- for _, p := range t.paths {
- newOr := &models.SceneFilterType{}
- if or == nil {
- ret.And = newOr
- } else {
- or.Or = newOr
- }
-
- or = newOr
-
- if !strings.HasSuffix(p, sep) {
- p = p + sep
- }
-
- or.Path = &models.StringCriterionInput{
- Modifier: models.CriterionModifierEquals,
- Value: p + "%",
- }
- }
-
- return ret
-}
-
-func (t *AutoTagTask) getFindFilter() *models.FindFilterType {
- perPage := -1
- return &models.FindFilterType{
- PerPage: &perPage,
- }
-}
-
-func (t *AutoTagPerformerTask) autoTagPerformer() {
- regex := t.getQueryRegex(t.performer.Name.String)
-
if err := t.txnManager.WithTxn(context.TODO(), func(r models.Repository) error {
- qb := r.Scene()
-
- scenes, _, err := qb.Query(t.getQueryFilter(regex), t.getFindFilter())
-
- if err != nil {
- return fmt.Errorf("Error querying scenes with regex '%s': %s", regex, err.Error())
- }
-
- for _, s := range scenes {
- added, err := scene.AddPerformer(qb, s.ID, t.performer.ID)
-
- if err != nil {
- return fmt.Errorf("Error adding performer '%s' to scene '%s': %s", t.performer.Name.String, s.GetTitle(), err.Error())
+ if t.performers {
+ if err := autotag.ScenePerformers(t.scene, r.Scene(), r.Performer()); err != nil {
+ return err
}
-
- if added {
- logger.Infof("Added performer '%s' to scene '%s'", t.performer.Name.String, s.GetTitle())
- }
- }
-
- return nil
- }); err != nil {
- logger.Error(err.Error())
- }
-}
-
-type AutoTagStudioTask struct {
- AutoTagTask
- studio *models.Studio
-}
-
-func (t *AutoTagStudioTask) Start(wg *sync.WaitGroup) {
- defer wg.Done()
-
- t.autoTagStudio()
-}
-
-func (t *AutoTagStudioTask) autoTagStudio() {
- regex := t.getQueryRegex(t.studio.Name.String)
-
- if err := t.txnManager.WithTxn(context.TODO(), func(r models.Repository) error {
- qb := r.Scene()
- scenes, _, err := qb.Query(t.getQueryFilter(regex), t.getFindFilter())
-
- if err != nil {
- return fmt.Errorf("Error querying scenes with regex '%s': %s", regex, err.Error())
- }
-
- for _, s := range scenes {
- // #306 - don't overwrite studio if already present
- if s.StudioID.Valid {
- // don't modify
- continue
- }
-
- logger.Infof("Adding studio '%s' to scene '%s'", t.studio.Name.String, s.GetTitle())
-
- // set the studio id
- studioID := sql.NullInt64{Int64: int64(t.studio.ID), Valid: true}
- scenePartial := models.ScenePartial{
- ID: s.ID,
- StudioID: &studioID,
- }
-
- if _, err := qb.Update(scenePartial); err != nil {
- return fmt.Errorf("Error adding studio to scene: %s", err.Error())
- }
- }
-
- return nil
- }); err != nil {
- logger.Error(err.Error())
- }
-}
-
-type AutoTagTagTask struct {
- AutoTagTask
- tag *models.Tag
-}
-
-func (t *AutoTagTagTask) Start(wg *sync.WaitGroup) {
- defer wg.Done()
-
- t.autoTagTag()
-}
-
-func (t *AutoTagTagTask) autoTagTag() {
- regex := t.getQueryRegex(t.tag.Name)
-
- if err := t.txnManager.WithTxn(context.TODO(), func(r models.Repository) error {
- qb := r.Scene()
- scenes, _, err := qb.Query(t.getQueryFilter(regex), t.getFindFilter())
-
- if err != nil {
- return fmt.Errorf("Error querying scenes with regex '%s': %s", regex, err.Error())
- }
-
- for _, s := range scenes {
- added, err := scene.AddTag(qb, s.ID, t.tag.ID)
-
- if err != nil {
- return fmt.Errorf("Error adding tag '%s' to scene '%s': %s", t.tag.Name, s.GetTitle(), err.Error())
- }
-
- if added {
- logger.Infof("Added tag '%s' to scene '%s'", t.tag.Name, s.GetTitle())
+ }
+ if t.studios {
+ if err := autotag.SceneStudios(t.scene, r.Scene(), r.Studio()); err != nil {
+ return err
+ }
+ }
+ if t.tags {
+ if err := autotag.SceneTags(t.scene, r.Scene(), r.Tag()); err != nil {
+ return err
}
}
diff --git a/pkg/models/extension_find_filter.go b/pkg/models/extension_find_filter.go
index f2e7e7ab1..8dc1ed515 100644
--- a/pkg/models/extension_find_filter.go
+++ b/pkg/models/extension_find_filter.go
@@ -1,5 +1,9 @@
package models
+// PerPageAll is the value used for perPage to indicate all results should be
+// returned.
+const PerPageAll = -1
+
func (ff FindFilterType) GetSort(defaultSort string) string {
var sort string
if ff.Sort == nil {
diff --git a/pkg/models/mocks/PerformerReaderWriter.go b/pkg/models/mocks/PerformerReaderWriter.go
index 60575ab3b..20629b3b5 100644
--- a/pkg/models/mocks/PerformerReaderWriter.go
+++ b/pkg/models/mocks/PerformerReaderWriter.go
@@ -388,6 +388,29 @@ func (_m *PerformerReaderWriter) Query(performerFilter *models.PerformerFilterTy
return r0, r1, r2
}
+// QueryForAutoTag provides a mock function with given fields: words
+func (_m *PerformerReaderWriter) QueryForAutoTag(words []string) ([]*models.Performer, error) {
+ ret := _m.Called(words)
+
+ var r0 []*models.Performer
+ if rf, ok := ret.Get(0).(func([]string) []*models.Performer); ok {
+ r0 = rf(words)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([]*models.Performer)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func([]string) error); ok {
+ r1 = rf(words)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// Update provides a mock function with given fields: updatedPerformer
func (_m *PerformerReaderWriter) Update(updatedPerformer models.PerformerPartial) (*models.Performer, error) {
ret := _m.Called(updatedPerformer)
diff --git a/pkg/models/mocks/StudioReaderWriter.go b/pkg/models/mocks/StudioReaderWriter.go
index fb9c02d7d..fbd8a1936 100644
--- a/pkg/models/mocks/StudioReaderWriter.go
+++ b/pkg/models/mocks/StudioReaderWriter.go
@@ -296,6 +296,29 @@ func (_m *StudioReaderWriter) Query(studioFilter *models.StudioFilterType, findF
return r0, r1, r2
}
+// QueryForAutoTag provides a mock function with given fields: words
+func (_m *StudioReaderWriter) QueryForAutoTag(words []string) ([]*models.Studio, error) {
+ ret := _m.Called(words)
+
+ var r0 []*models.Studio
+ if rf, ok := ret.Get(0).(func([]string) []*models.Studio); ok {
+ r0 = rf(words)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([]*models.Studio)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func([]string) error); ok {
+ r1 = rf(words)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// Update provides a mock function with given fields: updatedStudio
func (_m *StudioReaderWriter) Update(updatedStudio models.StudioPartial) (*models.Studio, error) {
ret := _m.Called(updatedStudio)
diff --git a/pkg/models/mocks/TagReaderWriter.go b/pkg/models/mocks/TagReaderWriter.go
index 65dcd8b89..e0d765577 100644
--- a/pkg/models/mocks/TagReaderWriter.go
+++ b/pkg/models/mocks/TagReaderWriter.go
@@ -367,6 +367,29 @@ func (_m *TagReaderWriter) Query(tagFilter *models.TagFilterType, findFilter *mo
return r0, r1, r2
}
+// QueryForAutoTag provides a mock function with given fields: words
+func (_m *TagReaderWriter) QueryForAutoTag(words []string) ([]*models.Tag, error) {
+ ret := _m.Called(words)
+
+ var r0 []*models.Tag
+ if rf, ok := ret.Get(0).(func([]string) []*models.Tag); ok {
+ r0 = rf(words)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).([]*models.Tag)
+ }
+ }
+
+ var r1 error
+ if rf, ok := ret.Get(1).(func([]string) error); ok {
+ r1 = rf(words)
+ } else {
+ r1 = ret.Error(1)
+ }
+
+ return r0, r1
+}
+
// Update provides a mock function with given fields: updatedTag
func (_m *TagReaderWriter) Update(updatedTag models.Tag) (*models.Tag, error) {
ret := _m.Called(updatedTag)
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
index 2c550b720..fabcff44a 100644
--- a/pkg/models/performer.go
+++ b/pkg/models/performer.go
@@ -11,6 +11,9 @@ type PerformerReader interface {
CountByTagID(tagID int) (int, error)
Count() (int, error)
All() ([]*Performer, error)
+ // TODO - this interface is temporary until the filter schema can fully
+ // support the query needed
+ QueryForAutoTag(words []string) ([]*Performer, error)
Query(performerFilter *PerformerFilterType, findFilter *FindFilterType) ([]*Performer, int, error)
GetImage(performerID int) ([]byte, error)
GetStashIDs(performerID int) ([]*StashID, error)
diff --git a/pkg/models/studio.go b/pkg/models/studio.go
index 358abf596..7aa2e87b8 100644
--- a/pkg/models/studio.go
+++ b/pkg/models/studio.go
@@ -7,6 +7,9 @@ type StudioReader interface {
FindByName(name string, nocase bool) (*Studio, error)
Count() (int, error)
All() ([]*Studio, error)
+ // TODO - this interface is temporary until the filter schema can fully
+ // support the query needed
+ QueryForAutoTag(words []string) ([]*Studio, error)
Query(studioFilter *StudioFilterType, findFilter *FindFilterType) ([]*Studio, int, error)
GetImage(studioID int) ([]byte, error)
HasImage(studioID int) (bool, error)
diff --git a/pkg/models/tag.go b/pkg/models/tag.go
index 5f03e33b5..a675bfbdf 100644
--- a/pkg/models/tag.go
+++ b/pkg/models/tag.go
@@ -12,6 +12,9 @@ type TagReader interface {
FindByNames(names []string, nocase bool) ([]*Tag, error)
Count() (int, error)
All() ([]*Tag, error)
+ // TODO - this interface is temporary until the filter schema can fully
+ // support the query needed
+ QueryForAutoTag(words []string) ([]*Tag, error)
Query(tagFilter *TagFilterType, findFilter *FindFilterType) ([]*Tag, int, error)
GetImage(tagID int) ([]byte, error)
}
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index 17406eb7c..a631f1ad1 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -4,6 +4,7 @@ import (
"database/sql"
"fmt"
"strconv"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -172,6 +173,25 @@ func (qb *performerQueryBuilder) All() ([]*models.Performer, error) {
return qb.queryPerformers(selectAll("performers")+qb.getPerformerSort(nil), nil)
}
+func (qb *performerQueryBuilder) QueryForAutoTag(words []string) ([]*models.Performer, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(performerTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ whereClauses = append(whereClauses, "aliases like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryPerformers(query+" WHERE "+where, args)
+}
+
func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) ([]*models.Performer, int, error) {
if performerFilter == nil {
performerFilter = &models.PerformerFilterType{}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index d2f32182b..71237831c 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -100,6 +100,26 @@ func TestPerformerFindByNames(t *testing.T) {
})
}
+func TestPerformerQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Performer()
+
+ name := performerNames[performerIdxWithScene] // find a performer by name
+
+ performers, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding performers: %s", err.Error())
+ }
+
+ assert.Len(t, performers, 2)
+ assert.Equal(t, strings.ToLower(performerNames[performerIdxWithScene]), strings.ToLower(performers[0].Name.String))
+ assert.Equal(t, strings.ToLower(performerNames[performerIdxWithScene]), strings.ToLower(performers[1].Name.String))
+
+ return nil
+ })
+}
+
func TestPerformerUpdatePerformerImage(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
qb := r.Performer()
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index cbfb57f4d..2ec5f82c2 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -3,6 +3,7 @@ package sqlite
import (
"database/sql"
"fmt"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -121,6 +122,23 @@ func (qb *studioQueryBuilder) All() ([]*models.Studio, error) {
return qb.queryStudios(selectAll("studios")+qb.getStudioSort(nil), nil)
}
+func (qb *studioQueryBuilder) QueryForAutoTag(words []string) ([]*models.Studio, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(studioTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryStudios(query+" WHERE "+where, args)
+}
+
func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findFilter *models.FindFilterType) ([]*models.Studio, int, error) {
if studioFilter == nil {
studioFilter = &models.StudioFilterType{}
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index ae17c1cf7..de947ee82 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -45,6 +45,26 @@ func TestStudioFindByName(t *testing.T) {
})
}
+func TestStudioQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Studio()
+
+ name := studioNames[studioIdxWithScene] // find a studio by name
+
+ studios, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding studios: %s", err.Error())
+ }
+
+ assert.Len(t, studios, 2)
+ assert.Equal(t, strings.ToLower(studioNames[studioIdxWithScene]), strings.ToLower(studios[0].Name.String))
+ assert.Equal(t, strings.ToLower(studioNames[studioIdxWithScene]), strings.ToLower(studios[1].Name.String))
+
+ return nil
+ })
+}
+
func TestStudioQueryParent(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Studio()
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index acb0105d1..a4549acd9 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -4,6 +4,7 @@ import (
"database/sql"
"errors"
"fmt"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -192,6 +193,23 @@ func (qb *tagQueryBuilder) All() ([]*models.Tag, error) {
return qb.queryTags(selectAll("tags")+qb.getDefaultTagSort(), nil)
}
+func (qb *tagQueryBuilder) QueryForAutoTag(words []string) ([]*models.Tag, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(tagTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryTags(query+" WHERE "+where, args)
+}
+
func (qb *tagQueryBuilder) validateFilter(tagFilter *models.TagFilterType) error {
const and = "AND"
const or = "OR"
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 272006776..f6a29def2 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -70,6 +70,26 @@ func TestTagFindByName(t *testing.T) {
})
}
+func TestTagQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Tag()
+
+ name := tagNames[tagIdxWithScene] // find a tag by name
+
+ tags, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding tags: %s", err.Error())
+ }
+
+ assert.Len(t, tags, 2)
+ assert.Equal(t, strings.ToLower(tagNames[tagIdxWithScene]), strings.ToLower(tags[0].Name))
+ assert.Equal(t, strings.ToLower(tagNames[tagIdxWithScene]), strings.ToLower(tags[1].Name))
+
+ return nil
+ })
+}
+
func TestTagFindByNames(t *testing.T) {
var names []string
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index 356ef3a1b..ceae9c844 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -11,6 +11,7 @@
* Added scene queue.
### 🎨 Improvements
+* Improved performance of the auto-tagger.
* Clean generation artifacts after generating each scene.
* Log message at startup when cleaning the `tmp` and `downloads` generated folders takes more than one second.
* Sort movie scenes by scene number by default.
@@ -27,6 +28,7 @@
* Change performer text query to search by name and alias only.
### 🐛 Bug fixes
+* Fixed error when auto-tagging for performers/studios/tags with regex characters in the name.
* Fix scraped performer image not updating after clearing the current image when creating a new performer.
* Fix error preventing adding a new library path when an existing library path is missing.
* Fix whitespace in query string returning all objects.
From aedadc3857a324e64d01bf01a474307961e1205c Mon Sep 17 00:00:00 2001
From: bnkai <48220860+bnkai@users.noreply.github.com>
Date: Mon, 26 Apr 2021 06:31:25 +0300
Subject: [PATCH 45/66] Add lbToKg pp action to the scraper (#1337)
---
pkg/scraper/mapped.go | 21 +++++++++++++++++++
pkg/scraper/xpath_test.go | 16 +++++++++-----
.../src/components/Changelog/versions/v070.md | 1 +
ui/v2.5/src/docs/en/Scraping.md | 12 ++++++++++-
4 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index f6c076e66..5945f6570 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -462,12 +462,25 @@ func (p *postProcessFeetToCm) Apply(value string, q mappedQuery) string {
return strconv.Itoa(int(math.Round(centimeters)))
}
+type postProcessLbToKg bool
+
+func (p *postProcessLbToKg) Apply(value string, q mappedQuery) string {
+ const lb_in_kg = 0.45359237
+ w, err := strconv.ParseFloat(value, 64)
+ if err == nil {
+ w = w * lb_in_kg
+ value = strconv.Itoa(int(math.Round(w)))
+ }
+ return value
+}
+
type mappedPostProcessAction struct {
ParseDate string `yaml:"parseDate"`
Replace mappedRegexConfigs `yaml:"replace"`
SubScraper *mappedScraperAttrConfig `yaml:"subScraper"`
Map map[string]string `yaml:"map"`
FeetToCm bool `yaml:"feetToCm"`
+ LbToKg bool `yaml:"lbToKg"`
}
func (a mappedPostProcessAction) ToPostProcessAction() (postProcessAction, error) {
@@ -511,6 +524,14 @@ func (a mappedPostProcessAction) ToPostProcessAction() (postProcessAction, error
action := postProcessFeetToCm(a.FeetToCm)
ret = &action
}
+ if a.LbToKg {
+ if found != "" {
+ return nil, fmt.Errorf("post-process actions must have a single field, found %s and %s", found, "lbToKg")
+ }
+ found = "lbToKg"
+ action := postProcessLbToKg(a.LbToKg)
+ ret = &action
+ }
if ret == nil {
return nil, errors.New("invalid post-process action")
diff --git a/pkg/scraper/xpath_test.go b/pkg/scraper/xpath_test.go
index d0883e16f..4a2d94ed4 100644
--- a/pkg/scraper/xpath_test.go
+++ b/pkg/scraper/xpath_test.go
@@ -105,7 +105,7 @@ const htmlDoc1 = `
Weight:
- 57
+ 126
+
+
+ 
+
+
+ ));
+
+ return (
+
+
+
+ );
+ }
+ }
+
+ function maybeRenderGallery(scene: GQL.SlimSceneDataFragment) {
+ if (scene.galleries.length <= 0) return;
+
+ const popoverContent = scene.galleries.map((gallery) => (
+
+
+
+ );
+ }
+ }
+
+ function maybeRenderPopoverButtonGroup(scene: GQL.SlimSceneDataFragment) {
+ if (
+ scene.tags.length > 0 ||
+ scene.performers.length > 0 ||
+ scene.movies.length > 0 ||
+ scene.scene_markers.length > 0 ||
+ scene?.o_counter ||
+ scene.galleries.length > 0 ||
+ scene.organized
+ ) {
+ return (
+ <>
+
+ {deletingScenes && selectedScenes && (
+
+
+ Search Accuracy
+
+ setQuery({
+ distance:
+ e.currentTarget.value === "0"
+ ? undefined
+ : e.currentTarget.value,
+ page: undefined,
+ })
+ }
+ defaultValue={distance ?? 0}
+ className="input-control ml-4"
+ >
+
+
+
+
+
+
+
+
+ Levels below “Exact” can take longer to calculate. False
+ positives might also be returned on lower accuracy levels.
+
+
+ {maybeRenderMissingPhashWarning()}
+
+
+ {scenes.length === 0 && (
+
+ Duplicate Scenes
+
+
+ Edit}>
+
+
+ Delete}>
+
+
+
+ )}
+
+ setQuery({ page: newPage === 1 ? undefined : newPage })
+ }
+ />
+
+ setQuery({
+ size:
+ e.currentTarget.value === "20"
+ ? undefined
+ : e.currentTarget.value,
+ })
+ }
+ >
+
+
+
+
+
+
+
+ + {scenes.length} sets of duplicates found. +
+ {checkCount > 0 && ( +| + | + | Details | ++ | Duration | +Filesize | +Resolution | +Bitrate | +Codec | +Delete | +
|---|---|---|---|---|---|---|---|---|---|
|
+ |
+
+ |
+
+ + + {scene.title ?? + TextUtils.fileNameFromPath(scene.path)} + + +{scene.path} + |
+ + {maybeRenderPopoverButtonGroup(scene)} + | ++ {scene.file.duration && + TextUtils.secondsToTimestamp(scene.file.duration)} + | +{renderFilesize(scene.file.size)} | +{`${scene.file.width}x${scene.file.height}`} | +
+ |
+ {scene.file.video_codec} | ++ + | +
No duplicates found.
+ )} +
- {deletingScene && (
-
-
- Search Accuracy
-
- setQuery({
- distance:
- e.currentTarget.value === "0"
- ? undefined
- : e.currentTarget.value,
- page: undefined,
- })
- }
- defaultValue={distance ?? 0}
- className="ml-4"
- >
-
-
-
-
-
-
-
-
- Levels below “Exact” can take longer to calculate. False
- positives might also be returned on lower accuracy levels.
-
-
-
-
- {scenes.length === 0 && (
-
- );
-};
diff --git a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
index f4f371e24..1eeaf655e 100644
--- a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
@@ -1,6 +1,5 @@
import React, { useState, useEffect } from "react";
import { Button, Form, ProgressBar } from "react-bootstrap";
-import { Link } from "react-router-dom";
import {
useJobStatus,
useMetadataUpdate,
@@ -495,12 +494,6 @@ export const SettingsTasksPanel: React.FC = () => {
- Duplicate Scenes
-
-
- setQuery({ page: newPage === 1 ? undefined : newPage })
- }
- />
-
- setQuery({
- size:
- e.currentTarget.value === "20"
- ? undefined
- : e.currentTarget.value,
- })
- }
- >
-
-
-
-
-
-
-
- - {scenes.length} sets of duplicates found. -
- {checkCount > 0 && ( - - )} -| - | - | Title | -Duration | -Filesize | -Resolution | -Bitrate | -Codec | -Delete | -
|---|---|---|---|---|---|---|---|---|
|
- |
-
- |
- - - {scene.title ?? TextUtils.fileNameFromPath(scene.path)} - - | -- {scene.file.duration && - TextUtils.secondsToTimestamp(scene.file.duration)} - | -{renderFilesize(scene.file.size)} | -{`${scene.file.width}x${scene.file.height}`} | -
- |
- {scene.file.video_codec} | -- - | -
- No duplicates found. Make sure the phash task has been run. -
- )} -Generated Content
diff --git a/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx b/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx new file mode 100644 index 000000000..02fb701c3 --- /dev/null +++ b/ui/v2.5/src/components/Settings/SettingsToolsPanel.tsx @@ -0,0 +1,19 @@ +import React from "react"; +import { Form } from "react-bootstrap"; +import { Link } from "react-router-dom"; + +export const SettingsToolsPanel: React.FC = () => { + return ( + <> +Scene Tools
+ +
;
zoomIndex: number;
onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void;
- onSceneClick?: (id: string, index: number) => void;
}
export const SceneCardsGrid: React.FC = ({
scenes,
+ queue,
selectedIds,
zoomIndex,
onSelectChange,
- onSceneClick,
}) => {
- function sceneClicked(sceneID: string, index: number) {
- if (onSceneClick) {
- onSceneClick(sceneID, index);
- }
- }
-
return (
= ({
if (queryResults.data.findScenes.scenes.length > index) {
const { id } = queryResults!.data!.findScenes!.scenes[index];
// navigate to the image player page
- const queue = SceneQueue.fromListFilterModel(filterCopy, index);
- queue.playScene(history, id, { autoPlay: true });
+ const queue = SceneQueue.fromListFilterModel(filterCopy);
+ queue.playScene(history, id, { sceneIndex: index, autoPlay: true });
}
}
}
@@ -143,15 +143,6 @@ export const SceneList: React.FC = ({
setIsExportDialogOpen(true);
}
- async function sceneClicked(
- sceneId: string,
- sceneIndex: number,
- filter: ListFilterModel
- ) {
- const queue = SceneQueue.fromListFilterModel(filter, sceneIndex);
- queue.playScene(history, sceneId);
- }
-
function maybeRenderSceneGenerateDialog(selectedIds: Set) {
if (isGenerateDialogOpen) {
return (
@@ -207,27 +198,34 @@ export const SceneList: React.FC = ({
if (!result.data || !result.data.findScenes) {
return;
}
+
+ const queue = SceneQueue.fromListFilterModel(filter);
+
if (filter.displayMode === DisplayMode.Grid) {
return (
listData.onSelectChange(id, selected, shiftKey)
}
- onSceneClick={(id, index) => sceneClicked(id, index, filter)}
/>
);
}
if (filter.displayMode === DisplayMode.List) {
- return = (
@@ -37,52 +38,58 @@ export const SceneListTable: React.FC = (
)
);
- const renderSceneRow = (scene: GQL.SlimSceneDataFragment) => (
-
-
-
- 
-
-
-
-
-
-
+ {renderMovies(scene)}
+
+ {scene.gallery && (
+
+ )}
+
+
+ );
+ };
return (
{scenes.map((scene, index) => (
0}
selected={selectedIds.has(scene.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
onSelectChange(scene.id, selected, shiftKey)
}
- onSceneClicked={() => sceneClicked(scene.id, index)}
/>
))}
diff --git a/ui/v2.5/src/components/Scenes/SceneList.tsx b/ui/v2.5/src/components/Scenes/SceneList.tsx
index 22b8a18e0..1fcd9b345 100644
--- a/ui/v2.5/src/components/Scenes/SceneList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneList.tsx
@@ -123,8 +123,8 @@ export const SceneList: React.FC
- {
+ const sceneLink = props.queue
+ ? props.queue.makeLink(scene.id, { sceneIndex: index })
+ : `/scenes/${scene.id}`;
+
+ return (
+
+
+
+
-
-
-
- {scene.rating ? scene.rating : ""}
-
- {scene.file.duration &&
- TextUtils.secondsToTimestamp(scene.file.duration)}
-
- {renderTags(scene.tags)}
- {renderPerformers(scene.performers)}
-
- {scene.studio && (
-
- {scene.studio.name}
- )}
-
- {renderMovies(scene)}
-
- {scene.gallery && (
-
+
+
+
+
+
+
+ {scene.rating ? scene.rating : ""}
+
+ {scene.file.duration &&
+ TextUtils.secondsToTimestamp(scene.file.duration)}
+
+ {renderTags(scene.tags)}
+ {renderPerformers(scene.performers)}
+
+ {scene.studio && (
+
+ {scene.studio.name}
-
- )}
-
-
- );
+ )}
+
{scene.studio.name}
- )} -
+
+
+ {scene.studio.name}
- - )} -
diff --git a/ui/v2.5/src/components/Tagger/Tagger.tsx b/ui/v2.5/src/components/Tagger/Tagger.tsx
index d18827b1e..ed9aa0a17 100755
--- a/ui/v2.5/src/components/Tagger/Tagger.tsx
+++ b/ui/v2.5/src/components/Tagger/Tagger.tsx
@@ -14,6 +14,7 @@ import {
} from "src/core/StashService";
import { Manual } from "src/components/Help/Manual";
+import { SceneQueue } from "src/models/sceneQueue";
import StashSearchResult from "./StashSearchResult";
import Config from "./Config";
import {
@@ -141,6 +142,7 @@ function prepareQueryString(
interface ITaggerListProps {
scenes: GQL.SlimSceneDataFragment[];
+ queue?: SceneQueue;
selectedEndpoint: { endpoint: string; index: number };
config: ITaggerConfig;
queueFingerprintSubmission: (sceneId: string, endpoint: string) => void;
@@ -149,6 +151,7 @@ interface ITaggerListProps {
const TaggerList: React.FC = ({
scenes,
+ queue,
selectedEndpoint,
config,
queueFingerprintSubmission,
@@ -304,8 +307,15 @@ const TaggerList: React.FC = ({
setHideUnmatched(!hideUnmatched);
};
+ function generateSceneLink(scene: GQL.SlimSceneDataFragment, index: number) {
+ return queue
+ ? queue.makeLink(scene.id, { sceneIndex: index })
+ : `/scenes/${scene.id}`;
+ }
+
const renderScenes = () =>
- scenes.map((scene) => {
+ scenes.map((scene, index) => {
+ const sceneLink = generateSceneLink(scene, index);
const { paths, file, ext } = parsePath(scene.path);
const originalDir = scene.path.slice(
0,
@@ -376,7 +386,7 @@ const TaggerList: React.FC = ({
= ({
= ({
interface ITaggerProps {
scenes: GQL.SlimSceneDataFragment[];
+ queue?: SceneQueue;
}
-export const Tagger: React.FC = ({ scenes }) => {
+export const Tagger: React.FC = ({ scenes, queue }) => {
const stashConfig = useConfiguration();
const [{ data: config }, setConfig] = useLocalForage(
LOCAL_FORAGE_KEY,
@@ -620,6 +628,7 @@ export const Tagger: React.FC = ({ scenes }) => {
= (props: IWallItemProps) => {
let linkSrc: string = "#";
if (!props.clickHandler) {
if (props.scene) {
- linkSrc = `/scenes/${props.scene.id}`;
+ linkSrc = props.sceneQueue
+ ? props.sceneQueue.makeLink(props.scene.id, { sceneIndex: props.index })
+ : `/scenes/${props.scene.id}`;
} else if (props.sceneMarker) {
linkSrc = NavUtils.makeSceneMarkerUrl(props.sceneMarker);
} else if (props.image) {
diff --git a/ui/v2.5/src/components/Wall/WallPanel.tsx b/ui/v2.5/src/components/Wall/WallPanel.tsx
index b3f2a3f2d..a50ce1414 100644
--- a/ui/v2.5/src/components/Wall/WallPanel.tsx
+++ b/ui/v2.5/src/components/Wall/WallPanel.tsx
@@ -1,9 +1,11 @@
import React from "react";
import * as GQL from "src/core/generated-graphql";
+import { SceneQueue } from "src/models/sceneQueue";
import { WallItem } from "./WallItem";
interface IWallPanelProps {
scenes?: GQL.SlimSceneDataFragment[];
+ sceneQueue?: SceneQueue;
sceneMarkers?: GQL.SceneMarkerDataFragment[];
images?: GQL.SlimImageDataFragment[];
clickHandler?: (
@@ -43,7 +45,9 @@ export const WallPanel: React.FC = (
const scenes = (props.scenes ?? []).map((scene, index, sceneArray) => (
Scene successfully tagged:
- + {taggedScenes[scene.id].title}
@@ -476,7 +486,7 @@ const TaggerList: React.FC
-
+
= ({
/>
-
+
-
+
+
- YouTube @@ -270,6 +272,12 @@ func makeXPathConfig() mappedPerformerScraperConfig { } config.mappedConfig["Weight"] = weightConfig + tagConfig := mappedScraperAttrConfig{ + Selector: `//ul[@id="socialmedia"]//a`, + } + config.Tags = make(mappedConfig) + config.Tags["Name"] = tagConfig + return config } @@ -348,6 +356,16 @@ func TestScrapePerformerXPath(t *testing.T) { verifyField(t, details, performer.Details, "Details") verifyField(t, hairColor, performer.HairColor, "HairColor") verifyField(t, weight, performer.Weight, "Weight") + + expectedTagNames := []string{ + "Twitter", + "Facebook", + "YouTube", + "Instagram", + } + for i, expected := range expectedTagNames { + verifyField(t, expected, &performer.Tags[i].Name, "TagName") + } } func TestConcatXPath(t *testing.T) { diff --git a/pkg/utils/string_collections.go b/pkg/utils/string_collections.go index af135eb71..ae2f52991 100644 --- a/pkg/utils/string_collections.go +++ b/pkg/utils/string_collections.go @@ -35,6 +35,40 @@ func StrMap(vs []string, f func(string) string) []string { return vsm } +// StrAppendUnique appends toAdd to the vs string slice if toAdd does not already +// exist in the slice. It returns the new or unchanged string slice. +func StrAppendUnique(vs []string, toAdd string) []string { + if StrInclude(vs, toAdd) { + return vs + } + + return append(vs, toAdd) +} + +// StrAppendUniques appends a slice of string values to the vs string slice. It only +// appends values that do not already exist in the slice. It returns the new or +// unchanged string slice. +func StrAppendUniques(vs []string, toAdd []string) []string { + for _, v := range toAdd { + vs = StrAppendUnique(vs, v) + } + + return vs +} + +// StrUnique returns the vs string slice with non-unique values removed. +func StrUnique(vs []string) []string { + distinctValues := make(map[string]struct{}) + var ret []string + for _, v := range vs { + if _, exists := distinctValues[v]; !exists { + distinctValues[v] = struct{}{} + ret = append(ret, v) + } + } + return ret +} + // StringSliceToIntSlice converts a slice of strings to a slice of ints. // Returns an error if any values cannot be parsed. func StringSliceToIntSlice(ss []string) ([]int, error) { diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md index f4c0aa656..f79e9775c 100644 --- a/ui/v2.5/src/components/Changelog/versions/v070.md +++ b/ui/v2.5/src/components/Changelog/versions/v070.md @@ -13,6 +13,7 @@ * Added scene queue. ### 🎨 Improvements +* Remove duplicate values when scraping lists of elements. * Improved performance of the auto-tagger. * Clean generation artifacts after generating each scene. * Log message at startup when cleaning the `tmp` and `downloads` generated folders takes more than one second. diff --git a/ui/v2.5/src/docs/en/Scraping.md b/ui/v2.5/src/docs/en/Scraping.md index 4d38b4fd9..e537bfb2a 100644 --- a/ui/v2.5/src/docs/en/Scraping.md +++ b/ui/v2.5/src/docs/en/Scraping.md @@ -389,7 +389,17 @@ Replaces `2001 to 2003` with `2001-2003`. Additionally, there are a number of fixed post-processing fields that are specified at the attribute level (not in `postProcess`) that are performed after the `postProcess` operations: * `concat`: if an xpath matches multiple elements, and `concat` is present, then all of the elements will be concatenated together -* `split`: Its the inverse of `concat`. Splits a string to more elements using the separator given. For more info and examples have a look at PR [#579](https://github.com/stashapp/stash/pull/579) +* `split`: the inverse of `concat`. Splits a string to more elements using the separator given. For more info and examples have a look at PR [#579](https://github.com/stashapp/stash/pull/579) + +Example: +```yaml +Tags: + Name: + selector: //span[@class="list_attributes"] + split: "," +``` +Splits a comma separated list of tags located in the span and returns the tags. + For backwards compatibility, `replace`, `subscraper` and `parseDate` are also allowed as keys for the attribute. From 4a04dfe4a2e4dda26a78f3f9e25388d5c2c43fc3 Mon Sep 17 00:00:00 2001 From: InfiniteTF
Duration off by {Math.floor(diff)}s
;
+
+ const minDiff = Math.min(scene.duration, ...durations);
+ return Duration off by at least {Math.floor(minDiff)}s
;
};
const getFingerprintStatus = (
scene: IStashBoxScene,
stashScene: GQL.SlimSceneDataFragment
) => {
- const checksum = stashScene.checksum ?? stashScene.oshash ?? undefined;
- const checksumMatch = scene.fingerprints.some((f) => f.hash === checksum);
+ const checksumMatch = scene.fingerprints.some(
+ (f) => f.hash === stashScene.checksum || f.hash === stashScene.oshash
+ );
const phashMatch = scene.fingerprints.some(
(f) => f.hash === stashScene.phash
);
@@ -176,6 +186,8 @@ const StashSearchResult: React.FC
+
+
+ ))}
{queryableScrapers
? queryableScrapers.map((s) => (
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 8aa7c038c..668a2f7e3 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -14,6 +14,7 @@ import { usePerformersList } from "src/hooks";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
+import { PerformerTagger } from "src/components/Tagger";
import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
import { PerformerCard } from "./PerformerCard";
import { PerformerListTable } from "./PerformerListTable";
@@ -184,6 +185,11 @@ export const PerformerList: React.FC = ({
/>
);
}
+ if (filter.displayMode === DisplayMode.Tagger) {
+ return (
+ = ({
}
}
- // function onStashBoxQueryClicked(/* stashBoxIndex: number */) {
- // TODO
- // }
-
async function onScrapeClicked(scraper: GQL.Scraper) {
setIsLoading(true);
try {
@@ -361,7 +357,7 @@ export const SceneEditPanel: React.FC = ({
key={s.endpoint}
onClick={() => onScrapeStashBoxClicked(index)}
>
- stash-box
+ {s.name ?? "Stash-Box"}
))}
{queryableScrapers.map((s) => (
diff --git a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
index 1eeaf655e..6a24a72bc 100644
--- a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
@@ -84,6 +84,8 @@ export const SettingsTasksPanel: React.FC = () => {
return "Running Plugin Operation";
case "Migrate":
return "Migrating";
+ case "Stash-Box Performer Batch Operation":
+ return "Tagging performers from Stash-Box instance";
default:
return "Idle";
}
diff --git a/ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx b/ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx
new file mode 100644
index 000000000..f0fbae2dd
--- /dev/null
+++ b/ui/v2.5/src/components/Tagger/PerformerFieldSelector.tsx
@@ -0,0 +1,63 @@
+import React, { useState } from "react";
+import { Button } from "react-bootstrap";
+
+import { Modal, Icon } from "src/components/Shared";
+import { TextUtils } from "src/utils";
+
+interface IProps {
+ fields: string[];
+ show: boolean;
+ excludedFields: string[];
+ onSelect: (fields: string[]) => void;
+}
+
+const PerformerFieldSelect: React.FC = ({
+ fields,
+ show,
+ excludedFields,
+ onSelect,
+}) => {
+ const [excluded, setExcluded] = useState>(
+ excludedFields.reduce((dict, field) => ({ ...dict, [field]: true }), {})
+ );
+
+ const toggleField = (name: string) =>
+ setExcluded({
+ ...excluded,
+ [name]: !excluded[name],
+ });
+
+ const renderField = (name: string) => (
+
+ onSelect(Object.keys(excluded).filter((f) => excluded[f])),
+ }}
+ >
+
+ );
+};
+
+export default PerformerFieldSelect;
diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
index 41233e2ad..390c8d0d1 100755
--- a/ui/v2.5/src/components/Tagger/PerformerModal.tsx
+++ b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -1,6 +1,7 @@
import React, { useState } from "react";
import { Button } from "react-bootstrap";
import cx from "classnames";
+import { IconName } from "@fortawesome/fontawesome-svg-core";
import {
LoadingIndicator,
@@ -10,26 +11,43 @@ import {
} from "src/components/Shared";
import * as GQL from "src/core/generated-graphql";
import { genderToString } from "src/core/StashService";
+import { TextUtils } from "src/utils";
import { IStashBoxPerformer } from "./utils";
interface IPerformerModalProps {
performer: IStashBoxPerformer;
modalVisible: boolean;
- showModal: (show: boolean) => void;
- handlePerformerCreate: (imageIndex: number) => void;
+ closeModal: () => void;
+ handlePerformerCreate: (imageIndex: number, excludedFields: string[]) => void;
+ excludedPerformerFields?: string[];
+ header: string;
+ icon: IconName;
+ create?: boolean;
+ endpoint: string;
}
const PerformerModal: React.FC = ({
modalVisible,
performer,
handlePerformerCreate,
- showModal,
+ closeModal,
+ excludedPerformerFields = [],
+ header,
+ icon,
+ create = false,
+ endpoint,
}) => {
const [imageIndex, setImageIndex] = useState(0);
const [imageState, setImageState] = useState<
"loading" | "error" | "loaded" | "empty"
>("empty");
const [loadDict, setLoadDict] = useState>({});
+ const [excluded, setExcluded] = useState>(
+ excludedPerformerFields.reduce(
+ (dict, field) => ({ ...dict, [field]: true }),
+ {}
+ )
+ );
const { images } = performer;
@@ -51,106 +69,101 @@ const PerformerModal: React.FC = ({
};
const handleError = () => setImageState("error");
+ const toggleField = (name: string) =>
+ setExcluded({
+ ...excluded,
+ [name]: !excluded[name],
+ });
+
+ const renderField = (
+ name: string,
+ text: string | null | undefined,
+ truncate: boolean = true
+ ) =>
+ text && (
+ handlePerformerCreate(imageIndex),
+ onClick: () =>
+ handlePerformerCreate(
+ imageIndex,
+ create ? [] : Object.keys(excluded).filter((key) => excluded[key])
+ ),
}}
- cancel={{ onClick: () => showModal(false), variant: "secondary" }}
- onHide={() => showModal(false)}
+ cancel={{ onClick: () => closeModal(), variant: "secondary" }}
+ onHide={() => closeModal()}
dialogClassName="performer-create-modal"
+ icon={icon}
+ header={header}
>
+
+ {TextUtils.capitalize(name)}
+
+ );
+
+ return (
+ Select tagged fields
+
+ These fields will be tagged by default. Click the button to toggle.
+
+ {fields.map((f) => renderField(f))}
+
+
+ );
+
+ const base = endpoint.match(/https?:\/\/.*?\//)?.[0];
+ const link = base ? `${base}performers/${performer.stash_id}` : undefined;
+
return (
+ {!create && (
+
+ )}
+ {TextUtils.capitalize(name)}:
+
+ {truncate ? (
+
-
-
- Performer information
-
-
- Name:
-
-
- Gender:
-
-
- Birthdate:
-
-
- Death Date:
-
-
- Ethnicity:
-
-
- Country:
-
-
- Hair Color:
-
-
- Eye Color:
-
-
- Height:
-
-
- Weight:
-
-
- Measurements:
-
- {performer?.gender !== GQL.GenderEnum.Male && (
-
- Fake Tits:
-
+
+ {renderField("name", performer.name)}
+ {renderField("gender", genderToString(performer.gender))}
+ {renderField("birthdate", performer.birthdate)}
+ {renderField("death_date", performer.death_date)}
+ {renderField("ethnicity", performer.ethnicity)}
+ {renderField("country", performer.country)}
+ {renderField("hair_color", performer.hair_color)}
+ {renderField("eye_color", performer.eye_color)}
+ {renderField("height", performer.height)}
+ {renderField("weight", performer.weight)}
+ {renderField("measurements", performer.measurements)}
+ {performer?.gender !== GQL.GenderEnum.Male &&
+ renderField("fake_tits", performer.fake_tits)}
+ {renderField("career_length", performer.career_length)}
+ {renderField("tattoos", performer.tattoos, false)}
+ {renderField("piercings", performer.piercings, false)}
+ {link && (
+
+
+ Stash-Box Source
+
)}
-
{images.length > 0 && (
-
+
+ Stash-Box Source
+
)}
-
- Career Length:
-
-
- Tattoos:
-
-
- Piercings:
-
+
-
+ {!create && (
+
+ )}
= ({
)}
-