From 33a3f620e627151485659eaf2d8468eff6a8246b Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Wed, 20 Mar 2013 17:17:47 -0400
Subject: display pending installations on dashboard home

---
 .../MediaBrowser.Controller.csproj                 |  1 -
 .../ScheduledTasks/RefreshMediaLibraryTask.cs      | 91 ----------------------
 .../IO/DirectoryWatchers.cs                        |  2 +-
 .../Library/LibraryManager.cs                      |  1 -
 .../MediaBrowser.Server.Implementations.csproj     |  1 +
 .../ScheduledTasks/RefreshMediaLibraryTask.cs      | 91 ++++++++++++++++++++++
 MediaBrowser.WebDashboard/Html/dashboard.html      | 11 ++-
 .../Html/scripts/DashboardPage.js                  | 41 ++++++++--
 8 files changed, 136 insertions(+), 103 deletions(-)
 delete mode 100644 MediaBrowser.Controller/ScheduledTasks/RefreshMediaLibraryTask.cs
 create mode 100644 MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 656f9d5670..96db93a99e 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -174,7 +174,6 @@
     <Compile Include="Resolvers\EntityResolutionHelper.cs" />
     <Compile Include="Resolvers\ResolverPriority.cs" />
     <Compile Include="Library\TVUtils.cs" />
-    <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
     <Compile Include="Library\ItemResolveArgs.cs" />
     <Compile Include="IO\FileData.cs" />
     <Compile Include="Kernel.cs" />
