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

handle RuntimeInformation exception

Browse Source
This commit is contained in:
kaso17
2018-06-05 13:14:32 +02:00
parent b303befbb9
commit 1615bff2d0
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,15 @@ namespace Jackett.Common.Indexers
} }
Version dotNetVersion = Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default.Application.RuntimeFramework.Version; Version dotNetVersion = Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default.Application.RuntimeFramework.Version;
bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); bool isWindows = false;
try {
// RuntimeInformation not available on older mono versions?
isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
}
catch (Exception e)
{
logger.Error(e, "IsOSPlatform check failed, assuming no windows system");
}
if (!isWindows && dotNetVersion.Major < 4) if (!isWindows && dotNetVersion.Major < 4)
{ {
@@ -210,7 +218,7 @@ namespace Jackett.Common.Indexers
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Warn($"Attempt to source password from json failed - {ID} : " + ex.ToString()); logger.Info("Attempt to source password from json failed: " + ex.ToString());
return false; return false;
} }
@@ -224,12 +232,7 @@ namespace Jackett.Common.Indexers
} }
catch (Exception ex) catch (Exception ex)
{ {
if (ex.Message != "The provided payload cannot be decrypted because it was not protected with this protection provider.") logger.Info("Password could not be unprotected using Microsoft.AspNetCore.DataProtection, trying legacy: " + ex.ToString());
{
logger.Info($"Password could not be unprotected using Microsoft.AspNetCore.DataProtection - {ID} : " + ex.ToString());
}
logger.Info($"Attempting legacy Unprotect - {ID} : ");
try try
{ {
@@ -240,13 +243,11 @@ namespace Jackett.Common.Indexers
SaveConfig(); SaveConfig();
IsConfigured = true; IsConfigured = true;
logger.Info($"Password successfully migrated for {ID}");
return true; return true;
} }
catch (Exception exception) catch (Exception exception)
{ {
logger.Info($"Password could not be unprotected using legacy DPAPI - {ID} : " + exception.ToString()); logger.Info("Password could not be unprotected using legacy DPAPI: " + exception.ToString());
} }
} }
} }