diff --git a/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs index 15feac05d1..32255bfad3 100644 --- a/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs +++ b/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs @@ -8,6 +8,7 @@ using NzbDrone.Common.Model; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Update; +using NzbDrone.Core.Update.Commands; using NzbDrone.Test.Common; using NzbDrone.Test.Common.Categories; @@ -46,7 +47,7 @@ public void should_delete_sandbox_before_update_if_folder_exists() { Mocker.GetMock().Setup(c => c.FolderExists(_sandboxFolder)).Returns(true); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); Mocker.GetMock().Verify(c => c.DeleteFolder(_sandboxFolder, true)); } @@ -56,7 +57,8 @@ public void should_not_delete_sandbox_before_update_if_folder_doesnt_exists() { Mocker.GetMock().Setup(c => c.FolderExists(_sandboxFolder)).Returns(false); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + Mocker.GetMock().Verify(c => c.DeleteFolder(_sandboxFolder, true), Times.Never()); } @@ -67,7 +69,8 @@ public void Should_download_update_package() { var updateArchive = Path.Combine(_sandboxFolder, _updatePackage.FileName); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + Mocker.GetMock().Verify(c => c.DownloadFile(_updatePackage.Url, updateArchive)); } @@ -77,7 +80,8 @@ public void Should_extract_update_package() { var updateArchive = Path.Combine(_sandboxFolder, _updatePackage.FileName); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + Mocker.GetMock().Verify(c => c.ExtractArchive(updateArchive, _sandboxFolder)); } @@ -87,7 +91,8 @@ public void Should_copy_update_client_to_root_of_sandbox() { var updateClientFolder = Mocker.GetMock().Object.GetUpdateClientFolder(); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + Mocker.GetMock().Verify(c => c.MoveDirectory(updateClientFolder, _sandboxFolder)); @@ -100,7 +105,8 @@ public void should_start_update_client() - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + Mocker.GetMock().Verify( @@ -115,7 +121,8 @@ public void when_no_updates_are_available_should_return_without_error_or_warning { Mocker.GetMock().Setup(c => c.GetLatestUpdate()).Returns(null); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + ExceptionVerification.AssertNoUnexcpectedLogs(); } @@ -133,7 +140,8 @@ public void Should_download_and_extract_to_temp_folder() Mocker.Resolve(); Mocker.Resolve(); - Subject.InstallAvailableUpdate(); + Subject.Execute(new CheckForUpdateCommand()); + updateSubFolder.Refresh(); diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 7bb98795f6..4e9c60820b 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -505,6 +505,7 @@ + diff --git a/NzbDrone.Core/Update/Commands/CheckForUpdateCommand.cs b/NzbDrone.Core/Update/Commands/CheckForUpdateCommand.cs new file mode 100644 index 0000000000..1bd99877ee --- /dev/null +++ b/NzbDrone.Core/Update/Commands/CheckForUpdateCommand.cs @@ -0,0 +1,8 @@ +using NzbDrone.Common.Messaging; + +namespace NzbDrone.Core.Update.Commands +{ + public class CheckForUpdateCommand : ICommand + { + } +} \ No newline at end of file diff --git a/NzbDrone.Core/Update/UpdateService.cs b/NzbDrone.Core/Update/UpdateService.cs index 81eca56a26..1700da7734 100644 --- a/NzbDrone.Core/Update/UpdateService.cs +++ b/NzbDrone.Core/Update/UpdateService.cs @@ -6,18 +6,19 @@ using System.Linq; using NLog; using NzbDrone.Common; +using NzbDrone.Common.Messaging; using NzbDrone.Core.Update; +using NzbDrone.Core.Update.Commands; namespace NzbDrone.Core.Update { public interface IUpdateService { - void InstallAvailableUpdate(); Dictionary GetUpdateLogFiles(); } } -public class UpdateService : IUpdateService +public class UpdateService : IUpdateService, IExecute { private readonly IUpdatePackageProvider _updatePackageProvider; private readonly IEnvironmentProvider _environmentProvider; @@ -43,19 +44,6 @@ public UpdateService(IUpdatePackageProvider updatePackageProvider, IEnvironmentP _logger = logger; } - public void InstallAvailableUpdate() - { - var latestAvailable = _updatePackageProvider.GetLatestUpdate(); - - if (latestAvailable == null || latestAvailable.Version <= _environmentProvider.Version) - { - _logger.Debug("No update available."); - return; - } - - InstallUpdate(latestAvailable); - - } private void InstallUpdate(UpdatePackage updatePackage) { @@ -108,5 +96,17 @@ public Dictionary GetUpdateLogFiles() return list; } -} + public void Execute(ApplicationUpdateCommand message) + { + var latestAvailable = _updatePackageProvider.GetLatestUpdate(); + + if (latestAvailable == null || latestAvailable.Version <= _environmentProvider.Version) + { + _logger.Debug("No update available."); + return; + } + + InstallUpdate(latestAvailable); + } +} \ No newline at end of file