Fixed a couple issues in ItemViewModel (#2189)

Author: gave92

Files/App.xaml.cs

@@ -145,7 +145,7 @@ private async void Connection_RequestReceived(AppServiceConnection sender, AppSe
                 var changeType = (string)args.Request.Message["Type"];
                 var newItem = JsonConvert.DeserializeObject<ShellFileItem>(args.Request.Message.Get("Item", ""));
                 Debug.WriteLine("{0}: {1}", folderPath, changeType);
-                await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+                await CoreApplication.MainView.ExecuteOnUIThreadAsync(async () =>
                 {
                     // If we are currently displaying the reycle bin lets refresh the items
                     if (CurrentInstance.FilesystemViewModel?.CurrentFolder?.ItemPath == folderPath)
@@ -157,7 +157,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                                 break;
 
                             case "Deleted":
-                                CurrentInstance.FilesystemViewModel.RemoveFileOrFolder(itemPath);
+                                await CurrentInstance.FilesystemViewModel.RemoveFileOrFolder(itemPath);
                                 break;
 
                             default:

Files/Commands/Delete.cs

@@ -197,7 +197,7 @@ private static async Task DeleteItem(StorageDeleteOption deleteOption, IShellPag
                     await (await ItemViewModel.GetFileFromPathAsync(iFilePath)).DeleteAsync(StorageDeleteOption.PermanentDelete);
                 }
 
-                AppInstance.FilesystemViewModel.RemoveFileOrFolder(storItem);
+                await AppInstance.FilesystemViewModel.RemoveFileOrFolder(storItem);
                 itemsDeleted++;
             }
         }

Files/View Models/ItemViewModel.cs

@@ -6,6 +6,7 @@
 using Files.View_Models;
 using Files.Views;
 using Microsoft.Toolkit.Uwp.Extensions;
+using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.UI;
 using System;
 using System.Collections.Generic;
@@ -610,7 +611,7 @@ public async void RapidAddItemsToCollectionAsync(string path)
                 // simply drop this instance
                 await semaphoreSlim.WaitAsync(_semaphoreCTS.Token);
             }
-            catch (OperationCanceledException)
+            catch (Exception ex) when (ex is OperationCanceledException || ex is ObjectDisposedException)
             {
                 return;
             }
@@ -877,19 +878,19 @@ await DialogDisplayHelper.ShowDialog(
             {
                 FINDEX_INFO_LEVELS findInfoLevel = FINDEX_INFO_LEVELS.FindExInfoBasic;
                 int additionalFlags = FIND_FIRST_EX_LARGE_FETCH;
-
                 IntPtr hFile = FindFirstFileExFromApp(path + "\\*.*", findInfoLevel, out WIN32_FIND_DATA findData, FINDEX_SEARCH_OPS.FindExSearchNameMatch, IntPtr.Zero,
                                                       additionalFlags);
-                FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemTimeOutput);
-                var itemDate = new DateTime(
-                    systemTimeOutput.Year,
-                    systemTimeOutput.Month,
-                    systemTimeOutput.Day,
-                    systemTimeOutput.Hour,
-                    systemTimeOutput.Minute,
-                    systemTimeOutput.Second,
-                    systemTimeOutput.Milliseconds,
-                    DateTimeKind.Utc);
+
+                DateTime itemDate = DateTime.UtcNow;
+                try
+                {
+                    FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemTimeOutput);
+                    itemDate = new DateTime(
+                        systemTimeOutput.Year, systemTimeOutput.Month, systemTimeOutput.Day,
+                        systemTimeOutput.Hour, systemTimeOutput.Minute, systemTimeOutput.Second, systemTimeOutput.Milliseconds,
+                        DateTimeKind.Utc);
+                }
+                catch (ArgumentException) { }
 
                 CurrentFolder = new ListedItem(_rootFolder.FolderRelativeId, returnformat)
                 {
@@ -1109,27 +1110,27 @@ private void WatchForDirectoryChanges(string path)
                                     {
                                         case FILE_ACTION_ADDED:
                                             Debug.WriteLine("File " + FileName + " added to working directory.");
-                                            AddFileOrFolder(FileName, returnformat);
+                                            AddFileOrFolder(FileName, returnformat).GetAwaiter().GetResult();
                                             break;
 
                                         case FILE_ACTION_REMOVED:
                                             Debug.WriteLine("File " + FileName + " removed from working directory.");
-                                            RemoveFileOrFolder(FileName);
+                                            RemoveFileOrFolder(FileName).GetAwaiter().GetResult();
                                             break;
 
                                         case FILE_ACTION_MODIFIED:
                                             Debug.WriteLine("File " + FileName + " had attributes modified in the working directory.");
-                                            UpdateFileOrFolder(FilesAndFolders.ToList().First(x => x.ItemPath.Equals(FileName)));
+                                            UpdateFileOrFolder(FileName).GetAwaiter().GetResult();
                                             break;
 
                                         case FILE_ACTION_RENAMED_OLD_NAME:
                                             Debug.WriteLine("File " + FileName + " will be renamed in the working directory.");
-                                            RemoveFileOrFolder(FileName);
+                                            RemoveFileOrFolder(FileName).GetAwaiter().GetResult();
                                             break;
 
                                         case FILE_ACTION_RENAMED_NEW_NAME:
                                             Debug.WriteLine("File " + FileName + " was renamed in the working directory.");
-                                            AddFileOrFolder(FileName, returnformat);
+                                            AddFileOrFolder(FileName, returnformat).GetAwaiter().GetResult();
                                             break;
 
                                         default:
@@ -1233,13 +1234,13 @@ public void AddFileOrFolderFromShellFile(ShellFileItem item, string dateReturnFo
             UpdateDirectoryInfo();
         }
 
-        public void AddFileOrFolder(ListedItem item)
+        private void AddFileOrFolder(ListedItem item)
         {
             _filesAndFolders.Add(item);
             IsFolderEmptyTextDisplayed = false;
         }
 
-        private void AddFileOrFolder2(string fileOrFolderPath, string dateReturnFormat)
+        private async Task AddFileOrFolder(string fileOrFolderPath, string dateReturnFormat)
         {
             FINDEX_INFO_LEVELS findInfoLevel = FINDEX_INFO_LEVELS.FindExInfoBasic;
             int additionalFlags = FIND_FIRST_EX_CASE_SENSITIVE;
@@ -1248,32 +1249,18 @@ private void AddFileOrFolder2(string fileOrFolderPath, string dateReturnFormat)
                                                   additionalFlags);
             FindClose(hFile);
 
-            if ((findData.dwFileAttributes & 0x10) > 0) // FILE_ATTRIBUTE_DIRECTORY
-            {
-                AddFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
-            }
-            else
+            await CoreApplication.MainView.ExecuteOnUIThreadAsync(() =>
             {
-                AddFile(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
-            }
-        }
-
-        private async void AddFileOrFolder(string path, string dateReturnFormat)
-        {
-            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
-                () =>
+                if ((findData.dwFileAttributes & 0x10) > 0) // FILE_ATTRIBUTE_DIRECTORY
                 {
-                    try
-                    {
-                        AddFileOrFolder2(path, dateReturnFormat);
-                    }
-                    catch (Exception)
-                    {
-                        // Ignore this..
-                    }
-
-                    UpdateDirectoryInfo();
-                });
+                    AddFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
+                }
+                else
+                {
+                    AddFile(findData, Directory.GetParent(fileOrFolderPath).FullName, dateReturnFormat);
+                }
+                UpdateDirectoryInfo();
+            });
         }
 
         private void UpdateDirectoryInfo()
