lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-10 00:33:02 -05:00
commit 46a6194516
7 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Api/Library/FileOrganizationService.cs
View File

@ -74,7 +74,7 @@ namespace MediaBrowser.Api.Library
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>>
{
/// <summary>
@ -92,13 +92,13 @@ namespace MediaBrowser.Api.Library
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
{
[ApiMember(Name = "Id", Description = "Item ID", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public string Id { get; set; }
[ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
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; }
}
@ -172,7 +172,7 @@ namespace MediaBrowser.Api.Library
public void Post(DeleteSmartMatchEntry request)
{
_iFileOrganizationService.DeleteSmartMatchEntry(request.Id, request.MatchString);
_iFileOrganizationService.DeleteSmartMatchEntry(request.Name, request.MatchString);
}
}
}

2
MediaBrowser.Api/PackageReviewService.cs
View File

@ -102,7 +102,7 @@ namespace MediaBrowser.Api
{
private readonly IHttpClient _httpClient;
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;
public PackageReviewService(IHttpClient httpClient, IJsonSerializer serializer, IServerApplicationHost appHost)

4
MediaBrowser.Common.Implementations/Security/MbAdmin.cs
View File

@ -3,11 +3,11 @@ namespace MediaBrowser.Common.Implementations.Security
{
public class MbAdmin
{
public const string HttpUrl = "http://www.mb3admin.com/admin/";
public const string HttpUrl = "https://www.mb3admin.com/admin/";
/// <summary>
/// Leaving as http for now until we get it squared away
/// </summary>
public const string HttpsUrl = "http://www.mb3admin.com/admin/";
public const string HttpsUrl = "https://www.mb3admin.com/admin/";
}
}

2
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
View File

@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Implementations.Security
public class PluginSecurityManager : ISecurityManager
{
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>
/// The _is MB supporter

15
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -373,15 +373,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (request.MaxAudioChannels.HasValue)
{
if (inputChannels.HasValue)
{
return Math.Min(request.MaxAudioChannels.Value, inputChannels.Value);
}
var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1
? 2
: 6;
if (inputChannels.HasValue)
{
channelLimit = Math.Min(channelLimit, inputChannels.Value);
}
// 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);
}
@ -436,16 +436,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
// h264
if (isHls)
{
return string.Format(" -b:v {0} -maxrate {0} -bufsize {1}",
bitrate.Value.ToString(UsCulture),
(bitrate.Value * 2).ToString(UsCulture));
}
return string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture));
}
return string.Empty;
}

2
MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
View File

@ -18,7 +18,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly IHttpClient _httpClient;
private readonly IUserManager _userManager;
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)
{

4
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -984,10 +984,6 @@ namespace MediaBrowser.Server.Startup.Common
{
get
{
if (!ServerConfigurationManager.Configuration.EnableAutoUpdate)
{
return false;
}
#if DEBUG
return false;
#endif