Bugfixes (#5961)

gave92 · web-flow · commit 4be1ee2f21ed · 2021-08-29T11:40:42.000-04:00
diff --git a/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs b/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs
@@ -888,6 +888,7 @@ private async Task<FilesystemResult> PerformAdminOperation(ValueSet operation)
                             && response.Get("Success", false));
                         var shellOpResult = JsonConvert.DeserializeObject<ShellOperationResult>(response.Get("Result", "{\"Items\": []}"));
                         fsResult &= (FilesystemResult)shellOpResult.Items.All(x => x.Succeeded);
+                        return fsResult;
                     }
                 }
             }
diff --git a/Files/Filesystem/ListedItem.cs b/Files/Filesystem/ListedItem.cs
@@ -14,6 +14,7 @@
 using Windows.Storage;
 using Windows.UI.Xaml.Media.Imaging;
 using Files.Filesystem.StorageItems;
+using System.Linq;
 
 namespace Files.Filesystem
 {
@@ -335,7 +336,7 @@ public override string ToString()
         public bool IsFtpItem => this is FtpItem;
         public bool IsZipItem => this is ZipItem;
 
-        public virtual bool IsExecutable => Path.GetExtension(ItemPath)?.ToLower() == ".exe";
+        public virtual bool IsExecutable => new[] { ".exe", ".bat", ".cmd" }.Contains(Path.GetExtension(ItemPath), StringComparer.OrdinalIgnoreCase);
         public bool IsPinned => App.SidebarPinnedController.Model.FavoriteItems.Contains(itemPath);
 
         private BaseStorageFile itemFile;
diff --git a/Files/Helpers/ContextFlyoutItemHelper.cs b/Files/Helpers/ContextFlyoutItemHelper.cs
@@ -629,7 +629,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
                     Tag = "OpenWith",
                     CollapseLabel = true,
                     ShowInSearchPage = true,
-                    ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem),
+                    ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem && !i.IsExecutable),
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {
@@ -645,7 +645,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
                         }
                     },
                     ShowInSearchPage = true,
-                    ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem),
+                    ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem && !i.IsExecutable),
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {
diff --git a/Files/Helpers/ItemListDisplayHelpers/SortingHelper.cs b/Files/Helpers/ItemListDisplayHelpers/SortingHelper.cs
@@ -52,6 +52,17 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                         ordered = filesAndFolders.OrderBy(folderThenFileAsync).ThenBy(orderFunc, naturalStringComparer);
                     }
                 }
+                else if (directorySortOption == SortOption.FileTag)
+                {
+                    if (App.AppSettings.ListAndSortDirectoriesAlongsideFiles)
+                    {
+                        ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenBy(orderFunc);
+                    }
+                    else
+                    {
+                        ordered = filesAndFolders.OrderBy(folderThenFileAsync).ThenBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenBy(orderFunc);
+                    }
+                }
                 else
                 {
                     if (App.AppSettings.ListAndSortDirectoriesAlongsideFiles)
@@ -77,6 +88,17 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                         ordered = filesAndFolders.OrderBy(folderThenFileAsync).ThenByDescending(orderFunc, naturalStringComparer);
                     }
                 }
