Merge pull request #21 from l34240013/main

Update group scraper

Author: Lurking987

plugins/Stash_Group_ADVE_Movie_Plugin/README.md

@@ -12,7 +12,7 @@ which you're still missing.
 |---|---|
 | Stash v0.25+ | Plugin API + patch system |
 | Python 3.10+ | Backend scraper |
-| `requests`, `beautifulsoup4` | `pip install -r requirements.txt` |
+| `requests`, `beautifulsoup4`, `stashapp-tools` | `pip install -r requirements.txt` |
 
 ---
 
@@ -39,16 +39,12 @@ text editor and fill in the three values:
 
 ```json
 {
-  "stash_url": "http://localhost:9999",
-  "stash_api_key": "",
   "adve_session_cookie": "ageConfirmed=true; defaults={}; etoken=PASTE_YOUR_ETOKEN_HERE"
 }
 ```
 
 | Key | Description |
 |---|---|
-| `stash_url` | URL of your Stash instance. Change if you use a custom port or remote host. |
-| `stash_api_key` | API key for your Stash instance. Leave blank if authentication is not enabled. |
 | `adve_session_cookie` | Your AdultDVDEmpire session cookie string. See instructions below. |
 
 ### How to get your AdultDVDEmpire session cookie
@@ -149,7 +145,7 @@ Each ADVE scene is matched to a Stash scene using these strategies in order:
 Stash_Group_ADVE_Movie_Plugin/
 ├── Stash_Group_ADVE_Movie_Plugin.yml   ← Plugin manifest
 ├── checker.py                          ← Backend: scraper + GraphQL + matching
-├── config.json                         ← Your settings (URL, API key, cookie)
+├── config.json                         ← Your settings (AdultDVDEmpire session cookie)
 ├── requirements.txt                    ← Python dependencies
 ├── panel.js                            ← Frontend UI injected into Group pages
 ├── results/                            ← Auto-created; persisted result JSON files

plugins/Stash_Group_ADVE_Movie_Plugin/Stash_Group_ADVE_Movie_Plugin.yml

@@ -1,6 +1,6 @@
 name: "Stash Group ADVE Movie Checker"
 description: "Compares scenes in a Stash Group against AdultDVDEmpire. Requires an ADVE URL in the Group's URL list."
-version: "0.8.0"
+version: "1.0.0"
 
 ui:
   javascript:

plugins/Stash_Group_ADVE_Movie_Plugin/checker.py

@@ -18,6 +18,8 @@
 import hashlib
 import requests
 from typing import Optional
+
+from stashapi.stashapp import StashInterface
 try:
     from bs4 import BeautifulSoup
 except ImportError:
@@ -84,8 +86,6 @@ def progress(pct: float):
     except Exception as _e:
         log.warning(f"Could not read config.json: {_e}")
 
