From b8e2dd378b4b1c7d26c81265ed3ceb7e820f673a Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sun, 24 Oct 2021 11:11:54 +1300 Subject: [PATCH] assorted: conform to yaml standards by avoiding duplicate keys #11917 --- src/Jackett.Common/Definitions/jptv.yml | 4 ++-- src/Jackett.Common/Definitions/r3vwtf.yml | 6 +++-- .../Definitions/racing4everyone.yml | 2 +- src/Jackett.Common/Definitions/redbits.yml | 8 ++++--- .../Definitions/redstartorrent.yml | 3 +-- src/Jackett.Common/Definitions/renegade.yml | 1 + src/Jackett.Common/Definitions/rintornet.yml | 7 ++++-- src/Jackett.Common/Definitions/rockbox.yml | 6 +++-- src/Jackett.Common/Definitions/rus-media.yml | 24 ++++++++++--------- src/Jackett.Common/Definitions/rutor.yml | 11 +-------- 10 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/Jackett.Common/Definitions/jptv.yml b/src/Jackett.Common/Definitions/jptv.yml index 7dacb0338..833f9bd66 100644 --- a/src/Jackett.Common/Definitions/jptv.yml +++ b/src/Jackett.Common/Definitions/jptv.yml @@ -11,7 +11,7 @@ links: caps: categorymappings: - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV"} + - {id: 2, cat: TV, desc: "TV Shows"} - {id: 6, cat: TV, desc: "TS Firehose (RAW TS)"} - {id: 7, cat: Movies/Other, desc: "Anime Movies"} - {id: 9, cat: TV/Anime, desc: "Anime Series"} @@ -127,7 +127,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/r3vwtf.yml b/src/Jackett.Common/Definitions/r3vwtf.yml index 271f78914..74a7f3257 100644 --- a/src/Jackett.Common/Definitions/r3vwtf.yml +++ b/src/Jackett.Common/Definitions/r3vwtf.yml @@ -96,7 +96,7 @@ search: args: "src=\\\\'(.+?)\\\\'" files: selector: td:nth-last-child(8) - date: + date_year: # Jul 4 2019 08:04 AM selector: td:nth-last-child(6):not(:contains("day")) optional: true @@ -105,11 +105,13 @@ search: args: " -07:00" # PDT - name: dateparse args: "Jan 2 2006 03:04 PM -07:00" - date: + date_day: # Today 02:40 PM # Yesterday 09:10 AM selector: td:nth-last-child(6):contains("day") optional: true + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" size: selector: td:nth-last-child(5) grabs: diff --git a/src/Jackett.Common/Definitions/racing4everyone.yml b/src/Jackett.Common/Definitions/racing4everyone.yml index 6dd250e3a..823da4759 100644 --- a/src/Jackett.Common/Definitions/racing4everyone.yml +++ b/src/Jackett.Common/Definitions/racing4everyone.yml @@ -143,7 +143,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href date: diff --git a/src/Jackett.Common/Definitions/redbits.yml b/src/Jackett.Common/Definitions/redbits.yml index 26a5ac817..94a9277d5 100644 --- a/src/Jackett.Common/Definitions/redbits.yml +++ b/src/Jackett.Common/Definitions/redbits.yml @@ -101,7 +101,7 @@ search: filters: - name: regexp args: "/categories/(\\d+)" - title: + title_vose: selector: a.view-torrent:contains("VOSE") optional: true filters: @@ -117,7 +117,7 @@ search: args: [" ", " "] - name: re_replace args: ["(?i)T(\\d{1,2})\\b", "S$1"] - title: + title_notvose: selector: a.view-torrent:not(:contains("VOSE")) optional: true filters: @@ -133,6 +133,8 @@ search: args: [" ", " "] - name: re_replace args: ["(?i)T(\\d{1,2})\\b", "S$1"] + title: + text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}" download: selector: a[href*="/download/"] attribute: href @@ -155,7 +157,7 @@ search: selector: td:nth-last-child(2) grabs: selector: td:nth-last-child(1) - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/redstartorrent.yml b/src/Jackett.Common/Definitions/redstartorrent.yml index e0b99de71..c01f58d4f 100644 --- a/src/Jackett.Common/Definitions/redstartorrent.yml +++ b/src/Jackett.Common/Definitions/redstartorrent.yml @@ -82,7 +82,6 @@ search: selector: a[href^="/download.php/"] attribute: href description: - optional: true selector: img[src="/pic/pl.gif"] attribute: src filters: @@ -90,7 +89,7 @@ search: args: "Language: polish\n
" - name: prepend args: "{{ .Result.description }}" - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] date: selector: td:nth-child(5) diff --git a/src/Jackett.Common/Definitions/renegade.yml b/src/Jackett.Common/Definitions/renegade.yml index 52731b30d..b972d3636 100644 --- a/src/Jackett.Common/Definitions/renegade.yml +++ b/src/Jackett.Common/Definitions/renegade.yml @@ -9,6 +9,7 @@ links: - https://renegade-tracker.com/ caps: + # dont forget to update the search fields category case block categorymappings: - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Eng"} - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Hun"} diff --git a/src/Jackett.Common/Definitions/rintornet.yml b/src/Jackett.Common/Definitions/rintornet.yml index 340a38aa9..0deee9a76 100644 --- a/src/Jackett.Common/Definitions/rintornet.yml +++ b/src/Jackett.Common/Definitions/rintornet.yml @@ -9,6 +9,7 @@ links: - https://www.rintor.net/ caps: + # dont forget to update the search fields category case block categorymappings: - {id: 27, cat: XXX, desc: "Фильмы 2160 4K | Movies 2160p 4K"} - {id: 20, cat: XXX, desc: "Сайтрипы 2160 4K | Porn Video 2160p 4K"} @@ -94,7 +95,7 @@ search: poster: selector: div.entry_content a.entry__content-image img attribute: src - date: + date_day: selector: span.entry__date:contains("Вчера"), span.entry__date:contains("Сегодня") optional: true filters: @@ -103,7 +104,7 @@ search: - name: replace args: ["Сегодня", "Today"] - name: fuzzytime - date: + date_year: selector: span.entry__date:contains("-") optional: true filters: @@ -111,6 +112,8 @@ search: args: " +03:00" # MSK - name: dateparse args: "2-01-2006, 15:04 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" size: text: "1 GB" seeders: diff --git a/src/Jackett.Common/Definitions/rockbox.yml b/src/Jackett.Common/Definitions/rockbox.yml index 7fb6afd83..dcea646a1 100644 --- a/src/Jackett.Common/Definitions/rockbox.yml +++ b/src/Jackett.Common/Definitions/rockbox.yml @@ -80,7 +80,7 @@ search: selector: td a[href^="download.php?id="] attribute: href # dates come in two flavours: - date: + date_year: # 13/10/2018 selector: td:nth-child(6):contains("/") optional: true @@ -89,12 +89,14 @@ search: args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "02/01/2006 -07:00" - date: + date_ago: # 1 hour ago, 2 days ago, 3 weeks ago etc selector: td:nth-child(6):not(:contains("/")) optional: true filters: - name: timeago + date: + text: "{{ if or .Result.date_year .Result.date_ago }}{{ or .Result.date_year .Result.date_ago }}{{ else }}now{{ end }}" size: selector: td:nth-child(7) seeders: diff --git a/src/Jackett.Common/Definitions/rus-media.yml b/src/Jackett.Common/Definitions/rus-media.yml index 7de1b17c4..e2a99cd44 100644 --- a/src/Jackett.Common/Definitions/rus-media.yml +++ b/src/Jackett.Common/Definitions/rus-media.yml @@ -333,9 +333,7 @@ search: download: selector: a.topictitle attribute: href - size: - text: "0 B" - size: + size_optional: selector: td:nth-of-type(5) p:not(:empty) optional: true filters: @@ -347,17 +345,19 @@ search: args: ["МБ", "MB"] - name: replace args: ["КБ", "KB"] - seeders: - text: 0 - seeders: + size: + text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}" + seeders_optional: selector: span.seed optional: true - leechers: - text: 0 - leechers: + seeders: + text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}" + leechers_optional: selector: span.leech optional: true - date: + leechers: + text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}" + date_day: # Сегодня, 03:04 # Вчера, 22:47 selector: td:nth-of-type(6) p:nth-of-type(1):contains("Сегодня"), td:nth-of-type(6) p:contains("Вчера") @@ -367,7 +367,7 @@ search: args: ["Сегодня", "Today"] - name: replace args: ["Вчера", "Yesterday"] - date: + date_year: # 12 янв 2019, 12:47 selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера")) optional: true @@ -403,6 +403,8 @@ search: args: " +03:00" # MSK - name: dateparse args: "02 Jan 2006 15:04 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/rutor.yml b/src/Jackett.Common/Definitions/rutor.yml index b52ba6dbc..2b6839b85 100644 --- a/src/Jackett.Common/Definitions/rutor.yml +++ b/src/Jackett.Common/Definitions/rutor.yml @@ -128,16 +128,7 @@ search: # some results don't have comments which throws off td count. So we go fishing for the following fields size: optional: true - selector: td:contains(\00a0GB) - size: - optional: true - selector: td:contains(\00a0MB) - size: - optional: true - selector: td:contains(\00a0kB) - size: - optional: true - selector: td:contains(\00a0B) + selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B) seeders: selector: td span.green leechers: