Added an Id property to SystemInfo
This commit is contained in:
parent
064b3d58cc
commit
b86a03bbdc
|
@ -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.
|
||||
/// </summary>
|
||||
/// <value>The failed assembly loads.</value>
|
||||
[ProtoMember(8)]
|
||||
public string[] FailedPluginAssemblies { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the id.
|
||||
/// </summary>
|
||||
/// <value>The id.</value>
|
||||
[ProtoMember(9)]
|
||||
public Guid Id { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
|||
/// </summary>
|
||||
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"); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -334,6 +335,8 @@ namespace MediaBrowser.ServerApplication
|
|||
yield return GetType().Assembly;
|
||||
}
|
||||
|
||||
private readonly Guid _systemId = Environment.MachineName.GetMD5();
|
||||
|
||||
/// <summary>
|
||||
/// Gets the system status.
|
||||
/// </summary>
|
||||
|
@ -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
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
<br/>
|
||||
<br/>
|
||||
<p>
|
||||
Utilizing <a href="http://www.pismotechnic.com/pfm/" />Pismo File Mount</a> through a donated license.
|
||||
Utilizing <a href="http://www.pismotechnic.com/pfm/" target="_blank">Pismo File Mount</a> through a donated license.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -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);
|
||||
},
|
||||
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user