Update to 3.5.2 and .net core 2.1

1 files changed, 15 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index a693e3b264..951f439c24 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -82,11 +82,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                         };
                     }
                 }
-                else if (string.IsNullOrWhiteSpace(collectionType))
+                else if (string.IsNullOrEmpty(collectionType))
                 {
                     if (args.ContainsFileSystemEntryByName("tvshow.nfo"))
                     {
-                        if (args.Parent.IsRoot)
+                        if (args.Parent != null && args.Parent.IsRoot)
                         {
                             // For now, return null, but if we want to allow this in the future then add some additional checks to guard against a misplaced tvshow.nfo
                             return null;
@@ -99,7 +99,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                         };
                     }
 
-                    if (args.Parent.IsRoot)
+                    if (args.Parent != null && args.Parent.IsRoot)
                     {
                         return null;
                     }
@@ -160,11 +160,19 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                             return true;
                         }
 
-                        var allowOptimisticEpisodeDetection = isTvContentType;
-                        var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions(allowOptimisticEpisodeDetection);
+                        var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
 
                         var episodeResolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
-                        var episodeInfo = episodeResolver.Resolve(fullName, false, false);
+                        bool? isNamed = null;
+                        bool? isOptimistic = null;
+
+                        if (!isTvContentType)
+                        {
+                            isNamed = true;
+                            isOptimistic = false;
+                        }
+
+                        var episodeInfo = episodeResolver.Resolve(fullName, false, isNamed, isOptimistic, null, false);
                         if (episodeInfo != null && episodeInfo.EpisodeNumber.HasValue)
                         {
                             return true;
@@ -206,7 +214,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         {
             var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
 
-            var seasonNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(path, isTvContentType, isTvContentType).SeasonNumber;
+            var seasonNumber = new SeasonPathParser(namingOptions).Parse(path, isTvContentType, isTvContentType).SeasonNumber;
 
             return seasonNumber.HasValue;
         }