diff --git a/README.md b/README.md index 1101b8af5..565a4ef81 100644 --- a/README.md +++ b/README.md @@ -264,7 +264,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * Trezzor * TV Chaos UK * TV-Vault - * u-Torrent + * u-torrents (SceneFZ) * UHDBits * Ultimate Gamer Club * ULTRAHDCLUB diff --git a/src/Jackett.Common/Definitions/utorrents.yml b/src/Jackett.Common/Definitions/utorrents.yml index c7c68e432..5c4a1a6ad 100644 --- a/src/Jackett.Common/Definitions/utorrents.yml +++ b/src/Jackett.Common/Definitions/utorrents.yml @@ -1,4 +1,5 @@ ---- +# removal pending (It's now the same as sceneFZ?) +--- site: utorrents name: u-Torrent description: "U-Torrents.ro (UTT) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL" @@ -10,121 +11,94 @@ caps: categorymappings: - - {id: 48, cat: Movies/3D, desc: "3D"} - - {id: 1, cat: PC/0day, desc: "Appz"} - - {id: 3, cat: Other, desc: "Cartoons"} - - {id: 42, cat: TV/Documentary, desc: "Documentaries"} - - {id: 6, cat: Books, desc: "eBooks"} - - {id: 11, cat: PC/Games, desc: "Games | PC"} - - {id: 12, cat: Console/PS3, desc: "Games | PS2"} - - {id: 36, cat: Console/PS3, desc: "Games | PS3"} - - {id: 40, cat: Console/PSP, desc: "Games | PSP"} - - {id: 25, cat: Console/Wii, desc: "Games | Wii"} - - {id: 16, cat: Console/Xbox, desc: "Games | XBOX"} - - {id: 19, cat: PC/Phone-Other, desc: "Mobile"} - - {id: 43, cat: Movies/BluRay, desc: "Movies | Blu-Ray"} - - {id: 49, cat: Movies/BluRay, desc: "Movies | Blu-Ray-RO"} - - {id: 7, cat: Movies/DVD, desc: "Movies | DVD-R"} - - {id: 2, cat: Movies/DVD, desc: "Movies | DVD-RO"} - - {id: 17, cat: Movies/HD, desc: "Movies | HD"} - - {id: 45, cat: Movies/HD, desc: "Movies | HD-RO"} - - {id: 21, cat: Movies, desc: "Movies | Oldies"} - - {id: 38, cat: Movies, desc: "Movies | Packs"} - - {id: 8, cat: Movies/SD, desc: "Movies | x264"} - - {id: 4, cat: Movies/SD, desc: "Movies | x264-RO"} - - {id: 10, cat: Movies/SD, desc: "Movies | XviD"} - - {id: 44, cat: Movies/SD, desc: "Movies | XviD-RO"} - - {id: 5, cat: Audio/MP3, desc: "Music | Mp3"} - - {id: 39, cat: Audio, desc: "Music | Packs"} - - {id: 23, cat: Audio/Video, desc: "Music | Videos"} - - {id: 18, cat: Other, desc: "Pictures"} - - {id: 46, cat: XXX/Imageset, desc: "Pictures | xxx"} - - {id: 22, cat: TV/Sport, desc: "Sport"} - - {id: 50, cat: TV, desc: "STAR"} - - {id: 20, cat: TV/SD, desc: "TV | Episodes"} - - {id: 47, cat: TV/HD, desc: "TV | Episodes HD"} - - {id: 41, cat: TV, desc: "TV | Packs"} - - {id: 15, cat: XXX, desc: "xXx"} + - {id: 1, cat: TV/Anime, desc: "Anime / Hentai"} + - {id: 49, cat: Other, desc: "Diverse"} + - {id: 43, cat: Books, desc: "Documents"} + - {id: 35, cat: Console, desc: "Games: Console"} + - {id: 30, cat: PC/Games, desc: "Games: PC-ISO"} + - {id: 13, cat: TV/HD, desc: "HDTV Episodes"} + - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro"} + - {id: 44, cat: Other, desc: "Images"} + - {id: 45, cat: PC/0day, desc: "Linux"} + - {id: 15, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 61, cat: Movies/3D, desc: "Movies: 3D"} + - {id: 62, cat: Movies/3D, desc: "Movies: 3D Ro"} + - {id: 67, cat: Movies/UHD, desc: "Movies: 4K-RO(2160p)"} + - {id: 65, cat: Movies/UHD, desc: "Movies: 4K(2160p)"} + - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay"} + - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro"} + - {id: 9, cat: Movies/DVD, desc: "Movies: DVD"} + - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro"} + - {id: 11, cat: Movies/HD, desc: "Movies: HD"} + - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro"} + - {id: 24, cat: Movies/SD, desc: "Movies: SD"} + - {id: 25, cat: Movies/SD, desc: "Movies: SD-Ro"} + - {id: 27, cat: XXX, desc: "Movies: XXX"} + - {id: 28, cat: Audio/Other, desc: "Music"} + - {id: 64, cat: Audio/Lossless, desc: "Music FLAC"} + - {id: 29, cat: Audio/Video, desc: "Music Video"} + - {id: 26, cat: PC/0day, desc: "Software"} + - {id: 22, cat: TV/Sport, desc: "Sports"} + - {id: 20, cat: TV/SD, desc: "TV Episodes"} + - {id: 21, cat: TV/SD, desc: "TV Episodes-Ro"} modes: search: [q] - tv-search: [q, season, ep] login: - path: /takelogin.php - method: post + path: /login.php + method: form + form: form inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" + "username": "{{ .Config.username }}" + "password": "{{ .Config.password }}" error: - - selector: td.embedded:has(h2:contains("failed")) + - selector: div.alert-danger test: - path: /browse.php - - ratio: - path: /browse.php - selector: font:contains("Ratio:") > span + path: /torrents search: paths: - - path: /browse.php + - path: /torrents inputs: - $raw: "{{range .Categories}}c{{.}}=1&{{end}}" - search: "{{ .Query.Keywords }}" - incldead: 1 + q: "{{ .Keywords }}" + searchin: 0 + cat: 0 + dead: 1 + rows: - selector: td.outer > table > tbody > tr:has(a[href^="details.php?id="]) + selector: table#minions > tbody > tr fields: title: - selector: a[href^="details.php?id="] + selector: a[href^="/details.php?id="] details: - selector: a[href^="details.php?id="] + selector: a[href^="/details.php?id="] + attribute: href + download: + selector: td:nth-child(3) > a attribute: href category: - selector: a[href^="browse.php?cat="] + selector: td:nth-child(1) > a attribute: href filters: - name: querystring args: cat - download: - selector: a[href^="download2.php"] - attribute: href + date: + selector: td:nth-child(5) + size: + selector: td:nth-child(6) grabs: selector: td:nth-child(7) filters: - name: regexp - args: (\d+) - files: - selector: td:nth-child(3) - size: - selector: td:nth-child(6) - date: - selector: td:nth-child(5) - filters: - - name: trim - args: "\xF0" - - name: append - args: " +02:00" - - name: dateparse - args: "02-01-200615:04:05 -07:00" + args: ([\d,]+) seeders: selector: td:nth-child(8) leechers: selector: td:nth-child(9) - banner: - selector: a[onmouseover][href^="details.php?id="] - attribute: onmouseover - filters: - - name: regexp - args: src=([^\s]+) downloadvolumefactor: case: - button.btnfree: "0" + "img[title=\"FreeLeech\"]": "0" "*": "1" uploadvolumefactor: - case: - button.btn2xup: "2" - "*": "1" - description: - selector: td:nth-child(2) - remove: a[href^="details.php?id="] + text: "1" diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 657592f7d..a03407fec 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -198,6 +198,7 @@ namespace Jackett.Updater "Definitions/torrentvault.yml", "Definitions/apollo.yml", // migrated to C# gazelle base tracker "Definitions/secretcinema.yml", // migrated to C# gazelle base tracker + "Definitions/utorrents.yml", // same as SzeneFZ now }; foreach (var oldFIle in oldFiles)