diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-11 15:37:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 15:37:53 -0500 |
| commit | b4c6cad2fa9256c4af83752a34679d2533c96b11 (patch) | |
| tree | 43e25b4ed64a535823e21128ee74f3e0a1245069 /Emby.Server.Implementations/Library/LibraryManager.cs | |
| parent | 00316bc8ca9791f2ad68e84e29f2fbc6b1af2173 (diff) | |
| parent | 2b19df9544315603673ff034e8fd621cf0b85a4b (diff) | |
Merge pull request #2281 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 8800777ca..13c6485e5 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -29,7 +29,6 @@ using System.Threading; using System.Threading.Tasks; using Emby.Server.Implementations.Library.Resolvers; using Emby.Server.Implementations.Library.Validators; -using Emby.Server.Implementations.Logging; using Emby.Server.Implementations.ScheduledTasks; using MediaBrowser.Model.IO; using MediaBrowser.Controller.Channels; @@ -2266,7 +2265,7 @@ namespace Emby.Server.Implementations.Library public bool IsVideoFile(string path, LibraryOptions libraryOptions) { - var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new PatternsLogger()); + var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new NullLogger()); return resolver.IsVideoFile(path); } @@ -2294,7 +2293,7 @@ namespace Emby.Server.Implementations.Library public bool FillMissingEpisodeNumbersFromPath(Episode episode) { var resolver = new EpisodeResolver(GetNamingOptions(), - new PatternsLogger()); + new NullLogger()); var isFolder = episode.VideoType == VideoType.BluRay || episode.VideoType == VideoType.Dvd || episode.VideoType == VideoType.HdDvd; @@ -2440,7 +2439,7 @@ namespace Emby.Server.Implementations.Library public ItemLookupInfo ParseName(string name) { - var resolver = new VideoResolver(GetNamingOptions(), new PatternsLogger()); + var resolver = new VideoResolver(GetNamingOptions(), new NullLogger()); var result = resolver.CleanDateTime(name); var cleanName = resolver.CleanString(result.Name); @@ -2459,7 +2458,7 @@ namespace Emby.Server.Implementations.Library .SelectMany(i => _fileSystem.GetFiles(i.FullName, false)) .ToList(); - var videoListResolver = new VideoListResolver(GetNamingOptions(), new PatternsLogger()); + var videoListResolver = new VideoListResolver(GetNamingOptions(), new NullLogger()); var videos = videoListResolver.Resolve(fileSystemChildren); @@ -2505,7 +2504,7 @@ namespace Emby.Server.Implementations.Library .SelectMany(i => _fileSystem.GetFiles(i.FullName, false)) .ToList(); - var videoListResolver = new VideoListResolver(GetNamingOptions(), new PatternsLogger()); + var videoListResolver = new VideoListResolver(GetNamingOptions(), new NullLogger()); var videos = videoListResolver.Resolve(fileSystemChildren); @@ -2628,7 +2627,7 @@ namespace Emby.Server.Implementations.Library private void SetExtraTypeFromFilename(Video item) { - var resolver = new ExtraResolver(GetNamingOptions(), new PatternsLogger(), new RegexProvider()); + var resolver = new ExtraResolver(GetNamingOptions(), new NullLogger(), new RegexProvider()); var result = resolver.GetExtraInfo(item.Path); |
