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

Fixed: Unit Test Fixes

Browse Source
This commit is contained in:
Qstick
2019-07-14 21:18:03 -04:00
parent 3bf5476922
commit 242d530bb4
19 changed files with 177 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/NzbDrone.Core/Update/InstallUpdateService.cs
View File

@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Update
{
if (configFileProvider == null)
{
throw new ArgumentNullException("configFileProvider");
throw new ArgumentNullException(nameof(configFileProvider));
}
_checkUpdateService = checkUpdateService;
_appFolderInfo = appFolderInfo;
@@ -87,6 +87,12 @@ namespace NzbDrone.Core.Update
}
}
if (_appFolderInfo.StartUpFolder.EndsWith("_output"))
{
_logger.ProgressDebug("Running in developer environment, not updating.");
return;
}
var updateSandboxFolder = _appFolderInfo.GetUpdateSandboxFolder();
var packageDestination = Path.Combine(updateSandboxFolder, updatePackage.FileName);
@@ -148,7 +154,7 @@ namespace NzbDrone.Core.Update
}
catch (Exception e)
{
_logger.Error(e, string.Format("Couldn't change the branch from [{0}] to [{1}].", currentBranch, package.Branch));
_logger.Error(e, "Couldn't change the branch from [{0}] to [{1}].", currentBranch, package.Branch);
}
}
}
@@ -178,9 +184,8 @@ namespace NzbDrone.Core.Update
{
var processId = _processProvider.GetCurrentProcess().Id.ToString();
var executingApplication = _runtimeInfo.ExecutingApplication;
var args = string.Join(" ", processId, updateSandboxFolder.TrimEnd(Path.DirectorySeparatorChar).WrapInQuotes(), executingApplication.WrapInQuotes(), _startupContext.PreservedArguments);
_logger.Info("Updater Arguments: " + args);
return args;
return string.Join(" ", processId, updateSandboxFolder.TrimEnd(Path.DirectorySeparatorChar).WrapInQuotes(), executingApplication.WrapInQuotes(), _startupContext.PreservedArguments);
}
private void EnsureAppDataSafety()
@@ -200,7 +205,7 @@ namespace NzbDrone.Core.Update
if (latestAvailable == null)
{
_logger.ProgressDebug("No update available.");
_logger.ProgressDebug("No update available");
return;
}
@@ -213,6 +218,7 @@ namespace NzbDrone.Core.Update
try
{
InstallUpdate(latestAvailable);
_logger.ProgressDebug("Restarting Radarr to apply updates");
}
catch (UpdateFolderNotWritableException ex)
{