+                else if (directorySortOption == SortOption.FileTag)
+                {
+                    if (App.AppSettings.ListAndSortDirectoriesAlongsideFiles)
+                    {
+                        ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenByDescending(orderFunc);
+                    }
+                    else
+                    {
+                        ordered = filesAndFolders.OrderBy(folderThenFileAsync).ThenBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenByDescending(orderFunc);
+                    }
+                }
                 else
                 {
                     if (App.AppSettings.ListAndSortDirectoriesAlongsideFiles)
diff --git a/Files/Helpers/NavigationHelpers.cs b/Files/Helpers/NavigationHelpers.cs
@@ -7,6 +7,7 @@
 using Microsoft.Toolkit.Uwp;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.AppService;
 using Windows.ApplicationModel.Core;
@@ -74,7 +75,7 @@ public static async void OpenSelectedItems(IShellPage associatedInstance, bool o
             {
                 return;
             }
-            foreach (ListedItem item in associatedInstance.SlimContentPage.SelectedItems)
+            foreach (ListedItem item in associatedInstance.SlimContentPage.SelectedItems.ToList())
             {
                 var type = item.PrimaryItemAttribute == StorageItemTypes.Folder ?
                     FilesystemItemType.Directory : FilesystemItemType.File;
diff --git a/Files/Interacts/BaseLayoutCommandImplementationModel.cs b/Files/Interacts/BaseLayoutCommandImplementationModel.cs
@@ -669,7 +669,11 @@ public async void DecompressArchive()
                     if (destinationFolder == null)
                     {
                         BaseStorageFolder parentFolder = await StorageItemHelpers.ToStorageItem<BaseStorageFolder>(Path.GetDirectoryName(archive.Path));
-                        destinationFolder = await parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName);
+                        destinationFolder = await FilesystemTasks.Wrap(() => parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName).AsTask());
+                    }
+                    if (destinationFolder == null)
+                    {
+                        return; // Could not create dest folder
                     }
 
                     Stopwatch sw = new Stopwatch();
@@ -742,7 +746,7 @@ public async void DecompressArchiveToChildFolder()
 
             if (currentFolder != null)
             {
-                destinationFolder = await currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.OpenIfExists);
+                destinationFolder = await FilesystemTasks.Wrap(() => currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.OpenIfExists).AsTask());
             }
 
             if (archive != null && destinationFolder != null)
diff --git a/Files/UserControls/ColoredIcon.xaml b/Files/UserControls/ColoredIcon.xaml
@@ -25,7 +25,7 @@
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
                     <SolidColorBrush x:Key="ColoredIconOverlayForeground" Color="{ThemeResource SystemAccentColor}" />
-                    <SolidColorBrush x:Key="ColoredIconOverlayDisabled" Color="{ThemeResource SystemAccentColorDark1}" />
+                    <SolidColorBrush x:Key="ColoredIconOverlayForegroundDisabled" Color="{ThemeResource SystemAccentColorDark1}" />
                     <SolidColorBrush x:Key="ColoredIconOverlayForegroundChecked" Color="{ThemeResource SystemAccentColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
