Merge branch 'main' into dev/lubl/trashhandler

hez2010 · web-flow · commit 2b5815c58288 · 2022-10-29T16:19:05.000+09:00
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -81,7 +81,7 @@ public sealed partial class DrivesWidget : UserControl, IWidgetItemModel, INotif
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public static ObservableCollection<DriveCardItem> ItemsAdded = new ObservableCollection<DriveCardItem>();
+        public static ObservableCollection<DriveCardItem> ItemsAdded = new();
 
         private IShellPage associatedInstance;
 
diff --git a/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
@@ -1,13 +1,21 @@
-using Files.App.Filesystem;
-using Files.App.Helpers;
-using Files.Backend.Services.Settings;
-using Files.App.ViewModels.Widgets;
-using Files.App.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
+using Files.App.Extensions;
+using Files.App.DataModels.NavigationControlItems;
+using Files.App.Filesystem;
+using Files.App.Helpers;
+using Files.App.Helpers.XamlHelpers;
+using Files.App.ViewModels.Widgets;
+using Files.Backend.Services.Settings;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
 using System;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -16,13 +24,6 @@
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media.Imaging;
-using Files.App.DataModels.NavigationControlItems;
-using Files.App.Helpers.XamlHelpers;
-using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace Files.App.UserControls.Widgets
 {
@@ -75,10 +76,10 @@ public async Task LoadCardThumbnailAsync()
             if (thumbnailData == null || thumbnailData.Length == 0)
             {
                 thumbnailData = await FileThumbnailHelper.LoadIconFromPathAsync(Path, Convert.ToUInt32(Constants.Widgets.WidgetIconSize), Windows.Storage.FileProperties.ThumbnailMode.SingleItem);
-                if (thumbnailData != null && thumbnailData.Length > 0)
-                {
-                    Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));
-                }
+            }
+            if (thumbnailData != null && thumbnailData.Length > 0)
+            {
+                Thumbnail = await App.Window.DispatcherQueue.EnqueueAsync(() => thumbnailData.ToBitmapAsync(Constants.Widgets.WidgetIconSize));
             }
         }
     }
