Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-05 21:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

add http server port number to system info

Browse source
This commit is contained in:
Luke Pulverenti 2013-09-07 11:58:47 -04:00
parent 0d59941539
commit 730c62818e
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MediaBrowser.Model/System/SystemInfo.cs
View file

@ -72,7 +72,13 @@ namespace MediaBrowser.Model.System
/// </summary>
/// <value>The program data path.</value>
public string ProgramDataPath { get; set; }
/// <summary>
/// Gets or sets the HTTP server port number.
/// </summary>
/// <value>The HTTP server port number.</value>
public int HttpServerPortNumber { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="SystemInfo"/> class.
/// </summary>

3
MediaBrowser.ServerApplication/ApplicationHost.cs
View file

@ -607,7 +607,8 @@ namespace MediaBrowser.ServerApplication
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
Id = _systemId,
ProgramDataPath = ApplicationPaths.ProgramDataPath,
MacAddress = GetMacAddress()
MacAddress = GetMacAddress(),
HttpServerPortNumber = ServerConfigurationManager.Configuration.HttpServerPortNumber
};
}

21
MediaBrowser.WebDashboard/ApiClient.js
View file

@ -20,9 +20,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
if (!serverHostName) {
throw new Error("Must supply serverHostName, e.g. 192.168.1.1 or myServerName");
}
if (!serverPortNumber) {
throw new Error("Must supply a serverPortNumber");
}
var self = this;
var deviceName = "Web Browser";
@ -38,14 +35,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
return serverHostName;
};
/**
* Gets the server port number.
*/
self.serverPortNumber = function () {
return serverPortNumber;
};
/**
* Gets or sets the current user id.
*/
@ -152,7 +141,13 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("Url name cannot be empty");
}
var url = serverProtocol + "//" + serverHostName + ":" + serverPortNumber + "/mediabrowser/" + name;
var url = serverProtocol + "//" + serverHostName;
if (serverPortNumber) {
url += ":" + serverPortNumber;
}
url += "/mediabrowser/" + name;
if (params) {
url += "?" + $.param(params);
@ -3384,7 +3379,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
var deferred = $.Deferred();
var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
self.sendWebSocketMessage("PlaybackProgress", msgData);

2
MediaBrowser.WebDashboard/packages.config
View file

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