Settings now moved correctly if the user don't want to overwrite files

Author: BornToBeRoot

Source/NETworkManager/Models/Settings/SettingsManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
@@ -128,12 +129,12 @@ public static void Save()
             Current.SettingsChanged = false;
         }
 
-        public static Task MoveSettingsAsync(string sourceLocation, string targedLocation, bool overwrite)
+        public static Task MoveSettingsAsync(string sourceLocation, string targedLocation, bool overwrite, string[] filesTargedLocation)
         {
-            return Task.Run(() => MoveSettings(sourceLocation, targedLocation, overwrite));
+            return Task.Run(() => MoveSettings(sourceLocation, targedLocation, overwrite, filesTargedLocation));
         }
 
-        private static void MoveSettings(string sourceLocation, string targedLocation, bool overwrite)
+        private static void MoveSettings(string sourceLocation, string targedLocation, bool overwrite, string[] filesTargedLocation = null)
         {
             string[] sourceFiles = Directory.GetFiles(sourceLocation);
 
@@ -143,9 +144,9 @@ private static void MoveSettings(string sourceLocation, string targedLocation, b
             foreach (string file in sourceFiles)
             {
                 // Skip if file exists and user don't want to overwrite it
-                if (!overwrite && File.Exists(file))
+                if (!overwrite && ((filesTargedLocation.Any(x => Path.GetFileName(x) == Path.GetFileName(file)))))
                     continue;
-
+                
                 File.Copy(file, Path.Combine(targedLocation, Path.GetFileName(file)), overwrite);
             }
 

Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs

@@ -429,8 +429,10 @@ private async void ChangeSettingsAction()
             bool overwrite = false;
             bool forceRestart = false;
 
+            string[] filesTargedLocation = Directory.GetFiles(LocationSelectedPath);
+
             // Check if there are any settings files in the folder...
-            if (FilesContainsSettingsFiles(Directory.GetFiles(LocationSelectedPath)))
+            if (FilesContainsSettingsFiles(filesTargedLocation))
             {
                 MetroDialogSettings settings = AppearanceManager.MetroDialog;
 
@@ -459,7 +461,7 @@ private async void ChangeSettingsAction()
             // Try moving files (permissions, file is in use...)
             try
             {
-                await SettingsManager.MoveSettingsAsync(SettingsManager.GetSettingsLocation(), LocationSelectedPath, overwrite);
+                await SettingsManager.MoveSettingsAsync(SettingsManager.GetSettingsLocation(), LocationSelectedPath, overwrite, filesTargedLocation);
 
                 Properties.Settings.Default.Settings_CustomSettingsLocation = LocationSelectedPath;
 
@@ -468,7 +470,11 @@ private async void ChangeSettingsAction()
             }
             catch (Exception ex)
             {
-                await dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error") as string, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+                MetroDialogSettings settings = AppearanceManager.MetroDialog;
+
+                settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK");
+
+               await dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error") as string, ex.Message, MessageDialogStyle.Affirmative, settings);
             }
 
             LocationSelectedPath = string.Empty;