From 60f666fba2002a943e4c5e699b4876137c9af2c9 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 14 Nov 2022 21:04:52 +1300 Subject: [PATCH] assorted: add requestdelay for multipath queries --- src/Jackett.Common/Definitions/bitbazis.yml | 75 ++++++------- src/Jackett.Common/Definitions/carphunter.yml | 67 ++++++------ src/Jackett.Common/Definitions/haitang.yml | 21 ++-- src/Jackett.Common/Definitions/lastfiles.yml | 87 +++++++-------- .../Definitions/majomparade.yml | 77 ++++++------- src/Jackett.Common/Definitions/mteamtp.yml | 69 ++++++------ src/Jackett.Common/Definitions/mteamtp2fa.yml | 69 ++++++------ src/Jackett.Common/Definitions/pignetwork.yml | 2 + src/Jackett.Common/Definitions/pttime.yml | 55 +++++----- src/Jackett.Common/Definitions/siambit.yml | 101 +++++++++--------- src/Jackett.Common/Definitions/teamctgame.yml | 93 ++++++++-------- src/Jackett.Common/Definitions/torlock.yml | 1 + src/Jackett.Common/Definitions/totheglory.yml | 1 + .../Definitions/totheglorycookie.yml | 1 + 14 files changed, 368 insertions(+), 351 deletions(-) diff --git a/src/Jackett.Common/Definitions/bitbazis.yml b/src/Jackett.Common/Definitions/bitbazis.yml index 3513448ea..b276d2f46 100644 --- a/src/Jackett.Common/Definitions/bitbazis.yml +++ b/src/Jackett.Common/Definitions/bitbazis.yml @@ -5,48 +5,49 @@ description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV" language: hu-HU type: private encoding: UTF-8 +requestDelay: 2 links: - https://bitbazis.net/ caps: categorymappings: - - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun"} - - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng"} - - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun"} - - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng"} - - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"} - - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"} - - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"} - - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"} - - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun"} - - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng"} - - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun"} - - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng"} - - {id: 64, cat: Movies, desc: "Film/Pack"} - - {id: 24, cat: Audio/Video, desc: "Videóklip"} - - {id: 22, cat: TV, desc: "Sorozat/Hun"} - - {id: 58, cat: TV, desc: "Sorozat/Eng"} - - {id: 69, cat: TV/Anime, desc: "Mese/SD"} - - {id: 68, cat: TV/Anime, desc: "Mese/DVD"} - - {id: 91, cat: TV/Anime, desc: "Mese/HD"} - - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"} - - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"} - - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"} - - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"} - - {id: 31, cat: PC/Games, desc: "Játék/PC"} - - {id: 81, cat: PC/0day, desc: "Program/PC"} - - {id: 49, cat: PC/0day, desc: "Program/Rip"} - - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"} - - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"} - - {id: 14, cat: PC, desc: "Program/Egyéb"} - - {id: 65, cat: Other, desc: "Egyéb"} - - {id: 33, cat: XXX/SD, desc: "SD/XXX"} - - {id: 89, cat: XXX/x264, desc: "HD/XXX"} - - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"} + - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun", default: true} + - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng", default: true} + - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun", default: true} + - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng", default: true} + - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true} + - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true} + - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun", default: true} + - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng", default: true} + - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun", default: true} + - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng", default: true} + - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true} + - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true} + - {id: 64, cat: Movies, desc: "Film/Pack", default: true} + - {id: 24, cat: Audio/Video, desc: "Videóklip", default: true} + - {id: 22, cat: TV, desc: "Sorozat/Hun", default: true} + - {id: 58, cat: TV, desc: "Sorozat/Eng", default: true} + - {id: 69, cat: TV/Anime, desc: "Mese/SD", default: true} + - {id: 68, cat: TV/Anime, desc: "Mese/DVD", default: true} + - {id: 91, cat: TV/Anime, desc: "Mese/HD", default: true} + - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun", default: true} + - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng", default: true} + - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun", default: true} + - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng", default: true} + - {id: 31, cat: PC/Games, desc: "Játék/PC", default: true} + - {id: 81, cat: PC/0day, desc: "Program/PC", default: true} + - {id: 49, cat: PC/0day, desc: "Program/Rip", default: true} + - {id: 27, cat: Books/EBook, desc: "Könyv/Hun", default: true} + - {id: 50, cat: Books/EBook, desc: "Könyv/Eng", default: true} + - {id: 14, cat: PC, desc: "Program/Egyéb", default: true} + - {id: 65, cat: Other, desc: "Egyéb", default: true} + - {id: 33, cat: XXX/SD, desc: "SD/XXX", default: false} + - {id: 89, cat: XXX/x264, desc: "HD/XXX", default: false} + - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX", default: false} # the following are no longer in the cat list in the search page, but are still in the profile cat list - - {id: 54, cat: Console, desc: "Játék/Konzol"} - - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil"} - - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"} + - {id: 54, cat: Console, desc: "Játék/Konzol", default: true} + - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil", default: true} + - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true} modes: search: [q] @@ -98,7 +99,7 @@ login: search: paths: - path: browse.php - categories: ["!", 33, 66, 89] + categories: [85, 86, 15, 16, 17, 19, 83, 82, 94, 95, 92, 93, 64, 24, 22, 58, 69, 68, 91, 25, 26, 84, 71, 31, 81, 49, 27, 50, 14, 65, 54, 67, 70] inputs: # 0 all, 1 active, 2 deadonly, 3 myuploads, 4 zeroseed, 6 re-seeded incldead: 0 diff --git a/src/Jackett.Common/Definitions/carphunter.yml b/src/Jackett.Common/Definitions/carphunter.yml index d3f48ace5..f77c523c6 100644 --- a/src/Jackett.Common/Definitions/carphunter.yml +++ b/src/Jackett.Common/Definitions/carphunter.yml @@ -5,42 +5,43 @@ description: "Carp-Hunter is a HUNGARIAN Private Torrent Tracker for MOVIES / TV language: hu-HU type: private encoding: UTF-8 +requestDelay: 2 links: - https://carp-hunter.hu/ caps: categorymappings: - - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng"} - - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"} - - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"} - - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"} - - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"} - - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"} - - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"} - - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun"} - - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng"} - - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun"} - - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng"} - - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun"} - - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny"} - - {id: 19, cat: PC/Games, desc: "Játék/ISO"} - - {id: 20, cat: PC/Games, desc: "Játék/RIP"} - - {id: 24, cat: Other, desc: "Képek"} - - {id: 21, cat: Books, desc: "Könyv/Eng"} - - {id: 22, cat: Books, desc: "Könyv/Hun"} - - {id: 35, cat: TV/Anime, desc: "Mese/Eng"} - - {id: 36, cat: TV/Anime, desc: "Mese/Hun"} - - {id: 25, cat: PC/Mobile-Other, desc: "Mobil"} - - {id: 30, cat: PC/ISO, desc: "Programok/ISO"} - - {id: 31, cat: PC/0day, desc: "Programok/RIP"} - - {id: 33, cat: TV, desc: "Sorozat/Eng"} - - {id: 32, cat: TV, desc: "Sorozat/Hun"} - - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"} - - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"} - - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"} - - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"} - - {id: 34, cat: XXX, desc: "XXX/Filmek"} - - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"} + - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng", default: true} + - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun", default: true} + - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true} + - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true} + - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng", default: true} + - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun", default: true} + - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng", default: true} + - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun", default: true} + - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng", default: true} + - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun", default: true} + - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true} + - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true} + - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny", default: true} + - {id: 19, cat: PC/Games, desc: "Játék/ISO", default: true} + - {id: 20, cat: PC/Games, desc: "Játék/RIP", default: true} + - {id: 24, cat: Other, desc: "Képek", default: true} + - {id: 21, cat: Books, desc: "Könyv/Eng", default: true} + - {id: 22, cat: Books, desc: "Könyv/Hun", default: true} + - {id: 35, cat: TV/Anime, desc: "Mese/Eng", default: true} + - {id: 36, cat: TV/Anime, desc: "Mese/Hun", default: true} + - {id: 25, cat: PC/Mobile-Other, desc: "Mobil", default: true} + - {id: 30, cat: PC/ISO, desc: "Programok/ISO", default: true} + - {id: 31, cat: PC/0day, desc: "Programok/RIP", default: true} + - {id: 33, cat: TV, desc: "Sorozat/Eng", default: true} + - {id: 32, cat: TV, desc: "Sorozat/Hun", default: true} + - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng", default: true} + - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun", default: true} + - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng", default: true} + - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun", default: true} + - {id: 34, cat: XXX, desc: "XXX/Filmek", default: false} + - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek", default: false} modes: search: [q] @@ -88,7 +89,7 @@ login: search: paths: - path: browse.php - categories: ["!", 34, 39] + categories: [1, 2, 8, 7, 16, 15, 14, 13, 4, 3, 18, 17, 23, 19, 20, 24, 21, 22, 35, 36, 25, 30, 31, 33, 32, 29, 28, 27, 26] - path: browse.php categories: [34, 39] inputs: @@ -146,6 +147,8 @@ search: date: selector: td:nth-last-child(8) filters: + - name: regexp + args: (\d{4}-\d{2}-\d{2}.\d{2}:\d{2}:\d{2}) - name: replace args: ["\u00a0", " "] - name: append diff --git a/src/Jackett.Common/Definitions/haitang.yml b/src/Jackett.Common/Definitions/haitang.yml index 3f6f35d56..af523faa5 100644 --- a/src/Jackett.Common/Definitions/haitang.yml +++ b/src/Jackett.Common/Definitions/haitang.yml @@ -5,20 +5,21 @@ description: "海棠PT (Hǎitáng PT) is a CHINESE Private Torrent Tracker for O language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://www.htpt.cc/ caps: categorymappings: - - {id: 1, cat: Audio, desc: "相声 Crosstalk"} - - {id: 4091, cat: Audio, desc: "评书 Storytelling"} - - {id: 4097, cat: Audio, desc: "戏曲 Opera"} - - {id: 4098, cat: Audio, desc: "鼓/琴 Drum / Piano"} - - {id: 4099, cat: Audio, desc: "小曲 Small Song"} - - {id: 4101, cat: Audio, desc: "小品 Sketch"} - - {id: 4104, cat: Audio, desc: "二人转 Duets"} - - {id: 4105, cat: TV, desc: "小剧种 Puppet shows"} - - {id: 4103, cat: Audio/Audiobook, desc: "广播剧 Audiobooks"} + - {id: 1, cat: Audio, desc: "相声 Crosstalk", default: true} + - {id: 4091, cat: Audio, desc: "评书 Storytelling", default: true} + - {id: 4097, cat: Audio, desc: "戏曲 Opera", default: true} + - {id: 4098, cat: Audio, desc: "鼓/琴 Drum / Piano", default: true} + - {id: 4099, cat: Audio, desc: "小曲 Small Song", default: true} + - {id: 4101, cat: Audio, desc: "小品 Sketch", default: true} + - {id: 4104, cat: Audio, desc: "二人转 Duets", default: true} + - {id: 4105, cat: TV, desc: "小剧种 Puppet shows", default: true} + - {id: 4103, cat: Audio/Audiobook, desc: "广播剧 Audiobooks", default: false} modes: search: [q] @@ -77,7 +78,7 @@ login: search: paths: - path: torrents.php - categories: ["!", 4103] + categories: [1, 4091, 4097, 4098, 4099, 4101, 4104, 4105] - path: live.php categories: [4103] inputs: diff --git a/src/Jackett.Common/Definitions/lastfiles.yml b/src/Jackett.Common/Definitions/lastfiles.yml index 32e2a84ee..28cebac30 100644 --- a/src/Jackett.Common/Definitions/lastfiles.yml +++ b/src/Jackett.Common/Definitions/lastfiles.yml @@ -6,6 +6,7 @@ language: ro-RO type: private encoding: utf-8 followredirect: true +requestDelay: 2 links: - https://www.lastfiles.ro/ - http://www.lastfiles.ro/ @@ -17,48 +18,48 @@ legacylinks: caps: categorymappings: - - {id: 31, cat: Movies/UHD, desc: "Movies: 4K"} - - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay"} - - {id: 9, cat: Movies/DVD, desc: "Movies: DVD"} - - {id: 11, cat: Movies/HD, desc: "Movies: HD"} - - {id: 58, cat: Movies/SD, desc: "Movies: Cam"} - - {id: 61, cat: Movies/3D, desc: "Movies: 3D"} - - {id: 24, cat: Movies/SD, desc: "Movies: XVID"} - - {id: 16, cat: Movies, desc: "Movies: Old"} - - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL"} - - {id: 56, cat: TV/Documentary, desc: "Documentary"} - - {id: 18, cat: Movies, desc: "Movies: Pack"} - - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRO"} - - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro"} - - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro"} - - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro"} - - {id: 82, cat: Movies/HD, desc: "Movies: x265"} - - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro"} - - {id: 59, cat: Movies/SD, desc: "Movies: Cam-RO"} - - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro"} - - {id: 17, cat: Movies, desc: "Movies: Old-Ro"} - - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro"} - - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro"} - - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro"} - - {id: 19, cat: Movies, desc: "Movies: Pack-Ro"} - - {id: 20, cat: TV, desc: "TV Episodes"} - - {id: 21, cat: TV, desc: "TV Episodes-Ro"} - - {id: 13, cat: TV/HD, desc: "HDTV Episodes"} - - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro"} - - {id: 28, cat: Audio, desc: "Music"} - - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps"} - - {id: 26, cat: PC/0day, desc: "Software"} - - {id: 30, cat: PC/Games, desc: "Games: PC-ISO"} - - {id: 33, cat: PC/Games, desc: "Games: Packs"} - - {id: 1, cat: TV/Anime, desc: "Movies: Anime"} - - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro"} - - {id: 42, cat: TV/Sport, desc: "Sport"} - - {id: 43, cat: Books, desc: "Documents"} - - {id: 44, cat: Other, desc: "Images"} - - {id: 49, cat: Other, desc: "Diverse"} - - {id: 22, cat: Other, desc: "RoContent"} - - {id: 60, cat: XXX/ImageSet, desc: "Images: XXX"} - - {id: 27, cat: XXX, desc: "Movies: XXX"} + - {id: 31, cat: Movies/UHD, desc: "Movies: 4K", default: true} + - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay", default: true} + - {id: 9, cat: Movies/DVD, desc: "Movies: DVD", default: true} + - {id: 11, cat: Movies/HD, desc: "Movies: HD", default: true} + - {id: 58, cat: Movies/SD, desc: "Movies: Cam", default: true} + - {id: 61, cat: Movies/3D, desc: "Movies: 3D", default: true} + - {id: 24, cat: Movies/SD, desc: "Movies: XVID", default: true} + - {id: 16, cat: Movies, desc: "Movies: Old", default: true} + - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL", default: true} + - {id: 56, cat: TV/Documentary, desc: "Documentary", default: true} + - {id: 18, cat: Movies, desc: "Movies: Pack", default: true} + - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRO", default: true} + - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro", default: true} + - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro", default: true} + - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro", default: true} + - {id: 82, cat: Movies/HD, desc: "Movies: x265", default: true} + - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro", default: true} + - {id: 59, cat: Movies/SD, desc: "Movies: Cam-RO", default: true} + - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro", default: true} + - {id: 17, cat: Movies, desc: "Movies: Old-Ro", default: true} + - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro", default: true} + - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro", default: true} + - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro", default: true} + - {id: 19, cat: Movies, desc: "Movies: Pack-Ro", default: true} + - {id: 20, cat: TV, desc: "TV Episodes", default: true} + - {id: 21, cat: TV, desc: "TV Episodes-Ro", default: true} + - {id: 13, cat: TV/HD, desc: "HDTV Episodes", default: true} + - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro", default: true} + - {id: 28, cat: Audio, desc: "Music", default: true} + - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps", default: true} + - {id: 26, cat: PC/0day, desc: "Software", default: true} + - {id: 30, cat: PC/Games, desc: "Games: PC-ISO", default: true} + - {id: 33, cat: PC/Games, desc: "Games: Packs", default: true} + - {id: 1, cat: TV/Anime, desc: "Movies: Anime", default: true} + - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro", default: true} + - {id: 42, cat: TV/Sport, desc: "Sport", default: true} + - {id: 43, cat: Books, desc: "Documents", default: true} + - {id: 44, cat: Other, desc: "Images", default: true} + - {id: 49, cat: Other, desc: "Diverse", default: true} + - {id: 22, cat: Other, desc: "RoContent", default: true} + - {id: 60, cat: XXX/ImageSet, desc: "Images: XXX", default: false} + - {id: 27, cat: XXX, desc: "Movies: XXX", default: false} modes: search: [q] @@ -118,7 +119,7 @@ login: search: paths: - path: browse.php - categories: ["!", 60, 27] + categories: [31, 5, 9, 11, 58, 61, 24, 16, 54, 56, 18, 32, 6, 12, 81, 82, 10, 59, 25, 17, 55, 57, 62, 19, 20, 21, 13, 14, 28, 51, 26, 30, 33, 1, 2, 42, 43, 44, 49, 22] - path: browseadult.php categories: [60, 27] diff --git a/src/Jackett.Common/Definitions/majomparade.yml b/src/Jackett.Common/Definitions/majomparade.yml index f0876d491..ebf1c8593 100644 --- a/src/Jackett.Common/Definitions/majomparade.yml +++ b/src/Jackett.Common/Definitions/majomparade.yml @@ -5,47 +5,48 @@ description: "Majomparádé (TurkDepo) is a HUNGARIAN Private Torrent Tracker fo language: hu-HU type: private encoding: UTF-8 +requestDelay: 2 links: - https://majomparade.eu/ caps: categorymappings: - - {id: 4, cat: Movies/3D, desc: "3D/Magyar"} - - {id: 5, cat: Movies/3D, desc: "3D/Külföldi"} - - {id: 48, cat: Movies/HD, desc: "Film/BR-BDRIP/Külföldi"} - - {id: 50, cat: Movies/HD, desc: "Film/BR-BDRIP/Magyar"} - - {id: 75, cat: Movies/SD, desc: "Film/Cam/Külföldi"} - - {id: 76, cat: Movies/SD, desc: "Film/Cam/Magyar"} - - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Külföldi"} - - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Magyar"} - - {id: 58, cat: Movies/DVD, desc: "Film/DVD9/Külföld"} - - {id: 59, cat: Movies/DVD, desc: "Film/DVD9/Magyar"} - - {id: 42, cat: Movies/HD, desc: "Film/HD/Külföldi"} - - {id: 51, cat: Movies/HD, desc: "Film/HD/Magyar"} - - {id: 38, cat: Movies/SD, desc: "Film/XviD/Külföldi"} - - {id: 24, cat: Movies/SD, desc: "Film/XviD/Magyar"} - - {id: 85, cat: TV/Sport, desc: "Sport/Külföldi"} - - {id: 87, cat: TV/Sport, desc: "Sport/Magyar"} - - {id: 47, cat: TV/SD, desc: "Sorozat/Külföldi"} - - {id: 36, cat: TV/SD, desc: "Sorozat/Magyar"} - - {id: 6, cat: TV/HD, desc: "Sorozat/HD/Magyar"} - - {id: 7, cat: TV/HD, desc: "Sorozat/HD/Külföldi"} - - {id: 56, cat: Audio/Audiobook, desc: "Hangoskönyv"} - - {id: 33, cat: Books, desc: "Könyv/Külföldi"} - - {id: 44, cat: Books, desc: "Könyv/Magyar"} - - {id: 28, cat: PC/Games, desc: "Játék/ISO"} - - {id: 32, cat: Console, desc: "Játék/Konzol"} - - {id: 30, cat: PC/Games, desc: "Játék/RIP"} - - {id: 53, cat: Audio/Lossless, desc: "Lossless/Külföldi"} - - {id: 74, cat: Audio/Lossless, desc: "Lossless/Magyar"} - - {id: 40, cat: Audio/Other, desc: "Zene/Külföldi"} - - {id: 41, cat: Audio/Other, desc: "Zene/Magyar"} - - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"} - - {id: 35, cat: PC/ISO, desc: "Programok/ISO"} - - {id: 46, cat: PC/0day, desc: "Programok/RIP"} - - {id: 70, cat: XXX/DVD, desc: "XXX/DVD"} - - {id: 39, cat: XXX/XviD, desc: "XXX/XviD"} - - {id: 57, cat: XXX, desc: "XXX/HD"} + - {id: 4, cat: Movies/3D, desc: "3D/Magyar", default: true} + - {id: 5, cat: Movies/3D, desc: "3D/Külföldi", default: true} + - {id: 48, cat: Movies/HD, desc: "Film/BR-BDRIP/Külföldi", default: true} + - {id: 50, cat: Movies/HD, desc: "Film/BR-BDRIP/Magyar", default: true} + - {id: 75, cat: Movies/SD, desc: "Film/Cam/Külföldi", default: true} + - {id: 76, cat: Movies/SD, desc: "Film/Cam/Magyar", default: true} + - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Külföldi", default: true} + - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Magyar", default: true} + - {id: 58, cat: Movies/DVD, desc: "Film/DVD9/Külföld", default: true} + - {id: 59, cat: Movies/DVD, desc: "Film/DVD9/Magyar", default: true} + - {id: 42, cat: Movies/HD, desc: "Film/HD/Külföldi", default: true} + - {id: 51, cat: Movies/HD, desc: "Film/HD/Magyar", default: true} + - {id: 38, cat: Movies/SD, desc: "Film/XviD/Külföldi", default: true} + - {id: 24, cat: Movies/SD, desc: "Film/XviD/Magyar", default: true} + - {id: 85, cat: TV/Sport, desc: "Sport/Külföldi", default: true} + - {id: 87, cat: TV/Sport, desc: "Sport/Magyar", default: true} + - {id: 47, cat: TV/SD, desc: "Sorozat/Külföldi", default: true} + - {id: 36, cat: TV/SD, desc: "Sorozat/Magyar", default: true} + - {id: 6, cat: TV/HD, desc: "Sorozat/HD/Magyar", default: true} + - {id: 7, cat: TV/HD, desc: "Sorozat/HD/Külföldi", default: true} + - {id: 56, cat: Audio/Audiobook, desc: "Hangoskönyv", default: true} + - {id: 33, cat: Books, desc: "Könyv/Külföldi", default: true} + - {id: 44, cat: Books, desc: "Könyv/Magyar", default: true} + - {id: 28, cat: PC/Games, desc: "Játék/ISO", default: true} + - {id: 32, cat: Console, desc: "Játék/Konzol", default: true} + - {id: 30, cat: PC/Games, desc: "Játék/RIP", default: true} + - {id: 53, cat: Audio/Lossless, desc: "Lossless/Külföldi", default: true} + - {id: 74, cat: Audio/Lossless, desc: "Lossless/Magyar", default: true} + - {id: 40, cat: Audio/Other, desc: "Zene/Külföldi", default: true} + - {id: 41, cat: Audio/Other, desc: "Zene/Magyar", default: true} + - {id: 34, cat: PC/Mobile-Other, desc: "Mobil", default: true} + - {id: 35, cat: PC/ISO, desc: "Programok/ISO", default: true} + - {id: 46, cat: PC/0day, desc: "Programok/RIP", default: true} + - {id: 70, cat: XXX/DVD, desc: "XXX/DVD", default: false} + - {id: 39, cat: XXX/XviD, desc: "XXX/XviD", default: false} + - {id: 57, cat: XXX, desc: "XXX/HD", default: false} modes: search: [q] @@ -81,11 +82,11 @@ login: search: paths: - path: letoltes.php - categories: ["!", 70, 39, 57] + categories: [4, 5, 48, 50, 75, 76, 26, 25, 58, 59, 42, 51, 38, 24, 85, 87, 47, 36, 6, 7, 56, 33, 44, 28, 32, 30, 53, 74, 40, 41, 34, 35, 46] inputs: tipus: 1 - path: letoltes.php - categories: ["!", 70, 39, 57] + categories: [4, 5, 48, 50, 75, 76, 26, 25, 58, 59, 42, 51, 38, 24, 85, 87, 47, 36, 6, 7, 56, 33, 44, 28, 32, 30, 53, 74, 40, 41, 34, 35, 46] inputs: tipus: 2 - path: xxx.php diff --git a/src/Jackett.Common/Definitions/mteamtp.yml b/src/Jackett.Common/Definitions/mteamtp.yml index b55d55d69..6507760f0 100644 --- a/src/Jackett.Common/Definitions/mteamtp.yml +++ b/src/Jackett.Common/Definitions/mteamtp.yml @@ -5,6 +5,7 @@ description: "M-Team TP (MTTP) is a CHINESE Private Torrent Tracker for HD MOVIE language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://kp.m-team.cc/ legacylinks: @@ -13,41 +14,41 @@ legacylinks: caps: categorymappings: - - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"} - - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"} - - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"} - - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"} - - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"} - - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"} - - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"} - - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"} - - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"} - - {id: 404, cat: TV/Documentary, desc: "紀錄教育"} - - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"} - - {id: 407, cat: TV/Sport, desc: "Sports(運動)"} - - {id: 422, cat: PC/0day, desc: "Software(軟體)"} - - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"} - - {id: 427, cat: Books, desc: "eBook(電子書)"} - - {id: 409, cat: Other, desc: "Misc(其他)"} + - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true} + - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true} + - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true} + - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true} + - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true} + - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true} + - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true} + - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true} + - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true} + - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true} + - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true} + - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true} + - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true} + - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true} + - {id: 427, cat: Books, desc: "eBook(電子書)", default: true} + - {id: 409, cat: Other, desc: "Misc(其他)", default: true} # music - - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} - - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} - - {id: 434, cat: Audio, desc: "Music(無損)"} + - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true} + - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true} + - {id: 434, cat: Audio, desc: "Music(無損)", default: true} # adult - - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"} - - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"} - - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored"} - - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored"} - - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored"} - - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored"} - - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored"} - - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored"} - - {id: 436, cat: XXX, desc: "AV(網站)/0Day"} - - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection"} - - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection"} - - {id: 411, cat: XXX, desc: "H-Game(遊戲)"} - - {id: 412, cat: XXX, desc: "H-Anime(動畫)"} - - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"} + - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false} + - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false} + - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false} + - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false} + - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false} + - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false} + - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false} + - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false} + - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false} + - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false} + - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false} + - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false} + - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false} + - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false} modes: search: [q] @@ -115,7 +116,7 @@ download: search: paths: - path: torrents.php - categories: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434] + categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409] - path: adult.php categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] - path: music.php diff --git a/src/Jackett.Common/Definitions/mteamtp2fa.yml b/src/Jackett.Common/Definitions/mteamtp2fa.yml index a6af36ea1..0fd63455a 100644 --- a/src/Jackett.Common/Definitions/mteamtp2fa.yml +++ b/src/Jackett.Common/Definitions/mteamtp2fa.yml @@ -5,6 +5,7 @@ description: "this indexer uses a cookie login for MTeamTP for those that want t language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://kp.m-team.cc/ legacylinks: @@ -13,41 +14,41 @@ legacylinks: caps: categorymappings: - - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD"} - - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD"} - - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo"} - - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray"} - - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux"} - - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD"} - - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD"} - - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo"} - - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"} - - {id: 404, cat: TV/Documentary, desc: "紀錄教育"} - - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"} - - {id: 407, cat: TV/Sport, desc: "Sports(運動)"} - - {id: 422, cat: PC/0day, desc: "Software(軟體)"} - - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"} - - {id: 427, cat: Books, desc: "eBook(電子書)"} - - {id: 409, cat: Other, desc: "Misc(其他)"} + - {id: 401, cat: Movies/SD, desc: "Movie(電影)/SD", default: true} + - {id: 419, cat: Movies/HD, desc: "Movie(電影)/HD", default: true} + - {id: 420, cat: Movies/DVD, desc: "Movie(電影)/DVDiSo", default: true} + - {id: 421, cat: Movies/BluRay, desc: "Movie(電影)/Blu-Ray", default: true} + - {id: 439, cat: Movies/Other, desc: "Movie(電影)/Remux", default: true} + - {id: 403, cat: TV/SD, desc: "TV Series(影劇/綜藝)/SD", default: true} + - {id: 402, cat: TV/HD, desc: "TV Series(影劇/綜藝)/HD", default: true} + - {id: 435, cat: TV/SD, desc: "TV Series(影劇/綜藝)/DVDiSo", default: true} + - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD", default: true} + - {id: 404, cat: TV/Documentary, desc: "紀錄教育", default: true} + - {id: 405, cat: TV/Anime, desc: "Anime(動畫)", default: true} + - {id: 407, cat: TV/Sport, desc: "Sports(運動)", default: true} + - {id: 422, cat: PC/0day, desc: "Software(軟體)", default: true} + - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)", default: true} + - {id: 427, cat: Books, desc: "eBook(電子書)", default: true} + - {id: 409, cat: Other, desc: "Misc(其他)", default: true} # music - - {id: 406, cat: Audio/Video, desc: "MV(演唱)"} - - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"} - - {id: 434, cat: Audio, desc: "Music(無損)"} + - {id: 406, cat: Audio/Video, desc: "MV(演唱)", default: true} + - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)", default: true} + - {id: 434, cat: Audio, desc: "Music(無損)", default: true} # adult - - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"} - - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"} - - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored"} - - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored"} - - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored"} - - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored"} - - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored"} - - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored"} - - {id: 436, cat: XXX, desc: "AV(網站)/0Day"} - - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection"} - - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection"} - - {id: 411, cat: XXX, desc: "H-Game(遊戲)"} - - {id: 412, cat: XXX, desc: "H-Anime(動畫)"} - - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"} + - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored", default: false} + - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored", default: false} + - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored", default: false} + - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored", default: false} + - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored", default: false} + - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored", default: false} + - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored", default: false} + - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored", default: false} + - {id: 436, cat: XXX, desc: "AV(網站)/0Day", default: false} + - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection", default: false} + - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection", default: false} + - {id: 411, cat: XXX, desc: "H-Game(遊戲)", default: false} + - {id: 412, cat: XXX, desc: "H-Anime(動畫)", default: false} + - {id: 413, cat: XXX, desc: "H-Comic(漫畫)", default: false} modes: search: [q] @@ -116,7 +117,7 @@ download: search: paths: - path: torrents.php - categories: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434] + categories: [401, 419, 420, 421, 439, 403, 402, 435, 438, 404, 405, 407, 422, 423, 427, 409] - path: adult.php categories: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413] - path: music.php diff --git a/src/Jackett.Common/Definitions/pignetwork.yml b/src/Jackett.Common/Definitions/pignetwork.yml index 6dfb07a97..92943189c 100644 --- a/src/Jackett.Common/Definitions/pignetwork.yml +++ b/src/Jackett.Common/Definitions/pignetwork.yml @@ -5,6 +5,7 @@ description: "PigNetwork (猪猪网) is a CHINESE Private Torrent Tracker for HD language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://piggo.me/ @@ -19,6 +20,7 @@ caps: - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true} - {id: 409, cat: Other, desc: "Misc/其他", default: true} - {id: 408, cat: Audio, desc: "Music/音乐", default: true} + # kids zone - {id: 908, cat: TV, desc: "TV Series/剧集", default: true} - {id: 909, cat: Movies, desc: "Movies/电影", default: true} - {id: 905, cat: Audio/Video, desc: "MusicVideo/MV", default: true} diff --git a/src/Jackett.Common/Definitions/pttime.yml b/src/Jackett.Common/Definitions/pttime.yml index b280c0115..80d551c55 100644 --- a/src/Jackett.Common/Definitions/pttime.yml +++ b/src/Jackett.Common/Definitions/pttime.yml @@ -5,37 +5,38 @@ description: "PTTime is a ratioless CHINESE Private Torrent Tracker for HD MOVIE language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://www.pttime.org/ caps: categorymappings: - - {id: 401, cat: Movies, desc: "Movies(电影)"} - - {id: 402, cat: TV, desc: "TV Series(电视剧)"} - - {id: 403, cat: TV, desc: "TV Shows(综艺)"} - - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"} - - {id: 405, cat: TV/Sport, desc: "Sport(体育、竞技、武术及相关)"} - - {id: 406, cat: PC/Games, desc: "Games(游戏及相关)"} - - {id: 408, cat: Audio, desc: "Music(音乐、专辑、MV、演唱会)"} - - {id: 409, cat: Other, desc: "Art(舞蹈、歌剧、戏曲、相声、评书等)"} - - {id: 411, cat: Other, desc: "Science(科学、知识、技能)"} - - {id: 412, cat: Other, desc: "School(应试、考级、初中以上教育)"} - - {id: 413, cat: Books, desc: "Book(书籍、有声书)"} - - {id: 420, cat: PC, desc: "Code(IT、编程、大数据、人工智能"} - - {id: 430, cat: TV/Anime, desc: "Animate(3D动画、2.5次元)"} - - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)"} - - {id: 432, cat: TV/Other, desc: "Baby(婴幼、早教、小学及相关)"} - - {id: 440, cat: XXX, desc: "9kg-AV(步兵/无码)"} - - {id: 441, cat: XXX, desc: "9kg-Sex(骑兵/有码)"} - - {id: 442, cat: XXX, desc: "9kg-III(三级片、限制级电影)"} - - {id: 443, cat: XXX, desc: "9kg-H动漫"} - - {id: 444, cat: XXX, desc: "9kg-H游戏"} - - {id: 445, cat: XXX, desc: "9kg-H书籍(书籍、有声书)"} - - {id: 446, cat: XXX, desc: "9kg-H写真(图片、私拍、短视频）"} - - {id: 447, cat: XXX, desc: "9kg-H音频(ASMR、音乐、音频)"} - - {id: 450, cat: Other, desc: "Resource(资源、素材、模板)"} - - {id: 451, cat: PC, desc: "Software(软件、系统、 程序、APP等)"} - - {id: 490, cat: Other, desc: "Other(其它)"} + - {id: 401, cat: Movies, desc: "Movies(电影)", default: true} + - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true} + - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true} + - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true} + - {id: 405, cat: TV/Sport, desc: "Sport(体育、竞技、武术及相关)", default: true} + - {id: 406, cat: PC/Games, desc: "Games(游戏及相关)", default: true} + - {id: 408, cat: Audio, desc: "Music(音乐、专辑、MV、演唱会)", default: true} + - {id: 409, cat: Other, desc: "Art(舞蹈、歌剧、戏曲、相声、评书等)", default: true} + - {id: 411, cat: Other, desc: "Science(科学、知识、技能)", default: true} + - {id: 412, cat: Other, desc: "School(应试、考级、初中以上教育)", default: true} + - {id: 413, cat: Books, desc: "Book(书籍、有声书)", default: true} + - {id: 420, cat: PC, desc: "Code(IT、编程、大数据、人工智能", default: true} + - {id: 430, cat: TV/Anime, desc: "Animate(3D动画、2.5次元)", default: true} + - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)", default: true} + - {id: 432, cat: TV/Other, desc: "Baby(婴幼、早教、小学及相关)", default: true} + - {id: 450, cat: Other, desc: "Resource(资源、素材、模板)", default: true} + - {id: 451, cat: PC, desc: "Software(软件、系统、 程序、APP等)", default: true} + - {id: 490, cat: Other, desc: "Other(其它)", default: true} + - {id: 440, cat: XXX, desc: "9kg-AV(步兵/无码)", default: false} + - {id: 441, cat: XXX, desc: "9kg-Sex(骑兵/有码)", default: false} + - {id: 442, cat: XXX, desc: "9kg-III(三级片、限制级电影)", default: false} + - {id: 443, cat: XXX, desc: "9kg-H动漫", default: false} + - {id: 444, cat: XXX, desc: "9kg-H游戏", default: false} + - {id: 445, cat: XXX, desc: "9kg-H书籍(书籍、有声书)", default: false} + - {id: 446, cat: XXX, desc: "9kg-H写真(图片、私拍、短视频）", default: false} + - {id: 447, cat: XXX, desc: "9kg-H音频(ASMR、音乐、音频)", default: false} modes: search: [q] @@ -79,7 +80,7 @@ login: search: paths: - path: torrents.php - categories: ["!", 440, 441, 442, 443, 444, 445, 446, 447] + categories: [401, 402, 403, 404, 405, 406, 408, 409, 411, 412, 413, 420, 430, 431, 432, 450, 451, 490] - path: adults.php categories: [440, 441, 442, 443, 444, 445, 446, 447] inputs: diff --git a/src/Jackett.Common/Definitions/siambit.yml b/src/Jackett.Common/Definitions/siambit.yml index 80429334d..0003af5de 100644 --- a/src/Jackett.Common/Definitions/siambit.yml +++ b/src/Jackett.Common/Definitions/siambit.yml @@ -5,60 +5,61 @@ description: "SiamBIT is a THAI Private Torrent Tracker for GENERAL" language: th-TH type: private encoding: tis-620 +requestDelay: 2 links: - https://www.siambit.me/ caps: categorymappings: - - {id: 1, cat: Other, desc: "@ King"} - - {id: 75, cat: PC/0day, desc: "OS Windows / Office"} - - {id: 10, cat: TV, desc: "Cartoons / Animation"} - - {id: 9, cat: TV/Sport, desc: "Sports / Football"} - - {id: 110, cat: PC/Games, desc: "Mobile games"} - - {id: 7, cat: PC/Games, desc: "Games"} - - {id: 40, cat: Audio/Video, desc: "clips"} - - {id: 16, cat: Audio/Video, desc: "Concert"} - - {id: 3, cat: Audio/Other, desc: "Karaoke / MV"} - - {id: 70, cat: PC, desc: "software AntiVirus / Antispyware"} - - {id: 100, cat: PC/Mobile-Other, desc: "software Mobile / Theme / Ringtone / mv"} - - {id: 85, cat: PC/Mac, desc: "Mac software"} - - {id: 105, cat: PC, desc: "Linux software"} - - {id: 8, cat: PC, desc: "software"} - - {id: 56, cat: Other, desc: "Dictionary / map"} - - {id: 19, cat: TV, desc: "Talk show / comedy / radio"} - - {id: 20, cat: TV, desc: "general"} - - {id: 55, cat: PC/Mobile-iOS, desc: "Tablet / iPhone"} - - {id: 21, cat: TV, desc: "Dharma"} - - {id: 2, cat: Audio/MP3, desc: "Music"} - - {id: 130, cat: Audio/Audiobook, desc: "High quality music (Lossless)"} - - {id: 60, cat: Other, desc: "fonts / icons / clip art / templates"} - - {id: 90, cat: Movies/UHD, desc: "4K UHD movies"} - - {id: 91, cat: Movies/DVD, desc: "DVD movies"} - - {id: 92, cat: Movies/HD, desc: "Hi-Def movies"} - - {id: 89, cat: Movies/SD, desc: "VCD movies"} - - {id: 93, cat: TV, desc: "Mother and child @ / Learning materials for children"} - - {id: 4, cat: TV, desc: "TV shows / Variety / Game shows"} - - {id: 50, cat: Other, desc: "Images"} - - {id: 18, cat: Other, desc: "website"} - - {id: 17, cat: TV/Documentary, desc: "Documentary"} - - {id: 11, cat: Books/Technical, desc: "Learning materials / Books / Ebook"} - - {id: 5, cat: Movies, desc: "Movies / series [Korea]"} - - {id: 54, cat: Movies, desc: "Movies / Series [China]"} - - {id: 51, cat: Movies, desc: "Movie series / series [Japan]"} - - {id: 52, cat: Movies, desc: "Movies / Series [Western]"} - - {id: 57, cat: Movies, desc: "Movies / series [other]"} - - {id: 53, cat: Movies, desc: "Movie series / series / drama [Thai]"} - - {id: 901, cat: XXX, desc: "XXX-Anime"} - - {id: 902, cat: XXX, desc: "XXX-Game"} - - {id: 903, cat: XXX, desc: "XXX-Japan censored"} - - {id: 904, cat: XXX, desc: "XXX-Japan"} - - {id: 905, cat: XXX, desc: "XXX-Guava"} - - {id: 906, cat: XXX, desc: "XXX-Asia censored"} - - {id: 907, cat: XXX, desc: "XXX-Asia"} - - {id: 908, cat: XXX, desc: "XXX-Gay"} - - {id: 910, cat: XXX, desc: "XXX-clip"} - - {id: 911, cat: XXX, desc: "XXX-pictures"} - - {id: 912, cat: XXX, desc: "XXX-magazine"} + - {id: 1, cat: Other, desc: "@ King", default: true} + - {id: 75, cat: PC/0day, desc: "OS Windows / Office", default: true} + - {id: 10, cat: TV, desc: "Cartoons / Animation", default: true} + - {id: 9, cat: TV/Sport, desc: "Sports / Football", default: true} + - {id: 110, cat: PC/Games, desc: "Mobile games", default: true} + - {id: 7, cat: PC/Games, desc: "Games", default: true} + - {id: 40, cat: Audio/Video, desc: "clips", default: true} + - {id: 16, cat: Audio/Video, desc: "Concert", default: true} + - {id: 3, cat: Audio/Other, desc: "Karaoke / MV", default: true} + - {id: 70, cat: PC, desc: "software AntiVirus / Antispyware", default: true} + - {id: 100, cat: PC/Mobile-Other, desc: "software Mobile / Theme / Ringtone / mv", default: true} + - {id: 85, cat: PC/Mac, desc: "Mac software", default: true} + - {id: 105, cat: PC, desc: "Linux software", default: true} + - {id: 8, cat: PC, desc: "software", default: true} + - {id: 56, cat: Other, desc: "Dictionary / map", default: true} + - {id: 19, cat: TV, desc: "Talk show / comedy / radio", default: true} + - {id: 20, cat: TV, desc: "general", default: true} + - {id: 55, cat: PC/Mobile-iOS, desc: "Tablet / iPhone", default: true} + - {id: 21, cat: TV, desc: "Dharma", default: true} + - {id: 2, cat: Audio/MP3, desc: "Music", default: true} + - {id: 130, cat: Audio/Audiobook, desc: "High quality music (Lossless)", default: true} + - {id: 60, cat: Other, desc: "fonts / icons / clip art / templates", default: true} + - {id: 90, cat: Movies/UHD, desc: "4K UHD movies", default: true} + - {id: 91, cat: Movies/DVD, desc: "DVD movies", default: true} + - {id: 92, cat: Movies/HD, desc: "Hi-Def movies", default: true} + - {id: 89, cat: Movies/SD, desc: "VCD movies", default: true} + - {id: 93, cat: TV, desc: "Mother and child @ / Learning materials for children", default: true} + - {id: 4, cat: TV, desc: "TV shows / Variety / Game shows", default: true} + - {id: 50, cat: Other, desc: "Images", default: true} + - {id: 18, cat: Other, desc: "website", default: true} + - {id: 17, cat: TV/Documentary, desc: "Documentary", default: true} + - {id: 11, cat: Books/Technical, desc: "Learning materials / Books / Ebook", default: true} + - {id: 5, cat: Movies, desc: "Movies / series [Korea]", default: true} + - {id: 54, cat: Movies, desc: "Movies / Series [China]", default: true} + - {id: 51, cat: Movies, desc: "Movie series / series [Japan]", default: true} + - {id: 52, cat: Movies, desc: "Movies / Series [Western]", default: true} + - {id: 57, cat: Movies, desc: "Movies / series [other]", default: true} + - {id: 53, cat: Movies, desc: "Movie series / series / drama [Thai]", default: true} + - {id: 901, cat: XXX, desc: "XXX-Anime", default: false} + - {id: 902, cat: XXX, desc: "XXX-Game", default: false} + - {id: 903, cat: XXX, desc: "XXX-Japan censored", default: false} + - {id: 904, cat: XXX, desc: "XXX-Japan", default: false} + - {id: 905, cat: XXX, desc: "XXX-Guava", default: false} + - {id: 906, cat: XXX, desc: "XXX-Asia censored", default: false} + - {id: 907, cat: XXX, desc: "XXX-Asia", default: false} + - {id: 908, cat: XXX, desc: "XXX-Gay", default: false} + - {id: 910, cat: XXX, desc: "XXX-clip", default: false} + - {id: 911, cat: XXX, desc: "XXX-pictures", default: false} + - {id: 912, cat: XXX, desc: "XXX-magazine", default: false} modes: search: [q] @@ -119,7 +120,7 @@ download: search: paths: - path: viewno18sb.php - categories: ["!", 901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912] + categories: [1, 75, 10, 9, 110, 7, 40, 16, 3, 70, 100, 85, 105, 8, 56, 19, 20, 55, 21, 2, 130, 60, 90, 91, 92, 89, 93, 4, 50, 18, 17, 11, 5, 54, 51, 52, 57, 53] - path: viewbrsb.php categories: [901, 902, 903, 904, 905, 906, 907, 908, 910, 911, 912] inputs: diff --git a/src/Jackett.Common/Definitions/teamctgame.yml b/src/Jackett.Common/Definitions/teamctgame.yml index 285f67f3c..148ddf039 100644 --- a/src/Jackett.Common/Definitions/teamctgame.yml +++ b/src/Jackett.Common/Definitions/teamctgame.yml @@ -5,6 +5,7 @@ description: "Team CT Game (TCTG) is a FRENCH Private Torrent Tracker for MOVIES language: fr-FR type: private encoding: UTF-8 +requestDelay: 2 links: - https://tctg.pm/ legacylinks: @@ -15,51 +16,51 @@ legacylinks: caps: categorymappings: - - {id: 409, cat: Books/Comics, desc: "BD"} - - {id: 410, cat: Books/Mags, desc: "Ebooks - Presse"} - - {id: 411, cat: Audio/Audiobook, desc: "Ebooks - Audiobooks"} - - {id: 412, cat: Books/EBook, desc: "Ebooks - Ebooks"} - - {id: 413, cat: Movies/3D, desc: "Films - 3D"} - - {id: 414, cat: Movies/HD, desc: "Films - 4K"} - - {id: 415, cat: Movies/UHD, desc: "Films - 4K HDR"} - - {id: 416, cat: Movies/UHD, desc: "Films - 4K Light"} - - {id: 417, cat: Movies/UHD, desc: "Films - 4K Remux"} - - {id: 418, cat: Movies, desc: "Films - Animation"} - - {id: 419, cat: Movies/BluRay, desc: "Films - BDRip / BRRip"} - - {id: 420, cat: Movies/DVD, desc: "Films - DVD-R"} - - {id: 421, cat: Movies/DVD, desc: "Films - DVDRip"} - - {id: 422, cat: Movies/BluRay, desc: "Films - Full Bluray"} - - {id: 423, cat: Movies/HD, desc: "Films - HDTV"} - - {id: 424, cat: Movies/HD, desc: "Films - HD 1080p"} - - {id: 425, cat: Movies/HD, desc: "Films - HD 720p"} - - {id: 426, cat: Movies/HD, desc: "Films - HDLiGHT / M-HD"} - - {id: 427, cat: Movies/HD, desc: "Films - HDRiP"} - - {id: 428, cat: Movies, desc: "Films - Pack"} - - {id: 429, cat: Movies, desc: "Films - Remux"} - - {id: 430, cat: TV, desc: "Films - TVRip"} - - {id: 431, cat: Movies, desc: "Films - VO"} - - {id: 432, cat: Movies, desc: "Films - VOSTFR"} - - {id: 433, cat: Movies/WEB-DL, desc: "Films - Web"} - - {id: 434, cat: Movies/HD, desc: "Films - x265"} - - {id: 436, cat: Console, desc: "Jeux - Consoles"} - - {id: 437, cat: PC/Games, desc: "Jeux - PC"} - - {id: 438, cat: PC/0day, desc: "Logiciels - Windows"} - - {id: 439, cat: Other, desc: "Logiciels - Graph / Wallpaper"} - - {id: 440, cat: TV/HD, desc: "Series - 4K HDR"} - - {id: 441, cat: TV/HD, desc: "Series TV - Pack HD"} - - {id: 442, cat: TV/HD, desc: "Series TV - Episode HD"} - - {id: 443, cat: TV/HD, desc: "Series TV - Pack HD VOSTFR"} - - {id: 444, cat: TV/HD, desc: "Series TV - Episode HD VOSTFR"} - - {id: 445, cat: TV/SD, desc: "Series TV - Pack SD"} - - {id: 446, cat: TV/SD, desc: "Series TV - Episode SD"} - - {id: 447, cat: TV/SD, desc: "Series TV - Pack SD VOSTFR"} - - {id: 448, cat: TV/SD, desc: "Series TV - Episode SD VOSTFR"} - - {id: 449, cat: TV/Anime, desc: "Series - Animés"} - - {id: 450, cat: TV, desc: "Spectacles - Tous"} - - {id: 451, cat: TV, desc: "TV - Emissions"} - - {id: 452, cat: TV/Documentary, desc: "TV - Documentaires"} - - {id: 453, cat: TV/Sport, desc: "TV - Sports"} - - {id: 435, cat: XXX, desc: "Films - XXX"} + - {id: 409, cat: Books/Comics, desc: "BD", default: true} + - {id: 410, cat: Books/Mags, desc: "Ebooks - Presse", default: true} + - {id: 411, cat: Audio/Audiobook, desc: "Ebooks - Audiobooks", default: true} + - {id: 412, cat: Books/EBook, desc: "Ebooks - Ebooks", default: true} + - {id: 413, cat: Movies/3D, desc: "Films - 3D", default: true} + - {id: 414, cat: Movies/HD, desc: "Films - 4K", default: true} + - {id: 415, cat: Movies/UHD, desc: "Films - 4K HDR", default: true} + - {id: 416, cat: Movies/UHD, desc: "Films - 4K Light", default: true} + - {id: 417, cat: Movies/UHD, desc: "Films - 4K Remux", default: true} + - {id: 418, cat: Movies, desc: "Films - Animation", default: true} + - {id: 419, cat: Movies/BluRay, desc: "Films - BDRip / BRRip", default: true} + - {id: 420, cat: Movies/DVD, desc: "Films - DVD-R", default: true} + - {id: 421, cat: Movies/DVD, desc: "Films - DVDRip", default: true} + - {id: 422, cat: Movies/BluRay, desc: "Films - Full Bluray", default: true} + - {id: 423, cat: Movies/HD, desc: "Films - HDTV", default: true} + - {id: 424, cat: Movies/HD, desc: "Films - HD 1080p", default: true} + - {id: 425, cat: Movies/HD, desc: "Films - HD 720p", default: true} + - {id: 426, cat: Movies/HD, desc: "Films - HDLiGHT / M-HD", default: true} + - {id: 427, cat: Movies/HD, desc: "Films - HDRiP", default: true} + - {id: 428, cat: Movies, desc: "Films - Pack", default: true} + - {id: 429, cat: Movies, desc: "Films - Remux", default: true} + - {id: 430, cat: TV, desc: "Films - TVRip", default: true} + - {id: 431, cat: Movies, desc: "Films - VO", default: true} + - {id: 432, cat: Movies, desc: "Films - VOSTFR", default: true} + - {id: 433, cat: Movies/WEB-DL, desc: "Films - Web", default: true} + - {id: 434, cat: Movies/HD, desc: "Films - x265", default: true} + - {id: 436, cat: Console, desc: "Jeux - Consoles", default: true} + - {id: 437, cat: PC/Games, desc: "Jeux - PC", default: true} + - {id: 438, cat: PC/0day, desc: "Logiciels - Windows", default: true} + - {id: 439, cat: Other, desc: "Logiciels - Graph / Wallpaper", default: true} + - {id: 440, cat: TV/HD, desc: "Series - 4K HDR", default: true} + - {id: 441, cat: TV/HD, desc: "Series TV - Pack HD", default: true} + - {id: 442, cat: TV/HD, desc: "Series TV - Episode HD", default: true} + - {id: 443, cat: TV/HD, desc: "Series TV - Pack HD VOSTFR", default: true} + - {id: 444, cat: TV/HD, desc: "Series TV - Episode HD VOSTFR", default: true} + - {id: 445, cat: TV/SD, desc: "Series TV - Pack SD", default: true} + - {id: 446, cat: TV/SD, desc: "Series TV - Episode SD", default: true} + - {id: 447, cat: TV/SD, desc: "Series TV - Pack SD VOSTFR", default: true} + - {id: 448, cat: TV/SD, desc: "Series TV - Episode SD VOSTFR", default: true} + - {id: 449, cat: TV/Anime, desc: "Series - Animés", default: true} + - {id: 450, cat: TV, desc: "Spectacles - Tous", default: true} + - {id: 451, cat: TV, desc: "TV - Emissions", default: true} + - {id: 452, cat: TV/Documentary, desc: "TV - Documentaires", default: true} + - {id: 453, cat: TV/Sport, desc: "TV - Sports", default: true} + - {id: 435, cat: XXX, desc: "Films - XXX", default: false} modes: search: [q] @@ -143,7 +144,7 @@ login: search: paths: - path: torrents.php - categories: ["!", 435] + categories: [409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453] - path: special.php categories: [435] inputs: diff --git a/src/Jackett.Common/Definitions/torlock.yml b/src/Jackett.Common/Definitions/torlock.yml index bea709327..547332fb6 100644 --- a/src/Jackett.Common/Definitions/torlock.yml +++ b/src/Jackett.Common/Definitions/torlock.yml @@ -6,6 +6,7 @@ language: en-US type: public encoding: UTF-8 followredirect: true +requestDelay: 2 links: - https://www.torlock2.com/ - https://www.torlock.com/ diff --git a/src/Jackett.Common/Definitions/totheglory.yml b/src/Jackett.Common/Definitions/totheglory.yml index d2f454d01..c7c87af8c 100644 --- a/src/Jackett.Common/Definitions/totheglory.yml +++ b/src/Jackett.Common/Definitions/totheglory.yml @@ -5,6 +5,7 @@ description: "ToTheGlory (TTG) A Chinese tracker" language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://totheglory.im/ diff --git a/src/Jackett.Common/Definitions/totheglorycookie.yml b/src/Jackett.Common/Definitions/totheglorycookie.yml index 8a6cdb785..17f0da91b 100644 --- a/src/Jackett.Common/Definitions/totheglorycookie.yml +++ b/src/Jackett.Common/Definitions/totheglorycookie.yml @@ -5,6 +5,7 @@ description: "ToTheGlory (TTG) A Chinese tracker. This uses the cookie method fo language: zh-CN type: private encoding: UTF-8 +requestDelay: 2 links: - https://totheglory.im/