ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-01-01 13:23:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some issues with glamourer not searching mods by name.

Browse source
This commit is contained in:
Ottermandias 2025-05-06 00:30:47 +02:00
parent b1abbb8e77
commit c1e1476fa6
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Glamourer/Interop/Penumbra/PenumbraService.cs
View file

@ -172,14 +172,14 @@ public class PenumbraService : IDisposable
if (_queryTemporaryModSettings != null) if (_queryTemporaryModSettings != null)
{ {
var tempEc = _queryTemporaryModSettings.Invoke(collection, modDirectory, out var tempTuple, out source); var tempEc = _queryTemporaryModSettings.Invoke(collection, modDirectory, out var tempTuple, out source, 0, modName);
if (tempEc is PenumbraApiEc.Success && tempTuple != null) if (tempEc is PenumbraApiEc.Success && tempTuple != null)
return new ModSettings(tempTuple.Value.Settings, tempTuple.Value.Priority, tempTuple.Value.Enabled, return new ModSettings(tempTuple.Value.Settings, tempTuple.Value.Priority, tempTuple.Value.Enabled,
tempTuple.Value.ForceInherit, false); tempTuple.Value.ForceInherit, false);
} }
source = string.Empty; source = string.Empty;
var (ec2, tuple2) = _getCurrentSettings!.Invoke(collection, modDirectory); var (ec2, tuple2) = _getCurrentSettings!.Invoke(collection, modDirectory, modName);
if (ec2 is not PenumbraApiEc.Success) if (ec2 is not PenumbraApiEc.Success)
return ModSettings.Empty; return ModSettings.Empty;
@ -265,7 +265,7 @@ public class PenumbraService : IDisposable
if (!Available) if (!Available)
return; return;
if (_openModPage!.Invoke(TabType.Mods, mod.DirectoryName) == PenumbraApiEc.ModMissing) if (_openModPage!.Invoke(TabType.Mods, mod.DirectoryName, mod.Name) == PenumbraApiEc.ModMissing)
Glamourer.Messager.NotificationMessage($"Could not open the mod {mod.Name}, no fitting mod was found in your Penumbra install.", Glamourer.Messager.NotificationMessage($"Could not open the mod {mod.Name}, no fitting mod was found in your Penumbra install.",
NotificationType.Info, false); NotificationType.Info, false);
} }
@ -349,14 +349,14 @@ public class PenumbraService : IDisposable
var ex = settings.Remove var ex = settings.Remove
? index.HasValue ? index.HasValue
? _removeTemporaryModSettingsPlayer!.Invoke(index.Value.Index, mod.DirectoryName, key) ? _removeTemporaryModSettingsPlayer!.Invoke(index.Value.Index, mod.DirectoryName, key, mod.Name)
: _removeTemporaryModSettings!.Invoke(collection, mod.DirectoryName, key) : _removeTemporaryModSettings!.Invoke(collection, mod.DirectoryName, key, mod.Name)
: index.HasValue : index.HasValue
? _setTemporaryModSettingsPlayer!.Invoke(index.Value.Index, mod.DirectoryName, settings.ForceInherit, settings.Enabled, ? _setTemporaryModSettingsPlayer!.Invoke(index.Value.Index, mod.DirectoryName, settings.ForceInherit, settings.Enabled,
settings.Priority, settings.Priority,
settings.Settings.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<string>)kvp.Value), name, key) settings.Settings.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<string>)kvp.Value), name, key, mod.Name)
: _setTemporaryModSettings!.Invoke(collection, mod.DirectoryName, settings.ForceInherit, settings.Enabled, settings.Priority, : _setTemporaryModSettings!.Invoke(collection, mod.DirectoryName, settings.ForceInherit, settings.Enabled, settings.Priority,
settings.Settings.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<string>)kvp.Value), name, key); settings.Settings.ToDictionary(kvp => kvp.Key, kvp => (IReadOnlyList<string>)kvp.Value), name, key, mod.Name);
switch (ex) switch (ex)
{ {
case PenumbraApiEc.InvalidArgument: case PenumbraApiEc.InvalidArgument:
@ -384,8 +384,8 @@ public class PenumbraService : IDisposable
private void SetModPermanent(StringBuilder sb, Mod mod, ModSettings settings, Guid collection) private void SetModPermanent(StringBuilder sb, Mod mod, ModSettings settings, Guid collection)
{ {
var ec = settings.ForceInherit var ec = settings.ForceInherit
? _inheritMod!.Invoke(collection, mod.DirectoryName, true) ? _inheritMod!.Invoke(collection, mod.DirectoryName, true, mod.Name)
: _setMod!.Invoke(collection, mod.DirectoryName, settings.Enabled); : _setMod!.Invoke(collection, mod.DirectoryName, settings.Enabled, mod.Name);
switch (ec) switch (ec)
{ {
case PenumbraApiEc.ModMissing: case PenumbraApiEc.ModMissing:
@ -399,14 +399,14 @@ public class PenumbraService : IDisposable
if (settings.ForceInherit || !settings.Enabled) if (settings.ForceInherit || !settings.Enabled)
return; return;
ec = _setModPriority!.Invoke(collection, mod.DirectoryName, settings.Priority); ec = _setModPriority!.Invoke(collection, mod.DirectoryName, settings.Priority, mod.Name);
Debug.Assert(ec is PenumbraApiEc.Success or PenumbraApiEc.NothingChanged, "Setting Priority should not be able to fail."); Debug.Assert(ec is PenumbraApiEc.Success or PenumbraApiEc.NothingChanged, "Setting Priority should not be able to fail.");
foreach (var (setting, list) in settings.Settings) foreach (var (setting, list) in settings.Settings)
{ {
ec = list.Count == 1 ec = list.Count == 1
? _setModSetting!.Invoke(collection, mod.DirectoryName, setting, list[0]) ? _setModSetting!.Invoke(collection, mod.DirectoryName, setting, list[0], mod.Name)
: _setModSettings!.Invoke(collection, mod.DirectoryName, setting, list); : _setModSettings!.Invoke(collection, mod.DirectoryName, setting, list, mod.Name);
switch (ec) switch (ec)
{ {
case PenumbraApiEc.OptionGroupMissing: sb.AppendLine($"Could not find the option group {setting} in mod {mod.Name}."); break; case PenumbraApiEc.OptionGroupMissing: sb.AppendLine($"Could not find the option group {setting} in mod {mod.Name}."); break;