Feature: Auto refresh after adding items if no directory watcher is a…

…vailable (#13068)

src/Files.App/Actions/FileSystem/CreateShortcutAction.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.IO;
-
 namespace Files.App.Actions
 {
 	internal class CreateShortcutAction : BaseUIAction, IAction
@@ -30,21 +28,9 @@ public CreateShortcutAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync()
+		public Task ExecuteAsync()
 		{
-			var currentPath = context.ShellPage?.FilesystemViewModel.WorkingDirectory;
-
-			if (App.LibraryManager.TryGetLibrary(currentPath ?? string.Empty, out var library) && !library.IsEmpty)
-				currentPath = library.DefaultSaveFolder;
-
-			foreach (ListedItem selectedItem in context.SelectedItems)
-			{
-				var fileName = string.Format("ShortcutCreateNewSuffix".GetLocalizedResource(), selectedItem.Name) + ".lnk";
-				var filePath = Path.Combine(currentPath ?? string.Empty, fileName);
-
-				if (!await FileOperationsHelpers.CreateOrUpdateLinkAsync(filePath, selectedItem.ItemPath))
-					await UIFilesystemHelpers.HandleShortcutCannotBeCreated(fileName, selectedItem.ItemPath);
-			}
+			return UIFilesystemHelpers.CreateShortcutAsync(context.ShellPage, context.SelectedItems);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Data/Models/ItemViewModel.cs

@@ -381,6 +381,8 @@ public bool AreDirectoriesSortedAlongsideFiles
 			}
 		}
 
+		public bool HasNoWatcher { get; private set; }
+
 		public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
 		{
 			folderSettings = folderSettingsViewModel;
@@ -1381,7 +1383,8 @@ private async Task RapidAddItemsToCollection(string? path, LibraryItem? library
 						IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown,
 						IsTypeGitRepository = GitDirectory is not null
 					});
-					WatchForDirectoryChanges(path, syncStatus);
+					if (!HasNoWatcher)
+						WatchForDirectoryChanges(path, syncStatus);
 					if (GitDirectory is not null)
 						WatchForGitChanges();
 					break;
@@ -1390,13 +1393,15 @@ private async Task RapidAddItemsToCollection(string? path, LibraryItem? library
 				case 1:
 					PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false, IsTypeRecycleBin = isRecycleBin });
 					currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
-					WatchForStorageFolderChanges(currentStorageFolder?.Item);
+					if (!HasNoWatcher)
+						WatchForStorageFolderChanges(currentStorageFolder?.Item);
 					break;
 
 				// Watch for changes using Win32 in Box Drive folder (#7428) and network drives (#5869)
 				case 2:
 					PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false });
-					WatchForWin32FolderChanges(path);
+					if (!HasNoWatcher)
+						WatchForWin32FolderChanges(path);
 					break;
 
 				// Enumeration failed
@@ -1429,14 +1434,16 @@ public void CloseWatcher()
 			watcherCTS = new CancellationTokenSource();
 		}
 
