Compare commits

...

4 Commits

Author SHA1 Message Date
flightlevel
9f03f8129a TorrentDay: Correct UHD movies
Fixes https://github.com/Jackett/Jackett/issues/3393
2018-07-14 14:45:40 +10:00
flightlevel
51aa6fdf13 Deprecate libcurl 2018-07-14 14:44:23 +10:00
flightlevel
f2f602dcc5 Mono 5.8 or greater is now required to start Jackett 2018-07-14 14:43:46 +10:00
flightlevel
a217381668 Fix blackhole decoding issue 2018-07-14 14:42:46 +10:00
5 changed files with 15 additions and 31 deletions

View File

@@ -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");

View File

@@ -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;
}
}

View File

@@ -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)

View File

@@ -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";

View File

@@ -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