From f52cc4273f55bdec5dbbde31104fe9835ef381f1 Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:36:39 +0100 Subject: [PATCH] partis: update/fix cats and tidy. resolves #13330 (#13331) --- README.md | 2 +- src/Jackett.Common/Indexers/Partis.cs | 45 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 2126cd9de..b288be76e 100644 --- a/README.md +++ b/README.md @@ -462,7 +462,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#) * P2PBG * P2PElite - * Partis [![(invite needed)][inviteneeded]](#) + * Partis * PassThePopcorn (PTP) * Peeratiko * PeerJunkies diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs index 345cb6b74..852918697 100644 --- a/src/Jackett.Common/Indexers/Partis.cs +++ b/src/Jackett.Common/Indexers/Partis.cs @@ -66,30 +66,32 @@ namespace Jackett.Common.Indexers Type = "private"; // Movies - AddCategoryMapping(40, TorznabCatType.MoviesBluRay, "Blu-Ray 1080p/i"); - AddCategoryMapping(42, TorznabCatType.MoviesBluRay, "Blu-Ray 720p/i"); - AddCategoryMapping(43, TorznabCatType.MoviesBluRay, "Blu-Ray B-Disc"); - AddCategoryMapping(41, TorznabCatType.MoviesBluRay, "Blu-Ray 3D"); - AddCategoryMapping(44, TorznabCatType.MoviesBluRay, "Blu-Ray Remux"); - AddCategoryMapping(45, TorznabCatType.MoviesBluRay, "Blu-Ray Remux/Disc"); - AddCategoryMapping(32, TorznabCatType.MoviesUHD, "UHD 4K Disc"); + AddCategoryMapping(40, TorznabCatType.MoviesHD, "Blu-ray 1080p/i"); + AddCategoryMapping(42, TorznabCatType.MoviesHD, "Blu-ray 720p/i"); + AddCategoryMapping(43, TorznabCatType.MoviesBluRay, "Blu-ray B-Disc"); + AddCategoryMapping(41, TorznabCatType.Movies3D, "Blu-ray 3D"); + AddCategoryMapping(44, TorznabCatType.MoviesHD, "Blu-ray Remux"); + AddCategoryMapping(45, TorznabCatType.MoviesBluRay, "Blu-ray Remux/Disc"); + AddCategoryMapping(32, TorznabCatType.MoviesBluRay, "UHD 4K Disc"); AddCategoryMapping(55, TorznabCatType.MoviesUHD, "UHD 4K Remux"); AddCategoryMapping(20, TorznabCatType.MoviesHD, "HD"); - AddCategoryMapping(4, TorznabCatType.MoviesSD, "DVD-R"); + AddCategoryMapping(4, TorznabCatType.MoviesDVD, "DVD-R"); AddCategoryMapping(7, TorznabCatType.MoviesSD, "XviD"); - AddCategoryMapping(30, TorznabCatType.MoviesSD, "Risanke"); - AddCategoryMapping(54, TorznabCatType.MoviesSD, "WEBRip"); + AddCategoryMapping(30, TorznabCatType.MoviesOther, "Risanke"); + AddCategoryMapping(54, TorznabCatType.MoviesWEBDL, "WEBRip"); AddCategoryMapping(59, TorznabCatType.MoviesWEBDL, "WEB-DL"); + AddCategoryMapping(24, TorznabCatType.TVDocumentary, "Dokumentarci"); // TV AddCategoryMapping(53, TorznabCatType.TVWEBDL, "TV WEB-DL"); AddCategoryMapping(60, TorznabCatType.TVSD, "TV-XviD"); AddCategoryMapping(38, TorznabCatType.TVSD, "SD-TV"); + AddCategoryMapping(17, TorznabCatType.TVHD, "HD-TV (1)"); + AddCategoryMapping(31, TorznabCatType.TVHD, "HD-TV (2)"); AddCategoryMapping(51, TorznabCatType.TVHD, "TV 1080p/i"); AddCategoryMapping(52, TorznabCatType.TVHD, "TV 720p/i"); AddCategoryMapping(5, TorznabCatType.TVSport, "Sport"); AddCategoryMapping(2, TorznabCatType.TVAnime, "Anime"); - AddCategoryMapping(24, TorznabCatType.TVDocumentary, "Dokumentarci"); // Games AddCategoryMapping(10, TorznabCatType.PCGames, "PC igre/ISO"); @@ -108,17 +110,25 @@ namespace Jackett.Common.Indexers AddCategoryMapping(46, TorznabCatType.AudioLossless, "Glasba/Flac"); AddCategoryMapping(8, TorznabCatType.AudioOther, "Glasba/Ostalo"); AddCategoryMapping(47, TorznabCatType.AudioMP3, "Glasba/Mp3"); - AddCategoryMapping(8, TorznabCatType.AudioVideo, "Music DVD"); - AddCategoryMapping(8, TorznabCatType.AudioVideo, "Videospoti"); + AddCategoryMapping(22, TorznabCatType.AudioVideo, "Music DVD"); + AddCategoryMapping(23, TorznabCatType.AudioVideo, "Videospoti"); // Programs AddCategoryMapping(15, TorznabCatType.PC, "PC programi/drugo"); - AddCategoryMapping(15, TorznabCatType.PCMac, "Mac Programi"); + AddCategoryMapping(58, TorznabCatType.PCMac, "Mac Programi"); AddCategoryMapping(16, TorznabCatType.PCISO, "PC programi/ISO"); + AddCategoryMapping(50, TorznabCatType.PC, "Linux programi"); // Other AddCategoryMapping(21, TorznabCatType.AudioAudiobook, "AudioBook"); AddCategoryMapping(3, TorznabCatType.BooksEBook, "eKnjige"); + AddCategoryMapping(19, TorznabCatType.Other, "Slike"); + AddCategoryMapping(9, TorznabCatType.ConsoleNDS, "GBA"); + AddCategoryMapping(25, TorznabCatType.PCMobileAndroid, "GSM/Igre"); + AddCategoryMapping(26, TorznabCatType.PCMobileAndroid, "PDA"); + AddCategoryMapping(61, TorznabCatType.PCMobileAndroid, "GSM/Programi"); + AddCategoryMapping(62, TorznabCatType.PCMobileAndroid, "GSM/Ostalo"); + AddCategoryMapping(29, TorznabCatType.PCMobileiOS, "iPOD"); } public override async Task ApplyConfiguration(JToken configJson) @@ -150,16 +160,13 @@ namespace Jackett.Common.Indexers var catList = MapTorznabCapsToTrackers(query); // map categories from query to indexer specific var categ = string.Join(",", catList); - //create GET request - search URI + // create GET request - search URI queryCollection.Add("q", searchString); queryCollection.Add("cat", categ.TrimStart(',')); - //c oncatenate base search url with query + // concatenate base search url with query var searchUrl = $"{SearchUrl}?{queryCollection.GetQueryString()}"; - // log search URL - logger.Info(string.Format("Searh URL Partis_: {0}", searchUrl)); - // add necessary headers var header = new Dictionary {