From c846a61fb394a7d0bb306b08757ea6588ffc124a Mon Sep 17 00:00:00 2001 From: Diego Heras Date: Sun, 10 May 2020 23:19:20 +0200 Subject: [PATCH] core: validate yaml definitions (yamllint part 4 #8575) (#8595) --- src/Jackett.Common/Definitions/32pages.yml | 6 +++--- src/Jackett.Common/Definitions/academictorrents.yml | 2 +- src/Jackett.Common/Definitions/anirena.yml | 2 +- src/Jackett.Common/Definitions/beyond-hd-oneurl.yml | 2 +- src/Jackett.Common/Definitions/bibliotik.yml | 4 ++-- src/Jackett.Common/Definitions/concen.yml | 4 ++-- src/Jackett.Common/Definitions/crazyhd.yml | 2 +- src/Jackett.Common/Definitions/eniahd.yml | 2 +- src/Jackett.Common/Definitions/losslessclub.yml | 2 +- src/Jackett.Common/Definitions/metal-iplay-ro.yml | 4 ++-- src/Jackett.Common/Definitions/mvgroupforum.yml | 2 +- src/Jackett.Common/Definitions/mvgroupmain.yml | 2 +- src/Jackett.Common/Definitions/myspleen.yml | 2 +- .../Definitions/onlineselfeducation.yml | 2 +- src/Jackett.Common/Definitions/p2pelite.yml | 4 ++-- src/Jackett.Common/Definitions/shellife.yml | 2 -- src/Jackett.Common/Definitions/snowpt.yml | 2 +- src/Jackett.Common/Definitions/sukebeinyaasi.yml | 2 +- src/Jackett.Common/Definitions/tasmanit.yml | 4 ++-- src/Jackett.Common/Definitions/tekno3d.yml | 2 +- src/Jackett.Common/Definitions/theplace.yml | 2 +- src/Jackett.Common/Definitions/tribalmixes.yml | 2 +- src/Jackett.Common/Definitions/twilightszoom.yml | 4 ++-- src/Jackett.Common/Definitions/wihd.yml | 12 ++++++------ 24 files changed, 36 insertions(+), 38 deletions(-) diff --git a/src/Jackett.Common/Definitions/32pages.yml b/src/Jackett.Common/Definitions/32pages.yml index bc3d0bd82..075be33f2 100644 --- a/src/Jackett.Common/Definitions/32pages.yml +++ b/src/Jackett.Common/Definitions/32pages.yml @@ -97,7 +97,7 @@ search: selector: table#torrent_table > tbody > tr[class^="torrent"] fields: - _grouptitle: + _grouptitle: selector: a[href^="torrents.php?id="] _language: selector: img[class^="flag"] @@ -112,7 +112,7 @@ search: args: ["/ /","/"] #removes slash left after freeleech images - name: append args: "{{if .Result._language}} [{{.Result._language}}]{{else}}{{end}}" - category: + category: text: Comics details: selector: a[title="View Torrent"] @@ -134,7 +134,7 @@ search: selector: td[headers="browse_time"] > span[title] attribute: title filters: - - name: dateparse + - name: dateparse args: "Apr 04 2020, 16:24" downloadvolumefactor: case: diff --git a/src/Jackett.Common/Definitions/academictorrents.yml b/src/Jackett.Common/Definitions/academictorrents.yml index c8d2de0f1..6d3e6f199 100644 --- a/src/Jackett.Common/Definitions/academictorrents.yml +++ b/src/Jackett.Common/Definitions/academictorrents.yml @@ -47,7 +47,7 @@ search: search: "{{ .Keywords }}" sort_field: "{{ .Config.sort }}" sort_dir: "{{ .Config.type }}" - + rows: selector: table.table> tbody > tr:has(a[href^="/browse.php?cat="]) filters: diff --git a/src/Jackett.Common/Definitions/anirena.yml b/src/Jackett.Common/Definitions/anirena.yml index 62377aa7a..992e682f2 100644 --- a/src/Jackett.Common/Definitions/anirena.yml +++ b/src/Jackett.Common/Definitions/anirena.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 links: - https://www.anirena.com/ - + settings: [] caps: diff --git a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml index f46eaf827..c2cb47374 100644 --- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml +++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml @@ -41,7 +41,7 @@ caps: login: method: oneurl - inputs: + inputs: oneurl: "{{ .Config.oneurl }}" test: path: torrents diff --git a/src/Jackett.Common/Definitions/bibliotik.yml b/src/Jackett.Common/Definitions/bibliotik.yml index 9e8d63f0c..48c16ab60 100644 --- a/src/Jackett.Common/Definitions/bibliotik.yml +++ b/src/Jackett.Common/Definitions/bibliotik.yml @@ -88,7 +88,7 @@ search: div[title="Magazines"]: 7 _year: selector: .torYear - optional: true + optional: true _filetype: selector: .torFormat optional: true @@ -132,7 +132,7 @@ search: grabs: text: 0 grabs: - optional: true + optional: true selector: .snatches downloadvolumefactor: case: diff --git a/src/Jackett.Common/Definitions/concen.yml b/src/Jackett.Common/Definitions/concen.yml index bb3b18b59..ebb1f5866 100644 --- a/src/Jackett.Common/Definitions/concen.yml +++ b/src/Jackett.Common/Definitions/concen.yml @@ -73,9 +73,9 @@ search: seeders: selector: td.views-field-seeds leechers: - selector: td.views-field-peers + selector: td.views-field-peers grabs: - selector: td.views-field-completed + selector: td.views-field-completed downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/crazyhd.yml b/src/Jackett.Common/Definitions/crazyhd.yml index 0204c5a9c..550bb241f 100644 --- a/src/Jackett.Common/Definitions/crazyhd.yml +++ b/src/Jackett.Common/Definitions/crazyhd.yml @@ -58,7 +58,7 @@ caps: - {id: 47, cat: Movies, desc: "Movies Indian Bangla"} - {id: 46, cat: Movies, desc: "Movies Eid Natok"} - {id: 67, cat: Audio, desc: "Radio program"} - # Anime Anime + # Anime Anime - {id: 36, cat: TV/Anime, desc: "Anime Cartoons"} - {id: 40, cat: TV/Anime, desc: "Anime Subbed"} - {id: 51, cat: TV/Anime, desc: "Anime Dubbed"} diff --git a/src/Jackett.Common/Definitions/eniahd.yml b/src/Jackett.Common/Definitions/eniahd.yml index d0e5eeb94..12e3a1538 100644 --- a/src/Jackett.Common/Definitions/eniahd.yml +++ b/src/Jackett.Common/Definitions/eniahd.yml @@ -160,7 +160,7 @@ search: attribute: href magnet: optional: true - selector: a[href^="magnet:?xt="] + selector: a[href^="magnet:?xt="] attribute: href category: selector: a.gen diff --git a/src/Jackett.Common/Definitions/losslessclub.yml b/src/Jackett.Common/Definitions/losslessclub.yml index 1eb905717..80a090306 100644 --- a/src/Jackett.Common/Definitions/losslessclub.yml +++ b/src/Jackett.Common/Definitions/losslessclub.yml @@ -27,7 +27,7 @@ login: test: path: browse.php selector: span.bar_user_welcome - + search: paths: - path: browse.php diff --git a/src/Jackett.Common/Definitions/metal-iplay-ro.yml b/src/Jackett.Common/Definitions/metal-iplay-ro.yml index 27f2c9f8f..1c15cf9cf 100644 --- a/src/Jackett.Common/Definitions/metal-iplay-ro.yml +++ b/src/Jackett.Common/Definitions/metal-iplay-ro.yml @@ -103,9 +103,9 @@ search: args: '([\d]+) times' category: text: "Music" - downloadvolumefactor: + downloadvolumefactor: case: - img[src$="pic/freedownload.gif"]: "0" + img[src$="pic/freedownload.gif"]: "0" img[src$="pic/half.gif"]: "0.5" "*": "1" uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/mvgroupforum.yml b/src/Jackett.Common/Definitions/mvgroupforum.yml index 1d5abf015..4207176a1 100644 --- a/src/Jackett.Common/Definitions/mvgroupforum.yml +++ b/src/Jackett.Common/Definitions/mvgroupforum.yml @@ -147,7 +147,7 @@ search: filter: "{{ if .Config.hidef }}hd+{{else}}{{end}}{{ .Keywords }}" orderby: "{{ .Config.sort }}" order: "{{ .Config.type }}" - keywordsfilters: + keywordsfilters: - name: re_replace args: ["S01E01", "{{ if .Config.stripS01E01 }}{{else}}S01E01{{end}}"] # optionally remove S01E01 from search diff --git a/src/Jackett.Common/Definitions/mvgroupmain.yml b/src/Jackett.Common/Definitions/mvgroupmain.yml index c790cfb2d..20e663b49 100644 --- a/src/Jackett.Common/Definitions/mvgroupmain.yml +++ b/src/Jackett.Common/Definitions/mvgroupmain.yml @@ -147,7 +147,7 @@ search: filter: "{{ if .Config.hidef }}hd+{{else}}{{end}}{{ .Keywords }}" orderby: "{{ .Config.sort }}" order: "{{ .Config.type }}" - keywordsfilters: + keywordsfilters: - name: re_replace args: ["S01E01", "{{ if .Config.stripS01E01 }}{{else}}S01E01{{end}}"] # optionally remove S01E01 from search diff --git a/src/Jackett.Common/Definitions/myspleen.yml b/src/Jackett.Common/Definitions/myspleen.yml index 3ff6c5a68..e1e59d322 100644 --- a/src/Jackett.Common/Definitions/myspleen.yml +++ b/src/Jackett.Common/Definitions/myspleen.yml @@ -65,7 +65,7 @@ search: args: cat details: selector: td.tor-name > a - attribute: href + attribute: href download: selector: td.tor-down > a attribute: href diff --git a/src/Jackett.Common/Definitions/onlineselfeducation.yml b/src/Jackett.Common/Definitions/onlineselfeducation.yml index d399a66ed..ee22220f5 100644 --- a/src/Jackett.Common/Definitions/onlineselfeducation.yml +++ b/src/Jackett.Common/Definitions/onlineselfeducation.yml @@ -101,7 +101,7 @@ login: test: path: index.php selector: a[href*="/logout.php?hash_insert="] - + search: paths: # https://onlineselfeducation.com/browse.php?c9=1&c10=1&c11=1&search=&searchin=title&incldead=1 diff --git a/src/Jackett.Common/Definitions/p2pelite.yml b/src/Jackett.Common/Definitions/p2pelite.yml index 0ed8645e6..6d80848bb 100644 --- a/src/Jackett.Common/Definitions/p2pelite.yml +++ b/src/Jackett.Common/Definitions/p2pelite.yml @@ -92,7 +92,7 @@ login: test: path: index.php selector: a[href^="./logout.php"] - + search: paths: - path: browse.php @@ -125,7 +125,7 @@ search: attribute: href download: selector: a[href^="download.php?torrent="] - attribute: href + attribute: href banner: selector: a[href^="details.php?id="] attribute: onmouseover diff --git a/src/Jackett.Common/Definitions/shellife.yml b/src/Jackett.Common/Definitions/shellife.yml index 64ac6fcd8..f378a0eac 100644 --- a/src/Jackett.Common/Definitions/shellife.yml +++ b/src/Jackett.Common/Definitions/shellife.yml @@ -79,5 +79,3 @@ search: args: "-" - name: trim args: " " - - diff --git a/src/Jackett.Common/Definitions/snowpt.yml b/src/Jackett.Common/Definitions/snowpt.yml index ef2330761..374add8fe 100644 --- a/src/Jackett.Common/Definitions/snowpt.yml +++ b/src/Jackett.Common/Definitions/snowpt.yml @@ -55,7 +55,7 @@ search: attribute: title details: selector: a[href^="/forum.php?mod=viewthread&tid="] - attribute: href + attribute: href download: selector: a[href^="/download.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/sukebeinyaasi.yml b/src/Jackett.Common/Definitions/sukebeinyaasi.yml index 8a39213a7..f125c5256 100644 --- a/src/Jackett.Common/Definitions/sukebeinyaasi.yml +++ b/src/Jackett.Common/Definitions/sukebeinyaasi.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 links: - https://sukebei.nyaa.si/ - + settings: - name: cat-id type: select diff --git a/src/Jackett.Common/Definitions/tasmanit.yml b/src/Jackett.Common/Definitions/tasmanit.yml index 7a7c9e11f..642b8c965 100644 --- a/src/Jackett.Common/Definitions/tasmanit.yml +++ b/src/Jackett.Common/Definitions/tasmanit.yml @@ -72,7 +72,7 @@ search: keywords: "{{ .Keywords }}" search_type: t_name include_dead_torrents: yes - keywordsfilters: + keywordsfilters: - name: re_replace args: ["[^a-zA-Z0-9]+", "%"] @@ -93,7 +93,7 @@ search: args: category details: selector: a[href^="https://tasmanit.es/details.php?id="] - attribute: href + attribute: href download: selector: a[href^="https://tasmanit.es/details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/tekno3d.yml b/src/Jackett.Common/Definitions/tekno3d.yml index e9ac186a8..99b32d597 100644 --- a/src/Jackett.Common/Definitions/tekno3d.yml +++ b/src/Jackett.Common/Definitions/tekno3d.yml @@ -77,7 +77,7 @@ login: search: paths: - - path: browse.php + - path: browse.php inputs: $raw: "{{range .Categories}}c{{.}}=1&{{end}}" search: "{{ .Keywords }}" diff --git a/src/Jackett.Common/Definitions/theplace.yml b/src/Jackett.Common/Definitions/theplace.yml index ee4175a61..43dc9046c 100644 --- a/src/Jackett.Common/Definitions/theplace.yml +++ b/src/Jackett.Common/Definitions/theplace.yml @@ -63,7 +63,7 @@ login: - selector: table:contains("Login failed!") test: path: main.php - + search: paths: - path: browse.php diff --git a/src/Jackett.Common/Definitions/tribalmixes.yml b/src/Jackett.Common/Definitions/tribalmixes.yml index b830448ab..f115fcdf4 100644 --- a/src/Jackett.Common/Definitions/tribalmixes.yml +++ b/src/Jackett.Common/Definitions/tribalmixes.yml @@ -72,7 +72,7 @@ login: test: path: / selector: a[href="/logout.php"] - + search: paths: - path: browse.php diff --git a/src/Jackett.Common/Definitions/twilightszoom.yml b/src/Jackett.Common/Definitions/twilightszoom.yml index c73aae26a..b1ebf913b 100644 --- a/src/Jackett.Common/Definitions/twilightszoom.yml +++ b/src/Jackett.Common/Definitions/twilightszoom.yml @@ -120,7 +120,7 @@ login: test: path: index.php selector: a[href^="./logout.php"] - + search: paths: - path: browse.php @@ -153,7 +153,7 @@ search: attribute: href download: selector: a[href^="download.php?torrent="] - attribute: href + attribute: href banner: selector: a[href^="details.php?id="] attribute: onmouseover diff --git a/src/Jackett.Common/Definitions/wihd.yml b/src/Jackett.Common/Definitions/wihd.yml index 117f8c47b..64c7f748e 100644 --- a/src/Jackett.Common/Definitions/wihd.yml +++ b/src/Jackett.Common/Definitions/wihd.yml @@ -101,21 +101,21 @@ search: ":contains(\"Films\"):contains(\"Bluray 4K\")": "59e67c0ed5b6a3e689dd1e1f" ":contains(\"Films\"):contains(\"Bluray\")": "565af82b1fd35761568b4578" ":contains(\"Films\"):contains(\"WEB-DL\")": "5a64af02ee30983a7e596aed" - + ":contains(\"Séries\"):contains(\"1080p\")": "565af82d1fd35761568b4587" ":contains(\"Séries\"):contains(\"720p\")": "565af82d1fd35761568b4589" ":contains(\"Séries\"):contains(\"HDTV\")": "565af82d1fd35761568b458b" ":contains(\"Séries\"):contains(\"Bluray Remux\")": "565af82d1fd35761568b458f" ":contains(\"Séries\"):contains(\"Bluray 3D\")": "565af82d1fd35761568b4591" ":contains(\"Séries\"):contains(\"Bluray\")": "565af82d1fd35761568b458d" - + ":contains(\"Animations\"):contains(\"1080p\")": "565af82d1fd35761568b459c" ":contains(\"Animations\"):contains(\"720p\")": "565af82d1fd35761568b459e" ":contains(\"Animations\"):contains(\"HDTV\")": "565af82d1fd35761568b45a0" ":contains(\"Animations\"):contains(\"Bluray Remux\")": "565af82d1fd35761568b45a4" ":contains(\"Animations\"):contains(\"Bluray 3D\")": "565af82d1fd35761568b45a6" ":contains(\"Animations\"):contains(\"Bluray\")": "565af82d1fd35761568b45a2" - + ":contains(\"Divers\"):contains(\"Logiciels\")": "565af82d1fd35761568b45af" ":contains(\"Divers\"):contains(\"Clips\")": "565af82d1fd35761568b45b1" ":contains(\"Divers\"):contains(\"Pistes audios\")": "565af82d1fd35761568b45b3" @@ -136,21 +136,21 @@ search: ":contains(\"Films\"):contains(\"Bluray 4K\")": "40GB" ":contains(\"Films\"):contains(\"Bluray\")": "20GB" ":contains(\"Films\"):contains(\"WEB-DL\")": "5GB" - + ":contains(\"Séries\"):contains(\"1080p\")": "3GB" ":contains(\"Séries\"):contains(\"720p\")": "2GB" ":contains(\"Séries\"):contains(\"HDTV\")": "1GB" ":contains(\"Séries\"):contains(\"Bluray Remux\")": "20GB" ":contains(\"Séries\"):contains(\"Bluray 3D\")": "20GB" ":contains(\"Séries\"):contains(\"Bluray\")": "20GB" - + ":contains(\"Animations\"):contains(\"1080p\")": "3GB" ":contains(\"Animations\"):contains(\"720p\")": "2GB" ":contains(\"Animations\"):contains(\"HDTV\")": "1GB" ":contains(\"Animations\"):contains(\"Bluray Remux\")": "20GB" ":contains(\"Animations\"):contains(\"Bluray 3D\")": "20GB" ":contains(\"Animations\"):contains(\"Bluray\")": "20GB" - + ":contains(\"Divers\"):contains(\"Logiciels\")": "0" ":contains(\"Divers\"):contains(\"Clips\")": "1GB" ":contains(\"Divers\"):contains(\"Pistes audios\")": "1GB"