Only Show Fully-Supported Drives

Author: lukeblevins

Files/Filesystem/Drives.cs

@@ -24,22 +24,28 @@ public class DrivesManager
 
 		public DrivesManager()
 		{
+			Task findDrivesTask = null;
 			try
 			{
-				GetDrives(Drives);
-				GetVirtualDrivesList(Drives);
+				findDrivesTask = GetDrives(Drives);
 			}
 			catch (AggregateException e)
 			{
 				ShowUserConsentOnInit = true;
 			}
 
-			_deviceWatcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());
-			_deviceWatcher.Added += DeviceAdded;
-			_deviceWatcher.Removed += DeviceRemoved;
-			_deviceWatcher.Updated += DeviceUpdated;
-			_deviceWatcher.EnumerationCompleted += DeviceWatcher_EnumerationCompleted;
-			_deviceWatcher.Start();
+			findDrivesTask.ContinueWith((x) => 
+			{
+				GetVirtualDrivesList(Drives);
+
+				_deviceWatcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());
+				_deviceWatcher.Added += DeviceAdded;
+				_deviceWatcher.Removed += DeviceRemoved;
+				_deviceWatcher.Updated += DeviceUpdated;
+				_deviceWatcher.EnumerationCompleted += DeviceWatcher_EnumerationCompleted;
+				_deviceWatcher.Start();
+			});
+			
 		}
 
 		private async void DeviceWatcher_EnumerationCompleted(DeviceWatcher sender, object args)
@@ -87,7 +93,11 @@ private async void DeviceAdded(DeviceWatcher sender, DeviceInformation args)
 			// Update the collection on the ui-thread.
 			try
 			{
-				CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Low, () => { Drives.Add(driveItem); });
+				CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Low, () => 
+				{
+					Drives.Add(driveItem);
+					DeviceWatcher_EnumerationCompleted(null, null);
+				});
 			}
 			catch (Exception e)
 			{
@@ -110,7 +120,11 @@ private async void DeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate a
 				// Update the collection on the ui-thread.
 				try
 				{
-					CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Low, () => { Drives.Remove(drive); });
+					CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Low, () => 
+					{ 
+						Drives.Remove(drive);
+						DeviceWatcher_EnumerationCompleted(null, null);
+					});
 				}
 				catch (Exception e)
 				{
@@ -126,9 +140,20 @@ private void DeviceUpdated(DeviceWatcher sender, DeviceInformationUpdate args)
 			Debug.WriteLine("Devices updated");
 		}
 
-		private void GetDrives(IList<DriveItem> list)
+		private async Task GetDrives(IList<DriveItem> list)
 		{
-			var drives = DriveInfo.GetDrives();
+			var drives = DriveInfo.GetDrives().ToList();
+
+			var remDevices = await DeviceInformation.FindAllAsync(StorageDevice.GetDeviceSelector());
+			var supportedDevicesNames = remDevices.Select(x => StorageDevice.FromId(x.Id).Name);
+			foreach (DriveInfo driveInfo in drives.ToList())
+			{
+				if (!supportedDevicesNames.Contains(driveInfo.Name) && driveInfo.DriveType == System.IO.DriveType.Removable)
+				{
+					drives.Remove(driveInfo);
+				}
+			}
+
 
 			foreach (var drive in drives)
 			{

Files/Filesystem/ItemViewModel.cs

@@ -653,31 +653,30 @@ public async void RapidAddItemsToCollectionAsync(string path)
             App.CurrentInstance.NavigationControl.CanGoBack = App.CurrentInstance.ContentFrame.CanGoBack;
             App.CurrentInstance.NavigationControl.CanGoForward = App.CurrentInstance.ContentFrame.CanGoForward;
 
-                try
-                {
-                    _rootFolder = await StorageFolder.GetFolderFromPathAsync(path);
-                }
-                catch (UnauthorizedAccessException)
-                {
-                    await App.consentDialog.ShowAsync();
-                    return;
-                }
-                catch (COMException e)
-                {
-                    Frame rootContentFrame = Window.Current.Content as Frame;
-                    MessageDialog driveGone = new MessageDialog(e.Message, "Did you unplug this drive?");
-                    await driveGone.ShowAsync();
-                    isLoadingItems = false;
-                    return;
-                }
-                catch (FileNotFoundException)
-                {
-                    Frame rootContentFrame = Window.Current.Content as Frame;
-                    MessageDialog folderGone = new MessageDialog("The folder you've navigated to was not found.", "Did you delete this folder?");
-                    await folderGone.ShowAsync();                    
-                    isLoadingItems = false;
-                    return;
-                }
+            try
+            {
+                _rootFolder = await StorageFolder.GetFolderFromPathAsync(path);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                await App.consentDialog.ShowAsync();
+                return;
+            }
+            catch (FileNotFoundException)
+            {
+                MessageDialog folderGone = new MessageDialog("The folder you've navigated to was not found.", "Did you delete this folder?");
+                await folderGone.ShowAsync();
+                isLoadingItems = false;
+                return;
+            }
+            catch (Exception e)
+            {
+                MessageDialog driveGone = new MessageDialog(e.Message, "Did you unplug this drive?");
+                await driveGone.ShowAsync();
+                isLoadingItems = false;
+                return;
+            }
+
 
             WIN32_FIND_DATA findData;
             FINDEX_INFO_LEVELS findInfoLevel = FINDEX_INFO_LEVELS.FindExInfoStandard;