Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 19 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index cebd5e192..04c247f7e 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Controller.Library;
+using System.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +18,6 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         private static readonly List<string> IgnoreFolders = new List<string>
         {
-            "trailers",
             "metadata",
             "certificate",
             "backup",
@@ -36,7 +37,12 @@ namespace MediaBrowser.Server.Implementations.Library
             // Ignore hidden files and folders
             if (args.IsHidden)
             {
-                return true;
+                var parentFolderName = Path.GetFileName(Path.GetDirectoryName(args.Path));
+
+                if (!string.Equals(parentFolderName, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
             }
 
             if (args.IsDirectory)
@@ -48,6 +54,16 @@ namespace MediaBrowser.Server.Implementations.Library
                 {
                     return true;
                 }
+
+                if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+
+                if (string.Equals(filename, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
             }
 
             return false;