alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-07 16:28:56 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

added UniversalDetector.dll

Browse Source
This commit is contained in:
Luke Pulverenti
2015-01-10 14:42:14 -05:00
parent e978482896
commit 5ff5df9867
14 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
View File

@@ -18,7 +18,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
public class UsageEntryPoint : IServerEntryPoint
{
private readonly IApplicationHost _applicationHost;
private readonly INetworkManager _networkManager;
private readonly IHttpClient _httpClient;
private readonly ILogger _logger;
private readonly ISessionManager _sessionManager;
@@ -29,11 +28,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly ConcurrentDictionary<Guid, ClientInfo> _apps = new ConcurrentDictionary<Guid, ClientInfo>();
public UsageEntryPoint(ILogger logger, IApplicationHost applicationHost, INetworkManager networkManager, IHttpClient httpClient, ISessionManager sessionManager, IUserManager userManager)
public UsageEntryPoint(ILogger logger, IApplicationHost applicationHost, IHttpClient httpClient, ISessionManager sessionManager, IUserManager userManager)
{
_logger = logger;
_applicationHost = applicationHost;
_networkManager = networkManager;
_httpClient = httpClient;
_sessionManager = sessionManager;
_userManager = userManager;
@@ -68,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
try
{
await new UsageReporter(_applicationHost, _networkManager, _httpClient, _userManager)
await new UsageReporter(_applicationHost, _httpClient, _userManager)
.ReportAppUsage(client, CancellationToken.None)
.ConfigureAwait(false);
}
@@ -110,7 +108,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
try
{
await new UsageReporter(_applicationHost, _networkManager, _httpClient, _userManager)
await new UsageReporter(_applicationHost, _httpClient, _userManager)
.ReportServerUsage(CancellationToken.None)
.ConfigureAwait(false);
}

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

@@ -14,15 +14,13 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
public class UsageReporter
{
private readonly IApplicationHost _applicationHost;
private readonly INetworkManager _networkManager;
private readonly IHttpClient _httpClient;
private readonly IUserManager _userManager;
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
public UsageReporter(IApplicationHost applicationHost, INetworkManager networkManager, IHttpClient httpClient, IUserManager userManager)
public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager)
{
_applicationHost = applicationHost;
_networkManager = networkManager;
_httpClient = httpClient;
_userManager = userManager;
}
@@ -31,12 +29,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
cancellationToken.ThrowIfCancellationRequested();
var mac = _networkManager.GetMacAddress();
var data = new Dictionary<string, string>
{
{ "feature", _applicationHost.Name },
{ "mac", mac },
{ "mac", _applicationHost.SystemId },
{ "serverid", _applicationHost.SystemId },
{ "deviceid", _applicationHost.SystemId },
{ "ver", _applicationHost.ApplicationVersion.ToString() },

2
MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
View File

@@ -138,7 +138,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
return true;
}
return _config.Configuration.InsecureApps7.Contains(auth.Client ?? string.Empty,
return _config.Configuration.InsecureApps8.Contains(auth.Client ?? string.Empty,
StringComparer.OrdinalIgnoreCase);
}

9
MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
@@ -143,6 +144,14 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
// In mixed folders we need to be conservative and avoid expressions that may result in false positives (e.g. movies with numbers in the title)
if (!isTvContentType)
{
namingOptions.EpisodeExpressions = namingOptions.EpisodeExpressions
.Where(i => i.IsNamed)
.ToList();
}
var episodeResolver = new Naming.TV.EpisodeResolver(namingOptions, new Naming.Logging.NullLogger());
var episodeInfo = episodeResolver.Resolve(fullName, FileInfoType.File, false);
if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)