Removed InstallUpdate, instead manually triggering ApplicationUpdate.

src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs

@@ -61,6 +61,10 @@ namespace NzbDrone.Core.Test.UpdateTests
             Mocker.GetMock<IProcessProvider>().Setup(c => c.GetCurrentProcess()).Returns(new ProcessInfo { Id = 12 });
             Mocker.GetMock<IRuntimeInfo>().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\NzbDrone.exe");
 
+            Mocker.GetMock<IConfigFileProvider>()
+                  .SetupGet(s => s.UpdateAutomatically)
+                  .Returns(true);
+
             Mocker.GetMock<IDiskProvider>()
                   .Setup(c => c.FolderWritable(It.IsAny<string>()))
                   .Returns(true);
@@ -289,7 +293,7 @@ namespace NzbDrone.Core.Test.UpdateTests
 
             var updateArchive = Path.Combine(_sandboxFolder, _updatePackage.FileName);
 
-            Subject.Execute(new InstallUpdateCommand() { UpdatePackage = _updatePackage });
+            Subject.Execute(new ApplicationUpdateCommand());
 
             Mocker.GetMock<IHttpClient>().Verify(c => c.DownloadFile(_updatePackage.Url, updateArchive), Times.Never());
             ExceptionVerification.ExpectedErrors(1);
@@ -300,7 +304,7 @@ namespace NzbDrone.Core.Test.UpdateTests
         {
             _updatePackage.Branch = "fake";
 
-            Subject.Execute(new InstallUpdateCommand() { UpdatePackage = _updatePackage });
+            Subject.Execute(new ApplicationUpdateCommand());
 
             Mocker.GetMock<IConfigFileProvider>()
                   .Verify(v => v.SaveConfigDictionary(It.Is<Dictionary<string, object>>(d => d.ContainsKey("Branch") && (string)d["Branch"] == "fake")), Times.Once());

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -852,7 +852,6 @@
     <Compile Include="Tv\SeriesTypes.cs" />
     <Compile Include="Tv\ShouldRefreshSeries.cs" />
     <Compile Include="Update\Commands\ApplicationUpdateCommand.cs" />
-    <Compile Include="Update\Commands\InstallUpdateCommand.cs" />
     <Compile Include="Update\InstallUpdateService.cs" />
     <Compile Include="Update\RecentUpdateProvider.cs" />
     <Compile Include="Update\UpdateAbortedException.cs" />

src/NzbDrone.Core/Update/Commands/InstallUpdateCommand.cs

@@ -1,17 +0,0 @@
-using NzbDrone.Core.Messaging.Commands;
-
-namespace NzbDrone.Core.Update.Commands
-{
-    public class InstallUpdateCommand : Command
-    {
-        public UpdatePackage UpdatePackage { get; set; }
-
-        public override bool SendUpdatesToClient
-        {
-            get
-            {
-                return true;
-            }
-        }
-    }
-}

src/NzbDrone.Core/Update/InstallUpdateService.cs

@@ -17,7 +17,7 @@ using NzbDrone.Core.Update.Commands;
 
 namespace NzbDrone.Core.Update
 {
-    public class InstallUpdateService : IExecute<ApplicationUpdateCommand>, IExecute<InstallUpdateCommand>
+    public class InstallUpdateService : IExecute<ApplicationUpdateCommand>
     {
         private readonly ICheckUpdateService _checkUpdateService;
         private readonly Logger _logger;
@@ -176,15 +176,31 @@ namespace NzbDrone.Core.Update
             if (_appFolderInfo.StartUpFolder.IsParentPath(_appFolderInfo.AppDataFolder) ||
                 _appFolderInfo.StartUpFolder.PathEquals(_appFolderInfo.AppDataFolder))
             {
-                throw new UpdateFailedException("You Sonarr configuration ('{0}') is being stored in application folder ('{1}') which will cause data lost during the upgrade. Please remove any symlinks or redirects before trying again.", _appFolderInfo.AppDataFolder, _appFolderInfo.StartUpFolder);
+                throw new UpdateFailedException("Your Sonarr configuration '{0}' is being stored in application folder '{1}' which will cause data lost during the upgrade. Please remove any symlinks or redirects before trying again.", _appFolderInfo.AppDataFolder, _appFolderInfo.StartUpFolder);
             }
         }
 
-        private void ExecuteInstallUpdate(Command message, UpdatePackage package)
+        public void Execute(ApplicationUpdateCommand message)
         {
+            _logger.ProgressDebug("Checking for updates");
+
+            var latestAvailable = _checkUpdateService.AvailableUpdate();
+
+            if (latestAvailable == null)
+            {
+                _logger.ProgressDebug("No update available.");
+                return;
+            }
+
+            if (OsInfo.IsNotWindows && !_configFileProvider.UpdateAutomatically && !message.Manual)
+            {
+                _logger.ProgressDebug("Auto-update not enabled, not installing available update.");
+                return;
+            }
+
             try
             {
-                InstallUpdate(package);
+                InstallUpdate(latestAvailable);
 
                 message.Completed("Restarting Sonarr to apply updates");
             }
@@ -204,28 +220,5 @@ namespace NzbDrone.Core.Update
                 message.Failed(ex);
             }
         }
-
-        public void Execute(ApplicationUpdateCommand message)
-        {
-            _logger.ProgressDebug("Checking for updates");
-            var latestAvailable = _checkUpdateService.AvailableUpdate();
-
-            if (latestAvailable != null)
-            {
-                ExecuteInstallUpdate(message, latestAvailable);
-            }
-        }
-
-        public void Execute(InstallUpdateCommand message)
-        {
-            var latestAvailable = _checkUpdateService.AvailableUpdate();
-
-            if (latestAvailable == null || latestAvailable.Hash != message.UpdatePackage.Hash)
-            {
-                throw new ApplicationException("Unknown or invalid update specified");
-            }
-
-            ExecuteInstallUpdate(message, latestAvailable);
-        }
     }
 }

