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

Make reinstall functional

Browse source
This commit is contained in:
Megalon 2020-05-08 23:23:04 -07:00
parent e69ab66062
commit 49e8c04441
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ModAssistant/MainWindow.xaml
View file

@ -226,8 +226,8 @@
Width="15" Width="15"
Height="40" Height="40"
HorizontalAlignment="Right" > HorizontalAlignment="Right" >
<MenuItem Header="^" Height="40"> <MenuItem Header="V" Height="40">
<MenuItem Header="Reinstall All" Click="ReinstallAllButton_Click"/> <MenuItem Header="Reinstall and Update" Click="ReinstallAllButton_Click"/>
</MenuItem> </MenuItem>
</Menu> </Menu>
</StackPanel> </StackPanel>

4
ModAssistant/MainWindow.xaml.cs
View file

@ -254,7 +254,7 @@ namespace ModAssistant
private void InstallButton_Click(object sender, RoutedEventArgs e) private void InstallButton_Click(object sender, RoutedEventArgs e)
{ {
Mods.Instance.InstallMods(); Mods.Instance.InstallMods(false);
} }
private void InfoButton_Click(object sender, RoutedEventArgs e) private void InfoButton_Click(object sender, RoutedEventArgs e)
@ -322,7 +322,7 @@ namespace ModAssistant
private void ReinstallAllButton_Click(object sender, RoutedEventArgs e) private void ReinstallAllButton_Click(object sender, RoutedEventArgs e)
{ {
Mods.Instance.InstallMods(true);
} }
} }
} }

14
ModAssistant/Pages/Mods.xaml.cs
View file

@ -309,7 +309,7 @@ namespace ModAssistant.Pages
} }
} }
public async void InstallMods() public async void InstallMods(bool reinstallInstalledMods)
{ {
MainWindow.Instance.InstallButton.IsEnabled = false; MainWindow.Instance.InstallButton.IsEnabled = false;
string installDirectory = App.BeatSaberInstallDirectory; string installDirectory = App.BeatSaberInstallDirectory;
@ -317,7 +317,10 @@ namespace ModAssistant.Pages
foreach (Mod mod in ModsList) foreach (Mod mod in ModsList)
{ {
// Ignore mods that are newer than installed version // Ignore mods that are newer than installed version
if (mod.ListItem.IsNewerVersionInstalled) continue; if (mod.ListItem.GetVersionComparison > 0) continue;
// Ignore mods that are on current version if we aren't reinstalling mods
if (mod.ListItem.GetVersionComparison == 0 && !reinstallInstalledMods) continue;
if (mod.name.ToLower() == "bsipa") if (mod.name.ToLower() == "bsipa")
{ {
@ -573,12 +576,13 @@ namespace ModAssistant.Pages
} }
} }
public bool IsNewerVersionInstalled public int GetVersionComparison
{ {
get get
{ {
if (!IsInstalled) return false; if (!IsInstalled || _installedVersion < ModVersion) return -1;
return _installedVersion > ModVersion; if (_installedVersion > ModVersion) return 1;
return 0;
} }
} }