diff --git a/src/Jackett.Common/Definitions/3evils.yml b/src/Jackett.Common/Definitions/3evils.yml index eff8404d9..801b09aff 100644 --- a/src/Jackett.Common/Definitions/3evils.yml +++ b/src/Jackett.Common/Definitions/3evils.yml @@ -10,12 +10,24 @@ caps: categorymappings: - - {id: 2, cat: Console, desc: "Games"} - - {id: 3, cat: Movies, desc: "Movies"} - - {id: 4, cat: Audio, desc: "Music"} - - {id: 9, cat: TV/Anime, desc: " Anime"} - - {id: 17, cat: TV, desc: " TV"} - - {id: 18, cat: PC, desc: "Appz"} + - {id: 65, cat: Books, desc: "Books"} + - {id: 27, cat: Console/NDS, desc: "Games/Nintendo-DS"} + - {id: 28, cat: Console/Other, desc: "Games/Switch"} + - {id: 42, cat: PC/Phone-Android, desc: "Mobile/Android"} + - {id: 44, cat: Movies/UHD, desc: "Movies/4K"} + - {id: 13, cat: Movies/BluRay, desc: "Movies/Bluray"} + - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"} + - {id: 14, cat: Movies, desc: "Movies/Packs"} + - {id: 67, cat: Movies/HD, desc: "Movies/x264"} + - {id: 55, cat: Movies/HD, desc: "Movies/X265"} + - {id: 45, cat: Movies, desc: "Movies/Remux"} + - {id: 62, cat: Audio, desc: "Music/Audio"} + - {id: 32, cat: Audio, desc: "Music/Packs"} + - {id: 6, cat: TV, desc: "TV/Packs"} + - {id: 3, cat: TV/HD, desc: "TV/x264"} + - {id: 4, cat: TV/HD, desc: "TV/x265"} + - {id: 8, cat: TV/SD, desc: "TV/Xvid"} + - {id: 63, cat: PC/0day, desc: "Windows/Applications"} modes: search: [q] @@ -80,31 +92,35 @@ size: selector: td:nth-last-child(6) files: - selector: td:nth-last-child(9) + selector: a[href^="filelist.php?id="] grabs: - selector: td:nth-last-child(5) + selector: a[href^="snatches.php?id="] filters: - - name: replace - args: ["Times", ""] + - name: regexp + args: "(\\d+)" # 2 flavours of dates date: - # Today
10:20 AM - # Yesterday
08:03 PM + # Today
10:20 AM + # Yesterday
08:03 PM optional: true selector: td:nth-last-child(7):contains("day") date: - # Feb 14 2019
10:20 AM + # Feb 14 2019
10:20 AM optional: true selector: td:nth-last-child(7):not(:contains("day")) filters: - - name: regex # drop break in between date and time - args: ["(.+?)<[^>]*>(.+?)","$1 $2"] - name: dateparse args: "Jan 2 2006 03:04 pm" seeders: - selector: td:nth-last-child(4) + text: "0" + seeders: + optional: true + selector: a[href$="#seeders"] leechers: - selector: td:nth-last-child(3) + text: "0" + leechers: + optional: true + selector: a[href$="#leechers"] downloadvolumefactor: case: "b:contains(\"[FREE]\")": "0"