Преглед на файлове

implemented shutdown button

Luke Pulverenti преди 11 години
родител
ревизия
900266eb54
променени са 3 файла, в които са добавени 16 реда и са изтрити 11 реда
  1. 2 10
      MediaBrowser.ServerApplication/ApplicationHost.cs
  2. 13 0
      MediaBrowser.WebDashboard/ApiClient.js
  3. 1 1
      MediaBrowser.WebDashboard/packages.config

+ 2 - 10
MediaBrowser.ServerApplication/ApplicationHost.cs

@@ -647,16 +647,8 @@ namespace MediaBrowser.ServerApplication
         {
             var availablePackages = await InstallationManager.GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
 
-            var package = availablePackages.FirstOrDefault(p => p.name.Equals(Constants.MbServerPkgName, StringComparison.OrdinalIgnoreCase));
-
-            if (package == null)
-            {
-                return null;
-            }
-
-            var version = package.versions
-                .OrderByDescending(v => v.version)
-                .FirstOrDefault(v => v.classification <= ConfigurationManager.CommonConfiguration.SystemUpdateLevel);
+            var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, Constants.MbServerPkgName, ApplicationVersion,
+                                                           ConfigurationManager.CommonConfiguration.SystemUpdateLevel);
 
             return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } :
                        new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false };

+ 13 - 0
MediaBrowser.WebDashboard/ApiClient.js

@@ -700,6 +700,19 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
             });
         };
 
+        /**
+         * Instructs the server to perform a shutdown.
+         */
+        self.shutdownServer = function () {
+
+            var url = self.getUrl("System/Shutdown");
+
+            return self.ajax({
+                type: "POST",
+                url: url
+            });
+        };
+
         /**
          * Gets information about an installable package
          */

+ 1 - 1
MediaBrowser.WebDashboard/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.177" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.178" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
 </packages>