Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-20 18:18:56 +00:00
Code Issues Projects Releases Wiki Activity

fix(operation) pack in old packer type after changin packer without reload

Browse source
This commit is contained in:
coderaiser 2017-08-29 11:55:18 +03:00
parent a777b33389
commit b3355f1de5
1 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
client/modules/operation/index.js
View file

@ -28,11 +28,13 @@ function OperationProto(operation, data) {
let {
cp: copyFn,
mv: moveFn,
pack: packFn,
delete: deleteFn,
extract: extractFn,
} = RESTful;
let packZipFn = RESTful.pack;
let packTarFn = RESTful.pack;
const Info = DOM.CurrentInfo;
const showLoad = Images.show.load.bind(null, 'top');
const Operation = this;
@ -108,12 +110,12 @@ function OperationProto(operation, data) {
});
}
function _setPacker(prefix, name, pack, fn) {
function _setTarPacker(prefix, name, pack, fn) {
pack(prefix + '/' + name, prefix, (packer) => {
fn();
packer.on('connect', () => {
authCheck(packer, () => {
packFn = (data, callback) => {
packTarFn = (data, callback) => {
setListeners(packer, {noContinue: true}, callback);
packer.pack(data.from, data.to, data.names);
};
@ -121,16 +123,39 @@ function OperationProto(operation, data) {
});
packer.on('disconnect', () => {
packFn = RESTful.pack;
packTarFn = RESTful.pack;
});
});
}
function _setZipPacker(prefix, name, pack, fn) {
pack(prefix + '/' + name, prefix, (packer) => {
fn();
packer.on('connect', () => {
authCheck(packer, () => {
packZipFn = (data, callback) => {
setListeners(packer, {noContinue: true}, callback);
packer.pack(data.from, data.to, data.names);
};
});
});
packer.on('disconnect', () => {
packZipFn = RESTful.pack;
});
});
}
function _initPacker(prefix, fn) {
if (config('packer') === 'zip')
return _setPacker(prefix, 'salam', salam, fn);
_setPacker(prefix, 'ishtar', ishtar, fn);
_setZipPacker(prefix, 'salam', salam, fn);
_setTarPacker(prefix, 'ishtar', ishtar, fn);
}
function getPacker(type) {
if (type === 'zip')
return packZipFn;
return packTarFn;
}
function _initExtractor(prefix, fn) {
@ -492,7 +517,7 @@ function OperationProto(operation, data) {
break;
case 'pack':
op = packFn;
op = getPacker(type);
if (names.length > 1)
currentName = Info.dir;