diff --git a/src/Jackett.Common/Definitions/0daykiev.yml b/src/Jackett.Common/Definitions/0daykiev.yml index ecc47d9b6..c018ae648 100644 --- a/src/Jackett.Common/Definitions/0daykiev.yml +++ b/src/Jackett.Common/Definitions/0daykiev.yml @@ -23,7 +23,7 @@ caps: - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"} - {id: 47, cat: Movies, desc: "HDv 0day Team"} - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"} - - {id: 25, cat: Console/Xbox 360, desc: "Игры / XBOX360 (Games / XBOX360)"} + - {id: 25, cat: Console/XBox 360, desc: "Игры / XBOX360 (Games / XBOX360)"} - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"} - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"} - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"} diff --git a/src/Jackett.Common/Definitions/1337x.yml b/src/Jackett.Common/Definitions/1337x.yml index 6fdda14bf..d5f19ccf5 100644 --- a/src/Jackett.Common/Definitions/1337x.yml +++ b/src/Jackett.Common/Definitions/1337x.yml @@ -87,18 +87,18 @@ caps: - {id: 19, cat: PC/Mac, desc: "Apps/Mac"} - {id: 20, cat: PC, desc: "Apps/Linux"} - {id: 21, cat: PC, desc: "Apps/Other"} - - {id: 56, cat: PC/Phone-Android, desc: "Apps/Android"} - - {id: 57, cat: PC/Phone-IOS, desc: "Apps/iOS"} + - {id: 56, cat: PC/Mobile-Android, desc: "Apps/Android"} + - {id: 57, cat: PC/Mobile-iOS, desc: "Apps/iOS"} # Games - {id: 10, cat: PC/Games, desc: "Games/PC Game"} - {id: 11, cat: Console/Other, desc: "Games/PS2"} - {id: 12, cat: Console/PSP, desc: "Games/PSP"} - - {id: 13, cat: Console/Xbox, desc: "Games/Xbox"} - - {id: 14, cat: Console/Xbox 360, desc: "Games/Xbox360"} + - {id: 13, cat: Console/XBox, desc: "Games/Xbox"} + - {id: 14, cat: Console/XBox 360, desc: "Games/Xbox360"} - {id: 15, cat: Console/Other, desc: "Games/PS1"} - {id: 16, cat: Console/Other, desc: "Games/Dreamcast"} - - {id: 17, cat: PC/Phone-Other, desc: "Games/Other"} + - {id: 17, cat: PC/Mobile-Other, desc: "Games/Other"} - {id: 43, cat: Console/PS3, desc: "Games/PS3"} - {id: 44, cat: Console/Wii, desc: "Games/Wii"} - {id: 45, cat: Console/NDS, desc: "Games/DS"} @@ -109,7 +109,7 @@ caps: # XXX - {id: 48, cat: XXX/DVD, desc: "XXX/Video"} - - {id: 49, cat: XXX/Imageset, desc: "XXX/Picture"} + - {id: 49, cat: XXX/ImageSet, desc: "XXX/Picture"} - {id: 50, cat: XXX, desc: "XXX/Magazine"} - {id: 51, cat: XXX, desc: "XXX/Hentai"} - {id: 67, cat: XXX, desc: "XXX/Games"} @@ -118,7 +118,7 @@ caps: - {id: 33, cat: Other, desc: "Other/Emulation"} - {id: 34, cat: Books, desc: "Other/Tutorial"} - {id: 35, cat: Other, desc: "Other/Sounds"} - - {id: 36, cat: Books/Ebook, desc: "Other/E-books"} + - {id: 36, cat: Books/EBook, desc: "Other/E-books"} - {id: 37, cat: Other, desc: "Other/Images"} - {id: 38, cat: Other, desc: "Other/Mobile Phone"} - {id: 39, cat: Books/Comics, desc: "Other/Comics"} diff --git a/src/Jackett.Common/Definitions/2fast4you.yml b/src/Jackett.Common/Definitions/2fast4you.yml index 4d29b7856..aa41e3380 100644 --- a/src/Jackett.Common/Definitions/2fast4you.yml +++ b/src/Jackett.Common/Definitions/2fast4you.yml @@ -18,7 +18,7 @@ caps: - {id: 56, cat: TV/Anime, desc: "Animation: DVDRip"} - {id: 18, cat: PC/0day, desc: "Applications: PC"} - {id: 16, cat: PC/Games, desc: "Applications: Jeux"} - - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"} + - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"} - {id: 17, cat: PC/0day, desc: "Applications: Autres"} - {id: 67, cat: TV, desc: "Autres: Emission TV"} - {id: 68, cat: TV/Sport, desc: "Autres: Sport"} @@ -35,7 +35,7 @@ caps: - {id: 51, cat: Books, desc: "E-Books: BD"} - {id: 95, cat: Movies, desc: "Films: Film Divx XviD"} - {id: 66, cat: Movies, desc: "Films: VOSTFR"} - - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"} + - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"} - {id: 65, cat: Movies, desc: "Films: VO"} - {id: 72, cat: Movies/SD, desc: "Films: TVRip/HDTV"} - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"} diff --git a/src/Jackett.Common/Definitions/3evils.yml b/src/Jackett.Common/Definitions/3evils.yml index 4e9afa2b4..744f48008 100644 --- a/src/Jackett.Common/Definitions/3evils.yml +++ b/src/Jackett.Common/Definitions/3evils.yml @@ -16,11 +16,11 @@ caps: - {id: 73, cat: PC, desc: "Appz/Linux"} - {id: 42, cat: PC/Mac, desc: "Appz/Mac"} - {id: 43, cat: PC/0day, desc: "Appz/Windows"} - - {id: 65, cat: Books/Ebook, desc: "Books"} + - {id: 65, cat: Books/EBook, desc: "Books"} - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"} - {id: 78, cat: Console/PS4, desc: "Games/PS4"} - {id: 77, cat: PC/Games, desc: "Games/Windows"} - - {id: 79, cat: Console/Xbox, desc: "Games/XBOX"} + - {id: 79, cat: Console/XBox, desc: "Games/XBOX"} - {id: 13, cat: Movies/3D, desc: "Movies/3D"} - {id: 71, cat: Movies/UHD, desc: "Movies/4K"} - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"} diff --git a/src/Jackett.Common/Definitions/4thd.yml b/src/Jackett.Common/Definitions/4thd.yml index ae94e1d89..4353cf403 100644 --- a/src/Jackett.Common/Definitions/4thd.yml +++ b/src/Jackett.Common/Definitions/4thd.yml @@ -17,7 +17,7 @@ caps: - {id: 27, cat: Movies/HD, desc: "MoviesHD"} - {id: 29, cat: Movies/SD, desc: "Movies/SD"} - {id: 26, cat: Movies/SD, desc: "Movies/XviD"} - - {id: 41, cat: TV/FOREIGN, desc: "Foreign tv"} + - {id: 41, cat: TV/Foreign, desc: "Foreign tv"} - {id: 40, cat: TV, desc: "Mini-Series"} - {id: 43, cat: TV/HD, desc: "TV H265"} - {id: 42, cat: TV, desc: "TV Movie"} @@ -32,7 +32,7 @@ caps: - {id: 37, cat: Audio, desc: "Radio"} - {id: 9, cat: PC/0day, desc: "Apps/PC"} - {id: 34, cat: Audio/Audiobook, desc: "Audiobooks"} - - {id: 25, cat: Books/Ebook, desc: "eBooks"} + - {id: 25, cat: Books/EBook, desc: "eBooks"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/Bittorrentfiles.yml b/src/Jackett.Common/Definitions/Bittorrentfiles.yml index f5933ace8..c26376fae 100644 --- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml +++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml @@ -43,7 +43,7 @@ caps: - {id: 92, cat: PC/Mac, desc: "Spiele Mac"} - {id: 93, cat: PC, desc: "Spiele Linux"} - {id: 97, cat: Console/XBox, desc: "Spiele XBOX"} - - {id: 94, cat: PC/Phone-Other, desc: "Spiele Mobile"} + - {id: 94, cat: PC/Mobile-Other, desc: "Spiele Mobile"} - {id: 95, cat: Console/NDS, desc: "Spiele Nintendo"} - {id: 96, cat: Console/PSP, desc: "Spiele Playstation"} - {id: 42, cat: Console/Other, desc: "Spiele Andere"} @@ -70,11 +70,11 @@ caps: # Sonstiges - {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"} - {id: 33, cat: TV/Anime, desc: "Sonstiges Anime"} - - {id: 35, cat: Books/Ebook, desc: "Sonstiges e-Book-DE"} - - {id: 90, cat: Books/Ebook, desc: "Sonstiges e-Book-INT"} + - {id: 35, cat: Books/EBook, desc: "Sonstiges e-Book-DE"} + - {id: 90, cat: Books/EBook, desc: "Sonstiges e-Book-INT"} - {id: 65, cat: Other, desc: "Sonstiges E-Learning"} - {id: 37, cat: PC, desc: "Sonstiges Mobile"} - - {id: 87, cat: Books/Magazines, desc: "Sonstiges E-Paper"} + - {id: 87, cat: Books/Mags, desc: "Sonstiges E-Paper"} - {id: 38, cat: Other, desc: "Sonstiges Kids"} - {id: 47, cat: Other, desc: "Sonstiges Line"} - {id: 9, cat: Other, desc: "Sonstiges Andere"} @@ -82,7 +82,7 @@ caps: - {id: 58, cat: Books/Comics, desc: "XXX HD"} - {id: 46, cat: XXX, desc: "XXX Hentai"} - {id: 35, cat: XXX/Other, desc: "XXX Andere"} - - {id: 59, cat: XXX/Packs, desc: "XXX Pack"} + - {id: 59, cat: XXX/Pack, desc: "XXX Pack"} - {id: 27, cat: XXX, desc: "XXX SD"} - {id: 76, cat: XXX, desc: "XXX Andere"} diff --git a/src/Jackett.Common/Definitions/DasUnerwartete.yml b/src/Jackett.Common/Definitions/DasUnerwartete.yml index 318f8a11a..45f74eec1 100644 --- a/src/Jackett.Common/Definitions/DasUnerwartete.yml +++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml @@ -32,20 +32,20 @@ caps: - {id: 109, cat: Console/PSP, desc: "Games/PSP"} - {id: 113, cat: Console/Wii, desc: "Games/Wii"} - {id: 86, cat: PC/Games, desc: "Games/Windows"} - - {id: 104, cat: Console/XBox360, desc: "Games/Xbox360"} + - {id: 104, cat: Console/XBox 360, desc: "Games/Xbox360"} - {id: 116, cat: PC/Games, desc: "Linux/Spiele"} - - {id: 53, cat: PC/Phone-Android, desc: "Android/Appz/Games/Navi"} + - {id: 53, cat: PC/Mobile-Android, desc: "Android/Appz/Games/Navi"} - {id: 126, cat: PC, desc: "Win/Mac/linux"} - {id: 129, cat: TV/HD, desc: "Serien/Folgen HD"} - {id: 61, cat: TV/SD, desc: "Serien/Folgen SD"} - {id: 131, cat: TV/HD, desc: "Serien/Staffeln HD"} - {id: 130, cat: TV/SD, desc: "Serien/Staffeln SD"} - - {id: 94, cat: Books/Ebook, desc: "Ebooks"} + - {id: 94, cat: Books/EBook, desc: "Ebooks"} - {id: 96, cat: TV/Anime, desc: "Anime / Hentai"} - {id: 9, cat: Other/Misc, desc: "Sonstiges"} - {id: 115, cat: TV/Sport, desc: "Sport"} - {id: 69, cat: XXX, desc: "XXX"} - - {id: 122, cat: Books/Magazines, desc: "Zeitschriften/Zeitungen"} + - {id: 122, cat: Books/Mags, desc: "Zeitschriften/Zeitungen"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/acidlounge.yml b/src/Jackett.Common/Definitions/acidlounge.yml index db4ab4503..676d429ea 100644 --- a/src/Jackett.Common/Definitions/acidlounge.yml +++ b/src/Jackett.Common/Definitions/acidlounge.yml @@ -10,7 +10,7 @@ links: caps: categorymappings: - - {id: 79, cat: PC/Phone-Android, desc: "Android"} + - {id: 79, cat: PC/Mobile-Android, desc: "Android"} - {id: 61, cat: TV/Anime, desc: "Anime"} - {id: 55, cat: PC/0day, desc: "Appz/0-Day"} - {id: 59, cat: PC/Mac, desc: "Appz/Mac"} @@ -26,9 +26,9 @@ caps: - {id: 4, cat: PC/Games, desc: "Games/PC"} - {id: 42, cat: Console/PS3, desc: "Games/PS3"} - {id: 56, cat: Console/Wii, desc: "Games/Wii"} - - {id: 36, cat: Console/Xbox360, desc: "Games/xbox360"} + - {id: 36, cat: Console/XBox 360, desc: "Games/xbox360"} - {id: 69, cat: Other, desc: "Halloween"} - - {id: 80, cat: PC/Phone-IOS, desc: "iPhone / iPad"} + - {id: 80, cat: PC/Mobile-iOS, desc: "iPhone / iPad"} - {id: 46, cat: Other, desc: "Kids"} - {id: 63, cat: PC, desc: "Linux"} - {id: 49, cat: Other, desc: "Misc"} diff --git a/src/Jackett.Common/Definitions/aftershock.yml b/src/Jackett.Common/Definitions/aftershock.yml index 3c3abc415..01b8a8f5f 100644 --- a/src/Jackett.Common/Definitions/aftershock.yml +++ b/src/Jackett.Common/Definitions/aftershock.yml @@ -18,7 +18,7 @@ caps: - {id: 191, cat: Movies/DVD, desc: "DVD-9Hun"} - {id: 1, cat: Movies/DVD, desc: "DVDEng"} - {id: 4, cat: Movies/DVD, desc: "DVDHun"} - - {id: 23, cat: Books/Ebook, desc: "E-Book"} + - {id: 23, cat: Books/EBook, desc: "E-Book"} - {id: 3, cat: Movies, desc: "Film Pack"} - {id: 185, cat: Audio/Lossless, desc: "FLACeng"} - {id: 188, cat: Audio/Lossless, desc: "FLAChu"} @@ -30,14 +30,14 @@ caps: - {id: 130, cat: Console, desc: "JátékKonzol"} - {id: 38, cat: Console/PSP, desc: "JátékPS2"} - {id: 44, cat: Console, desc: "Jatekrip"} - - {id: 131, cat: Console/Xbox, desc: "JátékX-box"} + - {id: 131, cat: Console/XBox, desc: "JátékX-box"} - {id: 140, cat: Other, desc: "Képek"} - {id: 141, cat: Other, desc: "Klipek"} - {id: 154, cat: Other, desc: "MeseEng"} - {id: 155, cat: Other, desc: "MeseHun"} - {id: 176, cat: Other, desc: "Mikro HDEng"} - {id: 174, cat: Other, desc: "Mikro HDHun"} - - {id: 37, cat: PC/Phone-Other, desc: "MobilPDA"} + - {id: 37, cat: PC/Mobile-Other, desc: "MobilPDA"} - {id: 35, cat: PC, desc: "ProgramEgyéb"} - {id: 170, cat: PC/ISO, desc: "ProgramIso"} - {id: 24, cat: TV, desc: "Sorozat Eng"} @@ -45,7 +45,7 @@ caps: - {id: 167, cat: Movies/SD, desc: "Xvid CamEng"} - {id: 166, cat: Movies/SD, desc: "Xvid CamHun"} - {id: 9, cat: Movies/SD, desc: "XvidHun"} - - {id: 169, cat: XXX/Imageset, desc: "XXX Képek"} + - {id: 169, cat: XXX/ImageSet, desc: "XXX Képek"} - {id: 39, cat: XXX, desc: "XXXFilm"} - {id: 28, cat: Audio, desc: "ZeneEng"} - {id: 29, cat: Audio, desc: "ZeneHun"} diff --git a/src/Jackett.Common/Definitions/amigosshare.yml b/src/Jackett.Common/Definitions/amigosshare.yml index b2cb688bc..7ffdc4af6 100644 --- a/src/Jackett.Common/Definitions/amigosshare.yml +++ b/src/Jackett.Common/Definitions/amigosshare.yml @@ -20,10 +20,10 @@ caps: - {id: 69, cat: TV/Anime, desc: "Anime: Anime"} - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"} - {id: 118, cat: TV/Anime, desc: "Anime: Séries"} - - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"} - - {id: 27, cat: PC/Phone-IOS, desc: "Aplicativos: iPad"} - - {id: 26, cat: PC/Phone-IOS, desc: "Aplicativos: iPhone"} - - {id: 28, cat: PC/Phone-IOS, desc: "Aplicativos: iPod"} + - {id: 23, cat: PC/Mobile-Android, desc: "Aplicativos: Android"} + - {id: 27, cat: PC/Mobile-iOS, desc: "Aplicativos: iPad"} + - {id: 26, cat: PC/Mobile-iOS, desc: "Aplicativos: iPhone"} + - {id: 28, cat: PC/Mobile-iOS, desc: "Aplicativos: iPod"} - {id: 25, cat: PC, desc: "Aplicativos: Linux"} - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"} - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"} @@ -49,9 +49,9 @@ caps: - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"} - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"} - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"} - - {id: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"} - - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"} - - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"} + - {id: 54, cat: Console/XBox 360, desc: "Jogos: Xbox360"} + - {id: 56, cat: Console/XBox, desc: "Jogos: Xbox"} + - {id: 78, cat: Console/XBox One, desc: "Jogos: Xbox One"} - {id: 29, cat: Audio, desc: "Musica: Axé"} - {id: 38, cat: Audio, desc: "Musica: Blues"} - {id: 39, cat: Audio, desc: "Musica: Dance"} diff --git a/src/Jackett.Common/Definitions/arabafenice.yml b/src/Jackett.Common/Definitions/arabafenice.yml index 817f458ad..1ac79820f 100644 --- a/src/Jackett.Common/Definitions/arabafenice.yml +++ b/src/Jackett.Common/Definitions/arabafenice.yml @@ -55,14 +55,14 @@ caps: # GAMES - {id: 25, cat: Console/PS4, desc: "Sony Games"} - - {id: 26, cat: Console/Xbox, desc: "XboX Games"} + - {id: 26, cat: Console/XBox, desc: "XboX Games"} - {id: 27, cat: Console/Other, desc: "Nintendo Games"} - {id: 28, cat: PC/Games, desc: "PC Games"} # SOFTWARE - {id: 30, cat: PC/ISO, desc: "Windows APP"} - - {id: 31, cat: PC/Phone-IOS, desc: "Apple APP"} - - {id: 32, cat: PC/Phone-Android, desc: "Android APP"} + - {id: 31, cat: PC/Mobile-iOS, desc: "Apple APP"} + - {id: 32, cat: PC/Mobile-Android, desc: "Android APP"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/arabp2p.yml b/src/Jackett.Common/Definitions/arabp2p.yml index 037963e41..24ff707b1 100644 --- a/src/Jackett.Common/Definitions/arabp2p.yml +++ b/src/Jackett.Common/Definitions/arabp2p.yml @@ -49,10 +49,10 @@ caps: - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"} - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"} # المرئيات الاجنبية Foreign Movies - - {id: 92, cat: TV/FOREIGN, desc: "تعليمي (Educational)"} + - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"} - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"} - - {id: 45, cat: TV/FOREIGN, desc: "مسلسلات وبرامج اجنبيه (Serials)"} - - {id: 57, cat: TV/FOREIGN, desc: "مسلسلات آسيوية (Asian Series)"} + - {id: 45, cat: TV/Foreign, desc: "مسلسلات وبرامج اجنبيه (Serials)"} + - {id: 57, cat: TV/Foreign, desc: "مسلسلات آسيوية (Asian Series)"} - {id: 42, cat: Movies/Foreign, desc: "افلام اجنبيه (Foreign)"} - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"} - {id: 74, cat: Movies/HD, desc: "جودة عالية HD"} @@ -74,14 +74,14 @@ caps: # برامج Software - {id: 22, cat: PC, desc: "برامج عربية (Arabic Software)"} - {id: 23, cat: PC, desc: "برامج عامه (Public Software)"} - - {id: 78, cat: PC/Phone-IOS, desc: "iPad/iPhone"} - - {id: 79, cat: PC/Phone-Android, desc: "android"} + - {id: 78, cat: PC/Mobile-iOS, desc: "iPad/iPhone"} + - {id: 79, cat: PC/Mobile-Android, desc: "android"} # العاب Games - {id: 30, cat: PC/Games, desc: "PC"} - {id: 31, cat: Console/PS3, desc: "PS2"} - {id: 53, cat: Console/Wii, desc: "wii"} - {id: 55, cat: Console/PSP, desc: "PSP"} - - {id: 63, cat: Console/Xbox, desc: "XBOX"} + - {id: 63, cat: Console/XBox, desc: "XBOX"} - {id: 64, cat: Console/PS3, desc: "PS3"} # اخرى Other - {id: 17, cat: Books, desc: "كتب (Books)"} diff --git a/src/Jackett.Common/Definitions/arenabg.yml b/src/Jackett.Common/Definitions/arenabg.yml index 95bf3a6ec..c5fb34965 100644 --- a/src/Jackett.Common/Definitions/arenabg.yml +++ b/src/Jackett.Common/Definitions/arenabg.yml @@ -46,20 +46,20 @@ caps: - {id: "pc-rip", cat: PC, desc: "Games / PC RIP"} - {id: "ps2", cat: Console, desc: "Games / PS2"} - {id: "psp", cat: Console/PSP, desc: "Games / PSP"} - - {id: "xbox", cat: Console/Xbox, desc: "Games / XBOX"} - - {id: "xbox-360", cat: Console/Xbox 360, desc: "Games / XBOX-360"} + - {id: "xbox", cat: Console/XBox, desc: "Games / XBOX"} + - {id: "xbox-360", cat: Console/XBox 360, desc: "Games / XBOX-360"} - {id: "ps3", cat: Console/PS3, desc: "Games / PS3"} - {id: "wii", cat: Console/Wii, desc: "Games / WII"} - {id: "PS4", cat: Console/PS4, desc: "Games / PS4"} - {id: "software", cat: PC, desc: "Software"} - {id: "pc-iso", cat: PC/ISO, desc: "Software / PC ISO"} - - {id: "pdasmartphone", cat: PC/Phone-Other, desc: "Software / Smartphone"} + - {id: "pdasmartphone", cat: PC/Mobile-Other, desc: "Software / Smartphone"} - {id: "tutorial", cat: PC, desc: "Software / Tutorial"} - - {id: "android", cat: PC/Phone-Android, desc: "Software / Android"} - - {id: "ios", cat: PC/Phone-IOS, desc: "Software / iOS"} + - {id: "android", cat: PC/Mobile-Android, desc: "Software / Android"} + - {id: "ios", cat: PC/Mobile-iOS, desc: "Software / iOS"} - {id: "misc", cat: Other/Misc, desc: "Misc"} - {id: "other", cat: Other, desc: "Misc / Other"} - - {id: "e-books", cat: Books/Ebook, desc: "Misc / e-Books"} + - {id: "e-books", cat: Books/EBook, desc: "Misc / e-Books"} - {id: "sports", cat: TV/Sport, desc: "Misc / Sports"} - {id: "0-day", cat: PC/0day, desc: "Misc / 0-Day"} - {id: "xxx", cat: XXX, desc: "XXX"} diff --git a/src/Jackett.Common/Definitions/asgaard.yml b/src/Jackett.Common/Definitions/asgaard.yml index b7327e507..c0bf1bad0 100644 --- a/src/Jackett.Common/Definitions/asgaard.yml +++ b/src/Jackett.Common/Definitions/asgaard.yml @@ -39,20 +39,20 @@ caps: - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"} - {id: 24, cat: Audio/Lossless, desc: "Music Flac"} - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"} - - {id: 28, cat: PC/Phone-Android, desc: "Apps Android"} - - {id: 29, cat: PC/Phone-IOS, desc: "Apps iOS"} + - {id: 28, cat: PC/Mobile-Android, desc: "Apps Android"} + - {id: 29, cat: PC/Mobile-iOS, desc: "Apps iOS"} - {id: 25, cat: PC/0day, desc: "Apps Windows"} - {id: 26, cat: PC, desc: "Apps Linux"} - {id: 27, cat: PC/Mac, desc: "Apps MacOS"} - {id: 30, cat: PC/Games, desc: "Games Windows"} - {id: 31, cat: PC, desc: "Games Linux"} - {id: 32, cat: PC/Mac, desc: "Games MacOS"} - - {id: 33, cat: PC/Phone-Android, desc: "Games Android"} - - {id: 34, cat: PC/Phone-IOS, desc: "Games iOS"} + - {id: 33, cat: PC/Mobile-Android, desc: "Games Android"} + - {id: 34, cat: PC/Mobile-iOS, desc: "Games iOS"} - {id: 35, cat: Console/NDS, desc: "Games Nintendo"} - {id: 38, cat: Console/PSP, desc: "Games Playstation"} - - {id: 39, cat: Console/Xbox, desc: "Games XBox"} - - {id: 41, cat: Books/Ebook, desc: "Books E-Book"} + - {id: 39, cat: Console/XBox, desc: "Games XBox"} + - {id: 41, cat: Books/EBook, desc: "Books E-Book"} - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"} - {id: 43, cat: Books/Technical, desc: "Books Education"} diff --git a/src/Jackett.Common/Definitions/asylumshare.yml b/src/Jackett.Common/Definitions/asylumshare.yml index 7e553040a..36ff6fe24 100644 --- a/src/Jackett.Common/Definitions/asylumshare.yml +++ b/src/Jackett.Common/Definitions/asylumshare.yml @@ -12,12 +12,12 @@ caps: categorymappings: - {id: 104, cat: XXX, desc: "Adultos: Fotos +18"} - {id: 120, cat: TV/Anime, desc: "Anime: Anime"} - - {id: 122, cat: PC/Phone-Android, desc: "Aplicativos: Android"} - - {id: 115, cat: PC/Phone-Other, desc: "Aplicativos: Celular"} + - {id: 122, cat: PC/Mobile-Android, desc: "Aplicativos: Android"} + - {id: 115, cat: PC/Mobile-Other, desc: "Aplicativos: Celular"} - {id: 129, cat: PC, desc: "Aplicativos: Linux"} - {id: 19, cat: PC/Mac, desc: "Aplicativos: Mac"} - {id: 18, cat: PC, desc: "Aplicativos: PC"} - - {id: 123, cat: PC/Phone-Other, desc: "Aplicativos: Symbian"} + - {id: 123, cat: PC/Mobile-Other, desc: "Aplicativos: Symbian"} - {id: 94, cat: PC/0day, desc: "Aplicativos: Windows"} - {id: 9, cat: Other, desc: "Cursos: Apostilas"} - {id: 113, cat: Other, desc: "Cursos: Curso"} diff --git a/src/Jackett.Common/Definitions/audiobooktorrents.yml b/src/Jackett.Common/Definitions/audiobooktorrents.yml index 19fd1b341..6ec8913b5 100644 --- a/src/Jackett.Common/Definitions/audiobooktorrents.yml +++ b/src/Jackett.Common/Definitions/audiobooktorrents.yml @@ -40,40 +40,40 @@ caps: - {id: 260, cat: Audio/Audiobook, desc: "Thriller and Suspense"} - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"} - {id: 300, cat: Audio/Audiobook, desc: "Western"} - - {id: 400, cat: Books/Ebook, desc: "[E] Action/Adventure"} - - {id: 410, cat: Books/Ebook, desc: "[E] Adult / Erotica"} - - {id: 420, cat: Books/Ebook, desc: "[E] Arts & Crafts (Hobbies)"} - - {id: 430, cat: Books/Ebook, desc: "[E] Biography/Memoirs"} - - {id: 730, cat: Books/Ebook, desc: "[E] Collections"} - - {id: 440, cat: Books/Ebook, desc: "[E] Comic Books"} - - {id: 450, cat: Books/Ebook, desc: "[E] Computer Learning"} - - {id: 460, cat: Books/Ebook, desc: "[E] Cookery"} - - {id: 470, cat: Books/Ebook, desc: "[E] Crime/Thriller/Mystery"} - - {id: 480, cat: Books/Ebook, desc: "[E] Fantasy"} - - {id: 490, cat: Books/Ebook, desc: "[E] Forteana"} - - {id: 500, cat: Books/Ebook, desc: "[E] General Fiction"} - - {id: 510, cat: Books/Ebook, desc: "[E] Historical Fiction"} - - {id: 520, cat: Books/Ebook, desc: "[E] History/Documentary"} - - {id: 530, cat: Books/Ebook, desc: "[E] Horror"} - - {id: 540, cat: Books/Ebook, desc: "[E] Humor ( Comedy)"} - - {id: 550, cat: Books/Ebook, desc: "[E] LGBT"} - - {id: 560, cat: Books/Ebook, desc: "[E] Literary Fiction"} - - {id: 570, cat: Books/Ebook, desc: "[E] Magazines - all"} - - {id: 580, cat: Books/Ebook, desc: "[E] Non-Fiction"} - - {id: 590, cat: Books/Ebook, desc: "[E] Paranormal Romance"} - - {id: 600, cat: Books/Ebook, desc: "[E] Reference/Educational"} - - {id: 610, cat: Books/Ebook, desc: "[E] Religion and Spirituality"} - - {id: 620, cat: Books/Ebook, desc: "[E] Romance"} - - {id: 630, cat: Books/Ebook, desc: "[E] Sci-Fi"} - - {id: 640, cat: Books/Ebook, desc: "[E] Sci-Fi/Apocalyptic"} - - {id: 650, cat: Books/Ebook, desc: "[E] Self-Help"} - - {id: 660, cat: Books/Ebook, desc: "[E] Sports/Fitness"} - - {id: 670, cat: Books/Ebook, desc: "[E] Travel"} - - {id: 680, cat: Books/Ebook, desc: "[E] Unsorted"} - - {id: 690, cat: Books/Ebook, desc: "[E] Urban Fantasy/Paranormal"} - - {id: 700, cat: Books/Ebook, desc: "[E] Western"} - - {id: 710, cat: Books/Ebook, desc: "[E] Young Adult"} - - {id: 720, cat: Books/Ebook, desc: "[E] Young Children"} + - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"} + - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"} + - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"} + - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"} + - {id: 730, cat: Books/EBook, desc: "[E] Collections"} + - {id: 440, cat: Books/EBook, desc: "[E] Comic Books"} + - {id: 450, cat: Books/EBook, desc: "[E] Computer Learning"} + - {id: 460, cat: Books/EBook, desc: "[E] Cookery"} + - {id: 470, cat: Books/EBook, desc: "[E] Crime/Thriller/Mystery"} + - {id: 480, cat: Books/EBook, desc: "[E] Fantasy"} + - {id: 490, cat: Books/EBook, desc: "[E] Forteana"} + - {id: 500, cat: Books/EBook, desc: "[E] General Fiction"} + - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"} + - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"} + - {id: 530, cat: Books/EBook, desc: "[E] Horror"} + - {id: 540, cat: Books/EBook, desc: "[E] Humor ( Comedy)"} + - {id: 550, cat: Books/EBook, desc: "[E] LGBT"} + - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"} + - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"} + - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"} + - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"} + - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"} + - {id: 610, cat: Books/EBook, desc: "[E] Religion and Spirituality"} + - {id: 620, cat: Books/EBook, desc: "[E] Romance"} + - {id: 630, cat: Books/EBook, desc: "[E] Sci-Fi"} + - {id: 640, cat: Books/EBook, desc: "[E] Sci-Fi/Apocalyptic"} + - {id: 650, cat: Books/EBook, desc: "[E] Self-Help"} + - {id: 660, cat: Books/EBook, desc: "[E] Sports/Fitness"} + - {id: 670, cat: Books/EBook, desc: "[E] Travel"} + - {id: 680, cat: Books/EBook, desc: "[E] Unsorted"} + - {id: 690, cat: Books/EBook, desc: "[E] Urban Fantasy/Paranormal"} + - {id: 700, cat: Books/EBook, desc: "[E] Western"} + - {id: 710, cat: Books/EBook, desc: "[E] Young Adult"} + - {id: 720, cat: Books/EBook, desc: "[E] Young Children"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/audionews.yml b/src/Jackett.Common/Definitions/audionews.yml index 439142986..36b59dde1 100644 --- a/src/Jackett.Common/Definitions/audionews.yml +++ b/src/Jackett.Common/Definitions/audionews.yml @@ -10,9 +10,9 @@ links: caps: categorymappings: - - {id: 106, cat: PC/Phone-Other, desc: "Mobile Apps"} - - {id: 161, cat: PC/Phone-IOS, desc: "Mobile Apps iOS"} - - {id: 160, cat: PC/Phone-Android, desc: "Mobile Apps Android"} + - {id: 106, cat: PC/Mobile-Other, desc: "Mobile Apps"} + - {id: 161, cat: PC/Mobile-iOS, desc: "Mobile Apps iOS"} + - {id: 160, cat: PC/Mobile-Android, desc: "Mobile Apps Android"} - {id: 12, cat: PC, desc: "AUDIOAPPS"} - {id: 32, cat: PC, desc: "AUDIOAPPS DAW Apps"} - {id: 175, cat: PC, desc: "AUDIOAPPS Ableton"} diff --git a/src/Jackett.Common/Definitions/bibliotik.yml b/src/Jackett.Common/Definitions/bibliotik.yml index 9dd62c6c3..d79479e09 100644 --- a/src/Jackett.Common/Definitions/bibliotik.yml +++ b/src/Jackett.Common/Definitions/bibliotik.yml @@ -13,8 +13,8 @@ caps: - {id: 1, cat: PC, desc: "Applications"} - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"} - {id: 4, cat: Books/Comics, desc: "Comics"} - - {id: 5, cat: Books/Ebook, desc: "eBooks"} - - {id: 7, cat: Books/Magazines, desc: "Magazines"} + - {id: 5, cat: Books/EBook, desc: "eBooks"} + - {id: 7, cat: Books/Mags, desc: "Magazines"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/bigtorrent.yml b/src/Jackett.Common/Definitions/bigtorrent.yml index 55221ccf4..3e9dc9f3f 100644 --- a/src/Jackett.Common/Definitions/bigtorrent.yml +++ b/src/Jackett.Common/Definitions/bigtorrent.yml @@ -25,11 +25,11 @@ caps: - {id: 24534, cat: Audio/Audiobook, desc: "Audiobooks"} - {id: 65, cat: Other, desc: "Picture"} - {id: 64, cat: Other, desc: "Video"} - - {id: 68, cat: Console/Xbox360, desc: "Video Game Console"} + - {id: 68, cat: Console/XBox 360, desc: "Video Game Console"} - {id: 63, cat: Books, desc: "English Books"} - {id: 62, cat: Books, desc: "Hungarian Books"} - {id: 74, cat: Audio/Lossless, desc: "Lossless"} - - {id: 56, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 56, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 57, cat: PC, desc: "Programs"} - {id: 24545, cat: TV/HD, desc: "English HD Series"} - {id: 24544, cat: TV/HD, desc: "Hungarian HD Series"} diff --git a/src/Jackett.Common/Definitions/bigtower.yml b/src/Jackett.Common/Definitions/bigtower.yml index 44874b94c..c746e4a08 100644 --- a/src/Jackett.Common/Definitions/bigtower.yml +++ b/src/Jackett.Common/Definitions/bigtower.yml @@ -28,7 +28,7 @@ caps: # SOFTWARE - {id: 9, cat: PC/0day, desc: "Software"} # PHONE - - {id: 12, cat: PC/Phone-Other, desc: "Applicazioni"} + - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"} # OTHER - {id: 14, cat: Other, desc: "Varie & Altro"} # EBOOK diff --git a/src/Jackett.Common/Definitions/bit-titan.yml b/src/Jackett.Common/Definitions/bit-titan.yml index 60235223c..879f21b54 100644 --- a/src/Jackett.Common/Definitions/bit-titan.yml +++ b/src/Jackett.Common/Definitions/bit-titan.yml @@ -31,7 +31,7 @@ caps: - {id: 2060, cat: TV/SD, desc: "TV XviD"} - {id: 2070, cat: TV/HD, desc: "TV HD Packs"} - {id: 2080, cat: TV/SD, desc: "TV SD Packs"} - - {id: 2090, cat: TV/FOREIGN, desc: "TV International"} + - {id: 2090, cat: TV/Foreign, desc: "TV International"} - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"} - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"} - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"} @@ -59,15 +59,15 @@ caps: - {id: 6010, cat: PC/Games, desc: "Games Windows"} - {id: 6020, cat: Console, desc: "Games Linux"} - {id: 6030, cat: PC/Mac, desc: "Games MacOS"} - - {id: 6040, cat: PC/Phone-Android, desc: "Games Android"} - - {id: 6050, cat: Console/Xbox, desc: "Games Xbox"} + - {id: 6040, cat: PC/Mobile-Android, desc: "Games Android"} + - {id: 6050, cat: Console/XBox, desc: "Games Xbox"} - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"} - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"} - {id: 6080, cat: Console, desc: "Games Sonstige"} - {id: 7010, cat: PC/0day, desc: "Software Windows"} - {id: 7020, cat: PC, desc: "Software Linux"} - {id: 7030, cat: PC/Mac, desc: "Software MacOS"} - - {id: 7040, cat: PC/Phone-Android, desc: "Software Android"} + - {id: 7040, cat: PC/Mobile-Android, desc: "Software Android"} - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"} - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"} - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"} @@ -78,7 +78,7 @@ caps: - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"} - {id: 8090, cat: Audio/Video, desc: "Music Video"} - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"} - - {id: 9020, cat: Books/Ebook, desc: "Books E-Book"} + - {id: 9020, cat: Books/EBook, desc: "Books E-Book"} - {id: 9030, cat: Books, desc: "Books E-Paper"} - {id: 9040, cat: Books, desc: "Books E-Learning"} - {id: 9050, cat: TV, desc: "TV Kids"} diff --git a/src/Jackett.Common/Definitions/bithorlo.yml b/src/Jackett.Common/Definitions/bithorlo.yml index 4aa5c8e8a..96ff00c78 100644 --- a/src/Jackett.Common/Definitions/bithorlo.yml +++ b/src/Jackett.Common/Definitions/bithorlo.yml @@ -35,7 +35,7 @@ caps: - {id: 13, cat: Audio, desc: "Zene/Hun"} # Egyéb - {id: 20, cat: Other, desc: "Képek"} - - {id: 21, cat: PC/Phone-Other, desc: "Mobil"} + - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"} # Program - {id: 22, cat: PC/0day, desc: "Win/Program/ISO"} - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"} diff --git a/src/Jackett.Common/Definitions/bithumen.yml b/src/Jackett.Common/Definitions/bithumen.yml index 7eff46eee..e7b56499c 100644 --- a/src/Jackett.Common/Definitions/bithumen.yml +++ b/src/Jackett.Common/Definitions/bithumen.yml @@ -38,7 +38,7 @@ caps: - {id: 38, cat: Audio/Lossless, desc: "Lossless/Eng"} - {id: 22, cat: PC, desc: "Programok/egyéb"} - {id: 21, cat: PC, desc: "Játékok/Rip/Dox"} - - {id: 32, cat: Console/Xbox360, desc: "Játékok/Xbox360"} + - {id: 32, cat: Console/XBox 360, desc: "Játékok/Xbox360"} - {id: 27, cat: Other, desc: "Klipek"} modes: diff --git a/src/Jackett.Common/Definitions/bitspyder.yml b/src/Jackett.Common/Definitions/bitspyder.yml index f95000454..406102126 100644 --- a/src/Jackett.Common/Definitions/bitspyder.yml +++ b/src/Jackett.Common/Definitions/bitspyder.yml @@ -23,14 +23,14 @@ caps: - {id: 63, cat: Books, desc: "College"} - {id: 53, cat: Books, desc: "Cooking"} - {id: 42, cat: Books, desc: "Documentary"} - - {id: 37, cat: Books/Ebook, desc: "e-Books"} + - {id: 37, cat: Books/EBook, desc: "e-Books"} - {id: 65, cat: Books, desc: "Engineering"} - {id: 54, cat: Books, desc: "Health-Fitness"} - {id: 64, cat: Books, desc: "Kids"} - {id: 47, cat: Books, desc: "Languages"} - {id: 49, cat: Books, desc: "Linux CBTs"} - {id: 43, cat: Books, desc: "Lynda.com"} - - {id: 57, cat: Books/Magazines, desc: "Magazines"} + - {id: 57, cat: Books/Mags, desc: "Magazines"} - {id: 71, cat: Books, desc: "Pluralsight"} - {id: 60, cat: Books, desc: "Medical"} - {id: 44, cat: Books, desc: "Misc Learning"} diff --git a/src/Jackett.Common/Definitions/bitturk.yml b/src/Jackett.Common/Definitions/bitturk.yml index ee124af39..851bec6ab 100644 --- a/src/Jackett.Common/Definitions/bitturk.yml +++ b/src/Jackett.Common/Definitions/bitturk.yml @@ -42,7 +42,7 @@ caps: - {id: 41, cat: Movies, desc: "ViP"} - {id: 42, cat: Movies/SD, desc: "XviD"} - {id: 43, cat: Movies/SD, desc: "XviD BoX"} - - {id: 55, cat: Movies/WEBDL, desc: "WEB-DL"} + - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL"} - {id: 7, cat: Audio, desc: "Müzik"} - {id: 20, cat: Audio, desc: "Türkçe MüziK"} - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"} diff --git a/src/Jackett.Common/Definitions/booktracker.yml b/src/Jackett.Common/Definitions/booktracker.yml index ad01ec7b0..50c67c181 100644 --- a/src/Jackett.Common/Definitions/booktracker.yml +++ b/src/Jackett.Common/Definitions/booktracker.yml @@ -10,7 +10,7 @@ links: caps: categorymappings: - - {id: 1, cat: Books/Ebook, desc: "Ebooks"} + - {id: 1, cat: Books/EBook, desc: "Ebooks"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/borgzelle.yml b/src/Jackett.Common/Definitions/borgzelle.yml index c68e21284..5d6abca95 100644 --- a/src/Jackett.Common/Definitions/borgzelle.yml +++ b/src/Jackett.Common/Definitions/borgzelle.yml @@ -17,7 +17,7 @@ caps: - {id: 12, cat: TV, desc: "Serien"} - {id: 14, cat: Audio/Video, desc: "Musikvideo"} - {id: 15, cat: TV/Documentary, desc: "Doku"} - - {id: 16, cat: TV/OTHER, desc: "Comedy"} + - {id: 16, cat: TV/Other, desc: "Comedy"} - {id: 18, cat: TV/Anime, desc: "Anime"} - {id: 6, cat: Movies/SD, desc: "Movie XviD/DivX"} - {id: 34, cat: Movies/UHD, desc: "Movie UHD"} @@ -33,11 +33,11 @@ caps: - {id: 26, cat: Console, desc: "Spiele Konsolen"} - {id: 30, cat: Other, desc: "Diverse Wallpaper"} - {id: 31, cat: Other, desc: "Sonstiges"} - - {id: 29, cat: Books/Ebook, desc: "E-Book"} + - {id: 29, cat: Books/EBook, desc: "E-Book"} - {id: 19, cat: Audio, desc: "Musik"} - {id: 20, cat: Audio/Audiobook, desc: "Hörbuch"} - {id: 21, cat: PC/0day, desc: "Software Windows"} - - {id: 23, cat: PC/Phone-Other, desc: "Software PDA/Handy"} + - {id: 23, cat: PC/Mobile-Other, desc: "Software PDA/Handy"} - {id: 22, cat: PC/Mac, desc: "Software MAC"} - {id: 24, cat: PC, desc: "Software Linux"} diff --git a/src/Jackett.Common/Definitions/btnext.yml b/src/Jackett.Common/Definitions/btnext.yml index 6183cbce1..543d92e3d 100644 --- a/src/Jackett.Common/Definitions/btnext.yml +++ b/src/Jackett.Common/Definitions/btnext.yml @@ -28,7 +28,7 @@ caps: - {id: 91, cat: Movies/Other, desc: "Movies Kids Inglês"} - {id: 113, cat: Movies/Other, desc: "Movies Kids PT-BR"} - {id: 114, cat: Movies/Other, desc: "Movies Kids PT-PT"} - - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"} + - {id: 77, cat: Movies/WEB-DL, desc: "Movies WEB-DL"} - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"} - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"} - {id: 98, cat: Movies/Other, desc: "Movies Juvenil"} @@ -64,24 +64,24 @@ caps: - {id: 81, cat: Console/PS3, desc: "Games PS3"} - {id: 82, cat: Console/PS4, desc: "Games PS4"} - {id: 83, cat: Console/PSP, desc: "Games PSP"} - - {id: 95, cat: Console/PSVita, desc: "Games PSVITA"} + - {id: 95, cat: Console/PS Vita, desc: "Games PSVITA"} - {id: 4, cat: Console/Wii, desc: "Games Wii"} - - {id: 26, cat: Console/Xbox360, desc: "Games XBOX360"} - - {id: 84, cat: Console/Xbox, desc: "Games XONE"} + - {id: 26, cat: Console/XBox 360, desc: "Games XBOX360"} + - {id: 84, cat: Console/XBox, desc: "Games XONE"} - {id: 6, cat: PC, desc: "Applications"} - {id: 18, cat: PC/ISO, desc: "Applications PC"} - {id: 19, cat: PC/Mac, desc: "Applications Macintosh"} - {id: 34, cat: PC/ISO, desc: "Applications Linux"} - {id: 44, cat: Other, desc: "Miscellaneous"} - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"} - - {id: 57, cat: Books/Ebook, desc: "Books E-Books"} + - {id: 57, cat: Books/EBook, desc: "Books E-Books"} - {id: 58, cat: Books/Comics, desc: "Books Comics"} - {id: 59, cat: Books, desc: "Books Educational"} - - {id: 60, cat: Books/Magazines, desc: "Books Magazines/Journals"} + - {id: 60, cat: Books/Mags, desc: "Books Magazines/Journals"} - {id: 61, cat: Other, desc: "Pics/Wallpapers"} - - {id: 62, cat: PC/Phone-Android, desc: "Android"} - - {id: 63, cat: PC/Phone-IOS, desc: "iOS"} - - {id: 66, cat: PC/Phone-Other, desc: "WindowsPhone"} + - {id: 62, cat: PC/Mobile-Android, desc: "Android"} + - {id: 63, cat: PC/Mobile-iOS, desc: "iOS"} + - {id: 66, cat: PC/Mobile-Other, desc: "WindowsPhone"} - {id: 90, cat: Other, desc: "GPS"} - {id: 68, cat: Other, desc: "Others"} - {id: 100, cat: Other, desc: "Revistas"} @@ -92,8 +92,8 @@ caps: - {id: 41, cat: XXX, desc: "XXX"} - {id: 64, cat: XXX, desc: "XXX-Magazines"} - {id: 65, cat: XXX, desc: "XXX-Movies"} - - {id: 67, cat: XXX/Packs, desc: "XXX-Packs"} - - {id: 69, cat: XXX/Imageset, desc: "XXX-Pics/Wallpapers"} + - {id: 67, cat: XXX/Pack, desc: "XXX-Packs"} + - {id: 69, cat: XXX/ImageSet, desc: "XXX-Pics/Wallpapers"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/bwtorrents.yml b/src/Jackett.Common/Definitions/bwtorrents.yml index 87722a87e..0ddf93fa3 100644 --- a/src/Jackett.Common/Definitions/bwtorrents.yml +++ b/src/Jackett.Common/Definitions/bwtorrents.yml @@ -18,26 +18,26 @@ caps: - {id: 116, cat: Movies/HD, desc: "Bollywood-1080p BluRay Rips"} - {id: 117, cat: Movies/HD, desc: "Bollywood-720p BluRay Rips"} - {id: 118, cat: Movies, desc: "Bollywood-Remuxes BluRay"} - - {id: 119, cat: Movies/WEBDL, desc: "Bollywood-Untouched WEB-DLs"} - - {id: 120, cat: Movies/WEBDL, desc: "Bollywood-1080p WEB-Rips"} - - {id: 188, cat: Movies/WEBDL, desc: "Bollywood-720p WEB-Rips"} + - {id: 119, cat: Movies/WEB-DL, desc: "Bollywood-Untouched WEB-DLs"} + - {id: 120, cat: Movies/WEB-DL, desc: "Bollywood-1080p WEB-Rips"} + - {id: 188, cat: Movies/WEB-DL, desc: "Bollywood-720p WEB-Rips"} - {id: 121, cat: Movies/DVD, desc: "Bollywood-Untouched DVDs"} - {id: 189, cat: Movies/DVD, desc: "Bollywood-Encoded DVDs"} - - {id: 122, cat: Movies/WEBDL, desc: "Bollywood-DVDRips 1080p/720p"} - - {id: 123, cat: Movies/WEBDL, desc: "Bollywood-SDRips WEB/DVD"} + - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"} + - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"} - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"} - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"} - - {id: 125, cat: Movies/WEBDL, desc: "Bollywood-WEB Originals"} + - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"} - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"} - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"} - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"} - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"} - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"} - - {id: 131, cat: Movies/WEBDL, desc: "Hollywood-Untouched WEB-DLs"} + - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"} - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"} - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"} - - {id: 191, cat: Movies/WEBDL, desc: "Hollywood-Encoded DVDs"} - - {id: 134, cat: Movies/WEBDL, desc: "Hollywood-DVDRips 1080p/720p"} + - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"} + - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"} - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"} - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"} - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"} @@ -88,12 +88,12 @@ caps: - {id: 173, cat: Audio, desc: "Music-Tamil"} - {id: 174, cat: Audio, desc: "Music-Telugu"} - {id: 196, cat: Audio, desc: "Music-Packs"} - - {id: 175, cat: Books/Ebook, desc: "EBooks"} + - {id: 175, cat: Books/EBook, desc: "EBooks"} - {id: 176, cat: PC/Games, desc: "Games PC"} - {id: 177, cat: Console, desc: "Games Console"} - {id: 178, cat: TV/Anime, desc: "Anime"} - {id: 179, cat: PC, desc: "Appz"} - - {id: 180, cat: PC/Phone-Other, desc: "Mobile Stuff"} + - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"} - {id: 181, cat: Other, desc: "Pics/Wallpapers"} - {id: 187, cat: XXX, desc: "Adult XXX 18+"} diff --git a/src/Jackett.Common/Definitions/carpathians.yml b/src/Jackett.Common/Definitions/carpathians.yml index 92234985d..d115a97e8 100644 --- a/src/Jackett.Common/Definitions/carpathians.yml +++ b/src/Jackett.Common/Definitions/carpathians.yml @@ -26,12 +26,12 @@ caps: - {id: 160, cat: Console/PS3, desc: "Játék/PS2-PS3"} - {id: 189, cat: Console/PSP, desc: "Játék/PSP"} - {id: 184, cat: Console/Wii, desc: "Játék/Wii"} - - {id: 150, cat: Console/Xbox, desc: "Játék/XBOX (XBOX360)"} + - {id: 150, cat: Console/XBox, desc: "Játék/XBOX (XBOX360)"} - {id: 182, cat: Audio/Lossless, desc: "Lossless"} - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"} - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"} - {id: 100, cat: Audio/Video, desc: "Music-Video"} - - {id: 180, cat: PC/Phone-Other, desc: "Program/Mobil"} + - {id: 180, cat: PC/Mobile-Other, desc: "Program/Mobil"} - {id: 170, cat: PC/0day, desc: "Program/PC"} - {id: 80, cat: TV, desc: "Sorozat/Eng"} - {id: 40, cat: TV, desc: "Sorozat/Hun"} diff --git a/src/Jackett.Common/Definitions/carphunter.yml b/src/Jackett.Common/Definitions/carphunter.yml index 7de3554b8..1e0893ed0 100644 --- a/src/Jackett.Common/Definitions/carphunter.yml +++ b/src/Jackett.Common/Definitions/carphunter.yml @@ -36,7 +36,7 @@ caps: - {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/Phone-Other, desc: "Mobil"} + - {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"} diff --git a/src/Jackett.Common/Definitions/cartoonchaos.yml b/src/Jackett.Common/Definitions/cartoonchaos.yml index 2530d24a1..e97c5c0aa 100644 --- a/src/Jackett.Common/Definitions/cartoonchaos.yml +++ b/src/Jackett.Common/Definitions/cartoonchaos.yml @@ -55,7 +55,7 @@ caps: - {id: 43, cat: Audio/Other, desc: "Misc Audio"} - {id: 14, cat: TV, desc: "Banned"} - {id: 29, cat: TV, desc: "Public Domain"} - - {id: 42, cat: TV/FOREIGN, desc: "Foreign Language"} + - {id: 42, cat: TV/Foreign, desc: "Foreign Language"} - {id: 28, cat: TV, desc: "Animated Adverts"} - {id: 45, cat: TV/Documentary, desc: "Documentaries"} diff --git a/src/Jackett.Common/Definitions/casatorrent.yml b/src/Jackett.Common/Definitions/casatorrent.yml index 1853be026..c266132e9 100644 --- a/src/Jackett.Common/Definitions/casatorrent.yml +++ b/src/Jackett.Common/Definitions/casatorrent.yml @@ -15,9 +15,9 @@ legacylinks: caps: categorymappings: - {id: 65, cat: Movies/HD, desc: "BD: BD"} - - {id: 68, cat: Books/Magazines, desc: "Ebooks: Presse"} + - {id: 68, cat: Books/Mags, desc: "Ebooks: Presse"} - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"} - - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"} + - {id: 56, cat: Books/EBook, desc: "Ebooks: Ebooks"} - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"} - {id: 84, cat: XXX, desc: "Ebooks: XXX"} - {id: 54, cat: Movies/3D, desc: "Films: 3D"} @@ -41,8 +41,8 @@ caps: - {id: 98, cat: Movies, desc: "Films: VFSTFR"} - {id: 89, cat: Movies, desc: "Films: VO"} - {id: 55, cat: Movies, desc: "Films: VOSTFR"} - - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"} - - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"} + - {id: 58, cat: Movies/WEB-DL, desc: "Films: Web - DL"} + - {id: 57, cat: Movies/WEB-DL, desc: "Films: WebRip"} - {id: 72, cat: Movies/HD, desc: "Films: x265"} - {id: 1, cat: XXX, desc: "Films: XXX"} - {id: 97, cat: Console, desc: "Jeux : Android"} diff --git a/src/Jackett.Common/Definitions/cinemamovies.yml b/src/Jackett.Common/Definitions/cinemamovies.yml index 26a174d2a..19cff7fe2 100644 --- a/src/Jackett.Common/Definitions/cinemamovies.yml +++ b/src/Jackett.Common/Definitions/cinemamovies.yml @@ -25,7 +25,7 @@ caps: - {id: 25, cat: TV/SD, desc: "TV SD"} - {id: 1, cat: PC, desc: "Aplikacje"} - {id: 15, cat: PC/Games, desc: "Gry"} - - {id: 16, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 17, cat: Other, desc: "Inne"} - {id: 19, cat: Audio, desc: "Muzyka"} - {id: 21, cat: Books, desc: "Book"} diff --git a/src/Jackett.Common/Definitions/cooltorrent.yml b/src/Jackett.Common/Definitions/cooltorrent.yml index f9f548781..47056f773 100644 --- a/src/Jackett.Common/Definitions/cooltorrent.yml +++ b/src/Jackett.Common/Definitions/cooltorrent.yml @@ -27,7 +27,7 @@ caps: - {id: "Erotyka", cat: XXX, desc: "Erotyka"} - {id: "Muzyka", cat: Audio, desc: "Muzyka"} - {id: "Programy", cat: PC, desc: "Programy"} - - {id: "GSM", cat: PC/Phone-Other, desc: "GSM/PDA"} + - {id: "GSM", cat: PC/Mobile-Other, desc: "GSM/PDA"} - {id: "Konsole", cat: Console, desc: "Konsole"} - {id: "Gry PC", cat: PC/Games, desc: "Gry PC"} - {id: "Dla Dzieci", cat: Movies, desc: "Dla Dzieci"} diff --git a/src/Jackett.Common/Definitions/crazyhd.yml b/src/Jackett.Common/Definitions/crazyhd.yml index 15c0c2992..8297f9e8c 100644 --- a/src/Jackett.Common/Definitions/crazyhd.yml +++ b/src/Jackett.Common/Definitions/crazyhd.yml @@ -16,13 +16,13 @@ caps: - {id: 16, cat: Movies/BluRay, desc: "Movies English Bluray"} - {id: 11, cat: Movies/DVD, desc: "Movies English DVD-RIP"} - {id: 14, cat: Movies, desc: "Movies English CAM"} - - {id: 60, cat: Movies/WEBDL, desc: "Movies English HD/WEBRIP"} + - {id: 60, cat: Movies/WEB-DL, desc: "Movies English HD/WEBRIP"} - {id: 19, cat: Movies/DVD, desc: "Movies Hindi DVDRIP"} - {id: 52, cat: Movies/BluRay, desc: "Movies Hindi Blu Ray"} - {id: 18, cat: Movies/DVD, desc: "Movies Hindi PreDVD"} - {id: 17, cat: Movies, desc: "Movies Hindi CAM"} - {id: 42, cat: Movies, desc: "Movies Tamil"} - - {id: 65, cat: Movies/WEBDL, desc: "Movies Hindi Webrip/HDrip"} + - {id: 65, cat: Movies/WEB-DL, desc: "Movies Hindi Webrip/HDrip"} - {id: 24, cat: Movies, desc: "Movies UNRATED"} - {id: 53, cat: Movies/Foreign, desc: "Movies Other Foreign"} - {id: 64, cat: Movies, desc: "Movies Animated"} @@ -40,17 +40,17 @@ caps: - {id: 95, cat: TV, desc: "TV Other Language"} # Games - {id: 3, cat: PC/Games, desc: "Games PC"} - - {id: 75, cat: PC/Phone-Android, desc: "Games Android"} - - {id: 77, cat: PC/Phone-IOS, desc: "Games Ipad/Iphone"} - - {id: 79, cat: PC/Phone-Other, desc: "Games Other Platforms"} + - {id: 75, cat: PC/Mobile-Android, desc: "Games Android"} + - {id: 77, cat: PC/Mobile-iOS, desc: "Games Ipad/Iphone"} + - {id: 79, cat: PC/Mobile-Other, desc: "Games Other Platforms"} - {id: 61, cat: PC/Games, desc: "Games trailer"} - {id: 90, cat: Console/PS4, desc: "Games Ps4"} - {id: 86, cat: Console/PS3, desc: "Games xbox / ps3"} - {id: 92, cat: PC/Games, desc: "Games nrated"} # Software - {id: 7, cat: PC/0day, desc: "Software Windows"} - - {id: 20, cat: PC/Phone-Android, desc: "Software Android Apps"} - - {id: 83, cat: PC/Phone-IOS, desc: "Software Iphone Apps"} + - {id: 20, cat: PC/Mobile-Android, desc: "Software Android Apps"} + - {id: 83, cat: PC/Mobile-iOS, desc: "Software Iphone Apps"} - {id: 39, cat: PC, desc: "Software Tutorials"} - {id: 63, cat: PC, desc: "Software Linux"} - {id: 89, cat: PC/Mac, desc: "Software MAC OSX"} @@ -78,7 +78,7 @@ caps: - {id: 4, cat: Other, desc: "Other"} - {id: 44, cat: Other, desc: "Food & Recipes"} - {id: 38, cat: Other, desc: "Pictures"} - - {id: 54, cat: Books/Magazines, desc: "Magazine"} + - {id: 54, cat: Books/Mags, desc: "Magazine"} - {id: 88, cat: Books/Comics, desc: "Comics"} modes: diff --git a/src/Jackett.Common/Definitions/crazyspirits.yml b/src/Jackett.Common/Definitions/crazyspirits.yml index e24dd1e68..9e21c18cb 100644 --- a/src/Jackett.Common/Definitions/crazyspirits.yml +++ b/src/Jackett.Common/Definitions/crazyspirits.yml @@ -35,14 +35,14 @@ caps: - {id: 67, cat: Movies, desc: "Films Pack Films"} - {id: 68, cat: Movies, desc: "Films VostFR"} - {id: 69, cat: Movies, desc: "Films VO"} - - {id: 70, cat: Movies/WEBDL, desc: "Films WebRip 1080p"} - - {id: 71, cat: Movies/WEBDL, desc: "Films WebRip 720p"} - - {id: 73, cat: Movies/WEBDL, desc: "Films Webrip"} - - {id: 72, cat: Movies/WEBDL, desc: "Films WEB DL"} + - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"} + - {id: 71, cat: Movies/WEB-DL, desc: "Films WebRip 720p"} + - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"} + - {id: 72, cat: Movies/WEB-DL, desc: "Films WEB DL"} - {id: 99, cat: Movies, desc: "Films Remux"} - {id: 98, cat: TV/Anime, desc: "Films Film Animées"} - - {id: 122, cat: Movies/WEBDL, desc: "Films Web-DL 1080P"} - - {id: 123, cat: Movies/WEBDL, desc: "Films WEB-DL 720p"} + - {id: 122, cat: Movies/WEB-DL, desc: "Films Web-DL 1080P"} + - {id: 123, cat: Movies/WEB-DL, desc: "Films WEB-DL 720p"} - {id: 126, cat: Movies, desc: "Films HDTV"} # Jeux - {id: 114, cat: PC/Games, desc: "Jeux PC"} @@ -52,20 +52,20 @@ caps: - {id: 118, cat: Console, desc: "Jeux Switch"} - {id: 119, cat: Console/Wii, desc: "Jeux Wii"} - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"} - - {id: 121, cat: Console/Xbox, desc: "Jeux Xbox"} + - {id: 121, cat: Console/XBox, desc: "Jeux Xbox"} # Livre - {id: 100, cat: Audio/Audiobook, desc: "Livre Audio"} - - {id: 101, cat: Books/Ebook, desc: "Livre Epub"} + - {id: 101, cat: Books/EBook, desc: "Livre Epub"} - {id: 102, cat: Books, desc: "Livre Mangas"} - {id: 103, cat: Books, desc: "Livres BD"} - {id: 104, cat: Books/Comics, desc: "Livres Comics"} - - {id: 105, cat: Books/Magazines, desc: "Livres Press"} + - {id: 105, cat: Books/Mags, desc: "Livres Press"} - {id: 106, cat: Books, desc: "Livres Romans"} # Logiciel - {id: 110, cat: PC/0day, desc: "Logiciel Windows"} - {id: 111, cat: PC, desc: "Logiciel Linux"} - - {id: 113, cat: PC/Phone-IOS, desc: "Logiciel Apple"} - - {id: 112, cat: PC/Phone-Other, desc: "Logiciel Smart Phone"} + - {id: 113, cat: PC/Mobile-iOS, desc: "Logiciel Apple"} + - {id: 112, cat: PC/Mobile-Other, desc: "Logiciel Smart Phone"} # Musiques - {id: 125, cat: Audio/Video, desc: "Musiques Videos Pack"} - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"} diff --git a/src/Jackett.Common/Definitions/dariustracker.yml b/src/Jackett.Common/Definitions/dariustracker.yml index ca0c3ec26..9ffcc935b 100644 --- a/src/Jackett.Common/Definitions/dariustracker.yml +++ b/src/Jackett.Common/Definitions/dariustracker.yml @@ -30,7 +30,7 @@ caps: - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"} - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"} - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"} - - {id: 32, cat: Console/Xbox, desc: "Játék/XBOX"} + - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"} - {id: 50, cat: Books, desc: "Könyv/Eng"} - {id: 27, cat: Books, desc: "Könyv/Hun"} - {id: 65, cat: Other, desc: "Képek"} @@ -39,7 +39,7 @@ caps: - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"} - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"} - {id: 69, cat: Movies/SD, desc: "Mese/XviD"} - - {id: 67, cat: PC/Phone-Other, desc: "Mobiltelefon"} + - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"} - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"} - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"} - {id: 14, cat: PC, desc: "Program/Egyéb"} diff --git a/src/Jackett.Common/Definitions/dark-shadow.yml b/src/Jackett.Common/Definitions/dark-shadow.yml index 2be96bcf8..2c6fb815a 100644 --- a/src/Jackett.Common/Definitions/dark-shadow.yml +++ b/src/Jackett.Common/Definitions/dark-shadow.yml @@ -40,7 +40,7 @@ caps: # App - {id: 12, cat: PC/0day, desc: "App PC"} - {id: 125, cat: PC/Mac, desc: "App MacOS"} - - {id: 11, cat: PC/Phone-Other, desc: "App Mobil"} + - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"} # Sport - {id: 61, cat: TV/Sport, desc: "Sport HD"} - {id: 62, cat: TV/Sport, desc: "Sport SD"} @@ -52,12 +52,12 @@ caps: - {id: 132, cat: Other, desc: "Internal Sonstiges"} # Sonstiges - {id: 64, cat: TV/Anime, desc: "Anime"} - - {id: 96, cat: Books/Ebook, desc: "e-Book"} + - {id: 96, cat: Books/EBook, desc: "e-Book"} - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"} - {id: 71, cat: Other, desc: "Anderes"} # XXX - {id: 73, cat: XXX/x264, desc: "XXX HD"} - - {id: 75, cat: XXX/Packs, desc: "XXX Pack"} + - {id: 75, cat: XXX/Pack, desc: "XXX Pack"} - {id: 76, cat: XXX/XviD, desc: "XXX SD"} - {id: 124, cat: XXX/Other, desc: "XXX Clips"} - {id: 133, cat: XXX/Other, desc: "XXX A/E-book"} diff --git a/src/Jackett.Common/Definitions/darktracker.yml b/src/Jackett.Common/Definitions/darktracker.yml index ec5c26052..b0b1018aa 100644 --- a/src/Jackett.Common/Definitions/darktracker.yml +++ b/src/Jackett.Common/Definitions/darktracker.yml @@ -26,7 +26,7 @@ caps: - {id: 1055, cat: Movies, desc: "Новинки проката"} - {id: 1058, cat: Movies, desc: " | Портал для новинок"} - {id: 1056, cat: Movies/SD, desc: " | Новинки (CamRip|TS)"} - - {id: 1057, cat: Movies/WEBDL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"} + - {id: 1057, cat: Movies/WEB-DL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"} - {id: 1059, cat: Movies, desc: " | Новинки (BD|HDTV|DVD)"} - {id: 57, cat: Movies, desc: "Зарубежные фильмы"} - {id: 1021, cat: Movies, desc: " | Фильмы 2011-2020"} @@ -122,12 +122,12 @@ caps: - {id: 269, cat: PC/Games, desc: "Архив"} # Консоли # Console - - {id: 679, cat: Console/Xbox, desc: "XBox"} - - {id: 684, cat: Console/Xbox, desc: " | XBox360 | Игры"} - - {id: 683, cat: Console/Xbox, desc: " | XBox360 | Демоверсии"} - - {id: 682, cat: Console/Xbox, desc: " | Xbox360 | Live"} - - {id: 681, cat: Console/Xbox, desc: " | XBox360 | Программы / Прошивки"} - - {id: 680, cat: Console/Xbox, desc: " | XBox | Игры"} + - {id: 679, cat: Console/XBox, desc: "XBox"} + - {id: 684, cat: Console/XBox, desc: " | XBox360 | Игры"} + - {id: 683, cat: Console/XBox, desc: " | XBox360 | Демоверсии"} + - {id: 682, cat: Console/XBox, desc: " | Xbox360 | Live"} + - {id: 681, cat: Console/XBox, desc: " | XBox360 | Программы / Прошивки"} + - {id: 680, cat: Console/XBox, desc: " | XBox | Игры"} - {id: 685, cat: Console/PS3, desc: "PlayStation"} - {id: 694, cat: Console/PS3, desc: " | Playstation 3 | Игры"} - {id: 693, cat: Console/PS3, desc: " | Playstation 3 | PSN Игры"} @@ -518,8 +518,8 @@ caps: - {id: 914, cat: PC, desc: " | Справочные системы"} - {id: 915, cat: PC, desc: " | Общий архив раздела "Справочно-правовые системы""} - {id: 908, cat: PC, desc: "Системы навигации и карты, ГИС"} - - {id: 1107, cat: PC/Phone-IOS, desc: " | iOS"} - - {id: 1106, cat: PC/Phone-Android, desc: " | Android"} + - {id: 1107, cat: PC/Mobile-iOS, desc: " | iOS"} + - {id: 1106, cat: PC/Mobile-Android, desc: " | Android"} - {id: 1105, cat: PC, desc: " | Garmin"} - {id: 1104, cat: PC/0day, desc: " | Windows XP/Vista/7/8/8.1/10"} - {id: 1103, cat: PC/0day, desc: " | Windows CE"} @@ -550,27 +550,27 @@ caps: - {id: 909, cat: PC, desc: "Разное"} # Смартфоны и Планшеты # mobiles - - {id: 921, cat: PC/Phone-Other, desc: "Windows Phone 7"} - - {id: 936, cat: PC/Phone-Other, desc: " | Прошивки"} - - {id: 935, cat: PC/Phone-Other, desc: " | Игры"} - - {id: 934, cat: PC/Phone-Other, desc: " | Программы"} - - {id: 1079, cat: PC/Phone-Other, desc: " | Архив"} - - {id: 922, cat: PC/Phone-Other, desc: "Windows Mobile 5.x - 6.x"} - - {id: 927, cat: PC/Phone-Other, desc: " | Прошивки"} - - {id: 926, cat: PC/Phone-Other, desc: " | Игры"} - - {id: 925, cat: PC/Phone-Other, desc: " | Программы"} - - {id: 1080, cat: PC/Phone-Other, desc: " | Архив"} - - {id: 923, cat: PC/Phone-Android, desc: "Android"} - - {id: 930, cat: PC/Phone-Android, desc: " | Игры"} - - {id: 929, cat: PC/Phone-Android, desc: " | Программы"} - - {id: 928, cat: PC/Phone-Android, desc: " | Прошивки"} - - {id: 1081, cat: PC/Phone-Android, desc: " | Архив"} - - {id: 924, cat: PC/Phone-Other, desc: "Symbian"} - - {id: 933, cat: PC/Phone-Other, desc: " | Игры"} - - {id: 932, cat: PC/Phone-Other, desc: " | Программы"} - - {id: 931, cat: PC/Phone-Other, desc: " | Прошивки"} - - {id: 1082, cat: PC/Phone-Other, desc: " | Архив"} - - {id: 1048, cat: PC/Phone-Other, desc: "Архив"} + - {id: 921, cat: PC/Mobile-Other, desc: "Windows Phone 7"} + - {id: 936, cat: PC/Mobile-Other, desc: " | Прошивки"} + - {id: 935, cat: PC/Mobile-Other, desc: " | Игры"} + - {id: 934, cat: PC/Mobile-Other, desc: " | Программы"} + - {id: 1079, cat: PC/Mobile-Other, desc: " | Архив"} + - {id: 922, cat: PC/Mobile-Other, desc: "Windows Mobile 5.x - 6.x"} + - {id: 927, cat: PC/Mobile-Other, desc: " | Прошивки"} + - {id: 926, cat: PC/Mobile-Other, desc: " | Игры"} + - {id: 925, cat: PC/Mobile-Other, desc: " | Программы"} + - {id: 1080, cat: PC/Mobile-Other, desc: " | Архив"} + - {id: 923, cat: PC/Mobile-Android, desc: "Android"} + - {id: 930, cat: PC/Mobile-Android, desc: " | Игры"} + - {id: 929, cat: PC/Mobile-Android, desc: " | Программы"} + - {id: 928, cat: PC/Mobile-Android, desc: " | Прошивки"} + - {id: 1081, cat: PC/Mobile-Android, desc: " | Архив"} + - {id: 924, cat: PC/Mobile-Other, desc: "Symbian"} + - {id: 933, cat: PC/Mobile-Other, desc: " | Игры"} + - {id: 932, cat: PC/Mobile-Other, desc: " | Программы"} + - {id: 931, cat: PC/Mobile-Other, desc: " | Прошивки"} + - {id: 1082, cat: PC/Mobile-Other, desc: " | Архив"} + - {id: 1048, cat: PC/Mobile-Other, desc: "Архив"} # Авто и Мото # Auto and Bikes - {id: 1095, cat: TV/Sport, desc: "Книги по ремонту/обслуживанию/эксплуатации ТС"} diff --git a/src/Jackett.Common/Definitions/datascene.yml b/src/Jackett.Common/Definitions/datascene.yml index 7da2cfb63..006feb0b3 100644 --- a/src/Jackett.Common/Definitions/datascene.yml +++ b/src/Jackett.Common/Definitions/datascene.yml @@ -22,7 +22,7 @@ caps: - {id: 43, cat: Console, desc: "Games | Console"} - {id: 29, cat: Other, desc: "Images"} - {id: 2, cat: Other, desc: "MiSC"} - - {id: 5, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 5, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 27, cat: Movies, desc: "Movies | Pack"} - {id: 63, cat: Movies, desc: "Movies | Pack-Ro"} - {id: 46, cat: Movies/3D, desc: "Movies | 3D"} diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml index a0f6570f8..342da60cf 100644 --- a/src/Jackett.Common/Definitions/demonoid.yml +++ b/src/Jackett.Common/Definitions/demonoid.yml @@ -29,11 +29,11 @@ caps: categorymappings: # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5 # Applications - - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"} - - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"} + - {id: 1, cat: PC/Mobile-Android, desc: "Applications Android"} + - {id: 2, cat: PC/Mobile-iOS, desc: "Applications Iphone / Ipod touch"} - {id: 3, cat: PC, desc: "Applications Linux"} - {id: 4, cat: PC/Mac, desc: "Applications Mac"} - - {id: 5, cat: PC/Phone-Other, desc: "Applications Mobile phone"} + - {id: 5, cat: PC/Mobile-Other, desc: "Applications Mobile phone"} - {id: 6, cat: PC, desc: "Applications PocketPC"} - {id: 7, cat: PC/0day, desc: "Applications Windows"} # Audio Books @@ -72,39 +72,39 @@ caps: - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"} - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"} # Books - - {id: 42, cat: Books/Ebook, desc: "Books Action and Adventure"} - - {id: 43, cat: Books/Ebook, desc: "Books Biography"} - - {id: 44, cat: Books/Ebook, desc: "Books Childrens"} - - {id: 45, cat: Books/Ebook, desc: "Books Computers and Technology"} - - {id: 46, cat: Books/Ebook, desc: "Books Contemporary"} - - {id: 47, cat: Books/Ebook, desc: "Books Cooking"} - - {id: 48, cat: Books/Ebook, desc: "Books Crafts and Hobbies"} - - {id: 49, cat: Books/Ebook, desc: "Books Educational"} - - {id: 50, cat: Books/Ebook, desc: "Books Fantasy"} - - {id: 51, cat: Books/Ebook, desc: "Books Fiction"} - - {id: 52, cat: Books/Ebook, desc: "Books General"} - - {id: 53, cat: Books/Ebook, desc: "Books History"} - - {id: 54, cat: Books/Ebook, desc: "Books Horror"} - - {id: 55, cat: Books/Ebook, desc: "Books Humor"} - - {id: 56, cat: Books/Ebook, desc: "Books Literary"} - - {id: 57, cat: Books/Magazines, desc: "Books Magazine"} - - {id: 58, cat: Books/Ebook, desc: "Books Mainstream"} - - {id: 59, cat: Books/Ebook, desc: "Books Medicine and Health"} - - {id: 60, cat: Books/Ebook, desc: "Books Mystery and Suspense"} - - {id: 61, cat: Books/Ebook, desc: "Books Newspaper"} - - {id: 62, cat: Books/Ebook, desc: "Books Nonfiction"} - - {id: 63, cat: Books/Ebook, desc: "Books Other"} - - {id: 64, cat: Books/Ebook, desc: "Books Paranormal"} - - {id: 65, cat: Books/Ebook, desc: "Books Religion"} - - {id: 66, cat: Books/Ebook, desc: "Books Romance"} - - {id: 67, cat: Books/Ebook, desc: "Books RPG"} - - {id: 68, cat: Books/Ebook, desc: "Books Sci-Fi"} - - {id: 69, cat: Books/Ebook, desc: "Books Self-help"} - - {id: 70, cat: Books/Ebook, desc: "Books Suspense"} - - {id: 71, cat: Books/Ebook, desc: "Books Textbook"} - - {id: 72, cat: Books/Ebook, desc: "Books Thriller"} - - {id: 73, cat: Books/Ebook, desc: "Books Western"} - - {id: 74, cat: Books/Ebook, desc: "Books Young Adult"} + - {id: 42, cat: Books/EBook, desc: "Books Action and Adventure"} + - {id: 43, cat: Books/EBook, desc: "Books Biography"} + - {id: 44, cat: Books/EBook, desc: "Books Childrens"} + - {id: 45, cat: Books/EBook, desc: "Books Computers and Technology"} + - {id: 46, cat: Books/EBook, desc: "Books Contemporary"} + - {id: 47, cat: Books/EBook, desc: "Books Cooking"} + - {id: 48, cat: Books/EBook, desc: "Books Crafts and Hobbies"} + - {id: 49, cat: Books/EBook, desc: "Books Educational"} + - {id: 50, cat: Books/EBook, desc: "Books Fantasy"} + - {id: 51, cat: Books/EBook, desc: "Books Fiction"} + - {id: 52, cat: Books/EBook, desc: "Books General"} + - {id: 53, cat: Books/EBook, desc: "Books History"} + - {id: 54, cat: Books/EBook, desc: "Books Horror"} + - {id: 55, cat: Books/EBook, desc: "Books Humor"} + - {id: 56, cat: Books/EBook, desc: "Books Literary"} + - {id: 57, cat: Books/Mags, desc: "Books Magazine"} + - {id: 58, cat: Books/EBook, desc: "Books Mainstream"} + - {id: 59, cat: Books/EBook, desc: "Books Medicine and Health"} + - {id: 60, cat: Books/EBook, desc: "Books Mystery and Suspense"} + - {id: 61, cat: Books/EBook, desc: "Books Newspaper"} + - {id: 62, cat: Books/EBook, desc: "Books Nonfiction"} + - {id: 63, cat: Books/EBook, desc: "Books Other"} + - {id: 64, cat: Books/EBook, desc: "Books Paranormal"} + - {id: 65, cat: Books/EBook, desc: "Books Religion"} + - {id: 66, cat: Books/EBook, desc: "Books Romance"} + - {id: 67, cat: Books/EBook, desc: "Books RPG"} + - {id: 68, cat: Books/EBook, desc: "Books Sci-Fi"} + - {id: 69, cat: Books/EBook, desc: "Books Self-help"} + - {id: 70, cat: Books/EBook, desc: "Books Suspense"} + - {id: 71, cat: Books/EBook, desc: "Books Textbook"} + - {id: 72, cat: Books/EBook, desc: "Books Thriller"} + - {id: 73, cat: Books/EBook, desc: "Books Western"} + - {id: 74, cat: Books/EBook, desc: "Books Young Adult"} # Comics - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"} - {id: 76, cat: Books/Comics, desc: "Comics Crime"} @@ -126,7 +126,7 @@ caps: - {id: 91, cat: Console/Other, desc: "Games GameCube"} - {id: 92, cat: PC, desc: "Games Linux"} - {id: 93, cat: PC/Mac, desc: "Games Mac"} - - {id: 94, cat: PC/Phone-Other, desc: "Games Mobile phone"} + - {id: 94, cat: PC/Mobile-Other, desc: "Games Mobile phone"} - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"} - {id: 96, cat: Console/Other, desc: "Games Palm"} - {id: 97, cat: Console/PS3, desc: "Games Playstation"} @@ -134,7 +134,7 @@ caps: - {id: 99, cat: Console/PSP, desc: "Games PSP"} - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"} - {id: 101, cat: PC/Games, desc: "Games Windows"} - - {id: 102, cat: Console/Xbox, desc: "Games XBox"} + - {id: 102, cat: Console/XBox, desc: "Games XBox"} # Anime - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"} - {id: 103, cat: TV/Anime, desc: "Anime Action"} diff --git a/src/Jackett.Common/Definitions/desitorrents.yml b/src/Jackett.Common/Definitions/desitorrents.yml index b1fd2f4f9..547b991df 100644 --- a/src/Jackett.Common/Definitions/desitorrents.yml +++ b/src/Jackett.Common/Definitions/desitorrents.yml @@ -71,8 +71,8 @@ caps: - {id: 83, cat: PC/Games, desc: "Games/XBOX"} - {id: 86, cat: PC/Games, desc: "Games/Playstation"} # books - - {id: 92, cat: Books/Magazines, desc: "Books/Magazine"} - - {id: 93, cat: Books/Ebook, desc: "Books/Novels"} + - {id: 92, cat: Books/Mags, desc: "Books/Magazine"} + - {id: 93, cat: Books/EBook, desc: "Books/Novels"} - {id: 95, cat: Books, desc: "Books/Newspapers"} - {id: 133, cat: Audio/Audiobook, desc: "Books/Audiobooks"} # Sport diff --git a/src/Jackett.Common/Definitions/diablotorrent.yml b/src/Jackett.Common/Definitions/diablotorrent.yml index 2be50a1fd..62ab35e3a 100644 --- a/src/Jackett.Common/Definitions/diablotorrent.yml +++ b/src/Jackett.Common/Definitions/diablotorrent.yml @@ -40,12 +40,12 @@ caps: - {id: 29, cat: Other, desc: "Egyéb / Képek"} - {id: 12, cat: PC/Games, desc: "Játék / PC"} - {id: 14, cat: Console/PS4, desc: "Játék / PS"} - - {id: 39, cat: Console/Xbox, desc: "Játék / Xbox"} + - {id: 39, cat: Console/XBox, desc: "Játék / Xbox"} - {id: 40, cat: Console/Other, desc: "Játék / Egyéb"} - {id: 16, cat: PC/ISO, desc: "Programok / PC"} - - {id: 24, cat: PC/Phone-Other, desc: "Programok / Mobil"} + - {id: 24, cat: PC/Mobile-Other, desc: "Programok / Mobil"} - {id: 53, cat: PC/0day, desc: "Programok / Egyéb"} - - {id: 17, cat: XXX/Xvid, desc: "Pornó / XviD"} + - {id: 17, cat: XXX/XviD, desc: "Pornó / XviD"} - {id: 34, cat: XXX/DVD, desc: "Pornó / DVD-R"} - {id: 35, cat: XXX, desc: "Pornó / HD"} - {id: 36, cat: XXX, desc: "Pornó / Képek"} diff --git a/src/Jackett.Common/Definitions/divteam.yml b/src/Jackett.Common/Definitions/divteam.yml index 6c2d48d58..ea5a2d0de 100644 --- a/src/Jackett.Common/Definitions/divteam.yml +++ b/src/Jackett.Common/Definitions/divteam.yml @@ -17,8 +17,8 @@ caps: - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"} - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"} - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"} - - {id: 82, cat: Movies/WEBDL, desc: "Pelis Web-DL 1080"} - - {id: 83, cat: Movies/WEBDL, desc: "Pelis Web-DL 720"} + - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"} + - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"} - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"} - {id: 23, cat: TV/Sport, desc: "Deportes"} - {id: 20, cat: TV/HD, desc: "Series"} @@ -33,11 +33,11 @@ caps: - {id: 79, cat: Movies, desc: "Saga Star Wars"} - {id: 18, cat: Movies/BluRay, desc: "Video Full & Remux"} - {id: 76, cat: Movies, desc: "x-men saga"} - - {id: 6, cat: Books/Ebook, desc: "EBooks"} - - {id: 58, cat: Books/Ebook, desc: "Kiosko"} + - {id: 6, cat: Books/EBook, desc: "EBooks"} + - {id: 58, cat: Books/EBook, desc: "Kiosko"} - {id: 24, cat: TV/Documentary, desc: "Documentales"} - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"} - - {id: 49, cat: Books/Ebook, desc: "eLearning"} + - {id: 49, cat: Books/EBook, desc: "eLearning"} - {id: 68, cat: TV, desc: "eLearning Multimedia"} - {id: 16, cat: Movies/DVD, desc: "DVD-Rip"} - {id: 48, cat: Movies/BluRay, desc: "BR-Rip/HD-Rip"} diff --git a/src/Jackett.Common/Definitions/documentarytorrents.yml b/src/Jackett.Common/Definitions/documentarytorrents.yml index 6d6837849..e995c1604 100644 --- a/src/Jackett.Common/Definitions/documentarytorrents.yml +++ b/src/Jackett.Common/Definitions/documentarytorrents.yml @@ -50,9 +50,9 @@ caps: - {id: 126, cat: TV/HD, desc: "PBS: HD"} - {id: 127, cat: TV/SD, desc: "PBS: Xvid / x264"} - {id: 72, cat: TV/HD, desc: "Politics: HD"} - - {id: 112, cat: Books/Ebook, desc: "Politics: Ebook"} + - {id: 112, cat: Books/EBook, desc: "Politics: Ebook"} - {id: 70, cat: TV/SD, desc: "Politics: Xvid / x264"} - - {id: 114, cat: Books/Ebook, desc: "Reference: Ebook"} + - {id: 114, cat: Books/EBook, desc: "Reference: Ebook"} - {id: 117, cat: Audio/Audiobook, desc: "Reference: Audio Book"} - {id: 56, cat: TV/HD, desc: "Religion: HD"} - {id: 54, cat: TV/SD, desc: "Religion: Xvid / x264"} diff --git a/src/Jackett.Common/Definitions/dragonworldreloaded.yml b/src/Jackett.Common/Definitions/dragonworldreloaded.yml index f67162ec3..f1f07fb69 100644 --- a/src/Jackett.Common/Definitions/dragonworldreloaded.yml +++ b/src/Jackett.Common/Definitions/dragonworldreloaded.yml @@ -47,12 +47,12 @@ caps: - {id: 17, cat: Console/PS3, desc: "Games - PS2/PS3"} - {id: 29, cat: Console/NDS, desc: "Games - NDS/3DS"} - {id: 15, cat: Console/Wii, desc: "Games - Wii"} - - {id: 8, cat: Console/Xbox, desc: "Games - XboX "} + - {id: 8, cat: Console/XBox, desc: "Games - XboX "} # Appz - {id: 30, cat: PC/0day, desc: "Appz - Windows"} - {id: 31, cat: PC/0day, desc: "Appz - Linux"} - {id: 32, cat: PC/Mac, desc: "Appz - Mac"} - - {id: 106, cat: PC/Phone-Android, desc: "Appz - Android"} + - {id: 106, cat: PC/Mobile-Android, desc: "Appz - Android"} # Sport - {id: 43, cat: TV/Sport, desc: "Sport - SD"} - {id: 50, cat: TV/Sport, desc: "Sport - HD"} diff --git a/src/Jackett.Common/Definitions/dxdhd.yml b/src/Jackett.Common/Definitions/dxdhd.yml index 9b87ce781..f00625b02 100644 --- a/src/Jackett.Common/Definitions/dxdhd.yml +++ b/src/Jackett.Common/Definitions/dxdhd.yml @@ -15,7 +15,7 @@ caps: - {id: 3, cat: Audio, desc: "Music"} - {id: 4, cat: TV/Anime, desc: "Anime-TV"} - {id: 5, cat: PC/0day, desc: "Apps"} - - {id: 6, cat: Books/Ebook, desc: "eBooks"} + - {id: 6, cat: Books/EBook, desc: "eBooks"} - {id: 7, cat: PC/Games, desc: "Games"} - {id: 8, cat: TV/Sport, desc: "Sports"} - {id: 9, cat: Other, desc: "Others"} diff --git a/src/Jackett.Common/Definitions/dxp.yml b/src/Jackett.Common/Definitions/dxp.yml index 5724ecc00..66908550a 100644 --- a/src/Jackett.Common/Definitions/dxp.yml +++ b/src/Jackett.Common/Definitions/dxp.yml @@ -24,12 +24,12 @@ caps: - {id: 1, cat: PC, desc: "Приложения Windows"} - {id: 3, cat: PC, desc: "Приложения Unix/Linux"} - {id: 4, cat: PC/Mac, desc: "Приложения Mac"} - - {id: 2, cat: PC/Phone-Other, desc: "Приложения PDA"} + - {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"} - {id: 5, cat: PC/Games, desc: "Игры PC"} - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"} - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"} - - {id: 7, cat: Console/Xbox, desc: "Игры X-Box"} + - {id: 7, cat: Console/XBox, desc: "Игры X-Box"} - {id: 8, cat: Console/PSP, desc: "Игры PSP"} - {id: 18, cat: Other, desc: "Эксклюзивы"} diff --git a/src/Jackett.Common/Definitions/ebookparadijs.yml b/src/Jackett.Common/Definitions/ebookparadijs.yml index 46a1a2173..85833e362 100644 --- a/src/Jackett.Common/Definitions/ebookparadijs.yml +++ b/src/Jackett.Common/Definitions/ebookparadijs.yml @@ -10,32 +10,32 @@ links: caps: categorymappings: - - {id: 2, cat: Books/Ebook, desc: "Roman"} - - {id: 3, cat: Books/Ebook, desc: "Thriller"} - - {id: 4, cat: Books/Ebook, desc: "Diverse"} - - {id: 7, cat: Books/Ebook, desc: "Jeugd"} - - {id: 8, cat: Books/Ebook, desc: "Oorlog"} - - {id: 9, cat: Books/Ebook, desc: "Luisterboeken"} - - {id: 10, cat: Books/Ebook, desc: "Stripboeken"} - - {id: 11, cat: Books/Ebook, desc: "Crime"} - - {id: 13, cat: Books/Ebook, desc: "Detective"} - - {id: 15, cat: Books/Ebook, desc: "Erothiek"} - - {id: 16, cat: Books/Ebook, desc: "Tijdschriften"} - - {id: 17, cat: Books/Ebook, desc: "Hobby"} - - {id: 19, cat: Books/Ebook, desc: "Medisch"} - - {id: 21, cat: Books/Ebook, desc: "Sport"} - - {id: 50, cat: Books/Ebook, desc: "Kookboeken"} - - {id: 51, cat: Books/Ebook, desc: "Fantasy"} - - {id: 52, cat: Books/Ebook, desc: "Kerst"} - - {id: 53, cat: Books/Ebook, desc: "Waargebeurd"} - - {id: 56, cat: Books/Ebook, desc: "Engels"} - - {id: 57, cat: Books/Ebook, desc: "Maatschappij"} - - {id: 58, cat: Books/Ebook, desc: "Biografie"} - - {id: 61, cat: Books/Ebook, desc: "Geschiedenis"} - - {id: 60, cat: Books/Ebook, desc: "Sci-Fi"} - - {id: 64, cat: Books/Ebook, desc: "Literatuur"} - - {id: 65, cat: Books/Ebook, desc: "Non-Fiction"} - - {id: 66, cat: Books/Ebook, desc: "Bladmuziek"} + - {id: 2, cat: Books/EBook, desc: "Roman"} + - {id: 3, cat: Books/EBook, desc: "Thriller"} + - {id: 4, cat: Books/EBook, desc: "Diverse"} + - {id: 7, cat: Books/EBook, desc: "Jeugd"} + - {id: 8, cat: Books/EBook, desc: "Oorlog"} + - {id: 9, cat: Books/EBook, desc: "Luisterboeken"} + - {id: 10, cat: Books/EBook, desc: "Stripboeken"} + - {id: 11, cat: Books/EBook, desc: "Crime"} + - {id: 13, cat: Books/EBook, desc: "Detective"} + - {id: 15, cat: Books/EBook, desc: "Erothiek"} + - {id: 16, cat: Books/EBook, desc: "Tijdschriften"} + - {id: 17, cat: Books/EBook, desc: "Hobby"} + - {id: 19, cat: Books/EBook, desc: "Medisch"} + - {id: 21, cat: Books/EBook, desc: "Sport"} + - {id: 50, cat: Books/EBook, desc: "Kookboeken"} + - {id: 51, cat: Books/EBook, desc: "Fantasy"} + - {id: 52, cat: Books/EBook, desc: "Kerst"} + - {id: 53, cat: Books/EBook, desc: "Waargebeurd"} + - {id: 56, cat: Books/EBook, desc: "Engels"} + - {id: 57, cat: Books/EBook, desc: "Maatschappij"} + - {id: 58, cat: Books/EBook, desc: "Biografie"} + - {id: 61, cat: Books/EBook, desc: "Geschiedenis"} + - {id: 60, cat: Books/EBook, desc: "Sci-Fi"} + - {id: 64, cat: Books/EBook, desc: "Literatuur"} + - {id: 65, cat: Books/EBook, desc: "Non-Fiction"} + - {id: 66, cat: Books/EBook, desc: "Bladmuziek"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/ebooks-shares.yml b/src/Jackett.Common/Definitions/ebooks-shares.yml index 460093b74..42eb6471d 100644 --- a/src/Jackett.Common/Definitions/ebooks-shares.yml +++ b/src/Jackett.Common/Definitions/ebooks-shares.yml @@ -44,21 +44,21 @@ caps: - {id: 276, cat: Audio/Audiobook, desc: "Audio: Military Fiction"} - {id: 299, cat: Audio/Audiobook, desc: "Audio: Magazines"} - {id: 301, cat: Audio/Audiobook, desc: "Audio: Collections"} - - {id: 47, cat: Books/Ebook, desc: "Children's: Adventure"} - - {id: 48, cat: Books/Ebook, desc: "Children's: Novels"} - - {id: 49, cat: Books/Ebook, desc: "Children's: Collections"} - - {id: 50, cat: Books/Ebook, desc: "Children's: Educational"} - - {id: 51, cat: Books/Ebook, desc: "Children's: Games"} - - {id: 52, cat: Books/Ebook, desc: "Children's: General"} - - {id: 283, cat: Books/Ebook, desc: "Children's: Sci-Fi/Fantasy"} - - {id: 284, cat: Books/Ebook, desc: "Children's: Mystery"} - - {id: 286, cat: Books/Ebook, desc: "Children's: Early Years / Picture"} - - {id: 295, cat: Books/Ebook, desc: "Children's: Nonfiction"} - - {id: 296, cat: Books/Ebook, desc: "Children's: Leveled / Decodable Readers"} - - {id: 288, cat: Books/Ebook, desc: "Collections: Same Author"} - - {id: 289, cat: Books/Ebook, desc: "Collections: Same Series"} - - {id: 291, cat: Books/Ebook, desc: "Collections: Fiction"} - - {id: 292, cat: Books/Ebook, desc: "Collections: Non Fiction"} + - {id: 47, cat: Books/EBook, desc: "Children's: Adventure"} + - {id: 48, cat: Books/EBook, desc: "Children's: Novels"} + - {id: 49, cat: Books/EBook, desc: "Children's: Collections"} + - {id: 50, cat: Books/EBook, desc: "Children's: Educational"} + - {id: 51, cat: Books/EBook, desc: "Children's: Games"} + - {id: 52, cat: Books/EBook, desc: "Children's: General"} + - {id: 283, cat: Books/EBook, desc: "Children's: Sci-Fi/Fantasy"} + - {id: 284, cat: Books/EBook, desc: "Children's: Mystery"} + - {id: 286, cat: Books/EBook, desc: "Children's: Early Years / Picture"} + - {id: 295, cat: Books/EBook, desc: "Children's: Nonfiction"} + - {id: 296, cat: Books/EBook, desc: "Children's: Leveled / Decodable Readers"} + - {id: 288, cat: Books/EBook, desc: "Collections: Same Author"} + - {id: 289, cat: Books/EBook, desc: "Collections: Same Series"} + - {id: 291, cat: Books/EBook, desc: "Collections: Fiction"} + - {id: 292, cat: Books/EBook, desc: "Collections: Non Fiction"} - {id: 220, cat: Books/Comics, desc: "Comics: Archie"} - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"} - {id: 225, cat: Books/Comics, desc: "Comics: ComicStrip Collection"} @@ -80,102 +80,102 @@ caps: - {id: 61, cat: Books/Technical, desc: "Computer: OS/Other"} - {id: 62, cat: Books/Technical, desc: "Computer: OS/Windows"} - {id: 63, cat: Books/Technical, desc: "Computer: Programming "} - - {id: 66, cat: Books/Ebook, desc: "Doc/Vid/Tut: Computer"} - - {id: 67, cat: Books/Ebook, desc: "Doc/Vid/Tut: Crafts"} - - {id: 68, cat: Books/Ebook, desc: "Doc/Vid/Tut: Educational"} - - {id: 69, cat: Books/Ebook, desc: "Doc/Vid/Tut: General"} - - {id: 70, cat: Books/Ebook, desc: "Doc/Vid/Tut: History"} - - {id: 71, cat: Books/Ebook, desc: "Doc/Vid/Tut: Medical/Health"} - - {id: 72, cat: Books/Ebook, desc: "Doc/Vid/Tut: Military"} - - {id: 73, cat: Books/Ebook, desc: "Doc/Vid/Tut: Modelling"} - - {id: 74, cat: Books/Ebook, desc: "Doc/Vid/Tut: Sciences"} - - {id: 75, cat: Books/Ebook, desc: "Doc/Vid/Tut: Transportation"} - - {id: 76, cat: Books/Ebook, desc: "Doc/Vid/Tut: Woodworking"} - - {id: 287, cat: Books/Ebook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"} - - {id: 121, cat: Books/Ebook, desc: "Educational: Arts"} - - {id: 122, cat: Books/Ebook, desc: "Educational: Astronomy/Cosmology"} - - {id: 123, cat: Books/Ebook, desc: "Educational: Biology & Genetics"} - - {id: 124, cat: Books/Ebook, desc: "Educational: Chemistry"} - - {id: 125, cat: Books/Ebook, desc: "Educational: Culture/Languages"} - - {id: 126, cat: Books/Ebook, desc: "Educational: Earth Sciences"} - - {id: 127, cat: Books/Ebook, desc: "Educational: Educational"} - - {id: 128, cat: Books/Ebook, desc: "Educational: Engineering & Technology "} - - {id: 129, cat: Books/Ebook, desc: "Educational: Environmental Studies"} - - {id: 130, cat: Books/Ebook, desc: "Educational: General Science Titles"} - - {id: 131, cat: Books/Ebook, desc: "Educational: Literature / Writing"} - - {id: 132, cat: Books/Ebook, desc: "Educational: Mathematics and Statistics"} - - {id: 133, cat: Books/Ebook, desc: "Educational: Medical Texts"} - - {id: 134, cat: Books/Ebook, desc: "Educational: Military History"} - - {id: 135, cat: Books/Ebook, desc: "Educational: Non-Military History"} - - {id: 136, cat: Books/Ebook, desc: "Educational: Paleontology"} - - {id: 137, cat: Books/Ebook, desc: "Educational: Physics"} - - {id: 138, cat: Books/Ebook, desc: "Educational: Psychology"} - - {id: 139, cat: Books/Ebook, desc: "Educational: Student Reference"} - - {id: 297, cat: Books/Ebook, desc: "Educational: Life Sciences/Evolution/Human "} - - {id: 77, cat: Books/Ebook, desc: "Fiction: Adventure"} - - {id: 78, cat: Books/Ebook, desc: "Fiction: Classics"} - - {id: 79, cat: Books/Ebook, desc: "Fiction: Collections"} - - {id: 80, cat: Books/Ebook, desc: "Fiction: Comedy/Humorous "} - - {id: 81, cat: Books/Ebook, desc: "Fiction: Crime/Mystery/Thriller"} - - {id: 302, cat: Books/Ebook, desc: "Fiction: Cozy Mysteries"} - - {id: 82, cat: Books/Ebook, desc: "Fiction: General Fiction"} - - {id: 83, cat: Books/Ebook, desc: "Fiction: Horror"} - - {id: 84, cat: Books/Ebook, desc: "Fiction: Military & Historic"} - - {id: 86, cat: Books/Ebook, desc: "Fiction: Romance"} - - {id: 87, cat: Books/Ebook, desc: "Fiction: Sci-Fi/Fantasy"} - - {id: 88, cat: Books/Ebook, desc: "Fiction: Westerns"} - - {id: 270, cat: Books/Ebook, desc: "Fiction: Historical "} - - {id: 312, cat: Books/Ebook, desc: "Fiction: Various Authors"} - - {id: 303, cat: Books/Ebook, desc: "Fiction: Poetry"} - - {id: 313, cat: Books/Ebook, desc: "Fiction: Dystopian"} - - {id: 140, cat: Books/Ebook, desc: "Hobby/Pastime: Art"} - - {id: 141, cat: Books/Ebook, desc: "Hobby/Pastime: Boating"} - - {id: 142, cat: Books/Ebook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"} - - {id: 143, cat: Books/Ebook, desc: "Hobby/Pastime: Food & Drink"} - - {id: 144, cat: Books/Ebook, desc: "Hobby/Pastime: Games/RPG/Gaming"} - - {id: 145, cat: Books/Ebook, desc: "Hobby/Pastime: General Pastimes"} - - {id: 146, cat: Books/Ebook, desc: "Hobby/Pastime: Graphic Arts and Design"} - - {id: 147, cat: Books/Ebook, desc: "Hobby/Pastime: Health/Lifestyle"} - - {id: 148, cat: Books/Ebook, desc: "Hobby/Pastime: Home/Gardening"} - - {id: 149, cat: Books/Ebook, desc: "Hobby/Pastime: Metalworking"} - - {id: 150, cat: Books/Ebook, desc: "Hobby/Pastime: Modelling"} - - {id: 151, cat: Books/Ebook, desc: "Hobby/Pastime: Pets/Vet Science"} - - {id: 152, cat: Books/Ebook, desc: "Hobby/Pastime: Photography"} - - {id: 153, cat: Books/Ebook, desc: "Hobby/Pastime: Quiz and Crossword Books"} - - {id: 154, cat: Books/Ebook, desc: "Hobby/Pastime: Sports"} - - {id: 155, cat: Books/Ebook, desc: "Hobby/Pastime: Travel"} - - {id: 156, cat: Books/Ebook, desc: "Hobby/Pastime: Woodworking"} - - {id: 157, cat: Books/Ebook, desc: "Language Learn: Arabic"} - - {id: 158, cat: Books/Ebook, desc: "Language Learn: Chinese"} - - {id: 159, cat: Books/Ebook, desc: "Language Learn: English"} - - {id: 160, cat: Books/Ebook, desc: "Language Learn: French"} - - {id: 161, cat: Books/Ebook, desc: "Language Learn: German"} - - {id: 162, cat: Books/Ebook, desc: "Language Learn: Italian"} - - {id: 163, cat: Books/Ebook, desc: "Language Learn: Japanese"} - - {id: 164, cat: Books/Ebook, desc: "Language Learn: Latin"} - - {id: 165, cat: Books/Ebook, desc: "Language Learn: Nordic Lang"} - - {id: 166, cat: Books/Ebook, desc: "Language Learn: Oriental Lang"} - - {id: 167, cat: Books/Ebook, desc: "Language Learn: Russian"} - - {id: 168, cat: Books/Ebook, desc: "Language Learn: Spanish"} - - {id: 169, cat: Books/Ebook, desc: "Language Learn: Other Lang"} - - {id: 310, cat: Books/Magazines, desc: "Magazines: Woodworking"} - - {id: 311, cat: Books/Magazines, desc: "Magazines: Sewing, Knitting and Quilting"} - - {id: 170, cat: Books/Magazines, desc: "Magazines : Computer"} - - {id: 171, cat: Books/Magazines, desc: "Magazines: Current Events"} - - {id: 172, cat: Books/Magazines, desc: "Magazines: Business/Finance "} - - {id: 173, cat: Books/Magazines, desc: "Magazines: Electronics"} - - {id: 174, cat: Books/Magazines, desc: "Magazines: General/Misc"} - - {id: 175, cat: Books/Magazines, desc: "Magazines: Military"} - - {id: 176, cat: Books/Magazines, desc: "Magazines: Photography"} - - {id: 177, cat: Books/Magazines, desc: "Magazines: Sciences "} - - {id: 178, cat: Books/Magazines, desc: "Magazines: Sports"} - - {id: 179, cat: Books/Magazines, desc: "Magazines: Technology"} - - {id: 180, cat: Books/Magazines, desc: "Magazines: Transportation"} - - {id: 181, cat: Books/Ebook, desc: "Military: Aircraft"} - - {id: 182, cat: Books/Ebook, desc: "Military: Armour"} - - {id: 183, cat: Books/Ebook, desc: "Military: General Military"} - - {id: 184, cat: Books/Ebook, desc: "Military: Miscellaneous"} - - {id: 185, cat: Books/Ebook, desc: "Military: Naval"} + - {id: 66, cat: Books/EBook, desc: "Doc/Vid/Tut: Computer"} + - {id: 67, cat: Books/EBook, desc: "Doc/Vid/Tut: Crafts"} + - {id: 68, cat: Books/EBook, desc: "Doc/Vid/Tut: Educational"} + - {id: 69, cat: Books/EBook, desc: "Doc/Vid/Tut: General"} + - {id: 70, cat: Books/EBook, desc: "Doc/Vid/Tut: History"} + - {id: 71, cat: Books/EBook, desc: "Doc/Vid/Tut: Medical/Health"} + - {id: 72, cat: Books/EBook, desc: "Doc/Vid/Tut: Military"} + - {id: 73, cat: Books/EBook, desc: "Doc/Vid/Tut: Modelling"} + - {id: 74, cat: Books/EBook, desc: "Doc/Vid/Tut: Sciences"} + - {id: 75, cat: Books/EBook, desc: "Doc/Vid/Tut: Transportation"} + - {id: 76, cat: Books/EBook, desc: "Doc/Vid/Tut: Woodworking"} + - {id: 287, cat: Books/EBook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"} + - {id: 121, cat: Books/EBook, desc: "Educational: Arts"} + - {id: 122, cat: Books/EBook, desc: "Educational: Astronomy/Cosmology"} + - {id: 123, cat: Books/EBook, desc: "Educational: Biology & Genetics"} + - {id: 124, cat: Books/EBook, desc: "Educational: Chemistry"} + - {id: 125, cat: Books/EBook, desc: "Educational: Culture/Languages"} + - {id: 126, cat: Books/EBook, desc: "Educational: Earth Sciences"} + - {id: 127, cat: Books/EBook, desc: "Educational: Educational"} + - {id: 128, cat: Books/EBook, desc: "Educational: Engineering & Technology "} + - {id: 129, cat: Books/EBook, desc: "Educational: Environmental Studies"} + - {id: 130, cat: Books/EBook, desc: "Educational: General Science Titles"} + - {id: 131, cat: Books/EBook, desc: "Educational: Literature / Writing"} + - {id: 132, cat: Books/EBook, desc: "Educational: Mathematics and Statistics"} + - {id: 133, cat: Books/EBook, desc: "Educational: Medical Texts"} + - {id: 134, cat: Books/EBook, desc: "Educational: Military History"} + - {id: 135, cat: Books/EBook, desc: "Educational: Non-Military History"} + - {id: 136, cat: Books/EBook, desc: "Educational: Paleontology"} + - {id: 137, cat: Books/EBook, desc: "Educational: Physics"} + - {id: 138, cat: Books/EBook, desc: "Educational: Psychology"} + - {id: 139, cat: Books/EBook, desc: "Educational: Student Reference"} + - {id: 297, cat: Books/EBook, desc: "Educational: Life Sciences/Evolution/Human "} + - {id: 77, cat: Books/EBook, desc: "Fiction: Adventure"} + - {id: 78, cat: Books/EBook, desc: "Fiction: Classics"} + - {id: 79, cat: Books/EBook, desc: "Fiction: Collections"} + - {id: 80, cat: Books/EBook, desc: "Fiction: Comedy/Humorous "} + - {id: 81, cat: Books/EBook, desc: "Fiction: Crime/Mystery/Thriller"} + - {id: 302, cat: Books/EBook, desc: "Fiction: Cozy Mysteries"} + - {id: 82, cat: Books/EBook, desc: "Fiction: General Fiction"} + - {id: 83, cat: Books/EBook, desc: "Fiction: Horror"} + - {id: 84, cat: Books/EBook, desc: "Fiction: Military & Historic"} + - {id: 86, cat: Books/EBook, desc: "Fiction: Romance"} + - {id: 87, cat: Books/EBook, desc: "Fiction: Sci-Fi/Fantasy"} + - {id: 88, cat: Books/EBook, desc: "Fiction: Westerns"} + - {id: 270, cat: Books/EBook, desc: "Fiction: Historical "} + - {id: 312, cat: Books/EBook, desc: "Fiction: Various Authors"} + - {id: 303, cat: Books/EBook, desc: "Fiction: Poetry"} + - {id: 313, cat: Books/EBook, desc: "Fiction: Dystopian"} + - {id: 140, cat: Books/EBook, desc: "Hobby/Pastime: Art"} + - {id: 141, cat: Books/EBook, desc: "Hobby/Pastime: Boating"} + - {id: 142, cat: Books/EBook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"} + - {id: 143, cat: Books/EBook, desc: "Hobby/Pastime: Food & Drink"} + - {id: 144, cat: Books/EBook, desc: "Hobby/Pastime: Games/RPG/Gaming"} + - {id: 145, cat: Books/EBook, desc: "Hobby/Pastime: General Pastimes"} + - {id: 146, cat: Books/EBook, desc: "Hobby/Pastime: Graphic Arts and Design"} + - {id: 147, cat: Books/EBook, desc: "Hobby/Pastime: Health/Lifestyle"} + - {id: 148, cat: Books/EBook, desc: "Hobby/Pastime: Home/Gardening"} + - {id: 149, cat: Books/EBook, desc: "Hobby/Pastime: Metalworking"} + - {id: 150, cat: Books/EBook, desc: "Hobby/Pastime: Modelling"} + - {id: 151, cat: Books/EBook, desc: "Hobby/Pastime: Pets/Vet Science"} + - {id: 152, cat: Books/EBook, desc: "Hobby/Pastime: Photography"} + - {id: 153, cat: Books/EBook, desc: "Hobby/Pastime: Quiz and Crossword Books"} + - {id: 154, cat: Books/EBook, desc: "Hobby/Pastime: Sports"} + - {id: 155, cat: Books/EBook, desc: "Hobby/Pastime: Travel"} + - {id: 156, cat: Books/EBook, desc: "Hobby/Pastime: Woodworking"} + - {id: 157, cat: Books/EBook, desc: "Language Learn: Arabic"} + - {id: 158, cat: Books/EBook, desc: "Language Learn: Chinese"} + - {id: 159, cat: Books/EBook, desc: "Language Learn: English"} + - {id: 160, cat: Books/EBook, desc: "Language Learn: French"} + - {id: 161, cat: Books/EBook, desc: "Language Learn: German"} + - {id: 162, cat: Books/EBook, desc: "Language Learn: Italian"} + - {id: 163, cat: Books/EBook, desc: "Language Learn: Japanese"} + - {id: 164, cat: Books/EBook, desc: "Language Learn: Latin"} + - {id: 165, cat: Books/EBook, desc: "Language Learn: Nordic Lang"} + - {id: 166, cat: Books/EBook, desc: "Language Learn: Oriental Lang"} + - {id: 167, cat: Books/EBook, desc: "Language Learn: Russian"} + - {id: 168, cat: Books/EBook, desc: "Language Learn: Spanish"} + - {id: 169, cat: Books/EBook, desc: "Language Learn: Other Lang"} + - {id: 310, cat: Books/Mags, desc: "Magazines: Woodworking"} + - {id: 311, cat: Books/Mags, desc: "Magazines: Sewing, Knitting and Quilting"} + - {id: 170, cat: Books/Mags, desc: "Magazines : Computer"} + - {id: 171, cat: Books/Mags, desc: "Magazines: Current Events"} + - {id: 172, cat: Books/Mags, desc: "Magazines: Business/Finance "} + - {id: 173, cat: Books/Mags, desc: "Magazines: Electronics"} + - {id: 174, cat: Books/Mags, desc: "Magazines: General/Misc"} + - {id: 175, cat: Books/Mags, desc: "Magazines: Military"} + - {id: 176, cat: Books/Mags, desc: "Magazines: Photography"} + - {id: 177, cat: Books/Mags, desc: "Magazines: Sciences "} + - {id: 178, cat: Books/Mags, desc: "Magazines: Sports"} + - {id: 179, cat: Books/Mags, desc: "Magazines: Technology"} + - {id: 180, cat: Books/Mags, desc: "Magazines: Transportation"} + - {id: 181, cat: Books/EBook, desc: "Military: Aircraft"} + - {id: 182, cat: Books/EBook, desc: "Military: Armour"} + - {id: 183, cat: Books/EBook, desc: "Military: General Military"} + - {id: 184, cat: Books/EBook, desc: "Military: Miscellaneous"} + - {id: 185, cat: Books/EBook, desc: "Military: Naval"} - {id: 186, cat: Books/Foreign, desc: "Non English Bks: Dutch"} - {id: 187, cat: Books/Foreign, desc: "Non English Bks: French"} - {id: 188, cat: Books/Foreign, desc: "Non English Bks: German"} @@ -190,53 +190,53 @@ caps: - {id: 197, cat: Books/Foreign, desc: "Non English Bks: Scandinavian"} - {id: 198, cat: Books/Foreign, desc: "Non English Bks: Serbian"} - {id: 199, cat: Books/Foreign, desc: "Non English Bks: Spanish"} - - {id: 89, cat: Books/Ebook, desc: "Non Fict/Ref: Agricultural"} - - {id: 90, cat: Books/Ebook, desc: "Non Fict/Ref: Alt. Therapies"} - - {id: 95, cat: Books/Ebook, desc: "Non Fict/Ref: Architecture"} - - {id: 91, cat: Books/Ebook, desc: "Non Fict/Ref: Auto & Repair"} - - {id: 92, cat: Books/Ebook, desc: "Non Fict/Ref: Aviation"} - - {id: 94, cat: Books/Ebook, desc: "Non Fict/Ref: Biographies and Memoirs"} - - {id: 96, cat: Books/Ebook, desc: "Non Fict/Ref: Business/Finance"} - - {id: 97, cat: Books/Ebook, desc: "Non Fict/Ref: Comedy/Humorous"} - - {id: 98, cat: Books/Ebook, desc: "Non Fict/Ref: Crime"} - - {id: 99, cat: Books/Ebook, desc: "Non Fict/Ref: Criminology"} - - {id: 100, cat: Books/Ebook, desc: "Non Fict/Ref: Economics & Math"} - - {id: 102, cat: Books/Ebook, desc: "Non Fict/Ref: Electronics"} - - {id: 103, cat: Books/Ebook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"} - - {id: 104, cat: Books/Ebook, desc: "Non Fict/Ref: Entertainment"} - - {id: 105, cat: Books/Ebook, desc: "Non Fict/Ref: General Ref"} - - {id: 106, cat: Books/Ebook, desc: "Non Fict/Ref: Geo & Archaeology"} - - {id: 107, cat: Books/Ebook, desc: "Non Fict/Ref: Journ/Current Affairs "} - - {id: 108, cat: Books/Ebook, desc: "Non Fict/Ref: Legal"} - - {id: 109, cat: Books/Ebook, desc: "Non Fict/Ref: Medical/Health"} - - {id: 110, cat: Books/Ebook, desc: "Non Fict/Ref: Motorcycle"} - - {id: 111, cat: Books/Ebook, desc: "Non Fict/Ref: Music"} - - {id: 112, cat: Books/Ebook, desc: "Non Fict/Ref: Parenting/Family"} - - {id: 113, cat: Books/Ebook, desc: "Non Fict/Ref: Philosophy & Belief"} - - {id: 114, cat: Books/Ebook, desc: "Non Fict/Ref: Literature / Writing"} - - {id: 115, cat: Books/Ebook, desc: "Non Fict/Ref: Political Science"} - - {id: 116, cat: Books/Ebook, desc: "Non Fict/Ref: Project Management"} - - {id: 117, cat: Books/Ebook, desc: "Non Fict/Ref: Self-Improvement"} - - {id: 118, cat: Books/Ebook, desc: "Non Fict/Ref: Sht Music-Tablatures"} - - {id: 119, cat: Books/Ebook, desc: "Non Fict/Ref: Sociology/Politics"} - - {id: 120, cat: Books/Ebook, desc: "Non Fict/Ref: Transportation"} - - {id: 266, cat: Books/Ebook, desc: "Non Fict/Ref: Technology Books"} - - {id: 267, cat: Books/Ebook, desc: "Non Fict/Ref: History Books"} - - {id: 271, cat: Books/Ebook, desc: "Non Fict/Ref: Collections"} - - {id: 272, cat: Books/Ebook, desc: "Non Fict/Ref: DIY (Do It Yourself)"} - - {id: 273, cat: Books/Ebook, desc: "Non Fict/Ref: Archaeology"} - - {id: 278, cat: Books/Ebook, desc: "Non Fict/Ref: Conspiracy Theory/UFO/Alien Bk"} - - {id: 279, cat: Books/Ebook, desc: "Non Fict/Ref: Psychology"} - - {id: 280, cat: Books/Ebook, desc: "Non Fict/Ref: Education"} - - {id: 282, cat: Books/Ebook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"} - - {id: 293, cat: Books/Ebook, desc: "Non Fict/Ref: Zoology & Veterinary Science"} - - {id: 294, cat: Books/Ebook, desc: "Non Fict/Ref: True Stories"} - - {id: 300, cat: Books/Ebook, desc: "Non Fict/Ref: Maritime Books (Building,navig"} - - {id: 200, cat: Books/Ebook, desc: "Teens: Collections"} - - {id: 201, cat: Books/Ebook, desc: "Teens: Educational"} - - {id: 202, cat: Books/Ebook, desc: "Teens: Fiction"} - - {id: 203, cat: Books/Ebook, desc: "Teens: Non Fiction"} - - {id: 285, cat: Books/Ebook, desc: "Teens: Sci-Fi/Fantasy"} + - {id: 89, cat: Books/EBook, desc: "Non Fict/Ref: Agricultural"} + - {id: 90, cat: Books/EBook, desc: "Non Fict/Ref: Alt. Therapies"} + - {id: 95, cat: Books/EBook, desc: "Non Fict/Ref: Architecture"} + - {id: 91, cat: Books/EBook, desc: "Non Fict/Ref: Auto & Repair"} + - {id: 92, cat: Books/EBook, desc: "Non Fict/Ref: Aviation"} + - {id: 94, cat: Books/EBook, desc: "Non Fict/Ref: Biographies and Memoirs"} + - {id: 96, cat: Books/EBook, desc: "Non Fict/Ref: Business/Finance"} + - {id: 97, cat: Books/EBook, desc: "Non Fict/Ref: Comedy/Humorous"} + - {id: 98, cat: Books/EBook, desc: "Non Fict/Ref: Crime"} + - {id: 99, cat: Books/EBook, desc: "Non Fict/Ref: Criminology"} + - {id: 100, cat: Books/EBook, desc: "Non Fict/Ref: Economics & Math"} + - {id: 102, cat: Books/EBook, desc: "Non Fict/Ref: Electronics"} + - {id: 103, cat: Books/EBook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"} + - {id: 104, cat: Books/EBook, desc: "Non Fict/Ref: Entertainment"} + - {id: 105, cat: Books/EBook, desc: "Non Fict/Ref: General Ref"} + - {id: 106, cat: Books/EBook, desc: "Non Fict/Ref: Geo & Archaeology"} + - {id: 107, cat: Books/EBook, desc: "Non Fict/Ref: Journ/Current Affairs "} + - {id: 108, cat: Books/EBook, desc: "Non Fict/Ref: Legal"} + - {id: 109, cat: Books/EBook, desc: "Non Fict/Ref: Medical/Health"} + - {id: 110, cat: Books/EBook, desc: "Non Fict/Ref: Motorcycle"} + - {id: 111, cat: Books/EBook, desc: "Non Fict/Ref: Music"} + - {id: 112, cat: Books/EBook, desc: "Non Fict/Ref: Parenting/Family"} + - {id: 113, cat: Books/EBook, desc: "Non Fict/Ref: Philosophy & Belief"} + - {id: 114, cat: Books/EBook, desc: "Non Fict/Ref: Literature / Writing"} + - {id: 115, cat: Books/EBook, desc: "Non Fict/Ref: Political Science"} + - {id: 116, cat: Books/EBook, desc: "Non Fict/Ref: Project Management"} + - {id: 117, cat: Books/EBook, desc: "Non Fict/Ref: Self-Improvement"} + - {id: 118, cat: Books/EBook, desc: "Non Fict/Ref: Sht Music-Tablatures"} + - {id: 119, cat: Books/EBook, desc: "Non Fict/Ref: Sociology/Politics"} + - {id: 120, cat: Books/EBook, desc: "Non Fict/Ref: Transportation"} + - {id: 266, cat: Books/EBook, desc: "Non Fict/Ref: Technology Books"} + - {id: 267, cat: Books/EBook, desc: "Non Fict/Ref: History Books"} + - {id: 271, cat: Books/EBook, desc: "Non Fict/Ref: Collections"} + - {id: 272, cat: Books/EBook, desc: "Non Fict/Ref: DIY (Do It Yourself)"} + - {id: 273, cat: Books/EBook, desc: "Non Fict/Ref: Archaeology"} + - {id: 278, cat: Books/EBook, desc: "Non Fict/Ref: Conspiracy Theory/UFO/Alien Bk"} + - {id: 279, cat: Books/EBook, desc: "Non Fict/Ref: Psychology"} + - {id: 280, cat: Books/EBook, desc: "Non Fict/Ref: Education"} + - {id: 282, cat: Books/EBook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"} + - {id: 293, cat: Books/EBook, desc: "Non Fict/Ref: Zoology & Veterinary Science"} + - {id: 294, cat: Books/EBook, desc: "Non Fict/Ref: True Stories"} + - {id: 300, cat: Books/EBook, desc: "Non Fict/Ref: Maritime Books (Building,navig"} + - {id: 200, cat: Books/EBook, desc: "Teens: Collections"} + - {id: 201, cat: Books/EBook, desc: "Teens: Educational"} + - {id: 202, cat: Books/EBook, desc: "Teens: Fiction"} + - {id: 203, cat: Books/EBook, desc: "Teens: Non Fiction"} + - {id: 285, cat: Books/EBook, desc: "Teens: Sci-Fi/Fantasy"} - {id: 305, cat: Books/Other, desc: "VIP: Science Fiction"} - {id: 307, cat: Books/Other, desc: "VIP: Thriller"} - {id: 306, cat: Books/Other, desc: "VIP: Mystery"} diff --git a/src/Jackett.Common/Definitions/estone.yml b/src/Jackett.Common/Definitions/estone.yml index d90fbdadc..315636257 100644 --- a/src/Jackett.Common/Definitions/estone.yml +++ b/src/Jackett.Common/Definitions/estone.yml @@ -26,12 +26,12 @@ caps: - {id: 28, cat: PC/Games, desc: "Játék/ISO"} - {id: 30, cat: PC/Games, desc: "Játék/Rip"} - {id: 32, cat: Console, desc: "Konzol"} - - {id: 34, cat: PC/Phone-Other, desc: "Mobil"} + - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"} - {id: 44, cat: Books, desc: "Könyv/Hun"} - {id: 33, cat: Books, desc: "Könyv/Eng"} - {id: 31, cat: Other, desc: "Képek"} - {id: 39, cat: XXX, desc: "XXX/Film"} - - {id: 49, cat: XXX/Imageset, desc: "XXX/Kép"} + - {id: 49, cat: XXX/ImageSet, desc: "XXX/Kép"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/ethor.yml b/src/Jackett.Common/Definitions/ethor.yml index eb8dc4298..892c073ef 100644 --- a/src/Jackett.Common/Definitions/ethor.yml +++ b/src/Jackett.Common/Definitions/ethor.yml @@ -22,7 +22,7 @@ caps: - {id: 41, cat: Console, desc: "Jeux/Portable"} - {id: 34, cat: Console/PS4, desc: "Jeux/PS2-PS3"} - {id: 38, cat: Console/Wii, desc: "Jeux/Wii-GC"} - - {id: 40, cat: Console/Xbox, desc: "Jeux/Xbox360"} + - {id: 40, cat: Console/XBox, desc: "Jeux/Xbox360"} - {id: 6, cat: Audio, desc: "Musique"} - {id: 37, cat: Audio/Video, desc: "Musique/Video"} - {id: 48, cat: TV/HD, desc: "Série-Télé/Bluray"} diff --git a/src/Jackett.Common/Definitions/ettv.yml b/src/Jackett.Common/Definitions/ettv.yml index 5df8976c4..2c44a32ac 100644 --- a/src/Jackett.Common/Definitions/ettv.yml +++ b/src/Jackett.Common/Definitions/ettv.yml @@ -48,8 +48,8 @@ caps: - {id: 75, cat: TV/Anime, desc: "Anime - Others"} - {id: 56, cat: Audio/Audiobook, desc: "Books - Audio"} - {id: 55, cat: Books/Comics, desc: "Books - Comics"} - - {id: 53, cat: Books/Ebook, desc: "Books - Ebooks"} - - {id: 54, cat: Books/Magazines, desc: "Books - Magazines"} + - {id: 53, cat: Books/EBook, desc: "Books - Ebooks"} + - {id: 54, cat: Books/Mags, desc: "Books - Magazines"} - {id: 68, cat: Books/Other, desc: "Books - Others"} - {id: 90, cat: Books/Other, desc: "Books - Others"} - {id: 58, cat: PC/Games, desc: "Games - Android"} @@ -74,10 +74,10 @@ caps: - {id: 69, cat: Audio/Other, desc: "Music - Others"} - {id: 95, cat: Other/Misc, desc: "Others - Misc"} - {id: 78, cat: Other, desc: "Others - Unsorted"} - - {id: 63, cat: PC/Phone-Android, desc: "Software - Android"} + - {id: 63, cat: PC/Mobile-Android, desc: "Software - Android"} - {id: 64, cat: PC/Mac, desc: "Software - Mac"} - {id: 70, cat: PC, desc: "Software - Others"} - - {id: 62, cat: PC/0Day, desc: "Software - Windows"} + - {id: 62, cat: PC/0day, desc: "Software - Windows"} - {id: 94, cat: Books, desc: "Tutorials - Tutorials"} - {id: 79, cat: TV/Documentary, desc: "Documentary"} - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"} diff --git a/src/Jackett.Common/Definitions/exkinoray.yml b/src/Jackett.Common/Definitions/exkinoray.yml index 43397a349..3f767fd4d 100644 --- a/src/Jackett.Common/Definitions/exkinoray.yml +++ b/src/Jackett.Common/Definitions/exkinoray.yml @@ -48,9 +48,9 @@ caps: - {id: 84, cat: Audio/Video, desc: "Другое Видеоклипы"} - {id: 85, cat: PC/Games, desc: "Другое Игры"} - {id: 86, cat: PC/0day, desc: "Другое Программы"} - - {id: 87, cat: Console/Xbox, desc: "Другое XBox"} + - {id: 87, cat: Console/XBox, desc: "Другое XBox"} - {id: 88, cat: Console/PSP, desc: "Другое PSP"} - - {id: 89, cat: Books/Magazines, desc: "Другое Журналы"} + - {id: 89, cat: Books/Mags, desc: "Другое Журналы"} - {id: 90, cat: Other, desc: "Другое Графика"} - {id: 93, cat: Other, desc: "Другое Библиотека"} - {id: 94, cat: Console/PS3, desc: "Другое PS3"} diff --git a/src/Jackett.Common/Definitions/extremlymtorrents.yml b/src/Jackett.Common/Definitions/extremlymtorrents.yml index c0fe33096..e463194f5 100644 --- a/src/Jackett.Common/Definitions/extremlymtorrents.yml +++ b/src/Jackett.Common/Definitions/extremlymtorrents.yml @@ -23,18 +23,18 @@ caps: - {id: 41, cat: TV, desc: "TVRip"} - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"} - {id: 9, cat: TV, desc: "Kidz | Cartoons"} - - {id: 8, cat: Books/Ebook, desc: "Comics | EBook"} + - {id: 8, cat: Books/EBook, desc: "Comics | EBook"} - {id: 10, cat: TV, desc: "TV Episode | Season Complete"} - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"} - - {id: 25, cat: Movies/WEBDL, desc: "WEBRip | WEB-DL"} + - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"} - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"} - {id: 3, cat: PC, desc: "Applications"} - {id: 17, cat: Console/PSP, desc: "PSP | Playstation "} - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"} - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3 "} - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"} - - {id: 20, cat: PC/Phone-IOS, desc: "Iphone iOS"} - - {id: 19, cat: PC/Phone-Android, desc: "Android Apk"} + - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"} + - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"} - {id: 21, cat: Movies, desc: "Pack"} - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"} - {id: 24, cat: Audio/Video, desc: "VideoClip"} @@ -48,9 +48,9 @@ caps: - {id: 29, cat: PC/0day, desc: "Windows PC"} - {id: 7, cat: PC/Mac, desc: "Mac"} - {id: 23, cat: PC, desc: "Linux"} - - {id: 32, cat: PC/Phone-Other, desc: "GPS Navigation"} + - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"} - {id: 45, cat: Audio, desc: "Vinyl Rip"} - - {id: 2, cat: Console/Xbox 360, desc: "XBOX 360"} + - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"} - {id: 1, cat: PC/Games, desc: "Games PC"} - {id: 14, cat: Other, desc: "Wallpapers"} - {id: 44, cat: Movies, desc: "Bollywood"} diff --git a/src/Jackett.Common/Definitions/exttorrents.yml b/src/Jackett.Common/Definitions/exttorrents.yml index 14220bef5..e65a9fa32 100644 --- a/src/Jackett.Common/Definitions/exttorrents.yml +++ b/src/Jackett.Common/Definitions/exttorrents.yml @@ -17,16 +17,16 @@ caps: "/anime/": TV/Anime "/anime/english-translated/": TV/Anime "/applications/": PC - "/applications/android/": PC/Phone-Android - "/applications/ios/": PC/Phone-IOS + "/applications/android/": PC/Mobile-Android + "/applications/ios/": PC/Mobile-iOS "/applications/linux/": PC "/applications/mac/": PC/Mac - "/applications/other-applications/": PC/Phone-Other + "/applications/other-applications/": PC/Mobile-Other "/applications/windows/": PC/0day "/books/": Books "/books/audio-books/": Audio/Audiobook "/books/comics/": Books/Comics - "/books/ebooks/": Books/Ebook + "/books/ebooks/": Books/EBook "/games/": PC/Games "/games/nds/": Console/NDS "/games/other-games/": Console/Other @@ -35,7 +35,7 @@ caps: "/games/ps4/": Console/PS4 "/games/psp/": Console/PSP "/games/wii/": Console/Wii - "/games/xbox360/": Console/Xbox 360 + "/games/xbox360/": Console/XBox 360 "/movies/": Movies "/movies/3d-movies/": Movies/3D "/movies/bollywood/": Movies diff --git a/src/Jackett.Common/Definitions/fanoin.yml b/src/Jackett.Common/Definitions/fanoin.yml index 6f685a9c8..600080cd8 100644 --- a/src/Jackett.Common/Definitions/fanoin.yml +++ b/src/Jackett.Common/Definitions/fanoin.yml @@ -26,7 +26,7 @@ caps: - {id: 29, cat: Books, desc: "Cartoons"} - {id: 24, cat: Movies/Foreign, desc: "Movies/Lat"} - {id: 25, cat: TV/Foreign, desc: "TV/Lat"} - - {id: 34, cat: Console/Xbox, desc: "Games/Xbox"} + - {id: 34, cat: Console/XBox, desc: "Games/Xbox"} - {id: 19, cat: Audio/Video, desc: "Music Videos"} - {id: 46, cat: Console, desc: "Packs/Games"} - {id: 42, cat: Other, desc: "Study"} @@ -34,7 +34,7 @@ caps: - {id: 37, cat: Movies/HD, desc: "Movies/HD"} - {id: 35, cat: TV/HD, desc: "TV/HD"} - {id: 43, cat: Console/PS4, desc: "Games/PS"} - - {id: 38, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 38, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 48, cat: Audio, desc: "Packs/Music"} - {id: 36, cat: Other, desc: "X-mas"} - {id: 53, cat: Movies/SD, desc: "Movies/CAM"} @@ -42,7 +42,7 @@ caps: - {id: 32, cat: TV, desc: "TV/Facts"} - {id: 40, cat: Console/Wii, desc: "Games/Wii"} - {id: 22, cat: PC/0day, desc: "Appz/misc"} - - {id: 50, cat: XXX/Packs, desc: "Packs/XXX"} + - {id: 50, cat: XXX/Pack, desc: "Packs/XXX"} - {id: 9, cat: XXX, desc: "XXX"} - {id: 45, cat: XXX, desc: "XXX/HD"} - {id: 54, cat: Movies, desc: "Movies/Retro"} diff --git a/src/Jackett.Common/Definitions/fantasticheaven.yml b/src/Jackett.Common/Definitions/fantasticheaven.yml index 8c6701698..976dece43 100644 --- a/src/Jackett.Common/Definitions/fantasticheaven.yml +++ b/src/Jackett.Common/Definitions/fantasticheaven.yml @@ -28,14 +28,14 @@ caps: - {id: 65, cat: TV/HD, desc: "Serien 720p"} - {id: 66, cat: TV/HD, desc: "Serien 1080p"} - {id: 68, cat: TV/UHD, desc: "Serien 2160p"} - - {id: 69, cat: TV/FOREIGN, desc: "Serien Ger-Subbed"} - - {id: 70, cat: TV/FOREIGN, desc: "Serien International"} + - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"} + - {id: 70, cat: TV/Foreign, desc: "Serien International"} - {id: 76, cat: TV/SD, desc: "Serienpacks SD x264/x265"} - {id: 77, cat: TV/HD, desc: "Serienpacks 720p"} - {id: 78, cat: TV/HD, desc: "Serienpacks 1080p"} - {id: 81, cat: TV/UHD, desc: "Serienpacks 2160p"} - - {id: 79, cat: TV/FOREIGN, desc: "Serienpacks Ger-Subbed"} - - {id: 80, cat: TV/FOREIGN, desc: "Serienpacks International"} + - {id: 79, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"} + - {id: 80, cat: TV/Foreign, desc: "Serienpacks International"} - {id: 115, cat: Movies/SD, desc: "Kids-Filme SD x264/x265"} - {id: 116, cat: Movies/HD, desc: "Kids-Filme 720p"} - {id: 117, cat: Movies/HD, desc: "Kids-Filme 1080p"} @@ -45,7 +45,7 @@ caps: - {id: 112, cat: TV/SD, desc: "Kids-Serien Packs SD"} - {id: 113, cat: TV/HD, desc: "Kids-Serien Packs 720p"} - {id: 114, cat: TV/HD, desc: "Kids-Serien Packs 1080p"} - - {id: 127, cat: TV/FOREIGN, desc: "Kids-Serien International"} + - {id: 127, cat: TV/Foreign, desc: "Kids-Serien International"} - {id: 98, cat: TV/SD, desc: "Tatort SD x264/x265"} - {id: 99, cat: TV/HD, desc: "Tatort 720p"} - {id: 105, cat: TV/SD, desc: "Daily Soaps SD x264/x265"} @@ -75,20 +75,20 @@ caps: - {id: 75, cat: Audio/Video, desc: "Audio Musikvideo"} - {id: 123, cat: PC, desc: "Software Windows"} - {id: 124, cat: PC, desc: "Software Linux"} - - {id: 125, cat: PC/Phone-Android, desc: "Software Android"} + - {id: 125, cat: PC/Mobile-Android, desc: "Software Android"} - {id: 126, cat: PC/Mac, desc: "Software MacOS"} - {id: 132, cat: PC/Games, desc: "Spiele Windows"} - {id: 133, cat: PC/Mac, desc: "Spiele MacOS"} - {id: 134, cat: Console, desc: "Spiele Nintendo"} - - {id: 90, cat: Books/Magazines, desc: "Diverses Zeitschriften"} - - {id: 89, cat: Books/Ebook, desc: "Diverses E-Books"} + - {id: 90, cat: Books/Mags, desc: "Diverses Zeitschriften"} + - {id: 89, cat: Books/EBook, desc: "Diverses E-Books"} - {id: 91, cat: XXX/x264, desc: "XXX SD x264/x265"} - {id: 92, cat: XXX/x264, desc: "XXX 720p"} - {id: 93, cat: XXX/x264, desc: "XXX 1080p"} - - {id: 95, cat: XXX/Packs, desc: "XXX Packs SD"} - - {id: 96, cat: XXX/Packs, desc: "XXX Packs HD"} - - {id: 94, cat: XXX/Imageset, desc: "XXX Magazine"} - - {id: 97, cat: XXX/Imageset, desc: "XXX Pics"} + - {id: 95, cat: XXX/Pack, desc: "XXX Packs SD"} + - {id: 96, cat: XXX/Pack, desc: "XXX Packs HD"} + - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"} + - {id: 97, cat: XXX/ImageSet, desc: "XXX Pics"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/filebase.yml b/src/Jackett.Common/Definitions/filebase.yml index 07fd66679..bcd01049f 100644 --- a/src/Jackett.Common/Definitions/filebase.yml +++ b/src/Jackett.Common/Definitions/filebase.yml @@ -41,7 +41,7 @@ caps: - {id: eng-music, cat: Audio, desc: "Eng Музыка (eng-music)"} - {id: rus-music, cat: Audio, desc: "Rus Музыка (rus-music)"} - {id: books, cat: Books, desc: "Книги (books)"} - - {id: phone, cat: PC/Phone-Other, desc: "Телефон (phone)"} + - {id: phone, cat: PC/Mobile-Other, desc: "Телефон (phone)"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/film-paleis.yml b/src/Jackett.Common/Definitions/film-paleis.yml index 9be13accc..08011be81 100644 --- a/src/Jackett.Common/Definitions/film-paleis.yml +++ b/src/Jackett.Common/Definitions/film-paleis.yml @@ -18,7 +18,7 @@ caps: - {id: 5, cat: Movies/DVD, desc: " DVD Films"} - {id: 7, cat: Movies/UHD, desc: " 4K films"} - {id: 8, cat: XXX, desc: " Erotiek"} - - {id: 9, cat: PC/Phone-Other, desc: " GSM/Navigatie"} + - {id: 9, cat: PC/Mobile-Other, desc: " GSM/Navigatie"} - {id: 10, cat: Audio, desc: " Muziek Album"} - {id: 11, cat: Audio/Other, desc: " Muziek Diverse"} - {id: 12, cat: Console/NDS, desc: " Nintendo"} @@ -28,7 +28,7 @@ caps: - {id: 17, cat: PC, desc: " PC Spellen"} - {id: 19, cat: TV, desc: " TV Series"} - {id: 21, cat: Movies/SD, desc: " Divx/Xvid"} - - {id: 24, cat: Books/Ebook, desc: " E-Books"} + - {id: 24, cat: Books/EBook, desc: " E-Books"} - {id: 26, cat: Audio/Other, desc: " Cabaret"} - {id: 27, cat: TV/Documentary, desc: " Documentaire"} - {id: 31, cat: Movies/HD, desc: " FP-release"} diff --git a/src/Jackett.Common/Definitions/finelite.yml b/src/Jackett.Common/Definitions/finelite.yml index 6aba1da87..74f4a6c7d 100644 --- a/src/Jackett.Common/Definitions/finelite.yml +++ b/src/Jackett.Common/Definitions/finelite.yml @@ -40,12 +40,12 @@ caps: categorymappings: - {id: 8, cat: PC/0day, desc: "0day/Apps"} - {id: 29, cat: TV/Documentary, desc: "Documentary"} - - {id: 24, cat: Books/Ebook, desc: "Ebooks"} + - {id: 24, cat: Books/EBook, desc: "Ebooks"} - {id: 28, cat: Movies, desc: "FE-INT"} - {id: 10, cat: Console, desc: "Games - Console"} - {id: 11, cat: PC/Games, desc: "Games - PC"} - {id: 26, cat: Movies, desc: "Kids"} - - {id: 9, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 9, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 12, cat: Movies, desc: "Movie Pack"} - {id: 13, cat: Movies/DVD, desc: "Movies DVD-r"} - {id: 14, cat: Movies/HD, desc: "Movies HD"} diff --git a/src/Jackett.Common/Definitions/finvip.yml b/src/Jackett.Common/Definitions/finvip.yml index 6593155ae..f4c386123 100644 --- a/src/Jackett.Common/Definitions/finvip.yml +++ b/src/Jackett.Common/Definitions/finvip.yml @@ -12,7 +12,7 @@ caps: categorymappings: - {id: 5, cat: TV/Anime, desc: "Anime"} - {id: 25, cat: TV/Documentary, desc: "Dokumentit (docs)"} - - {id: 6, cat: Books/Ebook, desc: "eBooks"} + - {id: 6, cat: Books/EBook, desc: "eBooks"} - {id: 26, cat: TV, desc: "Kannet/Tekstit (subs)"} - {id: 20, cat: TV/SD, desc: "Lasten DVD (kids)"} - {id: 33, cat: TV/SD, desc: "Lasten XviD (kids)"} @@ -28,13 +28,13 @@ caps: - {id: 9, cat: PC/Mac, desc: "Ohjelmat Mac (apps)"} - {id: 17, cat: PC/Games, desc: "Pelit PC (games)"} - {id: 18, cat: Console/PSP, desc: "Pelit PlayStation (games)"} - - {id: 19, cat: Console/Xbox, desc: "Pelit Xbox (games)"} + - {id: 19, cat: Console/XBox, desc: "Pelit Xbox (games)"} - {id: 35, cat: Console/Wii, desc: "Pelit Wii (games)"} - {id: 22, cat: XXX, desc: "Pr0n DVD (xxx)"} - {id: 23, cat: XXX, desc: "Pr0n XviD (xxx)"} - {id: 36, cat: XXX, desc: "Pr0n Muut (xxx)"} - {id: 47, cat: XXX, desc: "Pr0n HD (xxx)"} - - {id: 24, cat: PC/Phone-Other, desc: "Puhelimeen (phone)"} + - {id: 24, cat: PC/Mobile-Other, desc: "Puhelimeen (phone)"} - {id: 1, cat: TV/SD, desc: "Sarjat DVD (series)"} - {id: 30, cat: TV, desc: "Sarjat (series)"} - {id: 41, cat: TV/HD, desc: "Sarjat HD (series)"} diff --git a/src/Jackett.Common/Definitions/firebit.yml b/src/Jackett.Common/Definitions/firebit.yml index 04f269f9d..5a457f143 100644 --- a/src/Jackett.Common/Definitions/firebit.yml +++ b/src/Jackett.Common/Definitions/firebit.yml @@ -28,8 +28,8 @@ caps: "Программы FAQ": PC "Программы Web Оформление": PC "Linux": PC - "Мобилка": PC/Phone-Other - "Мобилка Игры": PC/Phone-Other + "Мобилка": PC/Mobile-Other + "Мобилка Игры": PC/Mobile-Other "Литература": Books "Игры": PC/Games "Игры Мобилка": PC/Games diff --git a/src/Jackett.Common/Definitions/fouducinema.yml b/src/Jackett.Common/Definitions/fouducinema.yml index 96279ae9e..0628390a2 100644 --- a/src/Jackett.Common/Definitions/fouducinema.yml +++ b/src/Jackett.Common/Definitions/fouducinema.yml @@ -13,34 +13,34 @@ caps: - {id: 2, cat: Movies/DVD, desc: "Film DVD"} - {id: 4, cat: Movies/HD, desc: "Film 1080P"} - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"} - - {id: 16, cat: Movies/WEBDL, desc: "Film Web"} + - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"} - {id: 17, cat: Movies/Other, desc: "Film Iso"} - {id: 19, cat: Movies/HD, desc: "Film 720P"} - {id: 59, cat: Movies/Other, desc: "Film Divers"} - {id: 64, cat: Movies/Other, desc: "Film Rip"} - {id: 46, cat: TV/HD, desc: "Série 1080P"} - {id: 48, cat: TV/HD, desc: "Série Bluray"} - - {id: 60, cat: TV/OTHER, desc: "Série Divers"} - - {id: 12, cat: TV/OTHER, desc: "Série DVDRip"} + - {id: 60, cat: TV/Other, desc: "Série Divers"} + - {id: 12, cat: TV/Other, desc: "Série DVDRip"} - {id: 30, cat: TV/HD, desc: "Série 720P"} - {id: 23, cat: TV/WEB-DL, desc: "Série Web"} - {id: 44, cat: TV/HD, desc: "Pack Séries 1080P"} - - {id: 38, cat: TV/OTHER, desc: "Pack Séries intégrale"} + - {id: 38, cat: TV/Other, desc: "Pack Séries intégrale"} - {id: 41, cat: TV/WEB-DL, desc: "Pack Séries Web"} - {id: 45, cat: TV/HD, desc: "Pack Séries 720P"} - - {id: 63, cat: TV/OTHER, desc: "Pack Séries Divers"} + - {id: 63, cat: TV/Other, desc: "Pack Séries Divers"} - {id: 10, cat: XXX, desc: "XxX Film"} - {id: 13, cat: PC/0day, desc: "Apps Win"} - {id: 14, cat: PC/Mac, desc: "Apps Mac"} - - {id: 52, cat: PC/Phone-IOS, desc: "Apps Iphone"} - - {id: 53, cat: PC/Phone-Android, desc: "Apps android"} + - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"} + - {id: 53, cat: PC/Mobile-Android, desc: "Apps android"} - {id: 5, cat: Audio/MP3, desc: "Music Mp3"} - {id: 6, cat: Audio/Lossless, desc: "Music FLAC"} - {id: 7, cat: PC/Games, desc: "Jeux Win"} - {id: 8, cat: Console/PS3, desc: "Jeux PS3"} - {id: 54, cat: PC/Games, desc: "Jeux Pc"} - {id: 55, cat: Console/PS4, desc: "Jeux PS4"} - - {id: 56, cat: Console/Xbox 360, desc: "Jeux XBOX 360"} + - {id: 56, cat: Console/XBox 360, desc: "Jeux XBOX 360"} - {id: 57, cat: Console/Other, desc: "Jeux androïd"} modes: diff --git a/src/Jackett.Common/Definitions/funreleases.yml b/src/Jackett.Common/Definitions/funreleases.yml index dcbb435a9..dabb46aa0 100644 --- a/src/Jackett.Common/Definitions/funreleases.yml +++ b/src/Jackett.Common/Definitions/funreleases.yml @@ -34,8 +34,8 @@ caps: - {id: 31, cat: TV/SD, desc: "Serien SD"} - {id: 32, cat: TV/SD, desc: "Serien Pack|SD"} - {id: 33, cat: TV, desc: "Serien TV/Shows"} - - {id: 34, cat: TV/FOREIGN, desc: "Serien International"} - - {id: 35, cat: TV/OTHER, desc: "Serien Sonstiges"} + - {id: 34, cat: TV/Foreign, desc: "Serien International"} + - {id: 35, cat: TV/Other, desc: "Serien Sonstiges"} - {id: 36, cat: TV/Documentary, desc: "Doku HD"} - {id: 37, cat: TV/Documentary, desc: "Doku Pack|HD"} - {id: 38, cat: TV/Documentary, desc: "Doku SD"} @@ -44,18 +44,18 @@ caps: - {id: 41, cat: TV/Documentary, desc: "Doku Sonstiges"} - {id: 42, cat: PC/Games, desc: "Games Windows"} - {id: 43, cat: Console/PSP, desc: "Games Playstation"} - - {id: 44, cat: Console/Xbox, desc: "Games XBox"} + - {id: 44, cat: Console/XBox, desc: "Games XBox"} - {id: 45, cat: Console/NDS, desc: "Games Nintendo"} - {id: 46, cat: PC/Games, desc: "Games Macintosh"} - {id: 47, cat: Console/Other, desc: "Games Sonstiges"} - {id: 48, cat: PC/0day, desc: "Software Windows"} - {id: 49, cat: PC/Mac, desc: "Software Macintosh"} - - {id: 50, cat: PC/Phone-Other, desc: "Software Handy-PDA"} + - {id: 50, cat: PC/Mobile-Other, desc: "Software Handy-PDA"} - {id: 51, cat: PC, desc: "Software Linux"} - {id: 52, cat: PC, desc: "Software Sonstiges"} - - {id: 53, cat: Books/Ebook, desc: "Ebook Buch"} + - {id: 53, cat: Books/EBook, desc: "Ebook Buch"} - {id: 54, cat: Books/Comics, desc: "Ebook Comic"} - - {id: 55, cat: Books/Magazines, desc: "Ebook Magazin"} + - {id: 55, cat: Books/Mags, desc: "Ebook Magazin"} - {id: 56, cat: Books, desc: "Ebook Zeitung"} - {id: 57, cat: Books/Other, desc: "Ebook Sonstiges"} - {id: 58, cat: TV/Sport, desc: "Sport Fußball"} diff --git a/src/Jackett.Common/Definitions/galeriens.yml b/src/Jackett.Common/Definitions/galeriens.yml index b64853ba7..5787c92b5 100644 --- a/src/Jackett.Common/Definitions/galeriens.yml +++ b/src/Jackett.Common/Definitions/galeriens.yml @@ -32,11 +32,11 @@ caps: - {id: 18, cat: Movies/HD, desc: "Animations - M-HD 1080p"} - {id: 19, cat: Movies/HD, desc: "Animations - M-HD 720p"} - {id: 20, cat: Movies, desc: "Animations - Remux"} - - {id: 21, cat: Movies/WEBDL, desc: "Animations - TVRip"} - - {id: 24, cat: Movies/WEBDL, desc: "Animations - WEB-DL"} - - {id: 22, cat: Movies/WEBDL, desc: "Animations - WEB-DL 1080p"} - - {id: 23, cat: Movies/WEBDL, desc: "Animations - WEB-DL 720p"} - - {id: 25, cat: Movies/WEBDL, desc: "Animations - WEBRip"} + - {id: 21, cat: Movies/WEB-DL, desc: "Animations - TVRip"} + - {id: 24, cat: Movies/WEB-DL, desc: "Animations - WEB-DL"} + - {id: 22, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 1080p"} + - {id: 23, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 720p"} + - {id: 25, cat: Movies/WEB-DL, desc: "Animations - WEBRip"} - {id: 26, cat: Movies/HD, desc: "Animations - X265"} - {id: 49, cat: TV/Documentary, desc: "Documentaires - Doc-Spectacle"} - {id: 48, cat: TV/Documentary, desc: "Documentaires - Emission TV"} @@ -61,11 +61,11 @@ caps: - {id: 73, cat: Movies/HD, desc: "Films - M-HD 1080p"} - {id: 74, cat: Movies/HD, desc: "Films - M-HD 720p"} - {id: 75, cat: Movies, desc: "Films - Remux"} - - {id: 76, cat: Movies/WEBDL, desc: "Films - TVRip"} - - {id: 77, cat: Movies/WEBDL, desc: "Films - WEB-DL"} - - {id: 78, cat: Movies/WEBDL, desc: "Films - WEB-DL 1080p"} - - {id: 79, cat: Movies/WEBDL, desc: "Films - WEB-DL 720p"} - - {id: 80, cat: Movies/WEBDL, desc: "Films - WEBRip"} + - {id: 76, cat: Movies/WEB-DL, desc: "Films - TVRip"} + - {id: 77, cat: Movies/WEB-DL, desc: "Films - WEB-DL"} + - {id: 78, cat: Movies/WEB-DL, desc: "Films - WEB-DL 1080p"} + - {id: 79, cat: Movies/WEB-DL, desc: "Films - WEB-DL 720p"} + - {id: 80, cat: Movies/WEB-DL, desc: "Films - WEBRip"} - {id: 81, cat: Movies/HD, desc: "Films - X265"} - {id: 82, cat: Movies/3D, desc: "Films-VOSTFR - 3D"} - {id: 84, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Light"} @@ -86,28 +86,28 @@ caps: - {id: 98, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 1080p"} - {id: 99, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 720p"} - {id: 100, cat: Movies, desc: "Films-VOSTFR - Remux"} - - {id: 101, cat: Movies/WEBDL, desc: "Films-VOSTFR - TVRip"} - - {id: 102, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL"} - - {id: 103, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL 1080p"} - - {id: 104, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEB-DL 720p"} - - {id: 105, cat: Movies/WEBDL, desc: "Films-VOSTFR - WEBRip"} + - {id: 101, cat: Movies/WEB-DL, desc: "Films-VOSTFR - TVRip"} + - {id: 102, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL"} + - {id: 103, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 1080p"} + - {id: 104, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 720p"} + - {id: 105, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEBRip"} - {id: 106, cat: Movies/HD, desc: "Films-VOSTFR - X265"} - {id: 107, cat: Console/3DS, desc: "Jeux - 3DS-DS"} - - {id: 108, cat: PC/Phone-IOS, desc: "Jeux - IOS-OSX"} + - {id: 108, cat: PC/Mobile-iOS, desc: "Jeux - IOS-OSX"} - {id: 109, cat: PC/Games, desc: "Jeux - PC"} - {id: 110, cat: Console/PS3, desc: "Jeux - PS3 - PS4"} - {id: 111, cat: Console/PSP, desc: "Jeux - PSP-PSX"} - {id: 112, cat: Console/Wii, desc: "Jeux - WII"} - {id: 113, cat: Console/WiiU, desc: "Jeux - WII-U"} - - {id: 114, cat: Console/Xbox, desc: "Jeux - XBOX"} + - {id: 114, cat: Console/XBox, desc: "Jeux - XBOX"} - {id: 52, cat: Books, desc: "Livres - BD"} - {id: 56, cat: Audio/Audiobook, desc: "Livres - Livres Audio"} - {id: 55, cat: Books/Comics, desc: "Livres - Mangas"} - - {id: 54, cat: Books/Magazines, desc: "Livres - Press"} - - {id: 53, cat: Books/Ebook, desc: "Livres - Romans"} - - {id: 115, cat: PC/Phone-Android, desc: "Logiciels - ANDROID"} + - {id: 54, cat: Books/Mags, desc: "Livres - Press"} + - {id: 53, cat: Books/EBook, desc: "Livres - Romans"} + - {id: 115, cat: PC/Mobile-Android, desc: "Logiciels - ANDROID"} - {id: 118, cat: PC/Mac, desc: "Logiciels - APPLE"} - - {id: 116, cat: PC/Phone-IOS, desc: "Logiciels - IPHONE"} + - {id: 116, cat: PC/Mobile-iOS, desc: "Logiciels - IPHONE"} - {id: 117, cat: PC, desc: "Logiciels - LINUX"} - {id: 119, cat: PC/0day, desc: "Logiciels - WINDOWS"} - {id: 120, cat: Audio/Lossless, desc: "Musiques - FLAC"} diff --git a/src/Jackett.Common/Definitions/gamestorrents.yml b/src/Jackett.Common/Definitions/gamestorrents.yml index d9bc391a6..76a4c8b1c 100644 --- a/src/Jackett.Common/Definitions/gamestorrents.yml +++ b/src/Jackett.Common/Definitions/gamestorrents.yml @@ -19,7 +19,7 @@ caps: juegos-ps4: Console/PS4 juegos-ps2: Console/PS Vita juegos-mac: PC/Mac - juegos-xbox360: Console/Xbox 360 + juegos-xbox360: Console/XBox 360 juegos-wii: Console/Wii juegos-nds: Console/NDS diff --git a/src/Jackett.Common/Definitions/gay-torrents.yml b/src/Jackett.Common/Definitions/gay-torrents.yml index cf1a71af3..f777b2a24 100644 --- a/src/Jackett.Common/Definitions/gay-torrents.yml +++ b/src/Jackett.Common/Definitions/gay-torrents.yml @@ -19,14 +19,14 @@ caps: - {id: porn/Bisexual, cat: XXX, desc: "Bisexual"} - {id: porn/Black-Men, cat: XXX, desc: "Black-Men"} - {id: porn/Chubs, cat: XXX, desc: "Chubs"} - - {id: porn/Clips, cat: XXX/Packs, desc: "Clips"} + - {id: porn/Clips, cat: XXX/Pack, desc: "Clips"} - {id: porn/Cross-Generation, cat: XXX, desc: "Cross-Generation"} - {id: porn/DVD-R, cat: XXX/DVD, desc: "DVD-R"} - {id: porn/Fetish, cat: XXX, desc: "Fetish"} - {id: porn/Group-Sex, cat: XXX, desc: "Group-Sex"} - {id: porn/HD-Movies, cat: XXX, desc: "HD-Movies"} - {id: porn/Hunks, cat: XXX, desc: "Hunks"} - - {id: porn/Images, cat: XXX/Imageset, desc: "Images"} + - {id: porn/Images, cat: XXX/ImageSet, desc: "Images"} - {id: porn/Interracial, cat: XXX, desc: "Interracial"} - {id: porn/Jocks, cat: XXX, desc: "Jocks"} - {id: porn/Latino, cat: XXX, desc: "Latino"} diff --git a/src/Jackett.Common/Definitions/gay-torrentsorg.yml b/src/Jackett.Common/Definitions/gay-torrentsorg.yml index 13ba99992..bcdb1a7d1 100644 --- a/src/Jackett.Common/Definitions/gay-torrentsorg.yml +++ b/src/Jackett.Common/Definitions/gay-torrentsorg.yml @@ -57,7 +57,7 @@ caps: - {id: 38, cat: XXX, desc: "Vintage"} - {id: 39, cat: XXX, desc: "Wrestling"} - {id: 17, cat: PC, desc: "Applications"} - - {id: 31, cat: XXX/Imageset, desc: "Images"} + - {id: 31, cat: XXX/ImageSet, desc: "Images"} - {id: 49, cat: Books, desc: "Books"} - {id: 41, cat: Movies, desc: "Non-Porn"} - {id: 41, cat: TV, desc: "Non-Porn"} diff --git a/src/Jackett.Common/Definitions/gaytorrentru.yml b/src/Jackett.Common/Definitions/gaytorrentru.yml index ab226a6c1..b6ed498fa 100644 --- a/src/Jackett.Common/Definitions/gaytorrentru.yml +++ b/src/Jackett.Common/Definitions/gaytorrentru.yml @@ -40,7 +40,7 @@ caps: - {id: 32, cat: XXX, desc: "Group-Sex"} - {id: 63, cat: XXX, desc: "Homemade"} - {id: 12, cat: XXX, desc: "Hunks"} - - {id: 33, cat: XXX/Imageset, desc: "Images"} + - {id: 33, cat: XXX/ImageSet, desc: "Images"} - {id: 53, cat: XXX, desc: "Interracial"} - {id: 57, cat: XXX, desc: "Jocks"} - {id: 35, cat: XXX, desc: "Latino"} diff --git a/src/Jackett.Common/Definitions/generationfree.yml b/src/Jackett.Common/Definitions/generationfree.yml index 7d786f318..561099272 100644 --- a/src/Jackett.Common/Definitions/generationfree.yml +++ b/src/Jackett.Common/Definitions/generationfree.yml @@ -19,17 +19,17 @@ caps: - {id: 10, cat: TV/HD, desc: "Animation: HD720P"} - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"} - {id: 140, cat: PC, desc: "Applications: Noel"} - - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"} - - {id: 38, cat: PC/Phone-Other, desc: "Applications: Mobile Phone"} + - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"} + - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"} - {id: 40, cat: PC, desc: "Applications: Linux"} - {id: 17, cat: PC/Mac, desc: "Applications: Mac"} - {id: 16, cat: PC/Games, desc: "Applications: Jeux"} - {id: 18, cat: PC/0day, desc: "Applications: PC"} - {id: 117, cat: PC, desc: "Applications: Appli-autre"} - - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"} - - {id: 141, cat: TV/OTHER, desc: "Autres: Noel"} + - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"} + - {id: 141, cat: TV/Other, desc: "Autres: Noel"} - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"} - - {id: 90, cat: Books/Ebook, desc: "BD: Livres"} + - {id: 90, cat: Books/EBook, desc: "BD: Livres"} - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"} - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"} - {id: 134, cat: TV/Documentary, desc: "Documentaires: Vostfr"} @@ -38,13 +38,13 @@ caps: - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"} - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"} - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"} - - {id: 138, cat: Books/Ebook, desc: "E-Books: Noel"} + - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"} - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"} - - {id: 52, cat: Books/Ebook, desc: "E-Books: Revue - Journaux"} - - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"} - - {id: 49, cat: Books/Ebook, desc: "E-Books: Manuel Anglais"} - - {id: 36, cat: Books/Ebook, desc: "E-Books: Livres Français"} - - {id: 50, cat: Books/Ebook, desc: "E-Books: Manuel Français"} + - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"} + - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"} + - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"} + - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"} + - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"} - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"} - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"} - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"} @@ -59,18 +59,18 @@ caps: - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"} - {id: 129, cat: Movies/BluRay, desc: "Films: Remux Bluray"} - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"} - - {id: 110, cat: Movies/WEBDL, desc: "Films: WEBRip"} + - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEBRip"} - {id: 65, cat: Movies, desc: "Films: VO"} - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"} - - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"} + - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"} - {id: 145, cat: Movies/SD, desc: "Films: VHS"} - - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"} + - {id: 102, cat: Movies/WEB-DL, desc: "Films: WEB-DL 720P"} - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"} - {id: 130, cat: Movies/HD, desc: "Films: HD720P"} - - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720P"} + - {id: 111, cat: Movies/WEB-DL, desc: "Films: WEBRip-720P"} - {id: 1, cat: Movies/UHD, desc: "Films: Remux Bluray 4K"} - - {id: 112, cat: Movies/WEBDL, desc: "Films: WEBrip-1080P"} - - {id: 101, cat: Movies/WEBDL, desc: "Films: WEB-DL 1080P"} + - {id: 112, cat: Movies/WEB-DL, desc: "Films: WEBrip-1080P"} + - {id: 101, cat: Movies/WEB-DL, desc: "Films: WEB-DL 1080P"} - {id: 87, cat: XXX, desc: "Films: XXX"} - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"} - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"} @@ -82,8 +82,8 @@ caps: - {id: 92, cat: Movies/UHD, desc: "Films: 4K"} - {id: 135, cat: Movies, desc: "Films: Noel"} - {id: 59, cat: TV, desc: "Films: Spectacle"} - - {id: 78, cat: PC/Phone-Other, desc: "GPS: Radars"} - - {id: 77, cat: PC/Phone-Other, desc: "GPS: Cartes"} + - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"} + - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"} - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"} - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"} - {id: 137, cat: Audio, desc: "Musique: Noel"} diff --git a/src/Jackett.Common/Definitions/gigatorrents.yml b/src/Jackett.Common/Definitions/gigatorrents.yml index 83c155569..22a55f0e4 100644 --- a/src/Jackett.Common/Definitions/gigatorrents.yml +++ b/src/Jackett.Common/Definitions/gigatorrents.yml @@ -33,7 +33,7 @@ caps: - {id: 52, cat: Books, desc: "Könyvek/Hun"} - {id: 33, cat: Console, desc: "Konzol"} - {id: 1, cat: Audio/Lossless, desc: "Lossless"} - - {id: 55, cat: PC/Phone-Other, desc: "Mobil/PDA"} + - {id: 55, cat: PC/Mobile-Other, desc: "Mobil/PDA"} - {id: 77, cat: PC/ISO, desc: "PC/ISO"} - {id: 78, cat: PC/0day, desc: "PC/Rip"} - {id: 85, cat: TV/HD, desc: "Sorozat HD/Eng"} diff --git a/src/Jackett.Common/Definitions/girotorrent.yml b/src/Jackett.Common/Definitions/girotorrent.yml index 0d78055fb..b10378535 100644 --- a/src/Jackett.Common/Definitions/girotorrent.yml +++ b/src/Jackett.Common/Definitions/girotorrent.yml @@ -11,8 +11,8 @@ links: caps: categorymappings: # LIBREDICOLA - - {id: 13, cat: Books/Magazines, desc: "Giornali e Riviste"} - - {id: 15, cat: Books/Ebook, desc: "E-Book"} + - {id: 13, cat: Books/Mags, desc: "Giornali e Riviste"} + - {id: 15, cat: Books/EBook, desc: "E-Book"} - {id: 16, cat: Books/Comics, desc: "Fumetti"} - {id: 70, cat: Books, desc: "Manuali e Guide"} - {id: 72, cat: Audio/Audiobook, desc: "Audio Libri"} @@ -61,7 +61,7 @@ caps: - {id: 47, cat: PC/Games, desc: "PC Games"} - {id: 48, cat: Console/PS3, desc: "PC Giochi PS2-PS3"} - {id: 49, cat: Console/Wii, desc: "PC Giochi Nintendo Wii"} - - {id: 50, cat: Console/Xbox, desc: "PC Giochi Xbox"} + - {id: 50, cat: Console/XBox, desc: "PC Giochi Xbox"} - {id: 51, cat: Console/PSP, desc: "PC Giochi PSP"} - {id: 52, cat: Console/3DS, desc: "PC Giochi DS-DS3"} # SOFTWARE @@ -70,8 +70,8 @@ caps: - {id: 69, cat: PC, desc: "PC Portable"} - {id: 56, cat: PC, desc: "PC Linux"} # CELLULARI-PALMARI - - {id: 68, cat: PC/Phone-IOS, desc: "IPhone-IPad"} - - {id: 71, cat: PC/Phone-Android, desc: "Android APP"} + - {id: 68, cat: PC/Mobile-iOS, desc: "IPhone-IPad"} + - {id: 71, cat: PC/Mobile-Android, desc: "Android APP"} - {id: 74, cat: Other, desc: "Varie"} - {id: 75, cat: Other, desc: "Immagini Wallpaper"} diff --git a/src/Jackett.Common/Definitions/glodls.yml b/src/Jackett.Common/Definitions/glodls.yml index f29153b3e..7a1852c64 100644 --- a/src/Jackett.Common/Definitions/glodls.yml +++ b/src/Jackett.Common/Definitions/glodls.yml @@ -33,15 +33,15 @@ legacylinks: caps: categorymappings: - {id: 50, cat: XXX, desc: "XXX"} - - {id: 5, cat: PC/Phone-Android, desc: "Android"} + - {id: 5, cat: PC/Mobile-Android, desc: "Android"} - {id: 28, cat: TV/Anime, desc: "Anime"} - {id: 18, cat: PC, desc: "Apps"} - - {id: 51, cat: Books/Ebook, desc: "Books"} + - {id: 51, cat: Books/EBook, desc: "Books"} - {id: 73, cat: XXX, desc: "Desi Porn"} - {id: 75, cat: Audio/Lossless, desc: "FLAC"} - {id: 10, cat: PC/Games, desc: "Games"} - {id: 55, cat: PC/Mac, desc: "Macintosh"} - - {id: 52, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 52, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 1, cat: Movies, desc: "Movies"} - {id: 22, cat: Audio, desc: "Music"} - {id: 33, cat: Other, desc: "Other"} diff --git a/src/Jackett.Common/Definitions/greekdiamond.yml b/src/Jackett.Common/Definitions/greekdiamond.yml index 120ead906..c46be09d9 100644 --- a/src/Jackett.Common/Definitions/greekdiamond.yml +++ b/src/Jackett.Common/Definitions/greekdiamond.yml @@ -36,20 +36,20 @@ caps: - {id: 50, cat: Audio, desc: "Music Διάφορα (Other)"} - {id: 33, cat: PC/Games, desc: "Games PC"} - {id: 34, cat: Console/PSP, desc: "Games Playstation/PSP"} - - {id: 35, cat: Console/Xbox, desc: "Games Xbox"} + - {id: 35, cat: Console/XBox, desc: "Games Xbox"} - {id: 36, cat: TV/Anime, desc: "Anime /Μεταγλωτισμένα"} - {id: 37, cat: TV/Anime, desc: "Anime /Subtitled"} - {id: 40, cat: Books/Comics, desc: "Comics"} - - {id: 41, cat: Books/Magazines, desc: "Magazines"} - - {id: 42, cat: Books/Ebook, desc: "E-books"} - - {id: 43, cat: Books/Ebook, desc: "PDF"} + - {id: 41, cat: Books/Mags, desc: "Magazines"} + - {id: 42, cat: Books/EBook, desc: "E-books"} + - {id: 43, cat: Books/EBook, desc: "PDF"} - {id: 44, cat: Other, desc: "Images"} - {id: 45, cat: TV/Sport, desc: "Football Leagues"} - {id: 46, cat: TV/Sport, desc: "Formula 1"} - {id: 48, cat: PC/0day, desc: "Apps Win"} - {id: 8, cat: PC, desc: "Apps Linux"} - {id: 9, cat: PC/Mac, desc: "Apps Mac"} - - {id: 49, cat: PC/Phone-Other, desc: "Apps Mobile"} + - {id: 49, cat: PC/Mobile-Other, desc: "Apps Mobile"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/greekteam.yml b/src/Jackett.Common/Definitions/greekteam.yml index 117189d82..1b1d87e4b 100644 --- a/src/Jackett.Common/Definitions/greekteam.yml +++ b/src/Jackett.Common/Definitions/greekteam.yml @@ -21,9 +21,9 @@ caps: - {id: 31, cat: Console/Other, desc: "Games Other"} - {id: 30, cat: Console/PS4, desc: "Games PSx"} - {id: 20, cat: PC/Games, desc: "Games Windows"} - - {id: 29, cat: Console/Xbox, desc: "Games XBOX"} + - {id: 29, cat: Console/XBox, desc: "Games XBOX"} - {id: 11, cat: Other, desc: "Misc"} - - {id: 47, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 47, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"} - {id: 53, cat: Movies/3D, desc: "Movies 3D"} - {id: 15, cat: Movies/UHD, desc: "Movies 4K"} diff --git a/src/Jackett.Common/Definitions/hachede.yml b/src/Jackett.Common/Definitions/hachede.yml index 663625d2b..d4ccdcc54 100644 --- a/src/Jackett.Common/Definitions/hachede.yml +++ b/src/Jackett.Common/Definitions/hachede.yml @@ -17,10 +17,10 @@ caps: - {id: 120, cat: Movies/BluRay, desc: "Películas JMBD"} - {id: 34, cat: Movies/HD, desc: "Películas BDrip 1080p"} - {id: 99, cat: Movies/HD, desc: "Películas BDrip 720p"} - - {id: 140, cat: Movies/WEBDL, desc: "Películas WEB-DL AMAZON"} - - {id: 141, cat: Movies/WEBDL, desc: "Películas WEB-DL APPLE TV+"} - - {id: 142, cat: Movies/WEBDL, desc: "Películas WEB-DL HBO"} - - {id: 143, cat: Movies/WEBDL, desc: "Películas WEB-DL NETFLIX"} + - {id: 140, cat: Movies/WEB-DL, desc: "Películas WEB-DL AMAZON"} + - {id: 141, cat: Movies/WEB-DL, desc: "Películas WEB-DL APPLE TV+"} + - {id: 142, cat: Movies/WEB-DL, desc: "Películas WEB-DL HBO"} + - {id: 143, cat: Movies/WEB-DL, desc: "Películas WEB-DL NETFLIX"} - {id: 37, cat: Movies/Other, desc: "Películas HDTVrip"} - {id: 119, cat: Movies/HD, desc: "Películas HDiTunes"} - {id: 84, cat: Movies/HD, desc: "Películas MicroHD 1080p"} @@ -55,7 +55,7 @@ caps: - {id: 53, cat: Movies/BluRay, desc: "Documentales Full Bluray"} - {id: 59, cat: Movies/3D, desc: "Documentales 3D"} - {id: 64, cat: Movies/BluRay, desc: "Documentales BDremux"} - - {id: 138, cat: Movies/WEBDL, desc: "Documentales WEB-DL"} + - {id: 138, cat: Movies/WEB-DL, desc: "Documentales WEB-DL"} - {id: 122, cat: Movies/BluRay, desc: "Documentales JMBD"} - {id: 68, cat: Movies/HD, desc: "Documentales BDrip 1080p"} - {id: 106, cat: Movies/HD, desc: "Documentales BDrip 720p"} diff --git a/src/Jackett.Common/Definitions/hamsterstudio.yml b/src/Jackett.Common/Definitions/hamsterstudio.yml index 2cdb3cb81..bb0374536 100644 --- a/src/Jackett.Common/Definitions/hamsterstudio.yml +++ b/src/Jackett.Common/Definitions/hamsterstudio.yml @@ -12,7 +12,7 @@ caps: categorymappings: - {id: 23, cat: Movies, desc: "Кино"} - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"} - - {id: 19, cat: TV/OTHER, desc: "Разные сериалы"} + - {id: 19, cat: TV/Other, desc: "Разные сериалы"} - {id: 10, cat: Audio, desc: "Музыка"} - {id: 29, cat: TV, desc: "Лечение (Пациенты)"} - {id: 37, cat: TV, desc: "Сериалы с ТВ"} diff --git a/src/Jackett.Common/Definitions/hdarea.yml b/src/Jackett.Common/Definitions/hdarea.yml index 034acff04..0437f773d 100644 --- a/src/Jackett.Common/Definitions/hdarea.yml +++ b/src/Jackett.Common/Definitions/hdarea.yml @@ -17,7 +17,7 @@ caps: - {id: 410, cat: Movies/HD, desc: "Movies 1080p"} - {id: 411, cat: Movies/HD, desc: "Movies 720p"} - {id: 414, cat: Movies/DVD, desc: "Movies DVD"} - - {id: 412, cat: Movies/WEBDL, desc: "Movies WEB-DL"} + - {id: 412, cat: Movies/WEB-DL, desc: "Movies WEB-DL"} - {id: 413, cat: Movies/HD, desc: "Movies HDTV"} - {id: 417, cat: Movies/Other, desc: "Movies iPad"} - {id: 404, cat: TV/Documentary, desc: "Documentaries"} diff --git a/src/Jackett.Common/Definitions/hdme.yml b/src/Jackett.Common/Definitions/hdme.yml index 9b8a041be..d442328b4 100644 --- a/src/Jackett.Common/Definitions/hdme.yml +++ b/src/Jackett.Common/Definitions/hdme.yml @@ -22,7 +22,7 @@ caps: - {id: 48, cat: Movies/HD, desc: "iCandy"} - {id: 45, cat: Movies/HD, desc: "INtL"} - {id: 29, cat: Other, desc: "Misc"} - - {id: 49, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 49, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 30, cat: Movies/HD, desc: "Movie 1080i"} - {id: 31, cat: Movies/HD, desc: "Movie 1080p"} - {id: 32, cat: Movies/HD, desc: "Movie 720p"} diff --git a/src/Jackett.Common/Definitions/hdspain.yml b/src/Jackett.Common/Definitions/hdspain.yml index cae37d6a0..80c8c138c 100644 --- a/src/Jackett.Common/Definitions/hdspain.yml +++ b/src/Jackett.Common/Definitions/hdspain.yml @@ -17,7 +17,7 @@ caps: - {id: 6, cat: TV/Documentary, desc: "Documentales"} - {id: 11, cat: TV/Sport, desc: "Deportes"} - {id: 7, cat: Audio/Video, desc: "Música/Espec."} - - {id: 9, cat: TV/OTHER, desc: "Programas TV"} + - {id: 9, cat: TV/Other, desc: "Programas TV"} - {id: 8, cat: Audio/Lossless, desc: "Audios"} - {id: 10, cat: XXX/x264, desc: "XXX"} modes: diff --git a/src/Jackett.Common/Definitions/hdturk.yml b/src/Jackett.Common/Definitions/hdturk.yml index 37e8dffd7..2ad552026 100644 --- a/src/Jackett.Common/Definitions/hdturk.yml +++ b/src/Jackett.Common/Definitions/hdturk.yml @@ -13,7 +13,7 @@ legacylinks: caps: categorymappings: - {id: 37, cat: Other, desc: "Diğer"} - - {id: 210, cat: Books/Ebook, desc: "E-Kitap"} + - {id: 210, cat: Books/EBook, desc: "E-Kitap"} - {id: 208, cat: Other, desc: "Eğitim"} - {id: 101, cat: Other, desc: "Resim"} - {id: 15, cat: TV, desc: "TV Dizi/Show/Spor"} diff --git a/src/Jackett.Common/Definitions/hellastz.yml b/src/Jackett.Common/Definitions/hellastz.yml index d3d380df1..9f8af70f4 100644 --- a/src/Jackett.Common/Definitions/hellastz.yml +++ b/src/Jackett.Common/Definitions/hellastz.yml @@ -17,17 +17,17 @@ caps: - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"} - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"} - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"} - - {id: 235, cat: Movies/WEBDL, desc: "Movies WEB-720-1080p -HDrip"} + - {id: 235, cat: Movies/WEB-DL, desc: "Movies WEB-720-1080p -HDrip"} - {id: 90, cat: TV, desc: "TV Ελληνικές Σειρές (Greek)"} - {id: 96, cat: TV, desc: "TV Ξένες Σειρές (Foreign)"} - {id: 219, cat: Audio, desc: "Music Ξένη μουσική (Foreign)"} - {id: 220, cat: Audio, desc: "Music Ελληνική Μουσική (Greek)"} - - {id: 240, cat: PC/Phone-Other, desc: "Android - Linux"} + - {id: 240, cat: PC/Mobile-Other, desc: "Android - Linux"} - {id: 230, cat: TV/Anime, desc: "Παιδικα μεταγλωτισμε (Children)"} - {id: 231, cat: TV/Anime, desc: "Παιδικα υποτιτλους (Children w/ subs)"} - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"} - {id: 228, cat: TV/Anime, desc: "Animation"} - - {id: 223, cat: Books/Ebook, desc: "Βιβλία (Books)"} + - {id: 223, cat: Books/EBook, desc: "Βιβλία (Books)"} - {id: 100, cat: Books/Comics, desc: "Comics &Περιοδικά"} - {id: 227, cat: PC, desc: "Pc Software"} - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"} diff --git a/src/Jackett.Common/Definitions/horrorsite.yml b/src/Jackett.Common/Definitions/horrorsite.yml index 784b0ea93..b674e2d9f 100644 --- a/src/Jackett.Common/Definitions/horrorsite.yml +++ b/src/Jackett.Common/Definitions/horrorsite.yml @@ -26,7 +26,7 @@ caps: - {id: 75, cat: Other, desc: "Képek"} - {id: 107, cat: Books, desc: "eBook/Eng"} - {id: 61, cat: Books, desc: "eBook/Hun"} - - {id: 106, cat: PC/Phone-Other, desc: "Mobil"} + - {id: 106, cat: PC/Mobile-Other, desc: "Mobil"} - {id: 50, cat: Audio/MP3, desc: "Mp3/Eng"} - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"} - {id: 45, cat: PC, desc: "Program ISO /RIP"} diff --git a/src/Jackett.Common/Definitions/ilcorsaroblu.yml b/src/Jackett.Common/Definitions/ilcorsaroblu.yml index 1404d999b..ee553c9b1 100644 --- a/src/Jackett.Common/Definitions/ilcorsaroblu.yml +++ b/src/Jackett.Common/Definitions/ilcorsaroblu.yml @@ -17,23 +17,23 @@ caps: # Adult - {id: 12, cat: XXX, desc: "Adult"} # Applicazioni - - {id: 5, cat: PC/Phone-Android, desc: "Android"} - - {id: 30, cat: PC/Phone-IOS, desc: "iOS / iPhone"} + - {id: 5, cat: PC/Mobile-Android, desc: "Android"} + - {id: 30, cat: PC/Mobile-iOS, desc: "iOS / iPhone"} - {id: 7, cat: PC/0day, desc: "Windows"} - {id: 8, cat: PC, desc: "Linux"} - {id: 9, cat: PC/Mac, desc: "Mac"} - {id: 40, cat: PC, desc: "Emulatori"} - {id: 34, cat: PC, desc: "Student's Office"} # Books - - {id: 6, cat: Books/Ebook, desc: "Books"} + - {id: 6, cat: Books/EBook, desc: "Books"} - {id: 45, cat: Books/Comics, desc: "Fumetti"} - - {id: 51, cat: Books/Ebook, desc: "Pdf"} - - {id: 33, cat: Books/Ebook, desc: "Romanzi"} - - {id: 26, cat: Books/Magazines, desc: "Edicola: Giornali/Quotidiani"} + - {id: 51, cat: Books/EBook, desc: "Pdf"} + - {id: 33, cat: Books/EBook, desc: "Romanzi"} + - {id: 26, cat: Books/Mags, desc: "Edicola: Giornali/Quotidiani"} # Games - {id: 3, cat: PC/Games, desc: "Games PC"} - {id: 27, cat: Console, desc: "Games Console"} - - {id: 41, cat: Console/Xbox, desc: "Games Xbox360"} + - {id: 41, cat: Console/XBox, desc: "Games Xbox360"} - {id: 43, cat: Console, desc: "Games Retro"} - {id: 47, cat: Console/NDS, desc: "Games Nintendo"} # Music diff --git a/src/Jackett.Common/Definitions/ilcorsaronero.yml b/src/Jackett.Common/Definitions/ilcorsaronero.yml index fe133f309..546a68ab7 100644 --- a/src/Jackett.Common/Definitions/ilcorsaronero.yml +++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml @@ -31,12 +31,12 @@ caps: - {id: 3, cat: PC/Games, desc: "Games PC", default: true} - {id: 4, cat: Other, desc: "Other", default: true} - {id: 5, cat: TV/Anime, desc: "Anime", default: true} - - {id: 6, cat: Books/Ebook, desc: "Ebooks", default: true} + - {id: 6, cat: Books/EBook, desc: "Ebooks", default: true} - {id: 7, cat: PC/0day, desc: "App Windows", default: true} - {id: 8, cat: PC, desc: "App Linux", default: true} - {id: 9, cat: PC/Mac, desc: "App Mac", default: true} - {id: 13, cat: Console/PSP, desc: "Games Playstation", default: true} - - {id: 14, cat: Console/Xbox, desc: "Games Xbox", default: true} + - {id: 14, cat: Console/XBox, desc: "Games Xbox", default: true} - {id: 15, cat: TV, desc: "TV Series", default: true} - {id: 16, cat: Other, desc: "Other", default: true} - {id: 18, cat: Audio/Audiobook, desc: "Audio Book", default: true} diff --git a/src/Jackett.Common/Definitions/insanetracker.yml b/src/Jackett.Common/Definitions/insanetracker.yml index 05c557bb8..6d2cf25e4 100644 --- a/src/Jackett.Common/Definitions/insanetracker.yml +++ b/src/Jackett.Common/Definitions/insanetracker.yml @@ -32,12 +32,12 @@ caps: - {id: 9, cat: PC/Games, desc: "Játék/ISO"} - {id: 43, cat: Console, desc: "Játék/Konzol"} - {id: 29, cat: Other, desc: "Képek"} - - {id: 28, cat: XXX/Imageset, desc: "XXX Képek"} + - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"} - {id: 3, cat: PC/0day, desc: "Program/Egyéb"} - {id: 18, cat: Audio/MP3, desc: "Zene/Eng"} - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"} - {id: 11, cat: PC/Games, desc: "Játék/Rip"} - - {id: 13, cat: PC/Phone-Other, desc: "Mobil"} + - {id: 13, cat: PC/Mobile-Other, desc: "Mobil"} modes: diff --git a/src/Jackett.Common/Definitions/iv-torrents.yml b/src/Jackett.Common/Definitions/iv-torrents.yml index 9c9d996a1..668236cf4 100644 --- a/src/Jackett.Common/Definitions/iv-torrents.yml +++ b/src/Jackett.Common/Definitions/iv-torrents.yml @@ -39,7 +39,7 @@ caps: - {id: 124, cat: Movies, desc: " |- Зарубежные фильмы"} - {id: 123, cat: Movies, desc: " |- Отечественные фильмы (Новинки)"} - {id: 122, cat: Movies, desc: " |- Отечественные фильмы"} - - {id: 689, cat: Movies/WEBDL, desc: " |- Фильмы WEB-DLRip, HDTVRip "} + - {id: 689, cat: Movies/WEB-DL, desc: " |- Фильмы WEB-DLRip, HDTVRip "} - {id: 121, cat: Movies, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"} - {id: 120, cat: Movies, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."} - {id: 126, cat: Movies, desc: " |- Антологии"} @@ -180,15 +180,15 @@ caps: - {id: 554, cat: PC/Games, desc: " |- Эротические игры"} - {id: 14, cat: Console, desc: "Игры для Консолей"} - {id: 115, cat: Console, desc: " |- Новые релизы"} - - {id: 114, cat: Console/Xbox 360, desc: " |- XBox360 "} - - {id: 674, cat: Console/Xbox 360, desc: " |- XBox360 | Kinect "} + - {id: 114, cat: Console/XBox 360, desc: " |- XBox360 "} + - {id: 674, cat: Console/XBox 360, desc: " |- XBox360 | Kinect "} - {id: 113, cat: Console/NDS, desc: " |- NDS "} - {id: 288, cat: Console/PS3, desc: " |- Playstation 2 "} - {id: 290, cat: Console/PS3, desc: " |- Playstation 3 "} - {id: 531, cat: Console, desc: "Программы / Прошивки"} - {id: 532, cat: Console, desc: " |- Новые релизы"} - {id: 533, cat: Console/PS3, desc: " |- Playstation 3 "} - - {id: 535, cat: Console/Xbox 360, desc: " |- XBox360 "} + - {id: 535, cat: Console/XBox 360, desc: " |- XBox360 "} - {id: 534, cat: Console/PSP, desc: " |- PSP "} - {id: 277, cat: Console, desc: "Всё для игр"} - {id: 291, cat: Console, desc: " |- Новые релизы"} @@ -460,29 +460,29 @@ caps: - {id: 762, cat: Books, desc: " |- Аудиокниги на немецком языке"} - {id: 761, cat: Books, desc: " |- Аудиокниги на английском языке"} # Мобильные устройства Mobile - - {id: 433, cat: PC/Phone-Other, desc: "Приложения для мобильных телефонов и КПК, КМК"} - - {id: 436, cat: PC/Phone-Other, desc: " |- Новые релизы"} - - {id: 437, cat: PC/Phone-Android, desc: " |- Android OS "} - - {id: 435, cat: PC/Phone-Other, desc: " |- Windows Mobile "} - - {id: 439, cat: PC/Phone-Other, desc: " |- Symbian "} - - {id: 438, cat: PC/Phone-IOS, desc: " |- iOS "} - - {id: 440, cat: PC/Phone-Other, desc: " |- Java "} - - {id: 434, cat: PC/Phone-Other, desc: "Игры"} - - {id: 441, cat: PC/Phone-Other, desc: " |- Новые релизы"} - - {id: 442, cat: PC/Phone-Android, desc: " |- Android OS "} - - {id: 443, cat: PC/Phone-Other, desc: " |- Symbian "} - - {id: 444, cat: PC/Phone-IOS, desc: " |- iOS "} - - {id: 446, cat: PC/Phone-Other, desc: " |- Java "} - - {id: 445, cat: PC/Phone-Other, desc: " |- Windows Mobile "} - - {id: 575, cat: PC/Phone-Other, desc: " |- Игры для Windows Phone 7,8 "} - - {id: 447, cat: PC/Phone-Other, desc: "Софт для работы с телефоном"} - - {id: 448, cat: PC/Phone-Other, desc: "Прошивки"} - - {id: 449, cat: PC/Phone-Other, desc: " |- Новые релизы"} - - {id: 450, cat: PC/Phone-Android, desc: " |- Android OS "} - - {id: 451, cat: PC/Phone-Other, desc: " |- Windows Mobile "} - - {id: 452, cat: PC/Phone-Other, desc: " |- Symbian "} - - {id: 454, cat: PC/Phone-IOS, desc: " |- iOS "} - - {id: 455, cat: PC/Phone-Other, desc: " |- Java "} + - {id: 433, cat: PC/Mobile-Other, desc: "Приложения для мобильных телефонов и КПК, КМК"} + - {id: 436, cat: PC/Mobile-Other, desc: " |- Новые релизы"} + - {id: 437, cat: PC/Mobile-Android, desc: " |- Android OS "} + - {id: 435, cat: PC/Mobile-Other, desc: " |- Windows Mobile "} + - {id: 439, cat: PC/Mobile-Other, desc: " |- Symbian "} + - {id: 438, cat: PC/Mobile-iOS, desc: " |- iOS "} + - {id: 440, cat: PC/Mobile-Other, desc: " |- Java "} + - {id: 434, cat: PC/Mobile-Other, desc: "Игры"} + - {id: 441, cat: PC/Mobile-Other, desc: " |- Новые релизы"} + - {id: 442, cat: PC/Mobile-Android, desc: " |- Android OS "} + - {id: 443, cat: PC/Mobile-Other, desc: " |- Symbian "} + - {id: 444, cat: PC/Mobile-iOS, desc: " |- iOS "} + - {id: 446, cat: PC/Mobile-Other, desc: " |- Java "} + - {id: 445, cat: PC/Mobile-Other, desc: " |- Windows Mobile "} + - {id: 575, cat: PC/Mobile-Other, desc: " |- Игры для Windows Phone 7,8 "} + - {id: 447, cat: PC/Mobile-Other, desc: "Софт для работы с телефоном"} + - {id: 448, cat: PC/Mobile-Other, desc: "Прошивки"} + - {id: 449, cat: PC/Mobile-Other, desc: " |- Новые релизы"} + - {id: 450, cat: PC/Mobile-Android, desc: " |- Android OS "} + - {id: 451, cat: PC/Mobile-Other, desc: " |- Windows Mobile "} + - {id: 452, cat: PC/Mobile-Other, desc: " |- Symbian "} + - {id: 454, cat: PC/Mobile-iOS, desc: " |- iOS "} + - {id: 455, cat: PC/Mobile-Other, desc: " |- Java "} # Книги и журналы Books - {id: 610, cat: Books, desc: " |- Новые релизы"} - {id: 611, cat: Books, desc: " |- Кино, театр, ТВ, мультипликация"} diff --git a/src/Jackett.Common/Definitions/kickasstorrent.yml b/src/Jackett.Common/Definitions/kickasstorrent.yml index f7302e809..ed9f78b42 100644 --- a/src/Jackett.Common/Definitions/kickasstorrent.yml +++ b/src/Jackett.Common/Definitions/kickasstorrent.yml @@ -35,7 +35,7 @@ caps: categorymappings: - {id: 118, cat: TV/Anime, desc: "Anime - English Translated"} - {id: 133, cat: TV/Anime, desc: "Anime - Other"} - - {id: 144, cat: PC/Phone-Other, desc: "Applications - Handheld"} + - {id: 144, cat: PC/Mobile-Other, desc: "Applications - Handheld"} - {id: 142, cat: PC/0day, desc: "Applications - Linux"} - {id: 140, cat: PC/Mac, desc: "Applications - Mac"} - {id: 131, cat: PC/0day, desc: "Applications - Other"} @@ -62,7 +62,7 @@ caps: - {id: 97, cat: Console/PS4, desc: "Games - Playstation"} - {id: 91, cat: Console/Wii, desc: "Games - Wii"} - {id: 85, cat: PC/Games, desc: "Games - Windows"} - - {id: 90, cat: Console/Xbox, desc: "Games - Xbox"} + - {id: 90, cat: Console/XBox, desc: "Games - Xbox"} - {id: 69, cat: Movies/3D, desc: "Movies - 3D Movies"} - {id: 80, cat: Movies, desc: "Movies - Animation"} - {id: 79, cat: Movies, desc: "Movies - Asian/Bollywood"} @@ -100,7 +100,7 @@ caps: - {id: 124, cat: XXX, desc: "XXX - Books"} - {id: 125, cat: XXX, desc: "XXX - Hentai"} - {id: 123, cat: XXX, desc: "XXX - Magazines"} - - {id: 122, cat: XXX/Imageset, desc: "XXX - Pictures"} + - {id: 122, cat: XXX/ImageSet, desc: "XXX - Pictures"} - {id: 121, cat: XXX, desc: "XXX - UltraHD"} - {id: 119, cat: XXX, desc: "XXX - Videos"} - {id: 126, cat: XXX, desc: "XXX - XXX Games"} diff --git a/src/Jackett.Common/Definitions/lastfiles.yml b/src/Jackett.Common/Definitions/lastfiles.yml index cb996eb78..dffb46e25 100644 --- a/src/Jackett.Common/Definitions/lastfiles.yml +++ b/src/Jackett.Common/Definitions/lastfiles.yml @@ -19,7 +19,7 @@ caps: - {id: 24, cat: Movies/SD, desc: "Movies/XVID"} - {id: 16, cat: Movies, desc: "Old Movies"} - {id: 15, cat: Movies, desc: "Movies Mobile"} - - {id: 54, cat: Movies/WEBDL, desc: "Movies/WEB-DL"} + - {id: 54, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"} - {id: 56, cat: TV/Documentary, desc: "Documentary"} - {id: 18, cat: Movies, desc: "Movie Packs"} - {id: 32, cat: Movies/UHD, desc: "Movies/4K-RO"} @@ -31,7 +31,7 @@ caps: - {id: 59, cat: Movies/SD, desc: "Movies/Cam-Ro"} - {id: 25, cat: Movies/SD, desc: "Movies/XVID-Ro"} - {id: 17, cat: Movies, desc: "Old Movies Ro"} - - {id: 55, cat: Movies/WEBDL, desc: "Movies/WEB-DL 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: "Movie Packs Ro"} @@ -40,7 +40,7 @@ caps: - {id: 13, cat: TV/HD, desc: "HDTV"} - {id: 14, cat: TV/HD, desc: "HDTV-Ro"} - {id: 28, cat: Audio, desc: "Music"} - - {id: 51, cat: PC/Phone-Android, desc: "Android Apps & Games"} + - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps & Games"} - {id: 26, cat: PC/0day, desc: "Software"} - {id: 30, cat: PC/ISO, desc: "Games PC-ISO"} - {id: 33, cat: PC/Games, desc: "Game Packs"} diff --git a/src/Jackett.Common/Definitions/latinop2p.yml b/src/Jackett.Common/Definitions/latinop2p.yml index 716572f79..ec4c77750 100644 --- a/src/Jackett.Common/Definitions/latinop2p.yml +++ b/src/Jackett.Common/Definitions/latinop2p.yml @@ -12,16 +12,16 @@ legacylinks: caps: categorymappings: - - {id: 3, cat: PC/Phone-Android, desc: "Android"} + - {id: 3, cat: PC/Mobile-Android, desc: "Android"} - {id: 4, cat: TV/Anime, desc: "Anime"} - {id: 5, cat: Books/Comics, desc: "Comic"} - {id: 7, cat: TV/Documentary, desc: "Documentales"} - {id: 13, cat: Books/Other, desc: "e-Learning"} - - {id: 12, cat: Books/Ebook, desc: "eBooks"} + - {id: 12, cat: Books/EBook, desc: "eBooks"} - {id: 8, cat: Console/NDS, desc: "Juegos Nintendo"} - {id: 17, cat: PC/Games, desc: "Juegos PC"} - {id: 18, cat: Console/PS4, desc: "Juegos PlayStation"} - - {id: 19, cat: Console/Xbox, desc: "Juegos Xbox"} + - {id: 19, cat: Console/XBox, desc: "Juegos Xbox"} - {id: 20, cat: PC, desc: "Programas Linux"} - {id: 21, cat: PC/Mac, desc: "Programas MacOS"} - {id: 9, cat: Movies/HD, desc: "Peliculas 1080p"} diff --git a/src/Jackett.Common/Definitions/leaguehd.yml b/src/Jackett.Common/Definitions/leaguehd.yml index 9aab95a6d..451050293 100644 --- a/src/Jackett.Common/Definitions/leaguehd.yml +++ b/src/Jackett.Common/Definitions/leaguehd.yml @@ -18,7 +18,7 @@ caps: - {id: 415, cat: Movies, desc: "Movies 1080p REMUX"} - {id: 416, cat: Movies/3D, desc: "Movies 3D"} - {id: 411, cat: Movies/HD, desc: "Movies 720p"} - - {id: 412, cat: Movies/WEBDL, desc: "Movies WEB-DL"} + - {id: 412, cat: Movies/WEB-DL, desc: "Movies WEB-DL"} - {id: 413, cat: TV/HD, desc: "Movies HDTV"} - {id: 417, cat: Movies, desc: "Movies iPad"} - {id: 414, cat: Movies/DVD, desc: "Movies DVD"} diff --git a/src/Jackett.Common/Definitions/learnflakes.yml b/src/Jackett.Common/Definitions/learnflakes.yml index a66fc3dbc..2e765a689 100644 --- a/src/Jackett.Common/Definitions/learnflakes.yml +++ b/src/Jackett.Common/Definitions/learnflakes.yml @@ -22,7 +22,7 @@ caps: - {id: 36, cat: Books, desc: "IPExpert"} - {id: 37, cat: Books, desc: "Tuts+"} - {id: 38, cat: Books, desc: "Pluralsight"} - - {id: 39, cat: Books/Ebook, desc: "E-Books"} + - {id: 39, cat: Books/EBook, desc: "E-Books"} - {id: 40, cat: Books, desc: "CBT-Videos"} - {id: 41, cat: Books, desc: "Linux-CBT"} - {id: 42, cat: Books, desc: "VTC"} @@ -30,7 +30,7 @@ caps: - {id: 44, cat: Books, desc: "TrainSignal"} - {id: 50, cat: Books, desc: "LiveLessons"} - {id: 47, cat: Books, desc: "Health"} - - {id: 48, cat: Books/Magazines, desc: "Magazines"} + - {id: 48, cat: Books/Mags, desc: "Magazines"} - {id: 49, cat: Books, desc: "CourseWare"} - {id: 51, cat: Books, desc: "Programming"} - {id: 52, cat: Books, desc: "Graphic & Design"} diff --git a/src/Jackett.Common/Definitions/lechaudron.yml b/src/Jackett.Common/Definitions/lechaudron.yml index e5b55e7bf..6a8ff4ee4 100644 --- a/src/Jackett.Common/Definitions/lechaudron.yml +++ b/src/Jackett.Common/Definitions/lechaudron.yml @@ -61,25 +61,25 @@ caps: - {id: 56, cat: Movies/HD, desc: "Films - MHD 720p"} - {id: 57, cat: Movies, desc: "Films - REMUX"} - {id: 58, cat: Movies, desc: "Films - TVRIP"} - - {id: 59, cat: Movies/WEBDL, desc: "Films - WEB-DL"} - - {id: 60, cat: Movies/WEBDL, desc: "Films - WEB-DL 1080p"} - - {id: 61, cat: Movies/WEBDL, desc: "Films - WEB-DL 720p"} - - {id: 62, cat: Movies/WEBDL, desc: "Films - WEBRIP"} + - {id: 59, cat: Movies/WEB-DL, desc: "Films - WEB-DL"} + - {id: 60, cat: Movies/WEB-DL, desc: "Films - WEB-DL 1080p"} + - {id: 61, cat: Movies/WEB-DL, desc: "Films - WEB-DL 720p"} + - {id: 62, cat: Movies/WEB-DL, desc: "Films - WEBRIP"} - {id: 64, cat: Console/3DS, desc: "Jeux - 3DS-DS"} - - {id: 65, cat: PC/Phone-IOS, desc: "Jeux - IOS-OSX"} + - {id: 65, cat: PC/Mobile-iOS, desc: "Jeux - IOS-OSX"} - {id: 66, cat: PC/Games, desc: "Jeux - PC"} - {id: 67, cat: Console/PSP, desc: "Jeux - PS-PSP-X"} - {id: 68, cat: Console/Wii, desc: "Jeux - Wii - Wii-U"} - - {id: 69, cat: Console/Xbox, desc: "Jeux - XBOX"} + - {id: 69, cat: Console/XBox, desc: "Jeux - XBOX"} - {id: 35, cat: Audio/Audiobook, desc: "Livres - Audio-Book"} - {id: 36, cat: Books, desc: "Livres - BD"} - - {id: 37, cat: Books/Magazines, desc: "Livres - Magazine"} + - {id: 37, cat: Books/Mags, desc: "Livres - Magazine"} - {id: 38, cat: Books/Comics, desc: "Livres - MANGAS"} - {id: 39, cat: Books, desc: "Livres - Presse"} - - {id: 40, cat: Books/Ebook, desc: "Livres - Roman"} - - {id: 70, cat: PC/Phone-Android, desc: "Logiciels - ANDROID"} + - {id: 40, cat: Books/EBook, desc: "Livres - Roman"} + - {id: 70, cat: PC/Mobile-Android, desc: "Logiciels - ANDROID"} - {id: 71, cat: PC/Mac, desc: "Logiciels - APPLE"} - - {id: 72, cat: PC/Phone-IOS, desc: "Logiciels - IPHONE"} + - {id: 72, cat: PC/Mobile-iOS, desc: "Logiciels - IPHONE"} - {id: 73, cat: PC, desc: "Logiciels - LINUX"} - {id: 74, cat: PC/0day, desc: "Logiciels - WINDOWS"} - {id: 75, cat: TV, desc: "Pack - 3D"} diff --git a/src/Jackett.Common/Definitions/legacyhd.yml b/src/Jackett.Common/Definitions/legacyhd.yml index 0eda78db5..ecdcd5ba9 100644 --- a/src/Jackett.Common/Definitions/legacyhd.yml +++ b/src/Jackett.Common/Definitions/legacyhd.yml @@ -13,7 +13,7 @@ caps: - {id: 1, cat: Movies, desc: "Movies"} - {id: 2, cat: TV, desc: "TV"} - {id: 3, cat: Audio, desc: "Music"} - - {id: 4, cat: Books/Ebook, desc: "Ebook"} + - {id: 4, cat: Books/EBook, desc: "Ebook"} - {id: 5, cat: TV, desc: "TV Pack"} - {id: 6, cat: PC, desc: "Software"} - {id: 7, cat: Movies, desc: "Movie Pack"} diff --git a/src/Jackett.Common/Definitions/lesaloon.yml b/src/Jackett.Common/Definitions/lesaloon.yml index 04a223385..dae6cb4ec 100644 --- a/src/Jackett.Common/Definitions/lesaloon.yml +++ b/src/Jackett.Common/Definitions/lesaloon.yml @@ -13,7 +13,7 @@ legacylinks: caps: categorymappings: - {id: 13, cat: Movies/BluRay, desc: "Films BD-Rip / BRRip"} - - {id: 19, cat: Movies/WEBDL, desc: "Films WEB-DL / WEB-Rip"} + - {id: 19, cat: Movies/WEB-DL, desc: "Films WEB-DL / WEB-Rip"} - {id: 15, cat: Movies/DVD, desc: "Films DVD-Rip"} - {id: 18, cat: Movies/HD, desc: "Films HD 720p"} - {id: 20, cat: Movies/HD, desc: "Films HD 1080p"} @@ -62,10 +62,10 @@ caps: - {id: 58, cat: Audio/Other, desc: "Musique Autres"} - {id: 59, cat: PC/Games, desc: "Jeux PC"} - {id: 60, cat: Console, desc: "Jeux Consoles"} - - {id: 61, cat: Books/Ebook, desc: "Livres epub"} - - {id: 62, cat: Books/Ebook, desc: "Livres pdf"} - - {id: 63, cat: Books/Magazines, desc: "Livres Journaux"} - - {id: 64, cat: Books/Magazines, desc: "Livres Magazines"} + - {id: 61, cat: Books/EBook, desc: "Livres epub"} + - {id: 62, cat: Books/EBook, desc: "Livres pdf"} + - {id: 63, cat: Books/Mags, desc: "Livres Journaux"} + - {id: 64, cat: Books/Mags, desc: "Livres Magazines"} - {id: 65, cat: Books/Comics, desc: "Livres Bandes Dessinées"} - {id: 66, cat: Books/Other, desc: "Livres Multi-Format"} - {id: 68, cat: PC/0day, desc: "Logiciels Windows"} diff --git a/src/Jackett.Common/Definitions/libranet.yml b/src/Jackett.Common/Definitions/libranet.yml index d029c756e..076b42cf0 100644 --- a/src/Jackett.Common/Definitions/libranet.yml +++ b/src/Jackett.Common/Definitions/libranet.yml @@ -14,13 +14,13 @@ caps: - {id: 51, cat: Movies, desc: "Film/Hun"} - {id: 3, cat: Audio/Audiobook, desc: "Hangoskönyv"} - {id: 4, cat: Audio/Audiobook, desc: "Hangoskönyv/Hun"} - - {id: 1, cat: Books/Ebook, desc: "Könyv"} - - {id: 2, cat: Books/Ebook, desc: "Könyv/Hun"} + - {id: 1, cat: Books/EBook, desc: "Könyv"} + - {id: 2, cat: Books/EBook, desc: "Könyv/Hun"} - {id: 55, cat: Other, desc: "Mûhelysarok"} - {id: 56, cat: Audio/Lossless, desc: "LossLess"} - {id: 57, cat: Audio/Lossless, desc: "LossLess/Hun"} - - {id: 48, cat: Books/Magazines, desc: "Magazin"} - - {id: 49, cat: Books/Magazines, desc: "Magazin/Hun"} + - {id: 48, cat: Books/Mags, desc: "Magazin"} + - {id: 49, cat: Books/Mags, desc: "Magazin/Hun"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/linkomanija.yml b/src/Jackett.Common/Definitions/linkomanija.yml index c50e859e8..7ff13897d 100644 --- a/src/Jackett.Common/Definitions/linkomanija.yml +++ b/src/Jackett.Common/Definitions/linkomanija.yml @@ -30,10 +30,10 @@ caps: - {id: 64, cat: Movies/HD, desc: "RU Movies HD"} - {id: 65, cat: TV, desc: "TV RU"} - {id: 25, cat: Movies/DVD, desc: "DVD"} - - {id: 42, cat: Console/Xbox, desc: "XBOX"} + - {id: 42, cat: Console/XBox, desc: "XBOX"} - {id: 66, cat: Audio/Lossless, desc: "Music Lossless"} - {id: 41, cat: PC/Mac, desc: "MAC"} - - {id: 69, cat: PC/Phone-Android, desc: "Android"} + - {id: 69, cat: PC/Mobile-Android, desc: "Android"} - {id: 46, cat: TV/Sport, desc: "Sports"} - {id: 58, cat: TV/Documentary, desc: "Documentaries"} - {id: 38, cat: TV/Anime, desc: "Anime"} diff --git a/src/Jackett.Common/Definitions/madsrevolution.yml b/src/Jackett.Common/Definitions/madsrevolution.yml index f81f29dd7..1bebe2634 100644 --- a/src/Jackett.Common/Definitions/madsrevolution.yml +++ b/src/Jackett.Common/Definitions/madsrevolution.yml @@ -23,7 +23,7 @@ caps: - {id: 48, cat: TV/HD, desc: "Serien x264"} - {id: 27, cat: TV/SD, desc: "Serien DivX/XviD"} - {id: 25, cat: TV/SD, desc: "Serien DVD-R"} - - {id: 8, cat: TV/OTHER, desc: "Serien Unsorted"} + - {id: 8, cat: TV/Other, desc: "Serien Unsorted"} - {id: 38, cat: Audio, desc: "Musik Album"} - {id: 37, cat: Audio, desc: "Musik Single/EP"} - {id: 40, cat: Audio/Video, desc: "Musik Video"} @@ -32,7 +32,7 @@ caps: - {id: 44, cat: PC/0day, desc: "Software Windows"} - {id: 42, cat: PC/Mac, desc: "Software Mac"} - {id: 41, cat: PC, desc: "Software Linux"} - - {id: 43, cat: PC/Phone-Other, desc: "Software Mobile"} + - {id: 43, cat: PC/Mobile-Other, desc: "Software Mobile"} - {id: 11, cat: PC, desc: "Software Unsorted"} - {id: 12, cat: PC/Games, desc: "Spiele PC"} - {id: 13, cat: Console, desc: "Spiele Konsole"} @@ -53,7 +53,7 @@ caps: - {id: 29, cat: TV/Sport, desc: "Sport DVD-R"} - {id: 9, cat: TV/Sport, desc: "Sport Unsorted"} - {id: 15, cat: Audio/Audiobook, desc: "Books aBooks"} - - {id: 18, cat: Books/Ebook, desc: "Books eBooks"} + - {id: 18, cat: Books/EBook, desc: "Books eBooks"} - {id: 56, cat: XXX, desc: "XXX UHD"} - {id: 36, cat: XXX, desc: "XXX 1080p"} - {id: 34, cat: XXX, desc: "XXX 720p"} diff --git a/src/Jackett.Common/Definitions/magico.yml b/src/Jackett.Common/Definitions/magico.yml index cc1cca50f..ac4003280 100644 --- a/src/Jackett.Common/Definitions/magico.yml +++ b/src/Jackett.Common/Definitions/magico.yml @@ -83,12 +83,12 @@ caps: - {id: 6, cat: PC, desc: "Programs"} - {id: 18, cat: PC/0day, desc: "Programs PC"} - - {id: 40, cat: PC/Phone-Android, desc: "Programs Android"} + - {id: 40, cat: PC/Mobile-Android, desc: "Programs Android"} - {id: 19, cat: PC/Mac, desc: "Programs Mac"} - {id: 2, cat: PC/Games, desc: "Games"} - {id: 27, cat: PC/Games, desc: "Games PC"} - - {id: 68, cat: PC/Phone-Android, desc: "Games Android"} + - {id: 68, cat: PC/Mobile-Android, desc: "Games Android"} - {id: 88, cat: Other, desc: "Tutorials / Design / Accessories"} - {id: 89, cat: Other, desc: "Tutorials Photoshop"} diff --git a/src/Jackett.Common/Definitions/magnetdl.yml b/src/Jackett.Common/Definitions/magnetdl.yml index fb0970a3d..906e5470c 100644 --- a/src/Jackett.Common/Definitions/magnetdl.yml +++ b/src/Jackett.Common/Definitions/magnetdl.yml @@ -27,7 +27,7 @@ caps: TV: TV Movie: Movies Music: Audio - E-Book: Books/Ebook + E-Book: Books/EBook Game: PC/Games Software: PC Other: Other diff --git a/src/Jackett.Common/Definitions/majomparade.yml b/src/Jackett.Common/Definitions/majomparade.yml index d7230910f..3b1dbe1d3 100644 --- a/src/Jackett.Common/Definitions/majomparade.yml +++ b/src/Jackett.Common/Definitions/majomparade.yml @@ -40,11 +40,11 @@ caps: - {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/Phone-Other, desc: "Mobil"} + - {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: 39, cat: XXX/XviD, desc: "XXX/XviD"} - {id: 57, cat: XXX, desc: "XXX/HD"} modes: diff --git a/src/Jackett.Common/Definitions/microbit.yml b/src/Jackett.Common/Definitions/microbit.yml index 1b871cc8b..ac062bf31 100644 --- a/src/Jackett.Common/Definitions/microbit.yml +++ b/src/Jackett.Common/Definitions/microbit.yml @@ -27,7 +27,7 @@ caps: - {id: 18, cat: PC/Games, desc: "Játék/Rip"} - {id: 19, cat: Other, desc: "Képek"} - {id: 11, cat: Audio/Video, desc: "Klippek/Videók"} - - {id: 8, cat: PC/Phone-Other, desc: "Mobil"} + - {id: 8, cat: PC/Mobile-Other, desc: "Mobil"} - {id: 35, cat: Books, desc: "Oktató Anyagok"} - {id: 28, cat: PC, desc: "PC/Egyéb"} - {id: 21, cat: PC/ISO, desc: "PC/ISO"} diff --git a/src/Jackett.Common/Definitions/mma-torrents.yml b/src/Jackett.Common/Definitions/mma-torrents.yml index ebdd0383d..c28a526c0 100644 --- a/src/Jackett.Common/Definitions/mma-torrents.yml +++ b/src/Jackett.Common/Definitions/mma-torrents.yml @@ -31,13 +31,13 @@ caps: - {id: 93, cat: Audio/Other, desc: "Instructional - Audio"} - {id: 112, cat: TV/Sport, desc: "Instructional - DVD/ISO/WEB"} - {id: 113, cat: Movies/DVD, desc: "Instructional - DVDRip/Other"} - - {id: 73, cat: Books/Ebook, desc: "Instructional - E-book"} - - {id: 83, cat: TV/OTHER, desc: "Instructional - Fitness"} + - {id: 73, cat: Books/EBook, desc: "Instructional - E-book"} + - {id: 83, cat: TV/Other, desc: "Instructional - Fitness"} - {id: 124, cat: TV/Sport, desc: "JJ/BJJ - Events"} - {id: 85, cat: TV/Sport, desc: "JJ/BJJ - Misc/Other"} - {id: 99, cat: TV/Sport, desc: "Kickboxing - HD"} - {id: 84, cat: TV/Sport, desc: "Kickboxing - SD"} - - {id: 111, cat: Books/Magazines, desc: "Magazines - All"} + - {id: 111, cat: Books/Mags, desc: "Magazines - All"} - {id: 58, cat: Other/Misc, desc: "Misc - All"} - {id: 63, cat: TV/Sport, desc: "Misc - MMA Special"} - {id: 62, cat: Movies/Other, desc: "Movies - MMA Related"} diff --git a/src/Jackett.Common/Definitions/mnv.yml b/src/Jackett.Common/Definitions/mnv.yml index bc8f73273..305a5e001 100644 --- a/src/Jackett.Common/Definitions/mnv.yml +++ b/src/Jackett.Common/Definitions/mnv.yml @@ -14,12 +14,12 @@ caps: - {id: 1, cat: TV/Anime, desc: "Anime"} - {id: 2, cat: PC, desc: "Appz"} - {id: 13, cat: TV/Documentary, desc: "Doku"} - - {id: 3, cat: Books/Ebook, desc: "E-Books/Bücher"} + - {id: 3, cat: Books/EBook, desc: "E-Books/Bücher"} - {id: 27, cat: Console/NDS, desc: "Games/Nintendo"} - {id: 24, cat: PC/Games, desc: "Games/PC"} - {id: 25, cat: Console/PSP, desc: "Games/PlayStation"} - - {id: 28, cat: Console/Xbox, desc: "Games/XBOX"} - - {id: 22, cat: PC/Phone-Other, desc: "Handy/PDA"} + - {id: 28, cat: Console/XBox, desc: "Games/XBOX"} + - {id: 22, cat: PC/Mobile-Other, desc: "Handy/PDA"} - {id: 32, cat: TV/Anime, desc: "Hentai"} - {id: 4, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"} - {id: 31, cat: Movies/BluRay, desc: "Movies/BluRay"} @@ -31,7 +31,7 @@ caps: - {id: 19, cat: Audio/Video, desc: "Musik Videos"} - {id: 30, cat: Other, desc: "Sonstiges"} - {id: 21, cat: TV/Sport, desc: "Sport"} - - {id: 5, cat: Books/Magazines, desc: "Tageszeitung"} + - {id: 5, cat: Books/Mags, desc: "Tageszeitung"} - {id: 14, cat: TV, desc: "TV-Serien"} - {id: 29, cat: XXX, desc: "XXX"} diff --git a/src/Jackett.Common/Definitions/moviezone.yml b/src/Jackett.Common/Definitions/moviezone.yml index c8c5aae30..830325cc6 100644 --- a/src/Jackett.Common/Definitions/moviezone.yml +++ b/src/Jackett.Common/Definitions/moviezone.yml @@ -10,10 +10,10 @@ links: caps: categorymappings: - - {id: 76, cat: PC/Phone-Android, desc: "Android"} + - {id: 76, cat: PC/Mobile-Android, desc: "Android"} - {id: 68, cat: Movies/DVD, desc: "DVD-9"} - - {id: 60, cat: Books/Ebook, desc: "eBook/Eng"} - - {id: 61, cat: Books/Ebook, desc: "eBook/Hun"} + - {id: 60, cat: Books/EBook, desc: "eBook/Eng"} + - {id: 61, cat: Books/EBook, desc: "eBook/Hun"} - {id: 37, cat: Movies/DVD, desc: "Film/DVD-R/Eng"} - {id: 38, cat: Movies/DVD, desc: "Film/DVD-R/Hun"} - {id: 48, cat: Movies/HD, desc: "Film/HD/Eng"} @@ -28,7 +28,7 @@ caps: - {id: 51, cat: PC/Games, desc: "Játék/ISO"} - {id: 53, cat: Console/PSP, desc: "Játék/PS"} - {id: 52, cat: PC/Games, desc: "Játék/Rip"} - - {id: 56, cat: Console/Xbox, desc: "Játék/Xbox (X-360)"} + - {id: 56, cat: Console/XBox, desc: "Játék/Xbox (X-360)"} - {id: 75, cat: Other, desc: "Képek"} - {id: 74, cat: XXX, desc: "Képek/XXX"} - {id: 86, cat: Audio/Video, desc: "Klip"} @@ -37,8 +37,8 @@ caps: - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"} - {id: 45, cat: PC/ISO, desc: "Program/ISO"} - {id: 44, cat: PC, desc: "Program/Misc"} - - {id: 36, cat: PC/Phone-Other, desc: "Program/Mobil"} - - {id: 46, cat: PC/Phone-Other, desc: "Program/PDA"} + - {id: 36, cat: PC/Mobile-Other, desc: "Program/Mobil"} + - {id: 46, cat: PC/Mobile-Other, desc: "Program/PDA"} - {id: 42, cat: TV/Anime, desc: "Rajzfilm/Eng"} - {id: 43, cat: TV/Anime, desc: "Rajzfilm/Hun"} - {id: 57, cat: TV, desc: "Sorozat/Eng"} diff --git a/src/Jackett.Common/Definitions/nbtorrents.yml b/src/Jackett.Common/Definitions/nbtorrents.yml index 5fd0349b4..cc8cf9d3c 100644 --- a/src/Jackett.Common/Definitions/nbtorrents.yml +++ b/src/Jackett.Common/Definitions/nbtorrents.yml @@ -18,8 +18,8 @@ caps: - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"} - {id: 8, cat: Movies, desc: "Movies Pre"} - {id: 2, cat: Movies, desc: "Movies Remux"} - - {id: 4, cat: Movies/WEBDL, desc: "Movies Web"} - - {id: 5, cat: Movies/WEBDL, desc: "Movies WebRip"} + - {id: 4, cat: Movies/WEB-DL, desc: "Movies Web"} + - {id: 5, cat: Movies/WEB-DL, desc: "Movies WebRip"} - {id: 15, cat: Audio/Lossless, desc: "Music FLAC"} - {id: 17, cat: Audio/MP3, desc: "Music MP3"} - {id: 18, cat: Audio, desc: "Music Pack"} diff --git a/src/Jackett.Common/Definitions/netcosmo.yml b/src/Jackett.Common/Definitions/netcosmo.yml index ecd8c121e..3edb05ec5 100644 --- a/src/Jackett.Common/Definitions/netcosmo.yml +++ b/src/Jackett.Common/Definitions/netcosmo.yml @@ -11,7 +11,7 @@ links: caps: categorymappings: - {id: 14, cat: Movies, desc: "Screener"} - - {id: 39, cat: Movies/WEBDL, desc: "BDRip - Download WEB"} + - {id: 39, cat: Movies/WEB-DL, desc: "BDRip - Download WEB"} - {id: 15, cat: Movies/HD, desc: "Rip H264"} - {id: 16, cat: Movies/HD, desc: "Rip H265"} - {id: 24, cat: Movies/UHD, desc: "Rip 4K"} diff --git a/src/Jackett.Common/Definitions/netlab.yml b/src/Jackett.Common/Definitions/netlab.yml index 90fb34bcf..3fd4658eb 100644 --- a/src/Jackett.Common/Definitions/netlab.yml +++ b/src/Jackett.Common/Definitions/netlab.yml @@ -12,13 +12,13 @@ caps: categorymappings: - {id: 1, cat: Movies/DVD, desc: "DVD5"} - {id: 4, cat: Movies/DVD, desc: "DVD9"} - - {id: 5, cat: Movies/WEBDL, desc: "MPEG/AVI"} + - {id: 5, cat: Movies/WEB-DL, desc: "MPEG/AVI"} - {id: 6, cat: Audio, desc: "Музыка (Music)"} - {id: 7, cat: PC/Games, desc: "Игры (Games)"} - {id: 9, cat: PC/0day, desc: "Программы (Apps)"} - {id: 10, cat: TV/HD, desc: "HDTV"} - {id: 11, cat: Audio/Audiobook, desc: "Аудио Книги (Audiobooks)"} - - {id: 12, cat: Books/Ebook, desc: "Книги (Ebooks)"} + - {id: 12, cat: Books/EBook, desc: "Книги (Ebooks)"} - {id: 14, cat: Other, desc: "Разное (Other)"} - {id: 15, cat: Audio/Video, desc: "МузDVD (Music/Video)"} diff --git a/src/Jackett.Common/Definitions/nitro.yml b/src/Jackett.Common/Definitions/nitro.yml index 5bccd31b4..00bbf3ed4 100644 --- a/src/Jackett.Common/Definitions/nitro.yml +++ b/src/Jackett.Common/Definitions/nitro.yml @@ -20,7 +20,7 @@ caps: - {id: 6, cat: PC, desc: "Programy"} - {id: 7, cat: Books, desc: "E-Booki/Książki"} - {id: 8, cat: Audio/Audiobook, desc: "Audio Booki"} - - {id: 9, cat: PC/Phone-Other, desc: "GSM/PDA"} + - {id: 9, cat: PC/Mobile-Other, desc: "GSM/PDA"} - {id: 10, cat: Other, desc: "Inne"} - {id: 11, cat: XXX, desc: "XXX"} - {id: 144, cat: Other, desc: "Nieposortowane"} diff --git a/src/Jackett.Common/Definitions/nntt.yml b/src/Jackett.Common/Definitions/nntt.yml index cfc230030..67e5e69ba 100644 --- a/src/Jackett.Common/Definitions/nntt.yml +++ b/src/Jackett.Common/Definitions/nntt.yml @@ -30,17 +30,17 @@ caps: - {id: 12, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"} - {id: 350, cat: TV/Anime, desc: "Аниме"} - {id: 824, cat: TV/Sport, desc: "Спорт"} - - {id: 9, cat: TV/OTHER, desc: "TV, развлекательные шоу, приколы и юмор"} + - {id: 9, cat: TV/Other, desc: "TV, развлекательные шоу, приколы и юмор"} - {id: 758, cat: Audio, desc: "Музыка"} - {id: 943, cat: Audio/Lossless, desc: "Lossless"} - {id: 1046, cat: Audio/Video, desc: "Музыкальное видео"} - {id: 616, cat: Audio/Audiobook, desc: "Аудиокниги"} - {id: 614, cat: Books, desc: "Книги"} - - {id: 617, cat: Books/Magazines, desc: "Журналы"} + - {id: 617, cat: Books/Mags, desc: "Журналы"} - {id: 488, cat: PC, desc: "Программы"} - {id: 492, cat: PC/Mac, desc: "ОС и ПО для Apple Macintosh"} - - {id: 799, cat: PC/Phone-IOS, desc: "iPhone, iPod Touch, iPad"} - - {id: 800, cat: PC/Phone-Android, desc: "Android"} + - {id: 799, cat: PC/Mobile-iOS, desc: "iPhone, iPod Touch, iPad"} + - {id: 800, cat: PC/Mobile-Android, desc: "Android"} - {id: 400, cat: PC/Games, desc: "Игры"} - {id: 748, cat: Console, desc: "Консольные игры"} - {id: 686, cat: XXX, desc: "Эротика и Pron"} diff --git a/src/Jackett.Common/Definitions/omgwtftrackr.yml b/src/Jackett.Common/Definitions/omgwtftrackr.yml index 9d621a4de..54b586e50 100644 --- a/src/Jackett.Common/Definitions/omgwtftrackr.yml +++ b/src/Jackett.Common/Definitions/omgwtftrackr.yml @@ -32,13 +32,13 @@ caps: - {id: 20, cat: TV/SD, desc: "en/TV-X264-SD"} - {id: 21, cat: Console/Wii, desc: "en/WII"} - {id: 22, cat: Movies/HD, desc: "en/X264"} - - {id: 23, cat: Console/Xbox 360, desc: "en/XBOX360"} - - {id: 24, cat: Console/Xbox One, desc: "en/XBOXONE"} + - {id: 23, cat: Console/XBox 360, desc: "en/XBOX360"} + - {id: 24, cat: Console/XBox One, desc: "en/XBOXONE"} - {id: 25, cat: Movies/SD, desc: "en/XVID"} - {id: 26, cat: XXX, desc: "en/XXX"} - {id: 27, cat: XXX/Other, desc: "en/XXX-0DAY"} - {id: 28, cat: XXX/DVD, desc: "en/XXX-DVDR"} - - {id: 29, cat: XXX/Imageset, desc: "en/XXX-iMAGESETS"} + - {id: 29, cat: XXX/ImageSet, desc: "en/XXX-iMAGESETS"} - {id: 30, cat: Movies/BluRay, desc: "de/BLURAY"} - {id: 31, cat: Movies/DVD, desc: "de/DVDR"} - {id: 32, cat: TV, desc: "de/TV"} diff --git a/src/Jackett.Common/Definitions/onlyscene.yml b/src/Jackett.Common/Definitions/onlyscene.yml index 3f97b972e..8c92f6fb3 100644 --- a/src/Jackett.Common/Definitions/onlyscene.yml +++ b/src/Jackett.Common/Definitions/onlyscene.yml @@ -20,8 +20,8 @@ caps: - {id: 13, cat: PC/Games, desc: "jeux"} - {id: 14, cat: Other, desc: "Dox"} - {id: 15, cat: PC/0day, desc: "APPS"} - - {id: 16, cat: Books/Magazines, desc: "Journaux-Mags"} - - {id: 17, cat: Books/Ebook, desc: "Ebooks"} + - {id: 16, cat: Books/Mags, desc: "Journaux-Mags"} + - {id: 17, cat: Books/EBook, desc: "Ebooks"} - {id: 18, cat: TV, desc: "Spectacles"} - {id: 19, cat: TV, desc: "TV Spectacles"} - {id: 20, cat: TV/Documentary, desc: "TV DOC"} diff --git a/src/Jackett.Common/Definitions/p2pbg.yml b/src/Jackett.Common/Definitions/p2pbg.yml index 2bbed7eca..1adae22b3 100644 --- a/src/Jackett.Common/Definitions/p2pbg.yml +++ b/src/Jackett.Common/Definitions/p2pbg.yml @@ -25,8 +25,8 @@ caps: - {id: 38, cat: TV/Anime, desc: "TV-Cartoons"} - {id: 8, cat: PC/Games, desc: "Games-PC ISO"} - {id: 9, cat: PC/Games, desc: "Games-PC Rips"} - - {id: 21, cat: Console/Xbox, desc: "Games-XboX"} - - {id: 22, cat: Console/Xbox 360, desc: "Games-X360"} + - {id: 21, cat: Console/XBox, desc: "Games-XboX"} + - {id: 22, cat: Console/XBox 360, desc: "Games-X360"} - {id: 33, cat: Console/Wii, desc: "Games-Wii"} - {id: 20, cat: Console/PSP, desc: "Games-PSP"} - {id: 23, cat: Console/PS3, desc: "Games-PS3"} @@ -45,13 +45,13 @@ caps: - {id: 37, cat: Other/Misc, desc: "Pictures"} - {id: 4, cat: Other, desc: "Other"} - {id: 6, cat: Books, desc: "Books"} - - {id: 52, cat: PC/Phone-Other, desc: "Mobile-GSM"} - - {id: 40, cat: PC/Phone-IOS, desc: "Mobile-iPhone"} + - {id: 52, cat: PC/Mobile-Other, desc: "Mobile-GSM"} + - {id: 40, cat: PC/Mobile-iOS, desc: "Mobile-iPhone"} - {id: 51, cat: TV/Sport, desc: "Sport"} - {id: 5, cat: TV/Sport, desc: "Sport F1"} - {id: 13, cat: XXX, desc: "XXX"} - {id: 54, cat: XXX/x264, desc: "XXX HD"} - - {id: 32, cat: XXX/Imageset, desc: "XXX Pictures"} + - {id: 32, cat: XXX/ImageSet, desc: "XXX Pictures"} - {id: 56, cat: XXX, desc: "XXX 3D"} - {id: 53, cat: XXX, desc: "XXX Hentai"} - {id: 48, cat: XXX, desc: "XXX BG Amateurs"} diff --git a/src/Jackett.Common/Definitions/p2pelite.yml b/src/Jackett.Common/Definitions/p2pelite.yml index f51748521..2b58983f5 100644 --- a/src/Jackett.Common/Definitions/p2pelite.yml +++ b/src/Jackett.Common/Definitions/p2pelite.yml @@ -12,43 +12,43 @@ caps: categorymappings: - {id: 19, cat: PC, desc: "Apps"} - {id: 11, cat: Audio/Audiobook, desc: "Audio Books"} - - {id: 40, cat: Books/Ebook, desc: "Best Sellers"} - - {id: 17, cat: Books/Ebook, desc: "Biographical"} - - {id: 27, cat: Books/Ebook, desc: "Business/Finance"} - - {id: 8, cat: Books/Ebook, desc: "Children"} - - {id: 30, cat: Books/Ebook, desc: "Classic"} + - {id: 40, cat: Books/EBook, desc: "Best Sellers"} + - {id: 17, cat: Books/EBook, desc: "Biographical"} + - {id: 27, cat: Books/EBook, desc: "Business/Finance"} + - {id: 8, cat: Books/EBook, desc: "Children"} + - {id: 30, cat: Books/EBook, desc: "Classic"} - {id: 2, cat: Books/Comics, desc: "Comics/GraphicNovels/Manga"} - - {id: 14, cat: Books/Ebook, desc: "Computer"} - - {id: 15, cat: Books/Ebook, desc: "Cookbooks"} - - {id: 22, cat: Books/Ebook, desc: "Crime/Thriller/Mystery"} - - {id: 10, cat: Books/Ebook, desc: "DIY"} - - {id: 6, cat: Books/Ebook, desc: "Educational"} + - {id: 14, cat: Books/EBook, desc: "Computer"} + - {id: 15, cat: Books/EBook, desc: "Cookbooks"} + - {id: 22, cat: Books/EBook, desc: "Crime/Thriller/Mystery"} + - {id: 10, cat: Books/EBook, desc: "DIY"} + - {id: 6, cat: Books/EBook, desc: "Educational"} - {id: 12, cat: Books/Other, desc: "Educational Videos"} - - {id: 20, cat: Books/Ebook, desc: "Erotica/over 18"} - - {id: 23, cat: Books/Ebook, desc: "Fantasy"} - - {id: 1, cat: Books/Ebook, desc: "Fiction"} - - {id: 18, cat: Books/Ebook, desc: "Gardening"} - - {id: 21, cat: Books/Ebook, desc: "Health"} - - {id: 33, cat: Books/Ebook, desc: "Historical Fiction"} - - {id: 16, cat: Books/Ebook, desc: "History"} - - {id: 4, cat: Books/Ebook, desc: "Hobby/Pastimes"} - - {id: 29, cat: Books/Ebook, desc: "Horror"} - - {id: 5, cat: Books/Ebook, desc: "Language Learning"} - - {id: 7, cat: Books/Magazines, desc: "Magazines"} + - {id: 20, cat: Books/EBook, desc: "Erotica/over 18"} + - {id: 23, cat: Books/EBook, desc: "Fantasy"} + - {id: 1, cat: Books/EBook, desc: "Fiction"} + - {id: 18, cat: Books/EBook, desc: "Gardening"} + - {id: 21, cat: Books/EBook, desc: "Health"} + - {id: 33, cat: Books/EBook, desc: "Historical Fiction"} + - {id: 16, cat: Books/EBook, desc: "History"} + - {id: 4, cat: Books/EBook, desc: "Hobby/Pastimes"} + - {id: 29, cat: Books/EBook, desc: "Horror"} + - {id: 5, cat: Books/EBook, desc: "Language Learning"} + - {id: 7, cat: Books/Mags, desc: "Magazines"} - {id: 13, cat: Books/Other, desc: "Misc"} - {id: 34, cat: Audio, desc: "Music"} - - {id: 37, cat: Books/Ebook, desc: "New Adult"} - - {id: 28, cat: Books/Ebook, desc: "Non-English"} - - {id: 3, cat: Books/Ebook, desc: "Non-Fiction/Reference"} - - {id: 24, cat: Books/Ebook, desc: "Paranormal Romance"} - - {id: 39, cat: Books/Ebook, desc: "Philosophy"} - - {id: 25, cat: Books/Ebook, desc: "Romance"} - - {id: 26, cat: Books/Ebook, desc: "SciFi"} - - {id: 9, cat: Books/Ebook, desc: "Teens"} + - {id: 37, cat: Books/EBook, desc: "New Adult"} + - {id: 28, cat: Books/EBook, desc: "Non-English"} + - {id: 3, cat: Books/EBook, desc: "Non-Fiction/Reference"} + - {id: 24, cat: Books/EBook, desc: "Paranormal Romance"} + - {id: 39, cat: Books/EBook, desc: "Philosophy"} + - {id: 25, cat: Books/EBook, desc: "Romance"} + - {id: 26, cat: Books/EBook, desc: "SciFi"} + - {id: 9, cat: Books/EBook, desc: "Teens"} - {id: 32, cat: Other, desc: "torrent not modded"} - - {id: 35, cat: Books/Ebook, desc: "True Crime"} - - {id: 38, cat: Books/Ebook, desc: "Urban Fantasy"} - - {id: 31, cat: Books/Ebook, desc: "Western"} + - {id: 35, cat: Books/EBook, desc: "True Crime"} + - {id: 38, cat: Books/EBook, desc: "Urban Fantasy"} + - {id: 31, cat: Books/EBook, desc: "Western"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/peersfm.yml b/src/Jackett.Common/Definitions/peersfm.yml index 202be1b00..a90a7fc44 100644 --- a/src/Jackett.Common/Definitions/peersfm.yml +++ b/src/Jackett.Common/Definitions/peersfm.yml @@ -16,16 +16,16 @@ caps: - {id: 14, cat: Movies/HD, desc: "HD Видео"} - {id: 7, cat: Other, desc: "Images"} - {id: 15, cat: PC/Mac, desc: "Mac"} - - {id: 26, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 26, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 24, cat: TV, desc: "TV Show"} - {id: 1, cat: PC, desc: "WaReZ"} - {id: 10, cat: XXX, desc: "XXX"} - {id: 9, cat: Audio/Audiobook, desc: "Аудиокниги"} - {id: 3, cat: PC/Games, desc: "Игры/GameZ"} - {id: 2, cat: Audio/Video, desc: "Клипы/Концерты"} - - {id: 8, cat: Books/Magazines, desc: "Книги/Журналы"} + - {id: 8, cat: Books/Mags, desc: "Книги/Журналы"} - {id: 20, cat: Audio/Lossless, desc: "Музыка/Lossless"} - - {id: 11, cat: Audio/Mp3, desc: "Музыка/Mp3"} + - {id: 11, cat: Audio/MP3, desc: "Музыка/Mp3"} - {id: 13, cat: TV, desc: "Мультфильмы"} - {id: 12, cat: Other, desc: "Разное/Miscellaneous"} - {id: 4, cat: Movies/DVD, desc: "Фильмы DVD"} diff --git a/src/Jackett.Common/Definitions/piratbit.yml b/src/Jackett.Common/Definitions/piratbit.yml index d668f0bee..358734adc 100644 --- a/src/Jackett.Common/Definitions/piratbit.yml +++ b/src/Jackett.Common/Definitions/piratbit.yml @@ -327,12 +327,12 @@ caps: - {id: 1362, cat: TV, desc: " |- Компьютерные видеоуроки и обучающие интерактивные диски"} - {id: 1361, cat: TV, desc: " |- Боевые искусства (Видеоуроки)"} # Games for consoles - - {id: 50, cat: Console/Xbox, desc: "XBox"} - - {id: 1363, cat: Console/Xbox 360, desc: " |- XBox360"} - - {id: 1420, cat: Console/Xbox 360, desc: " |- Xbox360 - Live"} - - {id: 1396, cat: Console/Xbox 360, desc: " |- XBox360 - FreeBoot / JTAG"} - - {id: 1364, cat: Console/Xbox 360, desc: " |- XBox360 - Демоверсии"} - - {id: 1323, cat: Console/Xbox 360, desc: " |- XBox360 - Программы / Прошивки"} + - {id: 50, cat: Console/XBox, desc: "XBox"} + - {id: 1363, cat: Console/XBox 360, desc: " |- XBox360"} + - {id: 1420, cat: Console/XBox 360, desc: " |- Xbox360 - Live"} + - {id: 1396, cat: Console/XBox 360, desc: " |- XBox360 - FreeBoot / JTAG"} + - {id: 1364, cat: Console/XBox 360, desc: " |- XBox360 - Демоверсии"} + - {id: 1323, cat: Console/XBox 360, desc: " |- XBox360 - Программы / Прошивки"} - {id: 49, cat: Console/PSP, desc: "PlayStation"} - {id: 303, cat: Console/PSP, desc: " |- PSX-PSP - Игры"} - {id: 1365, cat: Console/PSP, desc: " |- PlayStation 2 (PS2) - Игры"} @@ -555,43 +555,43 @@ caps: - {id: 792, cat: Books, desc: " |- Художественная литература"} - {id: 1407, cat: Books, desc: "Комиксы"} # Mobile Devices - - {id: 641, cat: PC/Phone-Other, desc: "Всё для мобильных телефонов и КПК"} - - {id: 651, cat: PC/Phone-Other, desc: " |- Видео для КПК и Смартфонов"} - - {id: 650, cat: PC/Phone-Other, desc: " |- Приложения для КПК"} - - {id: 649, cat: PC/Phone-Other, desc: " |- Игры для КПК"} - - {id: 648, cat: PC/Phone-Other, desc: " |- Видео для мобильных (3GP, MP4,AVI)"} - - {id: 647, cat: PC/Phone-Other, desc: " |- Софт для работы с телефоном"} - - {id: 646, cat: PC/Phone-Other, desc: " |- Приложения для мобильных"} - - {id: 645, cat: PC/Phone-Other, desc: " |- Игры для мобильных"} - - {id: 644, cat: PC/Phone-Other, desc: " |- Аудио/видео конвертеры в мобильные форматы"} - - {id: 643, cat: PC/Phone-Other, desc: " |- Мелодии"} - - {id: 642, cat: PC/Phone-Other, desc: " |- Сборники"} - - {id: 1832, cat: PC/Phone-Other, desc: " |- Игры android"} - - {id: 1833, cat: PC/Phone-Other, desc: " |- Программы android"} - - {id: 656, cat: PC/Phone-Other, desc: "iPhone, iPod, iPod Touch"} - - {id: 676, cat: PC/Phone-Other, desc: " |- Архив (iPhone, iPod, iPod Touch)"} - - {id: 675, cat: PC/Phone-Other, desc: " |- Аудиокниги (iPhone, iPod, iPod Touch)"} - - {id: 674, cat: PC/Phone-Other, desc: " |- Разное (iPhone, iPod, iPod Touch)"} - - {id: 673, cat: PC/Phone-Other, desc: " |- Программы (iPhone, iPod, iPod Touch)"} - - {id: 672, cat: PC/Phone-Other, desc: " |- Игры (iPhone, iPod, iPod Touch)"} - - {id: 671, cat: PC/Phone-Other, desc: " |- Видео (iPhone, iPod Touch)"} - - {id: 670, cat: PC/Phone-Other, desc: " |- Видео (iPod Classic, Video, Nano)"} - - {id: 669, cat: PC/Phone-Other, desc: " |- Видео (Apple TV)"} - - {id: 668, cat: PC/Phone-Other, desc: " |- Музыка lossless (iPod, iPod Touch, iPhone)"} - - {id: 625, cat: PC/Phone-Other, desc: "ГИС, системы навигации и карты"} - - {id: 640, cat: PC/Phone-Other, desc: " |- Архив (ГИС, системы навигации и карты)"} - - {id: 639, cat: PC/Phone-Other, desc: " |- Ищу и предлагаю (ГИС, системы навигации и карты)"} - - {id: 638, cat: PC/Phone-Other, desc: " |- Общение (ГИС, системы навигации и карты)"} - - {id: 637, cat: PC/Phone-Other, desc: " |- ГИС (Геоинформационные системы)"} - - {id: 636, cat: PC/Phone-Other, desc: " |- Карты, снабженные программной оболочкой"} - - {id: 633, cat: PC/Phone-Other, desc: " |- Карты прочие (астрономические, исторические, тематические)"} - - {id: 632, cat: PC/Phone-Other, desc: " |- Встроенная автомобильная навигация"} - - {id: 631, cat: PC/Phone-Other, desc: " |- Garmin"} - - {id: 630, cat: PC/Phone-Other, desc: " |- Ozi"} - - {id: 629, cat: PC/Phone-Other, desc: " |- TomTom"} - - {id: 628, cat: PC/Phone-Other, desc: " |- Navigon / Navitel"} - - {id: 627, cat: PC/Phone-Other, desc: " |- Igo"} - - {id: 626, cat: PC/Phone-Other, desc: " |- Разное - системы навигации и карты"} + - {id: 641, cat: PC/Mobile-Other, desc: "Всё для мобильных телефонов и КПК"} + - {id: 651, cat: PC/Mobile-Other, desc: " |- Видео для КПК и Смартфонов"} + - {id: 650, cat: PC/Mobile-Other, desc: " |- Приложения для КПК"} + - {id: 649, cat: PC/Mobile-Other, desc: " |- Игры для КПК"} + - {id: 648, cat: PC/Mobile-Other, desc: " |- Видео для мобильных (3GP, MP4,AVI)"} + - {id: 647, cat: PC/Mobile-Other, desc: " |- Софт для работы с телефоном"} + - {id: 646, cat: PC/Mobile-Other, desc: " |- Приложения для мобильных"} + - {id: 645, cat: PC/Mobile-Other, desc: " |- Игры для мобильных"} + - {id: 644, cat: PC/Mobile-Other, desc: " |- Аудио/видео конвертеры в мобильные форматы"} + - {id: 643, cat: PC/Mobile-Other, desc: " |- Мелодии"} + - {id: 642, cat: PC/Mobile-Other, desc: " |- Сборники"} + - {id: 1832, cat: PC/Mobile-Other, desc: " |- Игры android"} + - {id: 1833, cat: PC/Mobile-Other, desc: " |- Программы android"} + - {id: 656, cat: PC/Mobile-Other, desc: "iPhone, iPod, iPod Touch"} + - {id: 676, cat: PC/Mobile-Other, desc: " |- Архив (iPhone, iPod, iPod Touch)"} + - {id: 675, cat: PC/Mobile-Other, desc: " |- Аудиокниги (iPhone, iPod, iPod Touch)"} + - {id: 674, cat: PC/Mobile-Other, desc: " |- Разное (iPhone, iPod, iPod Touch)"} + - {id: 673, cat: PC/Mobile-Other, desc: " |- Программы (iPhone, iPod, iPod Touch)"} + - {id: 672, cat: PC/Mobile-Other, desc: " |- Игры (iPhone, iPod, iPod Touch)"} + - {id: 671, cat: PC/Mobile-Other, desc: " |- Видео (iPhone, iPod Touch)"} + - {id: 670, cat: PC/Mobile-Other, desc: " |- Видео (iPod Classic, Video, Nano)"} + - {id: 669, cat: PC/Mobile-Other, desc: " |- Видео (Apple TV)"} + - {id: 668, cat: PC/Mobile-Other, desc: " |- Музыка lossless (iPod, iPod Touch, iPhone)"} + - {id: 625, cat: PC/Mobile-Other, desc: "ГИС, системы навигации и карты"} + - {id: 640, cat: PC/Mobile-Other, desc: " |- Архив (ГИС, системы навигации и карты)"} + - {id: 639, cat: PC/Mobile-Other, desc: " |- Ищу и предлагаю (ГИС, системы навигации и карты)"} + - {id: 638, cat: PC/Mobile-Other, desc: " |- Общение (ГИС, системы навигации и карты)"} + - {id: 637, cat: PC/Mobile-Other, desc: " |- ГИС (Геоинформационные системы)"} + - {id: 636, cat: PC/Mobile-Other, desc: " |- Карты, снабженные программной оболочкой"} + - {id: 633, cat: PC/Mobile-Other, desc: " |- Карты прочие (астрономические, исторические, тематические)"} + - {id: 632, cat: PC/Mobile-Other, desc: " |- Встроенная автомобильная навигация"} + - {id: 631, cat: PC/Mobile-Other, desc: " |- Garmin"} + - {id: 630, cat: PC/Mobile-Other, desc: " |- Ozi"} + - {id: 629, cat: PC/Mobile-Other, desc: " |- TomTom"} + - {id: 628, cat: PC/Mobile-Other, desc: " |- Navigon / Navitel"} + - {id: 627, cat: PC/Mobile-Other, desc: " |- Igo"} + - {id: 626, cat: PC/Mobile-Other, desc: " |- Разное - системы навигации и карты"} # All by car and moto - {id: 1457, cat: PC, desc: " |- Ремонт и эксплуатация транспортных средств"} - {id: 1458, cat: PC, desc: " |- Ищу / Предлагаю (Ремонт и эксплуатация ТС)"} diff --git a/src/Jackett.Common/Definitions/piratbitl.yml b/src/Jackett.Common/Definitions/piratbitl.yml index 6f3df663f..4ae30a002 100644 --- a/src/Jackett.Common/Definitions/piratbitl.yml +++ b/src/Jackett.Common/Definitions/piratbitl.yml @@ -327,12 +327,12 @@ caps: - {id: 1362, cat: TV, desc: " |- Компьютерные видеоуроки и обучающие интерактивные диски"} - {id: 1361, cat: TV, desc: " |- Боевые искусства (Видеоуроки)"} # Games for consoles - - {id: 50, cat: Console/Xbox, desc: "XBox"} - - {id: 1363, cat: Console/Xbox 360, desc: " |- XBox360"} - - {id: 1420, cat: Console/Xbox 360, desc: " |- Xbox360 - Live"} - - {id: 1396, cat: Console/Xbox 360, desc: " |- XBox360 - FreeBoot / JTAG"} - - {id: 1364, cat: Console/Xbox 360, desc: " |- XBox360 - Демоверсии"} - - {id: 1323, cat: Console/Xbox 360, desc: " |- XBox360 - Программы / Прошивки"} + - {id: 50, cat: Console/XBox, desc: "XBox"} + - {id: 1363, cat: Console/XBox 360, desc: " |- XBox360"} + - {id: 1420, cat: Console/XBox 360, desc: " |- Xbox360 - Live"} + - {id: 1396, cat: Console/XBox 360, desc: " |- XBox360 - FreeBoot / JTAG"} + - {id: 1364, cat: Console/XBox 360, desc: " |- XBox360 - Демоверсии"} + - {id: 1323, cat: Console/XBox 360, desc: " |- XBox360 - Программы / Прошивки"} - {id: 49, cat: Console/PSP, desc: "PlayStation"} - {id: 303, cat: Console/PSP, desc: " |- PSX-PSP - Игры"} - {id: 1365, cat: Console/PSP, desc: " |- PlayStation 2 (PS2) - Игры"} @@ -555,43 +555,43 @@ caps: - {id: 792, cat: Books, desc: " |- Художественная литература"} - {id: 1407, cat: Books, desc: "Комиксы"} # Mobile Devices - - {id: 641, cat: PC/Phone-Other, desc: "Всё для мобильных телефонов и КПК"} - - {id: 651, cat: PC/Phone-Other, desc: " |- Видео для КПК и Смартфонов"} - - {id: 650, cat: PC/Phone-Other, desc: " |- Приложения для КПК"} - - {id: 649, cat: PC/Phone-Other, desc: " |- Игры для КПК"} - - {id: 648, cat: PC/Phone-Other, desc: " |- Видео для мобильных (3GP, MP4,AVI)"} - - {id: 647, cat: PC/Phone-Other, desc: " |- Софт для работы с телефоном"} - - {id: 646, cat: PC/Phone-Other, desc: " |- Приложения для мобильных"} - - {id: 645, cat: PC/Phone-Other, desc: " |- Игры для мобильных"} - - {id: 644, cat: PC/Phone-Other, desc: " |- Аудио/видео конвертеры в мобильные форматы"} - - {id: 643, cat: PC/Phone-Other, desc: " |- Мелодии"} - - {id: 642, cat: PC/Phone-Other, desc: " |- Сборники"} - - {id: 1832, cat: PC/Phone-Other, desc: " |- Игры android"} - - {id: 1833, cat: PC/Phone-Other, desc: " |- Программы android"} - - {id: 656, cat: PC/Phone-Other, desc: "iPhone, iPod, iPod Touch"} - - {id: 676, cat: PC/Phone-Other, desc: " |- Архив (iPhone, iPod, iPod Touch)"} - - {id: 675, cat: PC/Phone-Other, desc: " |- Аудиокниги (iPhone, iPod, iPod Touch)"} - - {id: 674, cat: PC/Phone-Other, desc: " |- Разное (iPhone, iPod, iPod Touch)"} - - {id: 673, cat: PC/Phone-Other, desc: " |- Программы (iPhone, iPod, iPod Touch)"} - - {id: 672, cat: PC/Phone-Other, desc: " |- Игры (iPhone, iPod, iPod Touch)"} - - {id: 671, cat: PC/Phone-Other, desc: " |- Видео (iPhone, iPod Touch)"} - - {id: 670, cat: PC/Phone-Other, desc: " |- Видео (iPod Classic, Video, Nano)"} - - {id: 669, cat: PC/Phone-Other, desc: " |- Видео (Apple TV)"} - - {id: 668, cat: PC/Phone-Other, desc: " |- Музыка lossless (iPod, iPod Touch, iPhone)"} - - {id: 625, cat: PC/Phone-Other, desc: "ГИС, системы навигации и карты"} - - {id: 640, cat: PC/Phone-Other, desc: " |- Архив (ГИС, системы навигации и карты)"} - - {id: 639, cat: PC/Phone-Other, desc: " |- Ищу и предлагаю (ГИС, системы навигации и карты)"} - - {id: 638, cat: PC/Phone-Other, desc: " |- Общение (ГИС, системы навигации и карты)"} - - {id: 637, cat: PC/Phone-Other, desc: " |- ГИС (Геоинформационные системы)"} - - {id: 636, cat: PC/Phone-Other, desc: " |- Карты, снабженные программной оболочкой"} - - {id: 633, cat: PC/Phone-Other, desc: " |- Карты прочие (астрономические, исторические, тематические)"} - - {id: 632, cat: PC/Phone-Other, desc: " |- Встроенная автомобильная навигация"} - - {id: 631, cat: PC/Phone-Other, desc: " |- Garmin"} - - {id: 630, cat: PC/Phone-Other, desc: " |- Ozi"} - - {id: 629, cat: PC/Phone-Other, desc: " |- TomTom"} - - {id: 628, cat: PC/Phone-Other, desc: " |- Navigon / Navitel"} - - {id: 627, cat: PC/Phone-Other, desc: " |- Igo"} - - {id: 626, cat: PC/Phone-Other, desc: " |- Разное - системы навигации и карты"} + - {id: 641, cat: PC/Mobile-Other, desc: "Всё для мобильных телефонов и КПК"} + - {id: 651, cat: PC/Mobile-Other, desc: " |- Видео для КПК и Смартфонов"} + - {id: 650, cat: PC/Mobile-Other, desc: " |- Приложения для КПК"} + - {id: 649, cat: PC/Mobile-Other, desc: " |- Игры для КПК"} + - {id: 648, cat: PC/Mobile-Other, desc: " |- Видео для мобильных (3GP, MP4,AVI)"} + - {id: 647, cat: PC/Mobile-Other, desc: " |- Софт для работы с телефоном"} + - {id: 646, cat: PC/Mobile-Other, desc: " |- Приложения для мобильных"} + - {id: 645, cat: PC/Mobile-Other, desc: " |- Игры для мобильных"} + - {id: 644, cat: PC/Mobile-Other, desc: " |- Аудио/видео конвертеры в мобильные форматы"} + - {id: 643, cat: PC/Mobile-Other, desc: " |- Мелодии"} + - {id: 642, cat: PC/Mobile-Other, desc: " |- Сборники"} + - {id: 1832, cat: PC/Mobile-Other, desc: " |- Игры android"} + - {id: 1833, cat: PC/Mobile-Other, desc: " |- Программы android"} + - {id: 656, cat: PC/Mobile-Other, desc: "iPhone, iPod, iPod Touch"} + - {id: 676, cat: PC/Mobile-Other, desc: " |- Архив (iPhone, iPod, iPod Touch)"} + - {id: 675, cat: PC/Mobile-Other, desc: " |- Аудиокниги (iPhone, iPod, iPod Touch)"} + - {id: 674, cat: PC/Mobile-Other, desc: " |- Разное (iPhone, iPod, iPod Touch)"} + - {id: 673, cat: PC/Mobile-Other, desc: " |- Программы (iPhone, iPod, iPod Touch)"} + - {id: 672, cat: PC/Mobile-Other, desc: " |- Игры (iPhone, iPod, iPod Touch)"} + - {id: 671, cat: PC/Mobile-Other, desc: " |- Видео (iPhone, iPod Touch)"} + - {id: 670, cat: PC/Mobile-Other, desc: " |- Видео (iPod Classic, Video, Nano)"} + - {id: 669, cat: PC/Mobile-Other, desc: " |- Видео (Apple TV)"} + - {id: 668, cat: PC/Mobile-Other, desc: " |- Музыка lossless (iPod, iPod Touch, iPhone)"} + - {id: 625, cat: PC/Mobile-Other, desc: "ГИС, системы навигации и карты"} + - {id: 640, cat: PC/Mobile-Other, desc: " |- Архив (ГИС, системы навигации и карты)"} + - {id: 639, cat: PC/Mobile-Other, desc: " |- Ищу и предлагаю (ГИС, системы навигации и карты)"} + - {id: 638, cat: PC/Mobile-Other, desc: " |- Общение (ГИС, системы навигации и карты)"} + - {id: 637, cat: PC/Mobile-Other, desc: " |- ГИС (Геоинформационные системы)"} + - {id: 636, cat: PC/Mobile-Other, desc: " |- Карты, снабженные программной оболочкой"} + - {id: 633, cat: PC/Mobile-Other, desc: " |- Карты прочие (астрономические, исторические, тематические)"} + - {id: 632, cat: PC/Mobile-Other, desc: " |- Встроенная автомобильная навигация"} + - {id: 631, cat: PC/Mobile-Other, desc: " |- Garmin"} + - {id: 630, cat: PC/Mobile-Other, desc: " |- Ozi"} + - {id: 629, cat: PC/Mobile-Other, desc: " |- TomTom"} + - {id: 628, cat: PC/Mobile-Other, desc: " |- Navigon / Navitel"} + - {id: 627, cat: PC/Mobile-Other, desc: " |- Igo"} + - {id: 626, cat: PC/Mobile-Other, desc: " |- Разное - системы навигации и карты"} # All by car and moto - {id: 1457, cat: PC, desc: " |- Ремонт и эксплуатация транспортных средств"} - {id: 1458, cat: PC, desc: " |- Ищу / Предлагаю (Ремонт и эксплуатация ТС)"} diff --git a/src/Jackett.Common/Definitions/pixelcove.yml b/src/Jackett.Common/Definitions/pixelcove.yml index 2458466df..19887ef11 100644 --- a/src/Jackett.Common/Definitions/pixelcove.yml +++ b/src/Jackett.Common/Definitions/pixelcove.yml @@ -16,9 +16,9 @@ caps: - {id: 47, cat: PC, desc: "Linux"} - {id: 56, cat: PC, desc: "VR"} # Microsoft - - {id: 14, cat: Console/Xbox, desc: "Xbox"} - - {id: 61, cat: Console/Xbox360, desc: "Xbox 360"} - - {id: 62, cat: Console/XboxOne, desc: "Xbox One"} + - {id: 14, cat: Console/XBox, desc: "Xbox"} + - {id: 61, cat: Console/XBox 360, desc: "Xbox 360"} + - {id: 62, cat: Console/XBox One, desc: "Xbox One"} # Sony - {id: 43, cat: Console/PS3, desc: "Playstation "} - {id: 63, cat: Console/PS3, desc: "Playstation 2"} @@ -34,11 +34,11 @@ caps: - {id: 15, cat: Console/NDS, desc: "DS"} - {id: 68, cat: Console/NDS, desc: "3DS"} - {id: 69, cat: Console/PSP, desc: "PSP"} - - {id: 70, cat: Console/PSVita, desc: "PSVita"} + - {id: 70, cat: Console/PS Vita, desc: "PSVita"} # Mobile - - {id: 65, cat: PC/Phone-IOS, desc: "iOS"} - - {id: 49, cat: PC/Phone-Android, desc: "Android"} - - {id: 66, cat: PC/Phone-Other, desc: "Windows Mobile"} + - {id: 65, cat: PC/Mobile-iOS, desc: "iOS"} + - {id: 49, cat: PC/Mobile-Android, desc: "Android"} + - {id: 66, cat: PC/Mobile-Other, desc: "Windows Mobile"} # Reading - {id: 53, cat: Books, desc: "Books/Mags"} - {id: 60, cat: Books, desc: "Comics"} diff --git a/src/Jackett.Common/Definitions/proaudiotorrents.yml b/src/Jackett.Common/Definitions/proaudiotorrents.yml index a5ce660ee..9e03e820d 100644 --- a/src/Jackett.Common/Definitions/proaudiotorrents.yml +++ b/src/Jackett.Common/Definitions/proaudiotorrents.yml @@ -13,7 +13,7 @@ legacylinks: caps: categorymappings: - {id: 24, cat: PC/0day, desc: "DJ Applications"} - - {id: 3, cat: Books/Ebook, desc: "Ebooks"} + - {id: 3, cat: Books/EBook, desc: "Ebooks"} - {id: 4, cat: PC, desc: "Expansions & Addons"} - {id: 5, cat: PC, desc: "HYBRID PC/MAC"} - {id: 26, cat: Other, desc: "Independent"} diff --git a/src/Jackett.Common/Definitions/prostylex.yml b/src/Jackett.Common/Definitions/prostylex.yml index 4ccf2716c..5dcbd2122 100644 --- a/src/Jackett.Common/Definitions/prostylex.yml +++ b/src/Jackett.Common/Definitions/prostylex.yml @@ -22,7 +22,7 @@ legacylinks: caps: categorymappings: - {id: 1, cat: Movies/SD, desc: "Movies - Divx/Xvid"} - - {id: 2, cat: Movies/WEBDL, desc: "Movies - h.264/x264"} + - {id: 2, cat: Movies/WEB-DL, desc: "Movies - h.264/x264"} - {id: 3, cat: Movies/HD, desc: "Movies - HD"} - {id: 4, cat: Movies/DVD, desc: "Movies - DVD"} - {id: 5, cat: Movies/Other, desc: "Movies - Cam/TS"} @@ -34,7 +34,7 @@ caps: - {id: 12, cat: TV/WEB-DL, desc: "TV - x264"} - {id: 13, cat: TV/SD, desc: "TV - Xvid"} - {id: 14, cat: TV/HD, desc: "TV - HD"} - - {id: 15, cat: TV/OTHER, desc: "TV - Packs"} + - {id: 15, cat: TV/Other, desc: "TV - Packs"} - {id: 16, cat: TV/Sport, desc: "TV - Sports"} - {id: 17, cat: TV/HD, desc: "TV - HEVC/x265"} - {id: 20, cat: Audio/MP3, desc: "Music - Audio"} @@ -48,8 +48,8 @@ caps: - {id: 46, cat: XXX, desc: "XXX - Games"} - {id: 53, cat: Audio/Audiobook, desc: "Books - Audio books"} - {id: 54, cat: Books/Comics, desc: "Books - Comics"} - - {id: 55, cat: Books/Ebook, desc: "Books - Ebooks"} - - {id: 56, cat: Books/Magazines, desc: "Books - Magazines"} + - {id: 55, cat: Books/EBook, desc: "Books - Ebooks"} + - {id: 56, cat: Books/Mags, desc: "Books - Magazines"} - {id: 57, cat: Books/Other, desc: "Books - Other"} - {id: 58, cat: Other, desc: "Pictures - Other"} - {id: 59, cat: Other, desc: "Pictures - Wallpapers"} @@ -60,15 +60,15 @@ caps: - {id: 92, cat: Console/PSP, desc: "Games - PSP"} - {id: 93, cat: Console/PS3, desc: "Games - PS3"} - {id: 94, cat: PC/Games, desc: "Games - PC-RIP"} - - {id: 95, cat: Console/Xbox 360, desc: "Games - Xbox360"} + - {id: 95, cat: Console/XBox 360, desc: "Games - Xbox360"} - {id: 96, cat: Console/Other, desc: "Games - Other"} - {id: 97, cat: Console/Wii, desc: "Games - Wii"} - {id: 98, cat: Console/NDS, desc: "Games - Nintendo DS"} - - {id: 99, cat: PC/Phone-Android, desc: "Games - Android"} + - {id: 99, cat: PC/Mobile-Android, desc: "Games - Android"} - {id: 103, cat: Console, desc: "Games - Switch"} - {id: 120, cat: PC/0day, desc: "Apps - Windows"} - {id: 121, cat: PC, desc: "Apps - Linux"} - - {id: 122, cat: PC/Phone-Android, desc: "Apps - Android"} + - {id: 122, cat: PC/Mobile-Android, desc: "Apps - Android"} - {id: 123, cat: PC/Mac, desc: "Apps - Mac"} - {id: 124, cat: PC, desc: "Apps - Other"} - {id: 130, cat: Other, desc: "Other - Other"} diff --git a/src/Jackett.Common/Definitions/ptfiles.yml b/src/Jackett.Common/Definitions/ptfiles.yml index 654f92d11..860690c17 100644 --- a/src/Jackett.Common/Definitions/ptfiles.yml +++ b/src/Jackett.Common/Definitions/ptfiles.yml @@ -27,7 +27,7 @@ caps: - {id: 42, cat: TV/SD, desc: "TV/SD X264 Episodes"} - {id: 33, cat: TV/HD, desc: "TV/HD Episodes"} - {id: 22, cat: Other, desc: "Misc"} - - {id: 24, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 24, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 6, cat: Audio, desc: "Music"} - {id: 39, cat: TV, desc: "TV/Seasons"} - {id: 4, cat: PC/Games, desc: "Games/PC"} diff --git a/src/Jackett.Common/Definitions/pthome.yml b/src/Jackett.Common/Definitions/pthome.yml index 99671e0c8..4bfa260fd 100644 --- a/src/Jackett.Common/Definitions/pthome.yml +++ b/src/Jackett.Common/Definitions/pthome.yml @@ -15,7 +15,7 @@ caps: - {id: 404, cat: TV/Documentary, desc: "Documentaries(记录片)"} - {id: 405, cat: TV/Anime, desc: "Animations(动漫)"} - {id: 402, cat: TV, desc: "TV Series(电视剧)"} - - {id: 403, cat: TV/OTHER, desc: "TV Shows(综艺)"} + - {id: 403, cat: TV/Other, desc: "TV Shows(综艺)"} - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)"} - {id: 407, cat: TV/Sport, desc: "Sports(体育)"} - {id: 408, cat: Audio/Lossless, desc: "HQ Audio(音乐)"} diff --git a/src/Jackett.Common/Definitions/ptsbao.yml b/src/Jackett.Common/Definitions/ptsbao.yml index beb9be0c5..9b28c50ab 100644 --- a/src/Jackett.Common/Definitions/ptsbao.yml +++ b/src/Jackett.Common/Definitions/ptsbao.yml @@ -13,7 +13,7 @@ caps: categorymappings: - {id: 401, cat: Movies, desc: "Movies(电影)"} - {id: 402, cat: TV, desc: "TV Series(电视剧)"} - - {id: 403, cat: TV/OTHER, desc: "TV Shows(电视节目)"} + - {id: 403, cat: TV/Other, desc: "TV Shows(电视节目)"} - {id: 405, cat: TV/Anime, desc: "Animations(动漫)"} - {id: 414, cat: Audio, desc: "Music(音乐)"} - {id: 404, cat: TV/Documentary, desc: "Documentaries(记录片)"} diff --git a/src/Jackett.Common/Definitions/puntotorrent.yml b/src/Jackett.Common/Definitions/puntotorrent.yml index 1ae3eda74..3ec541cb3 100644 --- a/src/Jackett.Common/Definitions/puntotorrent.yml +++ b/src/Jackett.Common/Definitions/puntotorrent.yml @@ -70,18 +70,18 @@ caps: - {id: 74, cat: PC/0day, desc: "Software - Windows"} - {id: 75, cat: PC, desc: "Software - Linux"} - {id: 76, cat: PC/Mac, desc: "Software - MAC"} - - {id: 77, cat: PC/Phone-Other, desc: "Software - Otras Plataformas"} - - {id: 115, cat: PC/Phone-Android, desc: "Software - Android"} + - {id: 77, cat: PC/Mobile-Other, desc: "Software - Otras Plataformas"} + - {id: 115, cat: PC/Mobile-Android, desc: "Software - Android"} - {id: 25, cat: PC/Games, desc: "Juegos - Microsoft"} - {id: 26, cat: Console, desc: "Juegos - Sony"} - {id: 27, cat: PC/Games, desc: "Juegos - PC"} - {id: 28, cat: Console/NDS, desc: "Juegos - Nintendo"} - {id: 34, cat: Console/Other, desc: "Juegos - Otros"} - {id: 113, cat: Console/Other, desc: "Juegos - Emuladores/Otras P."} - - {id: 6, cat: Books/Ebook, desc: "eBooks - eBooks"} + - {id: 6, cat: Books/EBook, desc: "eBooks - eBooks"} - {id: 131, cat: Books/Comics, desc: "eBooks - Cómics"} - {id: 134, cat: Books, desc: "eBooks - Manga"} - - {id: 132, cat: Books/Magazines, desc: "eBooks - Revistas"} + - {id: 132, cat: Books/Mags, desc: "eBooks - Revistas"} - {id: 72, cat: Books/Other, desc: "eBooks - Otros"} - {id: 133, cat: Books, desc: "eBooks - Adulto (+18)"} - {id: 92, cat: Other, desc: "Otros formatos - Animación"} diff --git a/src/Jackett.Common/Definitions/r3vwtf.yml b/src/Jackett.Common/Definitions/r3vwtf.yml index 8f1e1b2e8..e495808f3 100644 --- a/src/Jackett.Common/Definitions/r3vwtf.yml +++ b/src/Jackett.Common/Definitions/r3vwtf.yml @@ -15,7 +15,7 @@ caps: - {id: 36, cat: Movies/BluRay, desc: "Bluray"} - {id: 34, cat: Audio/MP3, desc: "Carrow's MP3 Packs"} - {id: 38, cat: Audio, desc: "DMC Music"} - - {id: 24, cat: Books/Ebook, desc: "EBOOK"} + - {id: 24, cat: Books/EBook, desc: "EBOOK"} - {id: 37, cat: Audio, desc: "Mastermix Music"} - {id: 20, cat: Movies/DVD, desc: "Movies/Dvdr"} - {id: 17, cat: Movies, desc: "Movies/Packs"} diff --git a/src/Jackett.Common/Definitions/rainbowtracker.yml b/src/Jackett.Common/Definitions/rainbowtracker.yml index 54bad400d..eafa0ed9e 100644 --- a/src/Jackett.Common/Definitions/rainbowtracker.yml +++ b/src/Jackett.Common/Definitions/rainbowtracker.yml @@ -49,7 +49,7 @@ caps: - {id: 26, cat: TV, desc: "Сериалы - Маленькая Британия / Little Britain "} - {id: 21, cat: TV, desc: "Сериалы - Молокососы / Skins. season "} - {id: 15, cat: TV, desc: "Сериалы - Близкие друзья / Queer as folk "} - - {id: 25, cat: XXX/Imageset, desc: "Фото, Картинки"} + - {id: 25, cat: XXX/ImageSet, desc: "Фото, Картинки"} - {id: 10, cat: XXX, desc: "Pron "} - {id: 16, cat: XXX, desc: "Pron - Pron-Фильмы"} - {id: 86, cat: XXX, desc: "Pron - Pron-Фильмы (азиатские)"} diff --git a/src/Jackett.Common/Definitions/riperam.yml b/src/Jackett.Common/Definitions/riperam.yml index 947d67357..197f4c07d 100644 --- a/src/Jackett.Common/Definitions/riperam.yml +++ b/src/Jackett.Common/Definitions/riperam.yml @@ -676,16 +676,16 @@ caps: - {id: 1391, cat: Other, desc: "Растровые и Векторные Клипарты"} - {id: 1272, cat: Other, desc: "Photoshop (Уроки) и Видеокурсы"} - {id: 1392, cat: Other, desc: "Заготовки, виньетки, рамки"} - - {id: 1408, cat: PC/Phone-Other, desc: "Мобильные устройства"} - - {id: 1409, cat: PC/Phone-Android, desc: "Android"} - - {id: 1411, cat: PC/Phone-Android, desc: "18+ -Android"} - - {id: 1418, cat: PC/Phone-Android, desc: "TV|Видео|IPTV - Android"} - - {id: 1419, cat: PC/Phone-Android, desc: "Утилиты|Система - Android"} - - {id: 1420, cat: PC/Phone-Android, desc: "Видеоплееры|Аудиоплееры - Android"} - - {id: 1421, cat: PC/Phone-Android, desc: "VPN|Интернет - Android"} - - {id: 1422, cat: PC/Phone-Android, desc: "Соцсети|Мессенджеры - Android"} - - {id: 1423, cat: PC/Phone-Android, desc: "Авто|Карты - Android"} - - {id: 1424, cat: PC/Phone-Android, desc: "Редакторы|Фоторедакторы - Android"} + - {id: 1408, cat: PC/Mobile-Other, desc: "Мобильные устройства"} + - {id: 1409, cat: PC/Mobile-Android, desc: "Android"} + - {id: 1411, cat: PC/Mobile-Android, desc: "18+ -Android"} + - {id: 1418, cat: PC/Mobile-Android, desc: "TV|Видео|IPTV - Android"} + - {id: 1419, cat: PC/Mobile-Android, desc: "Утилиты|Система - Android"} + - {id: 1420, cat: PC/Mobile-Android, desc: "Видеоплееры|Аудиоплееры - Android"} + - {id: 1421, cat: PC/Mobile-Android, desc: "VPN|Интернет - Android"} + - {id: 1422, cat: PC/Mobile-Android, desc: "Соцсети|Мессенджеры - Android"} + - {id: 1423, cat: PC/Mobile-Android, desc: "Авто|Карты - Android"} + - {id: 1424, cat: PC/Mobile-Android, desc: "Редакторы|Фоторедакторы - Android"} - {id: 243, cat: Audio, desc: "Музыка"} - {id: 26, cat: Audio, desc: "Правила и предложения по улучшению раздела 'Музыка'"} - {id: 96, cat: Audio, desc: "HD Видео"} diff --git a/src/Jackett.Common/Definitions/rptorrents.yml b/src/Jackett.Common/Definitions/rptorrents.yml index 84c0522db..9854c261a 100644 --- a/src/Jackett.Common/Definitions/rptorrents.yml +++ b/src/Jackett.Common/Definitions/rptorrents.yml @@ -14,9 +14,9 @@ caps: - {id: 2, cat: PC/0day, desc: "Apps Windows"} - {id: 3, cat: PC/Mac, desc: "Apps Mac"} - {id: 4, cat: PC, desc: "Apps Linux"} - - {id: 34, cat: PC/Phone-Other, desc: "Apps Mobile"} + - {id: 34, cat: PC/Mobile-Other, desc: "Apps Mobile"} - {id: 6, cat: TV/Anime, desc: "Movie Cartoons"} - - {id: 7, cat: Movies/WEBDL, desc: "Movies WEB-DL"} + - {id: 7, cat: Movies/WEB-DL, desc: "Movies WEB-DL"} - {id: 32, cat: Movies/UHD, desc: "Movies 4k"} - {id: 9, cat: Movies/HD, desc: "Movies HD"} - {id: 10, cat: Movies/3D, desc: "Movies 3D"} @@ -35,7 +35,7 @@ caps: - {id: 35, cat: PC/Games, desc: "Games Pack"} - {id: 36, cat: XXX, desc: "Movie XXX"} - {id: 37, cat: Movies/SD, desc: "Movies SD"} - - {id: 38, cat: Books/Ebook, desc: "Books eBooks"} + - {id: 38, cat: Books/EBook, desc: "Books eBooks"} - {id: 39, cat: Audio/Audiobook, desc: "Books Audio"} modes: diff --git a/src/Jackett.Common/Definitions/rus-media.yml b/src/Jackett.Common/Definitions/rus-media.yml index cb9188835..27b4f0657 100644 --- a/src/Jackett.Common/Definitions/rus-media.yml +++ b/src/Jackett.Common/Definitions/rus-media.yml @@ -29,13 +29,13 @@ caps: - {id: 992, cat: Movies/3D, desc: "3D Документальные фильмы"} - {id: 993, cat: Movies/3D, desc: "3D Спорт"} - {id: 994, cat: Movies/3D, desc: "3D Ролики, музыкальное видео, трейлеры к фильмам"} - - {id: 33, cat: TV/OTHER, desc: "Сериалы"} - - {id: 31, cat: TV/OTHER, desc: "Мультфильмы и мультсериалы"} + - {id: 33, cat: TV/Other, desc: "Сериалы"} + - {id: 31, cat: TV/Other, desc: "Мультфильмы и мультсериалы"} - {id: 201, cat: TV/Anime, desc: "Аниме"} - - {id: 32, cat: TV/OTHER, desc: "TV, развлекательные телепередачи и шоу"} + - {id: 32, cat: TV/Other, desc: "TV, развлекательные телепередачи и шоу"} - {id: 344, cat: TV/Sport, desc: "Спорт"} - {id: 542, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"} - - {id: 757, cat: TV/OTHER, desc: "Обучающие видео и видеоуроки"} + - {id: 757, cat: TV/Other, desc: "Обучающие видео и видеоуроки"} - {id: 34, cat: Audio, desc: "Музыка"} - {id: 36, cat: Audio/Other, desc: "Поп музыка"} - {id: 222, cat: Audio/Other, desc: "Зарубежный рок"} @@ -53,15 +53,15 @@ caps: - {id: 802, cat: PC, desc: "Операционные системы"} - {id: 1009, cat: PC, desc: "Софт"} - {id: 479, cat: PC, desc: "Разное"} - - {id: 511, cat: PC/Phone-Other, desc: "Всё для мобильных телефонов, КПК и Iphone"} - - {id: 983, cat: PC/Phone-Other, desc: "Мобильное видео"} + - {id: 511, cat: PC/Mobile-Other, desc: "Всё для мобильных телефонов, КПК и Iphone"} + - {id: 983, cat: PC/Mobile-Other, desc: "Мобильное видео"} - {id: 606, cat: Other, desc: "Книги, аудиокниги, журналы"} - {id: 607, cat: Books, desc: "Книги"} - {id: 629, cat: Audio/Audiobook, desc: "Аудиокниги"} - - {id: 662, cat: Books/Magazines, desc: "Журналы"} + - {id: 662, cat: Books/Mags, desc: "Журналы"} - {id: 312, cat: XXX, desc: "Э[ротика] и Pr[o]n"} - {id: 536, cat: XXX, desc: "Pr[o]n"} - - {id: 782, cat: XXX/Imageset, desc: "Фотографии, картинки, обои"} + - {id: 782, cat: XXX/ImageSet, desc: "Фотографии, картинки, обои"} - {id: 363, cat: XXX, desc: "Э[ротика]"} - {id: 182, cat: Other, desc: "Разное"} - {id: 789, cat: Other, desc: "Автомобильный раздел"} diff --git a/src/Jackett.Common/Definitions/rustorka.yml b/src/Jackett.Common/Definitions/rustorka.yml index 614e14296..14a30c8bc 100644 --- a/src/Jackett.Common/Definitions/rustorka.yml +++ b/src/Jackett.Common/Definitions/rustorka.yml @@ -667,28 +667,28 @@ caps: - {id: 1140, cat: Audio/Audiobook, desc: "Аудиоспектакли"} # Мобильные устройства # Mobile devices - - {id: 1173, cat: PC/Phone-Other, desc: "F.A.Q. по разделу / Прочее"} - - {id: 1166, cat: PC/Phone-Other, desc: "Windows Phone"} - - {id: 1176, cat: PC/Phone-Other, desc: " |- Игры"} - - {id: 1175, cat: PC/Phone-Other, desc: " |- Программы"} - - {id: 1174, cat: PC/Phone-Other, desc: " |- Прошивки"} - - {id: 1202, cat: PC/Phone-Other, desc: " |- Разное"} - - {id: 1167, cat: PC/Phone-Other, desc: "Android"} - - {id: 1179, cat: PC/Phone-Other, desc: " |- Игры"} - - {id: 1178, cat: PC/Phone-Other, desc: " |- Программы"} - - {id: 1177, cat: PC/Phone-Other, desc: " |- Прошивки"} - - {id: 1203, cat: PC/Phone-Other, desc: " |- Разное"} - - {id: 1168, cat: PC/Phone-Other, desc: "iOS"} - - {id: 1182, cat: PC/Phone-Other, desc: " |- Игры"} - - {id: 1181, cat: PC/Phone-Other, desc: " |- Программы"} - - {id: 1180, cat: PC/Phone-Other, desc: " |- Прошивки"} - - {id: 1205, cat: PC/Phone-Other, desc: " |- Разное"} - - {id: 1170, cat: PC/Phone-Other, desc: "Другие ОС"} - - {id: 1188, cat: PC/Phone-Other, desc: " |- Игры"} - - {id: 1187, cat: PC/Phone-Other, desc: " |- Программы"} - - {id: 1186, cat: PC/Phone-Other, desc: " |- Прошивки"} - - {id: 1206, cat: PC/Phone-Other, desc: " |- Разное"} - - {id: 1172, cat: PC/Phone-Other, desc: "Программы для PC"} + - {id: 1173, cat: PC/Mobile-Other, desc: "F.A.Q. по разделу / Прочее"} + - {id: 1166, cat: PC/Mobile-Other, desc: "Windows Phone"} + - {id: 1176, cat: PC/Mobile-Other, desc: " |- Игры"} + - {id: 1175, cat: PC/Mobile-Other, desc: " |- Программы"} + - {id: 1174, cat: PC/Mobile-Other, desc: " |- Прошивки"} + - {id: 1202, cat: PC/Mobile-Other, desc: " |- Разное"} + - {id: 1167, cat: PC/Mobile-Other, desc: "Android"} + - {id: 1179, cat: PC/Mobile-Other, desc: " |- Игры"} + - {id: 1178, cat: PC/Mobile-Other, desc: " |- Программы"} + - {id: 1177, cat: PC/Mobile-Other, desc: " |- Прошивки"} + - {id: 1203, cat: PC/Mobile-Other, desc: " |- Разное"} + - {id: 1168, cat: PC/Mobile-Other, desc: "iOS"} + - {id: 1182, cat: PC/Mobile-Other, desc: " |- Игры"} + - {id: 1181, cat: PC/Mobile-Other, desc: " |- Программы"} + - {id: 1180, cat: PC/Mobile-Other, desc: " |- Прошивки"} + - {id: 1205, cat: PC/Mobile-Other, desc: " |- Разное"} + - {id: 1170, cat: PC/Mobile-Other, desc: "Другие ОС"} + - {id: 1188, cat: PC/Mobile-Other, desc: " |- Игры"} + - {id: 1187, cat: PC/Mobile-Other, desc: " |- Программы"} + - {id: 1186, cat: PC/Mobile-Other, desc: " |- Прошивки"} + - {id: 1206, cat: PC/Mobile-Other, desc: " |- Разное"} + - {id: 1172, cat: PC/Mobile-Other, desc: "Программы для PC"} # Программное обеспечение # Software - {id: 349, cat: PC, desc: "Mac OS. Программное обеспечение под них"} diff --git a/src/Jackett.Common/Definitions/rutracker-ru.yml b/src/Jackett.Common/Definitions/rutracker-ru.yml index ea4047611..a2d04bed3 100644 --- a/src/Jackett.Common/Definitions/rutracker-ru.yml +++ b/src/Jackett.Common/Definitions/rutracker-ru.yml @@ -113,7 +113,7 @@ caps: - {id: 76, cat: Console, desc: " |- Аркады"} - {id: 1538, cat: Console, desc: "Игры для консолей"} - {id: 1539, cat: Console/PSP, desc: " |- PlayStation"} - - {id: 878, cat: Console/Xbox, desc: " |- XBox"} + - {id: 878, cat: Console/XBox, desc: " |- XBox"} # Документалистика, развлекательные телепередачи, спорт Docs - {id: 11, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"} - {id: 12, cat: TV, desc: "Развлекательные телепередачи"} @@ -278,23 +278,23 @@ caps: - {id: 1503, cat: PC, desc: " |- Дополнительные материалы для мультимедиа"} - {id: 968, cat: PC, desc: " |- Разное (Программы для работы с мультимедиа и 3D)"} # Все для мобильных устройств Mobiles - - {id: 1287, cat: PC/Phone-Other, desc: "Видео"} - - {id: 1307, cat: PC/Phone-Other, desc: " |- Мобильные телефоны"} - - {id: 1306, cat: PC/Phone-IOS, desc: " |- iPhone"} - - {id: 1305, cat: PC/Phone-IOS, desc: " |- iPad"} + - {id: 1287, cat: PC/Mobile-Other, desc: "Видео"} + - {id: 1307, cat: PC/Mobile-Other, desc: " |- Мобильные телефоны"} + - {id: 1306, cat: PC/Mobile-iOS, desc: " |- iPhone"} + - {id: 1305, cat: PC/Mobile-iOS, desc: " |- iPad"} - {id: 1289, cat: PC, desc: "Программы"} - {id: 1302, cat: PC, desc: " |- Мобильные телефоны"} - - {id: 1301, cat: PC/Phone-Android, desc: " |- Android OS"} + - {id: 1301, cat: PC/Mobile-Android, desc: " |- Android OS"} - {id: 1298, cat: PC, desc: " |- Symbian OS"} - - {id: 1293, cat: PC/Phone-Other, desc: " |- Windows Mobile"} - - {id: 1292, cat: PC/Phone-IOS, desc: " |- iPhone"} - - {id: 1291, cat: PC/Phone-IOS, desc: " |- Apple Macintosh"} + - {id: 1293, cat: PC/Mobile-Other, desc: " |- Windows Mobile"} + - {id: 1292, cat: PC/Mobile-iOS, desc: " |- iPhone"} + - {id: 1291, cat: PC/Mobile-iOS, desc: " |- Apple Macintosh"} - {id: 1294, cat: PC, desc: "Игры"} - {id: 1303, cat: PC, desc: " |- Мобильные телефоны"} - - {id: 1300, cat: PC/Phone-Android, desc: " |- Android OS"} + - {id: 1300, cat: PC/Mobile-Android, desc: " |- Android OS"} - {id: 1299, cat: PC, desc: " |- Symbian OS"} - - {id: 1296, cat: PC/Phone-IOS, desc: " |- iPhone"} - - {id: 1295, cat: PC/Phone-Other, desc: " |- Windows Mobile"} + - {id: 1296, cat: PC/Mobile-iOS, desc: " |- iPhone"} + - {id: 1295, cat: PC/Mobile-Other, desc: " |- Windows Mobile"} # Клубничка ХХХ 18+️ - {id: 1490, cat: XXX, desc: "Эротика (не порно)"} - {id: 1491, cat: XXX, desc: " |- Эротические фильмы ≪с переводом Rus≫"} diff --git a/src/Jackett.Common/Definitions/scenepalace.yml b/src/Jackett.Common/Definitions/scenepalace.yml index ec4d765f2..d8bd05554 100644 --- a/src/Jackett.Common/Definitions/scenepalace.yml +++ b/src/Jackett.Common/Definitions/scenepalace.yml @@ -11,7 +11,7 @@ links: caps: categorymappings: - {id: 14, cat: PC/0day, desc: "Apps"} - - {id: 12, cat: Books/Ebook, desc: "E-BOOKS"} + - {id: 12, cat: Books/EBook, desc: "E-BOOKS"} - {id: 7, cat: Console, desc: "Games/Console"} - {id: 9, cat: Console/Other, desc: "Games/Handheld"} - {id: 10, cat: PC/Mac, desc: "Games/Mac"} diff --git a/src/Jackett.Common/Definitions/scenerush.yml b/src/Jackett.Common/Definitions/scenerush.yml index cc04f487e..9f08d8dd1 100644 --- a/src/Jackett.Common/Definitions/scenerush.yml +++ b/src/Jackett.Common/Definitions/scenerush.yml @@ -23,7 +23,7 @@ caps: - {id: 8, cat: TV/Anime, desc: "Anime"} - {id: 9, cat: Audio, desc: "Audio"} - {id: 10, cat: Other, desc: "Other"} - - {id: 11, cat: Console/Xbox 360, desc: "XBOX 360"} + - {id: 11, cat: Console/XBox 360, desc: "XBOX 360"} - {id: 12, cat: Console/PSP, desc: "PSP"} - {id: 13, cat: TV/Documentary, desc: "Doc"} - {id: 14, cat: Movies/DVD, desc: "Movies DVD"} @@ -40,13 +40,13 @@ caps: - {id: 33, cat: Console/Wii, desc: "WII"} - {id: 34, cat: Console/PS3, desc: "PS3"} - {id: 35, cat: TV/Anime, desc: "Anime HD"} - - {id: 36, cat: PC/Phone-Android, desc: "Android"} + - {id: 36, cat: PC/Mobile-Android, desc: "Android"} - {id: 37, cat: Movies/DVD, desc: "Custom DVDR"} - {id: 38, cat: Movies/Other, desc: "CAM TS"} - {id: 39, cat: Other, desc: "GPS"} - {id: 40, cat: Console/PS4, desc: "PS4"} - {id: 41, cat: Movies/BluRay, desc: "BDRIP"} - - {id: 42, cat: Movies/WEBDL, desc: "WEB DL"} + - {id: 42, cat: Movies/WEB-DL, desc: "WEB DL"} - {id: 43, cat: Books, desc: "Ebook"} - {id: 44, cat: TV/Sport, desc: "Sports"} - {id: 46, cat: Movies/UHD, desc: "4K"} diff --git a/src/Jackett.Common/Definitions/seedfile.yml b/src/Jackett.Common/Definitions/seedfile.yml index f64c15568..d7e868c20 100644 --- a/src/Jackett.Common/Definitions/seedfile.yml +++ b/src/Jackett.Common/Definitions/seedfile.yml @@ -12,7 +12,7 @@ legacylinks: caps: categorymappings: - - {id: 1, cat: Books/Magazines, desc: "Cărți/Reviste"} + - {id: 1, cat: Books/Mags, desc: "Cărți/Reviste"} - {id: 2, cat: Other, desc: "Desene SD"} - {id: 3, cat: Other, desc: "Diverse n/a"} - {id: 5, cat: Movies/BluRay, desc: "Filme Blu-Ray"} @@ -26,7 +26,7 @@ caps: - {id: 13, cat: Console, desc: "Jocuri Console"} - {id: 14, cat: PC/Games, desc: "Jocuri PC"} - {id: 15, cat: Audio, desc: "Muzică"} - - {id: 16, cat: PC/Phone-Other, desc: "Mobile"} + - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"} - {id: 17, cat: PC, desc: "Programe "} - {id: 18, cat: TV/HD, desc: "Seriale HD"} - {id: 19, cat: TV/HD, desc: "Seriale HD-RO "} diff --git a/src/Jackett.Common/Definitions/shareisland.yml b/src/Jackett.Common/Definitions/shareisland.yml index b7f888b6e..82abdd9f6 100644 --- a/src/Jackett.Common/Definitions/shareisland.yml +++ b/src/Jackett.Common/Definitions/shareisland.yml @@ -15,8 +15,8 @@ caps: categorymappings: - {id: 1, cat: Movies, desc: "Movie"} - {id: 2, cat: TV, desc: "Serie TV"} - - {id: 15, cat: Books/Ebook, desc: "Ebook"} - - {id: 17, cat: Books/Magazines, desc: "Riviste e Giornali"} + - {id: 15, cat: Books/EBook, desc: "Ebook"} + - {id: 17, cat: Books/Mags, desc: "Riviste e Giornali"} - {id: 19, cat: XXX, desc: "XXX"} - {id: 3, cat: Audio, desc: "Music"} - {id: 7, cat: PC/Games, desc: "Games"} diff --git a/src/Jackett.Common/Definitions/shareuniversity.yml b/src/Jackett.Common/Definitions/shareuniversity.yml index bc014a80f..bbeca9fcd 100644 --- a/src/Jackett.Common/Definitions/shareuniversity.yml +++ b/src/Jackett.Common/Definitions/shareuniversity.yml @@ -20,7 +20,7 @@ caps: - {id: 21, cat: TV, desc: "TV Series Boxset"} - {id: 6, cat: PC, desc: "Appz"} - {id: 13, cat: Audio/Audiobook, desc: "AudioBooks"} - - {id: 4, cat: Books/Ebook, desc: "E-Books"} + - {id: 4, cat: Books/EBook, desc: "E-Books"} - {id: 16, cat: Other, desc: "Elearning"} - {id: 5, cat: Console, desc: "Games"} - {id: 19, cat: Movies, desc: "Kids Movies"} diff --git a/src/Jackett.Common/Definitions/sharewood.yml b/src/Jackett.Common/Definitions/sharewood.yml index 9b4789315..957a06033 100644 --- a/src/Jackett.Common/Definitions/sharewood.yml +++ b/src/Jackett.Common/Definitions/sharewood.yml @@ -26,15 +26,15 @@ caps: - {id: "Podcasts", cat: Audio, desc: "Audio Podcasts"} - {id: "AudioBooks", cat: Audio/Audiobook, desc: "Audio Books"} - {id: "Windows", cat: PC/0day, desc: " Applications Windows"} - - {id: "APK", cat: PC/Phone-Android, desc: " Applications Android"} - - {id: "GPS", cat: PC/Phone-Other, desc: " Applications GPS"} - - {id: "Ebooks", cat: Books/Ebook, desc: "Books Ebooks"} - - {id: "BDs", cat: Books/Ebook, desc: "Books BDs"} - - {id: "Presse", cat: Books/Magazines, desc: "Books Presse"} + - {id: "APK", cat: PC/Mobile-Android, desc: " Applications Android"} + - {id: "GPS", cat: PC/Mobile-Other, desc: " Applications GPS"} + - {id: "Ebooks", cat: Books/EBook, desc: "Books Ebooks"} + - {id: "BDs", cat: Books/EBook, desc: "Books BDs"} + - {id: "Presse", cat: Books/Mags, desc: "Books Presse"} - {id: "Mangas", cat: Books/Comics, desc: "Books Mangas"} - {id: "Comics", cat: Books/Comics, desc: "Books Comics"} - {id: "Nintendo", cat: Console/NDS, desc: "Jeux Nintendo"} - - {id: "Microsoft", cat: Console/Xbox, desc: "Jeux Microsoft"} + - {id: "Microsoft", cat: Console/XBox, desc: "Jeux Microsoft"} - {id: "Linux", cat: PC/Games, desc: "Jeux Linux"} - {id: "Mac", cat: PC/Games, desc: "Jeux Mac"} - {id: "Sony", cat: Console/PSP, desc: "Jeux Sony"} diff --git a/src/Jackett.Common/Definitions/siambit.yml b/src/Jackett.Common/Definitions/siambit.yml index 55d5e56f5..112932de6 100644 --- a/src/Jackett.Common/Definitions/siambit.yml +++ b/src/Jackett.Common/Definitions/siambit.yml @@ -20,14 +20,14 @@ caps: - {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/Phone-Other, desc: "software Mobile / Theme / Ringtone / mv"} + - {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/Phone-IOS, desc: "Tablet / iPhone"} + - {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)"} diff --git a/src/Jackett.Common/Definitions/sktorrent-org.yml b/src/Jackett.Common/Definitions/sktorrent-org.yml index 7f41496b8..570a919b3 100644 --- a/src/Jackett.Common/Definitions/sktorrent-org.yml +++ b/src/Jackett.Common/Definitions/sktorrent-org.yml @@ -12,8 +12,8 @@ caps: categorymappings: - {id: 18, cat: PC/0day, desc: "Application - PC"} - {id: 19, cat: PC/Mac, desc: "Application - Mac"} - - {id: 21, cat: PC/Phone-Other, desc: "Application - Other"} - - {id: 47, cat: PC/Phone-Android, desc: "Application - Android"} + - {id: 21, cat: PC/Mobile-Other, desc: "Application - Other"} + - {id: 47, cat: PC/Mobile-Android, desc: "Application - Android"} - {id: 61, cat: Audio/Audiobook, desc: "Audio - Audio books"} - {id: 60, cat: Audio, desc: "Audio - Music"} - {id: 63, cat: Audio/Lossless, desc: "Audio - Flac"} @@ -21,7 +21,7 @@ caps: - {id: 9, cat: TV/Documentary, desc: "Documentaries - Other"} - {id: 10, cat: PC/Games, desc: "Games - PC"} - {id: 11, cat: Console/PS3, desc: "Games - PSX"} - - {id: 13, cat: Console/Xbox 360, desc: "Games - Xbox360"} + - {id: 13, cat: Console/XBox 360, desc: "Games - Xbox360"} - {id: 66, cat: Console/Other, desc: "Games - Other"} - {id: 65, cat: Console/Other, desc: "Games - Android"} - {id: 1, cat: Movies/DVD, desc: "Movies - DVD"} @@ -34,13 +34,13 @@ caps: - {id: 24, cat: Audio/Video, desc: "Music - DVD"} - {id: 27, cat: Audio/Other, desc: "Music - Other"} - {id: 35, cat: Audio, desc: "Music - Album"} - - {id: 36, cat: Books/Ebook, desc: "Other - E-books"} + - {id: 36, cat: Books/EBook, desc: "Other - E-books"} - {id: 53, cat: Other, desc: "Other - Other"} - - {id: 51, cat: Books/Magazines, desc: "Other - Magazines"} + - {id: 51, cat: Books/Mags, desc: "Other - Magazines"} - {id: 50, cat: Books, desc: "Other - Books"} - {id: 56, cat: XXX/WMV, desc: "Porn - Video"} - {id: 55, cat: XXX, desc: "Porn - Movie"} - - {id: 54, cat: XXX/Imageset, desc: "Porn - Picture"} + - {id: 54, cat: XXX/ImageSet, desc: "Porn - Picture"} - {id: 68, cat: XXX/Other, desc: "Porn - Other"} - {id: 6, cat: TV, desc: "TV - Divx/Xvid"} - {id: 41, cat: TV/HD, desc: "TV - HD"} diff --git a/src/Jackett.Common/Definitions/sktorrent.yml b/src/Jackett.Common/Definitions/sktorrent.yml index a2f87abfa..bf72610b8 100644 --- a/src/Jackett.Common/Definitions/sktorrent.yml +++ b/src/Jackett.Common/Definitions/sktorrent.yml @@ -41,7 +41,7 @@ caps: - {id: 26, cat: Audio/Video, desc: "Hudební videa"} - {id: 45, cat: Audio, desc: "Soundtrack"} - {id: 21, cat: PC, desc: "Programy"} - - {id: 27, cat: PC/Phone-Other, desc: "Mobil, PDA"} + - {id: 27, cat: PC/Mobile-Other, desc: "Mobil, PDA"} - {id: 58, cat: Other, desc: "Neschválené"} modes: diff --git a/src/Jackett.Common/Definitions/speedmasterhd.yml b/src/Jackett.Common/Definitions/speedmasterhd.yml index a744b502a..e82661e6e 100644 --- a/src/Jackett.Common/Definitions/speedmasterhd.yml +++ b/src/Jackett.Common/Definitions/speedmasterhd.yml @@ -67,7 +67,7 @@ caps: - {id: 94, cat: Other, desc: "Sonstiges HD-XXX Pics"} - {id: 98, cat: Other, desc: "Sonstiges to sort"} # E-Book - - {id: 103, cat: Books/Ebook, desc: "E-Book Mixed"} + - {id: 103, cat: Books/EBook, desc: "E-Book Mixed"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml index c61947601..d850ae8a7 100644 --- a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml +++ b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml @@ -33,7 +33,7 @@ caps: - {id: 4, cat: PC/Games, desc: "PC-Games"} - {id: 84, cat: Console/PS3, desc: "PS3/PS4"} - {id: 84, cat: Console/PS4, desc: "PS3/PS4"} - - {id: 85, cat: Console/Xbox 360, desc: "Xbox-360"} + - {id: 85, cat: Console/XBox 360, desc: "Xbox-360"} - {id: 28, cat: PC/0day, desc: "Windows-Programme"} - {id: 18, cat: PC/0day, desc: "Appz-Sonstige"} - {id: 14, cat: Audio/Other, desc: "Alben / Sampler / Singles"} @@ -43,7 +43,7 @@ caps: - {id: 71, cat: Audio/Other, desc: "Soundtracks"} - {id: 70, cat: Audio/Lossless, desc: "Flac"} - {id: 72, cat: Audio, desc: "Musik-Packs"} - - {id: 19, cat: Books/Ebook, desc: "EBooks"} + - {id: 19, cat: Books/EBook, desc: "EBooks"} - {id: 87, cat: TV/Anime, desc: "Anime"} - {id: 96, cat: Other, desc: "Sonstiges"} - {id: 23, cat: TV/Sport, desc: "Wrestling"} diff --git a/src/Jackett.Common/Definitions/spiritofrevolution.yml b/src/Jackett.Common/Definitions/spiritofrevolution.yml index f0ef1776c..bcab5c945 100644 --- a/src/Jackett.Common/Definitions/spiritofrevolution.yml +++ b/src/Jackett.Common/Definitions/spiritofrevolution.yml @@ -38,7 +38,7 @@ caps: - {id: 150, cat: Console/Other, desc: "Games Android"} - {id: 49, cat: PC/0day, desc: "APPZ Windows"} - {id: 130, cat: PC/Mac, desc: "APPZ Mac/Linux"} - - {id: 153, cat: PC/Phone-Android, desc: "APPZ Android"} + - {id: 153, cat: PC/Mobile-Android, desc: "APPZ Android"} - {id: 132, cat: Books, desc: "E-Book Epub"} - {id: 131, cat: Books, desc: "E-Book PDF"} - {id: 173, cat: TV/Documentary, desc: "Dokus Packs"} diff --git a/src/Jackett.Common/Definitions/takeabyte.yml b/src/Jackett.Common/Definitions/takeabyte.yml index 32a1fc51f..c67398e9a 100644 --- a/src/Jackett.Common/Definitions/takeabyte.yml +++ b/src/Jackett.Common/Definitions/takeabyte.yml @@ -31,7 +31,7 @@ caps: - {id: 28, cat: TV, desc: "TV-Series"} - {id: 27, cat: TV/Other, desc: "TV Boxset"} - {id: 30, cat: PC/Mac, desc: "Apps Mac"} - - {id: 31, cat: PC/Phone-Other, desc: "Apps Mobile"} + - {id: 31, cat: PC/Mobile-Other, desc: "Apps Mobile"} - {id: 1, cat: PC/0day, desc: "Apps Windows"} - {id: 35, cat: Audio/Lossless, desc: "Music Flac"} - {id: 22, cat: Audio/MP3, desc: "Music MP3"} @@ -40,7 +40,7 @@ caps: - {id: 7, cat: Console/Wii, desc: "Games Console"} - {id: 8, cat: PC/Games, desc: "Games PC"} - {id: 32, cat: Audio/Audiobook, desc: "Audio-Books"} - - {id: 33, cat: Books/Ebook, desc: "E-Books"} + - {id: 33, cat: Books/EBook, desc: "E-Books"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/tapochek.yml b/src/Jackett.Common/Definitions/tapochek.yml index c7d35c14c..2fa739465 100644 --- a/src/Jackett.Common/Definitions/tapochek.yml +++ b/src/Jackett.Common/Definitions/tapochek.yml @@ -93,15 +93,15 @@ caps: - {id: 45, cat: PC/Games, desc: "MMORPG"} - {id: 46, cat: PC/Games, desc: "Для самых маленьких"} # Games for Consoles # Игры для Консолей - - {id: 69, cat: Console/Xbox, desc: "Xbox"} - - {id: 86, cat: Console/Xbox 360, desc: "XBox360 | Игры"} - - {id: 646, cat: Console/Xbox 360, desc: "XBox360 | JTAG"} - - {id: 87, cat: Console/Xbox 360, desc: "XBox360 | 360E"} - - {id: 89, cat: Console/Xbox 360, desc: "XBox360 | Demo"} - - {id: 612, cat: Console/Xbox 360, desc: "XBox360 | Live"} - - {id: 614, cat: Console/Xbox 360, desc: "XBox360 | Soft"} - - {id: 88, cat: Console/Xbox, desc: "XBox | Игры"} - - {id: 85, cat: Console/Xbox, desc: "Прочее | Архив (XBox)"} + - {id: 69, cat: Console/XBox, desc: "Xbox"} + - {id: 86, cat: Console/XBox 360, desc: "XBox360 | Игры"} + - {id: 646, cat: Console/XBox 360, desc: "XBox360 | JTAG"} + - {id: 87, cat: Console/XBox 360, desc: "XBox360 | 360E"} + - {id: 89, cat: Console/XBox 360, desc: "XBox360 | Demo"} + - {id: 612, cat: Console/XBox 360, desc: "XBox360 | Live"} + - {id: 614, cat: Console/XBox 360, desc: "XBox360 | Soft"} + - {id: 88, cat: Console/XBox, desc: "XBox | Игры"} + - {id: 85, cat: Console/XBox, desc: "Прочее | Архив (XBox)"} - {id: 70, cat: Console/PSP, desc: "PlayStation"} - {id: 910, cat: Console/PS4, desc: "PS4 | Игры"} - {id: 911, cat: Console/PS4, desc: "PS4 | Сцена"} @@ -126,7 +126,7 @@ caps: - {id: 115, cat: Console/Wii, desc: "Wii | Игры"} - {id: 899, cat: Console/WiiU, desc: "Wii U | Игры"} - {id: 900, cat: Console/WiiU, desc: "Wii U | Сцена"} - - {id: 381, cat: Console/Wiiware/VC, desc: "WiiWare | Игры"} + - {id: 381, cat: Console/Wiiware, desc: "WiiWare | Игры"} - {id: 382, cat: Console, desc: "GameCube | Игры"} - {id: 349, cat: Console, desc: "Sega"} - {id: 350, cat: Console, desc: "Dreamcast | Игры"} @@ -156,7 +156,7 @@ caps: - {id: 886, cat: Movies/3D, desc: "Новинки (3D)"} - {id: 964, cat: Movies/UHD, desc: "Новинки (UHD 4K)"} - {id: 934, cat: Movies/BluRay, desc: "Новинки 2018-2019 (Blu-Ray и BDRemux)"} - - {id: 431, cat: Movies/WEBDL, desc: "Новинки 2018-2019 (Web-DL, HD Rips)"} + - {id: 431, cat: Movies/WEB-DL, desc: "Новинки 2018-2019 (Web-DL, HD Rips)"} - {id: 430, cat: Movies, desc: "Новинки 2018-2019 (Rips)"} - {id: 703, cat: Movies, desc: "Экранки и Low-рипы (CAMRip, TS, WEBRip)"} - {id: 909, cat: Movies/HD, desc: "Новинки 2018-2019 (HD и HD Rips) с рекламой"} @@ -175,7 +175,7 @@ caps: - {id: 133, cat: Movies/DVD, desc: "Советское кино | DVD"} - {id: 135, cat: Movies, desc: "Советское кино | Rips"} - {id: 869, cat: Movies/3D, desc: "3D"} - - {id: 161, cat: TV/FOREIGN, desc: "Зарубежные сериалы"} + - {id: 161, cat: TV/Foreign, desc: "Зарубежные сериалы"} - {id: 160, cat: TV, desc: "Отечественные cериалы"} - {id: 320, cat: TV, desc: "Мультфильмы"} - {id: 325, cat: TV/SD, desc: "Мультфильмы | DVD"} @@ -392,13 +392,13 @@ caps: - {id: 626, cat: PC, desc: "Карты для навигаторов"} - {id: 627, cat: PC, desc: "Плееры"} - {id: 628, cat: PC, desc: "Разное (Мобильные устройства и КПК)"} - - {id: 622, cat: PC/Phone-IOS, desc: "Apple Mobile Device Software"} - - {id: 667, cat: PC/Phone-IOS, desc: "Прошивки (iPhone/iPod Touch/iPad)"} - - {id: 668, cat: PC/Phone-IOS, desc: "Программы (iPhone/iPod Touch/iPad)"} - - {id: 669, cat: PC/Phone-IOS, desc: "Игры (iPhone/iPod Touch/iPad)"} - - {id: 670, cat: PC/Phone-IOS, desc: "Видео (iPhone/iPod Touch/iPad)"} - - {id: 672, cat: PC/Phone-IOS, desc: "Разное (iPhone/iPod Touch/iPad)"} - - {id: 671, cat: PC/Phone-IOS, desc: "Музыка (iPhone/iPod Touch/iPad)"} + - {id: 622, cat: PC/Mobile-iOS, desc: "Apple Mobile Device Software"} + - {id: 667, cat: PC/Mobile-iOS, desc: "Прошивки (iPhone/iPod Touch/iPad)"} + - {id: 668, cat: PC/Mobile-iOS, desc: "Программы (iPhone/iPod Touch/iPad)"} + - {id: 669, cat: PC/Mobile-iOS, desc: "Игры (iPhone/iPod Touch/iPad)"} + - {id: 670, cat: PC/Mobile-iOS, desc: "Видео (iPhone/iPod Touch/iPad)"} + - {id: 672, cat: PC/Mobile-iOS, desc: "Разное (iPhone/iPod Touch/iPad)"} + - {id: 671, cat: PC/Mobile-iOS, desc: "Музыка (iPhone/iPod Touch/iPad)"} - {id: 639, cat: PC, desc: "Обучающие видеоматериалы"} - {id: 640, cat: PC, desc: "Мультимедийные материалы"} - {id: 642, cat: PC, desc: "Разное"} diff --git a/src/Jackett.Common/Definitions/teamos.yml b/src/Jackett.Common/Definitions/teamos.yml index e5ff08202..01d78f9c7 100644 --- a/src/Jackett.Common/Definitions/teamos.yml +++ b/src/Jackett.Common/Definitions/teamos.yml @@ -52,7 +52,7 @@ caps: - {id: 58, cat: PC/ISO, desc: "Microsoft Office Multi-lang Untouch ISO"} - {id: 59, cat: PC/ISO, desc: "x86-x64 bit Untouched Iso"} - {id: 61, cat: PC/0day, desc: "Antivirus"} - - {id: 62, cat: PC/Phone-Android, desc: "Android Apps"} + - {id: 62, cat: PC/Mobile-Android, desc: "Android Apps"} - {id: 63, cat: PC/0day, desc: "Download Managers"} - {id: 64, cat: PC/0day, desc: "DVD Tools"} - {id: 65, cat: PC/0day, desc: "Multimedia"} @@ -75,9 +75,9 @@ caps: - {id: 82, cat: PC/0day, desc: "Designers"} - {id: 83, cat: PC/0day, desc: "Silent Apps"} - {id: 85, cat: PC/Games, desc: "Games"} - - {id: 86, cat: Books/Ebook, desc: "Ebooks"} + - {id: 86, cat: Books/EBook, desc: "Ebooks"} - {id: 87, cat: Other, desc: "Wallpapers, Themes & Screensavers"} - - {id: 88, cat: PC/Phone-Android, desc: "Android Games"} + - {id: 88, cat: PC/Mobile-Android, desc: "Android Games"} - {id: 89, cat: PC, desc: "Other Releases"} - {id: 100, cat: Other, desc: "Tutorials"} - {id: 107, cat: PC, desc: "Windows 10 Releases"} @@ -89,7 +89,7 @@ caps: - {id: 114, cat: PC/0day, desc: "64 Bit Ghost Images"} - {id: 125, cat: PC, desc: "Dead Torrents"} - {id: 131, cat: PC/Mac, desc: "Mac Games"} - - {id: 132, cat: PC/Phone-Other, desc: "Linux/Unix"} + - {id: 132, cat: PC/Mobile-Other, desc: "Linux/Unix"} - {id: 140, cat: PC/Mac, desc: "MacOS"} - {id: 141, cat: PC/Mac, desc: "Mac Apps"} diff --git a/src/Jackett.Common/Definitions/tellytorrent.yml b/src/Jackett.Common/Definitions/tellytorrent.yml index a5ff42d21..465fbc4bd 100644 --- a/src/Jackett.Common/Definitions/tellytorrent.yml +++ b/src/Jackett.Common/Definitions/tellytorrent.yml @@ -18,7 +18,7 @@ caps: - {id: 4, cat: Movies, desc: "Web Originals"} - {id: 5, cat: PC/Games, desc: "Games"} - {id: 6, cat: PC/0day, desc: "Application"} - - {id: 7, cat: PC/Phone-Other, desc: "Mobile App"} + - {id: 7, cat: PC/Mobile-Other, desc: "Mobile App"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/theaudioscene.yml b/src/Jackett.Common/Definitions/theaudioscene.yml index 1b88088c9..6437796db 100644 --- a/src/Jackett.Common/Definitions/theaudioscene.yml +++ b/src/Jackett.Common/Definitions/theaudioscene.yml @@ -24,7 +24,7 @@ caps: - {id: 12, cat: PC/0day, desc: "Win Update"} - {id: 13, cat: PC/0day, desc: "Win VST"} - {id: 14, cat: PC/0day, desc: "Win VSTi"} - - {id: 15, cat: PC/Phone-Other, desc: "Handheld App"} + - {id: 15, cat: PC/Mobile-Other, desc: "Handheld App"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/thefallingangels.yml b/src/Jackett.Common/Definitions/thefallingangels.yml index 2f3f0c1db..b5a7a5c08 100644 --- a/src/Jackett.Common/Definitions/thefallingangels.yml +++ b/src/Jackett.Common/Definitions/thefallingangels.yml @@ -12,13 +12,13 @@ caps: categorymappings: - {id: 107, cat: PC/0day, desc: "Apps Windows"} - {id: 132, cat: PC/Mac, desc: "Apps Mac-OSX"} - - {id: 105, cat: PC/Phone-Other, desc: "Apps Other"} + - {id: 105, cat: PC/Mobile-Other, desc: "Apps Other"} - {id: 116, cat: PC/Games, desc: "Games PC"} - {id: 155, cat: Console/NDS, desc: "Games Nintendo DS"} - {id: 134, cat: Console, desc: "Games Switch"} - {id: 138, cat: Console/Wii, desc: "Games Nintendo Wii"} - {id: 124, cat: Console/PSP, desc: "Games PSP / PS 1-4"} - - {id: 139, cat: Console/Xbox, desc: "Games XBOX"} + - {id: 139, cat: Console/XBox, desc: "Games XBOX"} - {id: 140, cat: Movies/HD, desc: "Movies HD"} - {id: 141, cat: Movies/SD, desc: "Movies SD"} - {id: 125, cat: Movies/UHD, desc: "Movies Ultra HD"} @@ -35,8 +35,8 @@ caps: - {id: 154, cat: TV/Documentary, desc: "Dokus Pack"} - {id: 149, cat: TV/HD, desc: "Serien HD"} - {id: 151, cat: TV/SD, desc: "Serien SD"} - - {id: 150, cat: TV/OTHER, desc: "Serien Pack"} - - {id: 136, cat: TV/FOREIGN, desc: "Serien Englisch"} + - {id: 150, cat: TV/Other, desc: "Serien Pack"} + - {id: 136, cat: TV/Foreign, desc: "Serien Englisch"} - {id: 152, cat: TV/Sport, desc: "Sport HD"} - {id: 153, cat: TV/Sport, desc: "Sport SD"} - {id: 135, cat: TV/Sport, desc: "Sport Ultra HD"} @@ -52,9 +52,9 @@ caps: - {id: 161, cat: TV/HD, desc: "Kids Serien HD"} - {id: 162, cat: TV/SD, desc: "Kids Serien SD"} - {id: 112, cat: Audio/Audiobook, desc: "Kids Hörbuch"} - - {id: 115, cat: Books/Magazines, desc: "Books Zeitschriften"} + - {id: 115, cat: Books/Mags, desc: "Books Zeitschriften"} - {id: 114, cat: Books/Comics, desc: "Books Comics"} - - {id: 117, cat: Books/Ebook, desc: "Books Romane"} + - {id: 117, cat: Books/EBook, desc: "Books Romane"} - {id: 156, cat: Books, desc: "Books Packs"} - {id: 130, cat: Books, desc: "Books FSK 18"} - {id: 159, cat: TV/Anime, desc: "Anime Movies HD"} diff --git a/src/Jackett.Common/Definitions/thehorrorcharnel.yml b/src/Jackett.Common/Definitions/thehorrorcharnel.yml index 8debafcaf..cd44db63c 100644 --- a/src/Jackett.Common/Definitions/thehorrorcharnel.yml +++ b/src/Jackett.Common/Definitions/thehorrorcharnel.yml @@ -12,7 +12,7 @@ caps: categorymappings: - {id: 14, cat: PC, desc: "-- Appz --"} - {id: 15, cat: Books/Comics, desc: "-- Comics --"} - - {id: 17, cat: Books/Ebook, desc: "-- E-books --"} + - {id: 17, cat: Books/EBook, desc: "-- E-books --"} - {id: 16, cat: PC/Games, desc: "-- Games --"} - {id: 19, cat: Audio, desc: "-- Music --"} - {id: 82, cat: Other, desc: "-- Other --"} diff --git a/src/Jackett.Common/Definitions/theshinning.yml b/src/Jackett.Common/Definitions/theshinning.yml index d3403a85b..48b0e29df 100644 --- a/src/Jackett.Common/Definitions/theshinning.yml +++ b/src/Jackett.Common/Definitions/theshinning.yml @@ -22,7 +22,7 @@ caps: - {id: 7, cat: XXX, desc: "XXX"} - {id: 8, cat: Movies, desc: "Kids"} - {id: 9, cat: TV/Sport, desc: "Sport"} - - {id: 10, cat: Tv/Documentary, desc: "Doku"} + - {id: 10, cat: TV/Documentary, desc: "Doku"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/tjupt.yml b/src/Jackett.Common/Definitions/tjupt.yml index a42cb83fb..53baf1ccd 100644 --- a/src/Jackett.Common/Definitions/tjupt.yml +++ b/src/Jackett.Common/Definitions/tjupt.yml @@ -20,7 +20,7 @@ caps: - {id: 408, cat: PC, desc: "Software软件"} - {id: 409, cat: Console, desc: "Games游戏"} - {id: 411, cat: Books, desc: "Books纪录片"} - - {id: 412, cat: PC/Phone-Other, desc: "Mobile移动视频"} + - {id: 412, cat: PC/Mobile-Other, desc: "Mobile移动视频"} - {id: 410, cat: Other, desc: "Misc其他"} modes: diff --git a/src/Jackett.Common/Definitions/tlfbits.yml b/src/Jackett.Common/Definitions/tlfbits.yml index 169dada4b..133031f93 100644 --- a/src/Jackett.Common/Definitions/tlfbits.yml +++ b/src/Jackett.Common/Definitions/tlfbits.yml @@ -23,7 +23,7 @@ caps: - {id: 418, cat: Console/PS3, desc: "Game/PS3"} - {id: 419, cat: Console/PSP, desc: "Game/PSP"} - {id: 420, cat: Console/Wii, desc: "Game/WII"} - - {id: 421, cat: Console/Xbox 360, desc: "Game/Xbox360"} + - {id: 421, cat: Console/XBox 360, desc: "Game/Xbox360"} - {id: 429, cat: Console, desc: "Game/Archive"} - {id: 422, cat: PC, desc: "APPS"} - {id: 423, cat: PC/0day, desc: "0day"} diff --git a/src/Jackett.Common/Definitions/torlock.yml b/src/Jackett.Common/Definitions/torlock.yml index 472501a19..932fa1c39 100644 --- a/src/Jackett.Common/Definitions/torlock.yml +++ b/src/Jackett.Common/Definitions/torlock.yml @@ -29,7 +29,7 @@ caps: - {id: GAMES, cat: PC/Games, desc: "Games"} - {id: SOFTWARE, cat: PC, desc: "Software"} - {id: ANIME, cat: TV/Anime, desc: "Anime"} - - {id: EBOOKS, cat: Books/Ebook, desc: "Books"} + - {id: EBOOKS, cat: Books/EBook, desc: "Books"} - {id: OTHER, cat: Other, desc: "Other"} - {id: ADULT, cat: XXX, desc: "Adult"} - {id: AUDIOBOOK, cat: Audio/Audiobook, desc: "Audiobook"} diff --git a/src/Jackett.Common/Definitions/torrent-explosiv.yml b/src/Jackett.Common/Definitions/torrent-explosiv.yml index 7fbd45b3e..d51f2b881 100644 --- a/src/Jackett.Common/Definitions/torrent-explosiv.yml +++ b/src/Jackett.Common/Definitions/torrent-explosiv.yml @@ -14,7 +14,7 @@ caps: # App - {id: 12, cat: PC/0day, desc: "App Win"} - {id: 10, cat: PC/Mac, desc: "App Mac"} - - {id: 127, cat: PC/Phone-Android, desc: "App Android"} + - {id: 127, cat: PC/Mobile-Android, desc: "App Android"} # Doku - {id: 177, cat: TV/Documentary, desc: "Doku HD "} - {id: 178, cat: TV/Documentary, desc: "Doku SD "} @@ -54,11 +54,11 @@ caps: - {id: 282, cat: TV/Sport, desc: "Sport HD"} # Sonstiges - {id: 216, cat: Books, desc: "Sonstiges Pdf"} - - {id: 202, cat: Books/Magazines, desc: "Sonstiges Magazine"} + - {id: 202, cat: Books/Mags, desc: "Sonstiges Magazine"} - {id: 217, cat: Books, desc: "Sonstiges EPaper"} - {id: 269, cat: Books, desc: "Sonstiges Hörspiel"} - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges A-Book"} - - {id: 96, cat: Books/Ebook, desc: "Sonstiges E-Book"} + - {id: 96, cat: Books/EBook, desc: "Sonstiges E-Book"} # XXX - {id: 73, cat: XXX, desc: "XXX HD "} - {id: 75, cat: XXX, desc: "XXX Pack"} diff --git a/src/Jackett.Common/Definitions/torrent-turk.yml b/src/Jackett.Common/Definitions/torrent-turk.yml index 06b4df428..2b94d1889 100644 --- a/src/Jackett.Common/Definitions/torrent-turk.yml +++ b/src/Jackett.Common/Definitions/torrent-turk.yml @@ -17,7 +17,7 @@ caps: - {id: 151, cat: Movies/HD, desc: "Movies/Turkish/1080p"} - {id: 152, cat: Movies/HD, desc: "Movies/Turkish/720p"} - {id: 153, cat: Movies/DVD, desc: "Movies/Turkish/DVD5-DVD9"} - - {id: 154, cat: Movies/WEBDL, desc: "Movies/Turkish/BRRip-HDRip-DVDRip-WebDL"} + - {id: 154, cat: Movies/WEB-DL, desc: "Movies/Turkish/BRRip-HDRip-DVDRip-WebDL"} - {id: 155, cat: Movies/Other, desc: "Movies/Turkish/Boxset"} - {id: 156, cat: Movies, desc: "Movies/Foreign"} @@ -25,7 +25,7 @@ caps: - {id: 159, cat: Movies/HD, desc: "Movies/Foreign/1080p"} - {id: 160, cat: Movies/HD, desc: "Movies/Foreign/720p"} - {id: 161, cat: Movies/DVD, desc: "Movies/Foreign/DVD5-DVD9"} - - {id: 162, cat: Movies/WEBDL, desc: "Movies/Foreign/BRRip-HDRip-DVDRip-WebDL"} + - {id: 162, cat: Movies/WEB-DL, desc: "Movies/Foreign/BRRip-HDRip-DVDRip-WebDL"} - {id: 163, cat: Movies/Other, desc: "Movies/Foreign/Boxset"} - {id: 164, cat: TV, desc: "TV"} @@ -52,7 +52,7 @@ caps: - {id: 175, cat: PC, desc: "Apps / Game / Graphics"} - {id: 176, cat: PC, desc: "Apps"} - {id: 177, cat: Other, desc: "Pictures"} - - {id: 183, cat: Books/Ebook, desc: "EBook"} + - {id: 183, cat: Books/EBook, desc: "EBook"} - {id: 178, cat: Books/Technical, desc: "Training Sets"} - {id: 179, cat: PC, desc: "OS"} - {id: 180, cat: PC/Games, desc: "PC/Games"} diff --git a/src/Jackett.Common/Definitions/torrent9.yml b/src/Jackett.Common/Definitions/torrent9.yml index 8766dad12..3d89058b1 100644 --- a/src/Jackett.Common/Definitions/torrent9.yml +++ b/src/Jackett.Common/Definitions/torrent9.yml @@ -51,7 +51,7 @@ caps: - {id: ebook, cat: Books, desc: "Books"} - {id: logiciels, cat: PC, desc: "Software"} - {id: jeux-pc, cat: PC/Games, desc: "PC Games"} - - {id: jeux-consoles, cat: Console/Xbox360, desc: "Console Games"} + - {id: jeux-consoles, cat: Console/XBox 360, desc: "Console Games"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/torrent9clone.yml b/src/Jackett.Common/Definitions/torrent9clone.yml index 519526ac8..2febfb89a 100644 --- a/src/Jackett.Common/Definitions/torrent9clone.yml +++ b/src/Jackett.Common/Definitions/torrent9clone.yml @@ -52,7 +52,7 @@ caps: - {id: Ebook, cat: Books, desc: "Books"} - {id: Logiciels, cat: PC, desc: "Software"} - {id: Jeux-PC, cat: PC/Games, desc: "PC Games"} - - {id: Jeux-Consoles, cat: Console/Xbox360, desc: "Console Games"} + - {id: Jeux-Consoles, cat: Console/XBox 360, desc: "Console Games"} - {id: Porno, cat: XXX, desc: "XXX"} modes: diff --git a/src/Jackett.Common/Definitions/torrentbd.yml b/src/Jackett.Common/Definitions/torrentbd.yml index a53f61886..0edda183a 100644 --- a/src/Jackett.Common/Definitions/torrentbd.yml +++ b/src/Jackett.Common/Definitions/torrentbd.yml @@ -15,21 +15,21 @@ legacylinks: caps: categorymappings: - {id: 28, cat: TV/Anime, desc: "Anime - All"} - - {id: 65, cat: PC/Phone-Android, desc: "Apps - Android"} + - {id: 65, cat: PC/Mobile-Android, desc: "Apps - Android"} - {id: 18, cat: PC, desc: "Apps - PC"} - {id: 19, cat: PC/Mac, desc: "Apps - Mac"} - {id: 20, cat: PC, desc: "Apps - Linux"} - {id: 7, cat: Movies, desc: "Bangla - Movies | Natok"} - {id: 49, cat: TV, desc: "Cartoons - All"} - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"} - - {id: 36, cat: Books/Ebook, desc: "Other - E-Books"} - - {id: 77, cat: Books/Ebook, desc: "E-Books - Manga"} + - {id: 36, cat: Books/EBook, desc: "Other - E-Books"} + - {id: 77, cat: Books/EBook, desc: "E-Books - Manga"} - {id: 73, cat: Books/Comics, desc: "E-Books - Comics"} - {id: 10, cat: PC/Games, desc: "Games - PC"} - {id: 60, cat: PC/Games, desc: "Games - Cracks | Patches"} - {id: 52, cat: PC/Games, desc: "Games - Updates | DLC"} - {id: 43, cat: Console/PS3, desc: "Games - PS3"} - - {id: 14, cat: Console/Xbox, desc: "Games - Xbox"} + - {id: 14, cat: Console/XBox, desc: "Games - Xbox"} - {id: 17, cat: Console, desc: "Games - Other"} - {id: 80, cat: Movies/UHD, desc: "Movies - 4K BluRay"} - {id: 47, cat: Movies/HD, desc: "Movies - 1080p BluRay"} @@ -49,7 +49,7 @@ caps: - {id: 25, cat: Audio/Video, desc: "Music - Video"} - {id: 64, cat: Audio, desc: "Music - Concerts | Live Shows"} - {id: 26, cat: Audio, desc: "Music - Radio"} - - {id: 38, cat: PC/Phone-Other, desc: "Other - Mobile Phone"} + - {id: 38, cat: PC/Mobile-Other, desc: "Other - Mobile Phone"} - {id: 44, cat: Other, desc: "Religious - Islam"} - {id: 37, cat: Other, desc: "Other - Images"} - {id: 40, cat: Other, desc: "Other - Other | Misc"} diff --git a/src/Jackett.Common/Definitions/torrentccf.yml b/src/Jackett.Common/Definitions/torrentccf.yml index 60633cf6c..2b16e633a 100644 --- a/src/Jackett.Common/Definitions/torrentccf.yml +++ b/src/Jackett.Common/Definitions/torrentccf.yml @@ -30,7 +30,7 @@ caps: - {id: 616, cat: PC, desc: "Appz"} - {id: 617, cat: PC/Games, desc: "PC Games"} - {id: 618, cat: Console/PS4, desc: "Playstation"} - - {id: 619, cat: Console/Xbox, desc: "Xbox"} + - {id: 619, cat: Console/XBox, desc: "Xbox"} - {id: 620, cat: Console/Wii, desc: "Wii"} - {id: 621, cat: Other, desc: "Others"} diff --git a/src/Jackett.Common/Definitions/torrentdownload.yml b/src/Jackett.Common/Definitions/torrentdownload.yml index 91c3c81ba..37431708a 100644 --- a/src/Jackett.Common/Definitions/torrentdownload.yml +++ b/src/Jackett.Common/Definitions/torrentdownload.yml @@ -36,14 +36,14 @@ caps: AnimeEnglishtranslated: TV/Anime AnimeAnimeOther: TV/Anime Applications: PC/0day - ApplicationsAndroid: PC/Phone-Android + ApplicationsAndroid: PC/Mobile-Android AudioBooks: Audio/Audiobook BooksAcademic: Books BooksEbooks: Books BooksEducational: Books BooksFiction: Books BooksNonfiction: Books - Ebooks: Books/Ebook + Ebooks: Books/EBook Games: Console GamesWindows: PC/Games Movies: Movies diff --git a/src/Jackett.Common/Definitions/torrentfactory.yml b/src/Jackett.Common/Definitions/torrentfactory.yml index 3b30aa550..19050cd05 100644 --- a/src/Jackett.Common/Definitions/torrentfactory.yml +++ b/src/Jackett.Common/Definitions/torrentfactory.yml @@ -37,7 +37,7 @@ caps: - {id: 35, cat: PC/0day, desc: "Software - Linux"} - {id: 36, cat: PC/Mac, desc: "Software - Mac"} - {id: 37, cat: PC/0day, desc: "Software - Windows"} - - {id: 89, cat: PC/Phone-Android, desc: "Software - Android"} + - {id: 89, cat: PC/Mobile-Android, desc: "Software - Android"} - {id: 52, cat: Movies/HD, desc: "HDrip DVDrip - Peliculas"} - {id: 53, cat: TV, desc: "HDrip DVDrip - Series"} - {id: 62, cat: Audio/Video, desc: "HDrip DVDrip - Musica"} @@ -51,14 +51,14 @@ caps: - {id: 103, cat: Movies/HD, desc: "MicroHD - Peliculas"} - {id: 54, cat: XXX, desc: "XXX - xxx (Hetero)"} - {id: 74, cat: XXX, desc: "XXX - xxxy (Gay)"} - - {id: 76, cat: XXX/Imageset, desc: "XXX - xxx (Imagenes)"} + - {id: 76, cat: XXX/ImageSet, desc: "XXX - xxx (Imagenes)"} - {id: 85, cat: XXX, desc: "XXX - xxx Hentai"} - - {id: 55, cat: Books/Ebook, desc: "Ebooks - LIBROS"} - - {id: 63, cat: Books/Magazines, desc: "Ebooks - Publicacion Semanal"} - - {id: 64, cat: Books/Magazines, desc: "Ebooks - Prensa Diaria"} + - {id: 55, cat: Books/EBook, desc: "Ebooks - LIBROS"} + - {id: 63, cat: Books/Mags, desc: "Ebooks - Publicacion Semanal"} + - {id: 64, cat: Books/Mags, desc: "Ebooks - Prensa Diaria"} - {id: 79, cat: Books/Other, desc: "Ebooks - Adultos Ebooks"} - - {id: 83, cat: Books/Magazines, desc: "Ebooks - Publicacion Quincena"} - - {id: 88, cat: Books/Magazines, desc: "Ebooks - Publicacion Mensual"} + - {id: 83, cat: Books/Mags, desc: "Ebooks - Publicacion Quincena"} + - {id: 88, cat: Books/Mags, desc: "Ebooks - Publicacion Mensual"} - {id: 97, cat: Books/Comics, desc: "Ebooks - Comic eBooks"} # not listed / unknown - {id: 50, cat: Other, desc: "Desconocida"} diff --git a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml index bdfd1a446..ea278d39b 100644 --- a/src/Jackett.Common/Definitions/torrentgalaxyorg.yml +++ b/src/Jackett.Common/Definitions/torrentgalaxyorg.yml @@ -36,17 +36,17 @@ legacylinks: caps: categorymappings: - {id: 28, cat: TV/Anime, desc: "Anime - All"} - - {id: 20, cat: PC/Phone-Other, desc: "Apps - Mobile"} + - {id: 20, cat: PC/Mobile-Other, desc: "Apps - Mobile"} - {id: 19, cat: PC/Mac, desc: "Apps - OS"} - {id: 21, cat: PC, desc: "Apps - Other"} - {id: 18, cat: PC/0day, desc: "Apps - Windows"} - {id: 13, cat: Audio/Audiobook, desc: "Books - Audiobooks"} - - {id: 12, cat: Books/Ebook, desc: "Books - Ebooks"} + - {id: 12, cat: Books/EBook, desc: "Books - Ebooks"} - {id: 14, cat: Books/Technical, desc: "Books - Education"} - - {id: 15, cat: Books/Magazines, desc: "Books - Magazine"} + - {id: 15, cat: Books/Mags, desc: "Books - Magazine"} - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"} - {id: 11, cat: Console, desc: "Games - Console"} - - {id: 43, cat: PC/Phone-Other, desc: "Games - Mobile"} + - {id: 43, cat: PC/Mobile-Other, desc: "Games - Mobile"} - {id: 17, cat: Console/Other, desc: "Games - Other"} - {id: 10, cat: PC/Games, desc: "Games - Windows"} - {id: 3, cat: Movies/UHD, desc: "Movies - 2K/4K UHD"} @@ -65,7 +65,7 @@ caps: - {id: 33, cat: Other, desc: "Other - Training"} - {id: 41, cat: TV/HD, desc: "TV - Episodes HD"} - {id: 5, cat: TV/SD, desc: "TV - Episodes SD"} - - {id: 6, cat: TV/OTHER, desc: "TV - Packs"} + - {id: 6, cat: TV/Other, desc: "TV - Packs"} - {id: 7, cat: TV/Sport, desc: "TV - Sports"} - {id: 35, cat: XXX, desc: "XXX - HD"} - {id: 47, cat: XXX, desc: "XXX - Misc"} diff --git a/src/Jackett.Common/Definitions/torrenthr.yml b/src/Jackett.Common/Definitions/torrenthr.yml index d26980691..6edcbbe1b 100644 --- a/src/Jackett.Common/Definitions/torrenthr.yml +++ b/src/Jackett.Common/Definitions/torrenthr.yml @@ -25,10 +25,10 @@ caps: - {id: 11, cat: Audio, desc: "Koncerti/Spotovi"} - {id: 28, cat: Console/Wii, desc: "Igre/Wii"} - {id: 30, cat: Books/Comics, desc: "Stripovi"} - - {id: 38, cat: PC/Phone-Other, desc: "Smartphone"} + - {id: 38, cat: PC/Mobile-Other, desc: "Smartphone"} - {id: 40, cat: Movies/BluRay, desc: "Filmovi/BD"} - {id: 3, cat: Audio/MP3, desc: "Glazba/MP3"} - - {id: 26, cat: Console/Xbox, desc: "Igre/Xbox"} + - {id: 26, cat: Console/XBox, desc: "Igre/Xbox"} - {id: 10, cat: XXX, desc: "XXX/SD"} - {id: 16, cat: TV, desc: "THR Packs"} - {id: 15, cat: TV/Sport, desc: "Sport"} diff --git a/src/Jackett.Common/Definitions/torrenting.yml b/src/Jackett.Common/Definitions/torrenting.yml index f63cd21f1..6427720ec 100644 --- a/src/Jackett.Common/Definitions/torrenting.yml +++ b/src/Jackett.Common/Definitions/torrenting.yml @@ -29,7 +29,7 @@ caps: - {id: 47, cat: Movies, desc: "Movies/Packs"} - {id: 49, cat: Movies/HD, desc: "Movies/x265"} - {id: 55, cat: TV/Sport, desc: "Sports"} - - {id: 82, cat: TV/FOREIGN, desc: "TV/Non-English"} + - {id: 82, cat: TV/Foreign, desc: "TV/Non-English"} - {id: 93, cat: Audio, desc: "Music/Packs"} - {id: 99, cat: TV/HD, desc: "TV/x265"} diff --git a/src/Jackett.Common/Definitions/torrentland.yml b/src/Jackett.Common/Definitions/torrentland.yml index e623b7e60..0f51edea9 100644 --- a/src/Jackett.Common/Definitions/torrentland.yml +++ b/src/Jackett.Common/Definitions/torrentland.yml @@ -45,7 +45,7 @@ caps: - {id: 84, cat: TV/HD, desc: "Series - H265"} - {id: 22, cat: TV/SD, desc: "Series - DVD"} - {id: 20, cat: TV/SD, desc: "Series - HDRip"} - - {id: 51, cat: TV/OTHER, desc: "Series - Otros Formatos"} + - {id: 51, cat: TV/Other, desc: "Series - Otros Formatos"} # Documentales - {id: 53, cat: TV/Documentary, desc: "Documentales - HD"} - {id: 52, cat: TV/Documentary, desc: "Documentales - SD"} @@ -62,13 +62,13 @@ caps: - {id: 60, cat: TV/Sport, desc: "Deportes - SD"} # internal cats not provided in search category dropdown !?! # found by fishing - - {id: 37, cat: Books/Ebook, desc: "Ebook"} + - {id: 37, cat: Books/EBook, desc: "Ebook"} - {id: 47, cat: Audio/Lossless, desc: "Music Lossless"} - {id: 31, cat: Audio/Video, desc: "Music Video"} - {id: 19, cat: Audio/MP3, desc: "Music MP3"} - {id: 29, cat: PC/Games, desc: "PC Game"} - {id: 26, cat: Console/Wii, desc: "Console Wii / WiiU"} - - {id: 27, cat: Console/Xbox 360, desc: "Console Xbox360"} + - {id: 27, cat: Console/XBox 360, desc: "Console Xbox360"} - {id: 28, cat: Console/PSP, desc: "Console PSP / PS3"} - {id: 42, cat: PC/ISO, desc: "PC ISO"} - {id: 44, cat: PC, desc: "PC"} @@ -79,10 +79,10 @@ caps: - {id: 43, cat: PC/Mac, desc: "PC Mac"} - {id: 30, cat: Console/NDS, desc: "Console NDS"} - {id: 48, cat: Audio/Video, desc: "Music Video"} - - {id: 25, cat: Books/Ebook, desc: "Ebook"} - - {id: 0, cat: Books/Ebook, desc: "Ebook"} + - {id: 25, cat: Books/EBook, desc: "Ebook"} + - {id: 0, cat: Books/EBook, desc: "Ebook"} - {id: 24, cat: XXX, desc: "Adultos"} - - {id: 64, cat: PC/Phone-Android, desc: "PC Android"} + - {id: 64, cat: PC/Mobile-Android, desc: "PC Android"} - {id: 21, cat: TV/Documentary, desc: "Documentales"} modes: diff --git a/src/Jackett.Common/Definitions/torrentleech-pl.yml b/src/Jackett.Common/Definitions/torrentleech-pl.yml index 35ac73795..e47e0fdf4 100644 --- a/src/Jackett.Common/Definitions/torrentleech-pl.yml +++ b/src/Jackett.Common/Definitions/torrentleech-pl.yml @@ -24,11 +24,11 @@ caps: - {id: 64, cat: Movies, desc: "Filmy/Kino Polskie"} - {id: 59, cat: Movies, desc: "Filmy/PACK"} - {id: 40, cat: Movies/SD, desc: "Filmy/SD"} - - {id: 68, cat: Movies/WEBDL, desc: "Filmy/WEB-DL"} + - {id: 68, cat: Movies/WEB-DL, desc: "Filmy/WEB-DL"} - {id: 62, cat: Console, desc: "Gry/Dodatki"} - {id: 41, cat: Console, desc: "Gry/Konsole"} - {id: 42, cat: PC/Games, desc: "Gry/PC"} - - {id: 44, cat: PC/Phone-Other, desc: "GSM/PDA"} + - {id: 44, cat: PC/Mobile-Other, desc: "GSM/PDA"} - {id: 57, cat: Audio/Video, desc: "Koncerty/Teledyski"} - {id: 63, cat: Audio/Lossless, desc: "Muzyka/FLAC"} - {id: 46, cat: Audio/MP3, desc: "Muzyka/MP3"} diff --git a/src/Jackett.Common/Definitions/torrentlt.yml b/src/Jackett.Common/Definitions/torrentlt.yml index 97bfcf745..880fb864f 100644 --- a/src/Jackett.Common/Definitions/torrentlt.yml +++ b/src/Jackett.Common/Definitions/torrentlt.yml @@ -23,7 +23,7 @@ caps: - {id: 32, cat: Movies, desc: "Filmai / Rus"} - {id: 1, cat: PC/Games, desc: "Žaidimai / PC"} - {id: 50, cat: Console/PS4, desc: "Žaidimai / PlayStation"} - - {id: 51, cat: Console/Xbox 360, desc: "Žaidimai / XBOX-360"} + - {id: 51, cat: Console/XBox 360, desc: "Žaidimai / XBOX-360"} - {id: 73, cat: Console, desc: "Žaidimai / Priedai"} - {id: 36, cat: Console/Other, desc: "Žaidimai / Kita"} - {id: 80, cat: Movies/HD, desc: "HD / Animacija LT"} @@ -48,7 +48,7 @@ caps: - {id: 10, cat: PC/0day, desc: "Soft / PC"} - {id: 44, cat: PC/Mac, desc: "Soft / MAC"} - {id: 61, cat: PC, desc: "Soft / PDA"} - - {id: 75, cat: PC/Phone-Other, desc: "Soft / Kita"} + - {id: 75, cat: PC/Mobile-Other, desc: "Soft / Kita"} - {id: 40, cat: TV/Sport, desc: "Sport / Kita"} - {id: 62, cat: TV/Sport, desc: "Sport / Basketball"} - {id: 63, cat: TV/Sport, desc: "Sport / Cars"} @@ -59,7 +59,7 @@ caps: - {id: 39, cat: TV/Documentary, desc: "TV / Dokumentika"} - {id: 28, cat: TV, desc: "TV / Kita"} - {id: 21, cat: XXX, desc: "pr0n"} - - {id: 71, cat: XXX/Packs, desc: "pr0n / pack"} + - {id: 71, cat: XXX/Pack, desc: "pr0n / pack"} - {id: 30, cat: Other, desc: "Kita"} - {id: 77, cat: Other, desc: "Educational"} - {id: 41, cat: Books, desc: "E-Books"} diff --git a/src/Jackett.Common/Definitions/torrentparadise.yml b/src/Jackett.Common/Definitions/torrentparadise.yml index b8412b237..30420ca6e 100644 --- a/src/Jackett.Common/Definitions/torrentparadise.yml +++ b/src/Jackett.Common/Definitions/torrentparadise.yml @@ -25,13 +25,13 @@ caps: ANIMEDUBBEDSUBBED: TV/Anime APPLICATIONS: PC APPLICATIONSANDROID: PC - APPLICATIONSHANDHELD: PC/Phone-Other + APPLICATIONSHANDHELD: PC/Mobile-Other APPLICATIONSMAC: PC/Mac APPLICATIONSOTHEROS: PC APPLICATIONSWINDOWS: PC/0day APPS: PC APPSANDROID: PC - APPSHANDHELD: PC/Phone-Other + APPSHANDHELD: PC/Mobile-Other APPSMAC: PC/Mac APPSOTHEROS: PC APPSPC: PC @@ -50,16 +50,16 @@ caps: BOOKS: Books BOOKSAUDIO: Audio/Audiobook BOOKSCOMICS: Books/Comics - BOOKSEBOOKS: Books/Ebook - BOOKSMAGAZINES: Books/Magazines + BOOKSEBOOKS: Books/EBook + BOOKSMAGAZINES: Books/Mags BOOKSNONFICTION: Books BOOKSTEXTBOOKS: Books COMICSNEM43COMICS: Books/Comics DESIPORN: XXX DOCUMENTARIES: TV/Documentary DVDRVIDEO: Movies/DVD - EBOOKS: Books/Ebook - EBOOKSTUTORIALS: Books/Ebook + EBOOKS: Books/EBook + EBOOKSTUTORIALS: Books/EBook ESTRENOS: XXX FLAC: Audio/Lossless FLACMUSIC: Audio/Lossless @@ -75,8 +75,8 @@ caps: GAMESWII: Console/Wii GAMESWIIU: Console/WiiU GAMESWINDOWS: PC/Games - GAMESXBOX: Console/Xbox - GAMESXBOX360: Console/Xbox 360 + GAMESXBOX: Console/XBox + GAMESXBOX360: Console/XBox 360 IMAGES: Other JAPANESEANIME: TV/Anime JUEGOS: Console @@ -87,11 +87,11 @@ caps: JUEGOSPSP: Console/PSP JUEGOSWII: Console/Wii JUEGOSWIIU: Console/WiiU - JUEGOSXBOX: Console/Xbox - JUEGOSXBOX360: Console/Xbox 360 + JUEGOSXBOX: Console/XBox + JUEGOSXBOX360: Console/XBox 360 MACINTOSH: PC/Mac MISCELLANEOUS: Other - MOBILE: PC/Phone-Other + MOBILE: PC/Mobile-Other MOVIES: Movies MOVIESBLURAYDISCREMUX: Movies/HD MOVIESBOLLYWOOD: Movies @@ -140,7 +140,7 @@ caps: PORNPICTURES: XXX SERIES: TV SOFTWARE: PC - SOFTWAREANDROID: PC/Phone-Android + SOFTWAREANDROID: PC/Mobile-Android SOFTWAREMAC: PC/Mac SOFTWAREWINDOWS: PC/0day SPORTS: TV/Sport diff --git a/src/Jackett.Common/Definitions/torrentproject2.yml b/src/Jackett.Common/Definitions/torrentproject2.yml index 98034aee8..be4a5fb43 100644 --- a/src/Jackett.Common/Definitions/torrentproject2.yml +++ b/src/Jackett.Common/Definitions/torrentproject2.yml @@ -26,16 +26,16 @@ caps: "audio mp3": Audio/MP3 "audio lossless": Audio/Lossless video: Movies - ebooks: Books/Ebook + ebooks: Books/EBook "Ebooks Comics": Books/Comics "Ebooks Magazines": Other "Ebooks Audiobook": Audio/Audiobook - "Ebooks Tutorials": Books/Ebook + "Ebooks Tutorials": Books/EBook "Games PC": PC/Games "Games Nintendo": Console "Games PlayStation": Console "Games XBox": Console/XBox - Mobile: PC/Phone-Other + Mobile: PC/Mobile-Other Applications: PC Images: Other Other: Other diff --git a/src/Jackett.Common/Definitions/torrentquest.yml b/src/Jackett.Common/Definitions/torrentquest.yml index 90dc9c239..8219d2ccc 100644 --- a/src/Jackett.Common/Definitions/torrentquest.yml +++ b/src/Jackett.Common/Definitions/torrentquest.yml @@ -13,7 +13,7 @@ caps: TV: TV Movie: Movies Music: Audio - E-Book: Books/Ebook + E-Book: Books/EBook Game: PC/Games Software: PC Other: Other diff --git a/src/Jackett.Common/Definitions/torrentsectorcrew.yml b/src/Jackett.Common/Definitions/torrentsectorcrew.yml index 5e2219487..5193ab8cc 100644 --- a/src/Jackett.Common/Definitions/torrentsectorcrew.yml +++ b/src/Jackett.Common/Definitions/torrentsectorcrew.yml @@ -13,7 +13,7 @@ legacylinks: caps: categorymappings: # Apps - - {id: 65, cat: PC/Phone-Android, desc: "Apps Android"} + - {id: 65, cat: PC/Mobile-Android, desc: "Apps Android"} - {id: 107, cat: PC/0day, desc: "Apps Linux"} - {id: 48, cat: PC/Mac, desc: "Apps MAC"} - {id: 109, cat: PC, desc: "Apps Sonstige"} @@ -66,7 +66,7 @@ caps: - {id: 4, cat: PC/Games, desc: "Spiele PC"} - {id: 58, cat: Console/PS4, desc: "Spiele PSX"} - {id: 116, cat: Other, desc: "Spiele Sonstige"} - - {id: 50, cat: Console/Xbox, desc: "Spiele XBOX"} + - {id: 50, cat: Console/XBox, desc: "Spiele XBOX"} modes: search: [q] diff --git a/src/Jackett.Common/Definitions/torrentsurf.yml b/src/Jackett.Common/Definitions/torrentsurf.yml index 36a7089e7..174c09cf5 100644 --- a/src/Jackett.Common/Definitions/torrentsurf.yml +++ b/src/Jackett.Common/Definitions/torrentsurf.yml @@ -15,7 +15,7 @@ caps: - {id: 3, cat: PC/0day, desc: "Appz/PC"} - {id: 35, cat: TV, desc: "Big Brother"} - {id: 28, cat: Books/Comics, desc: "Comics"} - - {id: 4, cat: Books/Ebook, desc: "E-Book"} + - {id: 4, cat: Books/EBook, desc: "E-Book"} - {id: 39, cat: Console, desc: "Games/Console"} - {id: 33, cat: PC/Games, desc: "Games/PC"} - {id: 27, cat: Other, desc: "Misc"} diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml index 33dc421f3..826f8306c 100644 --- a/src/Jackett.Common/Definitions/torrentz2.yml +++ b/src/Jackett.Common/Definitions/torrentz2.yml @@ -40,9 +40,9 @@ caps: "video movie dvd": Movies "video movie dvdrip": Movies "video movie hd": Movies/HD - ebook: Books/Ebook + ebook: Books/EBook "ebook comics": Books/Comics - "ebook magazine": Books/Magazines + "ebook magazine": Books/Mags "ebook tutorial": Books/Technical "ebook audio book": Audio/Audiobook audio: Audio @@ -51,7 +51,7 @@ caps: application: PC/0day game: PC/Games "game pc": PC/Games - "game xbox": Console/Xbox + "game xbox": Console/XBox "game nintendo": Console/NDS adult: XXX "adult amateur": XXX diff --git a/src/Jackett.Common/Definitions/totheglory.yml b/src/Jackett.Common/Definitions/totheglory.yml index b57543de4..a32c46d67 100644 --- a/src/Jackett.Common/Definitions/totheglory.yml +++ b/src/Jackett.Common/Definitions/totheglory.yml @@ -45,15 +45,15 @@ caps: 日本综艺: TV/HD # TV Shows - JP MiniVideo: Other # MiniVideo 补充音轨: Audio # Supplemental audio tracks - iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video + iPhone/iPad视频: PC/Mobile-Other # IPhone / iPad video # 单机游戏 PC: PC/Games # Games - PC MAC: PC/Mac # Games - MAC # 微软系列 - XBOX360: Console/Xbox 360 # MicroSoft - XBOX360 - XBOX1: Console/Xbox # MicroSoft - XBOX360 - XBLA: Console/Xbox # MicroSoft - XBLA - XBOX+to+XBOX360: Console/Xbox # MicroSoft - XBOX to XBOX360 + XBOX360: Console/XBox 360 # MicroSoft - XBOX360 + XBOX1: Console/XBox # MicroSoft - XBOX360 + XBLA: Console/XBox # MicroSoft - XBLA + XBOX+to+XBOX360: Console/XBox # MicroSoft - XBOX to XBOX360 # 索尼系列 PS2: Console/Other # SONY - PS2 PSP: Console/PSP # SONY - PSP @@ -69,16 +69,16 @@ caps: # 主机影视 PS3兼容高清: Console/PS3 # Video - HD - PS3 PSP兼容高清&标清: Console/PSP # Video - SD&HD - PSP - XBOX360兼容高清: Console/Xbox 360 # Video - HD - XBOX360 + XBOX360兼容高清: Console/XBox 360 # Video - HD - XBOX360 Game+Video: Console/Other # Video - Game Video # 软件 APPZ: PC # Software - APPZ - Game+Ebook: Books/Ebook # Software - Game Ebook - Ebook: Books/Ebook # Software - Ebook + Game+Ebook: Books/EBook # Software - Game Ebook + Ebook: Books/EBook # Software - Ebook # 苹果系列 - iPhone/iPad游戏: PC/Phone-IOS # Apple - Game - iPhone/iPad - iPad书籍: Books/Ebook # Apple - Book - iPad - iPhone/iPad软件: PC/Phone-IOS # Apple - Software - iPhone/iPad + iPhone/iPad游戏: PC/Mobile-iOS # Apple - Game - iPhone/iPad + iPad书籍: Books/EBook # Apple - Book - iPad + iPhone/iPad软件: PC/Mobile-iOS # Apple - Software - iPhone/iPad modes: search: [q] diff --git a/src/Jackett.Common/Definitions/totheglorycookie.yml b/src/Jackett.Common/Definitions/totheglorycookie.yml index f532610d9..68a97994d 100644 --- a/src/Jackett.Common/Definitions/totheglorycookie.yml +++ b/src/Jackett.Common/Definitions/totheglorycookie.yml @@ -45,15 +45,15 @@ caps: 日本综艺: TV/HD # TV Shows - JP MiniVideo: Other # MiniVideo 补充音轨: Audio # Supplemental audio tracks - iPhone/iPad视频: PC/Phone-Other # IPhone / iPad video + iPhone/iPad视频: PC/Mobile-Other # IPhone / iPad video # 单机游戏 PC: PC/Games # Games - PC MAC: PC/Mac # Games - MAC # 微软系列 - XBOX360: Console/Xbox 360 # MicroSoft - XBOX360 - XBOX1: Console/Xbox # MicroSoft - XBOX360 - XBLA: Console/Xbox # MicroSoft - XBLA - XBOX+to+XBOX360: Console/Xbox # MicroSoft - XBOX to XBOX360 + XBOX360: Console/XBox 360 # MicroSoft - XBOX360 + XBOX1: Console/XBox # MicroSoft - XBOX360 + XBLA: Console/XBox # MicroSoft - XBLA + XBOX+to+XBOX360: Console/XBox # MicroSoft - XBOX to XBOX360 # 索尼系列 PS2: Console/Other # SONY - PS2 PSP: Console/PSP # SONY - PSP @@ -69,16 +69,16 @@ caps: # 主机影视 PS3兼容高清: Console/PS3 # Video - HD - PS3 PSP兼容高清&标清: Console/PSP # Video - SD&HD - PSP - XBOX360兼容高清: Console/Xbox 360 # Video - HD - XBOX360 + XBOX360兼容高清: Console/XBox 360 # Video - HD - XBOX360 Game+Video: Console/Other # Video - Game Video # 软件 APPZ: PC # Software - APPZ - Game+Ebook: Books/Ebook # Software - Game Ebook - Ebook: Books/Ebook # Software - Ebook + Game+Ebook: Books/EBook # Software - Game Ebook + Ebook: Books/EBook # Software - Ebook # 苹果系列 - iPhone/iPad游戏: PC/Phone-IOS # Apple - Game - iPhone/iPad - iPad书籍: Books/Ebook # Apple - Book - iPad - iPhone/iPad软件: PC/Phone-IOS # Apple - Software - iPhone/iPad + iPhone/iPad游戏: PC/Mobile-iOS # Apple - Game - iPhone/iPad + iPad书籍: Books/EBook # Apple - Book - iPad + iPhone/iPad软件: PC/Mobile-iOS # Apple - Software - iPhone/iPad modes: search: [q] diff --git a/src/Jackett.Common/Definitions/trezzor.yml b/src/Jackett.Common/Definitions/trezzor.yml index a1bea9536..ecbf2e025 100644 --- a/src/Jackett.Common/Definitions/trezzor.yml +++ b/src/Jackett.Common/Definitions/trezzor.yml @@ -24,7 +24,7 @@ caps: - {id: 18, cat: Books/Comics, desc: "Komiks CZ/SK lokalizace"} - {id: 16, cat: Other, desc: "Foto,obrázky"} - {id: 20, cat: Console, desc: "Konzole"} - - {id: 21, cat: PC/Phone-Other, desc: "Mobilmánia"} + - {id: 21, cat: PC/Mobile-Other, desc: "Mobilmánia"} - {id: 22, cat: Other, desc: "Ostatní CZ/SK scéna"} - {id: 23, cat: Other, desc: "Na prani non CZ/SK"} - {id: 27, cat: Other, desc: "TreZzoR rls"} diff --git a/src/Jackett.Common/Definitions/ttsweb.yml b/src/Jackett.Common/Definitions/ttsweb.yml index e21751e5a..4455fb7aa 100644 --- a/src/Jackett.Common/Definitions/ttsweb.yml +++ b/src/Jackett.Common/Definitions/ttsweb.yml @@ -13,7 +13,7 @@ caps: - {id: 10, cat: PC/0day, desc: "Apps 0day"} - {id: 26, cat: PC, desc: "Apps Linux"} - {id: 30, cat: PC/Mac, desc: "Apps Mac"} - - {id: 39, cat: PC/Phone-Other, desc: "Apps Mobile"} + - {id: 39, cat: PC/Mobile-Other, desc: "Apps Mobile"} - {id: 9, cat: PC, desc: "Apps PC"} - {id: 56, cat: Console/PSP, desc: "Games PSP"} - {id: 52, cat: Console/NDS, desc: "Games DS"} @@ -23,9 +23,9 @@ caps: - {id: 34, cat: PC/Games, desc: "Games PC"} - {id: 14, cat: Console/PS3, desc: "Games PS3"} - {id: 12, cat: Console/Wii, desc: "Games Wii"} - - {id: 13, cat: Console/Xbox 360, desc: "Games Xbox360"} + - {id: 13, cat: Console/XBox 360, desc: "Games Xbox360"} - {id: 41, cat: Audio/Audiobook, desc: "Books AudioBooks"} - - {id: 11, cat: Books/Ebook, desc: "Books EBooks"} + - {id: 11, cat: Books/EBook, desc: "Books EBooks"} - {id: 74, cat: Books/Other, desc: "Books Misc"} - {id: 64, cat: Movies/3D, desc: "Movies 3D Bluray"} - {id: 29, cat: Movies/BluRay, desc: "Movies Bluray"} @@ -37,7 +37,7 @@ caps: - {id: 71, cat: Movies, desc: "Movies Packs"} - {id: 73, cat: Movies, desc: "Movies Remux"} - {id: 15, cat: Movies/SD, desc: "Movies SD"} - - {id: 65, cat: Movies/WEBDL, desc: "Movies WEB-DL"} + - {id: 65, cat: Movies/WEB-DL, desc: "Movies WEB-DL"} - {id: 77, cat: TV, desc: "TV Movies"} - {id: 19, cat: Audio/Lossless, desc: "Music FLAC"} - {id: 72, cat: Audio/Lossless, desc: "Music FLAC Packs"} diff --git a/src/Jackett.Common/Definitions/turkseed.yml b/src/Jackett.Common/Definitions/turkseed.yml index 431d4f723..ce4ff3681 100644 --- a/src/Jackett.Common/Definitions/turkseed.yml +++ b/src/Jackett.Common/Definitions/turkseed.yml @@ -12,7 +12,7 @@ caps: categorymappings: - {id: 46, cat: Movies/3D, desc: "3D"} - {id: 47, cat: Movies/UHD, desc: "4K"} - - {id: 61, cat: PC/Phone-Android, desc: "Android"} + - {id: 61, cat: PC/Mobile-Android, desc: "Android"} - {id: 48, cat: TV/Anime, desc: "Animasyon"} - {id: 59, cat: PC, desc: "İşletim Sistemi"} - {id: 40, cat: TV/Documentary, desc: "Belgesel"} @@ -21,7 +21,7 @@ caps: - {id: 4, cat: Other, desc: "Diğer"} - {id: 42, cat: Movies, desc: "Dini"} - {id: 51, cat: Movies/DVD, desc: "DVD"} - - {id: 41, cat: Books/Ebook, desc: "E-Kitap"} + - {id: 41, cat: Books/EBook, desc: "E-Kitap"} - {id: 64, cat: Books, desc: "Eğitim"} - {id: 55, cat: Audio/Lossless, desc: "FLAC"} - {id: 52, cat: Movies/HD, desc: "HD"} diff --git a/src/Jackett.Common/Definitions/turktorrent.yml b/src/Jackett.Common/Definitions/turktorrent.yml index 0e9f3eae2..e929491b5 100644 --- a/src/Jackett.Common/Definitions/turktorrent.yml +++ b/src/Jackett.Common/Definitions/turktorrent.yml @@ -23,7 +23,7 @@ caps: - {id: 26, cat: Movies/UHD, desc: "4Film K UHD Disk"} - {id: 28, cat: Movies/HD, desc: "Film X265"} - {id: 30, cat: Movies/HD, desc: "Film X264"} - - {id: 69, cat: Movies/WEBDL, desc: "Film H264 WEB-DL"} + - {id: 69, cat: Movies/WEB-DL, desc: "Film H264 WEB-DL"} - {id: 63, cat: Movies/SD, desc: "Film XviD"} - {id: 51, cat: Other, desc: "Diğer"} - {id: 62, cat: Other, desc: "Diğer Eğitim"} @@ -32,7 +32,7 @@ caps: - {id: 54, cat: TV/Sport, desc: "Spor"} - {id: 55, cat: Other, desc: "Diğer Duvar Kağıtları"} - {id: 56, cat: Other, desc: "Diğer Her Şey"} - - {id: 65, cat: Books/Ebook, desc: "E-Kitap"} + - {id: 65, cat: Books/EBook, desc: "E-Kitap"} - {id: 2, cat: Console, desc: "Oyun"} - {id: 46, cat: Console, desc: "Oyun PC"} - {id: 3, cat: Console, desc: "Oyun Sony PS"} diff --git a/src/Jackett.Common/Definitions/twilight.yml b/src/Jackett.Common/Definitions/twilight.yml index 25dc67091..72645d0cf 100644 --- a/src/Jackett.Common/Definitions/twilight.yml +++ b/src/Jackett.Common/Definitions/twilight.yml @@ -15,7 +15,7 @@ caps: - {id: 44, cat: Other, desc: "Bots no Cat yet"} - {id: 46, cat: TV/Documentary, desc: "documentary-TV and Movies"} - {id: 35, cat: Audio/Audiobook, desc: "E-books (audio)"} - - {id: 13, cat: Books/Ebook, desc: "E-Books (text)"} + - {id: 13, cat: Books/EBook, desc: "E-Books (text)"} - {id: 48, cat: Movies, desc: "Filled Requests"} - {id: 6, cat: Console, desc: "Games/console"} - {id: 7, cat: Console, desc: "Games/handheld"} diff --git a/src/Jackett.Common/Definitions/uniondht.yml b/src/Jackett.Common/Definitions/uniondht.yml index d6a934a5f..85faf126b 100644 --- a/src/Jackett.Common/Definitions/uniondht.yml +++ b/src/Jackett.Common/Definitions/uniondht.yml @@ -67,17 +67,17 @@ caps: - {id: 97, cat: PC/Games, desc: " |- Бонусные видеодиски"} - {id: 96, cat: PC/Games, desc: " |- Телепередачи/интервью"} - {id: 95, cat: PC/Games, desc: " |- Киберспорт"} - - {id: 101, cat: Console/Xbox, desc: "Xbox "} - - {id: 139, cat: Console/Xbox 360, desc: " |- XBox360 | Игры"} - - {id: 1068, cat: Console/Xbox One, desc: " |- Xbox One | Игры"} - - {id: 554, cat: Console/Xbox 360, desc: " |- XBox360 | Kinect "} - - {id: 730, cat: Console/Xbox 360, desc: " |- XBox360 | GOD Игры"} - - {id: 138, cat: Console/Xbox 360, desc: " |- XBox360 | JTAG "} - - {id: 137, cat: Console/Xbox 360, desc: " |- XBox360 | 360E "} - - {id: 136, cat: Console/Xbox 360, desc: " |- XBox360 | Demo "} - - {id: 135, cat: Console/Xbox 360, desc: " |- XBox360 | Live "} - - {id: 134, cat: Console/Xbox 360, desc: " |- XBox360 | Soft "} - - {id: 133, cat: Console/Xbox, desc: " |- XBox | Игры"} + - {id: 101, cat: Console/XBox, desc: "Xbox "} + - {id: 139, cat: Console/XBox 360, desc: " |- XBox360 | Игры"} + - {id: 1068, cat: Console/XBox One, desc: " |- Xbox One | Игры"} + - {id: 554, cat: Console/XBox 360, desc: " |- XBox360 | Kinect "} + - {id: 730, cat: Console/XBox 360, desc: " |- XBox360 | GOD Игры"} + - {id: 138, cat: Console/XBox 360, desc: " |- XBox360 | JTAG "} + - {id: 137, cat: Console/XBox 360, desc: " |- XBox360 | 360E "} + - {id: 136, cat: Console/XBox 360, desc: " |- XBox360 | Demo "} + - {id: 135, cat: Console/XBox 360, desc: " |- XBox360 | Live "} + - {id: 134, cat: Console/XBox 360, desc: " |- XBox360 | Soft "} + - {id: 133, cat: Console/XBox, desc: " |- XBox | Игры"} - {id: 102, cat: Console/PSP, desc: "PlayStation "} - {id: 1067, cat: Console/PS4, desc: " |- PS4 | Игры"} - {id: 127, cat: Console/PS3, desc: " |- PS3 | Игры"} @@ -94,7 +94,7 @@ caps: - {id: 103, cat: Console/NDS, desc: "Nintendo "} - {id: 113, cat: Console/NDS, desc: " |- NDS | Игры"} - {id: 112, cat: Console/Wii, desc: " |- Wii | Игры"} - - {id: 111, cat: Console/Wiiware/VC, desc: " |- WiiWare | Игры"} + - {id: 111, cat: Console/Wiiware, desc: " |- WiiWare | Игры"} - {id: 110, cat: Console, desc: " |- GameCube | Игры"} - {id: 104, cat: Console, desc: "Sega "} - {id: 108, cat: Console, desc: " |- Dreamcast | Игры"} @@ -130,15 +130,15 @@ caps: - {id: 922, cat: TV/Sport, desc: " |- Евро 2012 "} - {id: 931, cat: TV/Sport, desc: " |- Лига Чемпионов 2012-2013 "} - {id: 1130, cat: TV/Sport, desc: " |- Чемпионат Мира 2014 "} - - {id: 737, cat: TV/OTHER, desc: "Видео для Консолей"} - - {id: 987, cat: TV/OTHER, desc: " |- PSVita | Видео"} - - {id: 748, cat: TV/OTHER, desc: " |- PSP | CAMRip/TS/Scr "} - - {id: 747, cat: TV/OTHER, desc: " |- PSP | Фильмы"} - - {id: 743, cat: TV/OTHER, desc: " |- PSP | Cериалы"} - - {id: 742, cat: TV/OTHER, desc: " |- PSP | Аниме"} - - {id: 741, cat: TV/OTHER, desc: " |- PSP | Мультфильмы"} - - {id: 739, cat: TV/OTHER, desc: " |- PSP | Телепередачи/Документальное кино"} - - {id: 738, cat: TV/OTHER, desc: " |- PSP | UMD Video "} + - {id: 737, cat: TV/Other, desc: "Видео для Консолей"} + - {id: 987, cat: TV/Other, desc: " |- PSVita | Видео"} + - {id: 748, cat: TV/Other, desc: " |- PSP | CAMRip/TS/Scr "} + - {id: 747, cat: TV/Other, desc: " |- PSP | Фильмы"} + - {id: 743, cat: TV/Other, desc: " |- PSP | Cериалы"} + - {id: 742, cat: TV/Other, desc: " |- PSP | Аниме"} + - {id: 741, cat: TV/Other, desc: " |- PSP | Мультфильмы"} + - {id: 739, cat: TV/Other, desc: " |- PSP | Телепередачи/Документальное кино"} + - {id: 738, cat: TV/Other, desc: " |- PSP | UMD Video "} - {id: 211, cat: TV/Anime, desc: "Аниме (Основной)"} - {id: 517, cat: TV/Anime, desc: " |- Аниме | Rips "} - {id: 518, cat: TV/Anime, desc: " |- Аниме | HD Rips "} diff --git a/src/Jackett.Common/Definitions/unionfansub.yml b/src/Jackett.Common/Definitions/unionfansub.yml index bb75d5da5..45d3cd4cc 100644 --- a/src/Jackett.Common/Definitions/unionfansub.yml +++ b/src/Jackett.Common/Definitions/unionfansub.yml @@ -28,7 +28,7 @@ caps: - {id: 7, cat: TV/Anime, desc: "Manga"} - {id: 8, cat: TV/Anime, desc: "Manga/Hentai"} - {id: 17, cat: Books, desc: "Novelas"} - - {id: 12, cat: TV/OTHER, desc: "Otros"} + - {id: 12, cat: TV/Other, desc: "Otros"} - {id: 11, cat: TV, desc: "Programas"} modes: diff --git a/src/Jackett.Common/Definitions/uniongang.yml b/src/Jackett.Common/Definitions/uniongang.yml index 20f6c1231..a234a97a0 100644 --- a/src/Jackett.Common/Definitions/uniongang.yml +++ b/src/Jackett.Common/Definitions/uniongang.yml @@ -11,7 +11,7 @@ links: caps: categorymappings: - {id: 1, cat: Movies, desc: "Movies SATRip / DVDRip / HDRip"} - - {id: 21, cat: Movies/WEBDL, desc: "Movies WEB-DLRip / WEB-DL"} + - {id: 21, cat: Movies/WEB-DL, desc: "Movies WEB-DLRip / WEB-DL"} - {id: 2, cat: Movies/HD, desc: "Movies x264"} - {id: 3, cat: Movies/DVD, desc: "Movies DVD5"} - {id: 4, cat: Movies/DVD, desc: "Movies DVD9"} diff --git a/src/Jackett.Common/Definitions/unlimitz.yml b/src/Jackett.Common/Definitions/unlimitz.yml index 2c1c93e44..c62092cf3 100644 --- a/src/Jackett.Common/Definitions/unlimitz.yml +++ b/src/Jackett.Common/Definitions/unlimitz.yml @@ -17,7 +17,7 @@ caps: - {id: 90, cat: Movies, desc: "ซีรีย์ (หนังชุด) [movie series]"} - {id: 92, cat: Console, desc: "เกมส์ (non PC) [games]"} - {id: 91, cat: PC/Games, desc: "เกมส์ (PC) [games]"} - - {id: 100, cat: PC/Phone-Other, desc: "โปรแกรมที่ใช้บน (มือถือ) [mobiles]"} + - {id: 100, cat: PC/Mobile-Other, desc: "โปรแกรมที่ใช้บน (มือถือ) [mobiles]"} - {id: 82, cat: PC, desc: "โปรแกรมที่ใช้บน (Linux)"} - {id: 83, cat: PC/0day, desc: "โปรแกรมที่ใช้บน (Windows)"} - {id: 110, cat: Audio, desc: "เพลงไทย [Thai music]"} diff --git a/src/Jackett.Common/Definitions/wdt.yml b/src/Jackett.Common/Definitions/wdt.yml index 83e8aa753..f091edbee 100644 --- a/src/Jackett.Common/Definitions/wdt.yml +++ b/src/Jackett.Common/Definitions/wdt.yml @@ -15,8 +15,8 @@ caps: - {id: 16, cat: Audio, desc: "Music Audio"} - {id: 13, cat: Audio, desc: "Podcasts"} - {id: 15, cat: Audio, desc: "Wrestling Themes"} - - {id: 29, cat: Books/Ebook, desc: "Ebooks"} - - {id: 28, cat: Books/Magazines, desc: "Magazines"} + - {id: 29, cat: Books/EBook, desc: "Ebooks"} + - {id: 28, cat: Books/Mags, desc: "Magazines"} - {id: 30, cat: Books/Other, desc: "Misc"} - {id: 18, cat: Books/Other, desc: "Wrestling Newsletters"} - {id: 34, cat: TV/Sport, desc: "Impact Wrestling PPV / One Nig"} @@ -27,7 +27,7 @@ caps: - {id: 20, cat: TV/Sport, desc: "Packs"} - {id: 19, cat: PC, desc: "Computer Programs"} - {id: 35, cat: PC/Games, desc: "Games"} - - {id: 36, cat: PC/Phone-Other, desc: "Mobile Apps"} + - {id: 36, cat: PC/Mobile-Other, desc: "Mobile Apps"} - {id: 37, cat: TV/Sport, desc: "Boxing"} - {id: 38, cat: TV/Sport, desc: "Classics"} - {id: 12, cat: TV/Documentary, desc: "Documentary"} diff --git a/src/Jackett.Common/Definitions/witchhunter.yml b/src/Jackett.Common/Definitions/witchhunter.yml index c818c9bbf..e1c2b2520 100644 --- a/src/Jackett.Common/Definitions/witchhunter.yml +++ b/src/Jackett.Common/Definitions/witchhunter.yml @@ -36,7 +36,7 @@ caps: - {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/Phone-Other, desc: "Mobil"} + - {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"} diff --git a/src/Jackett.Common/Definitions/woot.yml b/src/Jackett.Common/Definitions/woot.yml index acf9279b0..06a4bef25 100644 --- a/src/Jackett.Common/Definitions/woot.yml +++ b/src/Jackett.Common/Definitions/woot.yml @@ -12,7 +12,7 @@ caps: categorymappings: - {id: 73, cat: Audio/Audiobook, desc: "Misc/Abooks"} - {id: 74, cat: Other, desc: "Misc/All"} - - {id: 72, cat: Books/Ebook, desc: "Misc/Ebooks"} + - {id: 72, cat: Books/EBook, desc: "Misc/Ebooks"} - {id: 71, cat: PC/Games, desc: "Misc/Games"} - {id: 70, cat: PC/0day, desc: "Misc/Software"} - {id: 60, cat: Movies/HD, desc: "Movies/HD"} @@ -21,7 +21,7 @@ caps: - {id: 62, cat: Movies, desc: "Movies/Untouched"} - {id: 66, cat: TV/Documentary, desc: "TV/Doku HD"} - {id: 67, cat: TV/Documentary, desc: "TV/Doku SD"} - - {id: 69, cat: TV/OTHER, desc: "TV/Misc"} + - {id: 69, cat: TV/Other, desc: "TV/Misc"} - {id: 64, cat: TV/HD, desc: "TV/Serien HD"} - {id: 65, cat: TV/SD, desc: "TV/Serien SD"} - {id: 68, cat: TV/Sport, desc: "TV/Sport"} diff --git a/src/Jackett.Common/Definitions/x-ite.me.yml b/src/Jackett.Common/Definitions/x-ite.me.yml index 66b3c16d6..6ba158bee 100644 --- a/src/Jackett.Common/Definitions/x-ite.me.yml +++ b/src/Jackett.Common/Definitions/x-ite.me.yml @@ -23,7 +23,7 @@ caps: - {id: 6320, cat: TV/Anime, desc: "Animations - Yaoi"} - {id: 9700, cat: Books/Comics, desc: "Comics & Manga - Adult"} - {id: 5000, cat: XXX, desc: "Fetish - All"} - - {id: 7700, cat: XXX/Imageset, desc: "Images - Fetish"} + - {id: 7700, cat: XXX/ImageSet, desc: "Images - Fetish"} - {id: 1050, cat: Movies, desc: "Movies - Biography"} - {id: 1150, cat: Movies, desc: "Movies - Crime"} - {id: 1250, cat: Movies, desc: "Movies - Experimental"} @@ -36,7 +36,7 @@ caps: - {id: 6310, cat: TV/Anime, desc: "Animations - Yuri"} - {id: 9600, cat: Books/Comics, desc: "Comics & Manga - Cartoon"} - {id: 13000, cat: PC/Games, desc: "Games - All"} - - {id: 7900, cat: XXX/Imageset, desc: "Images - Other"} + - {id: 7900, cat: XXX/ImageSet, desc: "Images - Other"} - {id: 1070, cat: Movies, desc: "Movies - Bollywood"} - {id: 1170, cat: Movies, desc: "Movies - Documentary"} - {id: 1270, cat: Movies, desc: "Movies - Family"} @@ -49,7 +49,7 @@ caps: - {id: 14000, cat: PC, desc: "Applications - All"} - {id: 9200, cat: Books/Comics, desc: "Comics & Manga - Hentai"} - {id: 4000, cat: XXX, desc: "Hardcore - All"} - - {id: 8000, cat: Books/Magazines, desc: "Magazines - All"} + - {id: 8000, cat: Books/Mags, desc: "Magazines - All"} - {id: 1090, cat: Movies, desc: "Movies - Comedy"} - {id: 1190, cat: Movies, desc: "Movies - Drama"} - {id: 1290, cat: Movies, desc: "Movies - Fantasy"} @@ -61,7 +61,7 @@ caps: - {id: 6120, cat: TV/Anime, desc: "Animations - Shoujo Ai"} - {id: 11000, cat: Audio/Audiobook, desc: "Audio Books - All"} - {id: 9100, cat: Books/Comics, desc: "Comics & Manga - Manga"} - - {id: 7500, cat: XXX/Imageset, desc: "Images - Adult"} + - {id: 7500, cat: XXX/ImageSet, desc: "Images - Adult"} - {id: 1010, cat: Movies, desc: "Movies - Action"} - {id: 1110, cat: Movies, desc: "Movies - Coming of Age"} - {id: 1210, cat: Movies, desc: "Movies - Eastern"} @@ -73,7 +73,7 @@ caps: - {id: 6330, cat: TV/Anime, desc: "Animations - Shounen Ai"} - {id: 10000, cat: Books, desc: "Books - All"} - {id: 9900, cat: Books/Comics, desc: "Comics & Manga - Other"} - - {id: 7300, cat: XXX/Imageset, desc: "Images - Erotic"} + - {id: 7300, cat: XXX/ImageSet, desc: "Images - Erotic"} - {id: 1030, cat: Movies, desc: "Movies - Adventure"} - {id: 1130, cat: Movies, desc: "Movies - Coming Out"} - {id: 1230, cat: Movies, desc: "Movies - Entertainment"} diff --git a/src/Jackett.Common/Definitions/xbytes2.yml b/src/Jackett.Common/Definitions/xbytes2.yml index 7803b03f5..3724aa88f 100644 --- a/src/Jackett.Common/Definitions/xbytes2.yml +++ b/src/Jackett.Common/Definitions/xbytes2.yml @@ -36,7 +36,7 @@ caps: - {id: 65, cat: Console, desc: "Juegos Retro"} - {id: 33, cat: Books, desc: "Libros"} - {id: 7, cat: PC/0day, desc: "Software"} - - {id: 40, cat: PC/Phone-Other, desc: "Telefonos y tablets"} + - {id: 40, cat: PC/Mobile-Other, desc: "Telefonos y tablets"} - {id: 12, cat: XXX, desc: "Adult"} - {id: 32, cat: Other, desc: "Otros"} # internal cats not provided in search category dropdown !?! diff --git a/src/Jackett.Common/Definitions/xfsub.yml b/src/Jackett.Common/Definitions/xfsub.yml index 716f0f0a7..b1d5f8e99 100644 --- a/src/Jackett.Common/Definitions/xfsub.yml +++ b/src/Jackett.Common/Definitions/xfsub.yml @@ -27,7 +27,7 @@ caps: - {id: 12, cat: TV, desc: "日韩综艺 (JP+KR Shows)"} - {id: 13, cat: TV, desc: "台湾连续剧 (TW Series)"} - {id: 14, cat: Movies/3D, desc: "3D立体电影 (Movies3D)"} - - {id: 15, cat: Books/Ebook, desc: "Books"} + - {id: 15, cat: Books/EBook, desc: "Books"} - {id: 16, cat: TV, desc: "国产电视剧 (CH Series)"} - {id: 17, cat: TV, desc: "特摄 (Tokusatsu)"} diff --git a/src/Jackett.Common/Definitions/zamundanet.yml b/src/Jackett.Common/Definitions/zamundanet.yml index 659be8da8..74d677c45 100644 --- a/src/Jackett.Common/Definitions/zamundanet.yml +++ b/src/Jackett.Common/Definitions/zamundanet.yml @@ -30,7 +30,7 @@ caps: - {id: 4, cat: PC/ISO, desc: "Games ISO"} - {id: 21, cat: PC/Games, desc: "Games PC Rip"} - {id: 17, cat: Console/PS3, desc: "Games PS"} - - {id: 40, cat: Console/Xbox, desc: "Games Xbox"} + - {id: 40, cat: Console/XBox, desc: "Games Xbox"} - {id: 12, cat: Console, desc: "Games Console"} - {id: 54, cat: PC, desc: "Games Linux"} - {id: 6, cat: Audio, desc: "Music"} @@ -40,12 +40,12 @@ caps: - {id: 34, cat: Audio/Lossless, desc: "Music Lossless"} - {id: 38, cat: PC/Mac, desc: "Programs Mac"} - {id: 1, cat: PC/ISO, desc: "Programs PC ISO"} - - {id: 22, cat: PC/Phone-Other, desc: "Programs Other"} + - {id: 22, cat: PC/Mobile-Other, desc: "Programs Other"} - {id: 43, cat: TV/Sport, desc: "Sport HD"} - {id: 41, cat: TV/Sport, desc: "Sport SD"} - - {id: 36, cat: PC/Phone-Other, desc: "Programs Mobile/GSM"} - - {id: 52, cat: PC/Phone-Android, desc: "Android/Games"} - - {id: 53, cat: PC/Phone-Android, desc: "Android/Apps"} + - {id: 36, cat: PC/Mobile-Other, desc: "Programs Mobile/GSM"} + - {id: 52, cat: PC/Mobile-Android, desc: "Android/Games"} + - {id: 53, cat: PC/Mobile-Android, desc: "Android/Apps"} - {id: 26, cat: Other, desc: "Other"} - {id: 23, cat: Other, desc: "Clips"} - {id: 32, cat: Books/Comics, desc: "Books Comics"} diff --git a/src/Jackett.Common/Definitions/zelkaorg.yml b/src/Jackett.Common/Definitions/zelkaorg.yml index c6cf14076..e1091956c 100644 --- a/src/Jackett.Common/Definitions/zelkaorg.yml +++ b/src/Jackett.Common/Definitions/zelkaorg.yml @@ -13,7 +13,7 @@ caps: categories: categorymappings: - {id: 42, cat: Movies/BluRay, desc: "Blu-ray"} - - {id: 36, cat: PC/Phone-Other, desc: "Mobile/GSM"} + - {id: 36, cat: PC/Mobile-Other, desc: "Mobile/GSM"} - {id: 50, cat: TV, desc: "TV"} - {id: 9, cat: XXX, desc: "XXX"} - {id: 48, cat: XXX, desc: "XXX/3D"} @@ -25,7 +25,7 @@ caps: - {id: 4, cat: PC/Games, desc: "Games/PC ISO"} - {id: 21, cat: PC/Games, desc: "Games/PC Rip"} - {id: 17, cat: Console/PS3, desc: "Games/PS"} - - {id: 40, cat: Console/Xbox, desc: "Games/Xbox"} + - {id: 40, cat: Console/XBox, desc: "Games/Xbox"} - {id: 12, cat: Console/Other, desc: "Games/Console"} - {id: 23, cat: Audio/Video, desc: "Clips/Concerts"} - {id: 32, cat: Books/Comics, desc: "Books/Comics"} diff --git a/src/Jackett.Common/Definitions/ztracker.yml b/src/Jackett.Common/Definitions/ztracker.yml index c05ee4542..f18ce87c5 100644 --- a/src/Jackett.Common/Definitions/ztracker.yml +++ b/src/Jackett.Common/Definitions/ztracker.yml @@ -38,7 +38,7 @@ caps: - {id: 45, cat: Console, desc: "Game/Konzol"} - {id: 18, cat: Other, desc: "Képek"} - {id: 17, cat: XXX, desc: "Képek/XXX"} - - {id: 24, cat: PC/Phone-Other, desc: "Program/Mobil"} + - {id: 24, cat: PC/Mobile-Other, desc: "Program/Mobil"} - {id: 1, cat: PC/0day, desc: "Program/PC"} - {id: 44, cat: TV/HD, desc: "Sorozat/HD-HUN"} - {id: 46, cat: TV/HD, desc: "Sorozat/HD"} diff --git a/src/Jackett.Common/Indexers/Abnormal.cs b/src/Jackett.Common/Indexers/Abnormal.cs index ea4ff3c7e..767cc196f 100644 --- a/src/Jackett.Common/Indexers/Abnormal.cs +++ b/src/Jackett.Common/Indexers/Abnormal.cs @@ -94,9 +94,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping("TV|HD|VOSTFR", TorznabCatType.TVHD); // HD VOSTFR AddCategoryMapping("TV|SD|VF", TorznabCatType.TVSD); // SD VF AddCategoryMapping("TV|HD|VF", TorznabCatType.TVHD); // HD VF - AddCategoryMapping("TV|PACK|FR", TorznabCatType.TVOTHER); // PACK FR - AddCategoryMapping("TV|PACK|VOSTFR", TorznabCatType.TVOTHER); // PACK VOSTFR - AddCategoryMapping("TV|EMISSIONS", TorznabCatType.TVOTHER); // EMISSIONS + AddCategoryMapping("TV|PACK|FR", TorznabCatType.TVOther); // PACK FR + AddCategoryMapping("TV|PACK|VOSTFR", TorznabCatType.TVOther); // PACK VOSTFR + AddCategoryMapping("TV|EMISSIONS", TorznabCatType.TVOther); // EMISSIONS // Anime AddCategoryMapping("ANIME", TorznabCatType.TVAnime); // ANIME @@ -112,7 +112,7 @@ namespace Jackett.Common.Indexers // Other AddCategoryMapping("PC|APP", TorznabCatType.PC); // PC AddCategoryMapping("PC|GAMES", TorznabCatType.PCGames); // GAMES - AddCategoryMapping("EBOOKS", TorznabCatType.BooksEbook); // EBOOKS + AddCategoryMapping("EBOOKS", TorznabCatType.BooksEBook); // EBOOKS } /// diff --git a/src/Jackett.Common/Indexers/AlphaRatio.cs b/src/Jackett.Common/Indexers/AlphaRatio.cs index 16f455e95..f6056de14 100644 --- a/src/Jackett.Common/Indexers/AlphaRatio.cs +++ b/src/Jackett.Common/Indexers/AlphaRatio.cs @@ -56,13 +56,13 @@ namespace Jackett.Common.Indexers AddCategoryMapping(16, TorznabCatType.TVAnime, "AnimeSD"); AddCategoryMapping(17, TorznabCatType.TVAnime, "AnimeHD"); AddCategoryMapping(18, TorznabCatType.PCGames, "GamesPC"); - AddCategoryMapping(19, TorznabCatType.ConsoleXbox, "GamesxBox"); + AddCategoryMapping(19, TorznabCatType.ConsoleXBox, "GamesxBox"); AddCategoryMapping(20, TorznabCatType.ConsolePS4, "GamesPS"); AddCategoryMapping(21, TorznabCatType.ConsoleWii, "GamesNin"); AddCategoryMapping(22, TorznabCatType.PC0day, "AppsWindows"); AddCategoryMapping(23, TorznabCatType.PCMac, "AppsMAC"); AddCategoryMapping(24, TorznabCatType.PC0day, "AppsLinux"); - AddCategoryMapping(25, TorznabCatType.PCPhoneOther, "AppsMobile"); + AddCategoryMapping(25, TorznabCatType.PCMobileOther, "AppsMobile"); AddCategoryMapping(26, TorznabCatType.XXX, "0dayXXX"); AddCategoryMapping(27, TorznabCatType.Books, "eBook"); AddCategoryMapping(28, TorznabCatType.AudioAudiobook, "AudioBook"); diff --git a/src/Jackett.Common/Indexers/BB.cs b/src/Jackett.Common/Indexers/BB.cs index 76bd2e70c..2e5d48cda 100644 --- a/src/Jackett.Common/Indexers/BB.cs +++ b/src/Jackett.Common/Indexers/BB.cs @@ -71,10 +71,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1, TorznabCatType.AudioMP3); AddCategoryMapping(1, TorznabCatType.AudioLossless); AddCategoryMapping(2, TorznabCatType.PC); - AddCategoryMapping(3, TorznabCatType.BooksEbook); + AddCategoryMapping(3, TorznabCatType.BooksEBook); AddCategoryMapping(4, TorznabCatType.AudioAudiobook); AddCategoryMapping(5, TorznabCatType.Other); - AddCategoryMapping(6, TorznabCatType.BooksMagazines); + AddCategoryMapping(6, TorznabCatType.BooksMags); AddCategoryMapping(7, TorznabCatType.BooksComics); AddCategoryMapping(8, TorznabCatType.TVAnime); AddCategoryMapping(9, TorznabCatType.Movies); diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index b49c7676d..1101e1b0c 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -98,7 +98,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(3, TorznabCatType.PC0day, "Aplicativos"); AddCategoryMapping(8, TorznabCatType.Other, "Apostilas/Tutoriais"); AddCategoryMapping(19, TorznabCatType.AudioAudiobook, "Audiobook"); - AddCategoryMapping(16, TorznabCatType.TVOTHER, "Desenho Animado"); + AddCategoryMapping(16, TorznabCatType.TVOther, "Desenho Animado"); AddCategoryMapping(18, TorznabCatType.TVDocumentary, "Documentários"); AddCategoryMapping(10, TorznabCatType.Books, "E-Books"); AddCategoryMapping(20, TorznabCatType.TVSport, "Esportes"); @@ -106,7 +106,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(12, TorznabCatType.MoviesOther, "Histórias em Quadrinhos"); AddCategoryMapping(5, TorznabCatType.Audio, "Músicas"); AddCategoryMapping(7, TorznabCatType.Other, "Outros"); - AddCategoryMapping(9, TorznabCatType.BooksMagazines, "Revistas"); + AddCategoryMapping(9, TorznabCatType.BooksMags, "Revistas"); AddCategoryMapping(2, TorznabCatType.TV, "Seriados"); AddCategoryMapping(17, TorznabCatType.TV, "Shows"); AddCategoryMapping(13, TorznabCatType.TV, "Stand Up Comedy"); @@ -115,7 +115,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(4, TorznabCatType.PCGames, "Jogos"); AddCategoryMapping(199, TorznabCatType.XXX, "Filmes Adultos"); AddCategoryMapping(200, TorznabCatType.XXX, "Jogos Adultos"); - AddCategoryMapping(201, TorznabCatType.XXXImageset, "Fotos Adultas"); + AddCategoryMapping(201, TorznabCatType.XXXImageSet, "Fotos Adultas"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs index 695c8d131..51caca729 100644 --- a/src/Jackett.Common/Indexers/BakaBT.cs +++ b/src/Jackett.Common/Indexers/BakaBT.cs @@ -71,10 +71,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(3, TorznabCatType.AudioOther, "Soundtrack"); AddCategoryMapping(4, TorznabCatType.BooksComics, "Manga"); AddCategoryMapping(5, TorznabCatType.TVAnime, "Anime Movie"); - AddCategoryMapping(6, TorznabCatType.TVOTHER, "Live Action"); + AddCategoryMapping(6, TorznabCatType.TVOther, "Live Action"); AddCategoryMapping(7, TorznabCatType.BooksOther, "Artbook"); AddCategoryMapping(8, TorznabCatType.AudioVideo, "Music Video"); - AddCategoryMapping(9, TorznabCatType.BooksEbook, "Light Novel"); + AddCategoryMapping(9, TorznabCatType.BooksEBook, "Light Novel"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/BitCityReloaded.cs b/src/Jackett.Common/Indexers/BitCityReloaded.cs index 5d773969e..e54e7656d 100644 --- a/src/Jackett.Common/Indexers/BitCityReloaded.cs +++ b/src/Jackett.Common/Indexers/BitCityReloaded.cs @@ -79,8 +79,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(11, TorznabCatType.ConsoleNDS); // Games/Nintendo DS AddCategoryMapping(10, TorznabCatType.PCGames); // Games/PC AddCategoryMapping(13, TorznabCatType.ConsoleWii); // Games/Wii - AddCategoryMapping(14, TorznabCatType.ConsoleXbox); // Games/Xbox & 360 - AddCategoryMapping(15, TorznabCatType.PCPhoneOther); // Handy & PDA + AddCategoryMapping(14, TorznabCatType.ConsoleXBox); // Games/Xbox & 360 + AddCategoryMapping(15, TorznabCatType.PCMobileOther); // Handy & PDA AddCategoryMapping(16, TorznabCatType.AudioAudiobook); // Hörspiel/Hörbuch AddCategoryMapping(30, TorznabCatType.Other); // International AddCategoryMapping(17, TorznabCatType.Other); // MegaPack @@ -92,15 +92,15 @@ namespace Jackett.Common.Indexers AddCategoryMapping(9, TorznabCatType.MoviesOther); // Movie/XviD,DivX,h264 AddCategoryMapping(26, TorznabCatType.XXX); // Movie/XXX AddCategoryMapping(41, TorznabCatType.XXXOther); // Movie/XXX/Other - AddCategoryMapping(42, TorznabCatType.XXXPacks); // Movie/XXX/Pack + AddCategoryMapping(42, TorznabCatType.XXXPack); // Movie/XXX/Pack AddCategoryMapping(45, TorznabCatType.MoviesHD); // Movies/4K AddCategoryMapping(33, TorznabCatType.MoviesBluRay); // Movies/BluRay AddCategoryMapping(18, TorznabCatType.Audio); // Musik AddCategoryMapping(19, TorznabCatType.AudioVideo); // Musik Videos - AddCategoryMapping(44, TorznabCatType.TVOTHER); // Serie/DVD/R + AddCategoryMapping(44, TorznabCatType.TVOther); // Serie/DVD/R AddCategoryMapping(22, TorznabCatType.TVHD); // Serie/HDTV AddCategoryMapping(38, TorznabCatType.TV); // Serie/Pack - AddCategoryMapping(23, TorznabCatType.TVOTHER); // Serie/XviD,DivX,h264 + AddCategoryMapping(23, TorznabCatType.TVOther); // Serie/XviD,DivX,h264 AddCategoryMapping(25, TorznabCatType.TVSport); // Sport } diff --git a/src/Jackett.Common/Indexers/BrokenStones.cs b/src/Jackett.Common/Indexers/BrokenStones.cs index e1105bbb8..0fe9cb608 100644 --- a/src/Jackett.Common/Indexers/BrokenStones.cs +++ b/src/Jackett.Common/Indexers/BrokenStones.cs @@ -27,8 +27,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1, TorznabCatType.PCMac, "MacOS Apps"); AddCategoryMapping(2, TorznabCatType.PCMac, "MacOS Games"); - AddCategoryMapping(3, TorznabCatType.PCPhoneIOS, "iOS Apps"); - AddCategoryMapping(4, TorznabCatType.PCPhoneIOS, "iOS Games"); + AddCategoryMapping(3, TorznabCatType.PCMobileiOS, "iOS Apps"); + AddCategoryMapping(4, TorznabCatType.PCMobileiOS, "iOS Games"); AddCategoryMapping(5, TorznabCatType.Other, "Graphics"); AddCategoryMapping(6, TorznabCatType.Audio, "Audio"); AddCategoryMapping(7, TorznabCatType.Other, "Tutorials"); diff --git a/src/Jackett.Common/Indexers/CorsaroRed.cs b/src/Jackett.Common/Indexers/CorsaroRed.cs index a7d57498b..dd06251b9 100644 --- a/src/Jackett.Common/Indexers/CorsaroRed.cs +++ b/src/Jackett.Common/Indexers/CorsaroRed.cs @@ -82,7 +82,7 @@ namespace Jackett.Common.Indexers // TNTVillage cats AddCategoryMapping(1, TorznabCatType.TV, "TV Movies"); AddCategoryMapping(2, TorznabCatType.Audio, "Music"); - AddCategoryMapping(3, TorznabCatType.BooksEbook, "eBooks"); + AddCategoryMapping(3, TorznabCatType.BooksEBook, "eBooks"); AddCategoryMapping(4, TorznabCatType.Movies, "Movies"); AddCategoryMapping(6, TorznabCatType.PC, "Linux"); AddCategoryMapping(7, TorznabCatType.TVAnime, "Anime"); @@ -107,8 +107,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(32, TorznabCatType.Console, "Nintendo Games"); AddCategoryMapping(34, TorznabCatType.AudioAudiobook, "Audiobook"); AddCategoryMapping(35, TorznabCatType.Audio, "Podcasts"); - AddCategoryMapping(36, TorznabCatType.BooksMagazines, "Newspapers"); - AddCategoryMapping(37, TorznabCatType.PCPhoneOther, "Phone Apps"); + AddCategoryMapping(36, TorznabCatType.BooksMags, "Newspapers"); + AddCategoryMapping(37, TorznabCatType.PCMobileOther, "Phone Apps"); } private string ApiLatest => $"{SiteLink}api/latests"; diff --git a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs index 312546313..6ebd16269 100644 --- a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs +++ b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs @@ -86,22 +86,22 @@ namespace Jackett.Common.Indexers AddCategoryMapping(18, TorznabCatType.PCGames, "Gry"); AddCategoryMapping(34, TorznabCatType.PCGames, "Gry PC"); AddCategoryMapping(35, TorznabCatType.ConsolePSP, "Gry PS2/PS3/PSP"); - AddCategoryMapping(36, TorznabCatType.ConsoleXbox, "Gry Xbox"); + AddCategoryMapping(36, TorznabCatType.ConsoleXBox, "Gry Xbox"); AddCategoryMapping(37, TorznabCatType.Console, "Gry Inne Konsole"); AddCategoryMapping(19, TorznabCatType.Audio, "Muzyka"); AddCategoryMapping(38, TorznabCatType.Audio, "Muzyka Polska/Zagraniczna"); AddCategoryMapping(39, TorznabCatType.Audio, "Muzyka Soundtracki"); AddCategoryMapping(40, TorznabCatType.Audio, "Muzyka Teledyski/Koncerty"); - AddCategoryMapping(20, TorznabCatType.PCPhoneOther, "GSM/PDA"); - AddCategoryMapping(42, TorznabCatType.PCPhoneOther, " Tapety GSM/PDA"); - AddCategoryMapping(43, TorznabCatType.PCPhoneOther, " Programy GSM/PDA"); - AddCategoryMapping(44, TorznabCatType.PCPhoneOther, " Filmy GSM/PDA"); - AddCategoryMapping(45, TorznabCatType.PCPhoneOther, " Dzwonki GSM/PDA"); - AddCategoryMapping(46, TorznabCatType.PCPhoneOther, " Gry GSM/PDA"); + AddCategoryMapping(20, TorznabCatType.PCMobileOther, "GSM/PDA"); + AddCategoryMapping(42, TorznabCatType.PCMobileOther, " Tapety GSM/PDA"); + AddCategoryMapping(43, TorznabCatType.PCMobileOther, " Programy GSM/PDA"); + AddCategoryMapping(44, TorznabCatType.PCMobileOther, " Filmy GSM/PDA"); + AddCategoryMapping(45, TorznabCatType.PCMobileOther, " Dzwonki GSM/PDA"); + AddCategoryMapping(46, TorznabCatType.PCMobileOther, " Gry GSM/PDA"); AddCategoryMapping(21, TorznabCatType.Books, "Książki/Czasopisma"); - AddCategoryMapping(47, TorznabCatType.BooksEbook, "Książki/Czasopisma E-Booki"); + AddCategoryMapping(47, TorznabCatType.BooksEBook, "Książki/Czasopisma E-Booki"); AddCategoryMapping(48, TorznabCatType.AudioAudiobook, "Książki/Czasopisma Audio-Booki"); - AddCategoryMapping(49, TorznabCatType.BooksMagazines, "Książki/Czasopisma Czasopisma"); + AddCategoryMapping(49, TorznabCatType.BooksMags, "Książki/Czasopisma Czasopisma"); AddCategoryMapping(50, TorznabCatType.BooksComics, "Książki/Czasopisma Komiksy"); AddCategoryMapping(22, TorznabCatType.PC, "Programy"); AddCategoryMapping(51, TorznabCatType.PC0day, "Programy Windows"); diff --git a/src/Jackett.Common/Indexers/DigitalCore.cs b/src/Jackett.Common/Indexers/DigitalCore.cs index 0ab38f768..205c4a898 100644 --- a/src/Jackett.Common/Indexers/DigitalCore.cs +++ b/src/Jackett.Common/Indexers/DigitalCore.cs @@ -98,7 +98,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(30, TorznabCatType.XXX, "XXX/SD"); AddCategoryMapping(31, TorznabCatType.XXX, "XXX/HD"); AddCategoryMapping(32, TorznabCatType.XXX, "XXX/4K"); - AddCategoryMapping(34, TorznabCatType.XXXImageset, "XXX/Imagesets"); + AddCategoryMapping(34, TorznabCatType.XXXImageSet, "XXX/Imagesets"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs index 5dc2d9a6b..9bf0bc51a 100644 --- a/src/Jackett.Common/Indexers/EliteTracker.cs +++ b/src/Jackett.Common/Indexers/EliteTracker.cs @@ -70,8 +70,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(59, TorznabCatType.TVAnime, "Animes - Serie"); AddCategoryMapping(3, TorznabCatType.PC0day, "APPLICATION"); - AddCategoryMapping(74, TorznabCatType.PCPhoneAndroid, "APPLICATION - ANDROID"); - AddCategoryMapping(57, TorznabCatType.PCPhoneIOS, "APPLICATION - IPHONE"); + AddCategoryMapping(74, TorznabCatType.PCMobileAndroid, "APPLICATION - ANDROID"); + AddCategoryMapping(57, TorznabCatType.PCMobileiOS, "APPLICATION - IPHONE"); AddCategoryMapping(6, TorznabCatType.PC0day, "APPLICATION - LINUX"); AddCategoryMapping(5, TorznabCatType.PCMac, "APPLICATION - MAC"); AddCategoryMapping(4, TorznabCatType.PC0day, "APPLICATION - WINDOWS"); @@ -106,7 +106,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(15, TorznabCatType.Console, "JEUX VIDEO"); AddCategoryMapping(76, TorznabCatType.Console3DS, "JEUX VIDEO - 3DS"); AddCategoryMapping(18, TorznabCatType.ConsoleNDS, "JEUX VIDEO - DS"); - AddCategoryMapping(55, TorznabCatType.PCPhoneIOS, "JEUX VIDEO - IPHONE"); + AddCategoryMapping(55, TorznabCatType.PCMobileiOS, "JEUX VIDEO - IPHONE"); AddCategoryMapping(80, TorznabCatType.PCGames, "JEUX VIDEO - LINUX"); AddCategoryMapping(96, TorznabCatType.ConsoleOther, "JEUX VIDEO - NSW"); AddCategoryMapping(79, TorznabCatType.PCMac, "JEUX VIDEO - OSX"); @@ -118,9 +118,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(75, TorznabCatType.ConsolePS3, "JEUX VIDEO - PSX"); AddCategoryMapping(19, TorznabCatType.ConsoleWii, "JEUX VIDEO - WII"); AddCategoryMapping(83, TorznabCatType.ConsoleWiiU, "JEUX VIDEO - WiiU"); - AddCategoryMapping(16, TorznabCatType.ConsoleXbox, "JEUX VIDEO - XBOX"); - AddCategoryMapping(82, TorznabCatType.ConsoleXboxOne, "JEUX VIDEO - XBOX ONE"); - AddCategoryMapping(17, TorznabCatType.ConsoleXbox360, "JEUX VIDEO - XBOX360"); + AddCategoryMapping(16, TorznabCatType.ConsoleXBox, "JEUX VIDEO - XBOX"); + AddCategoryMapping(82, TorznabCatType.ConsoleXBoxOne, "JEUX VIDEO - XBOX ONE"); + AddCategoryMapping(17, TorznabCatType.ConsoleXBox360, "JEUX VIDEO - XBOX360"); AddCategoryMapping(23, TorznabCatType.Audio, "MUSIQUES"); AddCategoryMapping(26, TorznabCatType.Audio, "MUSIQUES - CLIP/CONCERT"); diff --git a/src/Jackett.Common/Indexers/EpubLibre.cs b/src/Jackett.Common/Indexers/EpubLibre.cs index e0aa1da98..9e0f532bd 100644 --- a/src/Jackett.Common/Indexers/EpubLibre.cs +++ b/src/Jackett.Common/Indexers/EpubLibre.cs @@ -70,7 +70,7 @@ namespace Jackett.Common.Indexers Language = "es-es"; Type = "public"; - AddCategoryMapping(1, TorznabCatType.BooksEbook); + AddCategoryMapping(1, TorznabCatType.BooksEBook); } public override async Task ApplyConfiguration(JToken configJson) @@ -136,7 +136,7 @@ namespace Jackett.Common.Indexers PublishDate = lastPublishDate, BannerUrl = banner, Description = description, - Category = new List { TorznabCatType.BooksEbook.ID }, + Category = new List { TorznabCatType.BooksEBook.ID }, Size = 5242880, // 5 MB Seeders = 1, Peers = 2, diff --git a/src/Jackett.Common/Indexers/ExoticaZ.cs b/src/Jackett.Common/Indexers/ExoticaZ.cs index 516d8d3b2..284addfea 100644 --- a/src/Jackett.Common/Indexers/ExoticaZ.cs +++ b/src/Jackett.Common/Indexers/ExoticaZ.cs @@ -37,12 +37,12 @@ namespace Jackett.Common.Indexers p: ps) { AddCategoryMapping(1, TorznabCatType.XXXx264); - AddCategoryMapping(2, TorznabCatType.XXXPacks); - AddCategoryMapping(3, TorznabCatType.XXXPacks); - AddCategoryMapping(4, TorznabCatType.XXXPacks); + AddCategoryMapping(2, TorznabCatType.XXXPack); + AddCategoryMapping(3, TorznabCatType.XXXPack); + AddCategoryMapping(4, TorznabCatType.XXXPack); AddCategoryMapping(5, TorznabCatType.XXXDVD); AddCategoryMapping(6, TorznabCatType.XXXOther); - AddCategoryMapping(7, TorznabCatType.XXXImageset); + AddCategoryMapping(7, TorznabCatType.XXXImageSet); } protected override List> GetSearchQueryParameters(TorznabQuery query) diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs index 2907c3e91..04b235d1e 100644 --- a/src/Jackett.Common/Indexers/FileList.cs +++ b/src/Jackett.Common/Indexers/FileList.cs @@ -84,7 +84,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(19, TorznabCatType.MoviesForeign, "Filme HD-RO"); AddCategoryMapping(20, TorznabCatType.MoviesBluRay, "Filme Blu-Ray"); AddCategoryMapping(21, TorznabCatType.TVHD, "Seriale HD"); - AddCategoryMapping(22, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(22, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(23, TorznabCatType.TVSD, "Seriale SD"); AddCategoryMapping(24, TorznabCatType.TVAnime, "Anime"); AddCategoryMapping(25, TorznabCatType.Movies3D, "Filme 3D"); diff --git a/src/Jackett.Common/Indexers/FunFile.cs b/src/Jackett.Common/Indexers/FunFile.cs index f5b8f8343..a17a5c74f 100644 --- a/src/Jackett.Common/Indexers/FunFile.cs +++ b/src/Jackett.Common/Indexers/FunFile.cs @@ -65,7 +65,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(40, TorznabCatType.OtherMisc); // Miscellaneous AddCategoryMapping(19, TorznabCatType.Movies); // Movies AddCategoryMapping(6, TorznabCatType.Audio); // Music - AddCategoryMapping(31, TorznabCatType.PCPhoneOther); // Portable + AddCategoryMapping(31, TorznabCatType.PCMobileOther); // Portable AddCategoryMapping(49, TorznabCatType.Other); // Tutorials AddCategoryMapping(7, TorznabCatType.TV); // TV } diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs index 26842b987..db946818d 100644 --- a/src/Jackett.Common/Indexers/Fuzer.cs +++ b/src/Jackett.Common/Indexers/Fuzer.cs @@ -85,7 +85,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(10, TorznabCatType.TVHD, "סדרות HD"); AddCategoryMapping(62, TorznabCatType.TVSD, "סדרות ישראליות"); AddCategoryMapping(63, TorznabCatType.TVHD, "סדרות ישראליות HD"); - AddCategoryMapping(84, TorznabCatType.TVOTHER, "סדרות מדובבות"); + AddCategoryMapping(84, TorznabCatType.TVOther, "סדרות מדובבות"); // מוזיקה AddCategoryMapping(14, TorznabCatType.Audio, "מוזיקה עולמית"); @@ -96,14 +96,14 @@ namespace Jackett.Common.Indexers // משחקים AddCategoryMapping(11, TorznabCatType.PCGames, "משחקים PC"); AddCategoryMapping(12, TorznabCatType.ConsoleOther, "משחקים PS"); - AddCategoryMapping(55, TorznabCatType.ConsoleXbox, "משחקים XBOX"); + AddCategoryMapping(55, TorznabCatType.ConsoleXBox, "משחקים XBOX"); AddCategoryMapping(56, TorznabCatType.ConsoleWii, "משחקים WII"); - AddCategoryMapping(57, TorznabCatType.PCPhoneOther, "משחקי קונסולות ניידות"); + AddCategoryMapping(57, TorznabCatType.PCMobileOther, "משחקי קונסולות ניידות"); // תוכנה - AddCategoryMapping(13, TorznabCatType.PCPhoneAndroid, "אפליקציות לאנדרואיד"); + AddCategoryMapping(13, TorznabCatType.PCMobileAndroid, "אפליקציות לאנדרואיד"); AddCategoryMapping(15, TorznabCatType.PC0day, "תוכנות PC"); - AddCategoryMapping(70, TorznabCatType.PCPhoneIOS, "אפליקציות לאייפון"); + AddCategoryMapping(70, TorznabCatType.PCMobileiOS, "אפליקציות לאייפון"); AddCategoryMapping(71, TorznabCatType.PCMac, "תוכנות MAC"); // שונות diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs index 9d4d755f5..e062fe6a1 100644 --- a/src/Jackett.Common/Indexers/GazelleGames.cs +++ b/src/Jackett.Common/Indexers/GazelleGames.cs @@ -50,17 +50,17 @@ namespace Jackett.Common.Indexers // Apple AddCategoryMapping("Mac", TorznabCatType.ConsoleOther, "Mac"); - AddCategoryMapping("iOS", TorznabCatType.PCPhoneIOS, "iOS"); + AddCategoryMapping("iOS", TorznabCatType.PCMobileiOS, "iOS"); AddCategoryMapping("Apple Bandai Pippin", TorznabCatType.ConsoleOther, "Apple Bandai Pippin"); // Google - AddCategoryMapping("Android", TorznabCatType.PCPhoneAndroid, "Android"); + AddCategoryMapping("Android", TorznabCatType.PCMobileAndroid, "Android"); // Microsoft AddCategoryMapping("DOS", TorznabCatType.PCGames, "DOS"); AddCategoryMapping("Windows", TorznabCatType.PCGames, "Windows"); - AddCategoryMapping("Xbox", TorznabCatType.ConsoleXbox, "Xbox"); - AddCategoryMapping("Xbox 360", TorznabCatType.ConsoleXbox360, "Xbox 360"); + AddCategoryMapping("Xbox", TorznabCatType.ConsoleXBox, "Xbox"); + AddCategoryMapping("Xbox 360", TorznabCatType.ConsoleXBox360, "Xbox 360"); // Nintendo AddCategoryMapping("Game Boy", TorznabCatType.ConsoleOther, "Game Boy"); @@ -176,7 +176,7 @@ namespace Jackett.Common.Indexers // special categories (real categories/not platforms) AddCategoryMapping("OST", TorznabCatType.AudioOther, "OST"); AddCategoryMapping("Applications", TorznabCatType.PC0day, "Applications"); - AddCategoryMapping("E-Books", TorznabCatType.BooksEbook, "E-Books"); + AddCategoryMapping("E-Books", TorznabCatType.BooksEBook, "E-Books"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/GimmePeers.cs b/src/Jackett.Common/Indexers/GimmePeers.cs index 1c620f2ec..011eebcf6 100644 --- a/src/Jackett.Common/Indexers/GimmePeers.cs +++ b/src/Jackett.Common/Indexers/GimmePeers.cs @@ -65,17 +65,17 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1, TorznabCatType.TVAnime, "Anime"); AddCategoryMapping(3, TorznabCatType.BooksOther, "Tutorials"); - AddCategoryMapping(5, TorznabCatType.BooksEbook, "Ebooks"); + AddCategoryMapping(5, TorznabCatType.BooksEBook, "Ebooks"); AddCategoryMapping(29, TorznabCatType.AudioAudiobook, "Abooks"); AddCategoryMapping(9, TorznabCatType.ConsoleNDS, "Game-NIN"); AddCategoryMapping(10, TorznabCatType.PCGames, "Game-WIN"); AddCategoryMapping(11, TorznabCatType.ConsolePS3, "Game-PS"); - AddCategoryMapping(12, TorznabCatType.ConsoleXbox, "Game-XBOX"); + AddCategoryMapping(12, TorznabCatType.ConsoleXBox, "Game-XBOX"); AddCategoryMapping(7, TorznabCatType.Audio, "Music"); AddCategoryMapping(2, TorznabCatType.PCMac, "App-MAC"); AddCategoryMapping(4, TorznabCatType.PC0day, "App-WIN"); AddCategoryMapping(27, TorznabCatType.PC, "App-LINUX"); - AddCategoryMapping(6, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(6, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(8, TorznabCatType.Other, "Other"); AddCategoryMapping(20, TorznabCatType.TVHD, "TV-HD"); diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs index 7bdc60138..c42badf28 100644 --- a/src/Jackett.Common/Indexers/Hebits.cs +++ b/src/Jackett.Common/Indexers/Hebits.cs @@ -82,7 +82,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(28, TorznabCatType.AudioLossless, "מוזיקה - Flac (Music Flac)"); AddCategoryMapping(35, TorznabCatType.AudioVideo, "הופעות (Music Concerts)"); AddCategoryMapping(30, TorznabCatType.Audio, "פסי קול (Music OST)"); - AddCategoryMapping(32, TorznabCatType.PCPhoneOther, "סלולאר (Mobile)"); + AddCategoryMapping(32, TorznabCatType.PCMobileOther, "סלולאר (Mobile)"); AddCategoryMapping(26, TorznabCatType.Books, "ספרים (Books)"); AddCategoryMapping(22, TorznabCatType.PC, "תוכנות (Apps)"); AddCategoryMapping(29, TorznabCatType.Other, "שונות (Other)"); diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs index 46076a7e9..8fcc69e28 100644 --- a/src/Jackett.Common/Indexers/IPTorrents.cs +++ b/src/Jackett.Common/Indexers/IPTorrents.cs @@ -108,9 +108,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(24, TorznabCatType.TVSD, "TV/DVD-R"); AddCategoryMapping(25, TorznabCatType.TVSD, "TV/DVD-Rip"); AddCategoryMapping(66, TorznabCatType.TVSD, "TV/Mobile"); - AddCategoryMapping(82, TorznabCatType.TVFOREIGN, "TV/Non-English"); + AddCategoryMapping(82, TorznabCatType.TVForeign, "TV/Non-English"); AddCategoryMapping(65, TorznabCatType.TV, "TV/Packs"); - AddCategoryMapping(83, TorznabCatType.TVFOREIGN, "TV/Packs/Non-English"); + AddCategoryMapping(83, TorznabCatType.TVForeign, "TV/Packs/Non-English"); AddCategoryMapping(79, TorznabCatType.TVSD, "TV/SD/x264"); AddCategoryMapping(22, TorznabCatType.TVWEBDL, "TV/Web-DL"); AddCategoryMapping(5, TorznabCatType.TVHD, "TV/x264"); @@ -126,7 +126,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(71, TorznabCatType.ConsolePS3, "Games/PS3"); AddCategoryMapping(40, TorznabCatType.ConsolePSP, "Games/PSP"); AddCategoryMapping(50, TorznabCatType.ConsoleWii, "Games/Wii"); - AddCategoryMapping(44, TorznabCatType.ConsoleXbox360, "Games/Xbox-360"); + AddCategoryMapping(44, TorznabCatType.ConsoleXBox360, "Games/Xbox-360"); AddCategoryMapping(75, TorznabCatType.Audio, "Music"); AddCategoryMapping(3, TorznabCatType.AudioMP3, "Music/Audio"); @@ -145,16 +145,16 @@ namespace Jackett.Common.Indexers AddCategoryMapping(95, TorznabCatType.BooksOther, "Educational"); AddCategoryMapping(98, TorznabCatType.Other, "Fonts"); AddCategoryMapping(69, TorznabCatType.PCMac, "Mac"); - AddCategoryMapping(92, TorznabCatType.BooksMagazines, "Magazines / Newspapers"); - AddCategoryMapping(58, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(92, TorznabCatType.BooksMags, "Magazines / Newspapers"); + AddCategoryMapping(58, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(36, TorznabCatType.Other, "Pics/Wallpapers"); AddCategoryMapping(88, TorznabCatType.XXX, "XXX"); AddCategoryMapping(85, TorznabCatType.XXXOther, "XXX/Magazines"); AddCategoryMapping(8, TorznabCatType.XXX, "XXX/Movie"); AddCategoryMapping(81, TorznabCatType.XXX, "XXX/Movie/0Day"); - AddCategoryMapping(91, TorznabCatType.XXXPacks, "XXX/Packs"); - AddCategoryMapping(84, TorznabCatType.XXXImageset, "XXX/Pics/Wallpapers"); + AddCategoryMapping(91, TorznabCatType.XXXPack, "XXX/Packs"); + AddCategoryMapping(84, TorznabCatType.XXXImageSet, "XXX/Pics/Wallpapers"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/IceTorrent.cs b/src/Jackett.Common/Indexers/IceTorrent.cs index 82a2c2a44..36489ce9d 100644 --- a/src/Jackett.Common/Indexers/IceTorrent.cs +++ b/src/Jackett.Common/Indexers/IceTorrent.cs @@ -69,10 +69,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1, TorznabCatType.PC0day, "Applications"); AddCategoryMapping(14, TorznabCatType.PC, "Applications: Linux"); AddCategoryMapping(37, TorznabCatType.PCMac, "Applications: Mac"); - AddCategoryMapping(19, TorznabCatType.PCPhoneOther, "Applications: Mobile"); + AddCategoryMapping(19, TorznabCatType.PCMobileOther, "Applications: Mobile"); AddCategoryMapping(62, TorznabCatType.TV, "TV Cartoons"); AddCategoryMapping(3, TorznabCatType.TVAnime, "TV Anime / Hentai"); - AddCategoryMapping(6, TorznabCatType.BooksEbook, "E-books"); + AddCategoryMapping(6, TorznabCatType.BooksEBook, "E-books"); AddCategoryMapping(5, TorznabCatType.Audio, "Music"); AddCategoryMapping(64, TorznabCatType.AudioVideo, "Music Video"); AddCategoryMapping(18, TorznabCatType.Other, "Images"); diff --git a/src/Jackett.Common/Indexers/ImmortalSeed.cs b/src/Jackett.Common/Indexers/ImmortalSeed.cs index fa8cf1d5a..a62565489 100644 --- a/src/Jackett.Common/Indexers/ImmortalSeed.cs +++ b/src/Jackett.Common/Indexers/ImmortalSeed.cs @@ -75,10 +75,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(54, TorznabCatType.TVDocumentary, "Documentary - HD"); AddCategoryMapping(41, TorznabCatType.BooksComics, "Comics"); AddCategoryMapping(25, TorznabCatType.PCGames, "Games"); - AddCategoryMapping(29, TorznabCatType.ConsoleXbox, "Games Xbox"); + AddCategoryMapping(29, TorznabCatType.ConsoleXBox, "Games Xbox"); AddCategoryMapping(27, TorznabCatType.PCGames, "Games-PC Rips"); AddCategoryMapping(28, TorznabCatType.ConsolePS4, "Games-PSx"); - AddCategoryMapping(49, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(49, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(59, TorznabCatType.MoviesUHD, "Movies-4k"); AddCategoryMapping(60, TorznabCatType.MoviesForeign, "Non-English 4k Movies"); AddCategoryMapping(16, TorznabCatType.MoviesHD, "Movies HD"); @@ -102,11 +102,11 @@ namespace Jackett.Common.Indexers AddCategoryMapping(9, TorznabCatType.TVSD, "TV - Standard Definition - XviD"); AddCategoryMapping(4, TorznabCatType.TVHD, "TV Season Packs - HD"); AddCategoryMapping(6, TorznabCatType.TVSD, "TV Season Packs - SD"); - AddCategoryMapping(22, TorznabCatType.BooksEbook, "Ebooks"); + AddCategoryMapping(22, TorznabCatType.BooksEBook, "Ebooks"); AddCategoryMapping(26, TorznabCatType.PCGames, "Games-PC ISO"); - AddCategoryMapping(46, TorznabCatType.BooksMagazines, "Magazines"); - AddCategoryMapping(50, TorznabCatType.PCPhoneIOS, "IOS"); - AddCategoryMapping(51, TorznabCatType.PCPhoneAndroid, "Android"); + AddCategoryMapping(46, TorznabCatType.BooksMags, "Magazines"); + AddCategoryMapping(50, TorznabCatType.PCMobileiOS, "IOS"); + AddCategoryMapping(51, TorznabCatType.PCMobileAndroid, "Android"); AddCategoryMapping(52, TorznabCatType.PC0day, "Windows"); AddCategoryMapping(53, TorznabCatType.TVDocumentary, "Documentary - SD"); } diff --git a/src/Jackett.Common/Indexers/MyAnonamouse.cs b/src/Jackett.Common/Indexers/MyAnonamouse.cs index 4582cf389..976cf45d0 100644 --- a/src/Jackett.Common/Indexers/MyAnonamouse.cs +++ b/src/Jackett.Common/Indexers/MyAnonamouse.cs @@ -48,7 +48,7 @@ namespace Jackett.Common.Indexers webclient.EmulateBrowser = false; AddCategoryMapping("13", TorznabCatType.AudioAudiobook, "AudioBooks"); - AddCategoryMapping("14", TorznabCatType.BooksEbook, "E-Books"); + AddCategoryMapping("14", TorznabCatType.BooksEBook, "E-Books"); AddCategoryMapping("15", TorznabCatType.AudioAudiobook, "Musicology"); AddCategoryMapping("16", TorznabCatType.AudioAudiobook, "Radio"); AddCategoryMapping("39", TorznabCatType.AudioAudiobook, "Audiobooks - Action/Adventure"); @@ -86,45 +86,45 @@ namespace Jackett.Common.Indexers AddCategoryMapping("108", TorznabCatType.AudioAudiobook, "Audiobooks - Urban Fantasy"); AddCategoryMapping("48", TorznabCatType.AudioAudiobook, "Audiobooks - Western"); AddCategoryMapping("111", TorznabCatType.AudioAudiobook, "Audiobooks - Young Adult"); - AddCategoryMapping("60", TorznabCatType.BooksEbook, "Ebooks - Action/Adventure"); - AddCategoryMapping("71", TorznabCatType.BooksEbook, "Ebooks - Art"); - AddCategoryMapping("72", TorznabCatType.BooksEbook, "Ebooks - Biographical"); - AddCategoryMapping("90", TorznabCatType.BooksEbook, "Ebooks - Business"); + AddCategoryMapping("60", TorznabCatType.BooksEBook, "Ebooks - Action/Adventure"); + AddCategoryMapping("71", TorznabCatType.BooksEBook, "Ebooks - Art"); + AddCategoryMapping("72", TorznabCatType.BooksEBook, "Ebooks - Biographical"); + AddCategoryMapping("90", TorznabCatType.BooksEBook, "Ebooks - Business"); AddCategoryMapping("61", TorznabCatType.BooksComics, "Ebooks - Comics/Graphic novels"); - AddCategoryMapping("73", TorznabCatType.BooksEbook, "Ebooks - Computer/Internet"); - AddCategoryMapping("101", TorznabCatType.BooksEbook, "Ebooks - Crafts"); - AddCategoryMapping("62", TorznabCatType.BooksEbook, "Ebooks - Crime/Thriller"); - AddCategoryMapping("63", TorznabCatType.BooksEbook, "Ebooks - Fantasy"); - AddCategoryMapping("107", TorznabCatType.BooksEbook, "Ebooks - Food"); - AddCategoryMapping("64", TorznabCatType.BooksEbook, "Ebooks - General Fiction"); - AddCategoryMapping("74", TorznabCatType.BooksEbook, "Ebooks - General Non-Fiction"); - AddCategoryMapping("102", TorznabCatType.BooksEbook, "Ebooks - Historical Fiction"); - AddCategoryMapping("76", TorznabCatType.BooksEbook, "Ebooks - History"); - AddCategoryMapping("77", TorznabCatType.BooksEbook, "Ebooks - Home/Garden"); - AddCategoryMapping("65", TorznabCatType.BooksEbook, "Ebooks - Horror"); - AddCategoryMapping("103", TorznabCatType.BooksEbook, "Ebooks - Humor"); - AddCategoryMapping("115", TorznabCatType.BooksEbook, "Ebooks - Illusion/Magic"); - AddCategoryMapping("91", TorznabCatType.BooksEbook, "Ebooks - Instructional"); - AddCategoryMapping("66", TorznabCatType.BooksEbook, "Ebooks - Juvenile"); - AddCategoryMapping("78", TorznabCatType.BooksEbook, "Ebooks - Language"); - AddCategoryMapping("67", TorznabCatType.BooksEbook, "Ebooks - Literary Classics"); - AddCategoryMapping("79", TorznabCatType.BooksMagazines, "Ebooks - Magazines/Newspapers"); + AddCategoryMapping("73", TorznabCatType.BooksEBook, "Ebooks - Computer/Internet"); + AddCategoryMapping("101", TorznabCatType.BooksEBook, "Ebooks - Crafts"); + AddCategoryMapping("62", TorznabCatType.BooksEBook, "Ebooks - Crime/Thriller"); + AddCategoryMapping("63", TorznabCatType.BooksEBook, "Ebooks - Fantasy"); + AddCategoryMapping("107", TorznabCatType.BooksEBook, "Ebooks - Food"); + AddCategoryMapping("64", TorznabCatType.BooksEBook, "Ebooks - General Fiction"); + AddCategoryMapping("74", TorznabCatType.BooksEBook, "Ebooks - General Non-Fiction"); + AddCategoryMapping("102", TorznabCatType.BooksEBook, "Ebooks - Historical Fiction"); + AddCategoryMapping("76", TorznabCatType.BooksEBook, "Ebooks - History"); + AddCategoryMapping("77", TorznabCatType.BooksEBook, "Ebooks - Home/Garden"); + AddCategoryMapping("65", TorznabCatType.BooksEBook, "Ebooks - Horror"); + AddCategoryMapping("103", TorznabCatType.BooksEBook, "Ebooks - Humor"); + AddCategoryMapping("115", TorznabCatType.BooksEBook, "Ebooks - Illusion/Magic"); + AddCategoryMapping("91", TorznabCatType.BooksEBook, "Ebooks - Instructional"); + AddCategoryMapping("66", TorznabCatType.BooksEBook, "Ebooks - Juvenile"); + AddCategoryMapping("78", TorznabCatType.BooksEBook, "Ebooks - Language"); + AddCategoryMapping("67", TorznabCatType.BooksEBook, "Ebooks - Literary Classics"); + AddCategoryMapping("79", TorznabCatType.BooksMags, "Ebooks - Magazines/Newspapers"); AddCategoryMapping("80", TorznabCatType.BooksTechnical, "Ebooks - Math/Science/Tech"); - AddCategoryMapping("92", TorznabCatType.BooksEbook, "Ebooks - Medical"); - AddCategoryMapping("118", TorznabCatType.BooksEbook, "Ebooks - Mixed Collections"); - AddCategoryMapping("94", TorznabCatType.BooksEbook, "Ebooks - Mystery"); - AddCategoryMapping("120", TorznabCatType.BooksEbook, "Ebooks - Nature"); - AddCategoryMapping("95", TorznabCatType.BooksEbook, "Ebooks - Philosophy"); - AddCategoryMapping("81", TorznabCatType.BooksEbook, "Ebooks - Pol/Soc/Relig"); - AddCategoryMapping("82", TorznabCatType.BooksEbook, "Ebooks - Recreation"); - AddCategoryMapping("68", TorznabCatType.BooksEbook, "Ebooks - Romance"); - AddCategoryMapping("69", TorznabCatType.BooksEbook, "Ebooks - Science Fiction"); - AddCategoryMapping("75", TorznabCatType.BooksEbook, "Ebooks - Self-Help"); - AddCategoryMapping("96", TorznabCatType.BooksEbook, "Ebooks - Travel/Adventure"); - AddCategoryMapping("104", TorznabCatType.BooksEbook, "Ebooks - True Crime"); - AddCategoryMapping("109", TorznabCatType.BooksEbook, "Ebooks - Urban Fantasy"); - AddCategoryMapping("70", TorznabCatType.BooksEbook, "Ebooks - Western"); - AddCategoryMapping("112", TorznabCatType.BooksEbook, "Ebooks - Young Adult"); + AddCategoryMapping("92", TorznabCatType.BooksEBook, "Ebooks - Medical"); + AddCategoryMapping("118", TorznabCatType.BooksEBook, "Ebooks - Mixed Collections"); + AddCategoryMapping("94", TorznabCatType.BooksEBook, "Ebooks - Mystery"); + AddCategoryMapping("120", TorznabCatType.BooksEBook, "Ebooks - Nature"); + AddCategoryMapping("95", TorznabCatType.BooksEBook, "Ebooks - Philosophy"); + AddCategoryMapping("81", TorznabCatType.BooksEBook, "Ebooks - Pol/Soc/Relig"); + AddCategoryMapping("82", TorznabCatType.BooksEBook, "Ebooks - Recreation"); + AddCategoryMapping("68", TorznabCatType.BooksEBook, "Ebooks - Romance"); + AddCategoryMapping("69", TorznabCatType.BooksEBook, "Ebooks - Science Fiction"); + AddCategoryMapping("75", TorznabCatType.BooksEBook, "Ebooks - Self-Help"); + AddCategoryMapping("96", TorznabCatType.BooksEBook, "Ebooks - Travel/Adventure"); + AddCategoryMapping("104", TorznabCatType.BooksEBook, "Ebooks - True Crime"); + AddCategoryMapping("109", TorznabCatType.BooksEBook, "Ebooks - Urban Fantasy"); + AddCategoryMapping("70", TorznabCatType.BooksEBook, "Ebooks - Western"); + AddCategoryMapping("112", TorznabCatType.BooksEBook, "Ebooks - Young Adult"); AddCategoryMapping("19", TorznabCatType.AudioAudiobook, "Guitar/Bass Tabs"); AddCategoryMapping("20", TorznabCatType.AudioAudiobook, "Individual Sheet"); AddCategoryMapping("24", TorznabCatType.AudioAudiobook, "Individual Sheet MP3"); diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs index 9628f0d0d..57e521a3d 100644 --- a/src/Jackett.Common/Indexers/NCore.cs +++ b/src/Jackett.Common/Indexers/NCore.cs @@ -96,14 +96,14 @@ namespace Jackett.Common.Indexers AddCategoryMapping("clip", TorznabCatType.AudioVideo, "Zene Klip"); AddCategoryMapping("xxx_xvid", TorznabCatType.XXXXviD, "XXX SD"); AddCategoryMapping("xxx_dvd", TorznabCatType.XXXDVD, "XXX DVDR"); - AddCategoryMapping("xxx_imageset", TorznabCatType.XXXImageset, "XXX Imageset"); + AddCategoryMapping("xxx_imageset", TorznabCatType.XXXImageSet, "XXX Imageset"); AddCategoryMapping("xxx_hd", TorznabCatType.XXX, "XXX HD"); AddCategoryMapping("game_iso", TorznabCatType.PCGames, "Játék PC/ISO"); AddCategoryMapping("game_rip", TorznabCatType.PCGames, "Játék PC/RIP"); AddCategoryMapping("console", TorznabCatType.Console, "Játék Konzol"); AddCategoryMapping("iso", TorznabCatType.PCISO, "Program Prog/ISO"); AddCategoryMapping("misc", TorznabCatType.PC0day, "Program Prog/RIP"); - AddCategoryMapping("mobil", TorznabCatType.PCPhoneOther, "Program Prog/Mobil"); + AddCategoryMapping("mobil", TorznabCatType.PCMobileOther, "Program Prog/Mobil"); AddCategoryMapping("ebook_hun", TorznabCatType.Books, "Könyv eBook/HU"); AddCategoryMapping("ebook", TorznabCatType.Books, "Könyv eBook/EN"); } diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs index 9af92fd78..419079482 100644 --- a/src/Jackett.Common/Indexers/NewRealWorld.cs +++ b/src/Jackett.Common/Indexers/NewRealWorld.cs @@ -66,7 +66,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(39, TorznabCatType.TVAnime); // Anime: HD|1080p AddCategoryMapping(38, TorznabCatType.TVAnime); // Anime: HD|720p AddCategoryMapping(1, TorznabCatType.TVAnime); // Anime: SD - AddCategoryMapping(7, TorznabCatType.PCPhoneOther); // Appz: Handy-PDA + AddCategoryMapping(7, TorznabCatType.PCMobileOther); // Appz: Handy-PDA AddCategoryMapping(36, TorznabCatType.PCMac); // Appz: Mac AddCategoryMapping(18, TorznabCatType.PC); // Appz: Sonstiges AddCategoryMapping(17, TorznabCatType.PC); // Appz: Win @@ -80,10 +80,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2, TorznabCatType.TVDocumentary); // Dokus: SD AddCategoryMapping(3, TorznabCatType.Books); // Ebooks: Bücher AddCategoryMapping(52, TorznabCatType.BooksComics); // Ebooks: Comics - AddCategoryMapping(53, TorznabCatType.BooksMagazines); // Ebooks: Magazine + AddCategoryMapping(53, TorznabCatType.BooksMags); // Ebooks: Magazine AddCategoryMapping(55, TorznabCatType.BooksOther); // Ebooks: XXX AddCategoryMapping(54, TorznabCatType.BooksOther); // Ebooks: Zeitungen - AddCategoryMapping(47, TorznabCatType.PCPhoneOther); // Games: Andere + AddCategoryMapping(47, TorznabCatType.PCMobileOther); // Games: Andere AddCategoryMapping(32, TorznabCatType.PCMac); // Games: Mac AddCategoryMapping(41, TorznabCatType.ConsoleNDS); // Games: NDS/3DS AddCategoryMapping(4, TorznabCatType.PCGames); // Games: PC @@ -91,7 +91,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(9, TorznabCatType.ConsolePS3); // Games: PS3 AddCategoryMapping(6, TorznabCatType.ConsolePSP); // Games: PSP AddCategoryMapping(28, TorznabCatType.ConsoleWii); // Games: Wii - AddCategoryMapping(31, TorznabCatType.ConsoleXbox); // Games: XboX + AddCategoryMapping(31, TorznabCatType.ConsoleXBox); // Games: XboX AddCategoryMapping(51, TorznabCatType.Movies3D); // Movies: 3D AddCategoryMapping(37, TorznabCatType.MoviesBluRay); // Movies: BluRay AddCategoryMapping(25, TorznabCatType.MoviesHD); // Movies: HD|1080p @@ -105,15 +105,15 @@ namespace Jackett.Common.Indexers AddCategoryMapping(56, TorznabCatType.TVHD); // Serien: Packs|HD AddCategoryMapping(44, TorznabCatType.TVSD); // Serien: Packs|SD AddCategoryMapping(16, TorznabCatType.TVSD); // Serien: SD - AddCategoryMapping(10, TorznabCatType.TVOTHER); // Serien: TV/Shows - AddCategoryMapping(21, TorznabCatType.TVFOREIGN); // Serien: US TV + AddCategoryMapping(10, TorznabCatType.TVOther); // Serien: TV/Shows + AddCategoryMapping(21, TorznabCatType.TVForeign); // Serien: US TV AddCategoryMapping(24, TorznabCatType.TVSport); // Sport: Diverses AddCategoryMapping(23, TorznabCatType.TVSport); // Sport: Wrestling AddCategoryMapping(57, TorznabCatType.Movies); // Tracker - Crew: pmHD AddCategoryMapping(58, TorznabCatType.MoviesHD); // Ultra-HD: 4K AddCategoryMapping(46, TorznabCatType.XXXOther); // XXX: Diverses AddCategoryMapping(50, TorznabCatType.XXX); // XXX: HD - AddCategoryMapping(45, TorznabCatType.XXXPacks); // XXX: Packs + AddCategoryMapping(45, TorznabCatType.XXXPack); // XXX: Packs AddCategoryMapping(27, TorznabCatType.XXX); // XXX: SD } diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs index c52e258eb..f7aec0976 100644 --- a/src/Jackett.Common/Indexers/Partis.cs +++ b/src/Jackett.Common/Indexers/Partis.cs @@ -105,7 +105,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(8, TorznabCatType.AudioVideo, "Music DVD"); AddCategoryMapping(8, TorznabCatType.AudioVideo, "Videospoti"); AddCategoryMapping(21, TorznabCatType.AudioAudiobook, "AudioBook"); - AddCategoryMapping(3, TorznabCatType.BooksEbook, "eKnjige"); + AddCategoryMapping(3, TorznabCatType.BooksEBook, "eKnjige"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/PornoLab.cs b/src/Jackett.Common/Indexers/PornoLab.cs index 7b4f00bfd..0216e9e86 100644 --- a/src/Jackett.Common/Indexers/PornoLab.cs +++ b/src/Jackett.Common/Indexers/PornoLab.cs @@ -53,7 +53,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(60, TorznabCatType.XXX, "Документальные фильмы / Documentary & Reality"); AddCategoryMapping(1644, TorznabCatType.XXX, "Нудизм-Натуризм / Nudity"); - AddCategoryMapping(1111, TorznabCatType.XXXPacks, "Паки полных фильмов / Full Length Movies Packs"); + AddCategoryMapping(1111, TorznabCatType.XXXPack, "Паки полных фильмов / Full Length Movies Packs"); AddCategoryMapping(508, TorznabCatType.XXX, "Классические фильмы / Classic"); AddCategoryMapping(555, TorznabCatType.XXX, "Фильмы с сюжетом / Feature & Vignettes"); AddCategoryMapping(1673, TorznabCatType.XXX, "Гонзо-фильмы / Gonzo"); @@ -70,7 +70,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1450, TorznabCatType.XXX, "Гонзо, Лесбо и Фильмы без сюжета (HD Video) / Gonzo, All Girl & Solo, All Sex (HD Video)"); AddCategoryMapping(902, TorznabCatType.XXX, "Русские порнофильмы / Russian Full Length Movies"); - AddCategoryMapping(1675, TorznabCatType.XXXPacks, "Паки русских порнороликов / Russian Clips Packs"); + AddCategoryMapping(1675, TorznabCatType.XXXPack, "Паки русских порнороликов / Russian Clips Packs"); AddCategoryMapping(36, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 1991-2015 / Russian SiteRip's 1991-2015"); AddCategoryMapping(1830, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 1991-2015 (HD Video) / Russian SiteRip's 1991-2015 (HD Video)"); AddCategoryMapping(1803, TorznabCatType.XXX, "Сайтрипы с русскими актрисами 2016-2019 / Russian SiteRip's 2016-2019"); @@ -78,9 +78,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1741, TorznabCatType.XXX, "Русские Порноролики Разное / Russian Clips (various)"); AddCategoryMapping(1676, TorznabCatType.XXX, "Русское любительское видео / Russian Amateur Video"); - AddCategoryMapping(1780, TorznabCatType.XXXPacks, "Паки сайтрипов (HD Video) / SiteRip's Packs (HD Video)"); - AddCategoryMapping(1110, TorznabCatType.XXXPacks, "Паки сайтрипов / SiteRip's Packs"); - AddCategoryMapping(1678, TorznabCatType.XXXPacks, "Паки порнороликов по актрисам / Actresses Clips Packs"); + AddCategoryMapping(1780, TorznabCatType.XXXPack, "Паки сайтрипов (HD Video) / SiteRip's Packs (HD Video)"); + AddCategoryMapping(1110, TorznabCatType.XXXPack, "Паки сайтрипов / SiteRip's Packs"); + AddCategoryMapping(1678, TorznabCatType.XXXPack, "Паки порнороликов по актрисам / Actresses Clips Packs"); AddCategoryMapping(1124, TorznabCatType.XXX, "Сайтрипы 1991-2010 (HD Video) / SiteRip's 1991-2010 (HD Video)"); AddCategoryMapping(1784, TorznabCatType.XXX, "Сайтрипы 2011-2012 (HD Video) / SiteRip's 2011-2012 (HD Video)"); AddCategoryMapping(1769, TorznabCatType.XXX, "Сайтрипы 2013 (HD Video) / SiteRip's 2013 (HD Video)"); @@ -103,21 +103,21 @@ namespace Jackett.Common.Indexers AddCategoryMapping(284, TorznabCatType.XXX, "Порноролики Разное / Clips (various)"); AddCategoryMapping(1823, TorznabCatType.XXX, "Порноролики в 3D и Virtual Reality (VR) / 3D & Virtual Reality Videos"); - AddCategoryMapping(1801, TorznabCatType.XXXPacks, "Паки японских фильмов и сайтрипов / Full Length Japanese Movies Packs & SiteRip's Packs"); + AddCategoryMapping(1801, TorznabCatType.XXXPack, "Паки японских фильмов и сайтрипов / Full Length Japanese Movies Packs & SiteRip's Packs"); AddCategoryMapping(1719, TorznabCatType.XXX, "Японские фильмы и сайтрипы (DVD и HD Video) / Japanese Movies & SiteRip's (DVD & HD Video)"); AddCategoryMapping(997, TorznabCatType.XXX, "Японские фильмы и сайтрипы 1991-2014 / Japanese Movies & SiteRip's 1991-2014"); AddCategoryMapping(1818, TorznabCatType.XXX, "Японские фильмы и сайтрипы 2015-2019 / Japanese Movies & SiteRip's 2015-2019"); AddCategoryMapping(1671, TorznabCatType.XXX, "Эротические студии (видео) / Erotic Video Library"); AddCategoryMapping(1726, TorznabCatType.XXX, "Met-Art & MetModels"); - AddCategoryMapping(883, TorznabCatType.XXXImageset, "Эротические студии Разное / Erotic Picture Gallery (various)"); - AddCategoryMapping(1759, TorznabCatType.XXXImageset, "Паки сайтрипов эротических студий / Erotic Picture SiteRip's Packs"); - AddCategoryMapping(1728, TorznabCatType.XXXImageset, "Любительское фото / Amateur Picture Gallery"); - AddCategoryMapping(1729, TorznabCatType.XXXPacks, "Подборки по актрисам / Actresses Picture Packs"); - AddCategoryMapping(38, TorznabCatType.XXXImageset, "Подборки сайтрипов / SiteRip's Picture Packs"); - AddCategoryMapping(1757, TorznabCatType.XXXImageset, "Подборки сетов / Picture Sets Packs"); - AddCategoryMapping(1735, TorznabCatType.XXXImageset, "Тематическое и нетрадиционное фото / Misc & Special Interest Picture Packs"); - AddCategoryMapping(1731, TorznabCatType.XXXImageset, "Журналы / Magazines"); + AddCategoryMapping(883, TorznabCatType.XXXImageSet, "Эротические студии Разное / Erotic Picture Gallery (various)"); + AddCategoryMapping(1759, TorznabCatType.XXXImageSet, "Паки сайтрипов эротических студий / Erotic Picture SiteRip's Packs"); + AddCategoryMapping(1728, TorznabCatType.XXXImageSet, "Любительское фото / Amateur Picture Gallery"); + AddCategoryMapping(1729, TorznabCatType.XXXPack, "Подборки по актрисам / Actresses Picture Packs"); + AddCategoryMapping(38, TorznabCatType.XXXImageSet, "Подборки сайтрипов / SiteRip's Picture Packs"); + AddCategoryMapping(1757, TorznabCatType.XXXImageSet, "Подборки сетов / Picture Sets Packs"); + AddCategoryMapping(1735, TorznabCatType.XXXImageSet, "Тематическое и нетрадиционное фото / Misc & Special Interest Picture Packs"); + AddCategoryMapping(1731, TorznabCatType.XXXImageSet, "Журналы / Magazines"); AddCategoryMapping(1679, TorznabCatType.XXX, "Хентай: основной подраздел / Hentai: main subsection"); AddCategoryMapping(1740, TorznabCatType.XXX, "Хентай в высоком качестве (DVD и HD) / Hentai DVD & HD"); @@ -153,10 +153,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1767, TorznabCatType.XXX, "Классические гей-фильмы (до 1990 года) / Classic Gay Films (Pre-1990's)"); AddCategoryMapping(1755, TorznabCatType.XXX, "Гей-фильмы в высоком качестве (DVD и HD) / High-Quality Full Length Movies (Gay DVD & HD)"); AddCategoryMapping(1787, TorznabCatType.XXX, "Азиатские гей-фильмы в высоком качестве (DVD и HD) / High-Quality Full Length Asian Movies (Gay DVD & HD)"); - AddCategoryMapping(1763, TorznabCatType.XXXPacks, "ПАКи гей-роликов и сайтрипов / Clip's & SiteRip's Packs (Gay)"); + AddCategoryMapping(1763, TorznabCatType.XXXPack, "ПАКи гей-роликов и сайтрипов / Clip's & SiteRip's Packs (Gay)"); AddCategoryMapping(1777, TorznabCatType.XXX, "Гей-ролики в высоком качестве (HD Video) / Gay Clips (HD Video)"); AddCategoryMapping(1691, TorznabCatType.XXX, "Ролики, SiteRip'ы и сцены из гей-фильмов / Clips & Movie Scenes (Gay)"); - AddCategoryMapping(1692, TorznabCatType.XXXImageset, "Гей-журналы, фото, разное / Magazines, Photo, Rest (Gay)"); + AddCategoryMapping(1692, TorznabCatType.XXXImageSet, "Гей-журналы, фото, разное / Magazines, Photo, Rest (Gay)"); AddCategoryMapping(1817, TorznabCatType.XXX, "Обход блокировки"); AddCategoryMapping(1670, TorznabCatType.XXX, "Эротическое видео / Erotic&Softcore"); diff --git a/src/Jackett.Common/Indexers/PreToMe.cs b/src/Jackett.Common/Indexers/PreToMe.cs index 63ef2d35f..b32a65ee9 100644 --- a/src/Jackett.Common/Indexers/PreToMe.cs +++ b/src/Jackett.Common/Indexers/PreToMe.cs @@ -67,24 +67,24 @@ namespace Jackett.Common.Indexers AddCategoryMappingAndParent("cat[]=22&tags=Linux", TorznabCatType.PC, TorznabCatType.PC); // Ebooks - AddCategoryMappingAndParent("cat[]=27", TorznabCatType.BooksEbook); + AddCategoryMappingAndParent("cat[]=27", TorznabCatType.BooksEBook); // Games AddCategoryMappingAndParent("cat[]=4", TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=PC", TorznabCatType.PCGames, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=RIP", TorznabCatType.PCGames, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=ISO", TorznabCatType.PCGames, TorznabCatType.Console); - AddCategoryMappingAndParent("cat[]=4&tags=XBOX360", TorznabCatType.ConsoleXbox360, TorznabCatType.Console); + AddCategoryMappingAndParent("cat[]=4&tags=XBOX360", TorznabCatType.ConsoleXBox360, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=PS3", TorznabCatType.ConsolePS3, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=Wii", TorznabCatType.ConsoleWii, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=PSP", TorznabCatType.ConsolePSP, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=NSD", TorznabCatType.ConsoleNDS, TorznabCatType.Console); - AddCategoryMappingAndParent("cat[]=4&tags=XBox", TorznabCatType.ConsoleXbox, TorznabCatType.Console); + AddCategoryMappingAndParent("cat[]=4&tags=XBox", TorznabCatType.ConsoleXBox, TorznabCatType.Console); AddCategoryMappingAndParent("cat[]=4&tags=PS2", TorznabCatType.ConsoleOther, TorznabCatType.Console); // Miscellaneous AddCategoryMappingAndParent("cat[]=31", TorznabCatType.Other); - AddCategoryMappingAndParent("cat[]=31&tags=Ebook", TorznabCatType.BooksEbook, TorznabCatType.Other); + AddCategoryMappingAndParent("cat[]=31&tags=Ebook", TorznabCatType.BooksEBook, TorznabCatType.Other); AddCategoryMappingAndParent("cat[]=31&tags=RARFiX", TorznabCatType.Other, TorznabCatType.Other); // Movies diff --git a/src/Jackett.Common/Indexers/RarBG.cs b/src/Jackett.Common/Indexers/RarBG.cs index 516e150df..c37396307 100644 --- a/src/Jackett.Common/Indexers/RarBG.cs +++ b/src/Jackett.Common/Indexers/RarBG.cs @@ -83,9 +83,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(25, TorznabCatType.AudioLossless, "Music/FLAC"); AddCategoryMapping(27, TorznabCatType.PCGames, "Games/PC ISO"); AddCategoryMapping(28, TorznabCatType.PCGames, "Games/PC RIP"); - AddCategoryMapping(32, TorznabCatType.ConsoleXbox360, "Games/XBOX-360"); + AddCategoryMapping(32, TorznabCatType.ConsoleXBox360, "Games/XBOX-360"); AddCategoryMapping(33, TorznabCatType.PCISO, "Software/PC ISO"); - AddCategoryMapping(35, TorznabCatType.BooksEbook, "e-Books"); + AddCategoryMapping(35, TorznabCatType.BooksEBook, "e-Books"); AddCategoryMapping(40, TorznabCatType.ConsolePS3, "Games/PS3"); AddCategoryMapping(41, TorznabCatType.TVHD, "TV HD Episodes"); AddCategoryMapping(42, TorznabCatType.MoviesBluRay, "Movies/Full BD"); diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs index df73120cd..db198c72e 100644 --- a/src/Jackett.Common/Indexers/RevolutionTT.cs +++ b/src/Jackett.Common/Indexers/RevolutionTT.cs @@ -63,12 +63,12 @@ namespace Jackett.Common.Indexers AddCategoryMapping("22", TorznabCatType.PC0day); AddCategoryMapping("1", TorznabCatType.PCISO); AddCategoryMapping("36", TorznabCatType.Books); - AddCategoryMapping("36", TorznabCatType.BooksEbook); + AddCategoryMapping("36", TorznabCatType.BooksEBook); AddCategoryMapping("4", TorznabCatType.PCGames); AddCategoryMapping("21", TorznabCatType.PCGames); AddCategoryMapping("16", TorznabCatType.ConsolePS3); AddCategoryMapping("40", TorznabCatType.ConsoleWii); - AddCategoryMapping("39", TorznabCatType.ConsoleXbox360); + AddCategoryMapping("39", TorznabCatType.ConsoleXBox360); AddCategoryMapping("35", TorznabCatType.ConsoleNDS); AddCategoryMapping("34", TorznabCatType.ConsolePSP); AddCategoryMapping("2", TorznabCatType.PCMac); @@ -82,9 +82,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping("8", TorznabCatType.AudioLossless); AddCategoryMapping("46", TorznabCatType.AudioOther); AddCategoryMapping("29", TorznabCatType.AudioVideo); - AddCategoryMapping("43", TorznabCatType.TVOTHER); + AddCategoryMapping("43", TorznabCatType.TVOther); AddCategoryMapping("42", TorznabCatType.TVHD); - AddCategoryMapping("45", TorznabCatType.TVOTHER); + AddCategoryMapping("45", TorznabCatType.TVOther); AddCategoryMapping("41", TorznabCatType.TVSD); AddCategoryMapping("7", TorznabCatType.TVSD); AddCategoryMapping("9", TorznabCatType.XXX); diff --git a/src/Jackett.Common/Indexers/RuTracker.cs b/src/Jackett.Common/Indexers/RuTracker.cs index 6bfcbe65a..10623e95e 100644 --- a/src/Jackett.Common/Indexers/RuTracker.cs +++ b/src/Jackett.Common/Indexers/RuTracker.cs @@ -92,7 +92,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1543, TorznabCatType.MoviesOther, "|- Короткий метр (Арт-хаус и авторское кино)"); AddCategoryMapping(709, TorznabCatType.MoviesOther, "|- Документальные фильмы (Арт-хаус и авторское кино)"); AddCategoryMapping(1577, TorznabCatType.MoviesOther, "|- Анимация (Арт-хаус и авторское кино)"); - AddCategoryMapping(511, TorznabCatType.TVOTHER, "Театр"); + AddCategoryMapping(511, TorznabCatType.TVOther, "Театр"); AddCategoryMapping(93, TorznabCatType.MoviesDVD, "DVD Video"); AddCategoryMapping(905, TorznabCatType.MoviesDVD, "|- Классика мирового кинематографа (DVD Video)"); AddCategoryMapping(101, TorznabCatType.MoviesDVD, "|- Зарубежное кино (DVD Video)"); @@ -158,34 +158,34 @@ namespace Jackett.Common.Indexers AddCategoryMapping(175, TorznabCatType.TV, "|- След"); AddCategoryMapping(79, TorznabCatType.TV, "|- Солдаты и пр."); AddCategoryMapping(104, TorznabCatType.TV, "|- Тайны следствия"); - AddCategoryMapping(189, TorznabCatType.TVFOREIGN, "Зарубежные сериалы"); - AddCategoryMapping(842, TorznabCatType.TVFOREIGN, "|- Новинки и сериалы в стадии показа"); - AddCategoryMapping(235, TorznabCatType.TVFOREIGN, "|- Сериалы США и Канады"); - AddCategoryMapping(242, TorznabCatType.TVFOREIGN, "|- Сериалы Великобритании и Ирландии"); - AddCategoryMapping(819, TorznabCatType.TVFOREIGN, "|- Скандинавские сериалы"); - AddCategoryMapping(1531, TorznabCatType.TVFOREIGN, "|- Испанские сериалы"); - AddCategoryMapping(721, TorznabCatType.TVFOREIGN, "|- Итальянские сериалы"); - AddCategoryMapping(1102, TorznabCatType.TVFOREIGN, "|- Европейские сериалы"); - AddCategoryMapping(1120, TorznabCatType.TVFOREIGN, "|- Сериалы стран Африки, Ближнего и Среднего Востока"); - AddCategoryMapping(1214, TorznabCatType.TVFOREIGN, "|- Сериалы Австралии и Новой Зеландии"); - AddCategoryMapping(489, TorznabCatType.TVFOREIGN, "|- Сериалы Ближнего Зарубежья"); - AddCategoryMapping(387, TorznabCatType.TVFOREIGN, "|- Сериалы совместного производства нескольких стран"); - AddCategoryMapping(1359, TorznabCatType.TVFOREIGN, "|- Веб-сериалы, Вебизоды к сериалам и Пилотные серии сериалов"); - AddCategoryMapping(184, TorznabCatType.TVFOREIGN, "|- Бесстыжие / Shameless (US)"); - AddCategoryMapping(1171, TorznabCatType.TVFOREIGN, "|- Викинги / Vikings"); - AddCategoryMapping(1417, TorznabCatType.TVFOREIGN, "|- Во все тяжкие / Breaking Bad"); - AddCategoryMapping(625, TorznabCatType.TVFOREIGN, "|- Доктор Хаус / House M.D."); - AddCategoryMapping(1449, TorznabCatType.TVFOREIGN, "|- Игра престолов / Game of Thrones"); - AddCategoryMapping(273, TorznabCatType.TVFOREIGN, "|- Карточный Домик / House of Cards"); - AddCategoryMapping(504, TorznabCatType.TVFOREIGN, "|- Клан Сопрано / The Sopranos"); - AddCategoryMapping(372, TorznabCatType.TVFOREIGN, "|- Сверхъестественное / Supernatural"); - AddCategoryMapping(110, TorznabCatType.TVFOREIGN, "|- Секретные материалы / The X-Files"); - AddCategoryMapping(121, TorznabCatType.TVFOREIGN, "|- Твин пикс / Twin Peaks"); - AddCategoryMapping(507, TorznabCatType.TVFOREIGN, "|- Теория большого взрыва + Детство Шелдона"); - AddCategoryMapping(536, TorznabCatType.TVFOREIGN, "|- Форс-мажоры / Костюмы в законе / Suits"); - AddCategoryMapping(1144, TorznabCatType.TVFOREIGN, "|- Ходячие мертвецы + Бойтесь ходячих мертвецов"); - AddCategoryMapping(173, TorznabCatType.TVFOREIGN, "|- Черное зеркало / Black Mirror"); - AddCategoryMapping(195, TorznabCatType.TVFOREIGN, "|- Для некондиционных раздач"); + AddCategoryMapping(189, TorznabCatType.TVForeign, "Зарубежные сериалы"); + AddCategoryMapping(842, TorznabCatType.TVForeign, "|- Новинки и сериалы в стадии показа"); + AddCategoryMapping(235, TorznabCatType.TVForeign, "|- Сериалы США и Канады"); + AddCategoryMapping(242, TorznabCatType.TVForeign, "|- Сериалы Великобритании и Ирландии"); + AddCategoryMapping(819, TorznabCatType.TVForeign, "|- Скандинавские сериалы"); + AddCategoryMapping(1531, TorznabCatType.TVForeign, "|- Испанские сериалы"); + AddCategoryMapping(721, TorznabCatType.TVForeign, "|- Итальянские сериалы"); + AddCategoryMapping(1102, TorznabCatType.TVForeign, "|- Европейские сериалы"); + AddCategoryMapping(1120, TorznabCatType.TVForeign, "|- Сериалы стран Африки, Ближнего и Среднего Востока"); + AddCategoryMapping(1214, TorznabCatType.TVForeign, "|- Сериалы Австралии и Новой Зеландии"); + AddCategoryMapping(489, TorznabCatType.TVForeign, "|- Сериалы Ближнего Зарубежья"); + AddCategoryMapping(387, TorznabCatType.TVForeign, "|- Сериалы совместного производства нескольких стран"); + AddCategoryMapping(1359, TorznabCatType.TVForeign, "|- Веб-сериалы, Вебизоды к сериалам и Пилотные серии сериалов"); + AddCategoryMapping(184, TorznabCatType.TVForeign, "|- Бесстыжие / Shameless (US)"); + AddCategoryMapping(1171, TorznabCatType.TVForeign, "|- Викинги / Vikings"); + AddCategoryMapping(1417, TorznabCatType.TVForeign, "|- Во все тяжкие / Breaking Bad"); + AddCategoryMapping(625, TorznabCatType.TVForeign, "|- Доктор Хаус / House M.D."); + AddCategoryMapping(1449, TorznabCatType.TVForeign, "|- Игра престолов / Game of Thrones"); + AddCategoryMapping(273, TorznabCatType.TVForeign, "|- Карточный Домик / House of Cards"); + AddCategoryMapping(504, TorznabCatType.TVForeign, "|- Клан Сопрано / The Sopranos"); + AddCategoryMapping(372, TorznabCatType.TVForeign, "|- Сверхъестественное / Supernatural"); + AddCategoryMapping(110, TorznabCatType.TVForeign, "|- Секретные материалы / The X-Files"); + AddCategoryMapping(121, TorznabCatType.TVForeign, "|- Твин пикс / Twin Peaks"); + AddCategoryMapping(507, TorznabCatType.TVForeign, "|- Теория большого взрыва + Детство Шелдона"); + AddCategoryMapping(536, TorznabCatType.TVForeign, "|- Форс-мажоры / Костюмы в законе / Suits"); + AddCategoryMapping(1144, TorznabCatType.TVForeign, "|- Ходячие мертвецы + Бойтесь ходячих мертвецов"); + AddCategoryMapping(173, TorznabCatType.TVForeign, "|- Черное зеркало / Black Mirror"); + AddCategoryMapping(195, TorznabCatType.TVForeign, "|- Для некондиционных раздач"); AddCategoryMapping(2366, TorznabCatType.TVHD, "Зарубежные сериалы (HD Video)"); AddCategoryMapping(1803, TorznabCatType.TVHD, "|- Новинки и сериалы в стадии показа (HD Video)"); AddCategoryMapping(266, TorznabCatType.TVHD, "|- Сериалы США и Канады (HD Video)"); @@ -207,31 +207,31 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2398, TorznabCatType.TVHD, "|- Ходячие мертвецы + Бойтесь ходячих мертвецов (HD Video)"); AddCategoryMapping(1949, TorznabCatType.TVHD, "|- Черное зеркало / Black Mirror (HD Video)"); AddCategoryMapping(1498, TorznabCatType.TVHD, "|- Для некондиционных раздач (HD Video)"); - AddCategoryMapping(911, TorznabCatType.TVFOREIGN, "Сериалы Латинской Америки, Турции и Индии"); - AddCategoryMapping(1493, TorznabCatType.TVFOREIGN, "|- Актёры и актрисы латиноамериканских сериалов"); - AddCategoryMapping(325, TorznabCatType.TVFOREIGN, "|- Сериалы Аргентины"); - AddCategoryMapping(534, TorznabCatType.TVFOREIGN, "|- Сериалы Бразилии"); - AddCategoryMapping(594, TorznabCatType.TVFOREIGN, "|- Сериалы Венесуэлы"); - AddCategoryMapping(1301, TorznabCatType.TVFOREIGN, "|- Сериалы Индии"); - AddCategoryMapping(607, TorznabCatType.TVFOREIGN, "|- Сериалы Колумбии"); - AddCategoryMapping(1574, TorznabCatType.TVFOREIGN, "|- Сериалы Латинской Америки с озвучкой (раздачи папками)"); - AddCategoryMapping(1539, TorznabCatType.TVFOREIGN, "|- Сериалы Латинской Америки с субтитрами"); - AddCategoryMapping(1940, TorznabCatType.TVFOREIGN, "|- Официальные краткие версии сериалов Латинской Америки"); - AddCategoryMapping(694, TorznabCatType.TVFOREIGN, "|- Сериалы Мексики"); - AddCategoryMapping(775, TorznabCatType.TVFOREIGN, "|- Сериалы Перу, Сальвадора, Чили и других стран"); - AddCategoryMapping(781, TorznabCatType.TVFOREIGN, "|- Сериалы совместного производства"); - AddCategoryMapping(718, TorznabCatType.TVFOREIGN, "|- Сериалы США (латиноамериканские)"); - AddCategoryMapping(704, TorznabCatType.TVFOREIGN, "|- Сериалы Турции"); - AddCategoryMapping(1537, TorznabCatType.TVFOREIGN, "|- Для некондиционных раздач"); - AddCategoryMapping(2100, TorznabCatType.TVFOREIGN, "Азиатские сериалы"); - AddCategoryMapping(717, TorznabCatType.TVFOREIGN, "|- Китайские сериалы с субтитрами"); - AddCategoryMapping(915, TorznabCatType.TVFOREIGN, "|- Корейские сериалы с озвучкой"); - AddCategoryMapping(1242, TorznabCatType.TVFOREIGN, "|- Корейские сериалы с субтитрами"); - AddCategoryMapping(2412, TorznabCatType.TVFOREIGN, "|- Прочие азиатские сериалы с озвучкой"); - AddCategoryMapping(1938, TorznabCatType.TVFOREIGN, "|- Тайваньские сериалы с субтитрами"); - AddCategoryMapping(2104, TorznabCatType.TVFOREIGN, "|- Японские сериалы с субтитрами"); - AddCategoryMapping(1939, TorznabCatType.TVFOREIGN, "|- Японские сериалы с озвучкой"); - AddCategoryMapping(2102, TorznabCatType.TVFOREIGN, "|- VMV и др. ролики"); + AddCategoryMapping(911, TorznabCatType.TVForeign, "Сериалы Латинской Америки, Турции и Индии"); + AddCategoryMapping(1493, TorznabCatType.TVForeign, "|- Актёры и актрисы латиноамериканских сериалов"); + AddCategoryMapping(325, TorznabCatType.TVForeign, "|- Сериалы Аргентины"); + AddCategoryMapping(534, TorznabCatType.TVForeign, "|- Сериалы Бразилии"); + AddCategoryMapping(594, TorznabCatType.TVForeign, "|- Сериалы Венесуэлы"); + AddCategoryMapping(1301, TorznabCatType.TVForeign, "|- Сериалы Индии"); + AddCategoryMapping(607, TorznabCatType.TVForeign, "|- Сериалы Колумбии"); + AddCategoryMapping(1574, TorznabCatType.TVForeign, "|- Сериалы Латинской Америки с озвучкой (раздачи папками)"); + AddCategoryMapping(1539, TorznabCatType.TVForeign, "|- Сериалы Латинской Америки с субтитрами"); + AddCategoryMapping(1940, TorznabCatType.TVForeign, "|- Официальные краткие версии сериалов Латинской Америки"); + AddCategoryMapping(694, TorznabCatType.TVForeign, "|- Сериалы Мексики"); + AddCategoryMapping(775, TorznabCatType.TVForeign, "|- Сериалы Перу, Сальвадора, Чили и других стран"); + AddCategoryMapping(781, TorznabCatType.TVForeign, "|- Сериалы совместного производства"); + AddCategoryMapping(718, TorznabCatType.TVForeign, "|- Сериалы США (латиноамериканские)"); + AddCategoryMapping(704, TorznabCatType.TVForeign, "|- Сериалы Турции"); + AddCategoryMapping(1537, TorznabCatType.TVForeign, "|- Для некондиционных раздач"); + AddCategoryMapping(2100, TorznabCatType.TVForeign, "Азиатские сериалы"); + AddCategoryMapping(717, TorznabCatType.TVForeign, "|- Китайские сериалы с субтитрами"); + AddCategoryMapping(915, TorznabCatType.TVForeign, "|- Корейские сериалы с озвучкой"); + AddCategoryMapping(1242, TorznabCatType.TVForeign, "|- Корейские сериалы с субтитрами"); + AddCategoryMapping(2412, TorznabCatType.TVForeign, "|- Прочие азиатские сериалы с озвучкой"); + AddCategoryMapping(1938, TorznabCatType.TVForeign, "|- Тайваньские сериалы с субтитрами"); + AddCategoryMapping(2104, TorznabCatType.TVForeign, "|- Японские сериалы с субтитрами"); + AddCategoryMapping(1939, TorznabCatType.TVForeign, "|- Японские сериалы с озвучкой"); + AddCategoryMapping(2102, TorznabCatType.TVForeign, "|- VMV и др. ролики"); AddCategoryMapping(670, TorznabCatType.TVDocumentary, "Вера и религия"); AddCategoryMapping(1475, TorznabCatType.TVDocumentary, "|- [Видео Религия] Христианство"); AddCategoryMapping(2107, TorznabCatType.TVDocumentary, "|- [Видео Религия] Ислам"); @@ -282,26 +282,26 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2164, TorznabCatType.TVDocumentary, "|- BBC, Discovery, National Geographic (HD Video)"); AddCategoryMapping(2163, TorznabCatType.TVDocumentary, "|- Криминальная документалистика (HD Video)"); AddCategoryMapping(24, TorznabCatType.TVDocumentary, "Развлекательные телепередачи и шоу, приколы и юмор"); - AddCategoryMapping(1959, TorznabCatType.TVOTHER, "|- [Видео Юмор] Интеллектуальные игры и викторины"); - AddCategoryMapping(939, TorznabCatType.TVOTHER, "|- [Видео Юмор] Реалити и ток-шоу / номинации / показы"); - AddCategoryMapping(1481, TorznabCatType.TVOTHER, "|- [Видео Юмор] Детские телешоу"); - AddCategoryMapping(113, TorznabCatType.TVOTHER, "|- [Видео Юмор] КВН"); - AddCategoryMapping(115, TorznabCatType.TVOTHER, "|- [Видео Юмор] Пост КВН"); - AddCategoryMapping(882, TorznabCatType.TVOTHER, "|- [Видео Юмор] Кривое Зеркало / Городок / В Городке"); - AddCategoryMapping(1482, TorznabCatType.TVOTHER, "|- [Видео Юмор] Ледовые шоу"); - AddCategoryMapping(393, TorznabCatType.TVOTHER, "|- [Видео Юмор] Музыкальные шоу"); - AddCategoryMapping(1569, TorznabCatType.TVOTHER, "|- [Видео Юмор] Званый ужин"); - AddCategoryMapping(373, TorznabCatType.TVOTHER, "|- [Видео Юмор] Хорошие Шутки"); - AddCategoryMapping(1186, TorznabCatType.TVOTHER, "|- [Видео Юмор] Вечерний Квартал"); - AddCategoryMapping(137, TorznabCatType.TVOTHER, "|- [Видео Юмор] Фильмы со смешным переводом (пародии)"); - AddCategoryMapping(2537, TorznabCatType.TVOTHER, "|- [Видео Юмор] Stand-up comedy"); - AddCategoryMapping(532, TorznabCatType.TVOTHER, "|- [Видео Юмор] Украинские Шоу"); - AddCategoryMapping(827, TorznabCatType.TVOTHER, "|- [Видео Юмор] Танцевальные шоу, концерты, выступления"); - AddCategoryMapping(1484, TorznabCatType.TVOTHER, "|- [Видео Юмор] Цирк"); - AddCategoryMapping(1485, TorznabCatType.TVOTHER, "|- [Видео Юмор] Школа злословия"); - AddCategoryMapping(114, TorznabCatType.TVOTHER, "|- [Видео Юмор] Сатирики и юмористы"); - AddCategoryMapping(1332, TorznabCatType.TVOTHER, "|- Юмористические аудиопередачи"); - AddCategoryMapping(1495, TorznabCatType.TVOTHER, "|- Аудио и видео ролики (Приколы и юмор)"); + AddCategoryMapping(1959, TorznabCatType.TVOther, "|- [Видео Юмор] Интеллектуальные игры и викторины"); + AddCategoryMapping(939, TorznabCatType.TVOther, "|- [Видео Юмор] Реалити и ток-шоу / номинации / показы"); + AddCategoryMapping(1481, TorznabCatType.TVOther, "|- [Видео Юмор] Детские телешоу"); + AddCategoryMapping(113, TorznabCatType.TVOther, "|- [Видео Юмор] КВН"); + AddCategoryMapping(115, TorznabCatType.TVOther, "|- [Видео Юмор] Пост КВН"); + AddCategoryMapping(882, TorznabCatType.TVOther, "|- [Видео Юмор] Кривое Зеркало / Городок / В Городке"); + AddCategoryMapping(1482, TorznabCatType.TVOther, "|- [Видео Юмор] Ледовые шоу"); + AddCategoryMapping(393, TorznabCatType.TVOther, "|- [Видео Юмор] Музыкальные шоу"); + AddCategoryMapping(1569, TorznabCatType.TVOther, "|- [Видео Юмор] Званый ужин"); + AddCategoryMapping(373, TorznabCatType.TVOther, "|- [Видео Юмор] Хорошие Шутки"); + AddCategoryMapping(1186, TorznabCatType.TVOther, "|- [Видео Юмор] Вечерний Квартал"); + AddCategoryMapping(137, TorznabCatType.TVOther, "|- [Видео Юмор] Фильмы со смешным переводом (пародии)"); + AddCategoryMapping(2537, TorznabCatType.TVOther, "|- [Видео Юмор] Stand-up comedy"); + AddCategoryMapping(532, TorznabCatType.TVOther, "|- [Видео Юмор] Украинские Шоу"); + AddCategoryMapping(827, TorznabCatType.TVOther, "|- [Видео Юмор] Танцевальные шоу, концерты, выступления"); + AddCategoryMapping(1484, TorznabCatType.TVOther, "|- [Видео Юмор] Цирк"); + AddCategoryMapping(1485, TorznabCatType.TVOther, "|- [Видео Юмор] Школа злословия"); + AddCategoryMapping(114, TorznabCatType.TVOther, "|- [Видео Юмор] Сатирики и юмористы"); + AddCategoryMapping(1332, TorznabCatType.TVOther, "|- Юмористические аудиопередачи"); + AddCategoryMapping(1495, TorznabCatType.TVOther, "|- Аудио и видео ролики (Приколы и юмор)"); AddCategoryMapping(1315, TorznabCatType.TVSport, "Зимние Олимпийские игры 2018"); AddCategoryMapping(1336, TorznabCatType.TVSport, "|- Биатлон"); AddCategoryMapping(2171, TorznabCatType.TVSport, "|- Лыжные гонки"); @@ -394,7 +394,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2157, TorznabCatType.Books, "|- Кино, театр, ТВ, мультипликация, цирк"); AddCategoryMapping(765, TorznabCatType.Books, "|- Рисунок, графический дизайн"); AddCategoryMapping(2019, TorznabCatType.Books, "|- Фото и видеосъемка"); - AddCategoryMapping(31, TorznabCatType.BooksMagazines, "|- Журналы и газеты (общий раздел)"); + AddCategoryMapping(31, TorznabCatType.BooksMags, "|- Журналы и газеты (общий раздел)"); AddCategoryMapping(1427, TorznabCatType.Books, "|- Эзотерика, гадания, магия, фен-шуй"); AddCategoryMapping(2422, TorznabCatType.Books, "|- Астрология"); AddCategoryMapping(2195, TorznabCatType.Books, "|- Красота. Уход. Домоводство"); @@ -566,12 +566,12 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1238, TorznabCatType.BooksOther, "|- Библиотеки (зеркала сетевых библиотек/коллекций)"); AddCategoryMapping(2055, TorznabCatType.BooksOther, "|- Тематические коллекции (подборки)"); AddCategoryMapping(754, TorznabCatType.BooksOther, "|- Многопредметные коллекции (подборки)"); - AddCategoryMapping(2114, TorznabCatType.BooksEbook, "Мультимедийные и интерактивные издания"); - AddCategoryMapping(2438, TorznabCatType.BooksEbook, "|- Мультимедийные энциклопедии"); - AddCategoryMapping(2439, TorznabCatType.BooksEbook, "|- Интерактивные обучающие и развивающие материалы"); - AddCategoryMapping(2440, TorznabCatType.BooksEbook, "|- Обучающие издания для детей"); - AddCategoryMapping(2441, TorznabCatType.BooksEbook, "|- Кулинария. Цветоводство. Домоводство"); - AddCategoryMapping(2442, TorznabCatType.BooksEbook, "|- Культура. Искусство. История"); + AddCategoryMapping(2114, TorznabCatType.BooksEBook, "Мультимедийные и интерактивные издания"); + AddCategoryMapping(2438, TorznabCatType.BooksEBook, "|- Мультимедийные энциклопедии"); + AddCategoryMapping(2439, TorznabCatType.BooksEBook, "|- Интерактивные обучающие и развивающие материалы"); + AddCategoryMapping(2440, TorznabCatType.BooksEBook, "|- Обучающие издания для детей"); + AddCategoryMapping(2441, TorznabCatType.BooksEBook, "|- Кулинария. Цветоводство. Домоводство"); + AddCategoryMapping(2442, TorznabCatType.BooksEBook, "|- Культура. Искусство. История"); AddCategoryMapping(2125, TorznabCatType.Books, "Медицина и здоровье"); AddCategoryMapping(2133, TorznabCatType.Books, "|- Клиническая медицина до 1980 г."); AddCategoryMapping(2130, TorznabCatType.Books, "|- Клиническая медицина с 1980 по 2000 г."); @@ -583,32 +583,32 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2132, TorznabCatType.Books, "|- Нетрадиционная, народная медицина и популярные книги о здоровье"); AddCategoryMapping(2131, TorznabCatType.Books, "|- Ветеринария, разное"); AddCategoryMapping(2315, TorznabCatType.Books, "|- Тематические коллекции книг"); - AddCategoryMapping(2362, TorznabCatType.BooksEbook, "Иностранные языки для взрослых"); - AddCategoryMapping(1265, TorznabCatType.BooksEbook, "|- Английский язык (для взрослых)"); - AddCategoryMapping(1266, TorznabCatType.BooksEbook, "|- Немецкий язык"); - AddCategoryMapping(1267, TorznabCatType.BooksEbook, "|- Французский язык"); - AddCategoryMapping(1358, TorznabCatType.BooksEbook, "|- Испанский язык"); - AddCategoryMapping(2363, TorznabCatType.BooksEbook, "|- Итальянский язык"); - AddCategoryMapping(734, TorznabCatType.BooksEbook, "|- Финский язык"); - AddCategoryMapping(1268, TorznabCatType.BooksEbook, "|- Другие европейские языки"); - AddCategoryMapping(1673, TorznabCatType.BooksEbook, "|- Арабский язык"); - AddCategoryMapping(1269, TorznabCatType.BooksEbook, "|- Китайский язык"); - AddCategoryMapping(1270, TorznabCatType.BooksEbook, "|- Японский язык"); - AddCategoryMapping(1275, TorznabCatType.BooksEbook, "|- Другие восточные языки"); - AddCategoryMapping(2364, TorznabCatType.BooksEbook, "|- Русский язык как иностранный"); - AddCategoryMapping(1276, TorznabCatType.BooksEbook, "|- Мультиязычные сборники и курсы"); - AddCategoryMapping(2094, TorznabCatType.BooksEbook, "|- LIM-курсы"); - AddCategoryMapping(1274, TorznabCatType.BooksEbook, "|- Разное (иностранные языки)"); - AddCategoryMapping(1264, TorznabCatType.BooksEbook, "Иностранные языки для детей"); - AddCategoryMapping(2358, TorznabCatType.BooksEbook, "|- Английский язык (для детей)"); - AddCategoryMapping(2359, TorznabCatType.BooksEbook, "|- Другие европейские языки (для детей)"); - AddCategoryMapping(2360, TorznabCatType.BooksEbook, "|- Восточные языки (для детей)"); - AddCategoryMapping(2361, TorznabCatType.BooksEbook, "|- Школьные учебники, ЕГЭ"); - AddCategoryMapping(2057, TorznabCatType.BooksEbook, "Художественная литература (ин.языки)"); - AddCategoryMapping(2355, TorznabCatType.BooksEbook, "|- Художественная литература на английском языке"); - AddCategoryMapping(2474, TorznabCatType.BooksEbook, "|- Художественная литература на французском языке"); - AddCategoryMapping(2356, TorznabCatType.BooksEbook, "|- Художественная литература на других европейских языках"); - AddCategoryMapping(2357, TorznabCatType.BooksEbook, "|- Художественная литература на восточных языках"); + AddCategoryMapping(2362, TorznabCatType.BooksEBook, "Иностранные языки для взрослых"); + AddCategoryMapping(1265, TorznabCatType.BooksEBook, "|- Английский язык (для взрослых)"); + AddCategoryMapping(1266, TorznabCatType.BooksEBook, "|- Немецкий язык"); + AddCategoryMapping(1267, TorznabCatType.BooksEBook, "|- Французский язык"); + AddCategoryMapping(1358, TorznabCatType.BooksEBook, "|- Испанский язык"); + AddCategoryMapping(2363, TorznabCatType.BooksEBook, "|- Итальянский язык"); + AddCategoryMapping(734, TorznabCatType.BooksEBook, "|- Финский язык"); + AddCategoryMapping(1268, TorznabCatType.BooksEBook, "|- Другие европейские языки"); + AddCategoryMapping(1673, TorznabCatType.BooksEBook, "|- Арабский язык"); + AddCategoryMapping(1269, TorznabCatType.BooksEBook, "|- Китайский язык"); + AddCategoryMapping(1270, TorznabCatType.BooksEBook, "|- Японский язык"); + AddCategoryMapping(1275, TorznabCatType.BooksEBook, "|- Другие восточные языки"); + AddCategoryMapping(2364, TorznabCatType.BooksEBook, "|- Русский язык как иностранный"); + AddCategoryMapping(1276, TorznabCatType.BooksEBook, "|- Мультиязычные сборники и курсы"); + AddCategoryMapping(2094, TorznabCatType.BooksEBook, "|- LIM-курсы"); + AddCategoryMapping(1274, TorznabCatType.BooksEBook, "|- Разное (иностранные языки)"); + AddCategoryMapping(1264, TorznabCatType.BooksEBook, "Иностранные языки для детей"); + AddCategoryMapping(2358, TorznabCatType.BooksEBook, "|- Английский язык (для детей)"); + AddCategoryMapping(2359, TorznabCatType.BooksEBook, "|- Другие европейские языки (для детей)"); + AddCategoryMapping(2360, TorznabCatType.BooksEBook, "|- Восточные языки (для детей)"); + AddCategoryMapping(2361, TorznabCatType.BooksEBook, "|- Школьные учебники, ЕГЭ"); + AddCategoryMapping(2057, TorznabCatType.BooksEBook, "Художественная литература (ин.языки)"); + AddCategoryMapping(2355, TorznabCatType.BooksEBook, "|- Художественная литература на английском языке"); + AddCategoryMapping(2474, TorznabCatType.BooksEBook, "|- Художественная литература на французском языке"); + AddCategoryMapping(2356, TorznabCatType.BooksEBook, "|- Художественная литература на других европейских языках"); + AddCategoryMapping(2357, TorznabCatType.BooksEBook, "|- Художественная литература на восточных языках"); AddCategoryMapping(2413, TorznabCatType.AudioAudiobook, "Аудиокниги на иностранных языках"); AddCategoryMapping(1501, TorznabCatType.AudioAudiobook, "|- Аудиокниги на английском языке"); AddCategoryMapping(1580, TorznabCatType.AudioAudiobook, "|- Аудиокниги на немецком языке"); @@ -732,7 +732,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(334, TorznabCatType.Books, "|- Водный транспорт"); AddCategoryMapping(1202, TorznabCatType.TVDocumentary, "Фильмы и передачи по авто/мото"); AddCategoryMapping(1985, TorznabCatType.TVDocumentary, "|- Документальные/познавательные фильмы"); - AddCategoryMapping(1982, TorznabCatType.TVOTHER, "|- Развлекательные передачи"); + AddCategoryMapping(1982, TorznabCatType.TVOther, "|- Развлекательные передачи"); AddCategoryMapping(2151, TorznabCatType.TVDocumentary, "|- Top Gear/Топ Гир"); AddCategoryMapping(1983, TorznabCatType.TVDocumentary, "|- Тест драйв/Обзоры/Автосалоны"); AddCategoryMapping(1984, TorznabCatType.TVDocumentary, "|- Тюнинг/форсаж"); @@ -1153,8 +1153,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1352, TorznabCatType.ConsolePSP, "|- PSP"); AddCategoryMapping(1116, TorznabCatType.ConsolePSP, "|- Игры PS1 для PSP"); AddCategoryMapping(595, TorznabCatType.ConsolePSVita, "|- PS Vita"); - AddCategoryMapping(887, TorznabCatType.ConsoleXbox, "|- Original Xbox"); - AddCategoryMapping(510, TorznabCatType.ConsoleXbox360, "|- Xbox 360"); + AddCategoryMapping(887, TorznabCatType.ConsoleXBox, "|- Original Xbox"); + AddCategoryMapping(510, TorznabCatType.ConsoleXBox360, "|- Xbox 360"); AddCategoryMapping(773, TorznabCatType.ConsoleWii, "|- Wii/WiiU"); AddCategoryMapping(774, TorznabCatType.ConsoleNDS, "|- NDS/3DS"); AddCategoryMapping(1605, TorznabCatType.Console, "|- Switch"); @@ -1169,12 +1169,12 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2186, TorznabCatType.ConsoleOther, "|- Аниме для PSP"); AddCategoryMapping(700, TorznabCatType.ConsoleOther, "|- Видео для PSP"); AddCategoryMapping(1926, TorznabCatType.ConsoleOther, "|- Видео для PS3 и других консолей"); - AddCategoryMapping(650, TorznabCatType.PCPhoneOther, "Игры для мобильных устройств"); - AddCategoryMapping(2149, TorznabCatType.PCPhoneAndroid, "|- Игры для Android"); - AddCategoryMapping(1001, TorznabCatType.PCPhoneOther, "|- Игры для Java"); - AddCategoryMapping(1004, TorznabCatType.PCPhoneOther, "|- Игры для Symbian"); - AddCategoryMapping(1002, TorznabCatType.PCPhoneOther, "|- Игры для Windows Mobile"); - AddCategoryMapping(2420, TorznabCatType.PCPhoneOther, "|- Игры для Windows Phone"); + AddCategoryMapping(650, TorznabCatType.PCMobileOther, "Игры для мобильных устройств"); + AddCategoryMapping(2149, TorznabCatType.PCMobileAndroid, "|- Игры для Android"); + AddCategoryMapping(1001, TorznabCatType.PCMobileOther, "|- Игры для Java"); + AddCategoryMapping(1004, TorznabCatType.PCMobileOther, "|- Игры для Symbian"); + AddCategoryMapping(1002, TorznabCatType.PCMobileOther, "|- Игры для Windows Mobile"); + AddCategoryMapping(2420, TorznabCatType.PCMobileOther, "|- Игры для Windows Phone"); AddCategoryMapping(240, TorznabCatType.OtherMisc, "Игровое видео"); AddCategoryMapping(2415, TorznabCatType.OtherMisc, "|- Видеопрохождения игр"); AddCategoryMapping(1012, TorznabCatType.PC, "Операционные системы от Microsoft"); @@ -1280,18 +1280,18 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1515, TorznabCatType.OtherMisc, "|- Navigon / Navitel"); AddCategoryMapping(1516, TorznabCatType.OtherMisc, "|- Igo"); AddCategoryMapping(1517, TorznabCatType.OtherMisc, "|- Разное - системы навигации и карты"); - AddCategoryMapping(285, TorznabCatType.PCPhoneOther, "Приложения для мобильных устройств"); - AddCategoryMapping(2154, TorznabCatType.PCPhoneAndroid, "|- Приложения для Android"); - AddCategoryMapping(1005, TorznabCatType.PCPhoneOther, "|- Приложения для Java"); - AddCategoryMapping(289, TorznabCatType.PCPhoneOther, "|- Приложения для Symbian"); - AddCategoryMapping(290, TorznabCatType.PCPhoneOther, "|- Приложения для Windows Mobile"); - AddCategoryMapping(2419, TorznabCatType.PCPhoneOther, "|- Приложения для Windows Phone"); - AddCategoryMapping(288, TorznabCatType.PCPhoneOther, "|- Софт для работы с телефоном"); - AddCategoryMapping(292, TorznabCatType.PCPhoneOther, "|- Прошивки для телефонов"); - AddCategoryMapping(291, TorznabCatType.PCPhoneOther, "|- Обои и темы"); - AddCategoryMapping(957, TorznabCatType.PCPhoneOther, "Видео для мобильных устройств"); - AddCategoryMapping(287, TorznabCatType.PCPhoneOther, "|- Видео для смартфонов и КПК"); - AddCategoryMapping(286, TorznabCatType.PCPhoneOther, "|- Видео в формате 3GP для мобильных"); + AddCategoryMapping(285, TorznabCatType.PCMobileOther, "Приложения для мобильных устройств"); + AddCategoryMapping(2154, TorznabCatType.PCMobileAndroid, "|- Приложения для Android"); + AddCategoryMapping(1005, TorznabCatType.PCMobileOther, "|- Приложения для Java"); + AddCategoryMapping(289, TorznabCatType.PCMobileOther, "|- Приложения для Symbian"); + AddCategoryMapping(290, TorznabCatType.PCMobileOther, "|- Приложения для Windows Mobile"); + AddCategoryMapping(2419, TorznabCatType.PCMobileOther, "|- Приложения для Windows Phone"); + AddCategoryMapping(288, TorznabCatType.PCMobileOther, "|- Софт для работы с телефоном"); + AddCategoryMapping(292, TorznabCatType.PCMobileOther, "|- Прошивки для телефонов"); + AddCategoryMapping(291, TorznabCatType.PCMobileOther, "|- Обои и темы"); + AddCategoryMapping(957, TorznabCatType.PCMobileOther, "Видео для мобильных устройств"); + AddCategoryMapping(287, TorznabCatType.PCMobileOther, "|- Видео для смартфонов и КПК"); + AddCategoryMapping(286, TorznabCatType.PCMobileOther, "|- Видео в формате 3GP для мобильных"); AddCategoryMapping(1366, TorznabCatType.PCMac, "Apple Macintosh"); AddCategoryMapping(1368, TorznabCatType.PCMac, "|- Mac OS (для Macintosh)"); AddCategoryMapping(1383, TorznabCatType.PCMac, "|- Mac OS (для РС-Хакинтош)"); @@ -1303,16 +1303,16 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1375, TorznabCatType.PCMac, "|- Офисные программы (Mac OS)"); AddCategoryMapping(1371, TorznabCatType.PCMac, "|- Программы для интернета и сетей (Mac OS)"); AddCategoryMapping(1374, TorznabCatType.PCMac, "|- Другие программы (Mac OS)"); - AddCategoryMapping(1933, TorznabCatType.PCPhoneIOS, "iOS"); - AddCategoryMapping(1935, TorznabCatType.PCPhoneIOS, "|- Программы для iOS"); - AddCategoryMapping(1003, TorznabCatType.PCPhoneIOS, "|- Игры для iOS"); - AddCategoryMapping(1937, TorznabCatType.PCPhoneIOS, "|- Разное для iOS"); - AddCategoryMapping(2235, TorznabCatType.PCPhoneIOS, "Видео"); - AddCategoryMapping(1908, TorznabCatType.PCPhoneIOS, "|- Фильмы для iPod, iPhone, iPad"); - AddCategoryMapping(864, TorznabCatType.PCPhoneIOS, "|- Сериалы для iPod, iPhone, iPad"); - AddCategoryMapping(863, TorznabCatType.PCPhoneIOS, "|- Мультфильмы для iPod, iPhone, iPad"); - AddCategoryMapping(2535, TorznabCatType.PCPhoneIOS, "|- Аниме для iPod, iPhone, iPad"); - AddCategoryMapping(2534, TorznabCatType.PCPhoneIOS, "|- Музыкальное видео для iPod, iPhone, iPad"); + AddCategoryMapping(1933, TorznabCatType.PCMobileiOS, "iOS"); + AddCategoryMapping(1935, TorznabCatType.PCMobileiOS, "|- Программы для iOS"); + AddCategoryMapping(1003, TorznabCatType.PCMobileiOS, "|- Игры для iOS"); + AddCategoryMapping(1937, TorznabCatType.PCMobileiOS, "|- Разное для iOS"); + AddCategoryMapping(2235, TorznabCatType.PCMobileiOS, "Видео"); + AddCategoryMapping(1908, TorznabCatType.PCMobileiOS, "|- Фильмы для iPod, iPhone, iPad"); + AddCategoryMapping(864, TorznabCatType.PCMobileiOS, "|- Сериалы для iPod, iPhone, iPad"); + AddCategoryMapping(863, TorznabCatType.PCMobileiOS, "|- Мультфильмы для iPod, iPhone, iPad"); + AddCategoryMapping(2535, TorznabCatType.PCMobileiOS, "|- Аниме для iPod, iPhone, iPad"); + AddCategoryMapping(2534, TorznabCatType.PCMobileiOS, "|- Музыкальное видео для iPod, iPhone, iPad"); AddCategoryMapping(2238, TorznabCatType.PCMac, "Видео HD"); AddCategoryMapping(1936, TorznabCatType.PCMac, "|- Фильмы HD для Apple TV"); AddCategoryMapping(315, TorznabCatType.PCMac, "|- Сериалы HD для Apple TV"); @@ -1336,10 +1336,10 @@ namespace Jackett.Common.Indexers AddCategoryMapping(148, TorznabCatType.Audio, "|- Аудио"); AddCategoryMapping(965, TorznabCatType.AudioMP3, "|- Музыка (lossy)"); AddCategoryMapping(134, TorznabCatType.AudioLossless, "|- Музыка (lossless)"); - AddCategoryMapping(807, TorznabCatType.TVOTHER, "|- Видео"); + AddCategoryMapping(807, TorznabCatType.TVOther, "|- Видео"); AddCategoryMapping(147, TorznabCatType.Books, "|- Публикации и учебные материалы (тексты)"); AddCategoryMapping(847, TorznabCatType.MoviesOther, "|- Трейлеры и дополнительные материалы к фильмам"); - AddCategoryMapping(1167, TorznabCatType.TVOTHER, "|- Любительские видеоклипы"); + AddCategoryMapping(1167, TorznabCatType.TVOther, "|- Любительские видеоклипы"); } public override async Task GetConfigurationForSetup() diff --git a/src/Jackett.Common/Indexers/SceneFZ.cs b/src/Jackett.Common/Indexers/SceneFZ.cs index cce95c724..f11e36f26 100644 --- a/src/Jackett.Common/Indexers/SceneFZ.cs +++ b/src/Jackett.Common/Indexers/SceneFZ.cs @@ -60,19 +60,19 @@ namespace Jackett.Common.Indexers AddCategoryMapping(61, TorznabCatType.MoviesUHD, "Movies-UHD"); AddCategoryMapping(41, TorznabCatType.TV, "TV-Packs"); - AddCategoryMapping(66, TorznabCatType.TVFOREIGN, "TV-Packs-RO"); + AddCategoryMapping(66, TorznabCatType.TVForeign, "TV-Packs-RO"); AddCategoryMapping(45, TorznabCatType.TVSD, "TV-SD"); AddCategoryMapping(46, TorznabCatType.TVSD, "TV-SD-RO"); AddCategoryMapping(43, TorznabCatType.TVHD, "TV-HD"); AddCategoryMapping(44, TorznabCatType.TVHD, "TV-HD-RO"); - AddCategoryMapping(60, TorznabCatType.TVFOREIGN, "TV-RO"); + AddCategoryMapping(60, TorznabCatType.TVForeign, "TV-RO"); AddCategoryMapping(11, TorznabCatType.PCGames, "Games-PC"); AddCategoryMapping(52, TorznabCatType.Console, "Games-Console"); AddCategoryMapping(1, TorznabCatType.PC0day, "Appz"); AddCategoryMapping(14, TorznabCatType.PC, "Linux"); AddCategoryMapping(37, TorznabCatType.PCMac, "Mac"); - AddCategoryMapping(19, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(19, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(62, TorznabCatType.TV, "Cartoons"); AddCategoryMapping(3, TorznabCatType.TVAnime, "Anime/Hentai"); @@ -90,7 +90,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(15, TorznabCatType.XXX, "XXX"); AddCategoryMapping(47, TorznabCatType.XXX, "XXX-DVD"); AddCategoryMapping(48, TorznabCatType.XXX, "XXX-HD"); - AddCategoryMapping(49, TorznabCatType.XXXImageset, "XXX-IMGSet"); + AddCategoryMapping(49, TorznabCatType.XXXImageSet, "XXX-IMGSet"); AddCategoryMapping(50, TorznabCatType.XXX, "XXX-Packs"); AddCategoryMapping(51, TorznabCatType.XXX, "XXX-SD"); } diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs index 373c603c4..dc3379a97 100644 --- a/src/Jackett.Common/Indexers/SceneTime.cs +++ b/src/Jackett.Common/Indexers/SceneTime.cs @@ -74,14 +74,14 @@ namespace Jackett.Common.Indexers AddCategoryMapping(9, TorznabCatType.TVHD, "TV HD"); AddCategoryMapping(77, TorznabCatType.TVSD, "TV SD"); AddCategoryMapping(6, TorznabCatType.PCGames, "Games PC ISO"); - AddCategoryMapping(48, TorznabCatType.ConsoleXbox, "Games XBOX"); + AddCategoryMapping(48, TorznabCatType.ConsoleXBox, "Games XBOX"); AddCategoryMapping(51, TorznabCatType.ConsoleWii, "Games Wii"); AddCategoryMapping(55, TorznabCatType.ConsoleNDS, "Games Nintendo DS"); AddCategoryMapping(12, TorznabCatType.ConsolePS4, "Games/PS"); AddCategoryMapping(15, TorznabCatType.ConsoleOther, "Games Dreamcast"); AddCategoryMapping(52, TorznabCatType.PCMac, "Mac/Linux"); AddCategoryMapping(53, TorznabCatType.PC0day, "Apps"); - AddCategoryMapping(24, TorznabCatType.PCPhoneOther, "Mobile Apps"); + AddCategoryMapping(24, TorznabCatType.PCMobileOther, "Mobile Apps"); AddCategoryMapping(7, TorznabCatType.Books, "Books and Magazines"); AddCategoryMapping(65, TorznabCatType.BooksComics, "Books Comic"); AddCategoryMapping(4, TorznabCatType.Audio, "Music"); diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs index bea2150a7..170c43091 100644 --- a/src/Jackett.Common/Indexers/SolidTorrents.cs +++ b/src/Jackett.Common/Indexers/SolidTorrents.cs @@ -73,9 +73,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping("Video", TorznabCatType.Movies); AddCategoryMapping("Image", TorznabCatType.OtherMisc); AddCategoryMapping("Document", TorznabCatType.BooksComics); - AddCategoryMapping("eBook", TorznabCatType.BooksEbook); + AddCategoryMapping("eBook", TorznabCatType.BooksEBook); AddCategoryMapping("Program", TorznabCatType.PC0day); - AddCategoryMapping("Android", TorznabCatType.PCPhoneAndroid); + AddCategoryMapping("Android", TorznabCatType.PCMobileAndroid); AddCategoryMapping("Archive", TorznabCatType.Other); AddCategoryMapping("Diskimage", TorznabCatType.PCISO); AddCategoryMapping("Sourcecode", TorznabCatType.MoviesOther); diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs index 217f1795c..16c0e4e88 100644 --- a/src/Jackett.Common/Indexers/SpeedCD.cs +++ b/src/Jackett.Common/Indexers/SpeedCD.cs @@ -91,8 +91,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(39, TorznabCatType.ConsoleWii, "Games/Wii"); AddCategoryMapping(45, TorznabCatType.ConsolePS3, "Games/PS3"); AddCategoryMapping(35, TorznabCatType.Console, "Games/Nintendo"); - AddCategoryMapping(33, TorznabCatType.ConsoleXbox360, "Games/XboX360"); - AddCategoryMapping(46, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(33, TorznabCatType.ConsoleXBox360, "Games/XboX360"); + AddCategoryMapping(46, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(24, TorznabCatType.PC0day, "Apps/0DAY"); AddCategoryMapping(51, TorznabCatType.PCMac, "Mac"); AddCategoryMapping(54, TorznabCatType.Books, "Educational"); diff --git a/src/Jackett.Common/Indexers/SuperBits.cs b/src/Jackett.Common/Indexers/SuperBits.cs index e1f26c1ca..84fc3187d 100644 --- a/src/Jackett.Common/Indexers/SuperBits.cs +++ b/src/Jackett.Common/Indexers/SuperBits.cs @@ -65,7 +65,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(1, TorznabCatType.MoviesDVD, "DVD-R Swesub"); AddCategoryMapping(2, TorznabCatType.TV, "DVD-R TV"); - AddCategoryMapping(3, TorznabCatType.BooksEbook, "eBok"); + AddCategoryMapping(3, TorznabCatType.BooksEBook, "eBok"); AddCategoryMapping(4, TorznabCatType.MoviesHD, "Film 1080"); AddCategoryMapping(5, TorznabCatType.Movies3D, "Film 3D"); AddCategoryMapping(6, TorznabCatType.MoviesHD, "Film 720"); @@ -73,7 +73,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(8, TorznabCatType.TV, "Svensk TV"); AddCategoryMapping(9, TorznabCatType.AudioAudiobook, "Ljudböcker"); AddCategoryMapping(10, TorznabCatType.AudioVideo, "Musikvideos"); - AddCategoryMapping(11, TorznabCatType.BooksMagazines, "E-tidningar"); + AddCategoryMapping(11, TorznabCatType.BooksMags, "E-tidningar"); AddCategoryMapping(12, TorznabCatType.Audio, "Musik"); AddCategoryMapping(13, TorznabCatType.Other, "Omslag"); AddCategoryMapping(14, TorznabCatType.Other, "Övrigt"); @@ -82,7 +82,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(17, TorznabCatType.ConsolePS3, "PS3"); AddCategoryMapping(18, TorznabCatType.TV, "TV"); AddCategoryMapping(19, TorznabCatType.ConsoleWii, "Wii"); - AddCategoryMapping(20, TorznabCatType.ConsoleXbox, "Xbox"); + AddCategoryMapping(20, TorznabCatType.ConsoleXBox, "Xbox"); AddCategoryMapping(21, TorznabCatType.MoviesOther, "Xvid"); AddCategoryMapping(22, TorznabCatType.XXX, "XXX"); AddCategoryMapping(24, TorznabCatType.MoviesUHD, "Film 4K"); diff --git a/src/Jackett.Common/Indexers/ThePirateBay.cs b/src/Jackett.Common/Indexers/ThePirateBay.cs index 8a27c5f05..46be31664 100644 --- a/src/Jackett.Common/Indexers/ThePirateBay.cs +++ b/src/Jackett.Common/Indexers/ThePirateBay.cs @@ -120,7 +120,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(203, TorznabCatType.AudioVideo, "Music Videos"); AddCategoryMapping(204, TorznabCatType.MoviesOther, "Movie Clips"); AddCategoryMapping(205, TorznabCatType.TV, "TV"); - AddCategoryMapping(206, TorznabCatType.TVOTHER, "Handheld"); + AddCategoryMapping(206, TorznabCatType.TVOther, "Handheld"); AddCategoryMapping(207, TorznabCatType.MoviesHD, "HD - Movies"); AddCategoryMapping(208, TorznabCatType.TVHD, "HD - TV shows"); AddCategoryMapping(209, TorznabCatType.Movies3D, "3D"); @@ -130,16 +130,16 @@ namespace Jackett.Common.Indexers AddCategoryMapping(301, TorznabCatType.PC, "Windows"); AddCategoryMapping(302, TorznabCatType.PCMac, "Mac"); AddCategoryMapping(303, TorznabCatType.PC, "UNIX"); - AddCategoryMapping(304, TorznabCatType.PCPhoneOther, "Handheld"); - AddCategoryMapping(305, TorznabCatType.PCPhoneIOS, "IOS (iPad/iPhone)"); - AddCategoryMapping(306, TorznabCatType.PCPhoneAndroid, "Android"); + AddCategoryMapping(304, TorznabCatType.PCMobileOther, "Handheld"); + AddCategoryMapping(305, TorznabCatType.PCMobileiOS, "IOS (iPad/iPhone)"); + AddCategoryMapping(306, TorznabCatType.PCMobileAndroid, "Android"); AddCategoryMapping(399, TorznabCatType.PC, "Other OS"); // Games AddCategoryMapping(400, TorznabCatType.Console, "Games"); AddCategoryMapping(401, TorznabCatType.PCGames, "PC"); AddCategoryMapping(402, TorznabCatType.PCMac, "Mac"); AddCategoryMapping(403, TorznabCatType.ConsolePS4, "PSx"); - AddCategoryMapping(404, TorznabCatType.ConsoleXbox, "XBOX360"); + AddCategoryMapping(404, TorznabCatType.ConsoleXBox, "XBOX360"); AddCategoryMapping(405, TorznabCatType.ConsoleWii, "Wii"); AddCategoryMapping(406, TorznabCatType.ConsoleOther, "Handheld"); AddCategoryMapping(407, TorznabCatType.ConsoleOther, "IOS (iPad/iPhone)"); @@ -149,7 +149,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(500, TorznabCatType.XXX, "Porn"); AddCategoryMapping(501, TorznabCatType.XXX, "Movies"); AddCategoryMapping(502, TorznabCatType.XXXDVD, "Movies DVDR"); - AddCategoryMapping(503, TorznabCatType.XXXImageset, "Pictures"); + AddCategoryMapping(503, TorznabCatType.XXXImageSet, "Pictures"); AddCategoryMapping(504, TorznabCatType.XXX, "Games"); AddCategoryMapping(505, TorznabCatType.XXX, "HD - Movies"); AddCategoryMapping(506, TorznabCatType.XXX, "Movie Clips"); diff --git a/src/Jackett.Common/Indexers/Toloka.cs b/src/Jackett.Common/Indexers/Toloka.cs index 857fc1d95..d438f0c45 100644 --- a/src/Jackett.Common/Indexers/Toloka.cs +++ b/src/Jackett.Common/Indexers/Toloka.cs @@ -100,9 +100,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(229, TorznabCatType.TVDocumentary, "|-History Channel"); AddCategoryMapping(230, TorznabCatType.TVDocumentary, "|-Інші іноземні документальні фільми"); - AddCategoryMapping(119, TorznabCatType.TVOTHER, "Телепередачі українською"); - AddCategoryMapping(18, TorznabCatType.TVOTHER, "|-Музичне відео"); - AddCategoryMapping(132, TorznabCatType.TVOTHER, "|-Телевізійні шоу та програми"); + AddCategoryMapping(119, TorznabCatType.TVOther, "Телепередачі українською"); + AddCategoryMapping(18, TorznabCatType.TVOther, "|-Музичне відео"); + AddCategoryMapping(132, TorznabCatType.TVOther, "|-Телевізійні шоу та програми"); AddCategoryMapping(157, TorznabCatType.TVSport, "Український спорт"); AddCategoryMapping(235, TorznabCatType.TVSport, "|-Олімпіада"); @@ -160,7 +160,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(179, TorznabCatType.Books, "|-Наукова література (гуманітарні дисципліни)"); AddCategoryMapping(180, TorznabCatType.Books, "|-Наукова література (природничі дисципліни)"); AddCategoryMapping(183, TorznabCatType.Books, "|-Навчальна та довідкова"); - AddCategoryMapping(181, TorznabCatType.BooksMagazines, "|-Періодика"); + AddCategoryMapping(181, TorznabCatType.BooksMags, "|-Періодика"); AddCategoryMapping(182, TorznabCatType.Books, "|-Батькам та малятам"); AddCategoryMapping(184, TorznabCatType.BooksComics, "|-Графіка (комікси, манґа, BD та інше)"); @@ -180,9 +180,9 @@ namespace Jackett.Common.Indexers AddCategoryMapping(26, TorznabCatType.PC, "|-Linux"); AddCategoryMapping(27, TorznabCatType.PCMac, "|-Mac OS"); // AddCategoryMapping(240, TorznabCatType.PC, "Інші OS"); - AddCategoryMapping(211, TorznabCatType.PCPhoneAndroid, "|-Android"); - AddCategoryMapping(122, TorznabCatType.PCPhoneIOS, "|-iOS"); - AddCategoryMapping(40, TorznabCatType.PCPhoneOther, "|-Інші мобільні платформи"); + AddCategoryMapping(211, TorznabCatType.PCMobileAndroid, "|-Android"); + AddCategoryMapping(122, TorznabCatType.PCMobileiOS, "|-iOS"); + AddCategoryMapping(40, TorznabCatType.PCMobileOther, "|-Інші мобільні платформи"); // AddCategoryMapping(241, TorznabCatType.Other, "Інше"); // AddCategoryMapping(203, TorznabCatType.Other, "|-Інфодиски, електронні підручники, відеоуроки"); @@ -193,8 +193,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(259, TorznabCatType.PCGames, "|-Mac ігри"); AddCategoryMapping(29, TorznabCatType.PCGames, "|-Українізації, доповнення, патчі..."); AddCategoryMapping(30, TorznabCatType.PCGames, "|-Мобільні та консольні ігри"); - AddCategoryMapping(41, TorznabCatType.PCPhoneIOS, "|-iOS"); - AddCategoryMapping(212, TorznabCatType.PCPhoneAndroid, "|-Android"); + AddCategoryMapping(41, TorznabCatType.PCMobileiOS, "|-iOS"); + AddCategoryMapping(212, TorznabCatType.PCMobileAndroid, "|-Android"); AddCategoryMapping(205, TorznabCatType.PCGames, "Переклад ігор українською"); } diff --git a/src/Jackett.Common/Indexers/TorrentBytes.cs b/src/Jackett.Common/Indexers/TorrentBytes.cs index d1cc8e0a0..ac4518047 100644 --- a/src/Jackett.Common/Indexers/TorrentBytes.cs +++ b/src/Jackett.Common/Indexers/TorrentBytes.cs @@ -58,7 +58,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(52, TorznabCatType.PCMac, "Apple/All"); AddCategoryMapping(22, TorznabCatType.PC, "Apps/misc"); AddCategoryMapping(1, TorznabCatType.PC, "Apps/PC"); - AddCategoryMapping(28, TorznabCatType.TVFOREIGN, "Foreign Titles"); + AddCategoryMapping(28, TorznabCatType.TVForeign, "Foreign Titles"); AddCategoryMapping(50, TorznabCatType.Console, "Games/Consoles"); AddCategoryMapping(42, TorznabCatType.PCGames, "Games/Pack"); AddCategoryMapping(4, TorznabCatType.PCGames, "Games/PC"); @@ -84,8 +84,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(33, TorznabCatType.TVSD, "TV/SD"); AddCategoryMapping(32, TorznabCatType.TVUHD, "TV/UHD"); AddCategoryMapping(39, TorznabCatType.XXXx264, "XXX/HD"); - AddCategoryMapping(24, TorznabCatType.XXXImageset, "XXX/IMGSET"); - AddCategoryMapping(21, TorznabCatType.XXXPacks, "XXX/Pack"); + AddCategoryMapping(24, TorznabCatType.XXXImageSet, "XXX/IMGSET"); + AddCategoryMapping(21, TorznabCatType.XXXPack, "XXX/Pack"); AddCategoryMapping(9, TorznabCatType.XXXXviD, "XXX/SD"); AddCategoryMapping(29, TorznabCatType.XXX, "XXX/Web"); } diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs index 4784d7e49..3734d43e6 100644 --- a/src/Jackett.Common/Indexers/TorrentDay.cs +++ b/src/Jackett.Common/Indexers/TorrentDay.cs @@ -115,7 +115,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(18, TorznabCatType.ConsolePS3, "PS3"); AddCategoryMapping(8, TorznabCatType.ConsolePSP, "PSP"); AddCategoryMapping(10, TorznabCatType.ConsoleWii, "Wii"); - AddCategoryMapping(9, TorznabCatType.ConsoleXbox360, "Xbox-360"); + AddCategoryMapping(9, TorznabCatType.ConsoleXBox360, "Xbox-360"); AddCategoryMapping(24, TorznabCatType.TVSD, "TV/480p"); AddCategoryMapping(32, TorznabCatType.TVHD, "TV/Bluray"); @@ -129,7 +129,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(2, TorznabCatType.TVSD, "TV/XviD"); AddCategoryMapping(6, TorznabCatType.XXX, "XXX/Movies"); - AddCategoryMapping(15, TorznabCatType.XXXPacks, "XXX/Packs"); + AddCategoryMapping(15, TorznabCatType.XXXPack, "XXX/Packs"); } public override async Task ApplyConfiguration(JToken configJson) diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs index 01d5b41ba..2a016a9d4 100644 --- a/src/Jackett.Common/Indexers/TorrentHeaven.cs +++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs @@ -62,8 +62,8 @@ namespace Jackett.Common.Indexers AddCategoryMapping(59, TorznabCatType.ConsolePS4, "GAMES/PlayStation"); AddCategoryMapping(60, TorznabCatType.ConsolePSP, "GAMES/PSP"); AddCategoryMapping(63, TorznabCatType.ConsoleWii, "GAMES/Wii"); - AddCategoryMapping(67, TorznabCatType.ConsoleXbox360, "GAMES/XBOX 360"); - AddCategoryMapping(68, TorznabCatType.PCPhoneOther, "GAMES/PDA / Handy"); + AddCategoryMapping(67, TorznabCatType.ConsoleXBox360, "GAMES/XBOX 360"); + AddCategoryMapping(68, TorznabCatType.PCMobileOther, "GAMES/PDA / Handy"); AddCategoryMapping(72, TorznabCatType.ConsoleNDS, "GAMES/NDS"); AddCategoryMapping(7, TorznabCatType.MoviesDVD, "MOVIES/DVD"); AddCategoryMapping(8, TorznabCatType.MoviesSD, "MOVIES/SD"); @@ -89,13 +89,13 @@ namespace Jackett.Common.Indexers AddCategoryMapping(52, TorznabCatType.TVDocumentary, "TV/Doku HD"); AddCategoryMapping(53, TorznabCatType.TV, "TV/Serien Complete Packs"); AddCategoryMapping(54, TorznabCatType.TVSport, "TV/Sport"); - AddCategoryMapping(66, TorznabCatType.TVFOREIGN, "TV/International"); + AddCategoryMapping(66, TorznabCatType.TVForeign, "TV/International"); AddCategoryMapping(22, TorznabCatType.Books, "MISC/EBooks"); AddCategoryMapping(24, TorznabCatType.Other, "MISC/Sonstiges"); AddCategoryMapping(25, TorznabCatType.Other, "MISC/Tonspuren"); AddCategoryMapping(108, TorznabCatType.TVAnime, "MISC/Anime"); AddCategoryMapping(28, TorznabCatType.PC, "APPLICATIONS/PC"); - AddCategoryMapping(29, TorznabCatType.PCPhoneOther, "APPLICATIONS/Mobile"); + AddCategoryMapping(29, TorznabCatType.PCMobileOther, "APPLICATIONS/Mobile"); AddCategoryMapping(30, TorznabCatType.PC, "APPLICATIONS/Sonstige"); AddCategoryMapping(70, TorznabCatType.PC, "APPLICATIONS/Linux"); AddCategoryMapping(71, TorznabCatType.PCMac, "APPLICATIONS/Mac"); diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs index a9daeb383..626bc4c32 100644 --- a/src/Jackett.Common/Indexers/TorrentLeech.cs +++ b/src/Jackett.Common/Indexers/TorrentLeech.cs @@ -83,13 +83,13 @@ namespace Jackett.Common.Indexers AddCategoryMapping(26, TorznabCatType.TVSD, "TV Episodes"); AddCategoryMapping(27, TorznabCatType.TV, "TV Boxsets"); AddCategoryMapping(32, TorznabCatType.TVHD, "TV Episodes HD"); - AddCategoryMapping(44, TorznabCatType.TVFOREIGN, "TV Foreign"); + AddCategoryMapping(44, TorznabCatType.TVForeign, "TV Foreign"); AddCategoryMapping(3, TorznabCatType.PCGames, "Games"); AddCategoryMapping(17, TorznabCatType.PCGames, "Games PC"); - AddCategoryMapping(18, TorznabCatType.ConsoleXbox, "Games XBOX"); - AddCategoryMapping(19, TorznabCatType.ConsoleXbox360, "Games XBOX360"); - AddCategoryMapping(40, TorznabCatType.ConsoleXboxOne, "Games XBOXONE"); + AddCategoryMapping(18, TorznabCatType.ConsoleXBox, "Games XBOX"); + AddCategoryMapping(19, TorznabCatType.ConsoleXBox360, "Games XBOX360"); + AddCategoryMapping(40, TorznabCatType.ConsoleXBoxOne, "Games XBOXONE"); AddCategoryMapping(20, TorznabCatType.ConsolePS3, "Games PS2"); AddCategoryMapping(21, TorznabCatType.ConsolePS3, "Games Mac"); AddCategoryMapping(22, TorznabCatType.ConsolePSP, "Games PSP"); @@ -108,13 +108,13 @@ namespace Jackett.Common.Indexers AddCategoryMapping(35, TorznabCatType.TV, "TV Cartoons"); AddCategoryMapping(5, TorznabCatType.Books, "Books"); - AddCategoryMapping(45, TorznabCatType.BooksEbook, "Books EBooks"); + AddCategoryMapping(45, TorznabCatType.BooksEBook, "Books EBooks"); AddCategoryMapping(46, TorznabCatType.BooksComics, "Books Comics"); AddCategoryMapping(6, TorznabCatType.PC, "Apps"); AddCategoryMapping(23, TorznabCatType.PCISO, "PC ISO"); AddCategoryMapping(24, TorznabCatType.PCMac, "PC Mac"); - AddCategoryMapping(25, TorznabCatType.PCPhoneOther, "PC Mobile"); + AddCategoryMapping(25, TorznabCatType.PCMobileOther, "PC Mobile"); AddCategoryMapping(33, TorznabCatType.PC0day, "PC 0-day"); AddCategoryMapping(38, TorznabCatType.Other, "Education"); } diff --git a/src/Jackett.Common/Indexers/TorrentMafya.cs b/src/Jackett.Common/Indexers/TorrentMafya.cs index 7450c7349..b89ad96ec 100644 --- a/src/Jackett.Common/Indexers/TorrentMafya.cs +++ b/src/Jackett.Common/Indexers/TorrentMafya.cs @@ -59,7 +59,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping("programs", TorznabCatType.PC, "Program"); AddCategoryMapping("movies", TorznabCatType.Movies, "Film"); AddCategoryMapping("tv", TorznabCatType.TV, "Dizi"); - AddCategoryMapping("apk", TorznabCatType.PCPhoneAndroid, "APK"); + AddCategoryMapping("apk", TorznabCatType.PCMobileAndroid, "APK"); } private static DateTime ParseReleasePublishDate(string date) @@ -107,7 +107,7 @@ namespace Jackett.Common.Indexers result.Add(TorznabCatType.PC.ID); } else if (classes.Contains("fa-android")) { - result.Add(TorznabCatType.PCPhoneAndroid.ID); + result.Add(TorznabCatType.PCMobileAndroid.ID); } return result; } diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs index 002c4bf61..bdd0fede9 100644 --- a/src/Jackett.Common/Indexers/TorrentNetwork.cs +++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs @@ -103,7 +103,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(10, TorznabCatType.PCGames, "Games/Win"); AddCategoryMapping(12, TorznabCatType.ConsoleWii, "Games/Wii"); AddCategoryMapping(13, TorznabCatType.ConsolePS4, "Games/PSX"); - AddCategoryMapping(14, TorznabCatType.ConsoleXbox, "Games/XBOX"); + AddCategoryMapping(14, TorznabCatType.ConsoleXBox, "Games/XBOX"); AddCategoryMapping(4, TorznabCatType.PCMac, "Apps/Mac"); AddCategoryMapping(5, TorznabCatType.PC0day, "Apps/Win"); diff --git a/src/Jackett.Common/Indexers/TorrentSeeds.cs b/src/Jackett.Common/Indexers/TorrentSeeds.cs index dd5c03c3b..ffe8d4105 100644 --- a/src/Jackett.Common/Indexers/TorrentSeeds.cs +++ b/src/Jackett.Common/Indexers/TorrentSeeds.cs @@ -90,16 +90,16 @@ namespace Jackett.Common.Indexers AddCategoryMapping(49, TorznabCatType.MoviesHD, "Movies/X265"); AddCategoryMapping(20, TorznabCatType.AudioVideo, "Music/MVID"); AddCategoryMapping(36, TorznabCatType.TVSport, "TV/SPORT-HD"); - AddCategoryMapping(32, TorznabCatType.BooksEbook, "EBooks"); + AddCategoryMapping(32, TorznabCatType.BooksEBook, "EBooks"); AddCategoryMapping(29, TorznabCatType.ConsoleWiiU, "Games/WIIU"); AddCategoryMapping(25, TorznabCatType.MoviesSD, "Movies/XVID"); AddCategoryMapping(68, TorznabCatType.Audio, "Music/Packs"); AddCategoryMapping(26, TorznabCatType.TVHD, "TV/X264"); AddCategoryMapping(47, TorznabCatType.ConsoleOther, "Games/NSW"); - AddCategoryMapping(17, TorznabCatType.ConsoleXbox360, "Games/XBOX360"); + AddCategoryMapping(17, TorznabCatType.ConsoleXBox360, "Games/XBOX360"); AddCategoryMapping(6, TorznabCatType.XXX, "Movies/XXX"); AddCategoryMapping(67, TorznabCatType.TVHD, "TV-HD/Pack"); - AddCategoryMapping(64, TorznabCatType.TVFOREIGN, "TV/X264-FOREIGN"); + AddCategoryMapping(64, TorznabCatType.TVForeign, "TV/X264-FOREIGN"); AddCategoryMapping(2, TorznabCatType.PCGames, "Games/PC"); AddCategoryMapping(50, TorznabCatType.MoviesBluRay, "Movies/Bluray-UHD"); AddCategoryMapping(55, TorznabCatType.XXX, "Movies/XXX-DVDR"); diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs index 2840c1b18..f29d7652c 100644 --- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs +++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs @@ -97,11 +97,11 @@ namespace Jackett.Common.Indexers AddCategoryMapping(33, TorznabCatType.AudioVideo, "Audio / Videos"); AddCategoryMapping(17, TorznabCatType.Books, "Misc / eBooks"); - AddCategoryMapping(5, TorznabCatType.PCPhoneOther, "Misc / Mobile"); + AddCategoryMapping(5, TorznabCatType.PCMobileOther, "Misc / Mobile"); AddCategoryMapping(39, TorznabCatType.Other, "Misc / Bildung"); - AddCategoryMapping(36, TorznabCatType.TVFOREIGN, "Englisch / Serien"); - AddCategoryMapping(57, TorznabCatType.TVFOREIGN, "Englisch / Serienpacks"); + AddCategoryMapping(36, TorznabCatType.TVForeign, "Englisch / Serien"); + AddCategoryMapping(57, TorznabCatType.TVForeign, "Englisch / Serienpacks"); AddCategoryMapping(37, TorznabCatType.MoviesForeign, "Englisch / Filme"); AddCategoryMapping(47, TorznabCatType.Books, "Englisch / eBooks"); AddCategoryMapping(48, TorznabCatType.Other, "Englisch / Bildung"); diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs index 60a00b4c3..e62c878ef 100644 --- a/src/Jackett.Common/Indexers/XSpeeds.cs +++ b/src/Jackett.Common/Indexers/XSpeeds.cs @@ -72,7 +72,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(65, TorznabCatType.TVDocumentary, "Documentaries"); AddCategoryMapping(10, TorznabCatType.MoviesDVD, "DVDR"); AddCategoryMapping(72, TorznabCatType.MoviesForeign, "Foreign"); - AddCategoryMapping(74, TorznabCatType.TVOTHER, "Kids"); + AddCategoryMapping(74, TorznabCatType.TVOther, "Kids"); AddCategoryMapping(44, TorznabCatType.TVSport, "MMA"); AddCategoryMapping(11, TorznabCatType.Movies, "Movie Boxsets"); AddCategoryMapping(12, TorznabCatType.Movies, "Movies"); @@ -97,7 +97,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(16, TorznabCatType.TVSD, "TV-SD"); AddCategoryMapping(7, TorznabCatType.ConsoleWii, "Wii Games"); AddCategoryMapping(43, TorznabCatType.TVSport, "Wrestling"); - AddCategoryMapping(8, TorznabCatType.ConsoleXbox, "Xbox Games"); + AddCategoryMapping(8, TorznabCatType.ConsoleXBox, "Xbox Games"); // RSS Textual categories AddCategoryMapping("4K Movies", TorznabCatType.MoviesUHD); @@ -113,7 +113,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping("Documentaries", TorznabCatType.TVDocumentary); AddCategoryMapping("DVDR", TorznabCatType.MoviesDVD); AddCategoryMapping("Foreign", TorznabCatType.MoviesForeign); - AddCategoryMapping("Kids", TorznabCatType.TVOTHER); + AddCategoryMapping("Kids", TorznabCatType.TVOther); AddCategoryMapping("MMA", TorznabCatType.TVSport); AddCategoryMapping("Movie Boxsets", TorznabCatType.Movies); AddCategoryMapping("Movies", TorznabCatType.Movies); @@ -137,7 +137,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping("TV-SD", TorznabCatType.TVSD); AddCategoryMapping("Wii Games", TorznabCatType.ConsoleWii); AddCategoryMapping("Wrestling", TorznabCatType.TVSport); - AddCategoryMapping("Xbox Games", TorznabCatType.ConsoleXbox); + AddCategoryMapping("Xbox Games", TorznabCatType.ConsoleXBox); } public override async Task GetConfigurationForSetup() diff --git a/src/Jackett.Common/Indexers/Xthor.cs b/src/Jackett.Common/Indexers/Xthor.cs index e02591001..a7a594e66 100644 --- a/src/Jackett.Common/Indexers/Xthor.cs +++ b/src/Jackett.Common/Indexers/Xthor.cs @@ -98,28 +98,28 @@ namespace Jackett.Common.Indexers AddCategoryMapping(9, TorznabCatType.MoviesOther, "VOSTFR"); // Series - AddCategoryMapping(104, TorznabCatType.TVOTHER, "BLURAY"); - AddCategoryMapping(13, TorznabCatType.TVOTHER, "PACK VF"); + AddCategoryMapping(104, TorznabCatType.TVOther, "BLURAY"); + AddCategoryMapping(13, TorznabCatType.TVOther, "PACK VF"); AddCategoryMapping(15, TorznabCatType.TVHD, "HD VF"); AddCategoryMapping(14, TorznabCatType.TVSD, "SD VF"); - AddCategoryMapping(98, TorznabCatType.TVOTHER, "PACK VOSTFR"); + AddCategoryMapping(98, TorznabCatType.TVOther, "PACK VOSTFR"); AddCategoryMapping(17, TorznabCatType.TVHD, "HD VF VOSTFR"); AddCategoryMapping(16, TorznabCatType.TVSD, "SD VF VOSTFR"); AddCategoryMapping(101, TorznabCatType.TVAnime, "PACK ANIME"); AddCategoryMapping(32, TorznabCatType.TVAnime, "ANIME VF"); AddCategoryMapping(110, TorznabCatType.TVAnime, "ANIME VOSTFR"); - AddCategoryMapping(123, TorznabCatType.TVOTHER, "ANIMATION"); + AddCategoryMapping(123, TorznabCatType.TVOther, "ANIMATION"); AddCategoryMapping(109, TorznabCatType.TVDocumentary, "DOCS"); - AddCategoryMapping(30, TorznabCatType.TVOTHER, "EMISSIONS"); - AddCategoryMapping(34, TorznabCatType.TVOTHER, "SPORT"); + AddCategoryMapping(30, TorznabCatType.TVOther, "EMISSIONS"); + AddCategoryMapping(34, TorznabCatType.TVOther, "SPORT"); // Music AddCategoryMapping(20, TorznabCatType.AudioVideo, "CONCERT"); // Books - AddCategoryMapping(24, TorznabCatType.BooksEbook, "ENOOKS NOVEL"); - AddCategoryMapping(96, TorznabCatType.BooksMagazines, "EBOOKS MAGAZINES"); - AddCategoryMapping(116, TorznabCatType.BooksEbook, "EBOOKS NOVEL JUNIOR"); + AddCategoryMapping(24, TorznabCatType.BooksEBook, "ENOOKS NOVEL"); + AddCategoryMapping(96, TorznabCatType.BooksMags, "EBOOKS MAGAZINES"); + AddCategoryMapping(116, TorznabCatType.BooksEBook, "EBOOKS NOVEL JUNIOR"); AddCategoryMapping(99, TorznabCatType.BooksOther, "EBOOKS BD"); AddCategoryMapping(102, TorznabCatType.BooksComics, "EBOOKS COMICS"); AddCategoryMapping(103, TorznabCatType.BooksOther, "EBOOKS MANGA"); @@ -129,13 +129,13 @@ namespace Jackett.Common.Indexers AddCategoryMapping(27, TorznabCatType.ConsolePS3, "PS GAMES"); AddCategoryMapping(111, TorznabCatType.PCMac, "MAC GAMES"); AddCategoryMapping(112, TorznabCatType.PC, "LINUX GAMES"); - AddCategoryMapping(26, TorznabCatType.ConsoleXbox360, "XBOX GAMES"); + AddCategoryMapping(26, TorznabCatType.ConsoleXBox360, "XBOX GAMES"); AddCategoryMapping(28, TorznabCatType.ConsoleWii, "WII GAMES"); AddCategoryMapping(29, TorznabCatType.ConsoleNDS, "NDS GAMES"); AddCategoryMapping(117, TorznabCatType.PC, "ROM"); AddCategoryMapping(21, TorznabCatType.PC, "PC SOFTWARE"); AddCategoryMapping(22, TorznabCatType.PCMac, "MAC SOFTWARE"); - AddCategoryMapping(23, TorznabCatType.PCPhoneAndroid, "ANDROID"); + AddCategoryMapping(23, TorznabCatType.PCMobileAndroid, "ANDROID"); // XxX AddCategoryMapping(36, TorznabCatType.XXX, "XxX / Films"); diff --git a/src/Jackett.Common/Indexers/XtremeZone.cs b/src/Jackett.Common/Indexers/XtremeZone.cs index df6951ef0..11b9b5ebb 100644 --- a/src/Jackett.Common/Indexers/XtremeZone.cs +++ b/src/Jackett.Common/Indexers/XtremeZone.cs @@ -60,19 +60,19 @@ namespace Jackett.Common.Indexers AddCategoryMapping(61, TorznabCatType.MoviesUHD, "Movies-UHD"); AddCategoryMapping(41, TorznabCatType.TV, "TV-Packs"); - AddCategoryMapping(66, TorznabCatType.TVFOREIGN, "TV-Packs-RO"); + AddCategoryMapping(66, TorznabCatType.TVForeign, "TV-Packs-RO"); AddCategoryMapping(45, TorznabCatType.TVSD, "TV-SD"); AddCategoryMapping(46, TorznabCatType.TVSD, "TV-SD-RO"); AddCategoryMapping(43, TorznabCatType.TVHD, "TV-HD"); AddCategoryMapping(44, TorznabCatType.TVHD, "TV-HD-RO"); - AddCategoryMapping(60, TorznabCatType.TVFOREIGN, "TV-RO"); + AddCategoryMapping(60, TorznabCatType.TVForeign, "TV-RO"); AddCategoryMapping(11, TorznabCatType.PCGames, "Games-PC"); AddCategoryMapping(52, TorznabCatType.Console, "Games-Console"); AddCategoryMapping(1, TorznabCatType.PC0day, "Appz"); AddCategoryMapping(14, TorznabCatType.PC, "Linux"); AddCategoryMapping(37, TorznabCatType.PCMac, "Mac"); - AddCategoryMapping(19, TorznabCatType.PCPhoneOther, "Mobile"); + AddCategoryMapping(19, TorznabCatType.PCMobileOther, "Mobile"); AddCategoryMapping(62, TorznabCatType.TV, "Cartoons"); AddCategoryMapping(3, TorznabCatType.TVAnime, "Anime/Hentai"); @@ -90,7 +90,7 @@ namespace Jackett.Common.Indexers AddCategoryMapping(15, TorznabCatType.XXX, "XXX"); AddCategoryMapping(47, TorznabCatType.XXX, "XXX-DVD"); AddCategoryMapping(48, TorznabCatType.XXX, "XXX-HD"); - AddCategoryMapping(49, TorznabCatType.XXXImageset, "XXX-IMGSet"); + AddCategoryMapping(49, TorznabCatType.XXXImageSet, "XXX-IMGSet"); AddCategoryMapping(50, TorznabCatType.XXX, "XXX-Packs"); AddCategoryMapping(51, TorznabCatType.XXX, "XXX-SD"); } diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj index 6985b7ae4..ec9610dc9 100644 --- a/src/Jackett.Common/Jackett.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -153,7 +153,6 @@ PreserveNewest - @@ -168,11 +167,6 @@ - - TorznabCatType.tt - True - True - True True @@ -208,10 +202,6 @@ PreserveNewest - - TextTemplatingFileGenerator - TorznabCatType.generated.cs - diff --git a/src/Jackett.Common/Models/TorznabCatType.cs b/src/Jackett.Common/Models/TorznabCatType.cs index 85d6421a4..30b31a978 100644 --- a/src/Jackett.Common/Models/TorznabCatType.cs +++ b/src/Jackett.Common/Models/TorznabCatType.cs @@ -3,8 +3,267 @@ using System.Linq; namespace Jackett.Common.Models { - public static partial class TorznabCatType + public static class TorznabCatType { + public static readonly TorznabCategory Console = new TorznabCategory(1000, "Console"); + public static readonly TorznabCategory ConsoleNDS = new TorznabCategory(1010, "Console/NDS"); + public static readonly TorznabCategory ConsolePSP = new TorznabCategory(1020, "Console/PSP"); + public static readonly TorznabCategory ConsoleWii = new TorznabCategory(1030, "Console/Wii"); + public static readonly TorznabCategory ConsoleXBox = new TorznabCategory(1040, "Console/XBox"); + public static readonly TorznabCategory ConsoleXBox360 = new TorznabCategory(1050, "Console/XBox 360"); + public static readonly TorznabCategory ConsoleWiiware = new TorznabCategory(1060, "Console/Wiiware"); + public static readonly TorznabCategory ConsoleXBox360DLC = new TorznabCategory(1070, "Console/XBox 360 DLC"); + public static readonly TorznabCategory ConsolePS3 = new TorznabCategory(1080, "Console/PS3"); + public static readonly TorznabCategory ConsoleOther = new TorznabCategory(1090, "Console/Other"); + public static readonly TorznabCategory Console3DS = new TorznabCategory(1110, "Console/3DS"); + public static readonly TorznabCategory ConsolePSVita = new TorznabCategory(1120, "Console/PS Vita"); + public static readonly TorznabCategory ConsoleWiiU = new TorznabCategory(1130, "Console/WiiU"); + public static readonly TorznabCategory ConsoleXBoxOne = new TorznabCategory(1140, "Console/XBox One"); + public static readonly TorznabCategory ConsolePS4 = new TorznabCategory(1180, "Console/PS4"); + + public static readonly TorznabCategory Movies = new TorznabCategory(2000, "Movies"); + public static readonly TorznabCategory MoviesForeign = new TorznabCategory(2010, "Movies/Foreign"); + public static readonly TorznabCategory MoviesOther = new TorznabCategory(2020, "Movies/Other"); + public static readonly TorznabCategory MoviesSD = new TorznabCategory(2030, "Movies/SD"); + public static readonly TorznabCategory MoviesHD = new TorznabCategory(2040, "Movies/HD"); + public static readonly TorznabCategory MoviesUHD = new TorznabCategory(2045, "Movies/UHD"); + public static readonly TorznabCategory MoviesBluRay = new TorznabCategory(2050, "Movies/BluRay"); + public static readonly TorznabCategory Movies3D = new TorznabCategory(2060, "Movies/3D"); + public static readonly TorznabCategory MoviesDVD = new TorznabCategory(2070, "Movies/DVD"); + public static readonly TorznabCategory MoviesWEBDL = new TorznabCategory(2080, "Movies/WEB-DL"); + + public static readonly TorznabCategory Audio = new TorznabCategory(3000, "Audio"); + public static readonly TorznabCategory AudioMP3 = new TorznabCategory(3010, "Audio/MP3"); + public static readonly TorznabCategory AudioVideo = new TorznabCategory(3020, "Audio/Video"); + public static readonly TorznabCategory AudioAudiobook = new TorznabCategory(3030, "Audio/Audiobook"); + public static readonly TorznabCategory AudioLossless = new TorznabCategory(3040, "Audio/Lossless"); + public static readonly TorznabCategory AudioOther = new TorznabCategory(3050, "Audio/Other"); + public static readonly TorznabCategory AudioForeign = new TorznabCategory(3060, "Audio/Foreign"); + + public static readonly TorznabCategory PC = new TorznabCategory(4000, "PC"); + public static readonly TorznabCategory PC0day = new TorznabCategory(4010, "PC/0day"); + public static readonly TorznabCategory PCISO = new TorznabCategory(4020, "PC/ISO"); + public static readonly TorznabCategory PCMac = new TorznabCategory(4030, "PC/Mac"); + public static readonly TorznabCategory PCMobileOther = new TorznabCategory(4040, "PC/Mobile-Other"); + public static readonly TorznabCategory PCGames = new TorznabCategory(4050, "PC/Games"); + public static readonly TorznabCategory PCMobileiOS = new TorznabCategory(4060, "PC/Mobile-iOS"); + public static readonly TorznabCategory PCMobileAndroid = new TorznabCategory(4070, "PC/Mobile-Android"); + + public static readonly TorznabCategory TV = new TorznabCategory(5000, "TV"); + public static readonly TorznabCategory TVWEBDL = new TorznabCategory(5010, "TV/WEB-DL"); + public static readonly TorznabCategory TVForeign = new TorznabCategory(5020, "TV/Foreign"); + public static readonly TorznabCategory TVSD = new TorznabCategory(5030, "TV/SD"); + public static readonly TorznabCategory TVHD = new TorznabCategory(5040, "TV/HD"); + public static readonly TorznabCategory TVUHD = new TorznabCategory(5045, "TV/UHD"); + public static readonly TorznabCategory TVOther = new TorznabCategory(5050, "TV/Other"); + public static readonly TorznabCategory TVSport = new TorznabCategory(5060, "TV/Sport"); + public static readonly TorznabCategory TVAnime = new TorznabCategory(5070, "TV/Anime"); + public static readonly TorznabCategory TVDocumentary = new TorznabCategory(5080, "TV/Documentary"); + + public static readonly TorznabCategory XXX = new TorznabCategory(6000, "XXX"); + public static readonly TorznabCategory XXXDVD = new TorznabCategory(6010, "XXX/DVD"); + public static readonly TorznabCategory XXXWMV = new TorznabCategory(6020, "XXX/WMV"); + public static readonly TorznabCategory XXXXviD = new TorznabCategory(6030, "XXX/XviD"); + public static readonly TorznabCategory XXXx264 = new TorznabCategory(6040, "XXX/x264"); + public static readonly TorznabCategory XXXUHD = new TorznabCategory(6045, "XXX/UHD"); + public static readonly TorznabCategory XXXPack = new TorznabCategory(6050, "XXX/Pack"); + public static readonly TorznabCategory XXXImageSet = new TorznabCategory(6060, "XXX/ImageSet"); + public static readonly TorznabCategory XXXOther = new TorznabCategory(6070, "XXX/Other"); + public static readonly TorznabCategory XXXSD = new TorznabCategory(6080, "XXX/SD"); + public static readonly TorznabCategory XXXWEBDL = new TorznabCategory(6090, "XXX/WEB-DL"); + + public static readonly TorznabCategory Books = new TorznabCategory(7000, "Books"); + public static readonly TorznabCategory BooksMags = new TorznabCategory(7010, "Books/Mags"); + public static readonly TorznabCategory BooksEBook = new TorznabCategory(7020, "Books/EBook"); + public static readonly TorznabCategory BooksComics = new TorznabCategory(7030, "Books/Comics"); + public static readonly TorznabCategory BooksTechnical = new TorznabCategory(7040, "Books/Technical"); + public static readonly TorznabCategory BooksOther = new TorznabCategory(7050, "Books/Other"); + public static readonly TorznabCategory BooksForeign = new TorznabCategory(7060, "Books/Foreign"); + + public static readonly TorznabCategory Other = new TorznabCategory(8000, "Other"); + public static readonly TorznabCategory OtherMisc = new TorznabCategory(8010, "Other/Misc"); + public static readonly TorznabCategory OtherHashed = new TorznabCategory(8020, "Other/Hashed"); + + public static readonly TorznabCategory[] ParentCats = + { + Console, + Movies, + Audio, + PC, + TV, + XXX, + Books, + Other + }; + + public static readonly TorznabCategory[] AllCats = + { + Console, + ConsoleNDS, + ConsolePSP, + ConsoleWii, + ConsoleXBox, + ConsoleXBox360, + ConsoleWiiware, + ConsoleXBox360DLC, + ConsolePS3, + ConsoleOther, + Console3DS, + ConsolePSVita, + ConsoleWiiU, + ConsoleXBoxOne, + ConsolePS4, + Movies, + MoviesForeign, + MoviesOther, + MoviesSD, + MoviesHD, + MoviesUHD, + MoviesBluRay, + Movies3D, + MoviesDVD, + MoviesWEBDL, + Audio, + AudioMP3, + AudioVideo, + AudioAudiobook, + AudioLossless, + AudioOther, + AudioForeign, + PC, + PC0day, + PCISO, + PCMac, + PCMobileOther, + PCGames, + PCMobileiOS, + PCMobileAndroid, + TV, + TVWEBDL, + TVForeign, + TVSD, + TVHD, + TVUHD, + TVOther, + TVSport, + TVAnime, + TVDocumentary, + XXX, + XXXDVD, + XXXWMV, + XXXXviD, + XXXx264, + XXXUHD, + XXXPack, + XXXImageSet, + XXXOther, + XXXSD, + XXXWEBDL, + Books, + BooksMags, + BooksEBook, + BooksComics, + BooksTechnical, + BooksOther, + BooksForeign, + Other, + OtherMisc, + OtherHashed + }; + + static TorznabCatType() + { + Console.SubCategories.AddRange( + new List + { + ConsoleNDS, + ConsolePSP, + ConsoleWii, + ConsoleXBox, + ConsoleXBox360, + ConsoleWiiware, + ConsoleXBox360DLC, + ConsolePS3, + ConsoleOther, + Console3DS, + ConsolePSVita, + ConsoleWiiU, + ConsoleXBoxOne, + ConsolePS4 + }); + Movies.SubCategories.AddRange( + new List + { + MoviesForeign, + MoviesOther, + MoviesSD, + MoviesHD, + MoviesUHD, + MoviesBluRay, + Movies3D, + MoviesDVD, + MoviesWEBDL + }); + Audio.SubCategories.AddRange( + new List + { + AudioMP3, + AudioVideo, + AudioAudiobook, + AudioLossless, + AudioOther, + AudioForeign + }); + PC.SubCategories.AddRange( + new List + { + PC0day, + PCISO, + PCMac, + PCMobileOther, + PCGames, + PCMobileiOS, + PCMobileAndroid + }); + TV.SubCategories.AddRange( + new List + { + TVWEBDL, + TVForeign, + TVSD, + TVHD, + TVUHD, + TVOther, + TVSport, + TVAnime, + TVDocumentary + }); + XXX.SubCategories.AddRange( + new List + { + XXXDVD, + XXXWMV, + XXXXviD, + XXXx264, + XXXUHD, + XXXPack, + XXXImageSet, + XXXOther, + XXXSD, + XXXWEBDL + }); + Books.SubCategories.AddRange( + new List + { + BooksMags, + BooksEBook, + BooksComics, + BooksTechnical, + BooksOther, + BooksForeign + }); + Other.SubCategories.AddRange(new List {OtherMisc, OtherHashed}); + } public static bool QueryContainsParentCategory(int[] queryCats, ICollection releaseCats) { @@ -15,25 +274,19 @@ namespace Jackett.Common.Models // select cat.SubCategories.Any(c => queryCats.Contains(c.ID))) // .FirstOrDefault(); // Is equal to: - foreach (var releaseCat in releaseCats) { var cat = AllCats.FirstOrDefault(c => c.ID == releaseCat); if (cat != null && queryCats != null) - { return cat.SubCategories.Any(c => queryCats.Contains(c.ID)); - } } return false; } public static string GetCatDesc(int newznabcat) => - AllCats.FirstOrDefault(c => c.ID == newznabcat)?.Name - ?? string.Empty; + AllCats.FirstOrDefault(c => c.ID == newznabcat)?.Name ?? string.Empty; - public static string NormalizeCatName(string name) => name.Replace(" ", "").ToLower(); - - public static TorznabCategory GetCatByName(string name) => AllCats.FirstOrDefault(c => NormalizeCatName(c.Name) == NormalizeCatName(name)); + public static TorznabCategory GetCatByName(string name) => AllCats.FirstOrDefault(c => c.Name == name); } } diff --git a/src/Jackett.Common/Models/TorznabCatType.generated.cs b/src/Jackett.Common/Models/TorznabCatType.generated.cs deleted file mode 100644 index b64f41775..000000000 --- a/src/Jackett.Common/Models/TorznabCatType.generated.cs +++ /dev/null @@ -1,169 +0,0 @@ -using System.Collections.Generic; - -namespace Jackett.Common.Models -{ - - public static partial class TorznabCatType - { - - public static readonly TorznabCategory Console = new TorznabCategory(1000, "Console"); - - public static readonly TorznabCategory ConsoleNDS = new TorznabCategory(1010, "Console/NDS"); - - public static readonly TorznabCategory ConsolePSP = new TorznabCategory(1020, "Console/PSP"); - - public static readonly TorznabCategory ConsoleWii = new TorznabCategory(1030, "Console/Wii"); - - public static readonly TorznabCategory ConsoleXbox = new TorznabCategory(1040, "Console/Xbox"); - - public static readonly TorznabCategory ConsoleXbox360 = new TorznabCategory(1050, "Console/Xbox 360"); - - public static readonly TorznabCategory ConsoleWiiwareVC = new TorznabCategory(1060, "Console/Wiiware/VC"); - - public static readonly TorznabCategory ConsoleXBOX360DLC = new TorznabCategory(1070, "Console/XBOX 360 DLC"); - - public static readonly TorznabCategory ConsolePS3 = new TorznabCategory(1080, "Console/PS3"); - - public static readonly TorznabCategory ConsoleOther = new TorznabCategory(1090, "Console/Other"); - - public static readonly TorznabCategory Console3DS = new TorznabCategory(1110, "Console/3DS"); - - public static readonly TorznabCategory ConsolePSVita = new TorznabCategory(1120, "Console/PS Vita"); - - public static readonly TorznabCategory ConsoleWiiU = new TorznabCategory(1130, "Console/WiiU"); - - public static readonly TorznabCategory ConsoleXboxOne = new TorznabCategory(1140, "Console/Xbox One"); - - public static readonly TorznabCategory ConsolePS4 = new TorznabCategory(1180, "Console/PS4"); - - public static readonly TorznabCategory Movies = new TorznabCategory(2000, "Movies"); - - public static readonly TorznabCategory MoviesForeign = new TorznabCategory(2010, "Movies/Foreign"); - - public static readonly TorznabCategory MoviesOther = new TorznabCategory(2020, "Movies/Other"); - - public static readonly TorznabCategory MoviesSD = new TorznabCategory(2030, "Movies/SD"); - - public static readonly TorznabCategory MoviesHD = new TorznabCategory(2040, "Movies/HD"); - - public static readonly TorznabCategory MoviesUHD = new TorznabCategory(2045, "Movies/UHD"); - - public static readonly TorznabCategory Movies3D = new TorznabCategory(2050, "Movies/3D"); - - public static readonly TorznabCategory MoviesBluRay = new TorznabCategory(2060, "Movies/BluRay"); - - public static readonly TorznabCategory MoviesDVD = new TorznabCategory(2070, "Movies/DVD"); - - public static readonly TorznabCategory MoviesWEBDL = new TorznabCategory(2080, "Movies/WEBDL"); - - public static readonly TorznabCategory Audio = new TorznabCategory(3000, "Audio"); - - public static readonly TorznabCategory AudioMP3 = new TorznabCategory(3010, "Audio/MP3"); - - public static readonly TorznabCategory AudioVideo = new TorznabCategory(3020, "Audio/Video"); - - public static readonly TorznabCategory AudioAudiobook = new TorznabCategory(3030, "Audio/Audiobook"); - - public static readonly TorznabCategory AudioLossless = new TorznabCategory(3040, "Audio/Lossless"); - - public static readonly TorznabCategory AudioOther = new TorznabCategory(3050, "Audio/Other"); - - public static readonly TorznabCategory AudioForeign = new TorznabCategory(3060, "Audio/Foreign"); - - public static readonly TorznabCategory PC = new TorznabCategory(4000, "PC"); - - public static readonly TorznabCategory PC0day = new TorznabCategory(4010, "PC/0day"); - - public static readonly TorznabCategory PCISO = new TorznabCategory(4020, "PC/ISO"); - - public static readonly TorznabCategory PCMac = new TorznabCategory(4030, "PC/Mac"); - - public static readonly TorznabCategory PCPhoneOther = new TorznabCategory(4040, "PC/Phone-Other"); - - public static readonly TorznabCategory PCGames = new TorznabCategory(4050, "PC/Games"); - - public static readonly TorznabCategory PCPhoneIOS = new TorznabCategory(4060, "PC/Phone-IOS"); - - public static readonly TorznabCategory PCPhoneAndroid = new TorznabCategory(4070, "PC/Phone-Android"); - - public static readonly TorznabCategory TV = new TorznabCategory(5000, "TV"); - - public static readonly TorznabCategory TVWEBDL = new TorznabCategory(5010, "TV/WEB-DL"); - - public static readonly TorznabCategory TVFOREIGN = new TorznabCategory(5020, "TV/FOREIGN"); - - public static readonly TorznabCategory TVSD = new TorznabCategory(5030, "TV/SD"); - - public static readonly TorznabCategory TVHD = new TorznabCategory(5040, "TV/HD"); - - public static readonly TorznabCategory TVUHD = new TorznabCategory(5045, "TV/UHD"); - - public static readonly TorznabCategory TVOTHER = new TorznabCategory(5050, "TV/OTHER"); - - public static readonly TorznabCategory TVSport = new TorznabCategory(5060, "TV/Sport"); - - public static readonly TorznabCategory TVAnime = new TorznabCategory(5070, "TV/Anime"); - - public static readonly TorznabCategory TVDocumentary = new TorznabCategory(5080, "TV/Documentary"); - - public static readonly TorznabCategory XXX = new TorznabCategory(6000, "XXX"); - - public static readonly TorznabCategory XXXDVD = new TorznabCategory(6010, "XXX/DVD"); - - public static readonly TorznabCategory XXXWMV = new TorznabCategory(6020, "XXX/WMV"); - - public static readonly TorznabCategory XXXXviD = new TorznabCategory(6030, "XXX/XviD"); - - public static readonly TorznabCategory XXXx264 = new TorznabCategory(6040, "XXX/x264"); - - public static readonly TorznabCategory XXXOther = new TorznabCategory(6050, "XXX/Other"); - - public static readonly TorznabCategory XXXImageset = new TorznabCategory(6060, "XXX/Imageset"); - - public static readonly TorznabCategory XXXPacks = new TorznabCategory(6070, "XXX/Packs"); - - public static readonly TorznabCategory Books = new TorznabCategory(7000, "Books"); - - public static readonly TorznabCategory BooksEbook = new TorznabCategory(7010, "Books/Ebook"); - - public static readonly TorznabCategory BooksComics = new TorznabCategory(7020, "Books/Comics"); - - public static readonly TorznabCategory BooksMagazines = new TorznabCategory(7030, "Books/Magazines"); - - public static readonly TorznabCategory BooksTechnical = new TorznabCategory(7040, "Books/Technical"); - - public static readonly TorznabCategory BooksOther = new TorznabCategory(7050, "Books/Other"); - - public static readonly TorznabCategory BooksForeign = new TorznabCategory(7060, "Books/Foreign"); - - public static readonly TorznabCategory Other = new TorznabCategory(8000, "Other"); - - public static readonly TorznabCategory OtherMisc = new TorznabCategory(8010, "Other/Misc"); - - public static readonly TorznabCategory OtherHashed = new TorznabCategory(8020, "Other/Hashed"); - - public static readonly TorznabCategory[] AllCats = new TorznabCategory[] { Console, ConsoleNDS, ConsolePSP, ConsoleWii, ConsoleXbox, ConsoleXbox360, ConsoleWiiwareVC, ConsoleXBOX360DLC, ConsolePS3, ConsoleOther, Console3DS, ConsolePSVita, ConsoleWiiU, ConsoleXboxOne, ConsolePS4, Movies, MoviesForeign, MoviesOther, MoviesSD, MoviesHD, MoviesUHD, Movies3D, MoviesBluRay, MoviesDVD, MoviesWEBDL, Audio, AudioMP3, AudioVideo, AudioAudiobook, AudioLossless, AudioOther, AudioForeign, PC, PC0day, PCISO, PCMac, PCPhoneOther, PCGames, PCPhoneIOS, PCPhoneAndroid, TV, TVWEBDL, TVFOREIGN, TVSD, TVHD, TVUHD, TVOTHER, TVSport, TVAnime, TVDocumentary, XXX, XXXDVD, XXXWMV, XXXXviD, XXXx264, XXXOther, XXXImageset, XXXPacks, Other, OtherMisc, OtherHashed, Books, BooksEbook, BooksComics, BooksMagazines, BooksTechnical, BooksOther, BooksForeign }; - - static TorznabCatType() - { - - Console.SubCategories.AddRange(new List { ConsoleNDS, ConsolePSP, ConsoleWii, ConsoleXbox, ConsoleXbox360, ConsoleWiiwareVC, ConsoleXBOX360DLC, ConsolePS3, ConsoleOther, Console3DS, ConsolePSVita, ConsoleWiiU, ConsoleXboxOne, ConsolePS4 }); - - Movies.SubCategories.AddRange(new List { MoviesForeign, MoviesOther, MoviesSD, MoviesHD, MoviesUHD, Movies3D, MoviesBluRay, MoviesDVD, MoviesWEBDL }); - - Audio.SubCategories.AddRange(new List { AudioMP3, AudioVideo, AudioAudiobook, AudioLossless, AudioOther, AudioForeign }); - - PC.SubCategories.AddRange(new List { PC0day, PCISO, PCMac, PCPhoneOther, PCGames, PCPhoneIOS, PCPhoneAndroid }); - - TV.SubCategories.AddRange(new List { TVWEBDL, TVFOREIGN, TVSD, TVHD, TVUHD, TVOTHER, TVSport, TVAnime, TVDocumentary }); - - XXX.SubCategories.AddRange(new List { XXXDVD, XXXWMV, XXXXviD, XXXx264, XXXOther, XXXImageset, XXXPacks }); - - Other.SubCategories.AddRange(new List { OtherMisc, OtherHashed }); - - Books.SubCategories.AddRange(new List { BooksEbook, BooksComics, BooksMagazines, BooksTechnical, BooksOther, BooksForeign }); - - } - } -} - diff --git a/src/Jackett.Common/Models/TorznabCatType.tt b/src/Jackett.Common/Models/TorznabCatType.tt deleted file mode 100644 index 2685ec28e..000000000 --- a/src/Jackett.Common/Models/TorznabCatType.tt +++ /dev/null @@ -1,136 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Collections.Generic" #> -<#@ output extension=".generated.cs" #> -<# string data = @" - -1000: Console -1010: Console/NDS -1020: Console/PSP -1030: Console/Wii -1040: Console/Xbox -1050: Console/Xbox 360 -1060: Console/Wiiware/VC -1070: Console/XBOX 360 DLC -1080: Console/PS3 -1090: Console/Other -1110: Console/3DS -1120: Console/PS Vita -1130: Console/WiiU -1140: Console/Xbox One -1180: Console/PS4 -2000: Movies -2010: Movies/Foreign -2020: Movies/Other -2030: Movies/SD -2040: Movies/HD -2045: Movies/UHD -2050: Movies/3D -2060: Movies/BluRay -2070: Movies/DVD -2080: Movies/WEBDL -3000: Audio -3010: Audio/MP3 -3020: Audio/Video -3030: Audio/Audiobook -3040: Audio/Lossless -3050: Audio/Other -3060: Audio/Foreign -4000: PC -4010: PC/0day -4020: PC/ISO -4030: PC/Mac -4040: PC/Phone-Other -4050: PC/Games -4060: PC/Phone-IOS -4070: PC/Phone-Android -5000: TV -5010: TV/WEB-DL -5020: TV/FOREIGN -5030: TV/SD -5040: TV/HD -5045: TV/UHD -5050: TV/OTHER -5060: TV/Sport -5070: TV/Anime -5080: TV/Documentary -6000: XXX -6010: XXX/DVD -6020: XXX/WMV -6030: XXX/XviD -6040: XXX/x264 -6050: XXX/Other -6060: XXX/Imageset -6070: XXX/Packs -7000: Books -7010: Books/Ebook -7020: Books/Comics -7030: Books/Magazines -7040: Books/Technical -7050: Books/Other -7060: Books/Foreign -8000: Other -8010: Other/Misc -8020: Other/Hashed - -"; #> -using System.Collections.Generic; - -namespace Jackett.Common.Models -{ - - public static partial class TorznabCatType - { -<# - var items = data.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); - var cats = new List(); - foreach (var item in items) - { - var parts = item.Split(new string[] { ": " }, StringSplitOptions.RemoveEmptyEntries); - var num = int.Parse(parts[0]); - var memberName = parts[1].Replace("/", "").Replace(" ", "").Replace("-", ""); - cats.Add(new CatStub { Number = num, MemberName = memberName, Name = parts[1] }); - } - - foreach(var cat in cats) - { #> - - public static readonly TorznabCategory <#= cat.MemberName #> = new TorznabCategory(<#= cat.Number #>, "<#= cat.Name #>"); - <# - } #> - - public static readonly TorznabCategory[] AllCats = new TorznabCategory[] { <#= string.Join(", ", cats.Select(c => c.MemberName)) #> }; - - static TorznabCatType() - { - <# - foreach (var cat in cats) - { - if (cat.Name.Contains("/")) - { - var parentName = cat.Name.Split('/')[0]; - var parentCat = cats.FirstOrDefault(c => c.Name == parentName); - parentCat.Children.Add(cat); - } - } - - foreach (var parentCat in cats.Where(c => c.Children.Count > 0)) - { #> - <#= parentCat.MemberName #>.SubCategories.AddRange(new List { <#= string.Join(", ", parentCat.Children.Select(t => t.MemberName)) #> }); - <# } - - #> - } - } -} - -<#+ -class CatStub -{ - public int Number; - public string Name; - public string MemberName; - public List Children = new List(); -} -#> diff --git a/src/Jackett.Test/Common/Models/TorznabCapabilitiesCategoriesTests.cs b/src/Jackett.Test/Common/Models/TorznabCapabilitiesCategoriesTests.cs index 609814113..57c6e8915 100644 --- a/src/Jackett.Test/Common/Models/TorznabCapabilitiesCategoriesTests.cs +++ b/src/Jackett.Test/Common/Models/TorznabCapabilitiesCategoriesTests.cs @@ -53,10 +53,10 @@ namespace Jackett.Test.Common.Models // add subcategory of books (child category) tcc.AddCategoryMapping("33", TorznabCatType.BooksComics); Assert.AreEqual(3, cats.Count); - Assert.AreEqual(7020, cats[2].ID); + Assert.AreEqual(7030, cats[2].ID); // add int category with description => custom category. it's converted into 2 different categories - tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c"); + tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c"); Assert.AreEqual(5, cats.Count); Assert.AreEqual(1040, cats[3].ID); Assert.AreEqual(100044, cats[4].ID); @@ -69,7 +69,7 @@ namespace Jackett.Test.Common.Models Assert.AreEqual(1030, cats[5].ID); // add another int category with description that maps to ConsoleXbox (there are 2 tracker cats => 1 torznab cat) - tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2"); + tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2"); Assert.AreEqual(7, cats.Count); Assert.AreEqual(100045, cats[6].ID); // 1040 is duplicated and it is not added } @@ -107,7 +107,7 @@ namespace Jackett.Test.Common.Models query = new TorznabQuery // duplicate category (1 toznab cat => 2 indexer cats) { - Categories = new [] { TorznabCatType.ConsoleXbox.ID } + Categories = new [] { TorznabCatType.ConsoleXBox.ID } }; trackerCats = tcc.MapTorznabCapsToTrackers(query); Assert.AreEqual(2, trackerCats.Count); @@ -223,9 +223,9 @@ namespace Jackett.Test.Common.Models tcc.AddCategoryMapping("1", TorznabCatType.Movies); tcc.AddCategoryMapping("mov_sd", TorznabCatType.MoviesSD); tcc.AddCategoryMapping("33", TorznabCatType.BooksComics); - tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c"); + tcc.AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c"); tcc.AddCategoryMapping("con_wii", TorznabCatType.ConsoleWii, "Console/Wii_c"); - tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2"); + tcc.AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2"); return tcc; } } diff --git a/src/Jackett.Test/Torznab/TorznabTests.cs b/src/Jackett.Test/Torznab/TorznabTests.cs index 5e6132395..109668c26 100644 --- a/src/Jackett.Test/Torznab/TorznabTests.cs +++ b/src/Jackett.Test/Torznab/TorznabTests.cs @@ -64,9 +64,9 @@ namespace Jackett.Test.Torznab AddCategoryMapping("1", TorznabCatType.Movies); AddCategoryMapping("mov_sd", TorznabCatType.MoviesSD); AddCategoryMapping("33", TorznabCatType.BooksComics); - AddCategoryMapping("44", TorznabCatType.ConsoleXbox, "Console/Xbox_c"); + AddCategoryMapping("44", TorznabCatType.ConsoleXBox, "Console/Xbox_c"); AddCategoryMapping("con_wii", TorznabCatType.ConsoleWii, "Console/Wii_c"); - AddCategoryMapping("45", TorznabCatType.ConsoleXbox, "Console/Xbox_c2"); + AddCategoryMapping("45", TorznabCatType.ConsoleXBox, "Console/Xbox_c2"); var query = new TorznabQuery // int category with subcategories (parent cat) { @@ -102,7 +102,7 @@ namespace Jackett.Test.Torznab Assert.AreEqual("1040", dtoCaps[3].ID); Assert.AreEqual("2000", dtoCaps[4].ID); Assert.AreEqual("2030", dtoCaps[5].ID); - Assert.AreEqual("7020", dtoCaps[6].ID); + Assert.AreEqual("7030", dtoCaps[6].ID); // test Torznab caps (XML) => more in Common.Model.TorznabCapabilitiesTests var xDocument = TorznabCaps.GetXDocument(); @@ -114,7 +114,7 @@ namespace Jackett.Test.Torznab Assert.AreEqual("1040", xDoumentCategories?[3].Attribute("id")?.Value); Assert.AreEqual("2000", xDoumentCategories?[4].Attribute("id")?.Value); // Movies Assert.AreEqual("2030", xDoumentCategories?[5].Attribute("id")?.Value); - Assert.AreEqual("7020", xDoumentCategories?[6].Attribute("id")?.Value); + Assert.AreEqual("7030", xDoumentCategories?[6].Attribute("id")?.Value); Assert.AreEqual(9, xDoumentCategories?[4]?.Elements("subcat").ToList().Count); // Movies } @@ -179,7 +179,7 @@ namespace Jackett.Test.Torznab new CategorymappingBlock // integer cat with description (child cat) => generates custom cat 100044 { id = "44", - cat = TorznabCatType.ConsoleXbox.Name, + cat = TorznabCatType.ConsoleXBox.Name, desc = "Console/Xbox_c" }, new CategorymappingBlock // string cat with description (child cat) @@ -191,7 +191,7 @@ namespace Jackett.Test.Torznab new CategorymappingBlock // duplicate category (2 indexer cats => 1 toznab cat) { id = "45", - cat = TorznabCatType.ConsoleXbox.Name, + cat = TorznabCatType.ConsoleXBox.Name, desc = "Console/Xbox_c2" }, } @@ -205,7 +205,7 @@ namespace Jackett.Test.Torznab Assert.AreEqual(7, cats.Count); Assert.AreEqual(2000, cats[0].ID); Assert.AreEqual(2030, cats[1].ID); - Assert.AreEqual(7020, cats[2].ID); + Assert.AreEqual(7030, cats[2].ID); Assert.AreEqual(1040, cats[3].ID); Assert.AreEqual(100044, cats[4].ID); Assert.AreEqual(1030, cats[5].ID);