From b1e5424f55482440a4b0ac795d4021005e8809e3 Mon Sep 17 00:00:00 2001
From: ahjephson <ahjephson@gmail.com>
Date: Sat, 2 Nov 2024 13:44:00 +0000
Subject: [PATCH] Update rename files UI

---
 .../Dialogs/RenameFilesDialog.razor           | 18 +++++++---------
 .../Dialogs/RenameFilesDialog.razor.cs        | 21 ++++++++++---------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor b/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor
index 7dafb6d..faeb8eb 100644
--- a/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor
+++ b/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor
@@ -9,16 +9,15 @@
                     <MudItem xs="12">
                         <MudTextField T="string" Label="Search files" Value="Search" ValueChanged="SearchChanged" Variant="Variant.Outlined" />
                     </MudItem>
-                    <MudItem xs="12">
+                    <MudItem xs="12" lg="4">
                         <FieldSwitch Label="Use regular expressions" Value="UseRegex" ValueChanged="UseRegexChanged" />
                     </MudItem>
-                    <MudItem xs="12">
+                    <MudItem xs="12" lg="4">
                         <FieldSwitch Label="Match all occurrences" Value="MatchAllOccurrences" ValueChanged="MatchAllOccurrencesChanged" />
                     </MudItem>
-                    <MudItem xs="12">
+                    <MudItem xs="12" lg="4">
                         <FieldSwitch Label="Case sensitive" Value="CaseSensitive" ValueChanged="CaseSensitiveChanged" />
                     </MudItem>
-                    <MudDivider />
                     <MudItem xs="12">
                         <MudTextField T="string" Label="Replacement" Value="Replacement" ValueChanged="ReplacementChanged" Variant="Variant.Outlined" />
                     </MudItem>
@@ -29,20 +28,19 @@
                             <MudSelectItem T="AppliesTo" Value="AppliesTo.Extension">Extension</MudSelectItem>
                         </MudSelect>
                     </MudItem>
-                    <MudItem xs="12">
+                    <MudItem xs="12" lg="4">
                         <FieldSwitch Label="Include files" Value="IncludeFiles" ValueChanged="IncludeFilesChanged" />
                     </MudItem>
-                    <MudItem xs="12">
+                    <MudItem xs="12" lg="4">
                         <FieldSwitch Label="Include folders" Value="IncludeFolders" ValueChanged="IncludeFoldersChanged" />
                     </MudItem>
-                    <MudItem xs="12" md="6">
+                    <MudItem xs="12" lg="4">
                         <MudNumericField T="int" Label="Enumerate files" Value="FileEnumerationStart" ValueChanged="FileEnumerationStartChanged" Min="0" Variant="Variant.Outlined" />
                     </MudItem>
-                    <MudDivider />
                     <MudItem xs="12">
                         <MudSelect T="bool" Label="Replace type" Value="ReplaceAll" ValueChanged="ReplaceAllChanged" Variant="Variant.Outlined">
-                            <MudSelectItem T="bool" Value="true">Replace</MudSelectItem>
-                            <MudSelectItem T="bool" Value="false">Replace all</MudSelectItem>
+                            <MudSelectItem T="bool" Value="false">Replace</MudSelectItem>
+                            <MudSelectItem T="bool" Value="true">Replace all</MudSelectItem>
                         </MudSelect>
                     </MudItem>
                 </MudGrid>
diff --git a/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor.cs b/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor.cs
index 9ab5b8d..c852481 100644
--- a/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor.cs
+++ b/Lantean.QBTMud/Components/Dialogs/RenameFilesDialog.razor.cs
@@ -484,19 +484,20 @@ namespace Lantean.QBTMud.Components.Dialogs
                 ReplaceAll,
                 FileEnumerationStart);
 
-            foreach (var (_, renamedFile) in renamedFiles)
+            foreach (var (_, renamedFile) in renamedFiles.Where(f => !f.Value.IsFolder))
             {
                 var oldPath = renamedFile.Path + renamedFile.OriginalName;
                 var newPath = renamedFile.Path + renamedFile.NewName;
-                if (renamedFile.IsFolder)
-                {
-                    
-                    await ApiClient.RenameFolder(Hash, oldPath, newPath);
-                }
-                else
-                {
-                    await ApiClient.RenameFile(Hash, oldPath, newPath);
-                }
+
+                await ApiClient.RenameFile(Hash, oldPath, newPath);
+            }
+
+            foreach (var (_, renamedFile) in renamedFiles.Where(f => f.Value.IsFolder).OrderBy(f => f.Value.Path.Split(Extensions.DirectorySeparator)))
+            {
+                var oldPath = renamedFile.Path + renamedFile.OriginalName;
+                var newPath = renamedFile.Path + renamedFile.NewName;
+                
+                await ApiClient.RenameFolder(Hash, oldPath, newPath);
             }
 
             MudDialog.Close();