@jtff/miztemplate-lib 3.0.0-rc15 → 3.0.0-rc17

package/lib/jtff-lib-ci.js

@@ -59,7 +59,7 @@ class MizTemplateCI{
         return newVersionObject;
     }
 
-    getDestinationMizFilePaths() {
+    getDestinationMizFilePathArrayFromConfig() {
         const returnArray = this.config.missionTemplates.map(missionTemplate => {
             return this.config.general.missionFolder + '/'
                 + this.config.general.missionPrefix + '_'
@@ -70,6 +70,16 @@ class MizTemplateCI{
         return returnArray;
     }
 
+    getDestinationMizFilePathFromConfigMissionTemplate(missionTemplate) {
+        const destinationMizPath =  [this.config.general.missionFolder + '/',
+            this.config.general.missionPrefix + '_',
+            missionTemplate.theatre + '_',
+            this.config.general.missionSuffix.length > 0 ? this.config.general.missionSuffix + '_' : '',
+            this.config.general.missionVersion + '.miz'].join('')
+        ;
+        return destinationMizPath;
+    }
+
     getGeneratedMizFilePaths() {
         return fs.readdirSync(this.config.general.missionFolder + '/')
             .filter(file => file.endsWith((".miz")))
@@ -193,8 +203,8 @@ class MizTemplateCI{
         return {
             "general": {
                 "missionFolder": "dist",
-                "missionPrefix": filename,
-                "missionSuffix": "JTFF",
+                "missionPrefix": path.parse(filename).name,
+                "missionSuffix": "",
                 "missionVersion": "1.0.0-snapshot"
             },
             "google": {

package/lib/mizlib.js

@@ -107,16 +107,33 @@ class Mizlib {
         return MizFile.loadAsync(mizData);
     }
 
-    async buildMizFileFromMizTemplate(mizPath, copyPath) {
+    async buildMizFileFromMizTemplate(mizPath, copyPath, singleMission= true) {
         const zipObject = await this.getZipObjectFromMizPath(mizPath);
         const missionObject = await this.getMissionObjectFromZipObject(zipObject);
         const strTheatreSettings = missionObject.theatre;
-        // TODO: D'abord mettre à jour les fichiers src et lib depuis la miztemplate sauf 200-mission.lua
+        const srcFiles = fs.readdirSync("node_modules/@jtff/miztemplate-lib/lua/src",{recursive: true})
+            .filter(filename => path.extname(filename).toLowerCase()==='.lua' && !(filename.startsWith('200-')));
+        const libFiles = fs.readdirSync("node_modules/@jtff/miztemplate-lib/lua/lib",{recursive: true})
+            .filter(filename => path.extname(filename).toLowerCase()==='.lua');
+        for (let file of srcFiles) {
+            console.log('updating src/' + file + ' from the miztemplate-lib');
+            fs.cpSync('node_modules/@jtff/miztemplate-lib/lua/src/' + file,
+                'src/' + file,
+                {force: true}
+            );
+        }
+        for (let file of libFiles) {
+            console.log('updating lib/' + file + ' from the miztemplate-lib');
+            fs.cpSync('node_modules/@jtff/miztemplate-lib/lua/lib/' + file,
+                'lib/' + file,
+                {force: true}
+            );
+        }
         this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'src');
         this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'lib');
         await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
-        this.mizUpdateSettingsLuaFiles(zipObject, strTheatreSettings);
-        await this.mizUpdateSoundFolders(zipObject);
+        this.injectSettingsLuaFilesFromFolderIntoZipObject(zipObject, singleMission ? '' : strTheatreSettings);
+        await this.injectSoundFoldersIntoZipObject(zipObject);
         const inputZip = await zipObject.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
@@ -290,15 +307,14 @@ class Mizlib {
         this.mizUpdateMissionDataFile(zip, {mission: mission_object});
     }
 
-    mizUpdateSettingsLuaFiles(zip, strTheatre) {
-        for (let file of fs.readdirSync('settings/' + strTheatre).filter(file => file.endsWith(".lua"))) {
-            console.log('updating settings/' + strTheatre + '/' + file + ' file in miz file');
-            this.injectFileIntoZipObject(zip, 'settings/' + strTheatre + '/' + file);
+    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(''));
         }
-        ;
     }
 
-    async mizUpdateSoundFolders(zip) {
+    async injectSoundFoldersIntoZipObject(zip) {
         if (fs.existsSync('resources/sounds') && fs.lstatSync('resources/sounds').isDirectory()) {
             const folderArray = fs.readdirSync('resources/sounds');
             for (const folder of folderArray) {

package/package.json

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

package/scripts/build.js

@@ -6,32 +6,16 @@ function build(jtffci) {
         if (missionTemplate.filename) {
             await jtffci.mizlib.buildMizFileFromMizTemplate(
                 missionTemplate.filename,
-                [
-                    jtffci.config.general.missionFolder + '/' + jtffci.config.general.missionPrefix,
-                    '_',
-                    missionTemplate.theatre,
-                    '_',
-                    jtffci.config.general.missionSuffix,
-                    '_',
-                    jtffci.displayVersion(jtffci.getVersion()),
-                    ".miz"
-                ].join(""));
+                jtffci.getDestinationMizFilePathFromConfigMissionTemplate(missionTemplate),
+                (jtffci.config.missionTemplates.length > 1) ? false : true);
         } else {
             await jtffci.mizlib.buildMizFileFromMizTemplate([
-                missionTemplate.prefix,
-                '_',
-                missionTemplate.theatre,
-                ".miz"
-            ].join(""), [
-                jtffci.config.general.missionFolder + '/' + jtffci.config.general.missionPrefix,
-                '_',
-                missionTemplate.theatre,
-                '_',
-                jtffci.config.general.missionSuffix,
-                '_',
-                jtffci.displayVersion(jtffci.getVersion()),
-                ".miz"
-            ].join(""));
+                    [missionTemplate.prefix,
+                        missionTemplate.theatre].join('_'),
+                    ".miz"
+                ].join(""),
+                jtffci.getDestinationMizFilePathFromConfigMissionTemplate(missionTemplate),
+                false);
         }
         let publicationConfig = {
             theatre: missionTemplate.theatre,
@@ -49,7 +33,6 @@ function build(jtffci) {
         };
         fs.writeFileSync(jtffci.config.general.missionFolder + '/' + missionTemplate.theatre + '.pub.json', JSON.stringify(publicationConfig, null, 4));
     });
-
 }
 
-module.exports = build
+module.exports = build;