mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
This commit is contained in:
commit
46a6194516
7 changed files with 21 additions and 30 deletions
|
@ -74,7 +74,7 @@ namespace MediaBrowser.Api.Library
|
||||||
public bool RememberCorrection { get; set; }
|
public bool RememberCorrection { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Library/FileOrganizationSmartMatch", "GET", Summary = "Gets smart match entries")]
|
[Route("/Library/FileOrganizations/SmartMatches", "GET", Summary = "Gets smart match entries")]
|
||||||
public class GetSmartMatchInfos : IReturn<QueryResult<SmartMatchInfo>>
|
public class GetSmartMatchInfos : IReturn<QueryResult<SmartMatchInfo>>
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -92,13 +92,13 @@ namespace MediaBrowser.Api.Library
|
||||||
public int? Limit { get; set; }
|
public int? Limit { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Library/FileOrganizationSmartMatch/{Id}/Delete", "POST", Summary = "Deletes a smart match entry")]
|
[Route("/Library/FileOrganizations/SmartMatches", "DELETE", Summary = "Deletes a smart match entry")]
|
||||||
public class DeleteSmartMatchEntry
|
public class DeleteSmartMatchEntry
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Id", Description = "Item ID", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
[ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
|
||||||
public string Id { get; set; }
|
public string Name { get; set; }
|
||||||
|
|
||||||
[ApiMember(Name = "MatchString", Description = "SmartMatch String", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "MatchString", Description = "SmartMatch String", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "DELETE")]
|
||||||
public string MatchString { get; set; }
|
public string MatchString { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,7 +172,7 @@ namespace MediaBrowser.Api.Library
|
||||||
|
|
||||||
public void Post(DeleteSmartMatchEntry request)
|
public void Post(DeleteSmartMatchEntry request)
|
||||||
{
|
{
|
||||||
_iFileOrganizationService.DeleteSmartMatchEntry(request.Id, request.MatchString);
|
_iFileOrganizationService.DeleteSmartMatchEntry(request.Name, request.MatchString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,7 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
private readonly IHttpClient _httpClient;
|
private readonly IHttpClient _httpClient;
|
||||||
private readonly IJsonSerializer _serializer;
|
private readonly IJsonSerializer _serializer;
|
||||||
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
|
private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
|
||||||
private readonly IServerApplicationHost _appHost;
|
private readonly IServerApplicationHost _appHost;
|
||||||
|
|
||||||
public PackageReviewService(IHttpClient httpClient, IJsonSerializer serializer, IServerApplicationHost appHost)
|
public PackageReviewService(IHttpClient httpClient, IJsonSerializer serializer, IServerApplicationHost appHost)
|
||||||
|
|
|
@ -3,11 +3,11 @@ namespace MediaBrowser.Common.Implementations.Security
|
||||||
{
|
{
|
||||||
public class MbAdmin
|
public class MbAdmin
|
||||||
{
|
{
|
||||||
public const string HttpUrl = "http://www.mb3admin.com/admin/";
|
public const string HttpUrl = "https://www.mb3admin.com/admin/";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Leaving as http for now until we get it squared away
|
/// Leaving as http for now until we get it squared away
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string HttpsUrl = "http://www.mb3admin.com/admin/";
|
public const string HttpsUrl = "https://www.mb3admin.com/admin/";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Implementations.Security
|
||||||
public class PluginSecurityManager : ISecurityManager
|
public class PluginSecurityManager : ISecurityManager
|
||||||
{
|
{
|
||||||
private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate";
|
private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate";
|
||||||
private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/admin/service/appstore/register";
|
private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "https://mb3admin.com/admin/service/appstore/register";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The _is MB supporter
|
/// The _is MB supporter
|
||||||
|
|
|
@ -355,8 +355,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
private int? GetNumAudioChannelsParam(EncodingJobOptions request, MediaStream audioStream, string outputAudioCodec)
|
private int? GetNumAudioChannelsParam(EncodingJobOptions request, MediaStream audioStream, string outputAudioCodec)
|
||||||
{
|
{
|
||||||
var inputChannels = audioStream == null
|
var inputChannels = audioStream == null
|
||||||
? null
|
? null
|
||||||
: audioStream.Channels;
|
: audioStream.Channels;
|
||||||
|
|
||||||
if (inputChannels <= 0)
|
if (inputChannels <= 0)
|
||||||
{
|
{
|
||||||
|
@ -373,15 +373,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
|
|
||||||
if (request.MaxAudioChannels.HasValue)
|
if (request.MaxAudioChannels.HasValue)
|
||||||
{
|
{
|
||||||
|
var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1
|
||||||
|
? 2
|
||||||
|
: 6;
|
||||||
|
|
||||||
if (inputChannels.HasValue)
|
if (inputChannels.HasValue)
|
||||||
{
|
{
|
||||||
return Math.Min(request.MaxAudioChannels.Value, inputChannels.Value);
|
channelLimit = Math.Min(channelLimit, inputChannels.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1
|
|
||||||
? 2
|
|
||||||
: 6;
|
|
||||||
|
|
||||||
// If we don't have any media info then limit it to 5 to prevent encoding errors due to asking for too many channels
|
// If we don't have any media info then limit it to 5 to prevent encoding errors due to asking for too many channels
|
||||||
return Math.Min(request.MaxAudioChannels.Value, channelLimit);
|
return Math.Min(request.MaxAudioChannels.Value, channelLimit);
|
||||||
}
|
}
|
||||||
|
@ -436,14 +436,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
}
|
}
|
||||||
|
|
||||||
// h264
|
// h264
|
||||||
if (isHls)
|
return string.Format(" -b:v {0} -maxrate {0} -bufsize {1}",
|
||||||
{
|
bitrate.Value.ToString(UsCulture),
|
||||||
return string.Format(" -b:v {0} -maxrate {0} -bufsize {1}",
|
(bitrate.Value * 2).ToString(UsCulture));
|
||||||
bitrate.Value.ToString(UsCulture),
|
|
||||||
(bitrate.Value * 2).ToString(UsCulture));
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
|
|
|
@ -18,7 +18,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
|
||||||
private readonly IHttpClient _httpClient;
|
private readonly IHttpClient _httpClient;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
|
private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
|
||||||
|
|
||||||
public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager, ILogger logger)
|
public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager, ILogger logger)
|
||||||
{
|
{
|
||||||
|
|
|
@ -984,10 +984,6 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (!ServerConfigurationManager.Configuration.EnableAutoUpdate)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue