Merge tag 'v0.16.2229'

abeloin · Nov 23, 2020 · eeaa9f5 · eeaa9f5
2 parents a7bc5aa + 81d53d3
commit eeaa9f5
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 335 deletions.
diff --git a/README.md b/README.md
@@ -384,7 +384,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Horror Site
  * HQSource (HQS)
  * HuSh [![(invite needed)][inviteneeded]](#)
- * ICE Torrent
  * IPTorrents (IPT)
  * ImmortalSeed (iS)
  * Immortuos
@@ -469,7 +468,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
- * SceneFZ
  * SceneHD
  * ScenePalace (SP)
  * SceneRush
@@ -484,6 +482,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SiamBIT
  * SnowPT (SSPT)
  * SoulVoice [![(invite needed)][inviteneeded]](#)
+ * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpaceTorrent
  * SpeedCD
  * Speedmaster HD
@@ -561,7 +560,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * XWT-Classics
  * XWTorrents (XWT)
  * Xthor
- * XtreMeZone (MYXZ)
  * YDYPT
  * YingK
  * Zamunda.net

diff --git a/src/Jackett.Common/Definitions/emtrek.yml b/src/Jackett.Common/Definitions/emtrek.yml
@@ -10,6 +10,7 @@ links:
 
 caps:
   categorymappings:
+    # when refreshing categories remember to use the list on the tracker.php page and not the search.php page.
     # Игры для PC (pc games)
     - {id: 317, cat: PC/Games, desc: "Игры для Linux"}
     - {id: 174, cat: PC/Games, desc: " |- Патчи"}
@@ -192,6 +193,9 @@ caps:
     - {id: 121, cat: Other, desc: "Обои / Рисунки / Картинки"}
     # Корзина (other)
     - {id: 2, cat: Other, desc: "Для пробных раздач"}
+    # the following forums are not in the tracker pull down list.
+    # Архив (archive)
+    - {id: 20, cat: Other, desc: "Архив"}
 
   modes:
     search: [q]

diff --git a/src/Jackett.Common/Definitions/linuxtracker.yml b/src/Jackett.Common/Definitions/linuxtracker.yml
@@ -145,6 +145,7 @@ caps:
     - {id: 2063, cat: PC/ISO, desc: "Linuxfx"}
     - {id: 2064, cat: PC/ISO, desc: "Liquid Lemur"}
     - {id: 2191, cat: PC/ISO, desc: "Live Raizo"}
+    - {id: 316, cat: PC/ISO, desc: "Livecd"}
     - {id: 1218, cat: PC/ISO, desc: "Lubuntu"}
     - {id: 2163, cat: PC/ISO, desc: "MOFO Linux"}
     - {id: 2177, cat: PC/ISO, desc: "MX Linux"}

diff --git a/src/Jackett.Common/Definitions/puntotorrent.yml b/src/Jackett.Common/Definitions/puntotorrent.yml
@@ -1,5 +1,5 @@
 ---
-id: puntorrent
+id: puntotorrent
 name: PuntoTorrent
 description: "PuntoTorrent is a SPANISH site for General content"
 language: es-es
@@ -84,6 +84,7 @@ caps:
     - {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: 142, cat: Audio/Audiobook, desc: "eBooks - Audiolibros"}
     - {id: 92, cat: Other, desc: "Otros formatos - Animación"}
     - {id: 93, cat: Other, desc: "Otros formatos - Deportes"}
     - {id: 94, cat: Other, desc: "Otros formatos - Documentales"}

diff --git a/src/Jackett.Common/Definitions/torrentparadise.yml b/src/Jackett.Common/Definitions/torrentparadise.yml
@@ -55,6 +55,7 @@ caps:
     BOOKSMAGAZINES: Books/Mags
     BOOKSNONFICTION: Books
     BOOKSTEXTBOOKS: Books
+    BOOKSTUTORIALS: Books
     COMICSNEM43COMICS: Books/Comics
     DESIPORN: XXX
     DOCUMENTARIES: TV/Documentary

diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs
@@ -55,35 +55,25 @@ public HDSpace(IIndexerConfigurationService configService, WebClient wc, Logger
             Language = "en-us";
             Type = "private";
 
-            AddCategoryMapping(15, TorznabCatType.MoviesBluRay); // Movie / Blu-ray
-            AddMultiCategoryMapping(TorznabCatType.MoviesHD,
-                                    19, // Movie / 1080p
-                                    18, // Movie / 720p
-                                    40, // Movie / Remux
-                                    16 // Movie / HD-DVD
-                );
-            AddMultiCategoryMapping(TorznabCatType.TVHD,
-                                    21, // TV Show / 720p HDTV
-                                    22 // TV Show / 1080p HDTV
-                );
-            AddMultiCategoryMapping(TorznabCatType.TVDocumentary,
-                                    24, // Documentary / 720p
-                                    25 // Documentary / 1080p
-                );
-            AddMultiCategoryMapping(TorznabCatType.TVAnime,
-                                    27, // Animation / 720p
-                                    28 // Animation / 1080p
-                );
-            AddCategoryMapping(30, TorznabCatType.AudioLossless); // Music / HQ Audio
-            AddCategoryMapping(31, TorznabCatType.AudioVideo); // Music / Videos
-            AddMultiCategoryMapping(TorznabCatType.XXX,
-                                    33, // XXX / 720p
-                                    34 // XXX / 1080p
-                );
-            AddCategoryMapping(36, TorznabCatType.MoviesOther); // Trailers
-            AddCategoryMapping(37, TorznabCatType.PC); // Software
-            AddCategoryMapping(38, TorznabCatType.Other); // Others
-            AddCategoryMapping(41, TorznabCatType.MoviesUHD); // Movie / 4K UHD
+            AddCategoryMapping(15, TorznabCatType.MoviesBluRay, "Movie / Blu-ray");
+            AddCategoryMapping(19, TorznabCatType.MoviesHD, "Movie / 1080p");
+            AddCategoryMapping(18, TorznabCatType.MoviesHD, "Movie / 720p");
+            AddCategoryMapping(40, TorznabCatType.MoviesHD, "Movie / Remux");
+            AddCategoryMapping(16, TorznabCatType.MoviesHD, "Movie / HD-DVD");
+            AddCategoryMapping(41, TorznabCatType.MoviesUHD, "Movie / 4K UHD");
+            AddCategoryMapping(21, TorznabCatType.TVHD, "TV Show / 720p HDTV");
+            AddCategoryMapping(22, TorznabCatType.TVHD, "TV Show / 1080p HDTV");
+            AddCategoryMapping(24, TorznabCatType.TVDocumentary, "Documentary / 720p");
+            AddCategoryMapping(25, TorznabCatType.TVDocumentary, "Documentary / 1080p");
+            AddCategoryMapping(27, TorznabCatType.TVAnime, "Animation / 720p");
+            AddCategoryMapping(28, TorznabCatType.TVAnime, "Animation / 1080p");
+            AddCategoryMapping(30, TorznabCatType.AudioLossless, "Music / HQ Audio");
+            AddCategoryMapping(31, TorznabCatType.AudioVideo, "Music / Videos");
+            AddCategoryMapping(33, TorznabCatType.XXX, "XXX / 720p");
+            AddCategoryMapping(34, TorznabCatType.XXX, "XXX / 1080p");
+            AddCategoryMapping(36, TorznabCatType.MoviesOther, "Trailers");
+            AddCategoryMapping(37, TorznabCatType.PC, "Software");
+            AddCategoryMapping(38, TorznabCatType.Other, "Others");
         }
 
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
@@ -148,7 +138,7 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
 
                     var release = new ReleaseInfo();
                     release.MinimumRatio = 1;
-                    release.MinimumSeedTime = 172800; // 48 hours
+                    release.MinimumSeedTime = 86400; // 24 hours
 
                     var qLink = row.Children[1].FirstElementChild;
                     release.Title = qLink.TextContent.Trim();

diff --git a/src/Jackett.Common/Indexers/IceTorrent.cs b/src/Jackett.Common/Indexers/IceTorrent.cs
diff --git a/src/Jackett.Common/Indexers/SceneFZ.cs b/src/Jackett.Common/Indexers/SceneFZ.cs