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

Remove Microsoft.Extensions.PlatformAbstractions dependency

Browse Source 
Was only needed for .NET Core 1
This commit is contained in:
flightlevel
2018-06-24 11:38:57 +10:00
parent f2e7ec25c8
commit 8ae09d453d
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,4 @@
using System; using AutoMapper;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
using Jackett.Common.Models; using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig; using Jackett.Common.Models.IndexerConfig;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
@@ -14,6 +7,12 @@ using Jackett.Common.Utils.Clients;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Jackett.Common.Indexers namespace Jackett.Common.Indexers
{ {
@@ -184,10 +183,10 @@ namespace Jackett.Common.Indexers
return false; return false;
} }
Version dotNetVersion = Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default.Application.RuntimeFramework.Version; bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("core", StringComparison.OrdinalIgnoreCase) >= 0;
bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT; bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
if (!isWindows && dotNetVersion.Major < 4) if (!isWindows && runningOnDotNetCore)
{ {
// User isn't running Windows, but is running on .NET Core framework, no access to the DPAPI, so don't bother trying to migrate // User isn't running Windows, but is running on .NET Core framework, no access to the DPAPI, so don't bother trying to migrate
return false; return false;
@@ -290,7 +289,7 @@ namespace Jackett.Common.Indexers
return false; return false;
if (caps.SupportsImdbSearch && query.IsImdbQuery) if (caps.SupportsImdbSearch && query.IsImdbQuery)
return true; return true;
else if(!caps.SupportsImdbSearch && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term else if (!caps.SupportsImdbSearch && query.IsImdbQuery && query.QueryType != "TorrentPotato") // potato query should always contain imdb+search term
return false; return false;
if (caps.SearchAvailable && query.IsSearch) if (caps.SearchAvailable && query.IsSearch)
return true; return true;
@@ -838,7 +837,6 @@ namespace Jackett.Common.Indexers
public override TorznabCapabilities TorznabCaps { get; protected set; } public override TorznabCapabilities TorznabCaps { get; protected set; }
private List<CategoryMapping> categoryMapping = new List<CategoryMapping>(); private List<CategoryMapping> categoryMapping = new List<CategoryMapping>();
protected WebClient webclient; protected WebClient webclient;
protected readonly string downloadUrlBase = ""; protected readonly string downloadUrlBase = "";

1
src/Jackett.Common/Jackett.Common.csproj
View File

@@ -121,7 +121,6 @@
<PackageReference Include="CommandLineParser" Version="2.2.1" /> <PackageReference Include="CommandLineParser" Version="2.2.1" />
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" /> <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="MimeMapping" Version="1.0.1.12" /> <PackageReference Include="MimeMapping" Version="1.0.1.12" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NLog" Version="4.5.6" /> <PackageReference Include="NLog" Version="4.5.6" />

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

@@ -32,17 +32,7 @@ namespace Jackett.Common.Utils
try try
{ {
var currentAssembly = Assembly.GetExecutingAssembly(); runningOwin = AppDomain.CurrentDomain.GetAssemblies().Where(x => x.FullName.StartsWith("Jackett, ")).Any();
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 catch
{ {