@jtff/miztemplate-lib 3.0.0-rc23 → 3.0.0-rc25

package/lib/jtff-lib-ci.js

@@ -5,6 +5,7 @@ const path = require("path");
 const { google } = require("googleapis");
 const ftpClient = require('ftp');
 const Mizlib = require("./mizlib");
+const { getInstalledPathSync } = require('get-installed-path')
 
 class MizTemplateCI{
     constructor(config) {
@@ -249,7 +250,7 @@ class MizTemplateCI{
     }
 
     async InjectCiScriptsIntoWorkspace(workspacePath) {
-        fs.cpSync('node_modules/@jtff/miztemplate-lib/ci',workspacePath + '/.workspace/src/nodejs',{recursive: true});
+        fs.cpSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/ci',workspacePath + '/.workspace/src/nodejs',{recursive: true});
     }
 
     async deployCIScriptsFromZipObjectIntoWorkspace(workspacePath, mizObject, mizFilePath) {

package/lib/mizlib.js

@@ -5,6 +5,7 @@ const path = require("path");
 const {format, parse} = require("lua-json");
 const {promisify} = require("util");
 const fs = require("fs");
+const {getInstalledPathSync} = require("get-installed-path");
 const lstat = promisify(fs.lstat);
 
 class Mizlib {
@@ -42,7 +43,8 @@ class Mizlib {
         for (let luaScript of luaScriptsArray) {
             fs.cpSync(
                 [
-                    'node_modules/@jtff/miztemplate-lib/lua/',
+                    getInstalledPathSync('@jtff/miztemplate-lib'),
+                    '/lua/',
                     folderPath,
                     '/',
                     luaScript
@@ -108,33 +110,33 @@ 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;
-        const srcFiles = fs.readdirSync("node_modules/@jtff/miztemplate-lib/lua/src",{recursive: true})
+        const srcFiles = fs.readdirSync(getInstalledPathSync('@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})
+        const libFiles = fs.readdirSync(getInstalledPathSync('@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,
+            fs.cpSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/lua/src/' + file,
                 '.workspace/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,
+            fs.cpSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/lua/lib/' + file,
                 '.workspace/lib/' + file,
                 {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 +238,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,10 +310,10 @@ 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(''));
         }
     }
 
@@ -349,14 +351,14 @@ class Mizlib {
             ].join(""), {recursive: true});
         }
         if (
-            fs.existsSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString) &&
-            fs.lstatSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString).isDirectory()) {
+            fs.existsSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/resources/sounds/' + folderString) &&
+            fs.lstatSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/resources/sounds/' + folderString).isDirectory()) {
             fs.mkdirSync([
                 workspacePath,
                 "/.workspace/resources/sounds/",
                 folderString
             ].join(""), {recursive: true});
-            fs.cpSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString,[
+            fs.cpSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/resources/sounds/' + folderString,[
                 workspacePath,
                 "/.workspace/resources/sounds/",
                 folderString

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc23",
+  "version": "3.0.0-rc25",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [
@@ -32,6 +32,7 @@
   "homepage": "https://github.com/JTFF-mission-scripts/miztemplate-lib#readme",
   "dependencies": {
     "ftp": "^0.3.10",
+    "get-installed-path": "^4.0.8",
     "googleapis": "^92.0.0",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",

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,

package/scripts/inject-scripts.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require("path");
 const prompt = require('prompt');
 let _ = require('lodash');
+const {getInstalledPathSync} = require("get-installed-path");
 
 function injectScripts(jtffci, env_mission) {
     const workspacePath = [
@@ -472,7 +473,7 @@ function injectScripts(jtffci, env_mission) {
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_radio_presets)) {
             // injection des preset radio
             fs.mkdirSync(workspacePath + '/resources/radios/' + missionObject.theatre,{recursive: true});
-            fs.cpSync('node_modules/@jtff/miztemplate-lib/resources/radios/' + missionObject.theatre,workspacePath + '/resources/radios/' + missionObject.theatre,{recursive: true})
+            fs.cpSync(getInstalledPathSync('@jtff/miztemplate-lib') + '/resources/radios/' + missionObject.theatre,workspacePath + '/resources/radios/' + missionObject.theatre,{recursive: true})
             console.log(destinationMizFilePath + ": injecting radio presets declared in resources/radios/" + missionObject.theatre);
             await jtffci.mizlib.injectRadioPresetsFromFolderIntoZipObject(mizObject, workspacePath + '/resources/radios/' + missionObject.theatre);
         }

package/scripts/template-update.js

@@ -3,43 +3,61 @@ const fs = require("fs");
 function templateUpdate(jtffci) {
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     jtffci.config.missionTemplates.map(async missionTemplate => {
-        await this.mizlib.buildMizFileFromMizTemplate([
-            missionTemplate.prefix,
-            '_',
-            missionTemplate.theatre,
-            ".miz"
-        ].join(""), [
-            missionTemplate.prefix,
-            '_',
-            missionTemplate.theatre,
-            "-new.miz"
-        ].join(""), missionTemplate.theatre);
-        if (fs.existsSync([
-            missionTemplate.prefix,
-            '_',
-            missionTemplate.theatre,
-            ".miz"
-        ].join(""))) {
-            fs.unlinkSync([
+        if (missionTemplate.filename) {
+            await jtffci.mizlib.buildMizFileFromMizTemplate(
+                missionTemplate.filename,
+                [ missionTemplate.filename,
+                    "-new.miz"
+                ].join(""),
+                (jtffci.config.missionTemplates.length > 1) ? missionTemplate.theatre : '');
+            if (fs.existsSync(missionTemplate.filename)) {
+                fs.unlinkSync(missionTemplate.filename);
+            }
+            fs.renameSync(
+                [ missionTemplate.filename,
+                    "-new.miz"
+                ].join(""),
+                missionTemplate.filename);
+        } else {
+            await this.mizlib.buildMizFileFromMizTemplate(
+                [ missionTemplate.prefix,
+                    '_',
+                    missionTemplate.theatre,
+                    ".miz"
+                ].join(""),
+                [ missionTemplate.prefix,
+                    '_',
+                    missionTemplate.theatre,
+                    "-new.miz"
+                ].join(""),
+                missionTemplate.theatre);
+            if (fs.existsSync([
                 missionTemplate.prefix,
                 '_',
                 missionTemplate.theatre,
                 ".miz"
-            ].join(""));
+            ].join(""))) {
+                fs.unlinkSync([
+                    missionTemplate.prefix,
+                    '_',
+                    missionTemplate.theatre,
+                    ".miz"
+                ].join(""));
+            }
+            fs.renameSync([
+                    missionTemplate.prefix,
+                    '_',
+                    missionTemplate.theatre,
+                    "-new.miz"
+                ].join(""),
+                [
+                    missionTemplate.prefix,
+                    '_',
+                    missionTemplate.theatre,
+                    ".miz"
+                ].join("")
+            );
         }
-        fs.renameSync([
-                missionTemplate.prefix,
-                '_',
-                missionTemplate.theatre,
-                "-new.miz"
-            ].join(""),
-            [
-                missionTemplate.prefix,
-                '_',
-                missionTemplate.theatre,
-                ".miz"
-            ].join("")
-        );
     });
 }