aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-07 14:58:16 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-05-07 14:58:16 -0400
commit8d6702b11533d49a5594a84f25f81f581962a54c (patch)
tree176df585e03a7b9124ee969eae31d09e2418c82f
parent26d3f9740ca3ed11311c40f108e5e0ee54a6f4a1 (diff)
update artists
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicArtist.cs7
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs11
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs2
3 files changed, 10 insertions, 10 deletions
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.