diff --git a/Files/UserControls/Widgets/FolderWidget.xaml.cs b/Files/UserControls/Widgets/FolderWidget.xaml.cs
@@ -140,7 +140,7 @@ public void Dispose()
 
         private async Task GetItemsAddedIcon()
         {
-            foreach (var item in ItemsAdded)
+            foreach (var item in ItemsAdded.ToList())
             {
                 item.SelectCommand = LibraryCardClicked;
                 item.AutomationProperties = item.Text;
diff --git a/Files/ViewModels/Properties/FileProperties.cs b/Files/ViewModels/Properties/FileProperties.cs
@@ -217,7 +217,7 @@ public static async Task<string> GetAddressFromCoordinatesAsync(double? Lat, dou
             // Reverse geocode the specified geographic location.
 
             var result = await MapLocationFinder.FindLocationsAtAsync(pointToReverseGeocode);
-            return result != null ? result.Locations[0].DisplayName : null;
+            return result?.Locations?.FirstOrDefault()?.DisplayName;
         }
 
         public async Task SyncPropertyChangesAsync()
diff --git a/Files/Views/LayoutModes/ColumnViewBrowser.xaml.cs b/Files/Views/LayoutModes/ColumnViewBrowser.xaml.cs
@@ -163,25 +163,18 @@ protected override void UnhookEvents()
 
         private void ColumnViewBase_DismissColumn(object sender, EventArgs e)
         {
+            if ((sender as ListView).FindAscendant<ColumnViewBrowser>() != this)
+            {
+                return;
+            }
             DismissOtherBlades(sender as ListView);
         }
 
         private void ColumnViewBase_UnFocusPreviousListView(object sender, EventArgs e)
         {
-            var list = sender as ListView;
-            var blade = list.FindAscendant<BladeItem>();
-            var index = ColumnHost.ActiveBlades.IndexOf(blade) - 1;
-            if (index == 0)
+            if ((sender as ListView).FindAscendant<ColumnViewBrowser>() != this)
             {
-                //_ = VisualStateManager.GoToState(listViewItem, "NotCurrentItem", true);
-            }
-            else if (index > 0)
-            {
-                Common.Extensions.IgnoreExceptions(() =>
-                {
-                    //var listview = ColumnHost.ActiveBlades[index].FindDescendant("FileList") as ListView;
-                    //var listViewItem = listview.ContainerFromItem((listview.SelectedItem) as ListedItem) as ListViewItem;
-                });
+                return;
             }
         }
 
@@ -193,6 +186,10 @@ private void FileList_GotFocus(object sender, RoutedEventArgs e)
         private void ColumnViewBase_ItemInvoked(object sender, EventArgs e)
         {
             var column = sender as ColumnParam;
+            if (column.ListView.FindAscendant<ColumnViewBrowser>() != this)
+            {
+                return;
+            }
 
             var frame = new Frame();
             frame.Navigated += Frame_Navigated;
diff --git a/Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -212,7 +212,10 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
             UpdateSortOptionsCommand = new RelayCommand<string>(x =>
             {
-                var val = Enum.Parse<SortOption>(x);
+                if (!Enum.TryParse<SortOption>(x, out var val))
+                {
+                    return;
+                }
                 if (FolderSettings.DirectorySortOption == val)
                 {
                     FolderSettings.DirectorySortDirection = (SortDirection)(((int)FolderSettings.DirectorySortDirection + 1) % 2);
@@ -755,7 +758,7 @@ private void ResizeColumnToFit(int columnToResize)
 
         private double MeasureTextColumn(int columnIndex, int measureItems, int maxItemLength)
         {
-            var tbs = DependencyObjectHelpers.FindChildren<TextBlock>(FileList.ItemsPanelRoot).Where(x => Grid.GetColumn(x.Parent as Grid) == columnIndex);
+            var tbs = DependencyObjectHelpers.FindChildren<TextBlock>(FileList.ItemsPanelRoot).Where(x => x.Parent is Grid && Grid.GetColumn((Grid)x.Parent) == columnIndex);
             var widthPerLetter = tbs.Where(tb => !string.IsNullOrEmpty(tb.Text)).Take(measureItems).Select(tb =>
             {
                 tb.Measure(new Size(Double.PositiveInfinity, Double.PositiveInfinity));
diff --git a/Files/Views/PaneHolderPage.xaml b/Files/Views/PaneHolderPage.xaml
@@ -114,11 +114,11 @@
                 <local:ModernShellPage
                     x:Name="PaneLeft"
                     ContentChanged="Pane_ContentChanged"
-                    CurrentInstanceBorderThickness="0,0,2,0"
+                    CurrentInstanceBorderThickness="0,0,0,2"
                     IsPageMainPane="True"
+                    Loaded="PaneLeft_Loaded"
                     NavParams="{x:Bind NavParamsLeft, Mode=OneWay}"
-                    PaneHolder="{x:Bind}"
-                    PointerPressed="PaneLeft_PointerPressed" />
+                    PaneHolder="{x:Bind}" />
             </Border>
 
             <Border
@@ -132,11 +132,11 @@
                 <local:ModernShellPage
                     x:Name="PaneRight"
                     ContentChanged="Pane_ContentChanged"
-                    CurrentInstanceBorderThickness="2,0,0,0"
+                    CurrentInstanceBorderThickness="0,0,0,2"
                     IsPageMainPane="False"
+                    Loaded="PaneRight_Loaded"
                     NavParams="{x:Bind NavParamsRight, Mode=OneWay}"
-                    PaneHolder="{x:Bind}"
-                    PointerPressed="PaneRight_PointerPressed" />
+                    PaneHolder="{x:Bind}" />
 
                 <animations:Implicit.ShowAnimations>
                     <animations:ScalarAnimation
diff --git a/Files/Views/PaneHolderPage.xaml.cs b/Files/Views/PaneHolderPage.xaml.cs
@@ -352,6 +352,16 @@ public void CloseActivePane()
             // Can only close right pane atm
             IsRightPaneVisible = false;
         }
+
+        private void PaneLeft_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as UIElement).AddHandler(UIElement.PointerPressedEvent, new PointerEventHandler(PaneLeft_PointerPressed), true);
+        }
+
+        private void PaneRight_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as UIElement).AddHandler(UIElement.PointerPressedEvent, new PointerEventHandler(PaneRight_PointerPressed), true);
+        }
     }
 
     public class PaneNavigationArguments

Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,7 @@ private async Task<FilesystemResult> PerformAdminOperation(ValueSet operation)`
`888`	`888`	`&& response.Get("Success", false));`
`889`	`889`	`var shellOpResult = JsonConvert.DeserializeObject<ShellOperationResult>(response.Get("Result", "{\"Items\": []}"));`
`890`	`890`	`fsResult &= (FilesystemResult)shellOpResult.Items.All(x => x.Succeeded);`
	`891`	`+ return fsResult;`
`891`	`892`	`}`
`892`	`893`	`}`
`893`	`894`	`}`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo`
`629`	`629`	`Tag = "OpenWith",`
`630`	`630`	`CollapseLabel = true,`
`631`	`631`	`ShowInSearchPage = true,`
`632`		`- ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem),`
	`632`	`+ ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem && !i.IsExecutable),`
