|
@@ -109,7 +109,7 @@ module.exports = app => {
|
|
|
// const paths = files.map(item => {
|
|
|
// return { name: item.filename + item.fileext, path: item.filepath }
|
|
|
// })
|
|
|
- return new Promise(resolve => {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
// 每次开一个新的archiver
|
|
|
const ziparchiver = archiver('zip');
|
|
|
const outputPath = fs.createWriteStream(path.resolve(this.app.baseDir, zipPath));
|
|
@@ -122,16 +122,17 @@ module.exports = app => {
|
|
|
ziparchiver.on('warning', function(err) {
|
|
|
if (err.code === 'ENOENT') {
|
|
|
console.warn('stat故障和其他非阻塞错误');
|
|
|
- } else {
|
|
|
- throw err;
|
|
|
}
|
|
|
+ reject(err);
|
|
|
+
|
|
|
});
|
|
|
|
|
|
// 存档出错
|
|
|
ziparchiver.on('error', function(err) {
|
|
|
console.log(err);
|
|
|
- throw err;
|
|
|
+ reject(err);
|
|
|
});
|
|
|
+
|
|
|
ziparchiver.finalize();
|
|
|
outputPath.on('close', () => {
|
|
|
resolve(ziparchiver.pointer());
|