0.17 update: Fixed hotpatch and scenario_loader

This commit is contained in:
Daniel Vestøl committed 2019-02-27 11:05:39 +01:00
1 parent 103409b0cd
commit c15709ddc1
3 files changed
+55 -30

No files matched your search

+2
View File
@@ -0,0 +1,2 @@
const fs = require("fs-extra");
const needle = require("needle");
@@ -382,7 +382,6 @@ debug_log({'hotpatch-info.loading-libs'})
local libraries = { local libraries = {
'camera', 'camera',
'flying_tags', 'flying_tags',
'inspect',
'math3d', 'math3d',
'mod-gui', 'mod-gui',
'noise', 'noise',
+53 -29
View File
@@ -11,35 +11,36 @@ module.exports = class remoteCommands {
let hotpatchInstallStatus = await this.checkHotpatchInstallation(); let hotpatchInstallStatus = await this.checkHotpatchInstallation();
messageInterface("Hotpach installation status: "+hotpatchInstallStatus); messageInterface("Hotpach installation status: "+hotpatchInstallStatus);
if(hotpatchInstallStatus){ if(hotpatchInstallStatus){
let scenarioDir = "scenarios"; await this.loadScenariosFromFolder("scenarios") // located in project root folder (with sharedMods, sharedPlugins etc)
await fs.ensureDir(scenarioDir) }
let scenarios = await fs.readdir(scenarioDir); })();
for(let i = 0; i < scenarios.length; i++){ }
messageInterface(`Loading scenario ${scenarios[i]}`) async loadScenariosFromFolder(scenarioDir){
let startTime = Date.now(); await fs.ensureDir(scenarioDir)
let scenPath = path.join(scenarioDir, scenarios[i]); let scenarios = await fs.readdir(scenarioDir);
let stat = await fs.stat(scenPath); for(let i = 0; i < scenarios.length; i++){
if(stat.isDirectory){ this.messageInterface(`Loading scenario ${scenarios[i]}`)
async function loadFiles(dir, rootdir){ let startTime = Date.now();
let returnFiles = []; let scenPath = path.join(scenarioDir, scenarios[i]);
let entries = await fs.readdir(path.join(rootdir, dir)); let stat = await fs.stat(scenPath);
for(let o = 0; o < entries.length; o++){ if(stat.isDirectory){
let stat = await fs.stat(path.join(rootdir, dir, entries[o])); async function loadFiles(dir, rootdir){
if(stat.isDirectory()){ let returnFiles = [];
// recurse let entries = await fs.readdir(path.join(rootdir, dir));
let subFolder = await loadFiles(path.join(dir, entries[o]), rootdir); for(let o = 0; o < entries.length; o++){
returnFiles = returnFiles.concat(subFolder); let stat = await fs.stat(path.join(rootdir, dir, entries[o]));
} else if(entries[o].split(".")[entries[o].split(".").length-1].toLowerCase() == "lua"){ if(stat.isDirectory()){
// if it is a Lua file, read its contents // recurse
// let data = await fs.readFile(path.join(rootdir, dir, entries[o])); let subFolder = await loadFiles(path.join(dir, entries[o]), rootdir);
let data = await clusterTools.getLua(path.join(rootdir, dir, entries[o]), false); returnFiles = returnFiles.concat(subFolder);
returnFiles.push({ } else if(entries[o].split(".")[entries[o].split(".").length-1].toLowerCase() == "lua"){
name: path.join(dir, entries[o].split(".")[0]), // if it is a Lua file, read its contents
data, // let data = await fs.readFile(path.join(rootdir, dir, entries[o]));
}); let data = await clusterTools.getLua(path.join(rootdir, dir, entries[o]), false);
} returnFiles.push({
} name: path.join(dir, entries[o].split(".")[0]),
return returnFiles; data,
});
} }
let fileMap = await loadFiles("", scenPath); let fileMap = await loadFiles("", scenPath);
let files = {}; let files = {};
@@ -61,6 +62,24 @@ module.exports = class remoteCommands {
messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`); messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`);
} }
} }
let fileMap = await loadFiles("", scenPath);
let files = {};
fileMap.forEach(map => {
files[map.name] = map.data;
console.log(map.name);
});
let fileImportString = `\{`;
for(let k in files){
let name = k.replace(/\\/g, '/');
name = name.replace(/ /g, '');
// make sure *not* to include control.lua as it is provided as a seperate argument
if(name != "control") fileImportString += `["${name}"] = '${files[k]}', `;
}
fileImportString += `\}`;
if(files.control) var returnValue = await this.messageInterface(`/silent-command remote.call('hotpatch', 'update', '${scenarios[i]}', '1.0.0', '${files.control}', ${fileImportString})`);
if(returnValue) this.messageInterface(returnValue);
this.messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`);
} }
})(); })();
} }
@@ -96,3 +115,8 @@ function readDirectorySynchronously(directory) {
} }
}); });
} }
class AsyncArray extends Array {
constructor(arr) {
super(arr)
this.data = arr; // In place of Array subclassing
}