diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-19 20:53:18 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-19 20:53:18 -0400 |
| commit | b7a8b92c0011c5411a691d522a414480c4c5e34c (patch) | |
| tree | 3a84dbd4d5cd1c78561a92c2a9283ac9cf687b52 /MediaBrowser.Server.Implementations/Library | |
| parent | 04468452ea873e83811522180a0423ac72d6f77d (diff) | |
reduce system info refreshing from dashboard
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
3 files changed, 17 insertions, 17 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs index 43d0e4db7..ca878476f 100644 --- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs @@ -299,7 +299,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="searchInput">The search input.</param> /// <param name="searchWords">The search input.</param> /// <returns>System.Int32.</returns> - private Tuple<string, int> GetIndex(string input, string searchInput, string[] searchWords) + private Tuple<string, int> GetIndex(string input, string searchInput, List<string> searchWords) { if (string.IsNullOrEmpty(input)) { @@ -324,11 +324,11 @@ namespace MediaBrowser.Server.Implementations.Library var items = GetWords(input); - for (var i = 0; i < searchWords.Length; i++) + for (var i = 0; i < searchWords.Count; i++) { var searchTerm = searchWords[i]; - for (var j = 0; j < items.Length; j++) + for (var j = 0; j < items.Count; j++) { var item = items[j]; @@ -357,9 +357,9 @@ namespace MediaBrowser.Server.Implementations.Library /// </summary> /// <param name="term">The term.</param> /// <returns>System.String[][].</returns> - private string[] GetWords(string term) + private List<string> GetWords(string term) { - return term.Split().Where(i => !string.IsNullOrWhiteSpace(i)).ToArray(); + return term.Split().Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); } } diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs index 767df9c79..73909de27 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs @@ -57,10 +57,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators /// <returns>Task.</returns> public async Task Run(IProgress<double> progress, CancellationToken cancellationToken) { - var allItems = _libraryManager.RootFolder.RecursiveChildren.ToArray(); + var allItems = _libraryManager.RootFolder.RecursiveChildren.ToList(); - var allMusicArtists = allItems.OfType<MusicArtist>().ToArray(); - var allSongs = allItems.OfType<Audio>().ToArray(); + var allMusicArtists = allItems.OfType<MusicArtist>().ToList(); + var allSongs = allItems.OfType<Audio>().ToList(); var innerProgress = new ActionableProgress<double>(); @@ -73,8 +73,8 @@ 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(); + .Select(i => new Tuple<Guid, List<IHasArtist>>(i.Id, i.RootFolder.GetRecursiveChildren(i).OfType<IHasArtist>().ToList())) + .ToList(); var numArtists = allArtists.Count; @@ -140,11 +140,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators var items = allItems .Where(i => i.HasArtist(name)) - .ToArray(); + .ToList(); var counts = new ItemByNameCounts { - TotalCount = items.Length, + TotalCount = items.Count, SongCount = items.OfType<Audio>().Count(), @@ -167,7 +167,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private void MergeImages(Dictionary<ImageType, string> source, Dictionary<ImageType, string> target) { foreach (var key in source.Keys - .ToArray() .Where(k => !target.ContainsKey(k))) { string path; @@ -202,7 +201,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators return list; }) .Distinct(StringComparer.OrdinalIgnoreCase) - .ToArray(); + .ToList(); const int maxTasks = 3; @@ -211,6 +210,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators var returnArtists = new ConcurrentBag<Artist>(); var numComplete = 0; + var numArtists = allArtists.Count; foreach (var artist in allArtists) { @@ -248,7 +248,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators { numComplete++; double percent = numComplete; - percent /= allArtists.Length; + percent /= numArtists; progress.Report(100 * percent); } diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs index 065507d3c..efefaeba3 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs @@ -47,7 +47,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators private void RunInternal(IProgress<double> progress, CancellationToken cancellationToken) { var userLibraries = _userManager.Users - .Select(i => new Tuple<Guid, BaseItem[]>(i.Id, i.RootFolder.GetRecursiveChildren(i).ToArray())) + .Select(i => new Tuple<Guid, List<BaseItem>>(i.Id, i.RootFolder.GetRecursiveChildren(i).ToList())) .ToList(); var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase); @@ -118,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators var names = media .People.Select(i => i.Name) .Distinct(StringComparer.OrdinalIgnoreCase) - .ToArray(); + .ToList(); CountHelpers.SetItemCounts(userId, media, names, masterDictionary); } |
