shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid Engine for AspNetCore

Browse Source
This commit is contained in:
flightlevel
2018-06-11 17:17:56 +10:00
parent 4e91761fdf
commit 8c953bbf01
5 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Jackett.Common/Indexers/BaseIndexer.cs
View File

@@ -174,14 +174,7 @@ namespace Jackett.Common.Indexers
//TODO: Remove this section once users have moved off DPAPI
private bool MigratedFromDPAPI(JToken jsonConfig)
{
var currentAssembly = Assembly.GetExecutingAssembly();
bool runningLegacyOwin = new StackTrace().GetFrames()
.Select(x => x.GetMethod().ReflectedType.Assembly).Distinct()
.Where(x => x.GetReferencedAssemblies().Any(y => y.FullName == currentAssembly.FullName))
.Where(x => x.ManifestModule.Name == "Jackett.dll" || x.ManifestModule.Name == "JackettConsole.exe")
.Count() == 2;
if (runningLegacyOwin)
if (EnvironmentUtil.IsRunningLegacyOwin)
{
//Still running legacy Owin and using the DPAPI, we don't want to migrate
logger.Debug(ID + " - Running Owin, no need to migrate from DPAPI");

10
src/Jackett.Common/Models/Config/ConsoleOptions.cs
View File

@@ -1,4 +1,5 @@
using CommandLine;
using Jackett.Common.Utils;
using System;
namespace Jackett.Common.Models.Config
@@ -83,8 +84,17 @@ namespace Jackett.Common.Models.Config
if (options.ListenPublic && options.ListenPrivate)
{
Console.WriteLine("You can only use listen private OR listen publicly.");
//TODO: Remove once off Owin
if (EnvironmentUtil.IsRunningLegacyOwin)
{
Engine.Exit(1);
}
else
{
Environment.Exit(1);
}
}
// SSL Fix
runtimeSettings.DoSSLFix = options.SSLFix;

4
src/Jackett.Common/Plumbing/JackettModule.cs
View File

@@ -82,8 +82,12 @@ namespace Jackett.Common.Plumbing
}
private void RegisterWebClient<WebClientType>(ContainerBuilder builder)
{
//TODO: Remove once off Owin
if (EnvironmentUtil.IsRunningLegacyOwin)
{
Engine.WebClientType = typeof(WebClientType);
}
builder.RegisterType<WebClientType>().As<WebClient>();
}

23
src/Jackett.Common/Services/UpdateService.cs
View File

@@ -12,8 +12,10 @@ using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using ICSharpCode.SharpZipLib.Zip;
using Jackett.Common.Models.Config;
using Jackett.Common.Models.GitHub;
using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils;
using Jackett.Common.Utils.Clients;
using Newtonsoft.Json;
using NLog;
@@ -28,14 +30,16 @@ namespace Jackett.Common.Services
IConfigurationService configService;
ManualResetEvent locker = new ManualResetEvent(false);
ITrayLockService lockService;
private ServerConfig serverConfig;
bool forceupdatecheck = false;
public UpdateService(Logger l, WebClient c, IConfigurationService cfg, ITrayLockService ls)
public UpdateService(Logger l, WebClient c, IConfigurationService cfg, ITrayLockService ls, ServerConfig sc)
{
logger = l;
client = c;
configService = cfg;
lockService = ls;
serverConfig = sc;
}
private string ExePath()
@@ -74,13 +78,12 @@ namespace Jackett.Common.Services
private async Task CheckForUpdates()
{
var config = Engine.ServerConfig;
if (config.RuntimeSettings.NoUpdates)
if (serverConfig.RuntimeSettings.NoUpdates)
{
logger.Info($"Updates are disabled via --NoUpdates.");
return;
}
if (config.UpdateDisabled && !forceupdatecheck)
if (serverConfig.UpdateDisabled && !forceupdatecheck)
{
logger.Info($"Skipping update check as it is disabled.");
return;
@@ -112,7 +115,7 @@ namespace Jackett.Common.Services
var releases = JsonConvert.DeserializeObject<List<Release>>(response.Content);
if (!config.UpdatePrerelease)
if (!serverConfig.UpdatePrerelease)
{
releases = releases.Where(r => !r.Prerelease).ToList();
}
@@ -132,7 +135,7 @@ namespace Jackett.Common.Services
var installDir = Path.GetDirectoryName(ExePath());
var updaterPath = Path.Combine(tempDir, "Jackett", "JackettUpdater.exe");
if (updaterPath != null)
StartUpdate(updaterPath, installDir, isWindows, config.RuntimeSettings.NoRestart);
StartUpdate(updaterPath, installDir, isWindows, serverConfig.RuntimeSettings.NoRestart);
}
catch (Exception e)
{
@@ -304,8 +307,16 @@ namespace Jackett.Common.Services
{
logger.Info("Exiting Jackett..");
lockService.Signal();
//TODO: Remove once off Owin
if (EnvironmentUtil.IsRunningLegacyOwin)
{
Engine.Exit(0);
}
else
{
Environment.Exit(0);
}
}
}
}
}

29
src/Jackett.Common/Utils/EnvironmentUtil.cs
View File

@@ -1,4 +1,6 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
namespace Jackett.Common.Utils
@@ -22,6 +24,33 @@ namespace Jackett.Common.Utils
}
}
public static bool IsRunningLegacyOwin
{
get
{
bool runningOwin;
try
{
var currentAssembly = Assembly.GetExecutingAssembly();
bool aspNetCorePresent = new StackTrace().GetFrames()
.Select(x => x.GetMethod().ReflectedType.Assembly).Distinct()
.Where(x => x.GetReferencedAssemblies().Any(y => y.FullName == currentAssembly.FullName))
.Where(x => x.ManifestModule.Name == "JackettConsole.exe").Select(x => x.CustomAttributes)
.FirstOrDefault()
.Where(x => x.AttributeType.Assembly.FullName.StartsWith("Microsoft.AspNetCore", StringComparison.OrdinalIgnoreCase))
.Any();
runningOwin = !aspNetCorePresent;
}
catch
{
runningOwin = true;
}
return runningOwin;
}
}
}
}