if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-21 16:38:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Electron-409 - Fix generating crash report (#336)

Browse Source
This commit is contained in:
Kiran Niranjan 2018-04-12 09:06:16 +00:00 committed by Vishwas Shashidhar
parent cffa8962a6
commit 81d9cae5d5
2 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/utils/archiveHandler.js
View File

@ -3,11 +3,6 @@
const fs = require('fs');
const path = require('path');
const archiver = require('archiver');
const log = require('../log.js');
const logLevels = require('../enums/logLevels.js');
const mmm = require('mmmagic');
const Magic = mmm.Magic;
const magic = new Magic(mmm.MAGIC_MIME_TYPE);
/**
* Archives files in the source directory
@ -36,53 +31,27 @@ function generateArchiveForDirectory(source, destination, fileExtensions) {
archive.pipe(output);
let files = fs.readdirSync(source);
let filtered = files.filter((file) => fileExtensions.indexOf(path.extname(file)) !== -1);
mapMimeType(filtered, source)
.then((mappedData) => {
if (mappedData.length > 0) {
mappedData.forEach((data) => {
switch (data.mimeType) {
case 'text/plain':
if (path.extname(data.file) === '.txt') {
archive.file(source + '/' + data.file, { name: 'crashes/' + data.file });
} else {
archive.file(source + '/' + data.file, { name: 'logs/' + data.file });
}
break;
case 'application/x-dmp':
archive.file(source + '/' + data.file, { name: 'crashes/' + data.file });
break;
default:
break;
}
});
files
.filter((file) => fileExtensions.indexOf(path.extname(file)) !== -1)
.forEach((file) => {
switch (path.extname(file)) {
case '.log':
archive.file(source + '/' + file, { name: 'logs/' + file });
break;
case '.dmp':
case '.txt': // on Windows .txt files will be created as part of crash dump
archive.file(source + '/' + file, { name: 'crashes/' + file });
break;
default:
break;
}
archive.finalize();
})
.catch((err) => {
log.send(logLevels.ERROR, 'Failed to find mime type. Error is -> ' + err);
});
archive.finalize();
});
}
function mapMimeType(files, source) {
return Promise.all(files.map((file) => {
return new Promise((resolve, reject) => {
return magic.detectFile(source + '/' + file, (err, result) => {
if (err) {
return reject(err);
}
return resolve({file: file, mimeType: result});
});
});
}))
.then((data) => data)
.catch((err) => log.send(logLevels.ERROR, 'Failed to find mime type. Error is -> ' + err));
}
module.exports = {
generateArchiveForDirectory: generateArchiveForDirectory
};

1
package.json
View File

@ -122,7 +122,6 @@
"lodash.isequal": "4.5.0",
"lodash.omit": "4.5.0",
"lodash.pick": "4.4.0",
"mmmagic": "0.5.0",
"parse-domain": "2.0.0",
"ref": "1.3.5",
"shell-path": "2.1.0",