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-13 20:13:06 -06:00
parent 7f6b35f762 f510fca656
commit 1fecb19c50
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/oputil/oputil_file_base.js
View File

@ -9,7 +9,6 @@ const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDataba
const getHelpFor = require('./oputil_help.js').getHelpFor; const getHelpFor = require('./oputil_help.js').getHelpFor;
const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage; const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage;
const Errors = require('../../core/enig_error.js').Errors; const Errors = require('../../core/enig_error.js').Errors;
const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName;
const async = require('async'); const async = require('async');
const fs = require('fs'); const fs = require('fs');
@ -43,6 +42,8 @@ function finalizeEntryAndPersist(fileEntry, cb) {
return callback(null); return callback(null);
} }
const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName;
const questions = [ const questions = [
{ {
name : 'desc', name : 'desc',

6
core/scanner_tossers/ftn_bso.js
View File

@ -1360,11 +1360,15 @@ 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 : 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,
} }
}; };
const ldesc = ticFileInfo.getAsString('Ldesc', '\n');
if(ldesc) {
scanOpts.meta.tic_ldesc = ldesc;
}
// //
// We may have TIC auto-tagging for this node and/or specific (remote) area // We may have TIC auto-tagging for this node and/or specific (remote) area
// //