Merge branch 'main' into fix-graphql

Author: donlothario

plugins/TPDBMarkers/TPDBMarkers.yml

@@ -18,8 +18,8 @@ settings:
     displayName: Disable the Scene Markers hook
     type: BOOLEAN
   createMovieFromScene:
-    displayName: Create Movie from scene
-    description: If there is a Movie linked to the scene in the timestamp.trade database automatically create a movie in stash with that info
+    displayName: Create Group from scene
+    description: If there is a Group linked to the scene in the timestamp.trade database automatically create a group in stash with that info
     type: BOOLEAN
   runOnScenesWithMarkers:
     displayName: Run on scenes that already have markers.

plugins/TPDBMarkers/tpdbMarkers.py

@@ -25,8 +25,7 @@ def processScene(scene):
     getTag("[TPDBMarker]")
     for sid in scene["stash_ids"]:
         if sid["endpoint"] == TPDB_ENDPOINT:
-            log.debug("Scene has a TPDB stash id, looking up %s " %
-                      (sid["stash_id"],))
+            log.debug("Scene has a TPDB stash id, looking up %s " % (sid["stash_id"],))
             res = request_s.get(
                 "https://api.theporndb.net/scenes/%s" % (sid["stash_id"],)
             )
@@ -56,23 +55,19 @@ def processScene(scene):
                         log.info("Saving markers")
                         if settings["overwriteMarkers"]:
                             stash.destroy_scene_markers(scene["id"])
-                            mp.import_scene_markers(
-                                stash, markers, scene["id"], 15)
+                            mp.import_scene_markers(stash, markers, scene["id"], 15)
                         elif (len(scene["scene_markers"]) == 0 or settings["mergeMarkers"]):
-                            mp.import_scene_markers(
-                                stash, markers, scene["id"], 15)
-                    # skip if there is already a movie linked
-                    if settings["createMovieFromScene"] and len(scene.get("movies", [])) == 0:
-                        movies = []
-                        for m in data["movies"]:
-                            movie = processMovie(m)
-                            if movie:
-                                movies.append(
-                                    {"movie_id": movie["id"], "scene_index": None})
-                        log.debug(movies)
-                        if len(movies) > 0:
-                            stash.update_scene(
-                                {'id': scene["id"], "movies": movies})
+                            mp.import_scene_markers(stash, markers, scene["id"], 15)
+                    # skip if there is already a group linked
+                    if settings["createMovieFromScene"] and len(scene.get("groups", [])) == 0:
+                        groups=[]
+                        for g in data["groups"]:
+                            group=processGroup(g)
+                            if group:
+                                groups.append({"group_id": group["id"],"scene_index":None})
+                        log.debug(groups)
+                        if len(groups) > 0:
+                           stash.update_scene({'id':scene["id"],"groups":groups})
             else:
                 log.error('bad response from tpdb: %s' % (res.status_code,))
 
@@ -81,8 +76,7 @@ def processScene(scene):
 
 def processAll():
     log.info("Getting scene count")
-    skip_sync_tag_id = stash.find_tag(
-        "[TPDB: Skip Marker]", create=True).get("id")
+    skip_sync_tag_id = stash.find_tag("[TPDB: Skip Marker]", create=True).get("id")
     f = {
         "stash_id_endpoint": {
             "endpoint": TPDB_ENDPOINT,
@@ -133,45 +127,48 @@ def processAll():
             log.progress((i / count))
             time.sleep(1)
 
-
-def processMovie(m):
-    log.debug(m)
-    log.debug(m.keys())
-    # check if the movie exists with the url, then match to the scene
-    sm = stash.find_groups(
-        f={
-            "url": {
-                "modifier": "EQUALS",
-                "value": m["url"],
-            }
+def processGroup(g):
+    log.debug(g)
+    log.debug(g.keys())
+    # check if the group exists with the url, then match to the scene
+    sg = stash.find_groups(
+      f={
+        "url": {
+          "modifier": "EQUALS",
+          "value": g["url"],
         }
+      }
     )
-    log.debug("sm: %s" % (sm,))
-    if len(sm) > 0:
-        return sm[0]
-    # find the movie by name
-    sm = stash.find_groups(q=m['title'])
-    for mov in sm:
-        if mov['name'] == m['title']:
-            return mov
-
-    # just create the movie with the details from tpdb
-    new_movie = {
-        'name': m['title'],
-        'date': m['date'],
-        'synopsis': m['description'],
-        'front_image': m['image'],
-        'back_image': m['back_image'],
-        'urls': [m['url']],
+    log.debug("sg: %s" % (sg,))
+    if len(sg) >0:
+        return sg[0]
+    # find the group by name
+    sg=stash.find_groups(q=g['title'])
+    for grp in sg:
+        if grp['name']==g['title']:
+          return grp
+
+
+    # just create the group with the details from tpdb
+    new_group={
+       'name': g['title'],
+       'date': g['date'],
+       'synopsis': g['description'],
+       'front_image': g['image'],
+       'back_image': g['back_image'],
+       'urls': [g['url']],
     }
-    if m['site']:
-        studio = stash.find_studio(m['site'], create=True)
+    if g['site']:
+        studio=stash.find_studio(g['site'],create=True)
         if studio:
-            new_movie['studio_id'] = studio['id']
+            new_group['studio_id']=studio['id']
+
+    grp=stash.create_group(new_group)
+    log.debug(grp)
+    return grp
+
+
 
-    mov = stash.create_movie(new_movie)
-    log.debug(mov)
-    return mov
 
 
 json_input = json.loads(sys.stdin.read())
@@ -182,7 +179,7 @@ def processMovie(m):
 config = stash.get_configuration()["plugins"]
 settings = {
     "disableSceneMarkerHook": False,
-    "createMovieFromScene": True,
+    "createMovieFromScene":True,
     "addTPDBMarkerTag": False,
     "addTPDBMarkerTitle": False,
     "runOnScenesWithMarkers": False,
@@ -215,8 +212,7 @@ def processMovie(m):
         _id = json_input["args"]["hookContext"]["id"]
         _type = json_input["args"]["hookContext"]["type"]
         if _type == "Scene.Update.Post" and not settings["disableSceneMarkerHook"]:
-            stash.run_plugin_task("TPDBMarkers", "Sync",
-                                  args={"scene_id": _id})
+            stash.run_plugin_task("TPDBMarkers", "Sync", args={"scene_id": _id})
 #          scene = stash.find_scene(_id)
 #            processScene(scene)