diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 7ae92294b7..20716ecc54 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -1,5 +1,6 @@ using MediaBrowser.Model.Updates; using ProtoBuf; +using System; namespace MediaBrowser.Model.System { @@ -62,6 +63,14 @@ namespace MediaBrowser.Model.System /// Gets or sets plugin assemblies that failed to load. /// /// The failed assembly loads. + [ProtoMember(8)] public string[] FailedPluginAssemblies { get; set; } + + /// + /// Gets or sets the id. + /// + /// The id. + [ProtoMember(9)] + public Guid Id { get; set; } } } diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 2ab9f0a44f..93396faf9e 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Constants; +using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Implementations; using MediaBrowser.Common.Implementations.ScheduledTasks; using MediaBrowser.Common.IO; @@ -133,7 +134,7 @@ namespace MediaBrowser.ServerApplication /// protected override string ProductShortcutPath { - get { return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Media Browser 3", "Media Browser Server.lnk"); } + get { return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu), "Media Browser 3", "Media Browser Server.lnk"); } } /// @@ -163,7 +164,7 @@ namespace MediaBrowser.ServerApplication await base.RegisterResources().ConfigureAwait(false); RegisterSingleInstance(new HttpResultFactory()); - + RegisterSingleInstance(this); RegisterSingleInstance(ApplicationPaths); @@ -247,14 +248,14 @@ namespace MediaBrowser.ServerApplication base.FindParts(); Parallel.Invoke( - + () => - { - HttpServer.Init(GetExports(false)); + { + HttpServer.Init(GetExports(false)); - ServerManager.AddWebSocketListeners(GetExports(false)); - ServerManager.Start(); - }, + ServerManager.AddWebSocketListeners(GetExports(false)); + ServerManager.Start(); + }, () => LibraryManager.AddParts(GetExports(), GetExports(), GetExports(), GetExports(), GetExports()), @@ -334,6 +335,8 @@ namespace MediaBrowser.ServerApplication yield return GetType().Assembly; } + private readonly Guid _systemId = Environment.MachineName.GetMD5(); + /// /// Gets the system status. /// @@ -349,7 +352,8 @@ namespace MediaBrowser.ServerApplication SupportsNativeWebSocket = ServerManager.SupportsNativeWebSocket, FailedPluginAssemblies = FailedAssemblies.ToArray(), InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToArray(), - CompletedInstallations = InstallationManager.CompletedInstallations.ToArray() + CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(), + Id = _systemId }; } diff --git a/MediaBrowser.WebDashboard/Html/about.html b/MediaBrowser.WebDashboard/Html/about.html index 5b778f4a7b..07b14cd8b8 100644 --- a/MediaBrowser.WebDashboard/Html/about.html +++ b/MediaBrowser.WebDashboard/Html/about.html @@ -26,7 +26,7 @@

- Utilizing Pismo File Mount through a donated license. + Utilizing Pismo File Mount through a donated license.

diff --git a/MediaBrowser.WebDashboard/Html/scripts/aboutPage.js b/MediaBrowser.WebDashboard/Html/scripts/aboutPage.js index c9a275d9b2..14c593d541 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/aboutPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/aboutPage.js @@ -6,17 +6,17 @@ pollForInfo: function () { - $.getJSON("dashboardInfo").done(AboutPage.renderInfo); + ApiClient.getSystemInfo().done(AboutPage.renderInfo); }, - renderInfo: function (dashboardInfo) { - AboutPage.renderSystemInfo(dashboardInfo); + renderInfo: function (info) { + AboutPage.renderSystemInfo(info); }, - renderSystemInfo: function (dashboardInfo) { + renderSystemInfo: function (info) { var page = $.mobile.activePage; - $('#appVersionNumber', page).html(dashboardInfo.SystemInfo.Version); + $('#appVersionNumber', page).html(info.Version); }, };