Refactor/mods

src/GIMI-ModManager.Core/Contracts/Entities/ICharacterModList.cs

@@ -28,7 +28,7 @@ public interface ICharacterModList
     /// Remove a mod from the mod list. Stops tracking the mod.
     /// </summary>
     /// <param name="mod"></param>
-    internal void UnTrackMod(IMod mod);
+    internal void UnTrackMod(ISkinMod mod);
 
     /// <summary>
     /// Enable a mod. This enables the mod.
@@ -40,9 +40,8 @@ public interface ICharacterModList
     /// </summary>
     public void DisableMod(Guid modId);
 
-    public bool IsModEnabled(IMod mod);
+    public bool IsModEnabled(ISkinMod mod);
 
-    public void SetCustomModName(Guid modId, string newName);
 
     public bool IsMultipleModsActive(bool perSkin = false);
 
@@ -66,9 +65,7 @@ public interface ICharacterModList
     public bool FolderAlreadyExists(string folderName);
 
     /// <summary>
-    /// Permanently deletes a mod from the mod list. This deletes entire mod from the mod folder.
+    /// Deletes a mod from the mod list. This deletes entire mod from the mod folder.
     /// </summary>
-    public void DeleteMod(Guid modId, bool moveToRecycleBin = true);
-
     public void DeleteModBySkinEntryId(Guid skinEntryId, bool moveToRecycleBin = true);
 }

src/GIMI-ModManager.Core/Contracts/Entities/IMod.cs

@@ -1,6 +1,4 @@
-using GIMI_ModManager.Core.Entities;
-
-namespace GIMI_ModManager.Core.Contracts.Entities;
+namespace GIMI_ModManager.Core.Contracts.Entities;
 
 /// <summary>
 /// The Idea behind this interface was that mods might not be folders but could also be archives or some other format
@@ -22,17 +20,6 @@ public interface IMod : IEqualityComparer<IMod>
     /// </summary>
     public string OnlyPath { get; }
 
-    /// <summary>
-    /// Custom name of the mod.
-    /// </summary>
-    public string CustomName { get; }
-
-    /// <summary>
-    /// Set the custom name of the mod.
-    /// </summary>
-    /// <param name="customName"></param>
-    public void SetCustomName(string customName);
-
     /// <summary>
     /// Move the mod to the specified folder. This does not change the folder name.
     /// If the drive is different, the mod will be copied and then deleted.
@@ -42,6 +29,7 @@ public interface IMod : IEqualityComparer<IMod>
     /// This needs to be an absolute path to the folder you want to move the mod to.
     /// </param>
     public void MoveTo(string absPath);
+
     /// <summary>
     /// Copies the mod to the specified folder. This does not change the folder name.
     /// </summary>
@@ -60,12 +48,12 @@ public interface IMod : IEqualityComparer<IMod>
     public bool Exists();
 
     public bool IsEmpty();
+
     /// <summary>
     /// This uses the contents of the mods to compare them
     /// </summary>
     /// <returns></returns>
     public bool DeepEquals(IMod? x, IMod? y);
-
-    public byte[] GetContentsHash();
 
+    public byte[] GetContentsHash();
 }

src/GIMI-ModManager.Core/Contracts/Entities/ISkinMod.cs

@@ -1,25 +1,14 @@
-using GIMI_ModManager.Core.Entities;
+using GIMI_ModManager.Core.Entities.Mods.SkinMod;
 
 namespace GIMI_ModManager.Core.Contracts.Entities;
 
 public interface ISkinMod : IMod, IEqualityComparer<ISkinMod>
 {
-    public IReadOnlyCollection<string> ImagePaths { get; } // Support multiple images at some point ???
-    public SkinModSettings? CachedSkinModSettings { get; }
-    public IReadOnlyCollection<SkinModKeySwap>? CachedKeySwaps { get; }
+    Guid Id { get; }
     public bool HasMergedInI { get; }
-
     public void ClearCache();
+    public SkinModSettingsManager Settings { get; }
+    public SkinModKeySwapManager? KeySwaps { get; }
 
-    public Task<IReadOnlyCollection<SkinModKeySwap>> ReadKeySwapConfiguration(bool forceReload = false,
-        CancellationToken cancellationToken = default);
-
-    public Task SaveKeySwapConfiguration(ICollection<SkinModKeySwap> updatedKeySwaps,
-        CancellationToken cancellationToken = default);
-
-
-    public Task<SkinModSettings> ReadSkinModSettings(bool forceReload = false, CancellationToken cancellationToken = default);
-
-    public Task SaveSkinModSettings(SkinModSettings skinModSettings,
-        CancellationToken cancellationToken = default);
+    public bool ContainsOnlyJasmFiles();
 }

src/GIMI-ModManager.Core/Contracts/Services/ISkinManagerService.cs

@@ -1,6 +1,8 @@
 using GIMI_ModManager.Core.Contracts.Entities;
 using GIMI_ModManager.Core.Entities.Genshin;
 using GIMI_ModManager.Core.Services;
+using OneOf;
+using OneOf.Types;
 
 namespace GIMI_ModManager.Core.Contracts.Services;
 
@@ -19,15 +21,18 @@ public Task Initialize(string activeModsFolderPath, string? unloadedModsFolderPa
     /// 
     /// </summary>
     /// <param name="characterFolderToReorganize">If null, reorganize all mods outside of characters mod folders</param>
+    /// <param name="disableMods">If true will also disable the mods</param>
     /// <returns>Mods moved</returns>
-    public int ReorganizeMods(GenshinCharacter? characterFolderToReorganize = null);
+    public Task<int> ReorganizeModsAsync(GenshinCharacter? characterFolderToReorganize = null,
+        bool disableMods = false);
 
     /// <summary>
     /// This looks for mods in characters mod folder that are not tracked by the mod manager and adds them to the mod manager.
     /// </summary>
     public Task<RefreshResult> RefreshModsAsync(GenshinCharacter? refreshForCharacter = null);
 
-    public Task TransferMods(ICharacterModList source, ICharacterModList destination, IEnumerable<Guid> modsEntryIds);
+    public Task<OneOf<Success, Error<string>[]>> TransferMods(ICharacterModList source, ICharacterModList destination,
+        IEnumerable<Guid> modsEntryIds);
 
     public Task<string> GetCurrentSwapVariationAsync(Guid characterSkinEntryId);
 
@@ -46,6 +51,8 @@ public void ExportMods(ICollection<ICharacterModList> characterModLists, string
         SetModStatus setModStatus = SetModStatus.KeepCurrent);
 
     public event EventHandler<ExportProgress>? ModExportProgress;
+
+    public ISkinMod? GetModById(Guid id);
 }
 
 public enum SetModStatus
@@ -58,16 +65,19 @@ public enum SetModStatus
 public readonly struct RefreshResult
 {
     public RefreshResult(IReadOnlyCollection<string> modsUntracked, IReadOnlyCollection<ISkinMod> modsTracked,
-        IReadOnlyCollection<DuplicateMods> modsDuplicate)
+        IReadOnlyCollection<DuplicateMods> modsDuplicate, IReadOnlyCollection<string> errors)
     {
         ModsUntracked = modsUntracked;
         ModsTracked = modsTracked;
         ModsDuplicate = modsDuplicate;
+        Errors = errors;
     }
 
     public IReadOnlyCollection<string> ModsUntracked { get; }
     public IReadOnlyCollection<ISkinMod> ModsTracked { get; }
 
+    public IReadOnlyCollection<string> Errors { get; }
+
     public IReadOnlyCollection<DuplicateMods> ModsDuplicate { get; }
 
     public readonly struct DuplicateMods