Update to 3.5.2 and .net core 2.1

9 files changed, 107 insertions, 51 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index d30aaa133..8872bd641 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -101,13 +101,15 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
             if (LibraryManager.IsAudioFile(args.Path, libraryOptions))
             {
-                if (string.Equals(Path.GetExtension(args.Path), ".cue", StringComparison.OrdinalIgnoreCase))
+                var extension = Path.GetExtension(args.Path);
+
+                if (string.Equals(extension, ".cue", StringComparison.OrdinalIgnoreCase))
                 {
                     // if audio file exists of same name, return null
                     return null;
                 }
 
-                var isMixedCollectionType = string.IsNullOrWhiteSpace(collectionType);
+                var isMixedCollectionType = string.IsNullOrEmpty(collectionType);
 
                 // For conflicting extensions, give priority to videos
                 if (isMixedCollectionType && LibraryManager.IsVideoFile(args.Path, libraryOptions))
@@ -134,6 +136,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
 
                 if (item != null)
                 {
+                    item.IsShortcut = string.Equals(extension, ".strm", StringComparison.OrdinalIgnoreCase);
+
                     item.IsInMixedFolder = true;
                 }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index b8ec41805..a33f101ae 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -52,14 +52,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         /// <returns>MusicAlbum.</returns>
         protected override MusicAlbum Resolve(ItemResolveArgs args)
         {
-            if (!args.IsDirectory) return null;
-
-            // Avoid mis-identifying top folders
-            if (args.HasParent<MusicAlbum>()) return null;
-            if (args.Parent.IsRoot) return null;
-
             var collectionType = args.GetCollectionType();
-
             var isMusicMediaFolder = string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase);
 
             // If there's a collection type and it's not music, don't allow it.
@@ -68,6 +61,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 return null;
             }
 
+            if (!args.IsDirectory) return null;
+
+            // Avoid mis-identifying top folders
+            if (args.HasParent<MusicAlbum>()) return null;
+            if (args.Parent.IsRoot) return null;
+
             return IsMusicAlbum(args) ? new MusicAlbum() : null;
         }
 
@@ -117,24 +116,22 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                 {
                     if (allowSubfolders)
                     {
+                        if (notMultiDisc)
+                        {
+                            continue;
+                        }
+
                         var path = fileSystemInfo.FullName;
-                        var isMultiDisc = IsMultiDiscFolder(path, libraryOptions);
+                        var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryOptions, libraryManager);
 
-                        if (isMultiDisc)
+                        if (hasMusic)
                         {
-                            var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryOptions, libraryManager);
-
-                            if (hasMusic)
+                            if (IsMultiDiscFolder(path, libraryOptions))
                             {
                                 logger.Debug("Found multi-disc folder: " + path);
                                 discSubfolderCount++;
                             }
-                        }
-                        else
-                        {
-                            var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryOptions, libraryManager);
-
-                            if (hasMusic)
+                            else
                             {
                                 // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
                                 notMultiDisc = true;
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index 7e960f85e..556748183 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -184,11 +184,6 @@ namespace Emby.Server.Implementations.Library.Resolvers
                 else if (string.Equals(videoInfo.StubType, "bluray", StringComparison.OrdinalIgnoreCase))
                 {
                     video.VideoType = VideoType.BluRay;
-                    video.IsHD = true;
-                }
-                else if (string.Equals(videoInfo.StubType, "hdtv", StringComparison.OrdinalIgnoreCase))
-                {
-                    video.IsHD = true;
                 }
             }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
index df441c5ed..b9aca1417 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/BoxSetResolver.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
 using System;
 using System.IO;
+using MediaBrowser.Model.Extensions;
 
 namespace Emby.Server.Implementations.Library.Resolvers.Movies
 {
@@ -30,14 +31,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 {
                     return null;
                 }
-                
-                if (filename.IndexOf("[boxset]", StringComparison.OrdinalIgnoreCase) != -1 || 
-                    args.ContainsFileSystemEntryByName("collection.xml"))
+
+                if (filename.IndexOf("[boxset]", StringComparison.OrdinalIgnoreCase) != -1 || args.ContainsFileSystemEntryByName("collection.xml"))
                 {
                     return new BoxSet
                     {
                         Path = args.Path,
-                        Name = ResolverHelper.StripBrackets(Path.GetFileName(args.Path))
+                        Name = Path.GetFileName(args.Path).Replace("[boxset]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim()
                     };
                 }
             }
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index d74235ec7..1394e3858 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -78,7 +78,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 return ResolveVideos<Video>(parent, files, directoryService, false, collectionType, false);
             }
 
