Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup

Browse source
This commit is contained in:
Luke Pulverenti 2014-02-08 15:22:40 -05:00
parent d0f1a83621
commit 3ffd95a637
13 changed files with 17 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
View file

@ -152,7 +152,7 @@ namespace MediaBrowser.Controller.Entities.Audio
// Refresh songs // Refresh songs
foreach (var item in songs) foreach (var item in songs)
{ {
if (tasks.Count > 3) if (tasks.Count >= 2)
{ {
await Task.WhenAll(tasks).ConfigureAwait(false); await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear(); tasks.Clear();

16
MediaBrowser.Controller/Entities/Folder.cs
View file

@ -518,7 +518,7 @@ namespace MediaBrowser.Controller.Entities
foreach (var child in children) foreach (var child in children)
{ {
if (tasks.Count > 5) if (tasks.Count >= 2)
{ {
await Task.WhenAll(tasks).ConfigureAwait(false); await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear(); tasks.Clear();
@ -596,15 +596,8 @@ namespace MediaBrowser.Controller.Entities
var percentages = new Dictionary<Guid, double>(list.Count); var percentages = new Dictionary<Guid, double>(list.Count);
var tasks = new List<Task>();
foreach (var item in list) foreach (var item in list)
{ {
if (tasks.Count > 10)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
}
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var child = item; var child = item;
@ -624,12 +617,9 @@ namespace MediaBrowser.Controller.Entities
} }
}); });
tasks.Add(child.ValidateChildrenWithCancellationSupport(innerProgress, cancellationToken, true, false, null)); await child.ValidateChildrenWithCancellationSupport(innerProgress, cancellationToken, true, false, null)
.ConfigureAwait(false);
} }
cancellationToken.ThrowIfCancellationRequested();
await Task.WhenAll(tasks).ConfigureAwait(false);
} }
/// <summary> /// <summary>

2
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View file

@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities.Movies
// Refresh songs // Refresh songs
foreach (var item in items) foreach (var item in items)
{ {
if (tasks.Count > 3) if (tasks.Count >= 2)
{ {
await Task.WhenAll(tasks).ConfigureAwait(false); await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear(); tasks.Clear();

5
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View file

@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
// Only do this for artists accessed by name. Folder-based artists use ArtistInfoFromSongsProvider // Only do this for artists accessed by name. Folder-based artists get it from the normal refresh
if (artist.IsAccessedByName && !artist.LockedFields.Contains(MetadataFields.Genres)) if (artist.IsAccessedByName && !artist.LockedFields.Contains(MetadataFields.Genres))
{ {
// Avoid implicitly captured closure // Avoid implicitly captured closure
@ -91,9 +91,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.ToList(); .ToList();
} }
// Populate counts of items
//SetItemCounts(artist, null, allItems.OfType<IHasArtist>());
foreach (var lib in userLibraries) foreach (var lib in userLibraries)
{ {
SetItemCounts(artist, lib.Item1, lib.Item2); SetItemCounts(artist, lib.Item1, lib.Item2);

3
MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
View file

@ -16,10 +16,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="GameGenresPostScanTask"/> class. /// Initializes a new instance of the <see cref="GameGenresPostScanTask" /> class.
/// </summary> /// </summary>
/// <param name="libraryManager">The library manager.</param> /// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user manager.</param>
public GameGenresPostScanTask(ILibraryManager libraryManager) public GameGenresPostScanTask(ILibraryManager libraryManager)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;

7
MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
View file

@ -47,9 +47,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
//SetItemCounts(null, allLibraryItems, masterDictionary);
progress.Report(2); progress.Report(2);
var numComplete = 0; var numComplete = 0;
@ -98,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100); progress.Report(100);
} }
private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts) private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
{ {
var itemByName = _libraryManager.GetGameGenre(name); var itemByName = _libraryManager.GetGameGenre(name);
@ -109,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
itemByName.SetItemByNameCounts(libraryId, itemCounts); itemByName.SetItemByNameCounts(libraryId, itemCounts);
} }
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false); return itemByName.RefreshMetadata(cancellationToken);
} }
private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary) private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)

7
MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
View file

@ -48,9 +48,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
//SetItemCounts(null, allLibraryItems, masterDictionary);
progress.Report(2); progress.Report(2);
var numComplete = 0; var numComplete = 0;
@ -99,7 +96,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100); progress.Report(100);
} }
private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts) private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
{ {
var itemByName = _libraryManager.GetGenre(name); var itemByName = _libraryManager.GetGenre(name);
@ -110,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
itemByName.SetItemByNameCounts(libraryId, itemCounts); itemByName.SetItemByNameCounts(libraryId, itemCounts);
} }
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false); return itemByName.RefreshMetadata(cancellationToken);
} }
private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary) private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)

1
MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
View file

@ -19,7 +19,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class. /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary> /// </summary>
/// <param name="libraryManager">The library manager.</param> /// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user manager.</param>
public MusicGenresPostScanTask(ILibraryManager libraryManager) public MusicGenresPostScanTask(ILibraryManager libraryManager)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;

7
MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
View file

@ -48,9 +48,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
//SetItemCounts(null, allLibraryItems, masterDictionary);
progress.Report(2); progress.Report(2);
var numComplete = 0; var numComplete = 0;
@ -99,7 +96,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100); progress.Report(100);
} }
private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts) private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
{ {
var itemByName = _libraryManager.GetMusicGenre(name); var itemByName = _libraryManager.GetMusicGenre(name);
@ -110,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
itemByName.SetItemByNameCounts(libraryId, itemCounts); itemByName.SetItemByNameCounts(libraryId, itemCounts);
} }
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false); return itemByName.RefreshMetadata(cancellationToken);
} }
private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary) private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)

3
MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs
View file

@ -53,9 +53,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
//SetItemCounts(null, allLibraryItems, masterDictionary);
progress.Report(2); progress.Report(2);
var numComplete = 0; var numComplete = 0;

1
MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
View file

@ -19,7 +19,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class. /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary> /// </summary>
/// <param name="libraryManager">The library manager.</param> /// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user manager.</param>
public StudiosPostScanTask(ILibraryManager libraryManager) public StudiosPostScanTask(ILibraryManager libraryManager)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;

7
MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
View file

@ -47,9 +47,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
//SetItemCounts(null, allLibraryItems, masterDictionary);
progress.Report(2); progress.Report(2);
var numComplete = 0; var numComplete = 0;
@ -98,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100); progress.Report(100);
} }
private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts) private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
{ {
var itemByName = _libraryManager.GetStudio(name); var itemByName = _libraryManager.GetStudio(name);
@ -109,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
itemByName.SetItemByNameCounts(libraryId, itemCounts); itemByName.SetItemByNameCounts(libraryId, itemCounts);
} }
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false); return itemByName.RefreshMetadata(cancellationToken);
} }
private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary) private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)

2
MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
View file

@ -26,6 +26,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct() .Distinct()
.ToList(); .ToList();
progress.Report(10);
var count = allYears.Count; var count = allYears.Count;
var numComplete = 0; var numComplete = 0;