From 3c8c6abca7c1f61a3f693b01eb567b1e1126d067 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 28 Nov 2014 12:41:47 -0500 Subject: remove tasks from startup --- .../Library/Resolvers/Audio/MusicAlbumResolver.cs | 3 ++- .../Library/Resolvers/BaseVideoResolver.cs | 3 ++- .../Library/Resolvers/Movies/MovieResolver.cs | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers') diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs index a500594610..5ba07cdaeb 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs @@ -12,6 +12,7 @@ using MediaBrowser.Naming.Audio; using System; using System.Collections.Generic; using System.IO; +using MediaBrowser.Naming.Common; namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio { @@ -179,7 +180,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio /// true if [is multi disc album folder] [the specified path]; otherwise, false. private static bool IsMultiDiscAlbumFolder(string path) { - var parser = new AlbumParser(new AudioOptions(), new Naming.Logging.NullLogger()); + var parser = new AlbumParser(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = parser.ParseMultiPart(path); return result.IsMultiPart; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs index ba2a32c13f..f6d33079b9 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using MediaBrowser.Naming.Video; using System; @@ -43,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers // If the path is a file check for a matching extensions if (!args.IsDirectory) { - var parser = new Naming.Video.VideoResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var parser = new Naming.Video.VideoResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var videoInfo = parser.ResolveFile(args.Path); if (videoInfo == null) diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index 15125ac43f..a2da9ff775 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using MediaBrowser.Naming.Video; namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies @@ -319,7 +320,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies return null; } - var resolver = new StackResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new StackResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = resolver.ResolveDirectories(folderPaths); @@ -355,7 +356,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies var paths = sortedMovies.Select(i => i.Path).ToList(); - var resolver = new StackResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new StackResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = resolver.ResolveFiles(paths); -- cgit v1.2.3