From 26b392b002ac39f7c985400c0b8adad3658346e3 Mon Sep 17 00:00:00 2001 From: ergoxiv Date: Sun, 2 Feb 2025 19:23:45 +0100 Subject: [PATCH] Fixed file rename causing duplicate file extensions --- Anamnesis/Files/FileBrowserView.xaml.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Anamnesis/Files/FileBrowserView.xaml.cs b/Anamnesis/Files/FileBrowserView.xaml.cs index 22e0025a..d14aab93 100644 --- a/Anamnesis/Files/FileBrowserView.xaml.cs +++ b/Anamnesis/Files/FileBrowserView.xaml.cs @@ -3,6 +3,12 @@ namespace Anamnesis.GUI.Views; +using Anamnesis.Files; +using Anamnesis.GUI.Dialogs; +using Anamnesis.Services; +using Anamnesis.Styles.Drawers; +using PropertyChanged; +using Serilog; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,12 +20,6 @@ namespace Anamnesis.GUI.Views; using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using Anamnesis.Files; -using Anamnesis.GUI.Dialogs; -using Anamnesis.Services; -using Anamnesis.Styles.Drawers; -using PropertyChanged; -using Serilog; using XivToolsWpf; public abstract class FileBrowserDrawer : SelectorDrawer @@ -504,7 +504,7 @@ private async void OnDeleteClick(object sender, RoutedEventArgs e) return; var entry = this.Selected.Entry; - if(entry is DirectoryInfo directory) + if (entry is DirectoryInfo directory) { directory.Delete(true); } @@ -672,7 +672,9 @@ public string? Rename if (this.Entry is FileInfo file) { string? extension = Path.GetExtension(this.Entry.FullName); - newPath += extension; + if (!newPath.EndsWith(extension, StringComparison.OrdinalIgnoreCase)) + newPath += extension; + file.MoveTo(newPath); } else if (this.Entry is DirectoryInfo dir)