moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a few bugs with import - use eachSeries() for packet import to properly handle SQL transaction with 2:n packets

This commit is contained in:
Bryan Ashby 2016-03-28 19:36:09 -06:00
parent 7c8f8a358a
commit 434fcdb652
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/scanner_tossers/ftn_bso.js
View File

@ -734,7 +734,7 @@ function FTNMessageScanTossModule() {
} }
Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => { Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => {
if(!err) { if(msgIds && msgIds.length > 0) {
assert(1 === msgIds.length); assert(1 === msgIds.length);
message.replyToMsgId = msgIds[0]; message.replyToMsgId = msgIds[0];
} }
@ -874,10 +874,13 @@ function FTNMessageScanTossModule() {
}, },
function importPacketFiles(packetFiles, callback) { function importPacketFiles(packetFiles, callback) {
let rejects = []; let rejects = [];
async.each(packetFiles, (packetFile, nextFile) => { async.eachSeries(packetFiles, (packetFile, nextFile) => {
self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => { self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => {
// :TODO: check err -- log / track rejects, etc.
if(err) { if(err) {
Log.debug(
{ path : paths.join(importDir, packetFile), error : err.toString() },
'Failed to import packet file');
rejects.push(packetFile); rejects.push(packetFile);
} }
nextFile(); nextFile();
@ -920,7 +923,15 @@ function FTNMessageScanTossModule() {
}, },
function discoverBundles(callback) { function discoverBundles(callback) {
fs.readdir(importDir, (err, files) => { fs.readdir(importDir, (err, files) => {
files = files.filter(f => '.pkt' !== paths.extname(f)); // :TODO: Need to be explicit about files to attempt an extract, e.g. *.su?, *.mo?, ...
// :TODO: if we do much more of this, probably just use the glob module
//files = files.filter(f => '.pkt' !== paths.extname(f));
const bundleRegExp = /\.(su|mo|tu|we|th|fr|sa)[0-9A-Za-z]/;
files = files.filter(f => {
const fext = paths.extname(f);
return bundleRegExp.test(fext);
});
async.map(files, (file, transform) => { async.map(files, (file, transform) => {
const fullPath = paths.join(importDir, file); const fullPath = paths.join(importDir, file);