Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 165528f
Author: Maista <[email protected]>
Date:   Mon Sep 25 05:05:24 2023 +0200

    Fix false positive mismatch in Movie Scrape dialog (stashapp#4144)

    * Fix false positive mismatch in Movie Scrape dialog

    Scraping a movie by URL would show a difference in duration because the
    persisted value of duration was converted to HH:MM:SS while the newly
    scraped value was displayed without formatting: this makes sense because
    the newly scraped value is just a string and so could be anything

    This adds a check to see if the string is a number and converts it to
    HH:MM:SS format if possible

    * Fallback to original value if not a number

    ---------

    Co-authored-by: WithoutPants <[email protected]>

commit 9577600
Author: WithoutPants <[email protected]>
Date:   Mon Sep 25 12:27:20 2023 +1000

    Gallery URLs (stashapp#4114)

    * Initial backend changes
    * Fix unit tests
    * UI changes
    * Fix missing URL filters

commit a369e39
Author: Maista <[email protected]>
Date:   Mon Sep 25 04:25:24 2023 +0200

    Allow scene scrapers to return full movie data (stashapp#4147)

    Movies scraped from the scene scrape dialog can now create full movies
    just like the movie scrape dialog albeit without the helpful preview

commit bba60cc
Author: Flashy78 <[email protected]>
Date:   Sun Sep 24 19:24:08 2023 -0700

    Fix width of image selection arrow div (stashapp#4142)

commit ce55392
Author: DingDongSoLong4 <[email protected]>
Date:   Mon Sep 25 03:55:36 2023 +0200

    PerformerSelect Tagger bugfixes (stashapp#4148)

    * Fix Tagger PerformerSelect active highlight
    * Clear select on skip
    * Add back react-select className

commit 22350d3
Author: WithoutPants <[email protected]>
Date:   Mon Sep 25 11:53:47 2023 +1000

    Filter migration fix (stashapp#4151)

    * Exclude value for is null/not null

    Also includes changes to the error message in the migration to include the filter string.

    * Ignore null when setting from encoded criterion

commit 9f5bcca
Author: WithoutPants <[email protected]>
Date:   Mon Sep 25 09:35:55 2023 +1000

    Fix lightbox fullscreen issues (stashapp#4149)

    * Improve lightbox context hook
    * Prevent fullscreen drop while loading
    * Fix close not working from fullscreen

commit 462943a
Author: Flashy78 <[email protected]>
Date:   Thu Sep 21 14:24:06 2023 -0700

    Help text for animated image previews (stashapp#4139)

commit 636b0a3
Author: elkorol <[email protected]>
Date:   Wed Sep 20 05:08:00 2023 +0100

    Add Icons to tags if they have parent/child tags (stashapp#3931)

    * Add Icons to tags if they have parent/child tags
    * Refactor TagLink
    ---------
    Co-authored-by: WithoutPants <[email protected]>

commit 36e9ed7
Author: DingDongSoLong4 <[email protected]>
Date:   Wed Sep 20 03:15:48 2023 +0200

    Fix bulk tagger again (stashapp#4133)

    * Add ForEndpoint method
    * Fix typo in schema 48 migration

commit 7ba7df0
Author: DingDongSoLong4 <[email protected]>
Date:   Wed Sep 20 03:11:27 2023 +0200

    Fix bulk movie update (stashapp#4130)

commit 3aa3515
Author: yoshnopa <[email protected]>
Date:   Tue Sep 19 01:32:59 2023 +0200

    Allow Autoplay when loading the site first time (stashapp#4131)

commit 81f39bc
Author: DingDongSoLong4 <[email protected]>
Date:   Tue Sep 19 01:31:34 2023 +0200

    Lightbox infinite scrolling improvements (stashapp#3894)

commit 62173a9
Author: DingDongSoLong4 <[email protected]>
Date:   Mon Sep 18 01:39:56 2023 +0200

    Fix scene merge nil dereference (stashapp#4119)

commit 0b7dcbe
Author: Maista <[email protected]>
Date:   Fri Sep 15 01:08:55 2023 +0200

    Update htmlquery dependency (stashapp#4126)

commit f51ac81
Author: DrDaveUK <[email protected]>
Date:   Tue Sep 12 07:46:36 2023 +0100

    Scene Duplicate Checker UI & Feature Improvement (stashapp#4006)

    * UI Update to show which file is being deleted
    Added Selection dropwdown
    Added checkbox to ensure that the codecs are the same within the group

    * Refactor size options
    * Convert select box to dropdown
    * Internationalisation
    ---------
    Co-authored-by: Steve Enderby <[email protected]>
    Co-authored-by: WithoutPants <[email protected]>

commit a25286b
Author: WithoutPants <[email protected]>
Date:   Tue Sep 12 13:31:53 2023 +1000

    Multiple image URLs (stashapp#4000)

    * Backend changes - ported from scene impl
    * Front end changes
    * Refactor URL mutation code

commit 9f4d0af
Author: DingDongSoLong4 <[email protected]>
Date:   Tue Sep 12 02:53:32 2023 +0200

    Filter criterion fixes (stashapp#4090)

    * Reorder
    * Remove PhashDuplicateCriterion
    * Improve DurationInput
    * Register abloop outside of player init function
    * Remove none criterion
    * Typing improvements
    * Move makeCriteria to ListFilterModel
    * Separate PathCriterionOption
    * Add makeCriterion arg to StringCriterionOption
    * Remove unused options args
    * Add DurationCriterionOption
    * Use createNumberCriterionOption
    * Add StringBooleanCriterion

commit 0d13eec
Author: MrX292 <[email protected]>
Date:   Tue Sep 12 02:37:49 2023 +0200

    Update Configuration.md (stashapp#4108)

commit 4a9fdc8
Author: its-josh4 <[email protected]>
Date:   Mon Sep 11 17:36:48 2023 -0700

    Remove vendored dependencies (stashapp#4110)

commit b36aa74
Author: its-josh4 <[email protected]>
Date:   Sun Sep 10 21:43:42 2023 -0700

    Fixed: CopyFile not working (stashapp#4104)

commit da38ec0
Author: WithoutPants <[email protected]>
Date:   Mon Sep 11 14:41:13 2023 +1000

    Fix rating and country filters (stashapp#4105)

    * Fix country criterion
    * Fixing rating criterion

commit 798db1a
Author: its-josh4 <[email protected]>
Date:   Sun Sep 10 19:48:39 2023 -0700

    Improve error reporting when moving a transcoded file fails (stashapp#4101)

commit 06d7630
Author: its-josh4 <[email protected]>
Date:   Sun Sep 10 19:46:21 2023 -0700

    Do not log ECONNRESET errors when serving transcoded video files (stashapp#4099)

commit 953867f
Author: CJ <[email protected]>
Date:   Sun Sep 10 21:45:58 2023 -0500

    Adjust compact details (stashapp#4098)

commit f237a58
Author: yoshnopa <[email protected]>
Date:   Mon Sep 11 04:39:55 2023 +0200

    Frontpage Mobile Fix (stashapp#4057)

    Change CSS To show Correct dimensions on Mobile

commit 24e4719
Author: DingDongSoLong4 <[email protected]>
Date:   Mon Sep 11 04:24:15 2023 +0200

    Model refactor, part 2 (stashapp#4092)

    * Move conversions into changesetTranslator
    * Improve mutation error messages
    * Use models.New and models.NewPartial everywhere
    * Replace getStashIDsFor functions
    * Remove ImageCreateInput
    * Remove unused parameters
    * Refactor matching functions
    ---------
    Co-authored-by: WithoutPants <[email protected]>

commit cf3301c
Author: WithoutPants <[email protected]>
Date:   Mon Sep 11 10:50:24 2023 +1000

    Handle equality when scraping scene performers (stashapp#4094)

commit 50c4ac9
Author: DingDongSoLong4 <[email protected]>
Date:   Fri Sep 8 03:33:16 2023 +0200

    Thumbnail scrubber improvements (stashapp#4081)

    * Remove deps from useDebounce hook
    * Add useThrottle hook
    * Throttle preview scrubber
    * Scrubber improvements
  • Loading branch information
Dankonite committed Sep 25, 2023
1 parent 2312e23 commit 2234a66
Show file tree
Hide file tree
Showing 2,898 changed files with 4,505 additions and 1,262,802 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: docker exec -t build /bin/bash -c "make generate-backend"

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest
Expand All @@ -42,19 +42,26 @@ jobs:
# working-directory: somedir

# Optional: golangci-lint command line arguments.
args: --modules-download-mode=vendor --timeout=5m
#
# Note: By default, the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
args: --timeout=5m

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the action will use pre-installed Go.
# skip-go-installation: true
# Optional: if set to true, then all caching functionality will be completely disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
skip-pkg-cache: true
# Optional: if set to true, then the action won't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
skip-build-cache: true
# Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"

- name: Cleanup build container
run: docker rm -f -v build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Go
####

# Vendored dependencies
vendor

# Binaries for programs and plugins
*.exe
*.exe~
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# options for analysis running
run:
timeout: 5m
modules-download-mode: vendor

linters:
disable-all: true
Expand Down
2 changes: 1 addition & 1 deletion cmd/stash/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go run -mod=vendor github.com/99designs/gqlgen
//go:generate go run github.com/99designs/gqlgen
package main

import (
Expand Down
1 change: 0 additions & 1 deletion docker/build/x86_64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN apk add --no-cache make alpine-sdk
WORKDIR /stash
COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
COPY ./scripts /stash/scripts/
COPY ./vendor /stash/vendor/
COPY ./pkg /stash/pkg/
COPY ./cmd /stash/cmd
COPY ./internal /stash/internal
Expand Down
1 change: 0 additions & 1 deletion docker/build/x86_64/Dockerfile-CUDA
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN apt update && apt install -y build-essential golang
WORKDIR /stash
COPY ./go* ./*.go Makefile gqlgen.yml .gqlgenc.yml /stash/
COPY ./scripts /stash/scripts/
COPY ./vendor /stash/vendor/
COPY ./pkg /stash/pkg/
COPY ./cmd /stash/cmd
COPY ./internal /stash/internal
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require (
github.com/99designs/gqlgen v0.17.2
github.com/Yamashou/gqlgenc v0.0.6
github.com/anacrolix/dms v1.2.2
github.com/antchfx/htmlquery v1.2.5-0.20211125074323-810ee8082758
github.com/antchfx/htmlquery v1.3.0
github.com/chromedp/cdproto v0.0.0-20210622022015-fe1827b46b84
github.com/chromedp/chromedp v0.7.3
github.com/corona10/goimagehash v1.0.3
Expand Down Expand Up @@ -66,7 +66,7 @@ require (

require (
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/antchfx/xpath v1.2.0 // indirect
github.com/antchfx/xpath v1.2.3 // indirect
github.com/asticode/go-astikit v0.20.0 // indirect
github.com/asticode/go-astits v1.8.0 // indirect
github.com/chromedp/sysutil v1.0.0 // indirect
Expand Down
13 changes: 8 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/antchfx/htmlquery v1.2.5-0.20211125074323-810ee8082758 h1:Ldjwcl7T8VqCKgQQ0TfPI8fNb8O/GtMXcYaHlqOu99s=
github.com/antchfx/htmlquery v1.2.5-0.20211125074323-810ee8082758/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5/0VZoDZLc=
github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
github.com/antchfx/htmlquery v1.3.0 h1:5I5yNFOVI+egyia5F2s/5Do2nFWxJz41Tr3DyfKD25E=
github.com/antchfx/htmlquery v1.3.0/go.mod h1:zKPDVTMhfOmcwxheXUsx4rKJy8KEY/PU6eXr/2SebQ8=
github.com/antchfx/xpath v1.2.3 h1:CCZWOzv5bAqjVv0offZ2LVgVYFbeldKQVuLNbViZdes=
github.com/antchfx/xpath v1.2.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0=
github.com/apache/arrow/go/arrow v0.0.0-20210521153258-78c88a9f517b/go.mod h1:R4hW3Ug0s+n4CUsWHKOj00Pu01ZqU4x/hSF5kXUcXKQ=
Expand Down Expand Up @@ -909,7 +909,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
Expand All @@ -935,6 +934,7 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
Expand Down Expand Up @@ -1064,10 +1064,12 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -1079,6 +1081,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
2 changes: 1 addition & 1 deletion graphql/documents/data/gallery-slim.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fragment SlimGalleryData on Gallery {
id
title
date
url
urls
details
rating100
organized
Expand Down
2 changes: 1 addition & 1 deletion graphql/documents/data/gallery.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fragment GalleryData on Gallery {
updated_at
title
date
url
urls
details
rating100
organized
Expand Down
2 changes: 1 addition & 1 deletion graphql/documents/data/image-slim.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fragment SlimImageData on Image {
id
title
date
url
urls
rating100
organized
o_counter
Expand Down
2 changes: 1 addition & 1 deletion graphql/documents/data/image.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fragment ImageData on Image {
title
rating100
date
url
urls
organized
o_counter
created_at
Expand Down
2 changes: 0 additions & 2 deletions graphql/documents/data/scene-marker.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ fragment SceneMarkerData on SceneMarker {
primary_tag {
id
name
aliases
}

tags {
id
name
aliases
}
}
8 changes: 7 additions & 1 deletion graphql/documents/data/scrapers.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ fragment ScrapedSceneMovieData on ScrapedMovie {
director
url
synopsis
front_image
back_image

studio {
...ScrapedMovieStudioData
}
}

fragment ScrapedSceneStudioData on ScrapedStudio {
Expand Down Expand Up @@ -179,7 +185,7 @@ fragment ScrapedSceneData on ScrapedScene {
fragment ScrapedGalleryData on ScrapedGallery {
title
details
url
urls
date

studio {
Expand Down
2 changes: 2 additions & 0 deletions graphql/documents/data/tag-slim.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ fragment SlimTagData on Tag {
name
aliases
image_path
parent_count
child_count
}
12 changes: 8 additions & 4 deletions graphql/schema/types/gallery.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ type Gallery {
checksum: String! @deprecated(reason: "Use files.fingerprints")
path: String @deprecated(reason: "Use files.path")
title: String
url: String
url: String @deprecated(reason: "Use urls")
urls: [String!]!
date: String
details: String
# rating expressed as 1-5
Expand Down Expand Up @@ -33,7 +34,8 @@ type Gallery {

input GalleryCreateInput {
title: String!
url: String
url: String @deprecated(reason: "Use urls")
urls: [String!]
date: String
details: String
# rating expressed as 1-5
Expand All @@ -51,7 +53,8 @@ input GalleryUpdateInput {
clientMutationId: String
id: ID!
title: String
url: String
url: String @deprecated(reason: "Use urls")
urls: [String!]
date: String
details: String
# rating expressed as 1-5
Expand All @@ -70,7 +73,8 @@ input GalleryUpdateInput {
input BulkGalleryUpdateInput {
clientMutationId: String
ids: [ID!]
url: String
url: String @deprecated(reason: "Use urls")
urls: BulkUpdateStrings
date: String
details: String
# rating expressed as 1-5
Expand Down
9 changes: 6 additions & 3 deletions graphql/schema/types/image.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ type Image {
rating: Int @deprecated(reason: "Use 1-100 range with rating100")
# rating expressed as 1-100
rating100: Int
url: String
url: String @deprecated(reason: "Use urls")
urls: [String!]!
date: String
o_counter: Int
organized: Boolean!
Expand Down Expand Up @@ -48,7 +49,8 @@ input ImageUpdateInput {
# rating expressed as 1-100
rating100: Int
organized: Boolean
url: String
url: String @deprecated(reason: "Use urls")
urls: [String!]
date: String

studio_id: ID
Expand All @@ -68,7 +70,8 @@ input BulkImageUpdateInput {
# rating expressed as 1-100
rating100: Int
organized: Boolean
url: String
url: String @deprecated(reason: "Use urls")
urls: BulkUpdateStrings
date: String

studio_id: ID
Expand Down
2 changes: 1 addition & 1 deletion graphql/schema/types/scene.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type Scene {
details: String
director: String
url: String @deprecated(reason: "Use urls")
urls: [String!]
urls: [String!]!
date: String
# rating expressed as 1-5
rating: Int @deprecated(reason: "Use 1-100 range with rating100")
Expand Down
6 changes: 4 additions & 2 deletions graphql/schema/types/scraper.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ input ScrapedSceneInput {
type ScrapedGallery {
title: String
details: String
url: String
url: String @deprecated(reason: "use urls")
urls: [String!]
date: String

studio: ScrapedStudio
Expand All @@ -111,7 +112,8 @@ type ScrapedGallery {
input ScrapedGalleryInput {
title: String
details: String
url: String
url: String @deprecated(reason: "use urls")
urls: [String!]
date: String

# no studio, tags or performers
Expand Down
3 changes: 3 additions & 0 deletions graphql/schema/types/tag.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ type Tag {
performer_count(depth: Int): Int! # Resolver
parents: [Tag!]!
children: [Tag!]!

parent_count: Int! # Resolver
child_count: Int! # Resolver
}

input TagCreateInput {
Expand Down
Loading

0 comments on commit 2234a66

Please sign in to comment.