mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issue where AppUpdateJob would throw when there are no updates available.

This commit is contained in:
kay.one 2012-01-16 10:10:18 -08:00
parent 488be41fb1
commit 24d51093d6
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
View File

@ -11,6 +11,7 @@ using NzbDrone.Core.Model;
using NzbDrone.Core.Providers; using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core; using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.JobTests namespace NzbDrone.Core.Test.JobTests
{ {
@ -61,6 +62,7 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<DiskProvider>().Verify(c => c.DeleteFolder(SANDBOX_FOLDER, true), Times.Never()); Mocker.GetMock<DiskProvider>().Verify(c => c.DeleteFolder(SANDBOX_FOLDER, true), Times.Never());
} }
[Test] [Test]
public void Should_download_update_package() public void Should_download_update_package()
{ {
@ -120,6 +122,16 @@ namespace NzbDrone.Core.Test.JobTests
)); ));
} }
[Test]
public void when_no_updates_are_available_should_return_without_error_or_warnings()
{
Mocker.GetMock<UpdateProvider>().Setup(c => c.GetAvilableUpdate()).Returns((UpdatePackage)null);
StartUpdate();
ExceptionVerification.AssertNoUnexcpectedLogs();
}
[Test] [Test]
[Category(INTEGRATION_TEST)] [Category(INTEGRATION_TEST)]
public void Should_download_and_extract_to_temp_folder() public void Should_download_and_extract_to_temp_folder()

13
NzbDrone.Core/Jobs/AppUpdateJob.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using NLog; using NLog;
using Ninject;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers; using NzbDrone.Core.Providers;
@ -22,7 +23,7 @@ namespace NzbDrone.Core.Jobs
private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static readonly Logger logger = LogManager.GetCurrentClassLogger();
[Inject]
public AppUpdateJob(UpdateProvider updateProvider, EnviromentProvider enviromentProvider, DiskProvider diskProvider, public AppUpdateJob(UpdateProvider updateProvider, EnviromentProvider enviromentProvider, DiskProvider diskProvider,
HttpProvider httpProvider, ProcessProvider processProvider, ArchiveProvider archiveProvider, ConfigFileProvider configFileProvider) HttpProvider httpProvider, ProcessProvider processProvider, ArchiveProvider archiveProvider, ConfigFileProvider configFileProvider)
{ {
@ -51,6 +52,10 @@ namespace NzbDrone.Core.Jobs
var updatePackage = _updateProvider.GetAvilableUpdate(); var updatePackage = _updateProvider.GetAvilableUpdate();
//No updates available
if (updatePackage == null)
return;
var packageDestination = Path.Combine(_enviromentProvider.GetUpdateSandboxFolder(), updatePackage.FileName); var packageDestination = Path.Combine(_enviromentProvider.GetUpdateSandboxFolder(), updatePackage.FileName);
if (_diskProvider.FolderExists(_enviromentProvider.GetUpdateSandboxFolder())) if (_diskProvider.FolderExists(_enviromentProvider.GetUpdateSandboxFolder()))
@ -75,13 +80,13 @@ namespace NzbDrone.Core.Jobs
logger.Info("Starting update client"); logger.Info("Starting update client");
var startInfo = new ProcessStartInfo() var startInfo = new ProcessStartInfo
{ {
FileName = _enviromentProvider.GetUpdateClientExePath(), FileName = _enviromentProvider.GetUpdateClientExePath(),
Arguments = string.Format("{0} {1}", _enviromentProvider.NzbDroneProcessIdFromEnviroment, _configFileProvider.Guid) Arguments = string.Format("{0} {1}", _enviromentProvider.NzbDroneProcessIdFromEnviroment, _configFileProvider.Guid)
}; };
var updateProcess = _processProvider.Start(startInfo); _processProvider.Start(startInfo);
notification.CurrentMessage = "Update in progress. NzbDrone will restart shortly."; notification.CurrentMessage = "Update in progress. NzbDrone will restart shortly.";
} }
} }