Don't allow invalid characters for profiles and mods

X-Hax · Dec 16, 2024 · b2c0e00 · b2c0e00
1 parent 81d4537
commit b2c0e00
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/SA-Mod-Manager/GamesInstall.cs b/SA-Mod-Manager/GamesInstall.cs
@@ -234,8 +234,7 @@ public static async Task<bool> UpdateLoader(Game game, string dlLink)
                 dl.StartDL();
                 if (success)
                 {
-                    List<string> excludeFile = new();
-                    excludeFile.Add("extlib");
+                    List<string> excludeFile = ["extlib"];
                     await Util.ExtractWExcludeFile(pathFinal, game.modDirectory, excludeFile);
                     await Util.ExtractSpecificFile(pathFinal, "extlib", App.ConfigFolder);
                     File.Copy(App.CurrentGame.loader.loaderdllpath, App.CurrentGame.loader.dataDllPath, true);

diff --git a/SA-Mod-Manager/ModsCommon/EditMod.xaml.cs b/SA-Mod-Manager/ModsCommon/EditMod.xaml.cs
@@ -123,6 +123,7 @@ private void okBtn_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
+
             SaveMod(moddir);
             ((MainWindow)Application.Current.MainWindow).Save();
             ((MainWindow)Application.Current.MainWindow).Refresh();
@@ -143,15 +144,18 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
         #region Properties Tab Functions
         private void nameBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
-            if (Util.IsStringValid(nameBox.Text))
+            if (Util.IsStringValid(nameBox.Text) && Util.IsValidFileName(nameBox.Text))
             {
                 modIDBox.Text = GenerateModID().Replace(" ", "");
 
                 if (editMod == false)
                     folderName = Path.Combine(App.CurrentGame.modDirectory, nameBox.Text);
+
+                UIHelper.EnableButton(ref okBtn);
             }
             else
             {
+                UIHelper.DisableButton(ref okBtn);
                 modIDBox.Text = string.Empty;
             }
         }

diff --git a/SA-Mod-Manager/Profile/EditProfile.xaml.cs b/SA-Mod-Manager/Profile/EditProfile.xaml.cs
@@ -141,7 +141,7 @@ private void UI_Cancel_Click(object sender, RoutedEventArgs e)
 
         private void ProfileNameTextbox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
-            if (( string.IsNullOrWhiteSpace(ProfileNameTextbox.Text) == false) && (ProfileNameTextbox.Text.Length > 1))
+            if (( string.IsNullOrWhiteSpace(ProfileNameTextbox.Text) == false) && (ProfileNameTextbox.Text.Length > 1) && Util.IsValidFileName(ProfileNameTextbox.Text))
              {
                 UIHelper.EnableButton(ref btnOK);
             }

diff --git a/SA-Mod-Manager/Util.cs b/SA-Mod-Manager/Util.cs
@@ -794,6 +794,22 @@ public static bool IsStringValid(string str)
             return !string.IsNullOrEmpty(str) && !string.IsNullOrWhiteSpace(str);
         }
 
+        public static bool IsValidFileName(string filename)
+        {
+
+            char[] invalidChars = Path.GetInvalidFileNameChars();
+
+            // Check if the filename contains any invalid characters eg ?, " etc.
+            foreach (char c in invalidChars)
+            {
+                if (filename.Contains(c))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
 
 
     }