Added protection against problems with folders in Windows if the file…

… name has a space before the extension (fix #596)
Serg-Norseman · Sep 12, 2024 · 522c77e · 522c77e
1 parent 43c557b
commit 522c77e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added protection against problems with folders in Windows if the file name has a space before the extension.
             <li>Added statistics type on parents' ages at child's birth.
             <li>Fixed a frequent error saving images to cache "A generic error occurred in GDI+".
             <li>Added the feature to save trees to PDF files.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена защита от проблем с папками в Windows, если в имени файла перед расширением есть пробел.
             <li>Добавлен тип статистики по возрастам родителей при рождении ребенка.
             <li>Исправлена частая ошибка сохранения изображений в кэш "A generic error occurred in GDI+".
             <li>Добавлена возможность сохранения диаграмм деревьев в PDF-файлы.

diff --git a/projects/GKCore/GKCore/BaseContext.cs b/projects/GKCore/GKCore/BaseContext.cs
@@ -1539,10 +1539,27 @@ private void RemoveOldestBackups(string fileName, string bakPath)
             }
         }
 
+        private static string CheckFileName(string fileName)
+        {
+            // Control of possible folder management problems in Windows
+            // if there is a space before the dot in the file name
+            // (the folder cannot be deleted, copied, renamed, moved).
+            string purePath = Path.GetDirectoryName(fileName);
+            string pureFileName = Path.GetFileNameWithoutExtension(fileName);
+            string ext = Path.GetExtension(fileName);
+            if (pureFileName.EndsWith(" ")) {
+                pureFileName = pureFileName.TrimEnd();
+                fileName = Path.Combine(purePath, Path.ChangeExtension(pureFileName, ext));
+            }
+            return fileName;
+        }
+
         private void FileSave(string fileName, string password)
         {
             string oldFileName = fFileName;
 
+            fileName = CheckFileName(fileName);
+
             switch (GlobalOptions.Instance.FileBackup) {
                 case FileBackup.fbNone:
                     break;