Merge pull request #3055 from MediaBrowser/beta

Beta

2 files changed, 25 insertions, 22 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 667616414..d74235ec7 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -126,10 +126,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
                 {
                     leftOver.Add(child);
                 }
-                else if (IsIgnored(child.Name))
-                {
-
-                }
                 else
                 {
                     files.Add(child);
@@ -298,22 +294,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             return item;
         }
 
-        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;
-        }
-
         /// <summary>
         /// Sets the initial item values.
         /// </summary>
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index a0ff29482..3bad69b56 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Globalization;
 using Emby.Naming.Common;
 using Emby.Naming.TV;
+using MediaBrowser.Model.Logging;
 
 namespace Emby.Server.Implementations.Library.Resolvers.TV
 {
@@ -21,16 +22,18 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         private readonly ILibraryManager _libraryManager;
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private readonly ILocalizationManager _localization;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SeasonResolver"/> class.
         /// </summary>
         /// <param name="config">The config.</param>
-        public SeasonResolver(IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization)
+        public SeasonResolver(IServerConfigurationManager config, ILibraryManager libraryManager, ILocalizationManager localization, ILogger logger)
         {
             _config = config;
             _libraryManager = libraryManager;
             _localization = localization;
+            _logger = logger;
         }
 
         /// <summary>
@@ -45,20 +48,40 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
                 var series = ((Series)args.Parent);
 
+                var path = args.Path;
+
                 var season = new Season
                 {
-                    IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(args.Path, true, true).SeasonNumber,
+                    IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(path, true, true).SeasonNumber,
                     SeriesId = series.Id,
                     SeriesName = series.Name
                 };
 
                 if (season.IndexNumber.HasValue)
                 {
+                    var resolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
+
+                    var episodeInfo = resolver.Resolve(path, 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}", 
+                                path,
+                                episodeInfo.SeasonNumber.Value,
+                                episodeInfo.EpisodeNumber.Value);
+
+                            return null;
+                        }
+                    }
+
                     var seasonNumber = season.IndexNumber.Value;
 
                     season.Name = seasonNumber == 0 ?
                         args.LibraryOptions.SeasonZeroDisplayName :
                         string.Format(_localization.GetLocalizedString("NameSeasonNumber"), seasonNumber.ToString(UsCulture), args.GetLibraryOptions().PreferredMetadataLanguage);
+
                 }
 
                 return season;