server resources packaging

Author: gusxyz

Robust.Packaging/RobustClientPackaging.cs

@@ -35,29 +35,6 @@ public static async Task WriteClientResources(
             .ToHashSet();
 
         await RobustSharedPackaging.DoResourceCopy(Path.Combine(contentDir, "Resources"), pass, ignoreSet, cancel: cancel);
-
-        var manifestPath = Path.Combine(contentDir, "Resources", "manifest.yml");
-        var manifest = ResourceManifestData.LoadFromFile(manifestPath); // load from disk no VFS
-
-        if (manifest.ModularResources != null)
-        {
-            foreach (var (vfsPath,diskName) in manifest.ModularResources)
-            {
-                var modPath = Path.Combine(contentDir, diskName);
-                if (!Directory.Exists(modPath))
-                    continue;
-                var files = Directory.EnumerateFiles(modPath, "*", SearchOption.AllDirectories);
-                foreach (var file in files)
-                {
-                    var filename = Path.GetFileName(file);
-                    if (ignoreSet.Contains(filename)) continue;
-                    var relative = Path.GetRelativePath(modPath, file);
-                    var zipRoot = vfsPath.TrimStart('/');
-                    var targetPath = Path.Combine(zipRoot, relative).Replace('\\', '/');
-                    await using var stream = File.OpenRead(file);
-                    pass.InjectFileFromDisk(targetPath, file);
-                }
-            }
-        }
+        await RobustSharedPackaging.DoModularResourceCopy(contentDir, pass, ignoreSet);
     }
 }

Robust.Packaging/RobustServerPackaging.cs

@@ -40,5 +40,7 @@ await RobustSharedPackaging.DoResourceCopy(
             pass,
             ignoreSet,
             cancel: cancel);
+
+        await RobustSharedPackaging.DoModularResourceCopy(contentDir, pass, ignoreSet);
     }
 }

Robust.Packaging/RobustSharedPackaging.cs

@@ -1,4 +1,5 @@
 using Robust.Packaging.AssetProcessing;
+using Robust.Shared.ContentPack;
 
 namespace Robust.Packaging;
 
@@ -82,10 +83,37 @@ public static Task DoResourceCopy(
         return Task.CompletedTask;
     }
 
-    private static void CopyDirIntoZip(string directory, string basePath, AssetPass pass)
+    public static Task DoModularResourceCopy(string contentDir, AssetPass pass, HashSet<string> ignoreSet)
+    {
+        var manifestPath = Path.Combine(contentDir, "Resources", "manifest.yml");
+        var manifest = ResourceManifestData.LoadFromFile(manifestPath);
+        if (manifest.ModularResources == null) return Task.CompletedTask;
+
+        foreach (var (vfsPath, diskName) in manifest.ModularResources)
+        {
+            var modPath = Path.Combine(contentDir, diskName);
+            if (!Directory.Exists(modPath))
+                continue;
+
+            var zipRoot = vfsPath.TrimStart('/');
+            CopyDirIntoZip(modPath, zipRoot, pass, ignoreSet);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private static void CopyDirIntoZip(
+        string directory,
+        string basePath,
+        AssetPass pass,
+        IReadOnlySet<string>? ignoreSet = null)
     {
         foreach (var file in Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories))
         {
+            var filename = Path.GetFileName(file);
+            if (ignoreSet != null && ignoreSet.Contains(filename))
+                continue;
+
             var relPath = Path.GetRelativePath(directory, file);
             var zipPath = $"{basePath}/{relPath}";