Codebase Quality: Network drives service and view model (#12176)

Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com>

Author: lukeblevins

src/Files.App/App.xaml.cs

@@ -63,7 +63,6 @@ public partial class App : Application
 		public static RecentItems RecentItemsManager { get; private set; }
 		public static QuickAccessManager QuickAccessManager { get; private set; }
 		public static CloudDrivesManager CloudDrivesManager { get; private set; }
-		public static NetworkDrivesManager NetworkDrivesManager { get; private set; }
 		public static WSLDistroManager WSLDistroManager { get; private set; }
 		public static LibraryManager LibraryManager { get; private set; }
 		public static FileTagsManager FileTagsManager { get; private set; }
@@ -74,8 +73,6 @@ public partial class App : Application
 		public static string AppVersion = $"{Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}.{Package.Current.Id.Version.Revision}";
 		public static string LogoPath;
 
-		public IServiceProvider Services { get; private set; }
-
 		/// <summary>
 		/// Initializes the singleton application object.  This is the first line of authored code
 		/// executed, and as such is the logical equivalent of main() or WinMain().
@@ -94,7 +91,6 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
 			RecentItemsManager ??= new RecentItems();
 			AppModel ??= new AppModel();
 			LibraryManager ??= new LibraryManager();
-			NetworkDrivesManager ??= new NetworkDrivesManager();
 			CloudDrivesManager ??= new CloudDrivesManager();
 			WSLDistroManager ??= new WSLDistroManager();
 			FileTagsManager ??= new FileTagsManager();
@@ -131,7 +127,6 @@ await Task.WhenAll(
 					StartAppCenter(),
 					OptionalTask(CloudDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowCloudDrivesSection),
 					LibraryManager.UpdateLibrariesAsync(),
-					OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowNetworkDrivesSection),
 					OptionalTask(WSLDistroManager.UpdateDrivesAsync(), generalSettingsService.ShowWslSection),
 					OptionalTask(FileTagsManager.UpdateFileTagsAsync(), generalSettingsService.ShowFileTagsSection),
 					QuickAccessManager.InitializeAsync()
@@ -225,11 +220,13 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 						.AddSingleton<IResourcesService, ResourcesService>()
 						.AddSingleton<IJumpListService, JumpListService>()
 						.AddSingleton<IRemovableDrivesService, RemovableDrivesService>()
+						.AddSingleton<INetworkDrivesService, NetworkDrivesService>()
 						.AddSingleton<MainPageViewModel>()
 						.AddSingleton<PreviewPaneViewModel>()
 						.AddSingleton<SidebarViewModel>()
 						.AddSingleton<SettingsViewModel>()
 						.AddSingleton<DrivesViewModel>()
+						.AddSingleton<NetworkDrivesViewModel>()
 						.AddSingleton<OngoingTasksViewModel>()
 						.AddSingleton<AppearanceViewModel>()
 				)

src/Files.App/Filesystem/NetworkDrivesManager.cs

@@ -292,8 +292,9 @@ private static PathBoxItem GetPathItem(string component, string path)
 			else if (component.Contains(':', StringComparison.Ordinal))
 			{
 				var drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
+				var networkDrivesViewModel = Ioc.Default.GetRequiredService<NetworkDrivesViewModel>();
 
-				var drives = drivesViewModel.Drives.Cast<DriveItem>().Concat(App.NetworkDrivesManager.Drives).Concat(App.CloudDrivesManager.Drives);
+				var drives = drivesViewModel.Drives.Concat(networkDrivesViewModel.Drives).Cast<DriveItem>().Concat(App.CloudDrivesManager.Drives);
 				var drive = drives.FirstOrDefault(y => y.ItemType is NavigationControlItemType.Drive && y.Path.Contains(component, StringComparison.OrdinalIgnoreCase));
 				title = drive is not null ? drive.Text : $@"Drive ({component})";
 			}

src/Files.App/Filesystem/StorageFileHelpers/StorageFileExtensions.cs

@@ -0,0 +1,75 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Files.App.DataModels.NavigationControlItems;
+using Files.App.Shell;
+using Files.Backend.Services;
+using Files.Sdk.Storage.LocatableStorage;
+using Vanara.PInvoke;
+using Vanara.Windows.Shell;
+
+namespace Files.App.ServicesImplementation
+{
+	public class NetworkDrivesService : INetworkDrivesService
+	{
+		public bool DisconnectNetworkDrive(ILocatableFolder drive)
+		{
+			return NetworkDrivesAPI.DisconnectNetworkDrive(drive.Path);    
+		}
+
+		public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
+		{
+			var networkLocations = await Win32API.StartSTATask(() =>
+			{
+				var locations = new List<ShellLinkItem>();
+				using (var nethood = new ShellFolder(Shell32.KNOWNFOLDERID.FOLDERID_NetHood))
+				{
+					foreach (var item in nethood)
+					{
+						if (item is ShellLink link)
+						{
+							locations.Add(ShellFolderExtensions.GetShellLinkItem(link));
+						}
+						else
+						{
+							var linkPath = (string)item.Properties["System.Link.TargetParsingPath"];
+							if (linkPath is not null)
+							{
+								var linkItem = ShellFolderExtensions.GetShellFileItem(item);
+								locations.Add(new ShellLinkItem(linkItem) { TargetPath = linkPath });
+							}
+						}
+					}
+				}
+				return locations;
+			});
+
+			foreach (var item in networkLocations ?? Enumerable.Empty<ShellLinkItem>())
+			{
+				var networkItem = new DriveItem
+				{
+					Text = System.IO.Path.GetFileNameWithoutExtension(item.FileName),
+					Path = item.TargetPath,
+					DeviceID = item.FilePath,
+					Type = DriveType.Network,
+					ItemType = NavigationControlItemType.Drive,
+				};
+				networkItem.MenuOptions = new ContextMenuOptions
+				{
+					IsLocationItem = true,
+					ShowEjectDevice = networkItem.IsRemovable,
+					ShowShellItems = true,
+					ShowProperties = true,
+				};
+
+				yield return networkItem;
+			}
+		}
+
+		public Task OpenMapNetworkDriveDialogAsync()
+		{
+			var handle = NativeWinApiHelper.CoreWindowHandle.ToInt64();
+			return NetworkDrivesAPI.OpenMapNetworkDriveDialog(handle);
+		}
+	}
+}

