Show custom bootfiles in mod list (#109)

OpenSimTools · Feb 24, 2024 · 7058b94 · 7058b94
1 parent 128f7d7
commit 7058b94
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/src/Core/IModFactory.cs b/src/Core/IModFactory.cs
@@ -4,6 +4,6 @@ namespace Core;
 
 public interface IModFactory
 {
-    IMod ManualInstallMod(string packageName, string extractedPath);
+    IMod ManualInstallMod(string packageName, int packageFsHash, string extractedPath);
     IMod GeneratedBootfiles(string generationBasePath);
 }
diff --git a/src/Core/ModFactory.cs b/src/Core/ModFactory.cs
@@ -18,8 +18,8 @@ public ModFactory(IConfig config, IGame game)
         this.game = game;
     }
 
-    public IMod ManualInstallMod(string packageName, string extractedPath) =>
-        new ManualInstallMod(packageName, extractedPath, config);
+    public IMod ManualInstallMod(string packageName, int packageFsHash, string extractedPath) =>
+        new ManualInstallMod(packageName, packageFsHash, extractedPath, config);
 
     public IMod GeneratedBootfiles(string generationBasePath) =>
         new GeneratedBootfiles(game.InstallationDirectory, generationBasePath);

diff --git a/src/Core/ModManager.cs b/src/Core/ModManager.cs
@@ -69,9 +69,9 @@ public List<ModState> FetchState()
         });
 
         var allPackageNames = installedMods.Keys
+            .Where(_ => !IsBootFiles(_))
             .Concat(enabledModPackages.Keys)
             .Concat(disabledModPackages.Keys)
-            .Where(_ => !IsBootFiles(_))
             .Distinct();
 
         return allPackageNames
@@ -297,7 +297,7 @@ private void InstallAllModFiles(CancellationToken cancellationToken)
                     finally
                     {
                         installedFilesByMod.Add(mod.PackageName, new(
-                            FsHash: modPackage.FsHash,
+                            FsHash: mod.PackageFsHash,
                             Partial: mod.Installed == IMod.InstalledState.PartiallyInstalled,
                             Files: mod.InstalledFiles
                         ));
@@ -324,7 +324,7 @@ private void InstallAllModFiles(CancellationToken cancellationToken)
                     finally
                     {
                         installedFilesByMod.Add(bootfilesMod.PackageName, new(
-                            FsHash: null,
+                            FsHash: bootfilesMod.PackageFsHash,
                             Partial: bootfilesMod.Installed == IMod.InstalledState.PartiallyInstalled || !postProcessingDone,
                             Files: bootfilesMod.InstalledFiles
                         ));
@@ -361,7 +361,7 @@ private IMod ExtractMod(ModPackage modPackage)
         using var extractor = new SevenZipExtractor(modPackage.FullPath);
         extractor.ExtractArchive(extractionDir);
 
-        return modFactory.ManualInstallMod(modPackage.PackageName, extractionDir);
+        return modFactory.ManualInstallMod(modPackage.PackageName, modPackage.FsHash, extractionDir);
     }
 
     private IMod BootfilesMod()

diff --git a/src/Core/Mods/ExtractedMod.cs b/src/Core/Mods/ExtractedMod.cs
@@ -5,9 +5,10 @@ public abstract class ExtractedMod : IMod
     protected readonly string extractedPath;
     protected readonly List<string> installedFiles = new();
 
-    internal ExtractedMod(string packageName, string extractedPath)
+    internal ExtractedMod(string packageName, int? packageFsHash, string extractedPath)
     {
         PackageName = packageName;
+        PackageFsHash = packageFsHash;
         this.extractedPath = extractedPath;
     }
 
@@ -16,6 +17,11 @@ public string PackageName
         get;
     }
 
+    public int? PackageFsHash
+    {
+        get;
+    }
+
     public IMod.InstalledState Installed
     {
         get;

diff --git a/src/Core/Mods/GeneratedBootfiles.cs b/src/Core/Mods/GeneratedBootfiles.cs
@@ -16,7 +16,7 @@ internal class GeneratedBootfiles : ExtractedMod
         Path.Combine("vehicles", "_data", "effects", "backfire", "*.bmt");
 
     public GeneratedBootfiles(string gamePath, string generationBasePath)
-        : base(VirtualPackageName, Path.Combine(generationBasePath, VirtualPackageName))
+        : base(VirtualPackageName, null, Path.Combine(generationBasePath, VirtualPackageName))
     {
         pakPath = Path.Combine(gamePath, PakfilesDirectory);
         GenerateBootfiles();

diff --git a/src/Core/Mods/IMod.cs b/src/Core/Mods/IMod.cs
@@ -5,6 +5,7 @@ public interface IMod
     string PackageName { get; }
     InstalledState Installed { get; }
     IReadOnlyCollection<string> InstalledFiles { get; }
+    int? PackageFsHash { get; }
 
     ConfigEntries Install(string dstPath, JsgmeFileInstaller.BeforeFileCallback beforeFileCallback);
 

diff --git a/src/Core/Mods/ManualInstallMod.cs b/src/Core/Mods/ManualInstallMod.cs
@@ -17,8 +17,8 @@ public interface IConfig
     private readonly Matcher filesToConfigureMatcher;
     private readonly List<string> dirsAtRootLowerCase;
 
-    internal ManualInstallMod(string packageName, string extractedPath, IConfig config)
-        : base(packageName, extractedPath)
+    internal ManualInstallMod(string packageName, int packageFsHash, string extractedPath, IConfig config)
+        : base(packageName, packageFsHash, extractedPath)
     {
         dirsAtRootLowerCase = config.DirsAtRoot.Select(dir => dir.ToLowerInvariant()).ToList();
         filesToInstallMatcher = MatcherExcluding(config.ExcludedFromInstall);