kopia lustrzana https://github.com/OpenDroneMap/NodeODM
commit
18256788fc
|
@ -117,7 +117,7 @@ config.maxConcurrency = parseInt(argv.max_concurrency || fromConfigFile("maxConc
|
||||||
config.maxRuntime = parseInt(argv.max_runtime || fromConfigFile("maxRuntime", -1));
|
config.maxRuntime = parseInt(argv.max_runtime || fromConfigFile("maxRuntime", -1));
|
||||||
|
|
||||||
// Detect 7z availability
|
// Detect 7z availability
|
||||||
// const childProcess = spawnSync("7z", ['--help']);
|
const childProcess = spawnSync("7z", ['--help']);
|
||||||
config.has7z = false; //childProcess.status === 0;
|
config.has7z = childProcess.status === 0;
|
||||||
|
|
||||||
module.exports = config;
|
module.exports = config;
|
||||||
|
|
6
index.js
6
index.js
|
@ -901,9 +901,9 @@ if (config.test) {
|
||||||
if (config.testDropUploads) logger.info("Uploads will drop at random");
|
if (config.testDropUploads) logger.info("Uploads will drop at random");
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (!config.has7z){
|
if (!config.has7z){
|
||||||
// logger.warn("The 7z program is not installed, falling back to legacy (zipping will be slower)");
|
logger.warn("The 7z program is not installed, falling back to legacy (zipping will be slower)");
|
||||||
// }
|
}
|
||||||
|
|
||||||
let commands = [
|
let commands = [
|
||||||
cb => odmInfo.initialize(cb),
|
cb => odmInfo.initialize(cb),
|
||||||
|
|
|
@ -76,6 +76,9 @@ function makeRunner(command, args, requiredOptions = [], outputTestFile = null,
|
||||||
if (outputReceived !== undefined){
|
if (outputReceived !== undefined){
|
||||||
childProcess.stdout.on('data', chunk => outputReceived(chunk.toString()));
|
childProcess.stdout.on('data', chunk => outputReceived(chunk.toString()));
|
||||||
childProcess.stderr.on('data', chunk => outputReceived(chunk.toString()));
|
childProcess.stderr.on('data', chunk => outputReceived(chunk.toString()));
|
||||||
|
}else{
|
||||||
|
childProcess.stdout.on('data', () => {});
|
||||||
|
childProcess.stderr.on('data', () => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
return childProcess;
|
return childProcess;
|
||||||
|
@ -90,7 +93,7 @@ module.exports = {
|
||||||
["projectFolderPath"]),
|
["projectFolderPath"]),
|
||||||
|
|
||||||
sevenZip: makeRunner("7z", function(options){
|
sevenZip: makeRunner("7z", function(options){
|
||||||
return ["a", "-r", "-bd", options.destination].concat(options.pathsToArchive);
|
return ["a", "-mx=0", "-r", "-bd", options.destination].concat(options.pathsToArchive);
|
||||||
},
|
},
|
||||||
["destination", "pathsToArchive", "cwd"],
|
["destination", "pathsToArchive", "cwd"],
|
||||||
null,
|
null,
|
||||||
|
|
Ładowanie…
Reference in New Issue