') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); tagScenesWithPerfTags: Fix "Exclude Tags set to Ignore auto tag" no longer working by RubyDevil · Pull Request #764 · stashapp/CommunityScripts · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions plugins/tagScenesWithPerfTags/tagScenesWithPerfTags.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ def processAll():
performers = stash.find_performers(
f=query,
filter={"page": page, "per_page": PERFORMER_PAGE_SIZE},
fragment="id name tags { id name }"
fragment="id name tags { id name ignore_auto_tag }"
)

if not performers:
Expand All@@ -54,6 +54,8 @@ def processAll():
performer_tags_names = set()

for tag in perf["tags"]:
if settings["excludeTagWithIgnoreAutoTag"] and tag["ignore_auto_tag"]:
continue
performer_tags_ids.add(tag["id"])
performer_tags_names.add(tag["name"])

Expand DownExpand Up@@ -112,7 +114,10 @@ def processScene(scene: dict):

perf_tag_ids = set()
for perf in scene.get("performers", []):
perf_tag_ids.update(map(lambda tag: tag["id"], perf.get("tags", [])))
for tag in perf.get("tags", []):
if settings["excludeTagWithIgnoreAutoTag"] and tag["ignore_auto_tag"]:
continue
perf_tag_ids.add(tag["id"])

# Skip if no performer tags
if not perf_tag_ids:
Expand DownExpand Up@@ -142,7 +147,8 @@ def processScene(scene: dict):

settings = {
"excludeSceneWithTag": "",
"excludeSceneOrganized": False
"excludeSceneOrganized": False,
"excludeTagWithIgnoreAutoTag": False
}
if "tagScenesWithPerfTags" in config["plugins"]:
settings.update(config["plugins"]["tagScenesWithPerfTags"])
Expand All@@ -161,6 +167,6 @@ def processScene(scene: dict):
and len(json_input["args"]["hookContext"]["inputFields"]) > 1
):
# Enforce explicit studio object allocation inside our graphQL post-hook criteria
scene = stash.find_scene(id, fragment="id organized tags { id name } performers { id tags { id } }")
scene = stash.find_scene(id, fragment="id organized tags { id name } performers { id tags { id ignore_auto_tag } }")
if scene:
processScene(scene)
2 changes: 1 addition & 1 deletion plugins/tagScenesWithPerfTags/tagScenesWithPerfTags.yml
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
name: Tag Scenes From Performer Tags
description: Tags scenes with performer tags.
version: 1.0.2
version: 1.0.3
url: https://discourse.stashapp.cc/t/tag-scenes-from-performer-tags/1413
exec:
- python
Expand Down
Loading