Some oversights regarding bsmg#344 and bsmg#346

Meivyn · Dec 2, 2021 · 44d47e5 · 44d47e5
1 parent c0abb58
commit 44d47e5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs
@@ -60,7 +60,7 @@ private static async Task<BeatSaverMap> GetMap(string id, string type, bool show
                     map.response = beatsaver;
                     if (type == "hash")
                     {
-                        map.HashToDownload = id.ToLower();
+                        map.HashToDownload = id.ToLowerInvariant();
                     }
                     else
                     {

diff --git a/ModAssistant/Classes/Themes.cs b/ModAssistant/Classes/Themes.cs
@@ -81,7 +81,7 @@ public static void LoadThemes()
                     FileInfo info = new FileInfo(file);
                     string name = Path.GetFileNameWithoutExtension(info.Name);
 
-                    if (info.Extension.ToLower().Equals(".mat"))
+                    if (info.Extension.ToLowerInvariant().Equals(".mat"))
                     {
                         Theme theme = LoadZipTheme(ThemeDirectory, name, ".mat");
                         if (theme is null) continue;

diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs
@@ -436,7 +436,7 @@ public static void Log(string message, string severity = "LOG")
         {
             string path = Path.GetDirectoryName(ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath);
             string logFile = $"{path}{Path.DirectorySeparatorChar}log.log";
-            File.AppendAllText(logFile, $"[{DateTime.UtcNow:yyyy-mm-dd HH:mm:ss.ffffff}][{severity.ToUpper()}] {message}\n");
+            File.AppendAllText(logFile, $"[{DateTime.UtcNow:yyyy-mm-dd HH:mm:ss.ffffff}][{severity.ToUpperInvariant()}] {message}\n");
         }
 
         public static async Task<string> Download(string link, string folder, string output, bool preferContentDisposition = false)

diff --git a/ModAssistant/Pages/Mods.xaml.cs b/ModAssistant/Pages/Mods.xaml.cs
@@ -28,7 +28,7 @@ public sealed partial class Mods : Page
         public Mod[] ModsList;
         public Mod[] AllModsList;
         public static List<Mod> InstalledMods = new List<Mod>();
-        public static List<Mod> LibsToMatch = new List<Mod>();
+        public static List<Mod> ManifestsToMatch = new List<Mod>();
         public List<string> CategoryNames = new List<string>();
         public CollectionView view;
         public bool PendingChanges;
@@ -178,22 +178,25 @@ private void CheckInstallDir(string directory)
             {
                 string fileExtension = Path.GetExtension(file);
 
-                if (File.Exists(file) && (fileExtension == ".dll" || fileExtension == ".manifest"))
+                if (File.Exists(file) && (fileExtension == ".dll" || fileExtension == ".exe" || fileExtension == ".manifest"))
                 {
                     Mod mod = GetModFromHash(Utils.CalculateMD5(file));
                     if (mod != null)
                     {
                         if (fileExtension == ".manifest")
                         {
-                            LibsToMatch.Add(mod);
+                            ManifestsToMatch.Add(mod);
                         }
                         else
                         {
                             if (directory.Contains("Libs"))
                             {
-                                if (!LibsToMatch.Contains(mod)) continue;
+                                if (!ManifestsToMatch.Contains(mod))
+                                {
+                                    continue;
+                                }
 
-                                LibsToMatch.Remove(mod);
+                                ManifestsToMatch.Remove(mod);
                             }
 
                             AddDetectedMod(mod);

diff --git a/ModAssistant/Pages/Options.xaml.cs b/ModAssistant/Pages/Options.xaml.cs
@@ -278,7 +278,7 @@ private async void YeetBSIPAButton_Click(object sender, RoutedEventArgs e)
             }
             foreach (Mod mod in Mods.InstalledMods)
             {
-                if (mod.name.ToLower() == "bsipa")
+                if (mod.name.ToLowerInvariant() == "bsipa")
                 {
                     Mods.Instance.UninstallMod(mod);
                     break;