From a9b041a7e62f408e07d15cb7cf253d76919b6fa1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 29 Apr 2017 22:37:51 -0400
Subject: rework refresh queue

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Providers/Manager/ProviderManager.cs')

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 0b8dca2eb..f08a7d3c3 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -24,6 +24,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
+using Priority_Queue;
 
 namespace MediaBrowser.Providers.Manager
 {
@@ -577,7 +578,6 @@ namespace MediaBrowser.Providers.Manager
             return SaveMetadata(item, updateType, _savers.Where(i => savers.Contains(i.Name, StringComparer.OrdinalIgnoreCase)));
         }
 
-        private readonly SemaphoreSlim _saveLock = new SemaphoreSlim(1, 1);
         /// <summary>
         /// Saves the metadata.
         /// </summary>
@@ -607,8 +607,6 @@ namespace MediaBrowser.Providers.Manager
                         continue;
                     }
 
-                    await _saveLock.WaitAsync().ConfigureAwait(false);
-
                     try
                     {
                         _libraryMonitor.ReportFileSystemChangeBeginning(path);
@@ -620,7 +618,6 @@ namespace MediaBrowser.Providers.Manager
                     }
                     finally
                     {
-                        _saveLock.Release();
                         _libraryMonitor.ReportFileSystemChangeComplete(path, false);
                     }
                 }
@@ -851,20 +848,20 @@ namespace MediaBrowser.Providers.Manager
                 });
         }
 
-        private readonly ConcurrentQueue<Tuple<Guid, MetadataRefreshOptions>> _refreshQueue =
-            new ConcurrentQueue<Tuple<Guid, MetadataRefreshOptions>>();
+        private readonly SimplePriorityQueue<Tuple<Guid, MetadataRefreshOptions>> _refreshQueue =
+            new SimplePriorityQueue<Tuple<Guid, MetadataRefreshOptions>>();
 
         private readonly object _refreshQueueLock = new object();
         private bool _isProcessingRefreshQueue;
 
-        public void QueueRefresh(Guid id, MetadataRefreshOptions options)
+        public void QueueRefresh(Guid id, MetadataRefreshOptions options, RefreshPriority priority)
         {
             if (_disposed)
             {
                 return;
             }
 
-            _refreshQueue.Enqueue(new Tuple<Guid, MetadataRefreshOptions>(id, options));
+            _refreshQueue.Enqueue(new Tuple<Guid, MetadataRefreshOptions>(id, options), (int)priority);
 
             lock (_refreshQueueLock)
             {
@@ -876,12 +873,19 @@ namespace MediaBrowser.Providers.Manager
             }
         }
 
+        private bool TryDequeue(out Tuple<Guid, MetadataRefreshOptions> item)
+        {
+            item = _refreshQueue.Dequeue();
+
+            return item != null;
+        }
+
         private async Task StartProcessingRefreshQueue()
         {
             Tuple<Guid, MetadataRefreshOptions> refreshItem;
             var libraryManager = _libraryManagerFactory();
 
-            while (_refreshQueue.TryDequeue(out refreshItem))
+            while (TryDequeue(out refreshItem))
             {
                 if (_disposed)
                 {
-- 
cgit v1.2.3