Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xbapps/xbvr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.29
Choose a base ref
...
head repository: xbapps/xbvr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 5,072 additions and 1,460 deletions.
  1. +2 −2 .github/workflows/lint.yml
  2. +2 −2 .github/workflows/release.yml
  3. +1 −1 .gitpod.dockerfile
  4. +1 −1 Makefile
  5. +2 −2 README.md
  6. +23 −23 go.mod
  7. +52 −2 go.sum
  8. +12 −12 package.json
  9. +17 −3 pkg/api/deovr.go
  10. +10 −0 pkg/api/external_references.go
  11. +13 −9 pkg/api/heresphere.go
  12. +35 −16 pkg/api/options.go
  13. +3 −1 pkg/api/scenes.go
  14. +689 −6 pkg/api/stashdb.go
  15. +17 −16 pkg/config/config.go
  16. +98 −10 pkg/config/scraper_list.go
  17. +9 −35 pkg/config/scrapers.json
  18. +17 −16 pkg/config/state.go
  19. +145 −59 pkg/externalreference/stashdb.go
  20. +173 −0 pkg/migrations/migrations.go
  21. +95 −79 pkg/models/model_external_reference.go
  22. +1 −0 pkg/models/model_file.go
  23. +21 −13 pkg/models/model_scene.go
  24. +29 −2 pkg/models/model_scraper.go
  25. +1 −0 pkg/models/model_site.go
  26. +22 −0 pkg/models/model_stashdb.go
  27. +1 −2 pkg/scrape/baberoticavr.go
  28. +22 −21 pkg/scrape/badoink.go
  29. +1 −2 pkg/scrape/caribbeancom.go
  30. +3 −4 pkg/scrape/czechvr.go
  31. +1 −2 pkg/scrape/darkroomvr.go
  32. +2 −3 pkg/scrape/fuckpassvr.go
  33. +1 −2 pkg/scrape/groobyvr.go
  34. +1 −2 pkg/scrape/hologirlsvr.go
  35. +1 −1 pkg/scrape/javdatabase.go
  36. +126 −0 pkg/scrape/kinkvr.go
  37. +3 −4 pkg/scrape/lethalhardcorevr.go
  38. +1 −2 pkg/scrape/littlecaprice.go
  39. +1 −2 pkg/scrape/navr.go
  40. +7 −8 pkg/scrape/povr.go
  41. +107 −106 pkg/scrape/realitylovers.go
  42. +3 −4 pkg/scrape/realjamvr.go
  43. +49 −0 pkg/scrape/realvr.go
  44. +24 −10 pkg/scrape/sexbabesvr.go
  45. +29 −2 pkg/scrape/sinsvr.go
  46. +36 −22 pkg/scrape/slrstudios.go
  47. +344 −18 pkg/scrape/stashdb.go
  48. +153 −0 pkg/scrape/stashdb_studios.go
  49. +1 −2 pkg/scrape/stasyqvr.go
  50. +1 −2 pkg/scrape/swallowbay.go
  51. +1 −2 pkg/scrape/tmwvrnet.go
  52. +1 −2 pkg/scrape/tngf.go
  53. +1 −2 pkg/scrape/transvr.go
  54. +157 −0 pkg/scrape/upclosevr.go
  55. +1 −2 pkg/scrape/virtualpee.go
  56. +65 −25 pkg/scrape/virtualporn.go
  57. +6 −7 pkg/scrape/virtualrealporn.go
  58. +1 −2 pkg/scrape/virtualtaboo.go
  59. +1 −2 pkg/scrape/vr3000.go
  60. +2 −2 pkg/scrape/vrallure.go
  61. +6 −7 pkg/scrape/vrbangers.go
  62. +1 −2 pkg/scrape/vrhush.go
  63. +1 −2 pkg/scrape/vrlatina.go
  64. +5 −6 pkg/scrape/vrphub.go
  65. +4 −5 pkg/scrape/vrporn.go
  66. +1 −2 pkg/scrape/vrsexygirlz.go
  67. +19 −11 pkg/scrape/vrspy.go
  68. +16 −7 pkg/scrape/wetvr.go
  69. +3 −4 pkg/scrape/zexywankitnow.go
  70. +38 −9 pkg/tasks/content.go
  71. +10 −0 pkg/tasks/volume.go
  72. +11 −1 ui/src/App.vue
  73. +50 −0 ui/src/components/LinkStashdbButton.vue
  74. +3 −0 ui/src/components/RescrapeButton.vue
  75. +3 −0 ui/src/store/optionsSites.js
  76. +4 −1 ui/src/store/optionsWeb.js
  77. +28 −0 ui/src/store/overlay.js
  78. +3 −1 ui/src/views/actors/ActorCard.vue
  79. +24 −2 ui/src/views/actors/ActorDetails.vue
  80. +250 −0 ui/src/views/actors/SearchStashdbActors.vue
  81. +1 −1 ui/src/views/options/sections/InterfaceAdvanced.vue
  82. +13 −0 ui/src/views/options/sections/InterfaceWeb.vue
  83. +6 −0 ui/src/views/options/sections/OptionsSceneCreate.vue
  84. +39 −5 ui/src/views/options/sections/OptionsSceneDataImportExport.vue
  85. +5 −0 ui/src/views/options/sections/OptionsSceneDataScrapers.vue
  86. +63 −8 ui/src/views/scenes/Details.vue
  87. +8 −1 ui/src/views/scenes/SceneCard.vue
  88. +197 −0 ui/src/views/scenes/SearchStashdbScenes.vue
  89. +1,616 −808 yarn.lock
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '12'

- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Check code formatting using gofmt
uses: Jerome1337/gofmt-action@v1.0.5
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
submodules: 'true'
fetch-depth: 0
@@ -25,7 +25,7 @@ jobs:
uses: docker/setup-qemu-action@v3

- name: Build UI
run: cd ui && yarn install && yarn build
run: cd ui && yarn install --ignore-engines && yarn build

- name: Setup release environment
run: |-
2 changes: 1 addition & 1 deletion .gitpod.dockerfile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ ENV HOME=/home/gitpod
WORKDIR $HOME
USER gitpod

ENV GO_VERSION=1.21.4 \
ENV GO_VERSION=1.22.7 \
GOPATH=$HOME/go-packages \
GOROOT=$HOME/go
RUN export PATH=$(echo "$PATH" | sed -e 's|:/workspace/go/bin||' -e 's|:/home/gitpod/go/bin||' -e 's|:/home/gitpod/go-packages/bin||')
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GORELEASER_CROSS_VERSION ?= v1.21.4
GORELEASER_CROSS_VERSION ?= v1.22.7

SYSROOT_DIR ?= sysroots
SYSROOT_ARCHIVE ?= sysroots.tar.bz2
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ Ask your questions and suggest features on [Discord](https://discord.gg/wdCHXAG)

Make sure you have following installed:

- Go 1.21
- Go 1.22
- Node.js 12.x
- Yarn 1.17.x
- air (run `go install github.com/cosmtrek/air@latest` outside project directory)
@@ -141,7 +141,7 @@ esc - closes details pane
|------------------------|--------------|------|-------------|
| `--enableLocalStorage` | | boolean |Use local folder to store application data|
| `--app_dir` | XBVR_APPDIR | String|path to the application directory|
| `--cache_dir` | XBVR_CACHEDIR | String|path to the tempoarary scraper cache directory|
| `--cache_dir` | XBVR_CACHEDIR | String|path to the temporary scraper cache directory|
| `--imgproxy_dir` | XBVR_IMAGEPROXYDIR | String|path to the imageproxy directory|
| `--search_dir` | XBVR_SEARCHDIR | String| path to the Search Index directory|
| `--preview_dir` | XBVR_VIDEOPREVIEWDIR | String| path to the Scraper Cache directory|
46 changes: 23 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/xbapps/xbvr

go 1.21
go 1.22

require (
github.com/ProtonMail/go-appdir v1.1.0
@@ -9,23 +9,23 @@ require (
github.com/anacrolix/ffprobe v1.1.0
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
github.com/avast/retry-go/v4 v4.6.0
github.com/blevesearch/bleve/v2 v2.4.1
github.com/blevesearch/bleve/v2 v2.4.4
github.com/bregydoc/gtranslate v0.0.0-20200913051839-1bd07f6c1fc5
github.com/creasty/defaults v1.7.0
github.com/creasty/defaults v1.8.0
github.com/darwayne/go-timecode v1.1.0
github.com/disintegration/imaging v1.6.2
github.com/djherbis/times v1.6.0
github.com/dustin/go-humanize v1.0.1
github.com/emicklei/go-restful-openapi/v2 v2.10.2
github.com/emicklei/go-restful-openapi/v2 v2.11.0
github.com/emicklei/go-restful/v3 v3.12.1
github.com/gammazero/nexus/v3 v3.2.2
github.com/getlantern/systray v1.2.2
github.com/go-openapi/spec v0.21.0
github.com/go-resty/resty/v2 v2.13.1
github.com/go-resty/resty/v2 v2.16.3
github.com/go-test/deep v1.1.1
github.com/gocolly/colly/v2 v2.1.0
github.com/gorilla/mux v1.8.1
github.com/gosimple/slug v1.14.0
github.com/gosimple/slug v1.15.0
github.com/gowww/log v1.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/jinzhu/gorm v1.9.16
@@ -37,36 +37,36 @@ require (
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/marcsauter/single v0.0.0-20201009143647-9f8d81240be2
github.com/markphelps/optional v0.11.0
github.com/mattn/go-sqlite3 v1.14.22
github.com/mattn/go-sqlite3 v1.14.24
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
github.com/mholt/archiver v3.1.1+incompatible
github.com/mozillazg/go-slugify v0.2.0
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/nleeper/goment v1.4.4
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/pkg/errors v0.9.1
github.com/putdotio/go-putio v1.7.1
github.com/robertkrimen/otto v0.4.0
github.com/putdotio/go-putio v1.7.2
github.com/robertkrimen/otto v0.5.1
github.com/robfig/cron/v3 v3.0.1
github.com/rs/cors v1.11.0
github.com/rs/cors v1.11.1
github.com/sirupsen/logrus v1.9.3
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/thoas/go-funk v0.9.3
github.com/tidwall/gjson v1.17.1
github.com/tidwall/gjson v1.18.0
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xo/dburl v0.21.1
golang.org/x/crypto v0.25.0
golang.org/x/net v0.27.0
golang.org/x/oauth2 v0.21.0
golang.org/x/sys v0.22.0
golang.org/x/text v0.16.0
github.com/xo/dburl v0.23.2
golang.org/x/crypto v0.32.0
golang.org/x/net v0.34.0
golang.org/x/oauth2 v0.25.0
golang.org/x/sys v0.29.0
golang.org/x/text v0.21.0
gopkg.in/gormigrate.v1 v1.6.0
willnorris.com/go/imageproxy v0.11.3-0.20240601234520-572ad2db78ed
)

require (
github.com/blevesearch/go-faiss v1.0.19 // indirect
github.com/blevesearch/zapx/v16 v16.1.4 // indirect
github.com/blevesearch/go-faiss v1.0.24 // indirect
github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

@@ -78,12 +78,12 @@ require (
github.com/antchfx/xpath v1.1.10 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.12.0 // indirect
github.com/blevesearch/bleve_index_api v1.1.9
github.com/blevesearch/bleve_index_api v1.1.12
github.com/blevesearch/geo v0.1.20 // indirect
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
github.com/blevesearch/gtreap v0.1.1 // indirect
github.com/blevesearch/mmap-go v1.0.4 // indirect
github.com/blevesearch/scorch_segment_api/v2 v2.2.14 // indirect
github.com/blevesearch/scorch_segment_api/v2 v2.2.16 // indirect
github.com/blevesearch/segment v0.9.1 // indirect
github.com/blevesearch/snowballstem v0.9.0 // indirect
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
@@ -92,7 +92,7 @@ require (
github.com/blevesearch/zapx/v12 v12.3.10 // indirect
github.com/blevesearch/zapx/v13 v13.3.10 // indirect
github.com/blevesearch/zapx/v14 v14.3.10 // indirect
github.com/blevesearch/zapx/v15 v15.3.13 // indirect
github.com/blevesearch/zapx/v15 v15.3.16 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/fcjr/aia-transport-go v1.2.2
@@ -148,7 +148,7 @@ require (
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/term v0.28.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
Loading