ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create newly added mods in import folder instead of moving them.

Browse source
This commit is contained in:
Ottermandias 2024-07-21 00:48:48 +02:00
parent 5b1c0cf0e3
commit c3b7ddad28
3 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit 89b3b9513f9b4989045517a452ef971e24377203 Subproject commit dc17161b1d9c47ffd6bcc17e91f4832cf7762993

21
Penumbra/Mods/Manager/ModFileSystem.cs
View file

@ -1,3 +1,5 @@
using Dalamud.Interface.ImGuiNotification;
using OtterGui.Classes;
using OtterGui.Filesystem; using OtterGui.Filesystem;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.Communication; using Penumbra.Communication;
@ -10,13 +12,15 @@ public sealed class ModFileSystem : FileSystem<Mod>, IDisposable, ISavable, ISer
private readonly ModManager _modManager; private readonly ModManager _modManager;
private readonly CommunicatorService _communicator; private readonly CommunicatorService _communicator;
private readonly SaveService _saveService; private readonly SaveService _saveService;
private readonly Configuration _config;
// Create a new ModFileSystem from the currently loaded mods and the current sort order file. // Create a new ModFileSystem from the currently loaded mods and the current sort order file.
public ModFileSystem(ModManager modManager, CommunicatorService communicator, SaveService saveService) public ModFileSystem(ModManager modManager, CommunicatorService communicator, SaveService saveService, Configuration config)
{ {
_modManager = modManager; _modManager = modManager;
_communicator = communicator; _communicator = communicator;
_saveService = saveService; _saveService = saveService;
_config = config;
Reload(); Reload();
Changed += OnChange; Changed += OnChange;
_communicator.ModDiscoveryFinished.Subscribe(Reload, ModDiscoveryFinished.Priority.ModFileSystem); _communicator.ModDiscoveryFinished.Subscribe(Reload, ModDiscoveryFinished.Priority.ModFileSystem);
@ -91,7 +95,20 @@ public sealed class ModFileSystem : FileSystem<Mod>, IDisposable, ISavable, ISer
switch (type) switch (type)
{ {
case ModPathChangeType.Added: case ModPathChangeType.Added:
CreateDuplicateLeaf(Root, mod.Name.Text, mod); var parent = Root;
if (_config.DefaultImportFolder.Length != 0)
try
{
parent = FindOrCreateAllFolders(_config.DefaultImportFolder);
}
catch (Exception e)
{
Penumbra.Messager.NotificationMessage(e,
$"Could not move newly imported mod {mod.Name} to default import folder {_config.DefaultImportFolder}.",
NotificationType.Warning);
}
CreateDuplicateLeaf(parent, mod.Name.Text, mod);
break; break;
case ModPathChangeType.Deleted: case ModPathChangeType.Deleted:
if (FindLeaf(mod, out var leaf)) if (FindLeaf(mod, out var leaf))

31
Penumbra/UI/ModsTab/ModFileSystemSelector.cs
View file

@ -196,10 +196,7 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
} }
while (_modImportManager.AddUnpackedMod(out var mod)) while (_modImportManager.AddUnpackedMod(out var mod))
{
MoveModToDefaultDirectory(mod);
SelectByValue(mod); SelectByValue(mod);
}
} }
protected override void DrawLeafName(FileSystem<Mod>.Leaf leaf, in ModState state, bool selected) protected override void DrawLeafName(FileSystem<Mod>.Leaf leaf, in ModState state, bool selected)
@ -379,34 +376,6 @@ public sealed class ModFileSystemSelector : FileSystemSelector<Mod, ModFileSyste
_collectionManager.Editor.SetMultipleModStates(_collectionManager.Active.Current, mods, enabled); _collectionManager.Editor.SetMultipleModStates(_collectionManager.Active.Current, mods, enabled);
} }
/// <summary>
/// If a default import folder is setup, try to move the given mod in there.
/// If the folder does not exist, create it if possible.
/// </summary>
/// <param name="mod"></param>
private void MoveModToDefaultDirectory(Mod mod)
{
if (_config.DefaultImportFolder.Length == 0)
return;
try
{
var leaf = FileSystem.Root.GetChildren(ISortMode<Mod>.Lexicographical)
.FirstOrDefault(f => f is FileSystem<Mod>.Leaf l && l.Value == mod);
if (leaf == null)
throw new Exception("Mod was not found at root.");
var folder = FileSystem.FindOrCreateAllFolders(_config.DefaultImportFolder);
FileSystem.Move(leaf, folder);
}
catch (Exception e)
{
_messager.NotificationMessage(e,
$"Could not move newly imported mod {mod.Name} to default import folder {_config.DefaultImportFolder}.",
NotificationType.Warning);
}
}
private void DrawHelpPopup() private void DrawHelpPopup()
{ {
ImGuiUtil.HelpPopup("ExtendedHelp", new Vector2(1000 * UiHelpers.Scale, 38.5f * ImGui.GetTextLineHeightWithSpacing()), () => ImGuiUtil.HelpPopup("ExtendedHelp", new Vector2(1000 * UiHelpers.Scale, 38.5f * ImGui.GetTextLineHeightWithSpacing()), () =>