diff --git a/ModAssistant/Classes/External Interfaces/BeatSaver.cs b/ModAssistant/Classes/External Interfaces/BeatSaver.cs index 58b562da..8bfad402 100644 --- a/ModAssistant/Classes/External Interfaces/BeatSaver.cs +++ b/ModAssistant/Classes/External Interfaces/BeatSaver.cs @@ -72,7 +72,7 @@ private static async Task 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 index a861e3e3..db4a63b6 100644 --- 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) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index ef72dd56..2120a8ad 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -465,7 +465,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 Download(string link, string folder, string output, bool preferContentDisposition = false) diff --git a/ModAssistant/Pages/Mods.xaml.cs b/ModAssistant/Pages/Mods.xaml.cs index bbb7c7f6..0020e86c 100644 --- a/ModAssistant/Pages/Mods.xaml.cs +++ b/ModAssistant/Pages/Mods.xaml.cs @@ -29,7 +29,7 @@ public sealed partial class Mods : Page public Mod[] ModsList; public Mod[] AllModsList; public static List InstalledMods = new List(); - public static List LibsToMatch = new List(); + public static List ManifestsToMatch = new List(); public List CategoryNames = new List(); public CollectionView view; public bool PendingChanges; @@ -186,25 +186,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)) + 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 index 84d023ec..a9f03fd3 100644 --- a/ModAssistant/Pages/Options.xaml.cs +++ b/ModAssistant/Pages/Options.xaml.cs @@ -279,7 +279,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;