CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-05-18 03:12:18 +12:00
Code Issues Projects Releases Wiki Activity

minor cleanup to alias resolution

Browse source
This commit is contained in:
Jack Baron 2020-10-25 01:11:52 +01:00
parent 1c8ae4e604
commit 223da16d7f
No known key found for this signature in database
GPG key ID: CD10BCEEC646C064
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ModAssistant/MainWindow.xaml.cs
View file

@ -120,11 +120,11 @@ namespace ModAssistant
resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias);
body = await resp.Content.ReadAsStringAsync();
object jsonObject = JsonSerializer.DeserializeObject(body);
Dictionary<string, string[]> aliases = JsonSerializer.Deserialize<Dictionary<string, string[]>>(body);
Dispatcher.Invoke(() =>
{
GameVersion = GetGameVersion(versions, jsonObject);
GameVersion = GetGameVersion(versions, aliases);
GameVersionsBox.ItemsSource = versions;
GameVersionsBox.SelectedValue = GameVersion;
@ -157,7 +157,7 @@ namespace ModAssistant
}
}
private string GetGameVersion(List<string> versions, object aliases)
private string GetGameVersion(List<string> versions, Dictionary<string, string[]> aliases)
{
string version = Utils.GetVersion();
if (!string.IsNullOrEmpty(version) && versions.Contains(version))
@ -190,25 +190,21 @@ namespace ModAssistant
return versions[0];
}
private string CheckAliases(List<string> versions, object aliases, string detectedVersion)
private string CheckAliases(List<string> versions, Dictionary<string, string[]> aliasesDict, string detectedVersion)
{
Dictionary<string, object> Objects = (Dictionary<string, object>)aliases;
Dictionary<string, List<string>> aliases = aliasesDict.ToDictionary(x => x.Key, x => x.Value.ToList());
foreach (string version in versions)
{
object x;
if (Objects.TryGetValue(version, out x))
if (aliases.TryGetValue(version, out var x))
{
object[] aliasArray = (object[])x;
foreach (object alias in aliasArray)
if (x.Contains(detectedVersion))
{
if (alias.ToString() == detectedVersion)
{
GameVersionOverride = detectedVersion;
return version;
}
GameVersionOverride = detectedVersion;
return version;
}
}
}
return string.Empty;
}