From 6e86db66c8f24c96aa7b725ea9620d85ce3362a2 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 28 Feb 2012 16:59:48 -0800
Subject: [PATCH] New: After an update the update page will redirect to a
 success or failure page, depending on the result.

Fix: Notifications will attempt to reconnect to NzbDrone after it is shutdown.
---
 NzbDrone.Web/Controllers/UpdateController.cs  | 14 ++++++++
 NzbDrone.Web/Models/PostUpgradeModel.cs       | 15 +++++++++
 NzbDrone.Web/NzbDrone.Web.csproj              |  2 ++
 NzbDrone.Web/Scripts/NzbDrone/Notification.js | 24 ++++++++------
 NzbDrone.Web/Views/Update/Index.cshtml        | 33 ++++++++++++++++++-
 NzbDrone.Web/Views/Update/Post.cshtml         | 19 +++++++++++
 6 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 NzbDrone.Web/Models/PostUpgradeModel.cs
 create mode 100644 NzbDrone.Web/Views/Update/Post.cshtml

diff --git a/NzbDrone.Web/Controllers/UpdateController.cs b/NzbDrone.Web/Controllers/UpdateController.cs
index 8a2982bd3..fc2033657 100644
--- a/NzbDrone.Web/Controllers/UpdateController.cs
+++ b/NzbDrone.Web/Controllers/UpdateController.cs
@@ -46,5 +46,19 @@ public ActionResult ViewLog( string filepath)
             ViewBag.Log = _diskProvider.ReadAllText(filepath).Replace(Environment.NewLine, "<br/>");
             return View();
         }
+
+        [HttpGet]
+        public ActionResult Post(string expectedVersion)
+        {
+            var model = new PostUpgradeModel();
+            model.CurrentVersion = _enviromentProvider.Version;
+            model.ExpectedVersion = Version.Parse(expectedVersion);
+            model.Success = model.CurrentVersion >= model.ExpectedVersion;
+            
+            if (!model.Success)
+                model.LogFile = _updateProvider.UpdateLogFile().FirstOrDefault();
+
+            return View(model);
+        }
     }
 }
diff --git a/NzbDrone.Web/Models/PostUpgradeModel.cs b/NzbDrone.Web/Models/PostUpgradeModel.cs
new file mode 100644
index 000000000..3d17fb2a1
--- /dev/null
+++ b/NzbDrone.Web/Models/PostUpgradeModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace NzbDrone.Web.Models
+{
+    public class PostUpgradeModel
+    {
+        public Version CurrentVersion { get; set; }
+        public Version ExpectedVersion { get; set; }
+        public bool Success { get; set; }
+        public KeyValuePair<DateTime, string> LogFile { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 4abc1bb7f..46bd02761 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -228,6 +228,7 @@
     <Compile Include="Models\DataTablesParams.cs" />
     <Compile Include="Models\JobModel.cs" />
     <Compile Include="Models\LogModel.cs" />
+    <Compile Include="Models\PostUpgradeModel.cs" />
     <Compile Include="Models\UpcomingEpisodesModel.cs" />
     <Compile Include="Models\SeasonModel.cs" />
     <Compile Include="Models\SeriesDetailsModel.cs" />
@@ -509,6 +510,7 @@
     <None Include="Content\DataTables-1.9.0\media\images\Sorting icons.psd" />
     <Content Include="Views\Settings\Plex.cshtml" />
     <Content Include="Views\Shared\NoSeriesBanner.cshtml" />
+    <Content Include="Views\Update\Post.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/NzbDrone.Web/Scripts/NzbDrone/Notification.js b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
index 1a6d7acee..0eaa53086 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/Notification.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
@@ -34,16 +34,17 @@
 
         jqXHR.error(function (xhr, textStatus, thrownError) {
             //ignore notification errors.
-            if (this.url.indexOf("/notification/Comet") !== 0) {
-                alert("Status: " + textStatus + ", Error: " + thrownError);
-                $.gritter.add({
-                    title: 'Request failed',
-                    text: this.url,
-                    image: '../../content/images/error.png',
-                    class_name: 'gritter-fail',
-                    time: 10000
-                });
-            }
+            if (this.url.indexOf("/notification/Comet") === 0 || this.url.indexOf("/Health/Index") === 0)
+                return;
+
+            alert("Status: " + textStatus + ", Error: " + thrownError);
+            $.gritter.add({
+                title: 'Request failed',
+                text: this.url,
+                image: '../../content/images/error.png',
+                class_name: 'gritter-fail',
+                time: 10000
+            });
         });
 
     });
@@ -71,6 +72,9 @@ $(window).load(function () {
             data: { message: currentMessage },
             success: function (data) {
                 notificationCallback(data);
+            },
+            error: function () {
+                $.doTimeout(5000, refreshNotifications);
             }
         });
     }
diff --git a/NzbDrone.Web/Views/Update/Index.cshtml b/NzbDrone.Web/Views/Update/Index.cshtml
index 20e6cea24..6c06fe61a 100644
--- a/NzbDrone.Web/Views/Update/Index.cshtml
+++ b/NzbDrone.Web/Views/Update/Index.cshtml
@@ -1,5 +1,6 @@
 @model NzbDrone.Web.Models.UpdateModel
 @{ViewBag.Title = "Update";}
+
 @if (Model.UpdatePackage == null)
 {
     <h2>
@@ -9,7 +10,7 @@ else
 {
     <h2>
         Available Update: @Model.UpdatePackage.Version
-        @Ajax.ActionLink("Update", "StartUpdate", "Update", null)
+        @Ajax.ActionLink("Update", "StartUpdate", "Update", new AjaxOptions{ OnSuccess = "updateStarted" })
     </h2> 
 }
 @if (Model.LogFiles.Count != 0)
@@ -26,3 +27,33 @@ else
     </div>
     }
 }
+
+@section Scripts
+{
+    <script type="text/javascript">
+        function updateStarted() {
+            var errors = 0;
+
+            //Pool the server every 5 seconds for a change in state
+            $.doTimeout('updateStarted', 5000, function () {
+                $.ajax({
+                    url: '/Health/Index',
+                    type: "GET",
+                    error: function (jqXHR, textStatus, errorThrown) {
+                        //Handle the first error that occured
+                        errors++;
+                    },
+                    success: function (data, textStatus, jqXHR) {
+                        if (errors > 0) {
+                            //Kill the timer, redirect
+                            $.doTimeout('updateStarted');
+                            window.location = '/Update/Post?expectedVersion=@Model.UpdatePackage.Version';
+                        }
+                    }
+                });
+
+                return true;
+            });
+        }
+    </script>
+}
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Update/Post.cshtml b/NzbDrone.Web/Views/Update/Post.cshtml
new file mode 100644
index 000000000..196569f40
--- /dev/null
+++ b/NzbDrone.Web/Views/Update/Post.cshtml
@@ -0,0 +1,19 @@
+@model NzbDrone.Web.Models.PostUpgradeModel
+@{
+    ViewBag.Title = "Post Upgrade";
+}
+
+    @if (Model.Success)
+    {
+        <h1><strong>Successfully upgraded to @(Model.CurrentVersion)</strong></h1>
+    }
+    
+    else{
+        <h1><strong>Failed to upgrade to @(Model.ExpectedVersion)</strong></h1>
+        
+        <div>
+            <h3>Please review the log file: 
+            <a href="@Url.Action("ViewLog", "Update", new { filePath = Model.LogFile.Value })">
+                @Model.LogFile.Key.ToString("MMM dd, hh:mm tt")</a></h3>
+        </div>
+    }