Merge branch 'master' into feature/cloudproxy

abeloin · Nov 22, 2020 · 740516e · 740516e
2 parents 0868850 + a7bc5aa
commit 740516e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Jackett.Common/Definitions/extratorrent-it.yml b/src/Jackett.Common/Definitions/extratorrent-it.yml
@@ -827,7 +827,7 @@ caps:
     - {id: 1025, cat: TV/HD, desc: "TV - HEVC/x265"}
     - {id: 1026, cat: TV/SD, desc: "TV - Divx/Xvid"}
     - {id: 1027, cat: TV/SD, desc: "TV - DVD"}
-    - {id: 1028, cat: TV/HD, desc: "TV/HD - HD"}
+    - {id: 1028, cat: TV/HD, desc: "TV - HD"}
     - {id: 1029, cat: TV/SD, desc: "TV - SVCD/VCD"}
     # Apps
     - {id: 7, cat: PC, desc: "Software"}
@@ -857,7 +857,7 @@ caps:
     - {id: 13, cat: Console, desc: "Games - ROMS/Retro"}
     - {id: 15, cat: Console, desc: "Games - Sega Saturn"}
     - {id: 14, cat: PC/Games, desc: "Games - Video Demonstrations"}
-    - {id: 701, cat: Console/Wii, desc: "Games -Wii"}
+    - {id: 701, cat: Console/Wii, desc: "Games - Wii"}
     - {id: 421, cat: PC/Games, desc: "Games - Windows"}
     - {id: 10, cat: PC/Games, desc: "Games - Windows Kids Games"}
     - {id: 16, cat: Console/XBox, desc: "Games - XBox"}

diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs
@@ -90,6 +90,7 @@ public TorrentHeaven(IIndexerConfigurationService configService, WebClient wc, L
             AddCategoryMapping(53, TorznabCatType.TV, "TV/Serien Complete Packs");
             AddCategoryMapping(54, TorznabCatType.TVSport, "TV/Sport");
             AddCategoryMapping(66, TorznabCatType.TVForeign, "TV/International");
+            AddCategoryMapping(110, TorznabCatType.TVUHD, "TV/Serien - 4K");
             AddCategoryMapping(22, TorznabCatType.Books, "MISC/EBooks");
             AddCategoryMapping(24, TorznabCatType.Other, "MISC/Sonstiges");
             AddCategoryMapping(25, TorznabCatType.Other, "MISC/Tonspuren");
@@ -237,7 +238,6 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                     var size = ReleaseInfo.GetBytes(qColumn1[1].TextContent);
                     var seeders = ParseUtil.CoerceInt(qColumn2[2].TextContent);
                     var leechers = ParseUtil.CoerceInt(qColumn1[3].TextContent);
-                    var grabs = ParseUtil.CoerceInt(qColumn1[2].TextContent);
                     var publishDate = TimeZoneInfo.ConvertTime(dateGerman, germanyTz, TimeZoneInfo.Local);
 
                     var release = new ReleaseInfo
@@ -253,7 +253,6 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                         Seeders = seeders,
                         Peers = leechers + seeders,
                         PublishDate = publishDate,
-                        Grabs = grabs,
                         DownloadVolumeFactor = downloadFactor,
                         UploadVolumeFactor = 1
                     };