From 9e78f460106f51d5b6fd414545a31e606ddc8db3 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Fri, 31 Aug 2018 20:04:36 +1000 Subject: [PATCH 1/7] Move HttpWebClientNetCore to Jackett.Common --- src/Jackett.Common/Plumbing/JackettModule.cs | 4 ++-- .../Utils/Clients}/HttpWebClientNetCore.cs | 0 src/Jackett.Server/Program.cs | 1 - src/Jackett.Server/Startup.cs | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) rename src/{Jackett.Server => Jackett.Common/Utils/Clients}/HttpWebClientNetCore.cs (100%) 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/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; From 6b3ffa22c935a64476e1b6780c02e30c414fbc01 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Fri, 31 Aug 2018 20:16:07 +1000 Subject: [PATCH 2/7] Package update --- src/Jackett.Common/Jackett.Common.csproj | 5 ++--- src/Jackett.Server/Jackett.Server.csproj | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) 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.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 @@ - - - - + + + + - + From 2e30fe18993e03a40664bcea4014da16468eaaab Mon Sep 17 00:00:00 2001 From: flightlevel Date: Fri, 31 Aug 2018 20:18:16 +1000 Subject: [PATCH 3/7] IlCorsaroNero: Update thumbprint https://github.com/Jackett/Jackett/issues/3718 --- src/Jackett.Common/Definitions/ilcorsaronero.yml | 1 + 1 file changed, 1 insertion(+) 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: From c112aef6447c879438473388a22895fd5983b7d9 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Fri, 31 Aug 2018 20:33:05 +1000 Subject: [PATCH 4/7] Update ConsoleOptions Use --version to get version info and --help for help -v no longer attempts to load Jackett https://github.com/Jackett/Jackett/issues/3720 --- .../Models/Config/ConsoleOptions.cs | 25 +++++-------------- .../Models/Config/RuntimeSettings.cs | 2 -- src/Jackett.Server/Initialisation.cs | 6 ----- 3 files changed, 6 insertions(+), 27 deletions(-) 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.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."); From 0e0dfe80a7dd084dd945619c09792bd5022de048 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sun, 2 Sep 2018 08:32:46 +1200 Subject: [PATCH 5/7] gktorrent: new domain (ww2.gktorrent.com) --- src/Jackett.Common/Definitions/gktorrent.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: From 79a8ef957fb4d07673479b121e9cbc8aa07bccc6 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sun, 2 Sep 2018 19:23:36 +1200 Subject: [PATCH 6/7] torrentz2: restore categories in results --- src/Jackett.Common/Definitions/torrentz2.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml index fecb7d3f2..7c8e8de83 100644 --- a/src/Jackett.Common/Definitions/torrentz2.yml +++ b/src/Jackett.Common/Definitions/torrentz2.yml @@ -114,10 +114,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 From db11db28e44d3faac55c445b724c75ca69d55ce5 Mon Sep 17 00:00:00 2001 From: Zotan Date: Mon, 3 Sep 2018 11:33:34 +0200 Subject: [PATCH 7/7] Update uhdbits.yml (#3740) Fix error 'Invalid non-ASCII or control character in header: 0x0009' on download (Tab character, upstream bug in kestrel) --- src/Jackett.Common/Definitions/uhdbits.yml | 2 ++ 1 file changed, 2 insertions(+) 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