chore: Better feedback when drag and drop fails

Moonholder · Sep 3, 2023 · bf47ce0 · bf47ce0
1 parent 8a1463e
commit bf47ce0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/src/GIMI-ModManager.Core/Services/DragAndDropScanner.cs b/src/GIMI-ModManager.Core/Services/DragAndDropScanner.cs
@@ -17,7 +17,7 @@ public DragAndDropScanner()
     {
     }
 
-    public IMod Scan(string path)
+    public DragAndDropScanResult Scan(string path)
     {
         PrepareWorkFolder();
 
@@ -40,15 +40,25 @@ public IMod Scan(string path)
         }
 
 
-        var extractedDir = new DirectoryInfo(_workFolder).EnumerateDirectories().FirstOrDefault();
-        if (extractedDir is null)
-            throw new Exception("No extracted folder found");
 
-        var newMod = new Mod(extractedDir);
 
-        newMod.MoveTo(_tmpFolder);
+        var extractedDirs = new DirectoryInfo(_workFolder).EnumerateDirectories().ToArray();
+        if (extractedDirs is null || !extractedDirs.Any())
+            throw new Exception("No valid mod folder found in archive. Loose files are ignored");
 
-        return newMod;
+        var ignoredDirs = new List<DirectoryInfo>();
+        if (extractedDirs.Length > 1)
+            ignoredDirs.AddRange(extractedDirs.Skip(1));
+
+        var newMod = new Mod(extractedDirs.First());
+
+        //newMod.MoveTo(_tmpFolder);
+
+        return new DragAndDropScanResult()
+        {
+            ExtractedMod = newMod,
+            IgnoredMods = ignoredDirs.Select(dir => dir.Name).ToArray()
+        };
     }
 
     private void PrepareWorkFolder()
@@ -138,6 +148,8 @@ public void Dispose()
 
 public class DragAndDropScanResult
 {
-    public IMod Mod { get; set; } = null!;
+    public IMod ExtractedMod { get; init; } = null!;
+    public string[] IgnoredMods { get; init; } = Array.Empty<string>();
+    public string[] IgnoredFiles { get; init; } = Array.Empty<string>();
     public string? ThumbnailPath { get; set; }
 }
diff --git a/src/GIMI-ModManager.WinUI/ViewModels/CharacterDetailsViewModel.cs b/src/GIMI-ModManager.WinUI/ViewModels/CharacterDetailsViewModel.cs
@@ -198,8 +198,8 @@ private async Task DragAndDropAsync(IReadOnlyList<IStorageItem>? storageItems)
         catch (Exception e)
         {
             _logger.Error(e, "Error while adding storage items.");
-            _notificationService.ShowNotification("Error while adding storage items.",
-                $"An error occurred while adding the storage items. Mod may have been partially copied.\n{e.Message}",
+            _notificationService.ShowNotification("Drag And Drop operation failed",
+                $"An error occurred while adding the storage items. Mod may have been partially copied. Reason:\n{e.Message}",
                 TimeSpan.FromSeconds(5));
         }
         finally
@@ -240,8 +240,13 @@ private async Task AddStorageItemFoldersAsync(IReadOnlyList<IStorageItem>? stora
             if (storageItem is StorageFile)
             {
                 using var scanner = new DragAndDropScanner();
-                var mod = scanner.Scan(storageItem.Path);
-                mod.MoveTo(destDirectoryInfo.FullName);
+                var extractResult = scanner.Scan(storageItem.Path);
+                extractResult.ExtractedMod.MoveTo(destDirectoryInfo.FullName);
+                if (extractResult.IgnoredMods.Any())
+                    App.MainWindow.DispatcherQueue.TryEnqueue(() =>
+                        _notificationService.ShowNotification("Multiple folders detected during extraction, first one was extracted",
+                            $"Ignored Folders: {string.Join(" | ", extractResult.IgnoredMods)}",
+                            TimeSpan.FromSeconds(7)));
                 continue;
             }
 

diff --git a/src/GIMI-ModManager.WinUI/Views/NotificationsPage.xaml b/src/GIMI-ModManager.WinUI/Views/NotificationsPage.xaml
@@ -69,7 +69,8 @@
                             Grid.Row="1"
                             IsTextSelectionEnabled="True"
                             Style="{ThemeResource BodyTextBlockStyle}"
-                            Text="{x:Bind Message}" />
+                            Text="{x:Bind Message}"
+                            TextWrapping="WrapWholeWords" />
                         <TextBlock
                             Grid.Row="2"
                             HorizontalTextAlignment="Right"