@jtff/miztemplate-lib 3.0.0-rc22 → 3.0.0-rc24

package/lib/mizlib.js

@@ -108,7 +108,7 @@ class Mizlib {
         return MizFile.loadAsync(mizData);
     }
 
-    async buildMizFileFromMizTemplate(mizPath, copyPath, singleMission= true) {
+    async buildMizFileFromMizTemplate(mizPath, copyPath, mizSettingSubFolder= '') {
         const zipObject = await this.getZipObjectFromMizPath(mizPath);
         const missionObject = await this.getMissionObjectFromZipObject(zipObject);
         const strTheatreSettings = missionObject.theatre;
@@ -130,11 +130,11 @@ class Mizlib {
                 {force: true}
             );
         }
-        this.injectLuaFilesFromFolderIntoZipObject(zipObject, '.workspace/src');
-        this.injectLuaFilesFromFolderIntoZipObject(zipObject, '.workspace/lib');
-        this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'src');
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, '.workspace/src', mizSettingSubFolder);
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, '.workspace/lib', mizSettingSubFolder);
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, ['src',mizSettingSubFolder.length > 0 ? '/' + mizSettingSubFolder : ''].join(''), mizSettingSubFolder);
         await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
-        this.injectSettingsLuaFilesFromFolderIntoZipObject(zipObject, singleMission ? '' : strTheatreSettings);
+        this.injectSettingsLuaFilesFromFolderIntoZipObject(zipObject, mizSettingSubFolder.length > 0 ? mizSettingSubFolder : '');
         await this.injectSoundFoldersIntoZipObject(zipObject);
         const inputZip = await zipObject.generateAsync({
             type: 'nodebuffer',
@@ -236,9 +236,9 @@ class Mizlib {
         return zipStream.file("l10n/DEFAULT/mapResource").async("string");
     }
 
-    injectLuaFilesFromFolderIntoZipObject(zip, folderPath) {
+    injectLuaFilesFromFolderIntoZipObject(zip, folderPath, mizSettingSubFolder) {
         for (let file of fs.readdirSync(folderPath).filter(file => file.endsWith(".lua"))) {
-            console.log('injecting up2date ' + folderPath + '/' + file + ' file in archive');
+            console.log('injecting up2date ' + folderPath + '/' + file + ' file in ' + mizSettingSubFolder + ' archive');
             this.injectFileIntoZipObject(zip, folderPath + "/" + file);
         };
     }
@@ -308,19 +308,16 @@ class Mizlib {
         this.injectMissionObjectIntoZipObject(zip, {mission: mission_object});
     }
 
-    injectSettingsLuaFilesFromFolderIntoZipObject(zip, strTheatre) {
-        for (let file of fs.readdirSync(['settings',strTheatre.length > 0 ? '/' + strTheatre : ''].join('')).filter(file => path.extname(file).toLowerCase()==='.lua')) {
-            console.log(['updating settings',strTheatre.length > 0 ? '/' + strTheatre : '','/',file,' file in miz file'].join(''));
-            this.injectFileIntoZipObject(zip, ['settings',strTheatre.length > 0 ? '/' + strTheatre : '','/',file].join(''));
+    injectSettingsLuaFilesFromFolderIntoZipObject(zip, settingsSubFolder) {
+        for (let file of fs.readdirSync(['settings',settingsSubFolder.length > 0 ? '/' + settingsSubFolder : ''].join('')).filter(file => path.extname(file).toLowerCase()==='.lua')) {
+            console.log(['updating settings',settingsSubFolder.length > 0 ? '/' + settingsSubFolder : '','/',file,' file in miz file'].join(''));
+            this.injectFileIntoZipObject(zip, ['settings',settingsSubFolder.length > 0 ? '/' + settingsSubFolder : '','/',file].join(''));
         }
     }
 
     async injectSoundFoldersIntoZipObject(zip) {
         if (fs.existsSync('resources/sounds') && fs.lstatSync('resources/sounds').isDirectory()) {
-            const folderArray = fs.readdirSync('resources/sounds');
-            for (const folder of folderArray) {
-                await this.injectSingleSoundFolderIntoZipObject(zip, '.', folder, false);
-            }
+            await this.injectSingleSoundFolderIntoZipObject(zip, '.', 'resources/sounds', false);
         }
         if (fs.existsSync('.workspace/resources/sounds') && fs.lstatSync('.workspace/resources/sounds').isDirectory()) {
             const folderArray = fs.readdirSync('.workspace/resources/sounds');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc22",
+  "version": "3.0.0-rc24",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [

package/scripts/build.js

@@ -7,7 +7,7 @@ function build(jtffci) {
             await jtffci.mizlib.buildMizFileFromMizTemplate(
                 missionTemplate.filename,
                 jtffci.getDestinationMizFilePathFromConfigMissionTemplate(missionTemplate),
-                (jtffci.config.missionTemplates.length > 1) ? false : true);
+                (jtffci.config.missionTemplates.length > 1) ? missionTemplate.theatre : '');
         } else {
             await jtffci.mizlib.buildMizFileFromMizTemplate([
                     [missionTemplate.prefix,
@@ -15,7 +15,7 @@ function build(jtffci) {
                     ".miz"
                 ].join(""),
                 jtffci.getDestinationMizFilePathFromConfigMissionTemplate(missionTemplate),
-                false);
+                missionTemplate.theatre);
         }
         let publicationConfig = {
             theatre: missionTemplate.theatre,