Update 1.0.0.4

Source/SBWPF/BackupPlanWindow.xaml.cs

@@ -60,7 +60,7 @@ private void addFolderButton_Click(object sender, RoutedEventArgs e)
                 var folderInfo = new FileInfo(openFolderDialog.FolderName);
 
                 var backupSource = new BackupSource();
-                backupSource.Name = folderInfo.Name;
+                backupSource.Name = GetSourceFolderName(folderInfo.Name, m_backupSources.ToList());
                 backupSource.Path = openFolderDialog.FolderName;
                 backupSource.Type = Backuper.Type.Directory;
 
@@ -76,7 +76,7 @@ private void addFileButton_Click(object sender, RoutedEventArgs e)
                 var folderInfo = new FileInfo(openFileDialog.FileName);
 
                 var backupSource = new BackupSource();
-                backupSource.Name = folderInfo.Name;
+                backupSource.Name = GetSourceFileName(System.IO.Path.GetFileNameWithoutExtension(openFileDialog.FileName), System.IO.Path.GetExtension(openFileDialog.FileName), m_backupSources.ToList());
                 backupSource.Path = openFileDialog.FileName;
                 backupSource.Type = Backuper.Type.File;
 
@@ -109,6 +109,49 @@ private void createPlanButton_Click(object sender, RoutedEventArgs e)
             this.Close();
         }
 
+        private static String GetSourceFolderName(String oldName, List<BackupSource> backupSources)
+        {
+            if(IsDuplicate(oldName, backupSources))
+            {
+                var i = 1;
+                string fileName = $"{oldName}_{i}";
+                while (IsDuplicate(fileName, backupSources))
+                {
+                    i++;
+                    fileName = $"{oldName}_{i}";
+                }
+                return fileName;
+            }
+            return oldName;
+        }
+
+        private static String GetSourceFileName(String oldName, String extension, List<BackupSource> backupSources)
+        {
+            if (IsDuplicate(oldName + extension, backupSources))
+            {
+                var i = 1;
+                string fileName = $"{oldName}_{i}{extension}";
+                while (IsDuplicate(fileName, backupSources))
+                {
+                    i++;
+                    fileName = $"{oldName}_{i}{extension}";
+                }
+                return fileName;
+            }
+            return oldName + extension;
+        }
+
+        private static bool IsDuplicate(String name, List<BackupSource> backupSources)
+        {
+            foreach (var item in backupSources)
+            {
+                if(item.Name.Equals(name))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
 
     }
 }

Source/SBWPF/SBWPF.csproj

@@ -58,7 +58,7 @@
 
   <ItemGroup>
     <Reference Include="Backuper">
-      <HintPath>..\..\Backuper\Backuper\bin\Debug\net8.0\Backuper.dll</HintPath>
+      <HintPath>..\..\Backuper\Backuper\bin\Release\net8.0\Backuper.dll</HintPath>
     </Reference>
   </ItemGroup>
 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7304f00bcc6ff981953a9c240d6a8cb9aacb3286086720c60a8c566acd060848
+7764bcb8b546307aa64acd37ab2ae91cea372c70d3efbf372815752ba05d4cc9

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_0yehgpfd_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_0yehgpfd_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_0yehgpfd_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_0yehgpfd_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_0yehgpfd_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_5taha24j_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_5taha24j_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_5taha24j_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_5taha24j_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_5taha24j_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_MarkupCompile.cache

@@ -13,7 +13,7 @@ C:\Users\andy1\source\repos\SBWPF\SBWPF\App.xaml
 191384786802
 
 22-1398533354
-2101689962709
+210464309183
 AboutDialog.xaml;BackupPlanWindow.xaml;ExportSecuredDialog.xaml;ImportSecruredDialog.xaml;MainWindow.xaml;RestoreBackupDialog.xaml;Styles\CustomStyles.xaml;Themes\ColourDictionaries\DarkGreyTheme.xaml;Themes\ColourDictionaries\DeepDark.xaml;Themes\ColourDictionaries\GreyTheme.xaml;Themes\ColourDictionaries\LightTheme.xaml;Themes\ColourDictionaries\RedBlackTheme.xaml;Themes\ColourDictionaries\SoftDark.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\ControlColours.xaml;Themes\Controls.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml;
 
 False

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_MarkupCompile.i.cache

@@ -13,8 +13,8 @@ C:\Users\andy1\source\repos\SBWPF\SBWPF\App.xaml
 191384786802
 
 241865189958
-2101689962709
+210464309183
 AboutDialog.xaml;BackupPlanWindow.xaml;ExportSecuredDialog.xaml;ImportSecruredDialog.xaml;MainWindow.xaml;RestoreBackupDialog.xaml;Styles\CustomStyles.xaml;Themes\ColourDictionaries\DarkGreyTheme.xaml;Themes\ColourDictionaries\DeepDark.xaml;Themes\ColourDictionaries\GreyTheme.xaml;Themes\ColourDictionaries\LightTheme.xaml;Themes\ColourDictionaries\RedBlackTheme.xaml;Themes\ColourDictionaries\SoftDark.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\ControlColours.xaml;Themes\Controls.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml;
 
-True
+False
 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_dn4fa0lk_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_dn4fa0lk_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_dn4fa0lk_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_dn4fa0lk_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_dn4fa0lk_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_menshksy_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_menshksy_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_menshksy_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_menshksy_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_menshksy_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_p0nr4gqy_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_p0nr4gqy_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_p0nr4gqy_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_p0nr4gqy_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_p0nr4gqy_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_waj4vf52_wpftmp.AssemblyInfo.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyTitleAttribute("SBWPF")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_waj4vf52_wpftmp.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+a31238605d3a29ce482c1384edcfc032d487adaa518a5dc58cb04092564d48e0

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_waj4vf52_wpftmp.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0-windows
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = SBWPF_waj4vf52_wpftmp
+build_property.ProjectDir = C:\Users\andy1\source\repos\SBWPF\SBWPF\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

Source/SBWPF/obj/Debug/net8.0-windows/SBWPF_waj4vf52_wpftmp.GlobalUsings.g.cs

@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;