Merge pull request #488 from Kevga/version-fix

Filter out new version suffix

Author: Assistant

ModAssistant/Classes/Utils.cs

@@ -275,7 +275,11 @@ public static string GetVersion()
                 var strlen = reader.ReadInt32();
                 var strbytes = reader.ReadBytes(strlen);
 
-                return Encoding.UTF8.GetString(strbytes);
+                var version = Encoding.UTF8.GetString(strbytes);
+
+                //There is one version ending in "p1" on BeatMods
+                var filteredVersionMatch = Regex.Match(version, @"[\d]+.[\d]+.[\d]+(p1)?");
+                return filteredVersionMatch.Success ? filteredVersionMatch.Value : version;
             }
         }
 

ModAssistant/MainWindow.xaml.cs

@@ -122,9 +122,16 @@ private async void LoadVersionsAsync()
                 body = await resp.Content.ReadAsStringAsync();
                 Dictionary<string, string[]> aliases = JsonSerializer.Deserialize<Dictionary<string, string[]>>(body);
 
+                string version = Utils.GetVersion();
+                if (!versions.Contains(version) && CheckAliases(versions, aliases, version) == string.Empty)
+                {
+                    versions.Insert(0, version);
+                }
+
+
                 Dispatcher.Invoke(() =>
                 {
-                    GameVersion = GetGameVersion(versions, aliases);
+                    GameVersion = GetGameVersion(version, versions, aliases);
 
                     GameVersionsBox.ItemsSource = versions;
                     GameVersionsBox.SelectedValue = GameVersion;
@@ -157,9 +164,8 @@ private async void LoadVersionsAsync()
             }
         }
 
-        private string GetGameVersion(List<string> versions, Dictionary<string, string[]> aliases)
+        private string GetGameVersion(string version, List<string> versions, Dictionary<string, string[]> aliases)
         {
-            string version = Utils.GetVersion();
             if (!string.IsNullOrEmpty(version) && versions.Contains(version))
             {
                 return version;