alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 02:33:33 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

changed ActualChildren to IEnumerable

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-18 20:37:01 -04:00
parent 5b93895c14
commit 8136647a0a
4 changed files with 76 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -341,7 +341,7 @@ namespace MediaBrowser.Server.Implementations.Library
items.Add(RootFolder);
// Need to use DistinctBy Id because there could be multiple instances with the same id
// Need to use Distinct because there could be multiple instances with the same id
// due to sharing the default library
var userRootFolders = _userManager.Users.Select(i => i.RootFolder)
.Distinct()
@@ -357,9 +357,14 @@ namespace MediaBrowser.Server.Implementations.Library
items.AddRange(userFolders);
var disctinctItems = items.DistinctBy(i => i.Id).ToList();
var dictionary = new ConcurrentDictionary<Guid, BaseItem>();
return new ConcurrentDictionary<Guid, BaseItem>(disctinctItems.ToDictionary(i => i.Id));
foreach (var item in items)
{
dictionary[item.Id] = item;
}
return dictionary;
}
/// <summary>

16
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@@ -72,6 +72,12 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var numComplete = 0;
var userLibraries = _userManager.Users
.Select(i => new Tuple<Guid, IHasArtist[]>(i.Id, i.RootFolder.GetRecursiveChildren(i).OfType<IHasArtist>().ToArray()))
.ToArray();
var numArtists = allArtists.Count;
foreach (var artist in allArtists)
{
cancellationToken.ThrowIfCancellationRequested();
@@ -106,14 +112,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
// Populate counts of items
//SetItemCounts(artist, null, allItems.OfType<IHasArtist>());
foreach (var user in _userManager.Users.ToArray())
foreach (var lib in userLibraries)
{
SetItemCounts(artist, user.Id, user.RootFolder.GetRecursiveChildren(user).OfType<IHasArtist>().ToArray());
SetItemCounts(artist, lib.Item1, lib.Item2);
}
numComplete++;
double percent = numComplete;
percent /= allArtists.Length;
percent /= numArtists;
percent *= 20;
progress.Report(80 + percent);
@@ -180,7 +186,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task{Artist[]}.</returns>
private async Task<Artist[]> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress)
private async Task<ConcurrentBag<Artist>> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress)
{
var allArtists = allSongs
.SelectMany(i =>
@@ -251,7 +257,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
await Task.WhenAll(tasks).ConfigureAwait(false);
return returnArtists.ToArray();
return returnArtists;
}
/// <summary>