mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-11 08:10:34 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
802ec3153d
|
@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
using (var remoteStream = await _msg.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
using (var remoteStream = await _msg.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
await remoteStream.CopyToAsync(responseStream, 8192000).ConfigureAwait(false);
|
await remoteStream.CopyToAsync(responseStream, 819200).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,12 +67,15 @@ namespace MediaBrowser.Model.Querying
|
||||||
/// <value>The sort by.</value>
|
/// <value>The sort by.</value>
|
||||||
public string[] SortBy { get; set; }
|
public string[] SortBy { get; set; }
|
||||||
|
|
||||||
|
public ImageType[] ImageTypes { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
|
/// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ItemsByNameQuery()
|
public ItemsByNameQuery()
|
||||||
{
|
{
|
||||||
Fields = new ItemFields[] {};
|
ImageTypes = new ImageType[] { };
|
||||||
|
Fields = new ItemFields[] { };
|
||||||
Recursive = true;
|
Recursive = true;
|
||||||
MediaTypes = new string[] { };
|
MediaTypes = new string[] { };
|
||||||
SortBy = new string[] { };
|
SortBy = new string[] { };
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.Querying
|
namespace MediaBrowser.Model.Querying
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -72,7 +72,13 @@ namespace MediaBrowser.Model.System
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The program data path.</value>
|
/// <value>The program data path.</value>
|
||||||
public string ProgramDataPath { get; set; }
|
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>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="SystemInfo"/> class.
|
/// Initializes a new instance of the <see cref="SystemInfo"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -219,7 +219,7 @@ namespace MediaBrowser.Server.Implementations.Providers
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.ErrorException("{0} failed refreshing {1}", ex, provider.GetType().Name, item.Name);
|
_logger.ErrorException("{0} failed refreshing {1} {2}", ex, provider.GetType().Name, item.Name, item.Path ?? string.Empty);
|
||||||
|
|
||||||
provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure);
|
provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure);
|
||||||
|
|
||||||
|
|
|
@ -132,10 +132,17 @@ namespace MediaBrowser.Server.Implementations.ServerManager
|
||||||
{
|
{
|
||||||
LastActivityDate = DateTime.UtcNow;
|
LastActivityDate = DateTime.UtcNow;
|
||||||
|
|
||||||
|
if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
_logger.Error("Received web socket message that is not a json structure: " + message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (OnReceive == null)
|
if (OnReceive == null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromString(message, typeof(WebSocketMessage<object>));
|
var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromString(message, typeof(WebSocketMessage<object>));
|
||||||
|
|
|
@ -607,7 +607,8 @@ namespace MediaBrowser.ServerApplication
|
||||||
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
|
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
|
||||||
Id = _systemId,
|
Id = _systemId,
|
||||||
ProgramDataPath = ApplicationPaths.ProgramDataPath,
|
ProgramDataPath = ApplicationPaths.ProgramDataPath,
|
||||||
MacAddress = GetMacAddress()
|
MacAddress = GetMacAddress(),
|
||||||
|
HttpServerPortNumber = ServerConfigurationManager.Configuration.HttpServerPortNumber
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
if (!serverHostName) {
|
if (!serverHostName) {
|
||||||
throw new Error("Must supply serverHostName, e.g. 192.168.1.1 or myServerName");
|
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 self = this;
|
||||||
var deviceName = "Web Browser";
|
var deviceName = "Web Browser";
|
||||||
|
@ -38,14 +35,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
return serverHostName;
|
return serverHostName;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the server port number.
|
|
||||||
*/
|
|
||||||
self.serverPortNumber = function () {
|
|
||||||
|
|
||||||
return serverPortNumber;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets or sets the current user id.
|
* 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");
|
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) {
|
if (params) {
|
||||||
url += "?" + $.param(params);
|
url += "?" + $.param(params);
|
||||||
|
@ -3384,7 +3379,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
|
|
||||||
var deferred = $.Deferred();
|
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);
|
self.sendWebSocketMessage("PlaybackProgress", msgData);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<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.Common" version="3.9.58" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" />
|
<package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
Loading…
Reference in a new issue