Skip to content

Fix skipping of scenes with markers and skip tag #506

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −23
Open

Fix skipping of scenes with markers and skip tag #506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions plugins/TPDBMarkers/tpdbMarkers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@
request_s = requests.Session()

TPDB_ENDPOINT = "https://theporndb.net/graphql"
SKIP_TAG = "[TPDB: Skip Marker]"

def processScene(scene):
has_markers = len(scene["scene_markers"]) > 0
has_skip_tag = any([t["name"] == SKIP_TAG for t in scene["tags"]])
if has_markers or has_skip_tag:
log.debug(f"Skipping. has_markers: {has_markers}, has_skip_tag: {has_skip_tag}")
return

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"],))
Expand Down Expand Up @@ -55,22 +62,21 @@ def processScene(scene):

def processAll():
log.info("Getting scene count")
skip_sync_tag_id = stash.find_tag("[TPDB: Skip Marker]", create=True).get("id")
count = stash.find_scenes(
f={
"stash_id_endpoint": {
"endpoint": TPDB_ENDPOINT,
"modifier": "NOT_NULL",
"stash_id": "",
},
"has_markers": "false",
"tags": {
"depth": 0,
"excludes": [skip_sync_tag_id],
"modifier": "INCLUDES_ALL",
"value": [],
},
skip_sync_tag_id = stash.find_tag(SKIP_TAG, create=True).get("id")
scene_filter = {
"stash_id_endpoint": {
"endpoint": TPDB_ENDPOINT,
"modifier": "NOT_NULL",
"stash_id": "",
},
"has_markers": "false",
"tags": {
"value": skip_sync_tag_id,
"modifier": "EXCLUDES",
},
}
count = stash.find_scenes(
f=scene_filter,
filter={"per_page": 1},
get_count=True,
)[0]
Expand All @@ -86,14 +92,7 @@ def processAll():
)
)
scenes = stash.find_scenes(
f={
"stash_id_endpoint": {
"endpoint": TPDB_ENDPOINT,
"modifier": "NOT_NULL",
"stash_id": "",
},
"has_markers": "false",
},
f=scene_filter,
filter={"page": r, "per_page": per_page},
)
for s in scenes:
Expand Down