zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-11 23:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Use per-network outbound for NetMail just like EchoMail

Browse source 
* Use BSO style FLO file for NetMail
* Some code cleanup
This commit is contained in:
Bryan Ashby 2017-12-31 18:45:39 -07:00
parent fc40641eeb
commit 11a19d899e
2 changed files with 62 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/scanner_tossers/ftn_bso.js
View file

@ -893,6 +893,8 @@ function FTNMessageScanTossModule() {
exportOpts.fileCase = config.fileCase || 'lower';
exportOpts.network = Config.messageNetworks.ftn.networks[networkName];
exportOpts.networkName = networkName;
exportOpts.outgoingDir = self.getOutgoingEchoMailPacketDir(exportOpts.networkName, exportOpts.destAddress);
exportOpts.exportType = self.getExportType(config);
if(!exportOpts.network) {
return callback(Errors.DoesNotExist(`No configuration found for network ${networkName}`));
@ -902,20 +904,33 @@ function FTNMessageScanTossModule() {
});
},
function createOutgoingDir(callback) {
// ensure outgoing NetMail directory exists
return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
// ensure outgoing NetMail directory exists
return fse.mkdirs(exportOpts.outgoingDir, callback);
//return fse.mkdirs(Config.scannerTossers.ftn_bso.paths.outboundNetMail, callback);
},
function exportPacket(callback) {
return self.exportNetMailMessagePacket(message, exportOpts, callback);
},
function moveToOutgoing(callback) {
const newExt = exportOpts.fileCase === 'lower' ? '.pkt' : '.PKT';
const newPath = paths.join(
Config.scannerTossers.ftn_bso.paths.outboundNetMail,
exportOpts.exportedToPath = paths.join(
exportOpts.outgoingDir,
//Config.scannerTossers.ftn_bso.paths.outboundNetMail,
`${paths.basename(exportOpts.pktFileName, paths.extname(exportOpts.pktFileName))}${newExt}`
);
return fse.move(exportOpts.pktFileName, newPath, callback);
return fse.move(exportOpts.pktFileName, exportOpts.exportedToPath, callback);
},
function prepareFloFile(callback) {
const flowFilePath = self.getOutgoingFlowFileName(
exportOpts.outgoingDir,
exportOpts.destAddress,
'ref',
exportOpts.exportType,
exportOpts.fileCase
);
return self.flowFileAppendRefs(flowFilePath, [ exportOpts.exportedToPath ], '^', callback);
},
function storeStateFlags0Meta(callback) {
return message.persistMetaValue('System', 'state_flags0', Message.StateFlags0.Exported.toString(), callback);