diff --git a/MediaBrowser.Controller/ScheduledTasks/RefreshMediaLibraryTask.cs b/MediaBrowser.Controller/ScheduledTasks/RefreshMediaLibraryTask.cs
deleted file mode 100644
index 6b06ca9449..0000000000
--- a/MediaBrowser.Controller/ScheduledTasks/RefreshMediaLibraryTask.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using MediaBrowser.Common.ScheduledTasks;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Tasks;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.ScheduledTasks
-{
-    /// <summary>
-    /// Class RefreshMediaLibraryTask
-    /// </summary>
-    public class RefreshMediaLibraryTask : IScheduledTask
-    {
-        /// <summary>
-        /// The _library manager
-        /// </summary>
-        private readonly ILibraryManager _libraryManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefreshMediaLibraryTask" /> class.
-        /// </summary>
-        /// <param name="libraryManager">The library manager.</param>
-        public RefreshMediaLibraryTask(ILibraryManager libraryManager)
-        {
-            _libraryManager = libraryManager;
-        }
-
-        /// <summary>
-        /// Gets the default triggers.
-        /// </summary>
-        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<ITaskTrigger> GetDefaultTriggers()
-        {
-            return new ITaskTrigger[] { 
-
-                new StartupTrigger(),
-
-                new SystemEventTrigger{ SystemEvent = SystemEvent.WakeFromSleep},
-
-                new IntervalTrigger{ Interval = TimeSpan.FromHours(2)}
-            };
-        }
-
-        /// <summary>
-        /// Executes the internal.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            progress.Report(0);
-
-            return _libraryManager.ValidateMediaLibrary(progress, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get { return "Scan media library"; }
-        }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description
-        {
-            get { return "Scans your media library and refreshes metatata based on configuration."; }
-        }
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category
-        {
-            get
-            {
-                return "Library";
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs
index c1371a32b0..14d413f1a4 100644
--- a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs
+++ b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs
@@ -3,8 +3,8 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.ScheduledTasks;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Server.Implementations.ScheduledTasks;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 7b12201f76..bf21e75004 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Controller.ScheduledTasks;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 72f6d0b0fd..6926355434 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -147,6 +147,7 @@
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
     <Compile Include="ScheduledTasks\ImageCleanupTask.cs" />
     <Compile Include="ScheduledTasks\PluginUpdateTask.cs" />
+    <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
     <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="ServerManager\ServerManager.cs" />
     <Compile Include="ServerManager\WebSocketConnection.cs" />
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
new file mode 100644
index 0000000000..8170e90a62
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
@@ -0,0 +1,91 @@
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class RefreshMediaLibraryTask
+    /// </summary>
+    public class RefreshMediaLibraryTask : IScheduledTask
+    {
+        /// <summary>
+        /// The _library manager
+        /// </summary>
+        private readonly ILibraryManager _libraryManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RefreshMediaLibraryTask" /> class.
+        /// </summary>
+        /// <param name="libraryManager">The library manager.</param>
+        public RefreshMediaLibraryTask(ILibraryManager libraryManager)
+        {
+            _libraryManager = libraryManager;
+        }
+
+        /// <summary>
+        /// Gets the default triggers.
+        /// </summary>
+        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
+        public IEnumerable<ITaskTrigger> GetDefaultTriggers()
+        {
+            return new ITaskTrigger[] { 
+
+                new StartupTrigger(),
+
+                new SystemEventTrigger{ SystemEvent = SystemEvent.WakeFromSleep},
+
+                new IntervalTrigger{ Interval = TimeSpan.FromHours(2)}
+            };
+        }
+
+        /// <summary>
+        /// Executes the internal.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            progress.Report(0);
+
+            return _libraryManager.ValidateMediaLibrary(progress, cancellationToken);
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return "Scan media library"; }
+        }
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description
+        {
+            get { return "Scans your media library and refreshes metatata based on configuration."; }
+        }
+
+        /// <summary>
+        /// Gets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        public string Category
+        {
+            get
+            {
+                return "Library";
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.WebDashboard/Html/dashboard.html b/MediaBrowser.WebDashboard/Html/dashboard.html
index deec12a36c..693af7d261 100644
--- a/MediaBrowser.WebDashboard/Html/dashboard.html
+++ b/MediaBrowser.WebDashboard/Html/dashboard.html
@@ -24,12 +24,17 @@
                                 <p id="newVersionNumber"></p>
                                 <button id="btnUpdateApplication" type="button" data-icon="download" data-theme="b" onclick="DashboardPage.updateApplication();">Update Now</button>
                             </div>
+                            <div id="pPluginUpdates"></div>
                         </div>
                     </div>
 
-                    <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em; display: none;" id="collapsiblePluginUpdates">
-                        <h3>Plugin Information</h3>
-                        <div id="pPluginUpdates"></div>
+                    <div id="collapsiblePendingInstallations" data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em; display: none;">
+                        <h3>Pending Installations</h3>
+                        <p>The following components have been installed or updated:</p>
+                        <div id="pendingInstallations">
+                        </div>
+                        <p>Please restart the server to finish applying updates.</p>
+                        <button type="button" data-icon="refresh" data-theme="b" onclick="Dashboard.restartServer();">Restart Now</button>
                     </div>
 
                     <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;">
diff --git a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
index e61febb263..5b06851478 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
@@ -293,6 +293,7 @@
 
         DashboardPage.renderApplicationUpdateInfo(dashboardInfo);
         DashboardPage.renderPluginUpdateInfo(dashboardInfo);
+        DashboardPage.renderPendingInstallations(dashboardInfo.SystemInfo);
     },
 
     renderApplicationUpdateInfo: function (dashboardInfo) {
@@ -330,17 +331,43 @@
             });
 
         } else {
-            
+
             if (dashboardInfo.SystemInfo.HasPendingRestart) {
                 $('#pUpToDate', page).hide();
             } else {
                 $('#pUpToDate', page).show();
             }
-            
+
             $('#pUpdateNow', page).hide();
         }
     },
 
+    renderPendingInstallations: function (systemInfo) {
+
+        var page = $.mobile.activePage;
+
+        if (systemInfo.CompletedInstallations.length) {
+
+            $('#collapsiblePendingInstallations', page).show();
+
+        } else {
+            $('#collapsiblePendingInstallations', page).hide();
+
+            return;
+        }
+
+        var html = '';
+
+        for (var i = 0, length = systemInfo.CompletedInstallations.length; i < length; i++) {
+
+            var update = systemInfo.CompletedInstallations[i];
+
+            html += '<div><strong>' + update.Name + '</strong> (' + update.Version + ')</div>';
+        }
+
+        $('#pendingInstallations', page).html(html);
+    },
+
     renderPluginUpdateInfo: function (dashboardInfo) {
 
         // Only check once every 10 mins
@@ -354,12 +381,14 @@
 
         ApiClient.getAvailablePluginUpdates().done(function (updates) {
 
+            var elem = $('#pPluginUpdates', page);
+
             if (updates.length) {
 
-                $('#collapsiblePluginUpdates', page).show();
+                elem.show();
 
             } else {
-                $('#collapsiblePluginUpdates', page).hide();
+                elem.hide();
 
                 return;
             }
@@ -374,8 +403,8 @@
                 html += '<button type="button" data-icon="download" data-theme="b" onclick="DashboardPage.installPluginUpdate(this);" data-name="' + update.name + '" data-version="' + update.versionStr + '" data-classification="' + update.classification + '">Update Now</button>';
             }
 
-            $('#pPluginUpdates', page).html(html).trigger('create');
-            
+            elem.html(html).trigger('create');
+
         }).fail(function () {
 
             Dashboard.showFooterNotification({ html: '<img src="css/images/notifications/error.png" class="notificationIcon" />There was an error connecting to the remote Media Browser repository.', id: "MB3ConnectionError" });
-- 
cgit v1.2.3