`633`	`633`	`},`
`634`	`634`	`new ContextMenuFlyoutItemViewModel()`
`635`	`635`	`{`
`@@ -645,7 +645,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo`
`645`	`645`	`}`
`646`	`646`	`},`
`647`	`647`	`ShowInSearchPage = true,`
`648`		`- ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem),`
	`648`	`+ ShowItem = selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.File && !i.IsShortcutItem && !i.IsExecutable),`
`649`	`649`	`},`
`650`	`650`	`new ContextMenuFlyoutItemViewModel()`
`651`	`651`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.Toolkit.Uwp;`
`8`	`8`	`using System;`
`9`	`9`	`using System.Collections.Generic;`
	`10`	`+using System.Linq;`
`10`	`11`	`using System.Threading.Tasks;`
`11`	`12`	`using Windows.ApplicationModel.AppService;`
`12`	`13`	`using Windows.ApplicationModel.Core;`
`@@ -74,7 +75,7 @@ public static async void OpenSelectedItems(IShellPage associatedInstance, bool o`
`74`	`75`	`{`
`75`	`76`	`return;`
`76`	`77`	`}`
`77`		`- foreach (ListedItem item in associatedInstance.SlimContentPage.SelectedItems)`
	`78`	`+ foreach (ListedItem item in associatedInstance.SlimContentPage.SelectedItems.ToList())`
`78`	`79`	`{`
`79`	`80`	`var type = item.PrimaryItemAttribute == StorageItemTypes.Folder ?`
`80`	`81`	`FilesystemItemType.Directory : FilesystemItemType.File;`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,11 @@ public async void DecompressArchive()`
`669`	`669`	`if (destinationFolder == null)`
`670`	`670`	`{`
`671`	`671`	`BaseStorageFolder parentFolder = await StorageItemHelpers.ToStorageItem<BaseStorageFolder>(Path.GetDirectoryName(archive.Path));`
`672`		`- destinationFolder = await parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName);`
	`672`	`+ destinationFolder = await FilesystemTasks.Wrap(() => parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName).AsTask());`
	`673`	`+ }`
	`674`	`+ if (destinationFolder == null)`
	`675`	`+ {`
	`676`	`+ return; // Could not create dest folder`
`673`	`677`	`}`
`674`	`678`
`675`	`679`	`Stopwatch sw = new Stopwatch();`
`@@ -742,7 +746,7 @@ public async void DecompressArchiveToChildFolder()`
`742`	`746`
`743`	`747`	`if (currentFolder != null)`
`744`	`748`	`{`
`745`		`- destinationFolder = await currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.OpenIfExists);`
	`749`	`+ destinationFolder = await FilesystemTasks.Wrap(() => currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.OpenIfExists).AsTask());`
`746`	`750`	`}`
`747`	`751`
`748`	`752`	`if (archive != null && destinationFolder != null)`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void Dispose()`
`140`	`140`
`141`	`141`	`private async Task GetItemsAddedIcon()`
`142`	`142`	`{`
`143`		`- foreach (var item in ItemsAdded)`
	`143`	`+ foreach (var item in ItemsAdded.ToList())`
`144`	`144`	`{`
`145`	`145`	`item.SelectCommand = LibraryCardClicked;`
`146`	`146`	`item.AutomationProperties = item.Text;`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public static async Task<string> GetAddressFromCoordinatesAsync(double? Lat, dou`
`217`	`217`	`// Reverse geocode the specified geographic location.`
`218`	`218`
`219`	`219`	`var result = await MapLocationFinder.FindLocationsAtAsync(pointToReverseGeocode);`
`220`		`- return result != null ? result.Locations[0].DisplayName : null;`
	`220`	`+ return result?.Locations?.FirstOrDefault()?.DisplayName;`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public async Task SyncPropertyChangesAsync()`
Original file line number	Diff line number	Diff line change
`@@ -163,25 +163,18 @@ protected override void UnhookEvents()`
`163`	`163`
`164`	`164`	`private void ColumnViewBase_DismissColumn(object sender, EventArgs e)`
`165`	`165`	`{`
	`166`	`+ if ((sender as ListView).FindAscendant<ColumnViewBrowser>() != this)`
	`167`	`+ {`
	`168`	`+ return;`
	`169`	`+ }`
`166`	`170`	`DismissOtherBlades(sender as ListView);`
`167`	`171`	`}`
`168`	`172`
`169`	`173`	`private void ColumnViewBase_UnFocusPreviousListView(object sender, EventArgs e)`
`170`	`174`	`{`
`171`		`- var list = sender as ListView;`
`172`		`- var blade = list.FindAscendant<BladeItem>();`
`173`		`- var index = ColumnHost.ActiveBlades.IndexOf(blade) - 1;`
`174`		`- if (index == 0)`
	`175`	`+ if ((sender as ListView).FindAscendant<ColumnViewBrowser>() != this)`
`175`	`176`	`{`
`176`		`- //_ = VisualStateManager.GoToState(listViewItem, "NotCurrentItem", true);`
`177`		`- }`
`178`		`- else if (index > 0)`
`179`		`- {`
`180`		`- Common.Extensions.IgnoreExceptions(() =>`
`181`		`- {`
`182`		`- //var listview = ColumnHost.ActiveBlades[index].FindDescendant("FileList") as ListView;`
`183`		`- //var listViewItem = listview.ContainerFromItem((listview.SelectedItem) as ListedItem) as ListViewItem;`
`184`		`- });`
	`177`	`+ return;`
`185`	`178`	`}`
`186`	`179`	`}`
`187`	`180`
`@@ -193,6 +186,10 @@ private void FileList_GotFocus(object sender, RoutedEventArgs e)`
`193`	`186`	`private void ColumnViewBase_ItemInvoked(object sender, EventArgs e)`
`194`	`187`	`{`
`195`	`188`	`var column = sender as ColumnParam;`
	`189`	`+ if (column.ListView.FindAscendant<ColumnViewBrowser>() != this)`
	`190`	`+ {`
	`191`	`+ return;`
	`192`	`+ }`
`196`	`193`
`197`	`194`	`var frame = new Frame();`
`198`	`195`	`frame.Navigated += Frame_Navigated;`