@jtff/miztemplate-lib 3.0.0-rc10 → 3.0.0-rc3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +2 -2
- package/lib/jtff-lib-ci.js +1 -3
- package/lib/mizlib.js +2 -6
- package/package.json +1 -1
- package/scripts/build.js +2 -1
- package/scripts/inject-scripts.js +34 -33
- package/scripts/template-update.js +1 -1
package/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const MizTemplateCI = require("./lib/jtff-lib-ci.js");
|
|
2
|
-
const
|
|
2
|
+
const mizlib = require("./lib/mizlib.js");
|
|
3
3
|
const build = require("./scripts/build.js");
|
|
4
4
|
const clean = require("./scripts/clean.js");
|
|
5
5
|
const ftpupload = require("./scripts/ftpupload.js");
|
|
@@ -13,7 +13,6 @@ const templateUpdate = require("./scripts/template-update.js");
|
|
|
13
13
|
|
|
14
14
|
module.exports = {
|
|
15
15
|
MizTemplateCI: MizTemplateCI,
|
|
16
|
-
Mizlib: Mizlib,
|
|
17
16
|
build:build,
|
|
18
17
|
clean:clean,
|
|
19
18
|
ftpupload:ftpupload,
|
|
@@ -25,4 +24,5 @@ module.exports = {
|
|
|
25
24
|
nextversionPrepare:nextversionPrepare,
|
|
26
25
|
release:release,
|
|
27
26
|
templateUpdate:templateUpdate,
|
|
27
|
+
mizlib: mizlib,
|
|
28
28
|
};
|
package/lib/jtff-lib-ci.js
CHANGED
|
@@ -4,12 +4,10 @@ const fs = require("fs");
|
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const { google } = require("googleapis");
|
|
6
6
|
const ftpClient = require('ftp');
|
|
7
|
-
const Mizlib = require("./mizlib");
|
|
8
7
|
|
|
9
8
|
class MizTemplateCI{
|
|
10
9
|
constructor(config) {
|
|
11
|
-
this.config = config
|
|
12
|
-
this.mizlib = new Mizlib();
|
|
10
|
+
this.config = config
|
|
13
11
|
}
|
|
14
12
|
|
|
15
13
|
getVersion() {
|
package/lib/mizlib.js
CHANGED
|
@@ -7,11 +7,7 @@ const {promisify} = require("util");
|
|
|
7
7
|
const fs = require("fs");
|
|
8
8
|
const lstat = promisify(fs.lstat);
|
|
9
9
|
|
|
10
|
-
class
|
|
11
|
-
constructor() {
|
|
12
|
-
// no need for initialization
|
|
13
|
-
}
|
|
14
|
-
|
|
10
|
+
class mizlib {
|
|
15
11
|
injectLuaScriptsInMissionObject(tObject, trObject, mrObject, strTitle, scriptFilesArray, timingInSeconds, hexColor) {
|
|
16
12
|
let nextIndex = Object.keys(trObject).length + 1;
|
|
17
13
|
if (nextIndex === 1) {
|
|
@@ -318,4 +314,4 @@ class Mizlib {
|
|
|
318
314
|
}
|
|
319
315
|
}
|
|
320
316
|
|
|
321
|
-
module.exports =
|
|
317
|
+
module.exports = mizlib;
|
package/package.json
CHANGED
package/scripts/build.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
const fs = require("fs");
|
|
2
|
+
const mizlib = require("./lib/mizlib.js");
|
|
2
3
|
|
|
3
4
|
function build(jtffci) {
|
|
4
5
|
fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
|
|
5
6
|
jtffci.config.missionTemplates.forEach(async missionTemplate => {
|
|
6
|
-
await
|
|
7
|
+
await mizlib.mizUpdate([
|
|
7
8
|
missionTemplate.prefix,
|
|
8
9
|
'_',
|
|
9
10
|
missionTemplate.theatre,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
2
|
const path = require("path");
|
|
3
3
|
const prompt = require('prompt');
|
|
4
|
+
const mizlib = require("./lib/mizlib.js");
|
|
4
5
|
|
|
5
6
|
function injectScripts(jtffci, env_mission) {
|
|
6
7
|
// create mission folder in dist (general) folder
|
|
@@ -120,13 +121,13 @@ function injectScripts(jtffci, env_mission) {
|
|
|
120
121
|
console.log(' inject_radio_presets scripts: ' + (/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_radio_presets));
|
|
121
122
|
|
|
122
123
|
// open the miz input file for reading
|
|
123
|
-
const mizObject = await
|
|
124
|
+
const mizObject = await mizlib.getZipObjectFromMizPath(env_mission);
|
|
124
125
|
// inject all the lua files in the src folder into the source zip object
|
|
125
|
-
|
|
126
|
+
mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "src");
|
|
126
127
|
// inject all the lua files in the lib folder into the source zip object
|
|
127
|
-
|
|
128
|
+
mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "lib");
|
|
128
129
|
// injection des fichiers son Généraux si repertoire resources/sounds/General present
|
|
129
|
-
await
|
|
130
|
+
await mizlib.mizUpdateSingleSoundFolder(mizObject, 'General');
|
|
130
131
|
// On fait une sauvegarde dans le folder de destination
|
|
131
132
|
// fs.writeFileSync([
|
|
132
133
|
// jtffci.config.general.missionFolder,
|
|
@@ -145,7 +146,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
145
146
|
// })
|
|
146
147
|
// );
|
|
147
148
|
// injection des fichiers son Misc si repertoire resources/sounds/Misc present
|
|
148
|
-
await
|
|
149
|
+
await mizlib.mizUpdateSingleSoundFolder(mizObject, 'Misc');
|
|
149
150
|
// On fait une sauvegarde dans le folder de destination
|
|
150
151
|
// fs.writeFileSync([
|
|
151
152
|
// jtffci.config.general.missionFolder,
|
|
@@ -163,8 +164,8 @@ function injectScripts(jtffci, env_mission) {
|
|
|
163
164
|
// }
|
|
164
165
|
// })
|
|
165
166
|
// );
|
|
166
|
-
const missionObject = await
|
|
167
|
-
let mapResourceObject = await
|
|
167
|
+
const missionObject = await mizlib.getMissionObjectFromZipObject(mizObject);
|
|
168
|
+
let mapResourceObject = await mizlib.getMapResourceObjectFromZipObject(mizObject);
|
|
168
169
|
let settingsArray = [];
|
|
169
170
|
if (Array.isArray(mapResourceObject)) {
|
|
170
171
|
if (mapResourceObject.length === 0) {
|
|
@@ -172,7 +173,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
// injection SplashDamage
|
|
175
|
-
let tuple =
|
|
176
|
+
let tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
176
177
|
missionObject['trig'],
|
|
177
178
|
missionObject['trigrules'],
|
|
178
179
|
mapResourceObject,
|
|
@@ -185,7 +186,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
185
186
|
missionObject['trigrules'] = tuple.trObject;
|
|
186
187
|
mapResourceObject = tuple.mrObject;
|
|
187
188
|
// injection Moose
|
|
188
|
-
tuple =
|
|
189
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
189
190
|
missionObject['trig'],
|
|
190
191
|
missionObject['trigrules'],
|
|
191
192
|
mapResourceObject,
|
|
@@ -198,7 +199,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
198
199
|
missionObject['trigrules'] = tuple.trObject;
|
|
199
200
|
mapResourceObject = tuple.mrObject;
|
|
200
201
|
// injection Mist
|
|
201
|
-
tuple =
|
|
202
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
202
203
|
missionObject['trig'],
|
|
203
204
|
missionObject['trigrules'],
|
|
204
205
|
mapResourceObject,
|
|
@@ -211,7 +212,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
211
212
|
missionObject['trigrules'] = tuple.trObject;
|
|
212
213
|
mapResourceObject = tuple.mrObject;
|
|
213
214
|
// injection Skynet
|
|
214
|
-
tuple =
|
|
215
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
215
216
|
missionObject['trig'],
|
|
216
217
|
missionObject['trigrules'],
|
|
217
218
|
mapResourceObject,
|
|
@@ -232,7 +233,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
232
233
|
file: "settings-global.lua",
|
|
233
234
|
},
|
|
234
235
|
);
|
|
235
|
-
tuple =
|
|
236
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
236
237
|
missionObject['trig'],
|
|
237
238
|
missionObject['trigrules'],
|
|
238
239
|
mapResourceObject,
|
|
@@ -246,7 +247,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
246
247
|
mapResourceObject = tuple.mrObject;
|
|
247
248
|
|
|
248
249
|
// injection de la gestion des Set_Clients
|
|
249
|
-
tuple =
|
|
250
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
250
251
|
missionObject['trig'],
|
|
251
252
|
missionObject['trigrules'],
|
|
252
253
|
mapResourceObject,
|
|
@@ -270,7 +271,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
270
271
|
objectName: "OnDemandTankersConfig"
|
|
271
272
|
},
|
|
272
273
|
);
|
|
273
|
-
tuple =
|
|
274
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
274
275
|
missionObject['trig'],
|
|
275
276
|
missionObject['trigrules'],
|
|
276
277
|
mapResourceObject,
|
|
@@ -285,7 +286,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
285
286
|
}
|
|
286
287
|
if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_airboss)) {
|
|
287
288
|
// injection des fichiers son Airboss
|
|
288
|
-
// await
|
|
289
|
+
// await mizlib.mizUpdateSingleSoundFolder(mizObject, 'AIRBOSS');
|
|
289
290
|
settingsArray.push(
|
|
290
291
|
{
|
|
291
292
|
file: "settings-airboss.lua",
|
|
@@ -296,7 +297,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
296
297
|
objectName: "PedrosConfig"
|
|
297
298
|
},
|
|
298
299
|
);
|
|
299
|
-
tuple =
|
|
300
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
300
301
|
missionObject['trig'],
|
|
301
302
|
missionObject['trigrules'],
|
|
302
303
|
mapResourceObject,
|
|
@@ -316,7 +317,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
316
317
|
objectName: "BeaconsConfig"
|
|
317
318
|
},
|
|
318
319
|
);
|
|
319
|
-
tuple =
|
|
320
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
320
321
|
missionObject['trig'],
|
|
321
322
|
missionObject['trigrules'],
|
|
322
323
|
mapResourceObject,
|
|
@@ -340,7 +341,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
340
341
|
objectName: "AwacsOnDemandConfig"
|
|
341
342
|
},
|
|
342
343
|
);
|
|
343
|
-
tuple =
|
|
344
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
344
345
|
missionObject['trig'],
|
|
345
346
|
missionObject['trigrules'],
|
|
346
347
|
mapResourceObject,
|
|
@@ -355,14 +356,14 @@ function injectScripts(jtffci, env_mission) {
|
|
|
355
356
|
}
|
|
356
357
|
if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_atis)) {
|
|
357
358
|
// injection des fichiers son ATIS
|
|
358
|
-
// await
|
|
359
|
+
// await mizlib.mizUpdateSingleSoundFolder(mizObject, 'ATIS');
|
|
359
360
|
settingsArray.push(
|
|
360
361
|
{
|
|
361
362
|
file: "settings-atis.lua",
|
|
362
363
|
objectName: "AtisConfig"
|
|
363
364
|
},
|
|
364
365
|
);
|
|
365
|
-
tuple =
|
|
366
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
366
367
|
missionObject['trig'],
|
|
367
368
|
missionObject['trigrules'],
|
|
368
369
|
mapResourceObject,
|
|
@@ -398,7 +399,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
398
399
|
objectName: "InterceptConfig"
|
|
399
400
|
},
|
|
400
401
|
);
|
|
401
|
-
tuple =
|
|
402
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
402
403
|
missionObject['trig'],
|
|
403
404
|
missionObject['trigrules'],
|
|
404
405
|
mapResourceObject,
|
|
@@ -413,14 +414,14 @@ function injectScripts(jtffci, env_mission) {
|
|
|
413
414
|
}
|
|
414
415
|
if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_Logistics)) {
|
|
415
416
|
// injection des fichiers son CTLD
|
|
416
|
-
await
|
|
417
|
+
await mizlib.mizUpdateSingleSoundFolder(mizObject, 'CTLD');
|
|
417
418
|
settingsArray.push(
|
|
418
419
|
{
|
|
419
420
|
file: "settings-logistics.lua",
|
|
420
421
|
objectName: "CTLDConfig"
|
|
421
422
|
},
|
|
422
423
|
);
|
|
423
|
-
tuple =
|
|
424
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
424
425
|
missionObject['trig'],
|
|
425
426
|
missionObject['trigrules'],
|
|
426
427
|
mapResourceObject,
|
|
@@ -435,7 +436,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
435
436
|
}
|
|
436
437
|
if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_A2G)) {
|
|
437
438
|
// injection des fichiers son Range
|
|
438
|
-
// await
|
|
439
|
+
// await mizlib.mizUpdateSingleSoundFolder(mizObject, 'RANGE');
|
|
439
440
|
settingsArray.push(
|
|
440
441
|
{
|
|
441
442
|
file: "settings-ranges.lua",
|
|
@@ -462,7 +463,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
462
463
|
objectName: "SkynetConfig"
|
|
463
464
|
},
|
|
464
465
|
);
|
|
465
|
-
tuple =
|
|
466
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
466
467
|
missionObject['trig'],
|
|
467
468
|
missionObject['trigrules'],
|
|
468
469
|
mapResourceObject,
|
|
@@ -484,7 +485,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
484
485
|
// "/src/200-mission.lua"
|
|
485
486
|
// ].join("")
|
|
486
487
|
// );
|
|
487
|
-
// const zip = await
|
|
488
|
+
// const zip = await mizlib.getZipObjectFromMizPath([
|
|
488
489
|
// jtffci.config.general.missionFolder,
|
|
489
490
|
// "/",
|
|
490
491
|
// path.parse(env_mission).name,
|
|
@@ -492,7 +493,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
492
493
|
// path.basename(env_mission)
|
|
493
494
|
// ].join(""));
|
|
494
495
|
//
|
|
495
|
-
//
|
|
496
|
+
// mizlib.injectFileIntoZipObject(zip, [
|
|
496
497
|
// jtffci.config.general.missionFolder,
|
|
497
498
|
// "/",
|
|
498
499
|
// path.parse(env_mission).name,
|
|
@@ -515,7 +516,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
515
516
|
// path.basename(env_mission)
|
|
516
517
|
// ].join(""),
|
|
517
518
|
// inputZip);
|
|
518
|
-
tuple =
|
|
519
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
519
520
|
missionObject['trig'],
|
|
520
521
|
missionObject['trigrules'],
|
|
521
522
|
mapResourceObject,
|
|
@@ -537,7 +538,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
537
538
|
"/",
|
|
538
539
|
path.basename(env_mission)
|
|
539
540
|
].join("") + ": injecting radio presets declared in resources/radios/" + path.parse(env_mission).name);
|
|
540
|
-
await
|
|
541
|
+
await mizlib.mizUpdateRadioPresets(mizObject, 'resources/radios/' + path.parse(env_mission).name);
|
|
541
542
|
}
|
|
542
543
|
//injection du trigger des settings
|
|
543
544
|
for (let settingsObject of settingsArray) {
|
|
@@ -555,7 +556,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
555
556
|
].join("")
|
|
556
557
|
);
|
|
557
558
|
}
|
|
558
|
-
await
|
|
559
|
+
await mizlib.injectLuaSettingsFromFolderPathToZipObject(mizObject,
|
|
559
560
|
[
|
|
560
561
|
jtffci.config.general.missionFolder,
|
|
561
562
|
"/",
|
|
@@ -564,7 +565,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
564
565
|
].join("")
|
|
565
566
|
);
|
|
566
567
|
if (settingsArray.length > 0) {
|
|
567
|
-
tuple =
|
|
568
|
+
tuple = mizlib.injectLuaScriptsInMissionObject(
|
|
568
569
|
missionObject['trig'],
|
|
569
570
|
missionObject['trigrules'],
|
|
570
571
|
mapResourceObject,
|
|
@@ -578,7 +579,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
578
579
|
mapResourceObject = tuple.mrObject;
|
|
579
580
|
}
|
|
580
581
|
// Sauvegarde de la mission avec scripts injectés
|
|
581
|
-
await
|
|
582
|
+
await mizlib.mizInjectMissionDataFile(
|
|
582
583
|
[
|
|
583
584
|
jtffci.config.general.missionFolder,
|
|
584
585
|
"/",
|
|
@@ -588,7 +589,7 @@ function injectScripts(jtffci, env_mission) {
|
|
|
588
589
|
].join(""),
|
|
589
590
|
{ mission: missionObject }
|
|
590
591
|
);
|
|
591
|
-
await
|
|
592
|
+
await mizlib.mizInjectMapResourceFile(
|
|
592
593
|
[
|
|
593
594
|
jtffci.config.general.missionFolder,
|
|
594
595
|
"/",
|
|
@@ -3,7 +3,7 @@ const fs = require("fs");
|
|
|
3
3
|
function templateUpdate(jtffci) {
|
|
4
4
|
fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
|
|
5
5
|
jtffci.config.missionTemplates.map(async missionTemplate => {
|
|
6
|
-
await
|
|
6
|
+
await mizlib.mizUpdate([
|
|
7
7
|
missionTemplate.prefix,
|
|
8
8
|
'_',
|
|
9
9
|
missionTemplate.theatre,
|