fix galleryByURL

stashapp · Jan 30, 2025 · 58bce66 · 58bce66
1 parent ff0bb04
commit 58bce66
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/scrapers/AdultTime/AdultTime.py b/scrapers/AdultTime/AdultTime.py
@@ -133,6 +133,7 @@ def fix_url(_url: str) -> str:
 """
 
 site_map = {
+    "AdultTimePilots": "Adult Time Pilots",
     "agentredgirl": "Agent Red Girl",
     "asmrfantasy": "ASMR Fantasy",
     "bethecuck": "Be the Cuck",
@@ -269,8 +270,9 @@ def postprocess_gallery(gallery: ScrapedGallery, api_gallery: dict[str, Any]) ->
 
     log.debug(f"args: {args}")
     match op, args:
-        case "gallery-by-url", {"url": url} if url:
-            result = gallery_from_url(url, postprocess=postprocess_gallery)
+        case "gallery-by-url", {"url": url, "extra": extra} if url and extra:
+            sites = extra
+            result = gallery_from_url(url, sites, postprocess=postprocess_gallery)
         case "gallery-by-fragment", args:
             sites = args.pop("extra")
             result = gallery_from_fragment(args, sites, postprocess=postprocess_gallery)

diff --git a/scrapers/AdultTime/AdultTime.yml b/scrapers/AdultTime/AdultTime.yml
@@ -114,6 +114,7 @@ galleryByURL:
   - action: script
     url:
       - accidentalgangbang.com/en/photo/
+      - adulttimepilots.com/en/photo/
       - asmrfantasy.com/en/photo/
       - devilsfilm.com/en/photo/
       - devilsfilm.com/en/video/

diff --git a/scrapers/AlgoliaAPI/AlgoliaAPI.py b/scrapers/AlgoliaAPI/AlgoliaAPI.py
@@ -488,11 +488,12 @@ def gallery_from_set_id(
 
 def gallery_from_url(
     _url: str,
+    sites: list[str],
     postprocess: Callable[[ScrapedGallery, dict], ScrapedGallery] = default_postprocess,
 ) -> ScrapedGallery | None:
     "Scrapes a gallery from a URL, running an optional postprocess function on the result"
     url_id = id_from_url(_url)
-    site = site_from_url(_url)
+    site = sites[0]
     log.debug(f"Site: {site}")
     if "/photo/" in _url: # some sites have public photoset URLs, so can be searched by set_id
         log.debug(f"set_id: {url_id}")
@@ -838,8 +839,9 @@ def performer_from_fragment(
 
     log.debug(f"args: {args}")
     match op, args:
-        case "gallery-by-url", {"url": url} if url:
-            result = gallery_from_url(url)
+        case "gallery-by-url", {"url": url, "extra": extra} if url and extra:
+            domains = extra
+            result = gallery_from_url(url, domains)
         case "gallery-by-fragment", args:
             domains = args.pop("extra")
             result = gallery_from_fragment(args, domains)

diff --git a/scrapers/EvilAngel/EvilAngel.py b/scrapers/EvilAngel/EvilAngel.py
@@ -181,8 +181,9 @@ def postprocess_gallery(gallery: ScrapedGallery, api_gallery: dict[str, Any]) ->
 
     log.debug(f"args: {args}")
     match op, args:
-        case "gallery-by-url", {"url": url} if url:
-            result = gallery_from_url(url, postprocess=postprocess_gallery)
+        case "gallery-by-url", {"url": url, "extra": extra} if url and extra:
+            sites = extra
+            result = gallery_from_url(url, sites, postprocess=postprocess_gallery)
         case "gallery-by-fragment", args:
             sites = args.pop("extra")
             result = gallery_from_fragment(args, sites, postprocess=postprocess_gallery)

diff --git a/scrapers/GenderXFilms/GenderXFilms.py b/scrapers/GenderXFilms/GenderXFilms.py
@@ -109,8 +109,9 @@ def postprocess_gallery(gallery: ScrapedGallery, api_gallery: dict[str, Any]) ->
 
     log.debug(f"args: {args}")
     match op, args:
-        case "gallery-by-url", {"url": url} if url:
-            result = gallery_from_url(url, postprocess=postprocess_gallery)
+        case "gallery-by-url", {"url": url, "extra": extra} if url and extra:
+            sites = extra
+            result = gallery_from_url(url, sites, postprocess=postprocess_gallery)
         case "gallery-by-fragment", args:
             sites = args.pop("extra")
             result = gallery_from_fragment(args, sites, postprocess=postprocess_gallery)

diff --git a/scrapers/RoccoSiffredi/RoccoSiffredi.py b/scrapers/RoccoSiffredi/RoccoSiffredi.py
@@ -57,8 +57,9 @@ def postprocess_movie(movie: ScrapedMovie, _: dict[str, Any]) -> ScrapedMovie:
 
     log.debug(f"args: {args}")
     match op, args:
-        case "gallery-by-url", {"url": url} if url:
-            result = gallery_from_url(url)
+        case "gallery-by-url", {"url": url, "extra": extra} if url and extra:
+            sites = extra
+            result = gallery_from_url(url, sites)
         case "gallery-by-fragment", args:
             sites = args.pop("extra")
             result = gallery_from_fragment(args, sites)