-		public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, CancellationToken cancellationToken, LibraryItem? library = null)
+		private async Task<int> EnumerateItemsFromStandardFolderAsync(string path, CancellationToken cancellationToken, LibraryItem? library = null)
 		{
 			// Flag to use FindFirstFileExFromApp or StorageFolder enumeration - Use storage folder for Box Drive (#4629)
 			var isBoxFolder = App.CloudDrivesManager.Drives.FirstOrDefault(x => x.Text == "Box")?.Path?.TrimEnd('\\') is string boxFolder && path.StartsWith(boxFolder);
 			bool isWslDistro = App.WSLDistroManager.TryGetDistro(path, out _);
+			bool isMtp = path.StartsWith(@"\\?\", StringComparison.Ordinal);
+			bool isShellFolder = path.StartsWith(@"\\SHELL\", StringComparison.Ordinal);
 			bool isNetwork = path.StartsWith(@"\\", StringComparison.Ordinal) &&
-				!path.StartsWith(@"\\?\", StringComparison.Ordinal) &&
-				!path.StartsWith(@"\\SHELL\", StringComparison.Ordinal) &&
+				!isMtp &&
+				!isShellFolder &&
 				!isWslDistro;
 			bool isFtp = FtpHelpers.IsFtpPath(path);
 			bool enumFromStorageFolder = isBoxFolder || isFtp;
@@ -1507,6 +1514,8 @@ await DialogDisplayHelper.ShowDialogAsync(
 					await ContextMenu.InvokeVerb("unlock-bde", pathRoot);
 			}
 
+			HasNoWatcher = isFtp || isWslDistro || isMtp || currentStorageFolder?.Item is ZipStorageFolder;
+
 			if (enumFromStorageFolder)
 			{
 				var basicProps = await rootFolder?.GetBasicPropertiesAsync();

src/Files.App/Helpers/UI/UIFilesystemHelpers.cs

@@ -231,7 +231,8 @@ public static async Task PasteItemAsync(string destinationPath, IShellPage assoc
 			if (packageView && packageView.Result is not null)
 			{
 				await associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(packageView.Result.RequestedOperation, packageView, destinationPath, false, true);
-				associatedInstance?.SlimContentPage?.ItemManipulationModel?.RefreshItemsOpacity();
+				associatedInstance.SlimContentPage?.ItemManipulationModel?.RefreshItemsOpacity();
+				await associatedInstance.RefreshIfNoWatcherExists();
 			}
 		}
 
@@ -264,6 +265,7 @@ public static async Task<bool> RenameFileItemAsync(ListedItem item, string newNa
 			if (renamed == ReturnResult.Success)
 			{
 				associatedInstance.ToolbarViewModel.CanGoForward = false;
+				await associatedInstance.RefreshIfNoWatcherExists();
 				return true;
 			}
 
@@ -273,9 +275,10 @@ public static async Task<bool> RenameFileItemAsync(ListedItem item, string newNa
 		public static async Task CreateFileFromDialogResultType(AddItemDialogItemType itemType, ShellNewEntry? itemInfo, IShellPage associatedInstance)
 		{
 			await CreateFileFromDialogResultTypeForResult(itemType, itemInfo, associatedInstance);
+			await associatedInstance.RefreshIfNoWatcherExists();
 		}
 
-		public static async Task<IStorageItem?> CreateFileFromDialogResultTypeForResult(AddItemDialogItemType itemType, ShellNewEntry? itemInfo, IShellPage associatedInstance)
+		private static async Task<IStorageItem?> CreateFileFromDialogResultTypeForResult(AddItemDialogItemType itemType, ShellNewEntry? itemInfo, IShellPage associatedInstance)
 		{
 			string? currentPath = null;
 
@@ -346,6 +349,7 @@ public static async Task CreateFolderWithSelectionAsync(IShellPage associatedIns
 					return;
 
 				await associatedInstance.FilesystemHelpers.MoveItemsAsync(items, items.Select(x => PathNormalization.Combine(folder.Path, x.Name)), false, true);
+				await associatedInstance.RefreshIfNoWatcherExists();
 			}
 			catch (Exception ex)
 			{
@@ -365,6 +369,26 @@ public static void SetHiddenAttributeItem(ListedItem item, bool isHidden, ItemMa
 			itemManipulationModel.RefreshItemsOpacity();
 		}
 
+		public static async Task CreateShortcutAsync(IShellPage? associatedInstance, IReadOnlyList<ListedItem> selectedItems)
+		{
+			var currentPath = associatedInstance?.FilesystemViewModel.WorkingDirectory;
+
+			if (App.LibraryManager.TryGetLibrary(currentPath ?? string.Empty, out var library) && !library.IsEmpty)
+				currentPath = library.DefaultSaveFolder;
+
+			foreach (ListedItem selectedItem in selectedItems)
+			{
+				var fileName = string.Format("ShortcutCreateNewSuffix".GetLocalizedResource(), selectedItem.Name) + ".lnk";
+				var filePath = Path.Combine(currentPath ?? string.Empty, fileName);
+
+				if (!await FileOperationsHelpers.CreateOrUpdateLinkAsync(filePath, selectedItem.ItemPath))
+					await HandleShortcutCannotBeCreated(fileName, selectedItem.ItemPath);
+			}
+
+			if (associatedInstance is not null)
+				await associatedInstance.RefreshIfNoWatcherExists();
+		}
+
 		public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInstance)
 		{
 			var currentPath = associatedInstance.FilesystemViewModel.WorkingDirectory;
@@ -382,6 +406,8 @@ public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInst
 				return;
 
 			await HandleShortcutCannotBeCreated(viewModel.ShortcutCompleteName, viewModel.DestinationItemPath);
+
+			await associatedInstance.RefreshIfNoWatcherExists();
 		}
 
 		public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName, string destinationPath)

src/Files.App/ViewModels/LayoutModes/BaseLayoutViewModel.cs

@@ -170,6 +170,8 @@ public async Task Drop(DragEventArgs e)
 			{
 				await _associatedInstance.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.DataView, _associatedInstance.FilesystemViewModel.WorkingDirectory, false, true);
 				e.Handled = true;
+
+				await _associatedInstance.RefreshIfNoWatcherExists();
 			}
 
 			deferral.Complete();

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.UserControls.MultitaskingControl;
-using Files.Core.Services;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -487,6 +486,12 @@ public Task TabItemDrop(object sender, DragEventArgs e)
 			return SlimContentPage?.CommandsViewModel.Drop(e);
 		}
 
+		public async Task RefreshIfNoWatcherExists()
+		{
+			if (FilesystemViewModel.HasNoWatcher)
+				await Refresh_Click();
+		}
+
 		public async Task Refresh_Click()
 		{
 			if (InstanceViewModel.IsPageTypeSearchResults)

src/Files.App/Views/Shells/IShellPage.cs

@@ -25,6 +25,8 @@ public interface IShellPage : ITabItemContent, IMultiPaneInfo, IDisposable, INot
 
 		bool CanNavigateForward { get; }
 
+		Task RefreshIfNoWatcherExists();
+
 		Task Refresh_Click();
 
 		void Back_Click();