-STASH_URL           = os.getenv("STASH_URL")           or _config.get("stash_url",           "http://localhost:9999")
-STASH_API_KEY       = os.getenv("STASH_API_KEY")       or _config.get("stash_api_key",       "")
 ADVE_SESSION_COOKIE = os.getenv("ADVE_SESSION_COOKIE") or _config.get("adve_session_cookie", "")
 
 HEADERS = {
@@ -104,21 +104,7 @@ def progress(pct: float):
 # STASH GRAPHQL
 # ─────────────────────────────────────────────
 
-def stash_gql(query: str, variables: dict = None) -> dict:
-    headers = {"Content-Type": "application/json"}
-    if STASH_API_KEY:
-        headers["ApiKey"] = STASH_API_KEY
-    resp = requests.post(
-        f"{STASH_URL}/graphql",
-        json={"query": query, "variables": variables or {}},
-        headers=headers,
-        timeout=15,
-    )
-    resp.raise_for_status()
-    return resp.json().get("data", {})
-
-
-def get_group(group_id: str) -> dict:
+def get_group(stash: StashInterface, group_id: str) -> dict:
     query = """
     query FindGroup($id: ID!) {
       findGroup(id: $id) {
@@ -134,10 +120,11 @@ def get_group(group_id: str) -> dict:
       }
     }
     """
-    return stash_gql(query, {"id": group_id}).get("findGroup")
+    result = stash.call_GQL(query, {"id": group_id})
+    return result.get("findGroup")
 
 
-def get_all_groups() -> list:
+def get_all_groups(stash: StashInterface) -> list:
     query = """
     query AllGroups($filter: FindFilterType, $group_filter: GroupFilterType) {
       findGroups(filter: $filter, group_filter: $group_filter) {
@@ -147,15 +134,16 @@ def get_all_groups() -> list:
     """
     # per_page: -1 returns all records; group_filter restricts to groups
     # whose URL list contains an adultdvdempire.com URL.
-    return stash_gql(query, {
+    result = stash.call_GQL(query, {
         "filter": {"per_page": -1},
         "group_filter": {
             "url": {
                 "value": "adultdvdempire.com",
                 "modifier": "INCLUDES",
             }
         },
-    }).get("findGroups", {}).get("groups", [])
+    })
+    return result.get("findGroups", {}).get("groups", [])
 
 
 # ─────────────────────────────────────────────
@@ -418,8 +406,8 @@ def match_scene(adve_scene: dict, stash_scenes: list) -> Optional[dict]:
     return None
 
 
-def build_comparison(group_id: str) -> dict:
-    group = get_group(group_id)
+def build_comparison(stash: StashInterface, group_id: str) -> dict:
+    group = get_group(stash, group_id)
     if not group:
         return {"error": f"Group {group_id} not found in Stash."}
 
@@ -473,32 +461,31 @@ def main():
         sys.exit(1)
 
 def _run():
-    raw = sys.stdin.read().strip()
-    try:
-        plugin_input = json.loads(raw) if raw else {}
-    except json.JSONDecodeError:
-        plugin_input = {}
+    json_input = json.loads(sys.stdin.read())
 
     if ADVE_SESSION_COOKIE:
         log.info("Session cookie loaded from config.json")
     else:
         log.warning("No session cookie found in config.json or environment")
 
-    args = plugin_input.get("args", {})
+    server_connection = json_input["server_connection"]
+    stash = StashInterface(server_connection)
+
+    args = json_input.get("args", {})
     mode = args.get("mode", "check_group")
 
     if mode == "check_group":
         group_id = args.get("group_id")
         if not group_id:
             result = {"error": "group_id is required"}
         else:
-            result = build_comparison(group_id)
+            result = build_comparison(stash, group_id)
             # Write to result file so JS can poll for it
             write_result(group_id, result)
         print(json.dumps(result))
 
     elif mode == "scrape_all":
-        groups = get_all_groups()
+        groups = get_all_groups(stash)
         total = len(groups)
         summary = []
         log.info(f"Scraping {total} groups with ADVE URLs...")
@@ -508,7 +495,7 @@ def _run():
         for idx, g in enumerate(groups, start=1):
             if find_adve_url(g.get("urls", [])):
                 log.info(f"[{idx}/{total}] {g['name']}")
-                result = build_comparison(g["id"])
+                result = build_comparison(stash, g["id"])
                 write_result(g["id"], result)
                 summary.append({
                     "group_id": g["id"],

plugins/Stash_Group_ADVE_Movie_Plugin/config.json

@@ -1,5 +1,3 @@
 {
-  "stash_url": "http://localhost:9999",
-  "stash_api_key": "",
   "adve_session_cookie": "ageConfirmed=true; defaults={}; etoken=PASTE_YOUR_ETOKEN_HERE"
 }

plugins/Stash_Group_ADVE_Movie_Plugin/manifest

@@ -2,8 +2,8 @@ id: Stash_Group_ADVE_Movie_Plugin
 name: Stash Group ADVE Movie Plugin
 metadata:
   description: Compares scenes in a Stash Group against AdultDVDEmpire. Requires an ADVE URL in the Group's URL list.
-version: 0.8.0
-date: "2026-03-22 00:42:09"
+version: 1.0.0
+date: "2026-04-03 12:22:00"
 requires: []
 source_repository: https://lurking987.github.io/stash-plugins/main/index.yml
 files:
@@ -12,3 +12,4 @@ files:
 - README.md
 - panel.js
 - checker.py
+- requirements.txt

plugins/Stash_Group_ADVE_Movie_Plugin/requirements.txt

@@ -0,0 +1,3 @@
+stashapp-tools
+requests
+beautifulsoup4