From 4489421af46ba369a31bff275efb5b6c27aac67d Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Fri, 5 Jan 2024 10:26:00 +1300 Subject: [PATCH] infire: login and search updates row cat id no longer available, resorting to text match new row selector validate genre as the list is full of rubbish new freeleech, size and date selectors --- src/Jackett.Common/Definitions/infire.yml | 158 +++++++++++++++------- 1 file changed, 111 insertions(+), 47 deletions(-) diff --git a/src/Jackett.Common/Definitions/infire.yml b/src/Jackett.Common/Definitions/infire.yml index 5d27d190d..f12b68f4d 100644 --- a/src/Jackett.Common/Definitions/infire.yml +++ b/src/Jackett.Common/Definitions/infire.yml @@ -11,24 +11,24 @@ links: caps: categorymappings: # Filmi - - {id: 14, cat: Movies/SD, desc: "Filmi XviD"} - - {id: 15, cat: Movies/HD, desc: "Filmi HD 720p"} - - {id: 16, cat: Movies/HD, desc: "Filmi HD 1080p"} - - {id: 20, cat: Movies/WEB-DL, desc: "Filmi WEB/Rip"} - - {id: 21, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 720p"} - - {id: 49, cat: Movies/UHD, desc: "Filmi HD 2160p"} - - {id: 50, cat: Movies/HD, desc: "Filmi BluRay 1080p"} - - {id: 51, cat: Movies/HD, desc: "Filmi 720p H265"} - - {id: 52, cat: Movies/HD, desc: "Filmi 1080p H265"} - - {id: 55, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 1080p"} - - {id: 71, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 2160p"} - - {id: 72, cat: Movies/HD, desc: "Filmi BluRay 720p"} - - {id: 73, cat: Movies/HD, desc: "Filmi BluRay Remux"} - - {id: 74, cat: Movies/UHD, desc: "Filmi UHD Remux"} - - {id: 77, cat: Movies/HD, desc: "Filmi DrSi"} - - {id: 97, cat: Movies/UHD, desc: "Filmi BluRay 2160p"} - - {id: 99, cat: Movies/HD, desc: "Filmi BRRip 720p"} - - {id: 100, cat: Movies/HD, desc: "Filmi BRRip 1080p"} + - {id: 14, cat: Movies/SD, desc: "XviD"} + - {id: 15, cat: Movies/HD, desc: "HD 720p"} + - {id: 16, cat: Movies/HD, desc: "HD 1080p"} + - {id: 20, cat: Movies/WEB-DL, desc: "WEB/Rip"} + - {id: 21, cat: Movies/WEB-DL, desc: "WEB-DL 720p"} + - {id: 49, cat: Movies/UHD, desc: "HD 2160p"} + - {id: 50, cat: Movies/HD, desc: "BluRay 1080p"} + - {id: 51, cat: Movies/HD, desc: "720p H265"} + - {id: 52, cat: Movies/HD, desc: "1080p H265"} + - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL 1080p"} + - {id: 71, cat: Movies/WEB-DL, desc: "WEB-DL 2160p"} + - {id: 72, cat: Movies/HD, desc: "BluRay 720p"} + - {id: 73, cat: Movies/HD, desc: "BluRay Remux"} + - {id: 74, cat: Movies/UHD, desc: "UHD Remux"} + - {id: 77, cat: Movies/HD, desc: "DrSi"} + - {id: 97, cat: Movies/UHD, desc: "BluRay 2160p"} + - {id: 99, cat: Movies/HD, desc: "BRRip 720p"} + - {id: 100, cat: Movies/HD, desc: "BRRip 1080p"} # TV - {id: 23, cat: TV, desc: "TV"} - {id: 24, cat: TV/HD, desc: "TV HDTV 720p"} @@ -45,27 +45,27 @@ caps: - {id: 56, cat: TV/Anime, desc: "Anime"} - {id: 93, cat: Movies/Other, desc: "SLOSiNH"} # Igre - - {id: 29, cat: PC/Games, desc: "Igre PC ISO"} - - {id: 30, cat: Console/Wii, desc: "Igre Nintendo"} - - {id: 31, cat: Console/PS3, desc: "Igre Playstation"} - - {id: 34, cat: Console/XBox One, desc: "Igre Xbox"} - - {id: 83, cat: PC/Games, desc: "Igre Repack"} + - {id: 29, cat: PC/Games, desc: "PC ISO"} + - {id: 30, cat: Console/Wii, desc: "Nintendo"} + - {id: 31, cat: Console/PS3, desc: "Playstation"} + - {id: 34, cat: Console/XBox One, desc: "Xbox"} + - {id: 83, cat: PC/Games, desc: "Repack"} # Glasba - {id: 42, cat: Audio/Video, desc: "Music DVD"} - - {id: 43, cat: Audio/Video, desc: "Glasba Videospoti"} + - {id: 43, cat: Audio/Video, desc: "Videospoti"} - {id: 53, cat: Audio/MP3, desc: "Glasba MP3"} - {id: 54, cat: Audio/Lossless, desc: "Glasba FLAC"} - {id: 62, cat: Audio/Video, desc: "Koncerti"} # Sport - {id: 37, cat: TV/Sport, desc: "Sport"} # XXX - - {id: 60, cat: XXX/Other, desc: "XXX Revije"} - - {id: 61, cat: XXX/Pack, desc: "XXX Packs"} - - {id: 66, cat: XXX/SD, desc: "XXX 480p"} - - {id: 67, cat: XXX/x264, desc: "XXX 720p"} - - {id: 68, cat: XXX/x264, desc: "XXX 1080p"} - - {id: 69, cat: XXX/UHD, desc: "XXX 2160p"} - - {id: 84, cat: XXX/ImageSet, desc: "XXX Slike"} + - {id: 60, cat: XXX/Other, desc: "Revije"} + - {id: 61, cat: XXX/Pack, desc: "Packs"} + - {id: 66, cat: XXX/SD, desc: "480p"} + - {id: 67, cat: XXX/x264, desc: "720p"} + - {id: 68, cat: XXX/x264, desc: "1080p"} + - {id: 69, cat: XXX/UHD, desc: "2160p"} + - {id: 84, cat: XXX/ImageSet, desc: "Slike"} # Disc - {id: 85, cat: Movies/DVD, desc: "DVD 5"} - {id: 86, cat: Movies/DVD, desc: "DVD 9"} @@ -130,10 +130,6 @@ login: uid: "{{ .Config.username }}" pwd: "{{ .Config.password }}" login: "Prijavi se" - selectorinputs: - csrf_token: - selector: input[name="csrf_token"] - attribute: value error: - selector: font[color="#FF0000"] test: @@ -154,15 +150,78 @@ search: by: "{{ .Config.type }}" rows: - selector: table.lista > tbody > tr.a + selector: table.mg-b-0 > tbody > tr fields: category: - selector: a[href^="torrents.php?category="] - attribute: href - filters: - - name: querystring - args: category + selector: span:has(i.fa-compact-disc) + case: + ":contains(\"TV HDTV 720p\")": 24 + ":contains(\"TV HDTV 1080p\")": 75 + ":contains(\"TV WEB/Rip\")": 76 + ":contains(\"TV WEB-DL 720p\")": 78 + ":contains(\"TV WEB-DL 1080p\")": 79 + ":contains(\"TV WEB-DL 2160p\")": 80 + ":contains(\"TV BluRay 720p\")": 81 + ":contains(\"TV BluRay 1080p\")": 82 + ":contains(\"TV BluRay 2160p\")": 98 + ":contains(\"XviD\")": 14 + ":contains(\"HD 720p\")": 15 + ":contains(\"HD 1080p\")": 16 + ":contains(\"WEB/Rip\")": 20 + ":contains(\"WEB-DL 720p\")": 21 + ":contains(\"HD 2160p\")": 49 + ":contains(\"BluRay 1080p\")": 50 + ":contains(\"720p H265\")": 51 + ":contains(\"1080p H265\")": 52 + ":contains(\"WEB-DL 1080p\")": 55 + ":contains(\"WEB-DL 2160p\")": 71 + ":contains(\"BluRay 720p\")": 72 + ":contains(\"BluRay Remux\")": 73 + ":contains(\"UHD Remux\")": 74 + ":contains(\"DrSi\")": 77 + ":contains(\"BluRay 2160p\")": 97 + ":contains(\"BRRip 720p\")": 99 + ":contains(\"BRRip 1080p\")": 100 + ":contains(\"TV\")": 23 + ":contains(\"Animirano\")": 26 + ":contains(\"Anime\")": 56 + ":contains(\"SLOSiNH\")": 93 + ":contains(\"PC ISO\")": 29 + ":contains(\"Nintendo\")": 30 + ":contains(\"Playstation\")": 31 + ":contains(\"Xbox\")": 34 + ":contains(\"Repack\")": 83 + ":contains(\"Music DVD\")": 42 + ":contains(\"Videospoti\")": 43 + ":contains(\"Glasba MP3\")": 53 + ":contains(\"Glasba FLAC\")": 54 + ":contains(\"Koncerti\")": 62 + ":contains(\"Sport\")": 37 + ":contains(\"Revije\")": 60 + ":contains(\"Packs\")": 61 + ":contains(\"480p\")": 66 + ":contains(\"720p\")": 67 + ":contains(\"1080p\")": 68 + ":contains(\"2160p\")": 69 +# ":contains(\"Slike\")": 84 + ":contains(\"DVD 5\")": 85 + ":contains(\"DVD 9\")": 86 + ":contains(\"BD 25\")": 87 + ":contains(\"BD 50\")": 88 + ":contains(\"UHD 50\")": 89 + ":contains(\"UHD 66\")": 90 + ":contains(\"UHD 100\")": 91 + ":contains(\"Programi\")": 38 + ":contains(\"eKnjige\")": 39 + ":contains(\"Slike\")": 40 + ":contains(\"AudioBook\")": 41 + ":contains(\"Android\")": 44 + ":contains(\"iOS\")": 45 + ":contains(\"Mac\")": 46 + ":contains(\"Linux\")": 47 + ":contains(\"Dokumentarni Film\")": 95 + ":contains(\"Dokumentarna Serija\")": 96 title: selector: a[href^="details.php?id="] details: @@ -175,9 +234,9 @@ search: selector: img attribute: src size: - selector: td:nth-child(7) + selector: td:nth-child(8) date: - selector: td:nth-child(6) + selector: td:nth-child(7) # auto adjusted by site account profile filters: - name: dateparse @@ -189,13 +248,18 @@ search: grabs: selector: td:nth-child(11) genre: - selector: td:nth-child(2) span + selector: td:nth-child(2) > span:nth-child(5) + filters: + - name: re_replace + args: ["(?i)(Znanstvena fantastika)", "Znanstvena_fantastika"] + - name: validate + args: "Akcija, Animirani, Animacija, Avantura, Biografski, Dokumentarni, Drама, Družinski, Fantastika, Fantazija, Glasbeni, Grozljivka, Комеdija, Kratek, Kriminalka, Кriminalni, Misterij, Mladinski, Potovanje, Pustolovski, Romantika, Sport, Sci-Fi, Тriler, Vojni, Western, Zgodovinski, Znanstvena_fantastika" description: text: "{{ .Result.genre }}" downloadvolumefactor: case: - img[src="images/gold.png"]: 0 - img[src="images/silver.png"]: 0.5 + "span:contains(\"100% Freeleech\")": 0 + "span:contains(\"50% Freeleech\")": 0.5 "*": 1 uploadvolumefactor: text: 1 @@ -204,4 +268,4 @@ search: minimumseedtime: # 30 hours (as seconds = 30 x 60 x 60) text: 108000 -# BtiTracker 1.5.8 +# Engine n/a