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

Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

This commit is contained in:
Bryan Ashby 2017-03-10 21:21:12 -07:00
parent 113585a71a 732e2eefd5
commit 7f6b35f762
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/scanner_tossers/ftn_bso.js
View File

@ -1353,11 +1353,6 @@ function FTNMessageScanTossModule() {
}); });
}, },
function scan(localInfo, callback) { function scan(localInfo, callback) {
let ldesc = ticFileInfo.getAsString('Ldesc', '\n');
if(ldesc) {
ldesc = ldesc.trim();
}
const scanOpts = { const scanOpts = {
sha256 : localInfo.sha256, // *may* have already been calculated sha256 : localInfo.sha256, // *may* have already been calculated
meta : { meta : {
@ -1365,7 +1360,7 @@ function FTNMessageScanTossModule() {
short_file_name : ticFileInfo.getAsString('File').toUpperCase(), // upper to ensure no case issues later; this should be a DOS 8.3 name short_file_name : ticFileInfo.getAsString('File').toUpperCase(), // upper to ensure no case issues later; this should be a DOS 8.3 name
tic_origin : ticFileInfo.getAsString('Origin'), tic_origin : ticFileInfo.getAsString('Origin'),
tic_desc : ticFileInfo.getAsString('Desc'), tic_desc : ticFileInfo.getAsString('Desc'),
tic_ldesc : ldesc, tic_ldesc : ticFileInfo.getAsString('Ldesc', '\n'),
upload_by_username : _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ]) || Config.scannerTossers.ftn_bso.tic.uploadBy, upload_by_username : _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ]) || Config.scannerTossers.ftn_bso.tic.uploadBy,
} }
}; };

7
core/tic_file_info.js
View File

@ -232,7 +232,12 @@ module.exports = class TicFileInfo {
return; return;
} }
value = line.substr(keyEnd + 1).trim(); value = line.substr(keyEnd + 1);
// don't trim Ldesc; may mess with FILE_ID.DIZ type descriptions
if('ldesc' !== key) {
value = value.trim();
}
// convert well known keys to a more reasonable format // convert well known keys to a more reasonable format
switch(key) { switch(key) {