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

Fix mod list failing to load if mods directory has non-mod dlls

Browse source
This commit is contained in:
Nikolay Kuznetsov 2021-05-17 23:16:09 +02:00
parent 3a9b80afdb
commit 9d453e7419
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
VRCMelonAssistant/Pages/Mods.xaml.cs
View file

@ -18,6 +18,7 @@ using System.Windows.Navigation;
using Mono.Cecil;
using VRCMelonAssistant.Libs;
using static VRCMelonAssistant.Http;
using MessageBox = System.Windows.MessageBox;
using TextBox = System.Windows.Controls.TextBox;
namespace VRCMelonAssistant.Pages
@ -220,12 +221,37 @@ namespace VRCMelonAssistant.Pages
private (string ModName, string ModVersion) ExtractModVersions(string dllPath)
{
using var asmdef = AssemblyDefinition.ReadAssembly(dllPath);
foreach (var attr in asmdef.CustomAttributes)
if (attr.AttributeType.Name == "MelonInfoAttribute" || attr.AttributeType.Name == "MelonModInfoAttribute")
return ((string) attr.ConstructorArguments[1].Value, (string) attr.ConstructorArguments[2].Value);
try
{
using var asmdef = AssemblyDefinition.ReadAssembly(dllPath);
foreach (var attr in asmdef.CustomAttributes)
if (attr.AttributeType.Name == "MelonInfoAttribute" ||
attr.AttributeType.Name == "MelonModInfoAttribute")
return ((string) attr.ConstructorArguments[1].Value,
(string) attr.ConstructorArguments[2].Value);
return (null, null);
return (null, null);
}
catch (Exception ex)
{
var result = MessageBox.Show(
$"A mod in {Path.GetFileName(dllPath)} is invalid. Would you like to delete it to avoid this error in the future?",
"Invalid mod", MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (result == MessageBoxResult.Yes)
{
try
{
File.Delete(dllPath);
}
catch (Exception ex2)
{
Utils.ShowErrorMessageBox($"Unable to delete file {dllPath}", ex2);
}
}
return (null, null);
}
}
public async Task PopulateModsList()