Improve performance of watcher

Author: hez2010

Files/ViewModels/ItemViewModel.cs

@@ -1714,8 +1714,10 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
                 return;
             }
 
+            var hasSyncStatus = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown;
+
             var cts = new CancellationTokenSource();
-            _ = Windows.System.Threading.ThreadPool.RunAsync((x) => ProcessOperationQueue(cts.Token));
+            _ = Windows.System.Threading.ThreadPool.RunAsync((x) => ProcessOperationQueue(cts.Token, hasSyncStatus));
 
             aWatcherAction = Windows.System.Threading.ThreadPool.RunAsync((x) =>
             {
@@ -1724,7 +1726,7 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
                 buff = new byte[4096];
                 int notifyFilters = FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE;
 
-                if (syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown)
+                if (hasSyncStatus)
                 {
                     notifyFilters |= FILE_NOTIFY_CHANGE_ATTRIBUTES;
                 }
@@ -1804,7 +1806,7 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
             Debug.WriteLine("Task exiting...");
         }
 
-        private async void ProcessOperationQueue(CancellationToken cancellationToken)
+        private async void ProcessOperationQueue(CancellationToken cancellationToken, bool hasSyncStatus)
         {
             ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
             string returnformat = Enum.Parse<TimeStyle>(localSettings.Values[Constants.LocalSettings.DateTimeFormat].ToString()) == TimeStyle.Application ? "D" : "g";
@@ -1816,6 +1818,7 @@ private async void ProcessOperationQueue(CancellationToken cancellationToken)
             const uint FILE_ACTION_RENAMED_NEW_NAME = 0x00000005;
 
             var sampler = new IntervalSampler(200);
+            var updateList = new HashSet<string>();
             bool anyEdits = false;
 
             try
@@ -1825,6 +1828,8 @@ private async void ProcessOperationQueue(CancellationToken cancellationToken)
                     if (operationEvent.Wait(200, cancellationToken))
                     {
                         operationEvent.Reset();
+
+
                         while (operationQueue.TryDequeue(out var operation))
                         {
                             if (cancellationToken.IsCancellationRequested) break;
@@ -1839,7 +1844,7 @@ private async void ProcessOperationQueue(CancellationToken cancellationToken)
                                         break;
 
                                     case FILE_ACTION_MODIFIED:
-                                        await UpdateFileOrFolderAsync(operation.FileName);
+                                        updateList.Add(operation.FileName);
                                         break;
 
                                     case FILE_ACTION_REMOVED:
@@ -1861,9 +1866,20 @@ private async void ProcessOperationQueue(CancellationToken cancellationToken)
                                 anyEdits = false;
                             }
                         }
+
+                        foreach (var entry in updateList.ToList())
+                        {
+                            await UpdateFileOrFolderAsync(entry, hasSyncStatus);
+                            updateList.Remove(entry);
+
+                            if (sampler.CheckNow() && operationQueue.Any(i => i.Action != FILE_ACTION_MODIFIED))
+                            {
+                                break;
+                            }
+                        }
                     }
 
-                    if (anyEdits && sampler.CheckNow())
+                    if (anyEdits)
                     {
                         await OrderFilesAndFoldersAsync();
                         await ApplyFilesAndFoldersChangesAsync();
@@ -1959,26 +1975,22 @@ public ListedItem AddFileOrFolderFromShellFile(ShellFileItem item, string dateRe
 
         private async Task AddFileOrFolderAsync(ListedItem item)
         {
-            try
-            {
-                await enumFolderSemaphore.WaitAsync(semaphoreCTS.Token);
-            }
-            catch (OperationCanceledException)
+            if (item == null)
             {
                 return;
             }
 
             try
             {
-                if (item != null)
-                {
-                    filesAndFolders.Add(item);
-                }
+                await enumFolderSemaphore.WaitAsync(semaphoreCTS.Token);
             }
-            finally
+            catch (OperationCanceledException)
             {
-                enumFolderSemaphore.Release();
+                return;
             }
+
+            filesAndFolders.Add(item);
+            enumFolderSemaphore.Release();
         }
 
         private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateReturnFormat)
@@ -2015,13 +2027,10 @@ private async Task AddFileOrFolderAsync(string fileOrFolderPath, string dateRetu
                 listedItem = await Win32StorageEnumerator.GetFile(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat, Connection, addFilesCTS.Token);
             }
 
-            if (listedItem != null)
-            {
-                filesAndFolders.Add(listedItem);
-            }
+            await AddFileOrFolderAsync(listedItem);
         }
 
-        private async Task UpdateFileOrFolderAsync(ListedItem item)
+        private async Task UpdateFileOrFolderAsync(ListedItem item, bool hasSyncStatus = false)
         {
             IStorageItem storageItem = null;
             if (item.PrimaryItemAttribute == StorageItemTypes.File)
@@ -2034,10 +2043,13 @@ private async Task UpdateFileOrFolderAsync(ListedItem item)
             }
             if (storageItem != null)
             {
-                var syncStatus = await CheckCloudDriveSyncStatusAsync(storageItem);
+                var syncStatus = hasSyncStatus ? await CheckCloudDriveSyncStatusAsync(storageItem) : CloudDriveSyncStatus.NotSynced;
                 await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>
                 {
-                    item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
+                    if (hasSyncStatus)
+                    {
+                        item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
+                    }
 
                     if (storageItem.IsOfType(StorageItemTypes.File))
                     {
@@ -2057,7 +2069,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>
             }
         }
 
-        private async Task UpdateFileOrFolderAsync(string path)
+        private async Task UpdateFileOrFolderAsync(string path, bool hasSyncStatus = false)
         {
             try
             {
@@ -2074,7 +2086,7 @@ private async Task UpdateFileOrFolderAsync(string path)
 
                 if (matchingItem != null)
                 {
-                    await UpdateFileOrFolderAsync(matchingItem);
+                    await UpdateFileOrFolderAsync(matchingItem, hasSyncStatus);
                 }
             }
             finally