@@ -1291,7 +1278,7 @@ private void UpdateDirectoryInfo()
             }
         }
 
-        public async void UpdateFileOrFolder(ListedItem item)
+        private async Task UpdateFileOrFolder(ListedItem item)
         {
             IStorageItem storageItem = null;
             if (item.PrimaryItemAttribute == StorageItemTypes.File)
@@ -1305,36 +1292,43 @@ public async void UpdateFileOrFolder(ListedItem item)
             if (storageItem != null)
             {
                 var syncStatus = await CheckCloudDriveSyncStatus(storageItem);
-                await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
-                    () =>
-                    {
-                        item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
-                    });
+                await CoreApplication.MainView.ExecuteOnUIThreadAsync(() =>
+                {
+                    item.SyncStatusUI = CloudDriveSyncStatusUI.FromCloudDriveSyncStatus(syncStatus);
+                });
             }
         }
 
-        public async void RemoveFileOrFolder(ListedItem item)
+        private async Task UpdateFileOrFolder(string path)
         {
-            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
-                () =>
+            var matchingItem = FilesAndFolders.ToList().FirstOrDefault(x => x.ItemPath.Equals(path));
+            if (matchingItem != null)
+            {
+                await UpdateFileOrFolder(matchingItem);
+            }
+        }
+
+        public async Task RemoveFileOrFolder(ListedItem item)
+        {
+            await CoreApplication.MainView.ExecuteOnUIThreadAsync(() =>
+            {
+                _filesAndFolders.Remove(item);
+                if (_filesAndFolders.Count == 0)
                 {
-                    _filesAndFolders.Remove(item);
-                    if (_filesAndFolders.Count == 0)
-                    {
-                        IsFolderEmptyTextDisplayed = true;
-                    }
-                    App.JumpList.RemoveFolder(item.ItemPath);
+                    IsFolderEmptyTextDisplayed = true;
+                }
+                App.JumpList.RemoveFolder(item.ItemPath);
 
-                    UpdateDirectoryInfo();
-                });
+                UpdateDirectoryInfo();
+            });
         }
 
-        public void RemoveFileOrFolder(string path)
+        public async Task RemoveFileOrFolder(string path)
         {
             var matchingItem = FilesAndFolders.ToList().FirstOrDefault(x => x.ItemPath.Equals(path));
             if (matchingItem != null)
             {
-                RemoveFileOrFolder(matchingItem);
+                await RemoveFileOrFolder(matchingItem);
             }
         }
 
