Added -includedir option to Pack step

Manually packs all files in a folder
ruarai · Jan 4, 2020 · 5e3cd30 · 5e3cd30
1 parent 4459c34
commit 5e3cd30
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/CompilePalX/Compilers/BSPPack/Pack.cs b/CompilePalX/Compilers/BSPPack/Pack.cs
@@ -37,6 +37,7 @@ public BSPPack()
         private static bool dryrun;
         private static bool renamenav;
         private static bool include;
+        private static bool includeDir;
         private static bool exclude;
         private static bool excludeDir;
         private static bool packvpk;
@@ -51,8 +52,9 @@ public override void Run(CompileContext context)
             verbose = GetParameterString().Contains("-verbose");
             dryrun = GetParameterString().Contains("-dryrun");
             renamenav = GetParameterString().Contains("-renamenav");
-            include = GetParameterString().Contains("-include");
-            exclude = GetParameterString().Contains("-exclude");
+            include = Regex.IsMatch(GetParameterString(), "^-include\b"); // ensures it doesnt match -includedir
+            includeDir = GetParameterString().Contains("-includedir");
+            exclude = Regex.IsMatch(GetParameterString(), "^-exclude\b"); // ensures it doesnt match -excludedir
             excludeDir = GetParameterString().Contains("-excludedir");
             packvpk = GetParameterString().Contains("-vpk");
 
@@ -100,6 +102,28 @@ public override void Run(CompileContext context)
                     }
                 }
 
+                // get manually included files in directories
+                if (includeDir)
+                {
+                    //Get included files from parameter list
+                    foreach (string parameter in parameters)
+                    {
+                        if (parameter.Contains("includedir"))
+                        {
+                            var folderPath = parameter.Replace("\"", "").Replace("includedir ", "").TrimEnd(' ');
+                            //Test that folder exists
+                            if (Directory.Exists(folderPath))
+                            {
+                                var files = Directory.GetFiles(folderPath, "*", SearchOption.AllDirectories);
+                                foreach (var file in files)
+                                    includeFiles.Add(file);
+                            }
+                            else
+                                CompilePalLogger.LogLineColor($"Could not find folder: {folderPath}", Error.GetSeverityBrush(2));
+                        }
+                    }
+                }
+
                 if (exclude)
                 {
                     //Get excluded files from parameter list

diff --git a/CompilePalX/Compilers/BSPPack/PakFile.cs b/CompilePalX/Compilers/BSPPack/PakFile.cs
@@ -164,7 +164,7 @@ public PakFile(BSP bsp, List<string> sourceDirectories, List<string> includeFile
 				// default base directory is the game folder
 		        string baseDir = GameConfigurationManager.GameConfiguration.GameFolder;
 
-		        var potentialSubDir = sourceDirs;
+		        var potentialSubDir = new List<string>(sourceDirs); // clone to prevent accidental modification
 				potentialSubDir.Remove(baseDir);
 		        foreach (var folder in potentialSubDir)
 		        {

diff --git a/CompilePalX/Parameters/PACK/parameters.json b/CompilePalX/Parameters/PACK/parameters.json
@@ -33,6 +33,17 @@
     "Warning": "",
     "CanBeUsedMoreThanOnce": true
   },
+  {
+    "Name": "Include Directory",
+    "Parameter": " -includedir",
+    "Description": "Packs all files in specified directory",
+    "Value": null,
+    "ValueIsFile": true,
+    "ValueIsFolder": true, 
+    "CanHaveValue": true,
+    "Warning": "",
+    "CanBeUsedMoreThanOnce": true
+  },
   {
     "Name": "Exclude",
     "Parameter": " -exclude",