Jackett.Tray: Hide form

- Removed IMDB Description as it is not needed
- Removed Audio Category

README.md

@@ -410,6 +410,22 @@ All contributions are welcome just send a pull request.  Jackett's framework all
 * Select Jackett.Console as startup project
 * Build/Start the project
 
+### OSX
+NOTE: msbuild is included in the mono release. 
+* Install Homebrew https://brew.sh
+* open terminal
+* brew install nuget mono
+* git clone https://github.com/Jackett/Jackett.git
+* cd Jackett/src
+* nuget restore Jackett.sln
+
+NOTE: if you get the error "NU1102: Unable to find package Microsoft.AspNetCore with version (>= 2.1.2)" while restoring packages, you'll need to install it manually.https://www.microsoft.com/net/download/thank-you/dotnet-sdk-2.1.302-macos-x64-installer then delete the entire project directory and restart from a new clone
+
+* msbuild Jackett.Console/Jackett.Console.csproj /t:Build /p:Configuration=Debug
+* curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin
+* mono Jackett.Console/bin/Debug/JackettConsole.exe
+
+
 ### Linux
 
 ```bash

src/Jackett.Common/Definitions/anidex.yml

@@ -56,6 +56,9 @@
             args: id
       title:
         selector: td:nth-child(3) > a.torrent > span.span-1440
+        filters:
+          - name: re_replace # remove anidb id from return string
+            args: ["(\\[[A-Z0-9]*\\])\\.", "."]
       details:
         selector: td:nth-child(3) > a.torrent
         attribute: href

src/Jackett.Common/Definitions/btxpress.yml

@@ -12,7 +12,6 @@
     categorymappings:
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
-      - {id: 3, cat: Audio, desc: "Music"}
 
     modes:
       search: [q]
@@ -36,7 +35,6 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
-      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -49,7 +49,13 @@
       - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{else}}descargas{{end}}"
     keywordsfilters:
       - name: re_replace #remove S/EXX from search string
-        args: ["([SE]\\d{1,2})", ""]
+        args: ["(S1)", ""]
+      - name: re_replace #remove S/EXX from search string
+        args: ["(S2)", "segunda temporada"]
+      - name: re_replace #remove S/EXX from search string
+        args: ["(S3)", "tercera temporada"]
+      - name: re_replace #remove S/EXX from search string
+        args: ["E([0-9]+)", "$1"]
     rows:
       selector: table#descargas > tbody > tr:has(td:has(a[href^="magnet:?"]))
     fields:
@@ -63,17 +69,19 @@
           - name: re_replace
             args: ["\\)", ""]
           - name: re_replace
-            args: ["([A-z]*) temporada", "S$1"]
+            args: ["([A-z]*) temporada", ""]
           - name: re_replace
-            args: ["S[pP]rimera", "S1"]
+            args: ["S[pP]rimera", ""]
           - name: re_replace
-            args: ["S[sS]egunda", "S2"]
+            args: ["S[sS]egunda", ""]
           - name: re_replace
-            args: ["S[tT]ercera", "S3"]
+            args: ["S[tT]ercera", ""]
           - name: re_replace
-            args: ["S([0-9]+) - Episodio ([0-9]+)", "S$1E$2"]
+            args: ["S([0-9]+) - Episodio ([0-9]+)", "$2"]
           - name: re_replace
-            args: ["- Episodio ([0-9]*)", "E$1"]
+            args: ["- Episodio ([0-9]*)", "$1"]
+          - name: append
+            args: " [spanish]"
       details:
         selector: td.tit a
         attribute: href

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -6,10 +6,12 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.ilcorsaroblu.info/
+    - https://www.ilcorsaroblu.org/
   legacylinks:
     - http://ilcorsaroblu.org/
-    - https://www.ilcorsaroblu.org/
+    - https://www.ilcorsaroblu.info/
+  certificates:
+    - e6dd93ef71f96d04559e2bee8cc8e6fd74957730 # incomplete CA chain
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.limetorrents.io/
+  legacylinks:
     - https://www.limetorrents.cc/
 
   caps:

src/Jackett.Common/Definitions/yggtorrent.yml

@@ -6,11 +6,12 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - https://ww1.yggtorrent.is/
+    - https://ww2.yggtorrent.is
   legacylinks:
     - https://yggtorrent.is/
     - https://yggtorrent.com/
     - https://ww1.yggtorrent.com/
+    - https://ww1.yggtorrent.is/
 
   caps:
     categorymappings:

src/Jackett.Common/Indexers/MejorTorrent.cs

@@ -18,7 +18,7 @@ namespace Jackett.Common.Indexers
 {
     class MejorTorrent : BaseWebIndexer
     {
-        public static Uri WebUri = new Uri("http://www.mejortorrent.com/");
+        public static Uri WebUri = new Uri("http://www.mejortorrent.org/");
         public static Uri DownloadUri = new Uri(WebUri, "secciones.php?sec=descargas&ap=contar_varios");
         private static Uri SearchUriBase = new Uri(WebUri, "secciones.php");
         public static Uri NewTorrentsUri = new Uri(WebUri, "secciones.php?sec=ultimos_torrents");

src/Jackett.Common/Indexers/TorrentDay.cs

@@ -71,6 +71,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(47, TorznabCatType.Other, "Fonts");
             AddCategoryMapping(43, TorznabCatType.PCMac, "Mac");
 
+            AddCategoryMapping(96, TorznabCatType.MoviesUHD, "Movie/4K");
             AddCategoryMapping(25, TorznabCatType.MoviesSD, "Movies/480p");
             AddCategoryMapping(11, TorznabCatType.MoviesBluRay, "Movies/Bluray");
             AddCategoryMapping(5, TorznabCatType.MoviesBluRay, "Movies/Bluray-Full");
@@ -79,7 +80,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(22, TorznabCatType.MoviesForeign, "Movies/Non-English");
             AddCategoryMapping(13, TorznabCatType.Movies, "Movies/Packs");
             AddCategoryMapping(44, TorznabCatType.MoviesSD, "Movies/SD/x264");
-            AddCategoryMapping(48, TorznabCatType.MoviesUHD, "Movies/x265");
+            AddCategoryMapping(48, TorznabCatType.Movies, "Movies/x265");
             AddCategoryMapping(1, TorznabCatType.MoviesSD, "Movies/XviD");
 
             AddCategoryMapping(17, TorznabCatType.Audio, "Music/Audio");

src/Jackett.Common/Plumbing/JackettModule.cs

@@ -62,24 +62,9 @@ namespace Jackett.Common.Plumbing
                 case "httpclient2":
                     RegisterWebClient<HttpWebClient2>(builder);
                     break;
-                case "safecurl":
-                    RegisterWebClient<UnixSafeCurlWebClient>(builder);
-                    break;
-                case "libcurl":
-                    RegisterWebClient<UnixLibCurlWebClient>(builder);
-                    break;
-                case "automatic":
                 default:
-                    if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-                    {
-                        RegisterWebClient<HttpWebClient>(builder);
-                        break;
-                    }
                     var usehttpclient = DetectMonoCompatabilityWithHttpClient();
-                    if (usehttpclient)
-                        RegisterWebClient<HttpWebClient>(builder);
-                    else
-                        RegisterWebClient<UnixLibCurlWebClient>(builder);
+                    RegisterWebClient<HttpWebClient>(builder);
                     break;
             }
         }

src/Jackett.Console/Program.cs

@@ -65,6 +65,14 @@ namespace Jackett.Console
                         Engine.Logger.Info("Jackett Data will be stored in: " + runtimeSettings.CustomDataFolder);
                     }
 
+                    if(!string.IsNullOrEmpty(runtimeSettings.ClientOverride))
+                    {
+                        if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore")
+                        {
+                            Engine.Logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments");
+                            Environment.Exit(1);
+                        }
+                    }
 
                     // Use Proxy
                     if (options.ProxyConnection != null)

src/Jackett.Server/Controllers/BlackholeController.cs

@@ -3,11 +3,12 @@ using Jackett.Common.Services.Interfaces;
 using Jackett.Common.Utils;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.WebUtilities;
 using Newtonsoft.Json.Linq;
 using NLog;
 using System;
 using System.IO;
-using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace Jackett.Server.Controllers
@@ -46,7 +47,7 @@ namespace Jackett.Server.Controllers
                 if (serverConfig.APIKey != jackett_apikey)
                     throw new Exception("Incorrect API key");
 
-                path = WebUtility.UrlDecode(path);
+                path = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(path));
                 path = protectionService.UnProtect(path);
                 var remoteFile = new Uri(path, UriKind.RelativeOrAbsolute);
                 var fileExtension = ".torrent";

src/Jackett.Tray/Jackett.Tray.csproj

@@ -42,7 +42,6 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -53,7 +52,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>

src/Jackett.Tray/Main.cs

@@ -30,6 +30,11 @@ namespace Jackett.Tray
             Hide();
             InitializeComponent();
 
+            Opacity = 0;
+            Enabled = false;
+            WindowState = FormWindowState.Minimized;
+            FormBorderStyle = FormBorderStyle.FixedToolWindow;
+
             RuntimeSettings runtimeSettings = new RuntimeSettings()
             {
                 CustomLogFileName = "TrayLog.txt"

src/Jackett.Tray/Program.cs

@@ -39,7 +39,7 @@ namespace Jackett.Tray
                         }
                     });
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     newVersion = "";
                 }

src/Jackett/Services/ServerService.cs

@@ -143,23 +143,12 @@ namespace Jackett.Services
 
                     var monoVersionO = new Version(monoVersion.Split(' ')[0]);
 
-                    if (monoVersionO.Major < 4)
-                    {
-                        logger.Error("Your mono version is to old (mono 3 is no longer supported). Please update to the latest version from http://www.mono-project.com/download/");
-                        Engine.Exit(2);
-                    }
-                    else if (monoVersionO.Major == 4 && monoVersionO.Minor == 2)
-                    {
-                        var notice = "mono version 4.2.* is known to cause problems with Jackett. If you experience any problems please try updating to the latest mono version from http://www.mono-project.com/download/ first.";
-                        _notices.Add(notice);
-                        logger.Error(notice);
-                    }
-
                     if (monoVersionO.Major < 5 || (monoVersionO.Major == 5 && monoVersionO.Minor < 8))
                     {
                         string notice = "A minimum Mono version of 5.8 is required. Please update to the latest version from http://www.mono-project.com/download/";
                         _notices.Add(notice);
                         logger.Error(notice);
+                        Engine.Exit(1);
                     }
 
                     try