progress on #16149 (pre-PR)

Move Registry query for the base Google Drive path from `StorageDevicesService`
back into `GoogleDriveCloudDetector` because we can use the drive label to
filter GD out of the plain "Drives" sections (we were using the base GD path).

Comments and logging adjustments.

next: test on all the mirror/stream-letter/folder configs

Author: wharvex

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

@@ -20,19 +20,9 @@ public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()
 		{
 			var list = DriveInfo.GetDrives();
 			var pCloudDrivePath = App.AppModel.PCloudDrivePath;
-
-			var sw = Stopwatch.StartNew();
-			var googleDrivePath = GoogleDriveCloudDetector.GetRegistryBasePath();
-			sw.Stop();
-			Debug.WriteLine($"In RemovableDrivesService: Time elapsed for Google Drive registry check: {sw.Elapsed}");
-			var googleDrivePathWithMyDrive = googleDrivePath ?? string.Empty;
-			var gdPathIsValid = GoogleDriveCloudDetector.AddMyDriveToPathAndValidate(ref googleDrivePathWithMyDrive);
-			App.AppModel.GoogleDrivePath = gdPathIsValid ? googleDrivePathWithMyDrive : string.Empty;
-
 			foreach (var drive in list)
 			{
 				var driveLabel = DriveHelpers.GetExtendedDriveLabel(drive);
-				Debug.WriteLine($"In RemovableDrivesService: Drive {drive.Name} has ExtendedDriveLabel `{driveLabel}`");
 				// We don't want cloud drives to appear in a plain "Drives" section.
 				if (driveLabel.Equals("Google Drive") || drive.Name.Equals(pCloudDrivePath))
 					continue;

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

@@ -103,19 +103,25 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
 				};
 			}
 
+			// Log the contents of the root_preferences database to the debug output.
 			await Inspect(database, "SELECT * FROM roots", "root_preferences db, roots table");
 			await Inspect(database, "SELECT * FROM media", "root_preferences db, media table");
 			await Inspect(database, "SELECT name FROM sqlite_master WHERE type = 'table' ORDER BY 1", "root_preferences db, all tables");
 
-			var registryPath = App.AppModel.GoogleDrivePath;
-			if (registryPath.Equals(string.Empty))
-				yield break;
-			yield return new CloudProvider(CloudProviders.GoogleDrive)
-			{
-				Name = "Google Drive",
-				SyncFolder = registryPath,
-				IconData = iconFile is not null ? await iconFile.ToByteArrayAsync() : null
-			};
+			// Query the Windows Registry for the base Google Drive path and time the query.
+			var sw = Stopwatch.StartNew();
+			var googleDrivePath = GetRegistryBasePath() ?? string.Empty;
+			sw.Stop();
+			Debug.WriteLine($"Google Drive path registry check took {sw.Elapsed} seconds.");
+
+			// Add "My Drive" to the base GD path and return the resulting cloud provider.
+			if (AddMyDriveToPathAndValidate(ref googleDrivePath))
+				yield return new CloudProvider(CloudProviders.GoogleDrive)
+				{
+					Name = "Google Drive",
+					SyncFolder = googleDrivePath,
+					IconData = iconFile is not null ? await iconFile.ToByteArrayAsync() : null
+				};
 		}
 
 		private static async Task Inspect(SqliteConnection database, string sqlCommand, string targetDescription)
@@ -175,8 +181,8 @@ private static async Task Inspect(SqliteConnection database, string sqlCommand,
 				.RootElement.EnumerateObject()
 				.FirstOrDefault();
 
-			// A default JsonProperty struct has an "Undefined" Value#ValueKind and throws an
-			// error if you try to call EnumerateArray on its Value.
+			// A default `JsonProperty` struct has an Undefined `Value.ValueKind` and throws an
+			// error if you try to call `EnumerateArray` on its `Value`.
 			if (googleDriveRegValJsonProperty.Value.ValueKind == JsonValueKind.Undefined)
 			{
 				_logger.LogWarning($"Root element of Google Drive registry value for value name '{_googleDriveRegValName}' was empty.");
@@ -269,7 +275,8 @@ public static bool AddMyDriveToPathAndValidate(ref string path)
 						si.Name?.Equals("My Drive") ?? false) as ShellLink)?.TargetPath
 				?? string.Empty);
 
-			Debug.WriteLine("SHELL FOLDER LOGGING");
+			var callingMethod = new StackFrame(1).GetMethod();
+			Debug.WriteLine($"SHELL FOLDER LOGGING (Context: `{callingMethod?.Name}` in `{callingMethod?.DeclaringType}`)");
 			rootFolder?.ForEach(si => Debug.WriteLine(si.Name));
 
 			if (!string.IsNullOrEmpty(myDriveFolder))