zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-10 14:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Use node-temp for temp file creation, cleanup, etc.

Browse source 
* Lots of WIP on FTN BSO import
* Fix double callbacks in ArchiveUtil
* Impl ArchiveUtil.extractTo()
* Update bunyan
This commit is contained in:
Bryan Ashby 2016-03-03 22:54:32 -07:00
parent 5c324788fe
commit 6094bed07f
4 changed files with 194 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

58
core/archive_util.js
View file

@ -51,13 +51,17 @@ module.exports = class ArchiveUtil {
}
}
haveArchiver(archType) {
getArchiver(archType) {
if(!archType) {
return false;
return;
}
archType = archType.toLowerCase();
return archType in this.archivers;
return this.archivers[archType];
}
haveArchiver(archType) {
return this.getArchiver(archType) ? true : false;
}
detectType(path, cb) {
@ -92,15 +96,13 @@ module.exports = class ArchiveUtil {
}
compressTo(archType, archivePath, files, cb) {
archType = archType.toLowerCase();
const archiver = this.archivers[archType];
const archiver = this.getArchiver(archType);
if(!archiver) {
cb(new Error('Unknown archive type: ' + archType));
return;
return cb(new Error(`Unknown archive type: ${archType}`));
}
let args = _.clone(archiver.compressArgs); // don't much with orig
let args = _.clone(archiver.compressArgs); // don't muck with orig
for(let i = 0; i < args.length; ++i) {
args[i] = args[i].format({
archivePath : archivePath,
@ -108,18 +110,42 @@ module.exports = class ArchiveUtil {
});
}
let comp = pty.spawn(archiver.compressCmd, args, {
cols : 80,
rows : 24,
// :TODO: cwd
});
let comp = pty.spawn(archiver.compressCmd, args, this.getPtyOpts());
comp.on('exit', exitCode => {
cb(exitCode ? new Error('Compression failed with exit code: ' + exitCode) : null);
comp.once('exit', exitCode => {
cb(exitCode ? new Error(`Compression failed with exit code: ${exitCode}`) : null);
});
}
extractTo(archivePath, extractPath, archType, cb) {
const archiver = this.getArchiver(archType);
if(!archiver) {
return cb(new Error(`Unknown archive type: ${archType}`));
}
let args = _.clone(archiver.decompressArgs); // don't muck with orig
for(let i = 0; i < args.length; ++i) {
args[i] = args[i].format({
archivePath : archivePath,
extractPath : extractPath,
});
}
let comp = pty.spawn(archiver.decompressCmd, args, this.getPtyOpts());
comp.once('exit', exitCode => {
cb(exitCode ? new Error(`Decompression failed with exit code: ${exitCode}`) : null);
});
}
getPtyOpts() {
return {
// :TODO: cwd
name : 'enigma-archiver',
cols : 80,
rows : 24,
env : process.env,
};
}
}