From 6adc668bed55948b89ee6adcc379cce7253da82c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 May 2016 13:47:41 -0400
Subject: update icons

---
 MediaBrowser.Server.Implementations/Library/MusicManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index aad7c112b..c82c4cdf7 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Implementations.Library
         public IEnumerable<Audio> GetInstantMixFromFolder(Folder item, User user)
         {
             var genres = item
-                .GetRecursiveChildren(user, i => i is Audio)
+               .GetRecursiveChildren(user, i => i is Audio)
                .Cast<Audio>()
                .SelectMany(i => i.Genres)
                .Concat(item.Genres)
-- 
cgit v1.2.3


From 8d6702b11533d49a5594a84f25f81f581962a54c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 May 2016 14:58:16 -0400
Subject: update artists

---
 MediaBrowser.Controller/Entities/Audio/MusicArtist.cs         |  7 ++++++-
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 11 +++--------
 .../Persistence/SqliteItemRepository.cs                       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 2637e729c..6f6f124db 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -17,7 +17,12 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// </summary>
     public class MusicArtist : Folder, IMetadataContainer, IItemByName, IHasMusicGenres, IHasDualAccess, IHasProductionLocations, IHasLookupInfo<ArtistInfo>
     {
-        public bool IsAccessedByName { get; set; }
+        [IgnoreDataMember]
+        public bool IsAccessedByName
+        {
+            get { return ParentId == Guid.Empty; }
+        }
+
         public List<string> ProductionLocations { get; set; }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 95d47b380..b6a33afe4 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -961,7 +961,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     Name = name
 
                 }).Cast<MusicArtist>()
-                .Where(i => !i.IsAccessedByName)
+                .OrderBy(i => i.IsAccessedByName ? 1 : 0)
                 .Cast<T>()
                 .FirstOrDefault();
 
@@ -984,11 +984,6 @@ namespace MediaBrowser.Server.Implementations.Library
                     Path = path
                 };
 
-                if (isArtist)
-                {
-                    (item as MusicArtist).IsAccessedByName = true;
-                }
-
                 var task = CreateItem(item, CancellationToken.None);
                 Task.WaitAll(task);
             }
@@ -2574,8 +2569,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("name");
             }
 
-             name = _fileSystem.GetValidFilename(name);
-            
+            name = _fileSystem.GetValidFilename(name);
+
             var rootFolderPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
 
             var virtualFolderPath = Path.Combine(rootFolderPath, name);
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 14acd64e6..30314b7cc 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private IDbCommand _updateInheritedRatingCommand;
         private IDbCommand _updateInheritedTagsCommand;
 
-        public const int LatestSchemaVersion = 72;
+        public const int LatestSchemaVersion = 73;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
-- 
cgit v1.2.3