From 0067c614e4efabb3df03740a7b41537f9fe1d132 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 14 Dec 2023 05:30:11 +1300 Subject: [PATCH] assorted luminance: add verified/unverified to descr also add doubleseed ULVF and drop rows without DL (these would have a torrent-has-issues warning) --- src/Jackett.Common/Definitions/cathoderaytube.yml | 6 +++++- src/Jackett.Common/Definitions/crt2fa.yml | 6 +++++- src/Jackett.Common/Definitions/empornium.yml | 14 ++++++++++---- src/Jackett.Common/Definitions/empornium2fa.yml | 14 ++++++++++---- src/Jackett.Common/Definitions/enthralled.yml | 13 +++++++++++-- src/Jackett.Common/Definitions/enthralled2fa.yml | 13 +++++++++++-- src/Jackett.Common/Definitions/femdomcult.yml | 8 +++++--- src/Jackett.Common/Definitions/happyfappy.yml | 13 ++++++++++--- src/Jackett.Common/Definitions/kufirc.yml | 13 ++++++++++--- src/Jackett.Common/Definitions/pixelcove.yml | 13 ++++++++++--- src/Jackett.Common/Definitions/pixelcove2fa.yml | 14 ++++++++++---- 11 files changed, 97 insertions(+), 30 deletions(-) diff --git a/src/Jackett.Common/Definitions/cathoderaytube.yml b/src/Jackett.Common/Definitions/cathoderaytube.yml index 88dafac34..0b75bbe85 100644 --- a/src/Jackett.Common/Definitions/cathoderaytube.yml +++ b/src/Jackett.Common/Definitions/cathoderaytube.yml @@ -125,8 +125,12 @@ search: filters: - name: validate args: "Action, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, SciFi, Soap, Talk, Thriller, War, Western" - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: diff --git a/src/Jackett.Common/Definitions/crt2fa.yml b/src/Jackett.Common/Definitions/crt2fa.yml index 33dd5ca82..f35de9269 100644 --- a/src/Jackett.Common/Definitions/crt2fa.yml +++ b/src/Jackett.Common/Definitions/crt2fa.yml @@ -115,8 +115,12 @@ search: filters: - name: validate args: "Action, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, SciFi, Soap, Talk, Thriller, War, Western" - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: diff --git a/src/Jackett.Common/Definitions/empornium.yml b/src/Jackett.Common/Definitions/empornium.yml index 5630e3368..4f7001181 100644 --- a/src/Jackett.Common/Definitions/empornium.yml +++ b/src/Jackett.Common/Definitions/empornium.yml @@ -106,15 +106,18 @@ search: taglist: "" rows: - # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: download: selector: a[href^="/torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" title: selector: a[href^="/torrents.php?id="] category: @@ -158,7 +161,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # Luminance diff --git a/src/Jackett.Common/Definitions/empornium2fa.yml b/src/Jackett.Common/Definitions/empornium2fa.yml index 7c5ef05b9..c34cfc05c 100644 --- a/src/Jackett.Common/Definitions/empornium2fa.yml +++ b/src/Jackett.Common/Definitions/empornium2fa.yml @@ -101,15 +101,18 @@ search: taglist: "" rows: - # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: download: selector: a[href^="/torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" title: selector: a[href^="/torrents.php?id="] category: @@ -153,7 +156,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # Luminance diff --git a/src/Jackett.Common/Definitions/enthralled.yml b/src/Jackett.Common/Definitions/enthralled.yml index e372e891c..da2ee58e9 100644 --- a/src/Jackett.Common/Definitions/enthralled.yml +++ b/src/Jackett.Common/Definitions/enthralled.yml @@ -76,7 +76,7 @@ search: filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: category: @@ -93,6 +93,12 @@ search: download: selector: a[href^="/torrents.php?action=download&id="] attribute: href + description_tags: + selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: @@ -125,7 +131,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 description: diff --git a/src/Jackett.Common/Definitions/enthralled2fa.yml b/src/Jackett.Common/Definitions/enthralled2fa.yml index 9b4bd21ae..81d0fc07a 100644 --- a/src/Jackett.Common/Definitions/enthralled2fa.yml +++ b/src/Jackett.Common/Definitions/enthralled2fa.yml @@ -71,7 +71,7 @@ search: filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: category: @@ -88,6 +88,12 @@ search: download: selector: a[href^="/torrents.php?action=download&id="] attribute: href + description_tags: + selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: @@ -120,7 +126,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 description: diff --git a/src/Jackett.Common/Definitions/femdomcult.yml b/src/Jackett.Common/Definitions/femdomcult.yml index de2f200c8..8db9d5ce7 100644 --- a/src/Jackett.Common/Definitions/femdomcult.yml +++ b/src/Jackett.Common/Definitions/femdomcult.yml @@ -90,8 +90,7 @@ search: filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: - # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: download: @@ -147,7 +146,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # MR is reduced but not removed if MST is met diff --git a/src/Jackett.Common/Definitions/happyfappy.yml b/src/Jackett.Common/Definitions/happyfappy.yml index 1d6789725..7aa9c9172 100644 --- a/src/Jackett.Common/Definitions/happyfappy.yml +++ b/src/Jackett.Common/Definitions/happyfappy.yml @@ -83,7 +83,7 @@ search: filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}" rows: - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: category: @@ -100,8 +100,12 @@ search: download: selector: a[href^="torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: @@ -134,7 +138,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 minimumseedtime: diff --git a/src/Jackett.Common/Definitions/kufirc.yml b/src/Jackett.Common/Definitions/kufirc.yml index 77b0677f1..f5f1805a6 100644 --- a/src/Jackett.Common/Definitions/kufirc.yml +++ b/src/Jackett.Common/Definitions/kufirc.yml @@ -131,7 +131,7 @@ search: autocomplete_toggle: "" rows: - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: category: @@ -148,8 +148,12 @@ search: download: selector: a[href^="torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" poster: selector: td:nth-child(2) > script filters: @@ -182,7 +186,10 @@ search: "img[alt=\"Freeleech\"]": 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # Luminance diff --git a/src/Jackett.Common/Definitions/pixelcove.yml b/src/Jackett.Common/Definitions/pixelcove.yml index 4a9ca64c1..16a340a88 100644 --- a/src/Jackett.Common/Definitions/pixelcove.yml +++ b/src/Jackett.Common/Definitions/pixelcove.yml @@ -121,14 +121,18 @@ search: rows: # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: download: selector: a[href^="torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" title: selector: a[href^="/torrents.php?id="] category: @@ -183,7 +187,10 @@ search: img[src$="/freedownload.gif"]: 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # luminance diff --git a/src/Jackett.Common/Definitions/pixelcove2fa.yml b/src/Jackett.Common/Definitions/pixelcove2fa.yml index b7287fb74..d229d0b86 100644 --- a/src/Jackett.Common/Definitions/pixelcove2fa.yml +++ b/src/Jackett.Common/Definitions/pixelcove2fa.yml @@ -115,15 +115,18 @@ search: taglist: "" rows: - # exclude redbar torrents - selector: table#torrent_table > tbody > tr[class^="torrent row"] + selector: table#torrent_table > tbody > tr[class^="torrent row"]:has(a[href*="action=download"]) fields: download: selector: a[href^="torrents.php?action=download&id="] attribute: href - description: + description_tags: selector: div.tags + description: + case: + span.icon_okay: "Verified: {{ .Result.description_tags }}" + "*": "Unverified: {{ .Result.description_tags }}" title: selector: a[href^="/torrents.php?id="] category: @@ -178,7 +181,10 @@ search: img[src$="/freedownload.gif"]: 0 "*": 1 uploadvolumefactor: - text: 1 + case: + span.icon[title*="DoubleSeed"]: 2 + "img[alt=\"DoubleSeed\"]": 2 + "*": 1 minimumratio: text: 0.5 # luminance