@@ -87,7 +88,8 @@ public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotif
     {
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
-        public BulkConcurrentObservableCollection<FolderCardItem> ItemsAdded = new BulkConcurrentObservableCollection<FolderCardItem>();
+        public ObservableCollection<FolderCardItem> ItemsAdded = new();
+
         private bool showMultiPaneControls;
 
         public FolderWidget()
@@ -152,7 +154,6 @@ private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
         {
             Loaded -= FolderWidget_Loaded;
 
-            ItemsAdded.BeginBulkOperation();
             ItemsAdded.Add(new FolderCardItem("Desktop".GetLocalizedResource())
             {
                 Path = UserDataPaths.GetDefault().Desktop,
@@ -184,12 +185,8 @@ private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
                 SelectCommand = LibraryCardCommand
             });
 
-            foreach (var cardItem in ItemsAdded.ToList()) // ToList() is necessary
-            {
-                await cardItem.LoadCardThumbnailAsync();
-            }
-
-            ItemsAdded.EndBulkOperation();
+            var cardLoadTasks = ItemsAdded.Select(cardItem => cardItem.LoadCardThumbnailAsync());
+            await Task.WhenAll(cardLoadTasks);
         }
 
         private void FolderWidget_Unloaded(object sender, RoutedEventArgs e)
diff --git a/src/Files.App/ViewModels/Pages/YourHomeViewModel.cs b/src/Files.App/ViewModels/Pages/YourHomeViewModel.cs
@@ -1,16 +1,16 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using Files.App.EventArguments.Bundles;
 using Files.App.Helpers;
 using Files.App.ViewModels.Widgets;
 using Files.App.ViewModels.Widgets.Bundles;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using System;
-using System.Windows.Input;
+using Files.Shared.Extensions;
 using Microsoft.UI.Xaml;
-using System.Threading.Tasks;
+using System;
 using System.Collections.Generic;
-using Files.Shared.Extensions;
 using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace Files.App.ViewModels.Pages
 {
diff --git a/src/Files.App/Views/Pages/PropertiesGeneral.xaml b/src/Files.App/Views/Pages/PropertiesGeneral.xaml
@@ -78,6 +78,8 @@
 				<TextBox
 					x:Name="ItemFileName"
 					x:Load="{x:Bind ViewModel.ItemNameVisibility, Mode=OneWay}"
+					GettingFocus="ItemFileName_GettingFocus"
+					LosingFocus="ItemFileName_LosingFocus"
 					PlaceholderText="{helpers:ResourceString Name=PropertiesItemFileName/PlaceholderText}"
 					Text="{x:Bind ViewModel.ItemName, Mode=TwoWay}" />
 				<TextBlock
@@ -308,9 +310,9 @@
 				Height="60"
 				HorizontalAlignment="Left"
 				x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
+				Background="{ThemeResource ProgressRingBackgroundThemeBrush}"
 				IsIndeterminate="False"
-				Value="{x:Bind ViewModel.DrivePercentageValue, Mode=OneWay}"
-				Background="{ThemeResource ProgressRingBackgroundThemeBrush}">
+				Value="{x:Bind ViewModel.DrivePercentageValue, Mode=OneWay}">
 
 				<ProgressRing.Template>
 					<ControlTemplate TargetType="ProgressRing">
diff --git a/src/Files.App/Views/Pages/PropertiesGeneral.xaml.cs b/src/Files.App/Views/Pages/PropertiesGeneral.xaml.cs
@@ -1,113 +1,144 @@
-using Files.Shared;
+using CommunityToolkit.WinUI;
+using Files.App.DataModels.NavigationControlItems;
 using Files.App.Filesystem;
 using Files.App.Helpers;
-using Files.Shared.Enums;
+using Files.App.Shell;
 using Files.App.ViewModels.Properties;
-using CommunityToolkit.WinUI;
+using Files.Shared;
+using Files.Shared.Enums;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using System.Collections.Generic;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Windows.Foundation.Collections;
-using Files.App.Shell;
+using Windows.Storage;
 
 namespace Files.App.Views
 {
-    public sealed partial class PropertiesGeneral : PropertiesTab
-    {
-        public PropertiesGeneral()
-        {
-            this.InitializeComponent();
-        }
-
-        public override async Task<bool> SaveChangesAsync(ListedItem item)
-        {
-            if (BaseProperties is DriveProperties driveProps)
-            {
-                var drive = driveProps.Drive;
-                ViewModel.ItemName = ItemFileName.Text; // Make sure Name is updated
-                if (!string.IsNullOrWhiteSpace(ViewModel.ItemName) && ViewModel.OriginalItemName != ViewModel.ItemName)
-                {
-                    var remDrive = new System.Text.RegularExpressions.Regex(@"\s*\(\w:\)$");
-                    ViewModel.ItemName = remDrive.Replace(ViewModel.ItemName, ""); // Remove "(C:)" from the new label
-                    if (AppInstance.FilesystemViewModel != null)
-                    {
-                        Win32API.SetVolumeLabel(drive.Path, ViewModel.ItemName);
-                        _ = App.Window.DispatcherQueue.EnqueueAsync(async () =>
-                        {
-                            await drive.UpdateLabelAsync();
-                            await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(drive.Path);
-                        });
-                        return true;
-                    }
-                }
-            }
-            else if (BaseProperties is LibraryProperties libProps)
-            {
-                var library = libProps.Library;
-                ViewModel.ItemName = ItemFileName.Text; // Make sure Name is updated
-                var newName = ViewModel.ItemName;
-                if (!string.IsNullOrWhiteSpace(newName) && ViewModel.OriginalItemName != newName)
-                {
-                    if (AppInstance.FilesystemViewModel != null && App.LibraryManager.CanCreateLibrary(newName).result)
-                    {
-                        var libraryPath = library.ItemPath;
-                        var renamed = await AppInstance.FilesystemHelpers.RenameAsync(new StorageFileWithPath(null, libraryPath), $"{newName}{ShellLibraryItem.EXTENSION}", Windows.Storage.NameCollisionOption.FailIfExists, false);
-                        if (renamed == ReturnResult.Success)
-                        {
-                            var newPath = Path.Combine(Path.GetDirectoryName(libraryPath), $"{newName}{ShellLibraryItem.EXTENSION}");
-                            _ = App.Window.DispatcherQueue.EnqueueAsync(async () =>
-                            {
-                                await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(newPath);
-                            });
-                            return true;
-                        }
-                    }
-                }
-            }
-            else if (BaseProperties is CombinedProperties combinedProps)
-            {
-                // Handle the visibility attribute for multiple files
-                if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
-                {
-                    foreach (var fileOrFolder in combinedProps.List)
-                    {
-                        await App.Window.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
-                    }
-                }
-                return true;
-            }
-            else
-            {
-                // Handle the visibility attribute for a single file
-                if (AppInstance?.SlimContentPage?.ItemManipulationModel != null) // null on homepage
-                {
-                    await App.Window.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
-                }
-
-                ViewModel.ItemName = ItemFileName.Text; // Make sure Name is updated
-                if (!string.IsNullOrWhiteSpace(ViewModel.ItemName) && ViewModel.OriginalItemName != ViewModel.ItemName)
-                {
-                    return await App.Window.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,
-                          ViewModel.ItemName,
-                          AppInstance));
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        public override void Dispose()
-        {
-        }
-
-        private void DiskCleanupButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            if (BaseProperties is DriveProperties driveProps)
-            {
-                var drive = driveProps.Drive;
-
-                StorageSenseHelper.OpenStorageSense(drive.Path);
-            }
-        }
-    }
-}
+	public sealed partial class PropertiesGeneral : PropertiesTab
+	{
+		private readonly Regex letterRegex = new(@"\s*\(\w:\)$");
+
+		public PropertiesGeneral() => InitializeComponent();
+
+		public override async Task<bool> SaveChangesAsync(ListedItem item)
+		{
+			ViewModel.ItemName = ItemFileName.Text; // Make sure Name is updated
+
+			string newName = ViewModel.ItemName;
+			string oldName = ViewModel.OriginalItemName;
+			bool hasNewName = !string.IsNullOrWhiteSpace(newName) && newName != oldName;
+
+			return BaseProperties switch
+			{
+				DriveProperties properties => SaveDrive(properties.Drive),
+				LibraryProperties properties => await SaveLibraryAsync(properties.Library),
+				CombinedProperties properties => await SaveCombinedAsync(properties.List),
+				_ => await SaveBaseAsync(),
+			};
+
+			bool SaveDrive(DriveItem drive)
+			{
+				var fsVM = AppInstance.FilesystemViewModel;
+				if (!hasNewName || fsVM is null)
+					return false;
+
+				newName = letterRegex.Replace(newName, string.Empty); // Remove "(C:)" from the new label
+
+				Win32API.SetVolumeLabel(drive.Path, newName);
+				_ = App.Window.DispatcherQueue.EnqueueAsync(async () =>
+				{
+					await drive.UpdateLabelAsync();
+					await fsVM.SetWorkingDirectoryAsync(drive.Path);
+				});
+				return true;
+			}
+
+			async Task<bool> SaveLibraryAsync(LibraryItem library)
+			{
+				var fsVM = AppInstance.FilesystemViewModel;
+				if (!hasNewName || fsVM is null || !App.LibraryManager.CanCreateLibrary(newName).result)
+					return false;
+
+				newName = $"{newName}{ShellLibraryItem.EXTENSION}";
+
+				var file = new StorageFileWithPath(null, library.ItemPath);
+				var renamed = await AppInstance!.FilesystemHelpers.RenameAsync(file, newName, NameCollisionOption.FailIfExists, false);
+				if (renamed is ReturnResult.Success)
+				{
+					var newPath = Path.Combine(Path.GetDirectoryName(library.ItemPath)!, newName);
+					_ = App.Window.DispatcherQueue.EnqueueAsync(async () =>
+					{
+						await fsVM.SetWorkingDirectoryAsync(newPath);
+					});
+					return true;
+				}
+
+				return false;
+			}
+
+			async Task<bool> SaveCombinedAsync(IList<ListedItem> fileOrFolders)
+			{
+				// Handle the visibility attribute for multiple files
+				var itemMM = AppInstance?.SlimContentPage?.ItemManipulationModel;
+				if (itemMM is not null) // null on homepage
+				{
+					foreach (var fileOrFolder in fileOrFolders)
+					{
+						await App.Window.DispatcherQueue.EnqueueAsync(() =>
+							UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, itemMM)
+						);
+					}
+				}
+				return true;
+			}
+
+			async Task<bool> SaveBaseAsync()
+			{
+				// Handle the visibility attribute for a single file
+				var itemMM = AppInstance?.SlimContentPage?.ItemManipulationModel;
+				if (itemMM is not null) // null on homepage
+				{
+					await App.Window.DispatcherQueue.EnqueueAsync(() =>
+						UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, itemMM)
+					);
+				}
+
+				if (!hasNewName)
+					return true;
+
+				return await App.Window.DispatcherQueue.EnqueueAsync(() =>
+					UIFilesystemHelpers.RenameFileItemAsync(item, ViewModel.ItemName, AppInstance)
+				);
+			}
+		}
+
+		public override void Dispose()
+		{
+		}
+
+		private void ItemFileName_GettingFocus(UIElement _, GettingFocusEventArgs e)
+		{
+			ItemFileName.Text = letterRegex.Replace(ItemFileName.Text, string.Empty);
+		}
+		private void ItemFileName_LosingFocus(UIElement _, LosingFocusEventArgs e)
+		{
+			if (string.IsNullOrWhiteSpace(ItemFileName.Text))
+			{
+				ItemFileName.Text = ViewModel.ItemName;
+				return;
+			}
+
+			var match = letterRegex.Match(ViewModel.OriginalItemName);
+			if (match.Success)
+				ItemFileName.Text += match.Value;
+		}
+
+		private void DiskCleanupButton_Click(object _, RoutedEventArgs e)
+		{
+			if (BaseProperties is DriveProperties driveProps)
+				StorageSenseHelper.OpenStorageSense(driveProps.Drive.Path);
+		}
+	}
+}
