From 0ac587d97bda305b32fc87c83d315690c2608c73 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 12 Feb 2019 12:58:20 +1300 Subject: [PATCH] speedCD: update categories and correct title link. resolves # --- src/Jackett.Common/Indexers/SpeedCD.cs | 62 ++++++++++++++------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs index 4f35fd803..17340f47c 100644 --- a/src/Jackett.Common/Indexers/SpeedCD.cs +++ b/src/Jackett.Common/Indexers/SpeedCD.cs @@ -45,34 +45,37 @@ namespace Jackett.Common.Indexers TorznabCaps.SupportsImdbSearch = true; - AddCategoryMapping("1", TorznabCatType.MoviesOther); - AddCategoryMapping("42", TorznabCatType.Movies); - AddCategoryMapping("32", TorznabCatType.Movies); - AddCategoryMapping("43", TorznabCatType.MoviesHD); - AddCategoryMapping("47", TorznabCatType.Movies); - AddCategoryMapping("28", TorznabCatType.MoviesBluRay); - AddCategoryMapping("48", TorznabCatType.Movies3D); - AddCategoryMapping("40", TorznabCatType.MoviesDVD); - AddCategoryMapping("49", TorznabCatType.TVHD); - AddCategoryMapping("50", TorznabCatType.TVSport); - AddCategoryMapping("52", TorznabCatType.TVHD); - AddCategoryMapping("53", TorznabCatType.TVSD); - AddCategoryMapping("41", TorznabCatType.TV); - AddCategoryMapping("55", TorznabCatType.TV); - AddCategoryMapping("2", TorznabCatType.TVSD); - AddCategoryMapping("30", TorznabCatType.TVAnime); - AddCategoryMapping("25", TorznabCatType.PCISO); - AddCategoryMapping("39", TorznabCatType.ConsoleWii); - AddCategoryMapping("45", TorznabCatType.ConsolePS3); - AddCategoryMapping("35", TorznabCatType.Console); - AddCategoryMapping("33", TorznabCatType.ConsoleXbox360); - AddCategoryMapping("46", TorznabCatType.PCPhoneOther); - AddCategoryMapping("24", TorznabCatType.PC0day); - AddCategoryMapping("51", TorznabCatType.PCMac); - AddCategoryMapping("27", TorznabCatType.Books); - AddCategoryMapping("26", TorznabCatType.Audio); - AddCategoryMapping("44", TorznabCatType.Audio); - AddCategoryMapping("29", TorznabCatType.AudioVideo); + AddCategoryMapping(1, TorznabCatType.MoviesOther, "Movies/XviD"); + AddCategoryMapping(42, TorznabCatType.Movies, "Movies/Packs"); + AddCategoryMapping(32, TorznabCatType.Movies, "Movies/Kids"); + AddCategoryMapping(43, TorznabCatType.MoviesHD, "Movies/HD"); + AddCategoryMapping(47, TorznabCatType.Movies, "Movies/DiVERSiTY"); + AddCategoryMapping(28, TorznabCatType.MoviesBluRay, "Movies/B-Ray"); + AddCategoryMapping(48, TorznabCatType.Movies3D, "Movies/3D"); + AddCategoryMapping(40, TorznabCatType.MoviesDVD, "Movies/DVD-R"); + AddCategoryMapping(56, TorznabCatType.Movies, "Movies/Anime"); + AddCategoryMapping(50, TorznabCatType.TVSport, "TV/Sports"); + AddCategoryMapping(52, TorznabCatType.TVHD, "TV/B-Ray"); + AddCategoryMapping(53, TorznabCatType.TVSD, "TV/DVD-R"); + AddCategoryMapping(41, TorznabCatType.TV, "TV/Packs"); + AddCategoryMapping(55, TorznabCatType.TV, "TV/Kids"); + AddCategoryMapping(57, TorznabCatType.TV, "TV/DiVERSiTY"); + AddCategoryMapping(49, TorznabCatType.TVHD, "TV/HD"); + AddCategoryMapping(2, TorznabCatType.TVSD, "TV/Episodes"); + AddCategoryMapping(30, TorznabCatType.TVAnime, "TV/Anime"); + AddCategoryMapping(25, TorznabCatType.PCISO, "Games/PC ISO"); + 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(24, TorznabCatType.PC0day, "Apps/0DAY"); + AddCategoryMapping(51, TorznabCatType.PCMac, "Mac"); + AddCategoryMapping(54, TorznabCatType.Books, "Educational"); + AddCategoryMapping(27, TorznabCatType.Books, "Books-Mags"); + AddCategoryMapping(26, TorznabCatType.Audio, "Music/Audio"); + AddCategoryMapping(44, TorznabCatType.Audio, "Music/Pack"); + AddCategoryMapping(29, TorznabCatType.AudioVideo, "Music/Video"); } public override async Task ApplyConfiguration(JToken configJson) @@ -152,6 +155,7 @@ namespace Jackett.Common.Indexers string title = torrentData.Find("td[class='lft'] > div > a").First().Text().Trim(); Uri link = new Uri(SiteLink + torrentData.Find("img[title='Download']").First().Parent().Attr("href").Trim()); Uri guid = link; + Uri comments = new Uri(SiteLink + torrentData.Find("td[class='lft'] > div > a").First().Attr("href").Trim()); long size = ReleaseInfo.GetBytes(cells.Elements.ElementAt(4).Cq().Text()); int grabs = ParseUtil.CoerceInt(cells.Elements.ElementAt(5).Cq().Text()); int seeders = ParseUtil.CoerceInt(cells.Elements.ElementAt(6).Cq().Text()); @@ -177,7 +181,7 @@ namespace Jackett.Common.Indexers release.MinimumRatio = 1; release.MinimumSeedTime = 172800; release.Category = MapTrackerCatToNewznab(category.ToString()); - release.Comments = guid; + release.Comments = comments; if (torrentData.Find("span:contains(\"[Freeleech]\")").Any()) release.DownloadVolumeFactor = 0;