-
Notifications
You must be signed in to change notification settings - Fork 134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
javr: enable multiple scrapers, and add javlibrary and javbus #1100
Conversation
I can give it about as thorough a look as I did for the previous PR! I don't think I'll have the free time today to fumble with getting Gitpod to properly load and start XBVR, as I had to do a few extra things with installing or building stuff within it for it to actually launch, and I didn't take any notes, but I'll give it a go by tomorrow evening!!! |
Thanks vt! I also struggled with the build system for a while when starting this, because I didn't feel like using gitpod and prefer a local development environment over a cloud environment. It means I had to start with creating a standalone Dockerfile and docker-compose file, so I could build and spin up a development copy with https://github.com/thebrnd/xbvr/blob/standalone-build/Dockerfile-standalone |
I'm on Windows, (WS2019 - it's got WSL and Docker but not as "good" as 2022) so I haven't the faintest idea what to do with Docker. I'm going to try and remember what I did it to launch in Gitpod beyond |
I focused on 3DSVR since it was the only one where I "thought of a fix" earlier, and just picked some random unmatched scenes I actually had for testing anyways, all three new scrapers seem to work. I'm not sure if you want to add workarounds for how 3DSVR scrapes as "DSVR" for both javlibrary and jav.land, but they both appear to show up in the library universally the same way they did from javdatabase before the bodge/fix - I didn't scrape too many scenes, but I did notice that e.g. javlibrary returned JAV.land also returned the other peculiarities, like differences in actress names, JAVBUS having Japanese studio names actress name differences aren't a huge deal, either users can change them out on their own, or they can use AKAs. also another tag to add to the "drop these useless annoying tags" list, this one was from jav.land: final thought: similarly to how the "JAVR" tag is added to anything scraped using the scraper, it might be worth adding an additional tag, for the actual scraper used? only if it's easy to implement - and something simple, so either let me know if you'd like me to look at anything else! unrelated gitpod rambling IDK if it's just me, or what, but with gitpod, npm i -g concurrently
npm i -g vue
npm i -g @vue/cli-service
npm i -g go
npm audit fix only then does |
Also, I just figured out how to PR directly to your fork, so I'll take care of
!!! |
Add `javdatabase` as a tag
Always add `javbus` as a tag
Always add 'jav.land' as a tag
Always add javlibrary as a tag
Changed both of the skip/re-map lists to tab separation. Moved "solo/solo work/solowork" to the "drop" list, I forgot what the R18 tag was, but unless I am mistaken, it was a tag they (and FANZA by extension) automatically add(ed) to titles that aren't part of an overarching "series". It's meaningless to us since we don't scrape R18/DMM's "series" listings, nor would we have a way to filter for them in XBVR. Changed "kiss kiss" to the tag to be retained, as that was the tag R18 used, and most users would already have plenty of in their databases. Probably best to maintain continuity with the old R18 tags whenever possible if this is to be done.
Similarly, `suntan` was the tag R18 used, I have 12 entries in my library that pre-date the manifests I started writing myself.
I made some edits to the tag replacement rules, both in cases where I know what the old R18 tag used to be, moved the "solo" related tags to the drop list, and added the extra tag per scraper source. Also added tab separation, but without lint running on the fork IDK if I broke anything or not because gofmt really doesn't like stray spaces. |
Patched the following:
My code editor does it's own thing with whitespace whenever I save, so I was unable to preserve your whitespace changes. Are you planning to further complete the tag mapping or is it finished? |
I just made corrections to the ones I saw in there, I imagine that one will be a WIP as time goes on and I notice any differences or similarities between R18 tags and any of the tags from the new scrapers. |
…ps#1100) * javr: enable multiple scraper options, and add javlibrary and javbus * javr: add jav.land as well * Update javdatabase.go Add `javdatabase` as a tag * Update javbus.go Always add `javbus` as a tag * Update javland.go Always add 'jav.land' as a tag * Update javlibrary.go Always add javlibrary as a tag * Update javtags.go Changed both of the skip/re-map lists to tab separation. Moved "solo/solo work/solowork" to the "drop" list, I forgot what the R18 tag was, but unless I am mistaken, it was a tag they (and FANZA by extension) automatically add(ed) to titles that aren't part of an overarching "series". It's meaningless to us since we don't scrape R18/DMM's "series" listings, nor would we have a way to filter for them in XBVR. Changed "kiss kiss" to the tag to be retained, as that was the tag R18 used, and most users would already have plenty of in their databases. Probably best to maintain continuity with the old R18 tags whenever possible if this is to be done. * Update javtags.go Similarly, `suntan` was the tag R18 used, I have 12 entries in my library that pre-date the manifests I started writing myself. * javr: more error-correcting code, and less code-reuse between scrapers Co-authored-by: vt-idiot <81622808+vt-idiot@users.noreply.github.com>
Two additional javr scene importers, because one just isn't enough. See discussion in pull request #1067 for details. Is anybody willing to test or comment on this?