1 files changed, 9 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index f6e5af7b5..c2e87cbd7 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -35,6 +35,15 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         public bool ShouldIgnore(ItemResolveArgs args)
         {
+            var filename = args.FileInfo.Name;
+
+            // Handle mac .DS_Store
+            // https://github.com/MediaBrowser/MediaBrowser/issues/427
+            if (filename.IndexOf("._", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                return true;    
+            }
+
             // Ignore hidden files and folders
             if (args.IsHidden)
             {
@@ -71,8 +80,6 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (args.IsDirectory)
             {
-                var filename = args.FileInfo.Name;
-
                 // Ignore any folders in our list
                 if (IgnoreFolders.ContainsKey(filename))
                 {
@@ -100,8 +107,6 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 if (args.Parent != null)
                 {
-                    var filename = args.FileInfo.Name;
-
                     if (string.Equals(Path.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(filename))
                     {
                         return true;