diff options
3 files changed, 26 insertions, 23 deletions
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs index 0e99ee673..dac0b0d15 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs @@ -29,13 +29,14 @@ 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) + public UsageEntryPoint(ILogger logger, IApplicationHost applicationHost, INetworkManager networkManager, IHttpClient httpClient, ISessionManager sessionManager, IUserManager userManager) { _logger = logger; _applicationHost = applicationHost; _networkManager = networkManager; _httpClient = httpClient; _sessionManager = sessionManager; + _userManager = userManager; _sessionManager.SessionStarted += _sessionManager_SessionStarted; } diff --git a/MediaBrowser.Server.Implementations/Library/PathExtensions.cs b/MediaBrowser.Server.Implementations/Library/PathExtensions.cs index 822f41da2..6c0e3237e 100644 --- a/MediaBrowser.Server.Implementations/Library/PathExtensions.cs +++ b/MediaBrowser.Server.Implementations/Library/PathExtensions.cs @@ -33,13 +33,12 @@ namespace MediaBrowser.Server.Implementations.Library return str.Substring(start, end - start); } // for imdbid we also accept pattern matching - if (attrib == "imdbid") + if (string.Equals(attrib, "imdbid", StringComparison.OrdinalIgnoreCase)) { - Regex imdbPattern = new Regex("tt\\d{7}"); - var m = imdbPattern.Match(str); - return m.Success ? m.Value : null; + var m = Regex.Match(str, "tt\\d{7}", RegexOptions.IgnoreCase); + return m.Success ? m.Value : null; } - + return null; } } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index 5ecf7759d..441fada6a 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -19,7 +19,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies /// </summary> public class MovieResolver : BaseVideoResolver<Video>, IMultiItemResolver { - public MovieResolver(ILibraryManager libraryManager) : base(libraryManager) + public MovieResolver(ILibraryManager libraryManager) + : base(libraryManager) { } @@ -39,7 +40,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies } } - public MultiItemResolverResult ResolveMultiple(Folder parent, + public MultiItemResolverResult ResolveMultiple(Folder parent, List<FileSystemInfo> files, string collectionType, IDirectoryService directoryService) @@ -237,25 +238,27 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies /// <param name="item">The item.</param> private void SetProviderIdsFromPath(Video item) { - //we need to only look at the name of this actual item (not parents) - var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(item.ContainingFolderPath); + if (item is Movie || item is MusicVideo) + { + //we need to only look at the name of this actual item (not parents) + var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(item.ContainingFolderPath); - // check for tmdb id - var tmdbid = justName.GetAttributeValue("tmdbid"); + // check for tmdb id + var tmdbid = justName.GetAttributeValue("tmdbid"); - if (!string.IsNullOrEmpty(tmdbid)) - { - item.SetProviderId(MetadataProviders.Tmdb, tmdbid); - } + if (!string.IsNullOrEmpty(tmdbid)) + { + item.SetProviderId(MetadataProviders.Tmdb, tmdbid); + } - // check for imdb id - we use full media path, as we can assume, that this will match in any use case (wither id in parent dir or in file name) - var imdbid = item.Path.GetAttributeValue("imdbid"); + // check for imdb id - we use full media path, as we can assume, that this will match in any use case (wither id in parent dir or in file name) + var imdbid = item.Path.GetAttributeValue("imdbid"); - if (!string.IsNullOrEmpty(imdbid)) - { - item.SetProviderId(MetadataProviders.Imdb, imdbid); + if (!string.IsNullOrEmpty(imdbid)) + { + item.SetProviderId(MetadataProviders.Imdb, imdbid); + } } - } /// <summary> @@ -272,7 +275,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies where T : Video, new() { var multiDiscFolders = new List<FileSystemInfo>(); - + // Search for a folder rip foreach (var child in fileSystemEntries) { |