fix issue where Google Drive appears under drives

Add Debug.WriteLine logging to track when App.AppModel.GoogleDrivePath is
written and read.

Add logic to RemoteDrivesService.GetDrivesAsync() that filters out Google Drive
by calling GoogleDriveCloudDetector.GetGoogleDriveProvidersFromRegistryAsync().

Adjust GoogleDriveCloudDetector.GetGoogleDriveProvidersFromRegistryAsync() so it
can be called from RemoteDrivesService.GetDrivesAsync(), and so it can be told
to not append 'My Drive'.

Author: wharvex

src/Files.App/Services/Storage/StorageDevicesService.cs

@@ -22,8 +22,20 @@ public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
 			var googleDrivePath = App.AppModel.GoogleDrivePath;
 			var pCloudDrivePath = App.AppModel.PCloudDrivePath;
 
+#if DEBUG
+			Debug.WriteLine($"In RDS.GDA: googleDrivePath: {googleDrivePath}");
+#endif
+
 			foreach (var drive in list)
 			{
+				var shouldSkip = false;
+				await foreach (var cloudProvider in GoogleDriveCloudDetector.GetGoogleDriveProvidersFromRegistryAsync(false))
+				{
+					if (cloudProvider.SyncFolder.Equals(drive.Name))
+						shouldSkip = true;
+				}
+				if (shouldSkip)
+					continue;
 				var res = await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(drive.Name).AsTask());
 				if (res.ErrorCode is FileSystemStatusCode.Unauthorized)
 				{
@@ -43,6 +55,9 @@ public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
 				var label = DriveHelpers.GetExtendedDriveLabel(drive);
 				var driveItem = await DriveItem.CreateFromPropertiesAsync(res.Result, drive.Name.TrimEnd('\\'), label, type, thumbnail);
 
+#if DEBUG
+				Debug.WriteLine($"In RDS.GDA: drive.Name: {drive.Name}");
+#endif
 				// Don't add here because Google Drive is already displayed under cloud drives
 				if (drive.Name == googleDrivePath || drive.Name == pCloudDrivePath)
 					continue;

src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs

@@ -72,6 +72,7 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 				App.AppModel.GoogleDrivePath = path;
 
 #if DEBUG
+				Debug.WriteLine($"In GDCD in roots table: App.AppModel.GoogleDrivePath being set to: {path}");
 				Debug.WriteLine("YIELD RETURNING from GoogleDriveCloudDetector#GetProviders (roots): ");
 				Debug.WriteLine($"name=Google Drive ({title}); path={path}");
 #endif
@@ -106,6 +107,7 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 				var iconFile = await GetGoogleDriveIconFileAsync();
 
 #if DEBUG
+				Debug.WriteLine($"In GDCD in media table: App.AppModel.GoogleDrivePath being set to: {path}");
 				Debug.WriteLine("YIELD RETURNING from GoogleDriveCloudDetector#GetProviders (media): ");
 				Debug.WriteLine($"name={title}; path={path}");
 #endif
@@ -160,7 +162,7 @@ private async Task Inspect(SqliteConnection database, string sqlCommand, string
 #endif
 		}
 
-		private JsonDocument? GetGoogleDriveRegValJson()
+		private static JsonDocument? GetGoogleDriveRegValJson()
 		{
 			// This will be null if the key name is not found.
 			using var googleDriveRegKey = Registry.CurrentUser.OpenSubKey(_googleDriveRegKeyName);
@@ -192,7 +194,7 @@ private async Task Inspect(SqliteConnection database, string sqlCommand, string
 			return googleDriveRegValueJson;
 		}
 
-		private async IAsyncEnumerable<ICloudProvider> GetGoogleDriveProvidersFromRegistryAsync()
+		public static async IAsyncEnumerable<ICloudProvider> GetGoogleDriveProvidersFromRegistryAsync(bool addMyDriveToPath = true)
 		{
 			var googleDriveRegValJson = GetGoogleDriveRegValJson();
 
@@ -228,13 +230,16 @@ private async IAsyncEnumerable<ICloudProvider> GetGoogleDriveProvidersFromRegist
 				if (path is null)
 					continue;
 
-				if (!AddMyDriveToPathAndValidate(ref path))
+				if (!AddMyDriveToPathAndValidate(ref path, addMyDriveToPath))
 				{
 					_logger.LogWarning($"Validation failed for {path} (media)");
 					continue;
 				}
 
 				App.AppModel.GoogleDrivePath = path;
+#if DEBUG
+				Debug.WriteLine($"In GDCD in registry: App.AppModel.GoogleDrivePath being set to: {path}");
+#endif
 
 				var iconFile = await GetGoogleDriveIconFileAsync();
 
@@ -247,7 +252,7 @@ private async IAsyncEnumerable<ICloudProvider> GetGoogleDriveProvidersFromRegist
 			}
 		}
 
-		private async Task<StorageFile?> GetGoogleDriveIconFileAsync()
+		private static async Task<StorageFile?> GetGoogleDriveIconFileAsync()
 		{
 			var programFilesEnvVar = Environment.GetEnvironmentVariable("ProgramFiles");
 
@@ -259,7 +264,7 @@ private async IAsyncEnumerable<ICloudProvider> GetGoogleDriveProvidersFromRegist
 			return await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(iconPath).AsTask());
 		}
 
