Merge pull request #651 from jellyfin/release-10.1.0

Release 10.1.0

3 files changed, 28 insertions, 36 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index 7d1c4d65a5..fed0904d19 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
+using System.Linq;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using System.Linq;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
             }
 
             var season = parent as Season;
-            // Just in case the user decided to nest episodes. 
+            // Just in case the user decided to nest episodes.
             // Not officially supported but in some cases we can handle it.
             if (season == null)
             {
@@ -36,8 +36,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
             // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
             // Also handle flat tv folders
-            if (season != null || 
-                string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) || 
+            if (season != null ||
+                string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) ||
                 args.HasParent<Series>())
             {
                 var episode = ResolveVideo<Episode>(args, false);
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 0fe42fa736..ce1386e91a 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -1,10 +1,9 @@
-using System.Globalization;
+using System.Globalization;
+using Emby.Naming.TV;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Globalization;
-using Emby.Naming.Common;
-using Emby.Naming.TV;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Library.Resolvers.TV
@@ -28,6 +27,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// Initializes a new instance of the <see cref="SeasonResolver"/> class.
         /// </summary>
         /// <param name="config">The config.</param>
+        /// <param name="libraryManager">The library manager.</param>
+        /// <param name="localization">The localization</param>
+        /// <param name="logger">The logger</param>
         public SeasonResolver(IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization, ILogger logger)
         {
             _config = config;
@@ -61,7 +63,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                 if (!season.IndexNumber.HasValue || !seasonParserResult.IsSeasonFolder)
                 {
-                    var resolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
+                    var resolver = new Naming.TV.EpisodeResolver(namingOptions);
 
                     var folderName = System.IO.Path.GetFileName(path);
                     var testPath = "\\\\test\\" + folderName;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 32e8b6120d..8ef2276898 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -1,20 +1,15 @@
-using MediaBrowser.Controller.Entities.TV;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Emby.Naming.TV;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using Emby.Naming.Common;
-using Emby.Naming.TV;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.Configuration;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Library.Resolvers.TV
 {
@@ -38,13 +33,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// Gets the priority.
         /// </summary>
         /// <value>The priority.</value>
-        public override ResolverPriority Priority
-        {
-            get
-            {
-                return ResolverPriority.Second;
-            }
-        }
+        public override ResolverPriority Priority => ResolverPriority.Second;
 
         /// <summary>
         /// Resolves the specified args.
@@ -118,7 +107,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
             return null;
         }
 
-        public static bool IsSeriesFolder(string path,
+        public static bool IsSeriesFolder(
+            string path,
             IEnumerable<FileSystemMetadata> fileSystemChildren,
             IDirectoryService directoryService,
             IFileSystem fileSystem,
@@ -146,7 +136,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 {
                     if (IsSeasonFolder(child.FullName, isTvContentType, libraryManager))
                     {
-                        //logger.LogDebug("{0} is a series because of season folder {1}.", path, child.FullName);
+                        logger.LogDebug("{Path} is a series because of season folder {Dir}.", path, child.FullName);
                         return true;
                     }
                 }
@@ -162,7 +152,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                         var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
 
-                        var episodeResolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
+                        var episodeResolver = new Naming.TV.EpisodeResolver(namingOptions);
                         bool? isNamed = null;
                         bool? isOptimistic = null;
 
@@ -172,7 +162,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                             isOptimistic = false;
                         }
 
-                        var episodeInfo = episodeResolver.Resolve(fullName, false, isNamed, isOptimistic, null, false);
+                        var episodeInfo = episodeResolver.Resolve(fullName, false, isNamed, isOptimistic, fillExtendedInfo: false);
                         if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)
                         {
                             return true;
@@ -181,7 +171,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 }
             }
 
-            //logger.LogDebug("{0} is not a series folder.", path);
+            logger.LogDebug("{Path} is not a series folder.", path);
             return false;
         }
 
@@ -190,12 +180,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns><c>true</c> if [is place holder] [the specified path]; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">path</exception>
+        /// <exception cref="ArgumentNullException">path</exception>
         private static bool IsVideoPlaceHolder(string path)
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
             }
 
             var extension = Path.GetExtension(path);
@@ -236,7 +226,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="path">The path.</param>
-        private void SetProviderIdFromPath(Series item, string path)
+        private static void SetProviderIdFromPath(Series item, string path)
         {
             var justName = Path.GetFileName(path);