MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put zip feature back until debug until new agent.

This commit is contained in:
Ylian Saint-Hilaire 2020-08-19 14:01:05 -07:00
parent 991a93b5f6
commit 0fb119ef4e
3 changed files with 1121 additions and 1123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
agents/meshcore.js
View File

@ -2140,34 +2140,28 @@ function createMeshCore(agent) {
}
case 'zip':
// Zip a bunch of files
if (this.zip != null) return; // Zip operating is currently running, exit now.
// Check that the specified files exist & build full paths
var fp, stat, p = [];
for (var i in cmd.files) {
// Right now, we only zip files.
// TODO: Support folder compression
// TODO: Support compression relative to a root path
// TODO: Support the 'cancel' operation below
fp = cmd.path + '/' + cmd.files[i];
stat = null;
try { stat = fs.statSync(fp); } catch (e) { }
if ((stat != null) && (stat.isDirectory() == false) && (stat.size != null) && (stat.size > 0)) { p.push(fp); }
}
if (p.length == 0) return;
for (var i in cmd.files) { fp = cmd.path + '/' + cmd.files[i]; stat = null; try { stat = fs.statSync(fp); } catch (e) { } if (stat != null) { p.push(fp); } }
if (p.length == 0) return; // No files, quit now.
// Setup file compression
var ofile = cmd.path + '/' + cmd.output;
this.write(Buffer.from(JSON.stringify({ action: 'dialogmessage', msg: 'zipping' })));
var out = require('fs').createWriteStream(ofile, { flags: 'wb' });
out.fname = ofile;
out.xws = this;
out.on('close', function () {
this.xws.write(Buffer.from(JSON.stringify({ action: 'dialogmessage', msg: null })));
this.xws.write(Buffer.from(JSON.stringify({ action: 'refresh' })));
});
this.zip = require('zip-writer').write({ files: p });
out.on('close', function () { this.xws.write(Buffer.from(JSON.stringify({ action: 'dialogmessage', msg: null }))); this.xws.write(Buffer.from(JSON.stringify({ action: 'refresh' }))); this.xws.zip = null; });
this.zip = require('zip-writer').write({ files: p, basePath: cmd.path });
this.zip.xws = this;
this.zip.on('progress', require('events').moderated(function (name, p) { this.xws.write(Buffer.from(JSON.stringify({ action: 'dialogmessage', msg: 'zippingFile', file: ((process.platform == 'win32') ? (name.split('/').join('\\')) : name), progress: p }))); }, 2000));
this.zip.pipe(out);
break;
case 'cancel':
// TODO: Cancel zip operation if present
//sendConsoleText('Cancel operation');
try { this.zip.cancel(function () { sendConsoleText('Zip operation was cancelled'); }); } catch (ex) { }
// Cancel zip operation if present
try { this.zip.cancel(function () { }); } catch (ex) { }
this.zip = null;
break;
default:
// Unknown action, ignore it.

2207
translate/translate.json
View File

File diff suppressed because it is too large Load Diff

3
views/default.handlebars
View File

@ -7730,6 +7730,9 @@
} else if ((data.msg == 'zipping') && ((!xxdialogMode) || (xxdialogTag == 'fileMsgDialog'))) {
// Show the dialog box message
setDialogMode(2, "File Operation", 10, p13fileOperationDialogEx, '<div style=margin:10px>' + "Compressing files..." + '<div>', 'fileMsgDialog');
} else if ((data.msg == 'zippingFile') && ((!xxdialogMode) || (xxdialogTag == 'fileMsgDialog'))) {
// Show the dialog box message
setDialogMode(2, "File Operation", 10, p13fileOperationDialogEx, '<div style=margin:10px>' + EscapeHtml(data.file) + '<div><br /><progress value=' + EscapeHtml(data.progress) + ' style=width:100% max=100 />', 'fileMsgDialog');
}
return;
}