-		private bool AddMyDriveToPathAndValidate(ref string path)
+		private static bool AddMyDriveToPathAndValidate(ref string path, bool addMyDrive = true)
 		{
 			// If Google Drive is mounted as a drive, then the path found in the registry will be
 			// *just* the drive letter (e.g. just "G" as opposed to "G:\"), and therefore must be
@@ -280,27 +285,31 @@ private bool AddMyDriveToPathAndValidate(ref string path)
 				path = temp.RootDirectory.Name;
 			}
 
-			// If `path` contains a shortcut named "My Drive", store its target in `shellFolderBaseFirst`.
-			// This happens when "My Drive syncing options" is set to "Mirror files".
-			// TODO: Avoid to use Vanara (#15000)
-			using var shellFolderBase = ShellFolderExtensions.GetShellItemFromPathOrPIDL(path) as ShellFolder;
-			var shellFolderBaseFirst = Environment.ExpandEnvironmentVariables((
-				shellFolderBase?.FirstOrDefault(si =>
-					si.Name?.Equals("My Drive") ?? false) as ShellLink)?.TargetPath
-			    ?? string.Empty);
+			if (addMyDrive)
+			{
+				// If `path` contains a shortcut named "My Drive", store its target in `shellFolderBaseFirst`.
+				// This happens when "My Drive syncing options" is set to "Mirror files".
+				// TODO: Avoid to use Vanara (#15000)
+				using var shellFolderBase = ShellFolderExtensions.GetShellItemFromPathOrPIDL(path) as ShellFolder;
+				var shellFolderBaseFirst = Environment.ExpandEnvironmentVariables((
+						shellFolderBase?.FirstOrDefault(si =>
+							si.Name?.Equals("My Drive") ?? false) as ShellLink)?.TargetPath
+					?? string.Empty);
 
 #if DEBUG
-			Debug.WriteLine("INVALID PATHS LOGGER");
-			shellFolderBase?.ForEach(si => Debug.WriteLine(si.Name));
+				Debug.WriteLine("INVALID PATHS LOGGER");
+				shellFolderBase?.ForEach(si => Debug.WriteLine(si.Name));
 #endif
 
-			if (!string.IsNullOrEmpty(shellFolderBaseFirst))
-			{
-				path = shellFolderBaseFirst;
-				return true;
+				if (!string.IsNullOrEmpty(shellFolderBaseFirst))
+				{
+					path = shellFolderBaseFirst;
+					return true;
+				}
+
+				path = Path.Combine(path, "My Drive");
 			}
 
-			path = Path.Combine(path, "My Drive");
 			if (Directory.Exists(path))
 				return true;
 			_logger.LogWarning($"Invalid Google Drive mount point path: {path}");