diff --git a/src/Jackett.Common/Definitions/gktorrent.yml b/src/Jackett.Common/Definitions/gktorrent.yml
index 56d51f0c9..ef8ba3ce6 100644
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -6,12 +6,13 @@
type: public
encoding: UTF-8
links:
- - http://ww1.gktorrent.com/
+ - http://ww2.gktorrent.com/
legacylinks:
- https://www.gktorrent.org/
- http://www.gktorrent.net/
- https://www.gktorrent.com/ # they're forcing http
- http://www.gktorrent.com/
+ - http://ww1.gktorrent.com/
caps:
categorymappings:
diff --git a/src/Jackett.Common/Definitions/ilcorsaronero.yml b/src/Jackett.Common/Definitions/ilcorsaronero.yml
index 0be56c02d..5b2f610e1 100644
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -10,6 +10,7 @@
certificates:
- aa7c40aa360a1cec8a9687312fd50402b912e618 # incomplete CA chain
- 83174ec1f92fa13cdef9d51888ea1dfba2166e17 # incomplete CA chain
+ - c414bf4ad6c69841693c147849f4c314aa200bdf # incomplete CA chain
caps:
categorymappings:
diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml
index cec2ea026..b2e724696 100644
--- a/src/Jackett.Common/Definitions/torrentz2.yml
+++ b/src/Jackett.Common/Definitions/torrentz2.yml
@@ -116,10 +116,9 @@
selector: dt
remove: a
filters:
+ - name: re_replace
+ args: ["[^a-zA-Z\\s]+", ""]
- name: trim
- args: "»"
- - name: trim
- args: " "
date:
selector: dd span:nth-child(2)
attribute: title
diff --git a/src/Jackett.Common/Definitions/uhdbits.yml b/src/Jackett.Common/Definitions/uhdbits.yml
index 26a4205ca..8ce88c3e6 100644
--- a/src/Jackett.Common/Definitions/uhdbits.yml
+++ b/src/Jackett.Common/Definitions/uhdbits.yml
@@ -67,6 +67,8 @@
selector: div.group_info
remove: span, div.tags
filters:
+ - name: replace
+ args: ["\t\t\t\t", " "]
- name: replace
args: [" / Free", ""]
- name: replace
diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj
index aa53e0129..2326ea392 100644
--- a/src/Jackett.Common/Jackett.Common.csproj
+++ b/src/Jackett.Common/Jackett.Common.csproj
@@ -16,14 +16,14 @@
-
+
+
-
@@ -31,7 +31,6 @@
-
diff --git a/src/Jackett.Common/Models/Config/ConsoleOptions.cs b/src/Jackett.Common/Models/Config/ConsoleOptions.cs
index def0fc8c7..017316842 100644
--- a/src/Jackett.Common/Models/Config/ConsoleOptions.cs
+++ b/src/Jackett.Common/Models/Config/ConsoleOptions.cs
@@ -1,5 +1,4 @@
using CommandLine;
-using Jackett.Common.Utils;
using System;
namespace Jackett.Common.Models.Config
@@ -9,55 +8,46 @@ namespace Jackett.Common.Models.Config
[Option('i', "Install", HelpText = "Install Jackett windows service (Must be admin)")]
public bool Install { get; set; }
- [Option('r', "ReserveUrls", HelpText = "(Re)Register windows port reservations (Required for listening on all interfaces).")]
+ [Option('r', "ReserveUrls", HelpText = "(Re)Register windows port reservations (Required for listening on all interfaces).")]
public bool ReserveUrls { get; set; }
[Option('u', "Uninstall", HelpText = "Uninstall Jackett windows service (Must be admin).")]
public bool Uninstall { get; set; }
- [Option('l', "Logging", HelpText = "Log all requests/responses to Jackett")]
+ [Option('l', "Logging", HelpText = "Log all requests/responses to Jackett")]
public bool Logging { get; set; }
[Option('t', "Tracing", HelpText = "Enable tracing")]
public bool Tracing { get; set; }
- [Option('c', "UseClient", HelpText = "Override web client selection. [automatic(Default)/libcurl/safecurl/httpclient/httpclient2]")]
+ [Option('c', "UseClient", HelpText = "Override web client selection. [automatic(Default)/httpclient/httpclient2]")]
public string Client { get; set; }
[Option('j', "ProxyConnection", HelpText = "use proxy - e.g. 127.0.0.1:8888")]
public string ProxyConnection { get; set; }
- [Option('s', "Start", HelpText = "Start the Jacket Windows service (Must be admin)")]
+ [Option('s', "Start", HelpText = "Start the Jacket Windows service (Must be admin)")]
public bool StartService { get; set; }
[Option('k', "Stop", HelpText = "Stop the Jacket Windows service (Must be admin)")]
public bool StopService { get; set; }
- [Option('x', "ListenPublic", HelpText = "Listen publicly")]
+ [Option('x', "ListenPublic", HelpText = "Listen publicly")]
public bool ListenPublic { get; set; }
[Option('z', "ListenPrivate", HelpText = "Only allow local access")]
public bool ListenPrivate { get; set; }
- [Option('h', "Help", HelpText = "Show Help")]
- public bool ShowHelp { get; set; }
-
- [Option('v', "Version", HelpText = "Show Version")]
- public bool ShowVersion { get; set; }
-
[Option('p', "Port", HelpText = "Web server port")]
public int Port { get; set; }
[Option('m', "MigrateSettings", HelpText = "Migrate settings manually (Must be admin on Windows)")]
public bool MigrateSettings { get; set; }
- [Option('f', "SSLFix", HelpText = "[true/false] Linux Libcurl NSS Missing ECC Ciphers workaround (Use if you can't access some trackers) .")]
- public bool? SSLFix { get; set; }
-
[Option('n', "IgnoreSslErrors", HelpText = "[true/false] Ignores invalid SSL certificates")]
public bool? IgnoreSslErrors { get; set; }
- [Option('d', "DataFolder", HelpText = "Specify the location of the data folder (Must be admin on Windows) eg. --DataFolder=\"D:\\Your Data\\Jackett\\\". Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datedir or set the XDG_CONFIG_HOME environment variable.")]
+ [Option('d', "DataFolder", HelpText = "Specify the location of the data folder (Must be admin on Windows) eg. --DataFolder=\"D:\\Your Data\\Jackett\\\". Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datadir or set the XDG_CONFIG_HOME environment variable.")]
public string DataFolder { get; set; }
[Option("NoRestart", HelpText = "Don't restart after update")]
@@ -87,9 +77,6 @@ namespace Jackett.Common.Models.Config
Environment.Exit(1);
}
- // SSL Fix
- runtimeSettings.DoSSLFix = options.SSLFix;
-
// Use curl
if (options.Client != null)
runtimeSettings.ClientOverride = options.Client.ToLowerInvariant();
diff --git a/src/Jackett.Common/Models/Config/RuntimeSettings.cs b/src/Jackett.Common/Models/Config/RuntimeSettings.cs
index 16888202f..5d1fc2180 100644
--- a/src/Jackett.Common/Models/Config/RuntimeSettings.cs
+++ b/src/Jackett.Common/Models/Config/RuntimeSettings.cs
@@ -13,8 +13,6 @@ namespace Jackett.Common.Models.Config
public string ProxyConnection { get; set; }
- public bool? DoSSLFix { get; set; }
-
public bool? IgnoreSslErrors { get; set; }
public string CustomDataFolder { get; set; }
diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs
index f1f2a2854..cfbffd0f7 100644
--- a/src/Jackett.Common/Plumbing/JackettModule.cs
+++ b/src/Jackett.Common/Plumbing/JackettModule.cs
@@ -49,12 +49,12 @@ namespace Jackett.Common.Plumbing
return BuildServerConfig(ctx);
}).As().SingleInstance();
builder.RegisterType();
-
+
// Register the best web client for the platform or the override
switch (_runtimeSettings.ClientOverride)
{
case "httpclientnetcore":
- // do nothing, registered by the netcore app
+ RegisterWebClient(builder);
break;
case "httpclient":
RegisterWebClient(builder);
diff --git a/src/Jackett.Server/HttpWebClientNetCore.cs b/src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
similarity index 100%
rename from src/Jackett.Server/HttpWebClientNetCore.cs
rename to src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs
index 809e6b7be..a6d43263f 100644
--- a/src/Jackett.Server/Initialisation.cs
+++ b/src/Jackett.Server/Initialisation.cs
@@ -19,12 +19,6 @@ namespace Jackett.Server
Environment.Exit(1);
}
- if (runtimeSettings.DoSSLFix != null)
- {
- logger.Error("SSLFix has been deprecated, please remove it from your start arguments");
- Environment.Exit(1);
- }
-
if (runtimeSettings.LogRequests)
{
logger.Info("Logging enabled.");
diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj
index 62281c8d7..8f442611c 100644
--- a/src/Jackett.Server/Jackett.Server.csproj
+++ b/src/Jackett.Server/Jackett.Server.csproj
@@ -25,15 +25,15 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/src/Jackett.Server/Program.cs b/src/Jackett.Server/Program.cs
index caed9f096..02295361d 100644
--- a/src/Jackett.Server/Program.cs
+++ b/src/Jackett.Server/Program.cs
@@ -47,7 +47,6 @@ namespace Jackett.Server
{
if (string.IsNullOrEmpty(options.Client))
{
- //TODO: Remove libcurl once off owin
bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("Core", StringComparison.OrdinalIgnoreCase) >= 0;
if (runningOnDotNetCore)
diff --git a/src/Jackett.Server/Startup.cs b/src/Jackett.Server/Startup.cs
index 32451e74e..bce5c610a 100644
--- a/src/Jackett.Server/Startup.cs
+++ b/src/Jackett.Server/Startup.cs
@@ -3,7 +3,6 @@ using Autofac.Extensions.DependencyInjection;
using Jackett.Common.Models.Config;
using Jackett.Common.Plumbing;
using Jackett.Common.Services.Interfaces;
-using Jackett.Common.Utils.Clients;
using Jackett.Server.Middleware;
using Jackett.Server.Services;
using Microsoft.AspNetCore.Authentication.Cookies;
@@ -84,8 +83,6 @@ namespace Jackett.Server
builder.RegisterType().As();
builder.RegisterType().As();
builder.RegisterType().As();
- if (runtimeSettings.ClientOverride == "httpclientnetcore")
- builder.RegisterType().As();
IContainer container = builder.Build();
Helper.ApplicationContainer = container;