@@ -1346,16 +1340,20 @@ private void AddFolder(WIN32_FIND_DATA findData, string pathRoot, string dateRet
                 return;
             }
 
-            FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemTimeOutput);
-            var itemDate = new DateTime(
-                systemTimeOutput.Year,
-                systemTimeOutput.Month,
-                systemTimeOutput.Day,
-                systemTimeOutput.Hour,
-                systemTimeOutput.Minute,
-                systemTimeOutput.Second,
-                systemTimeOutput.Milliseconds,
-                DateTimeKind.Utc);
+            DateTime itemDate;
+            try
+            {
+                FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemTimeOutput);
+                itemDate = new DateTime(
+                    systemTimeOutput.Year, systemTimeOutput.Month, systemTimeOutput.Day,
+                    systemTimeOutput.Hour, systemTimeOutput.Minute, systemTimeOutput.Second, systemTimeOutput.Milliseconds,
+                    DateTimeKind.Utc);
+            }
+            catch (ArgumentException)
+            {
+                // Invalid date means invalid findData, do not add to list
+                return;
+            }
             var itemPath = Path.Combine(pathRoot, findData.cFileName);
 
             _filesAndFolders.Add(new ListedItem(null, dateReturnFormat)
@@ -1399,23 +1397,32 @@ private void AddFile(WIN32_FIND_DATA findData, string pathRoot, string dateRetur
                 }
             }
 
-            FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemModifiedDateOutput);
-            var itemModifiedDate = new DateTime(
-                systemModifiedDateOutput.Year, systemModifiedDateOutput.Month, systemModifiedDateOutput.Day,
-                systemModifiedDateOutput.Hour, systemModifiedDateOutput.Minute, systemModifiedDateOutput.Second, systemModifiedDateOutput.Milliseconds,
-                DateTimeKind.Utc);
+            DateTime itemModifiedDate, itemCreatedDate, itemLastAccessDate;
+            try
+            {
+                FileTimeToSystemTime(ref findData.ftLastWriteTime, out SYSTEMTIME systemModifiedDateOutput);
+                itemModifiedDate = new DateTime(
+                    systemModifiedDateOutput.Year, systemModifiedDateOutput.Month, systemModifiedDateOutput.Day,
+                    systemModifiedDateOutput.Hour, systemModifiedDateOutput.Minute, systemModifiedDateOutput.Second, systemModifiedDateOutput.Milliseconds,
+                    DateTimeKind.Utc);
 
-            FileTimeToSystemTime(ref findData.ftCreationTime, out SYSTEMTIME systemCreatedDateOutput);
-            var itemCreatedDate = new DateTime(
-                systemCreatedDateOutput.Year, systemCreatedDateOutput.Month, systemCreatedDateOutput.Day,
-                systemCreatedDateOutput.Hour, systemCreatedDateOutput.Minute, systemCreatedDateOutput.Second, systemCreatedDateOutput.Milliseconds,
-                DateTimeKind.Utc);
+                FileTimeToSystemTime(ref findData.ftCreationTime, out SYSTEMTIME systemCreatedDateOutput);
+                itemCreatedDate = new DateTime(
+                    systemCreatedDateOutput.Year, systemCreatedDateOutput.Month, systemCreatedDateOutput.Day,
+                    systemCreatedDateOutput.Hour, systemCreatedDateOutput.Minute, systemCreatedDateOutput.Second, systemCreatedDateOutput.Milliseconds,
+                    DateTimeKind.Utc);
 
-            FileTimeToSystemTime(ref findData.ftLastAccessTime, out SYSTEMTIME systemLastAccessOutput);
-            var itemLastAccessDate = new DateTime(
-                systemLastAccessOutput.Year, systemLastAccessOutput.Month, systemLastAccessOutput.Day,
-                systemLastAccessOutput.Hour, systemLastAccessOutput.Minute, systemLastAccessOutput.Second, systemLastAccessOutput.Milliseconds,
-                DateTimeKind.Utc);
+                FileTimeToSystemTime(ref findData.ftLastAccessTime, out SYSTEMTIME systemLastAccessOutput);
+                itemLastAccessDate = new DateTime(
+                    systemLastAccessOutput.Year, systemLastAccessOutput.Month, systemLastAccessOutput.Day,
+                    systemLastAccessOutput.Hour, systemLastAccessOutput.Minute, systemLastAccessOutput.Second, systemLastAccessOutput.Milliseconds,
+                    DateTimeKind.Utc);
+            }
+            catch (ArgumentException)
+            {
+                // Invalid date means invalid findData, do not add to list
+                return;
+            }
 
             long itemSizeBytes = findData.GetSize();
             var itemSize = ByteSize.FromBytes(itemSizeBytes).ToBinaryString().ConvertSizeAbbreviation();