Merge pull request #1051 from MediaBrowser/dev

3.0.5557.20000 Beta

3 files changed, 12 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index db4910c52..3dda3f158 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -29,7 +29,10 @@ namespace MediaBrowser.Server.Implementations.Library
                 "extrafanart",
                 "extrathumbs",
                 ".actors",
-                ".wd_tv"
+                ".wd_tv",
+
+                // Synology
+                "eaDir"
 
         };
         
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 1f82e7ef1..64e5d20c9 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -886,7 +886,14 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (type == typeof(Person))
             {
-                subFolderPrefix = validFilename.Substring(0, 1);
+                var subFolderIndex = 0;
+
+                while (!char.IsLetterOrDigit(validFilename[subFolderIndex]))
+                {
+                    subFolderIndex++;
+                }
+
+                subFolderPrefix = validFilename.Substring(subFolderIndex, 1);
             }
 
             var fullPath = string.IsNullOrEmpty(subFolderPrefix) ?
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
index 7636833e4..a964738e6 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -53,8 +52,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            var returnArtists = new List<MusicArtist>(allArtists.Count);
-
             var numComplete = 0;
             var numArtists = allArtists.Count;
 
@@ -67,8 +64,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                     var artistItem = _libraryManager.GetArtist(artist);
 
                     await artistItem.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-
-                    returnArtists.Add(artistItem);
                 }
                 catch (IOException ex)
                 {