src/Files.App/ServicesImplementation/NetworkDrivesService.cs

@@ -5,26 +5,14 @@
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
 using Files.App.DataModels.NavigationControlItems;
-using Files.App.Extensions;
-using Files.App.Filesystem;
-using Files.App.Helpers;
 using Files.App.Shell;
-using Files.App.ViewModels;
 using Files.App.ViewModels.Widgets;
-using Files.Backend.Services.Settings;
-using Files.Shared.Extensions;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Imaging;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Windows.System;
 using Windows.UI.Core;
@@ -74,7 +62,7 @@ public sealed partial class DrivesWidget : HomePageWidget, IWidgetItemModel, INo
 	{
 		public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
-
+		private NetworkDrivesViewModel networkDrivesViewModel = Ioc.Default.GetRequiredService<NetworkDrivesViewModel>();
 		public delegate void DrivesWidgetInvokedEventHandler(object sender, DrivesWidgetInvokedEventArgs e);
 
 		public event DrivesWidgetInvokedEventHandler DrivesWidgetInvoked;
@@ -143,7 +131,7 @@ public DrivesWidget()
 			OpenPropertiesCommand = new RelayCommand<DriveCardItem>(OpenProperties);
 			PinToFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(PinToFavorites);
 			UnpinFromFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromFavorites);
-			MapNetworkDriveCommand = new AsyncRelayCommand(DoNetworkMapDrive); 
+			MapNetworkDriveCommand = new AsyncRelayCommand(DoNetworkMapDriveAsync); 
 			DisconnectNetworkDriveCommand = new RelayCommand<DriveCardItem>(DisconnectNetworkDrive);
 		}
 
@@ -268,9 +256,9 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			}.Where(x => x.ShowItem).ToList();
 		}
 
-		private async Task DoNetworkMapDrive()
+		private Task DoNetworkMapDriveAsync()
 		{
-			await NetworkDrivesManager.OpenMapNetworkDriveDialogAsync(NativeWinApiHelper.CoreWindowHandle.ToInt64());
+			return networkDrivesViewModel.OpenMapNetworkDriveDialogAsync();
 		}
 
 		private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
@@ -357,7 +345,7 @@ private void MenuFlyout_Opening(object sender, object e)
 
 		private void DisconnectNetworkDrive(DriveCardItem item)
 		{
-			NetworkDrivesManager.DisconnectNetworkDrive(item.Item.Path);
+			networkDrivesViewModel.DisconnectNetworkDrive(item.Item);
 		}
 
 		private void GoToStorageSense_Click(object sender, RoutedEventArgs e)

src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs

@@ -18,6 +18,7 @@ public class MainPageViewModel : ObservableObject
 		private IUserSettingsService userSettingsService;
 		private IAppearanceSettingsService appearanceSettingsService;
 		private readonly DrivesViewModel drivesViewModel;
+		private readonly NetworkDrivesViewModel networkDrivesViewModel;
 		private IResourcesService resourcesService;
 
 		public IMultitaskingControl? MultitaskingControl { get; set; }
@@ -40,11 +41,13 @@ public MainPageViewModel(
 			IUserSettingsService userSettings, 
 			IAppearanceSettingsService appearanceSettings,
 			IResourcesService resources,
-			DrivesViewModel drivesViewModel)
+			DrivesViewModel drivesViewModel,
+			NetworkDrivesViewModel networkDrivesViewModel)
 		{
 			userSettingsService = userSettings;
 			appearanceSettingsService = appearanceSettings;
 			this.drivesViewModel = drivesViewModel;
+			this.networkDrivesViewModel = networkDrivesViewModel;
 			resourcesService = resources;
 			// Create commands
 			NavigateToNumberedTabKeyboardAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(NavigateToNumberedTabKeyboardAccelerator);
@@ -231,7 +234,7 @@ public async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
 				}
 				else if (PathNormalization.NormalizePath(PathNormalization.GetPathRoot(currentPath)) == normalizedCurrentPath) // If path is a drive's root
 				{
-					var matchingDrive = App.NetworkDrivesManager.Drives.FirstOrDefault(netDrive => normalizedCurrentPath.Contains(PathNormalization.NormalizePath(netDrive.Path), StringComparison.OrdinalIgnoreCase));
+					var matchingDrive = networkDrivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(netDrive => normalizedCurrentPath.Contains(PathNormalization.NormalizePath(netDrive.Path), StringComparison.OrdinalIgnoreCase));
 					matchingDrive ??= drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(drive => normalizedCurrentPath.Contains(PathNormalization.NormalizePath(drive.Path), StringComparison.OrdinalIgnoreCase));
 					tabLocationHeader = matchingDrive is not null ? matchingDrive.Text : normalizedCurrentPath;
 				}