src/NzbDrone.Core/Update/UpdateCheckService.cs

@@ -31,19 +31,7 @@ namespace NzbDrone.Core.Update
 
         public UpdatePackage AvailableUpdate()
         {
-            var latestAvailable = _updatePackageProvider.GetLatestUpdate(_configFileProvider.Branch, BuildInfo.Version);
+            return _updatePackageProvider.GetLatestUpdate(_configFileProvider.Branch, BuildInfo.Version);
-
-            if (OsInfo.IsNotWindows && !_configFileProvider.UpdateAutomatically)
-            {
-                return null;
-            }
-
-            if (latestAvailable == null)
-            {
-                _logger.ProgressDebug("No update available.");
-            }
-
-            return latestAvailable;
         }
     }
 }

src/UI/System/Update/UpdateItemView.js

@@ -13,7 +13,7 @@ module.exports = Marionette.ItemView.extend({
         }
         this.updating = true;
         var self = this;
-        var promise = CommandController.Execute('installUpdate', {updatePackage : this.model.toJSON()});
+        var promise = CommandController.Execute('applicationUpdate');
         promise.done(function(){
             window.setTimeout(function(){
                 self.updating = false;

src/UI/System/Update/UpdateItemViewTemplate.hbs

@@ -5,14 +5,17 @@
                 - {{ShortDate releaseDate}}
             </span>
             <span class="status">
+                {{#unless_eq branch compare="master"}}
+                    <span class="label label-default">{{branch}}</span>
+                {{/unless_eq}}
                 {{#if installed}}
                     <span class="label label-success">Installed</span>
                 {{else}}
                     {{#if latest}}
                         {{#if installable}}
-                            <span class="label label-default install-update x-install-update">Install</span>
+                            <span class="label label-info install-update x-install-update">Install Latest</span>
                         {{else}}
-                            <span class="label label-default label-disabled" title="Cannot install an older version">Install</span>
+                            <span class="label label-info label-disabled" title="Cannot install an older version">Install Latest</span>
                         {{/if}}
                     {{/if}}
                 {{/if}}