-            if (string.IsNullOrWhiteSpace(collectionType))
+            if (string.IsNullOrEmpty(collectionType))
             {
                 // Owned items should just use the plain video type
                 if (parent == null)
@@ -113,7 +113,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             foreach (var child in fileSystemEntries)
             {
                 // This is a hack but currently no better way to resolve a sometimes ambiguous situation
-                if (string.IsNullOrWhiteSpace(collectionType))
+                if (string.IsNullOrEmpty(collectionType))
                 {
                     if (string.Equals(child.Name, "tvshow.nfo", StringComparison.OrdinalIgnoreCase) ||
                         string.Equals(child.Name, "season.nfo", StringComparison.OrdinalIgnoreCase))
@@ -126,6 +126,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 {
                     leftOver.Add(child);
                 }
+                else if (IsIgnored(child.Name))
+                {
+
+                }
                 else
                 {
                     files.Add(child);
@@ -172,6 +176,22 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             return result;
         }
 
+        private bool IsIgnored(string filename)
+        {
+            // Ignore samples
+            var sampleFilename = " " + filename.Replace(".", " ", StringComparison.OrdinalIgnoreCase)
+                .Replace("-", " ", StringComparison.OrdinalIgnoreCase)
+                .Replace("_", " ", StringComparison.OrdinalIgnoreCase)
+                .Replace("!", " ", StringComparison.OrdinalIgnoreCase);
+
+            if (sampleFilename.IndexOf(" sample ", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         private bool ContainsFile(List<VideoInfo> result, FileSystemMetadata file)
         {
             return result.Any(i => ContainsFile(i, file));
@@ -317,7 +337,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 //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 (!string.IsNullOrWhiteSpace(justName))
+                if (!string.IsNullOrEmpty(justName))
                 {
                     // check for tmdb id
                     var tmdbid = justName.GetAttributeValue("tmdbid");
@@ -328,7 +348,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     }
                 }
 
-                if (!string.IsNullOrWhiteSpace(item.Path))
+                if (!string.IsNullOrEmpty(item.Path))
                 {
                     // 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");
@@ -395,16 +415,14 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                     Set3DFormat(movie);
                     return movie;
                 }
-                else if (supportPhotos && !child.IsHidden && PhotoResolver.IsImageFile(child.FullName, _imageProcessor))
+                else if (supportPhotos && PhotoResolver.IsImageFile(child.FullName, _imageProcessor))
                 {
                     photos.Add(child);
                 }
             }
 
             // TODO: Allow GetMultiDiscMovie in here
-            var supportsMultiVersion = !string.Equals(collectionType, CollectionType.HomeVideos) &&
-                                    !string.Equals(collectionType, CollectionType.Photos) &&
-                                    !string.Equals(collectionType, CollectionType.MusicVideos);
+            var supportsMultiVersion = true;
 
             var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
                 new MultiItemResolverResult();
@@ -532,7 +550,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 }
             }
 
-            if (string.IsNullOrWhiteSpace(collectionType))
+            if (string.IsNullOrEmpty(collectionType))
             {
                 return false;
             }
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index 48f5802a9..e3cce5f4b 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -94,7 +94,8 @@ namespace Emby.Server.Implementations.Library.Resolvers
             "backdrop",
             "poster",
             "cover",
-            "logo"
+            "logo",
+            "default"
         };
 
         internal static bool IsImageFile(string path, IImageProcessor imageProcessor)
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index 8c59cf20f..e66c9f087 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -2,11 +2,20 @@
 using MediaBrowser.Controller.Playlists;
 using System;
 using System.IO;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Entities;
+using System.Linq;
 
 namespace Emby.Server.Implementations.Library.Resolvers
 {
     public class PlaylistResolver : FolderResolver<Playlist>
     {
+        private string[] SupportedCollectionTypes = new string[] {
+
+            string.Empty,
+            CollectionType.Music
+        };
+
         /// <summary>
         /// Resolves the specified args.
         /// </summary>
@@ -31,10 +40,26 @@ namespace Emby.Server.Implementations.Library.Resolvers
                     return new Playlist
                     {
                         Path = args.Path,
-                        Name = ResolverHelper.StripBrackets(Path.GetFileName(args.Path))
+                        Name = Path.GetFileName(args.Path).Replace("[playlist]", string.Empty, StringComparison.OrdinalIgnoreCase).Trim()
                     };
                 }
             }
+            else
+            {
+                if (SupportedCollectionTypes.Contains(args.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                {
+                    var extension = Path.GetExtension(args.Path);
+                    if (Playlist.SupportedExtensions.Contains(extension ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                    {
+                        return new Playlist
+                        {
+                            Path = args.Path,
+                            Name = Path.GetFileNameWithoutExtension(args.Path),
+                            IsInMixedFolder = true
+                        };
+                    }
+                }
+            }
 
             return null;
         }
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index 3bad69b56..d8343f7c6 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -50,24 +50,29 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                 var path = args.Path;
 
+                var seasonParserResult = new SeasonPathParser(namingOptions).Parse(path, true, true);
+
                 var season = new Season
                 {
-                    IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(path, true, true).SeasonNumber,
+                    IndexNumber = seasonParserResult.SeasonNumber,
                     SeriesId = series.Id,
                     SeriesName = series.Name
                 };
 
-                if (season.IndexNumber.HasValue)
+                if (!season.IndexNumber.HasValue || !seasonParserResult.IsSeasonFolder)
                 {
                     var resolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
 
-                    var episodeInfo = resolver.Resolve(path, true);
+                    var folderName = System.IO.Path.GetFileName(path);
+                    var testPath = "\\\\test\\" + folderName;
+
+                    var episodeInfo = resolver.Resolve(testPath, true);
 
                     if (episodeInfo != null)
                     {
                         if (episodeInfo.EpisodeNumber.HasValue && episodeInfo.SeasonNumber.HasValue)
                         {
-                            _logger.Info("Found folder underneath series with episode number: {0}. Season {1}. Episode {2}", 
+                            _logger.Debug("Found folder underneath series with episode number: {0}. Season {1}. Episode {2}",
                                 path,
                                 episodeInfo.SeasonNumber.Value,
                                 episodeInfo.EpisodeNumber.Value);
@@ -75,7 +80,10 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                             return null;
                         }
                     }
+                }
 
+                if (season.IndexNumber.HasValue)
+                {
                     var seasonNumber = season.IndexNumber.Value;
 
                     season.Name = seasonNumber == 0 ?
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index a693e3b26..951f439c2 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;
         }