Fixed duplicate drives added to the sidebar (#8325)

Author: gave92

src/Files/Filesystem/Drives.cs

@@ -235,24 +235,22 @@ ex is UnauthorizedAccessException
             }
 
             using var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(() => root.GetThumbnailAsync(ThumbnailMode.SingleItem, 40, ThumbnailOptions.UseCurrentScale).AsTask());
+            var driveItem = await DriveItem.CreateFromPropertiesAsync(root, deviceId, type, thumbnail);
+
             lock (drivesList)
             {
                 // If drive already in list, skip.
                 if (drivesList.Any(x => x.DeviceID == deviceId ||
-                string.IsNullOrEmpty(root.Path) ? x.Path.Contains(root.Name, StringComparison.Ordinal) : x.Path == root.Path))
+                    string.IsNullOrEmpty(root.Path) ? x.Path.Contains(root.Name, StringComparison.OrdinalIgnoreCase) : x.Path == root.Path))
                 {
                     return;
                 }
-            }
-
-            var driveItem = await DriveItem.CreateFromPropertiesAsync(root, deviceId, type, thumbnail);
-
-            lock (drivesList)
-            {
+            
                 Logger.Info($"Drive added: {driveItem.Path}, {driveItem.Type}");
 
                 drivesList.Add(driveItem);
             }
+
             // Update the collection on the ui-thread.
             DeviceWatcher_EnumerationCompleted(null, null);
         }
@@ -291,20 +289,17 @@ private async Task<bool> GetDrivesAsync()
                 }
 
                 using var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(() => res.Result.GetThumbnailAsync(ThumbnailMode.SingleItem, 40, ThumbnailOptions.UseCurrentScale).AsTask());
+                var type = GetDriveType(drive);
+                var driveItem = await DriveItem.CreateFromPropertiesAsync(res.Result, drive.Name.TrimEnd('\\'), type, thumbnail);
+
                 lock (drivesList)
                 {
                     // If drive already in list, skip.
                     if (drivesList.Any(x => x.Path == drive.Name))
                     {
                         continue;
                     }
-                }
-
-                var type = GetDriveType(drive);
-                var driveItem = await DriveItem.CreateFromPropertiesAsync(res.Result, drive.Name.TrimEnd('\\'), type, thumbnail);
 
-                lock (drivesList)
-                {
                     Logger.Info($"Drive added: {driveItem.Path}, {driveItem.Type}");
                     drivesList.Add(driveItem);
                 }
@@ -448,29 +443,27 @@ public async Task HandleWin32DriveEvent(DeviceEvent eventType, string deviceId)
                         return;
                     }
 
+                    DriveItem driveItem;
+
+                    using (var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(() => rootAdded.Result.GetThumbnailAsync(ThumbnailMode.SingleItem, 40, ThumbnailOptions.UseCurrentScale).AsTask()))
+                    {
+                        var type = GetDriveType(driveAdded);
+                        driveItem = await DriveItem.CreateFromPropertiesAsync(rootAdded, deviceId, type, thumbnail);
+                    }
+
                     lock (drivesList)
                     {
                         // If drive already in list, skip.
                         var matchingDrive = drivesList.FirstOrDefault(x => x.DeviceID == deviceId ||
-                        string.IsNullOrEmpty(rootAdded.Result.Path) ? x.Path.Contains(rootAdded.Result.Name, StringComparison.Ordinal) : x.Path == rootAdded.Result.Path);
+                            string.IsNullOrEmpty(rootAdded.Result.Path) ? x.Path.Contains(rootAdded.Result.Name, StringComparison.OrdinalIgnoreCase) : x.Path == rootAdded.Result.Path);
                         if (matchingDrive != null)
                         {
                             // Update device id to match drive letter
                             matchingDrive.DeviceID = deviceId;
                             return;
                         }
-                    }
-
-                    using (var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(() => rootAdded.Result.GetThumbnailAsync(ThumbnailMode.SingleItem, 40, ThumbnailOptions.UseCurrentScale).AsTask()))
-                    {
-                        var type = GetDriveType(driveAdded);
-                        var driveItem = await DriveItem.CreateFromPropertiesAsync(rootAdded, deviceId, type, thumbnail);
-
-                        lock (drivesList)
-                        {
-                            Logger.Info($"Drive added from fulltrust process: {driveItem.Path}, {driveItem.Type}");
-                            drivesList.Add(driveItem);
-                        }
+                        Logger.Info($"Drive added from fulltrust process: {driveItem.Path}, {driveItem.Type}");
+                        drivesList.Add(driveItem);
                     }
 
                     DeviceWatcher_EnumerationCompleted(null, null);