Fix views in area browser, change 'ignore' to 'exclude' during scan

This commit is contained in:
Bryan Ashby 2017-08-29 20:10:34 -06:00
parent 6cbe574d4e
commit 1d86be6e34
2 changed files with 9 additions and 9 deletions

View File

@ -85,7 +85,7 @@ function finalizeEntryAndPersist(fileEntry, descHandler, cb) {
);
}
const SCAN_IGNORE_FILENAMES = [ 'DESCRIPT.ION', 'FILES.BBS' ];
const SCAN_EXCLUDE_FILENAMES = [ 'DESCRIPT.ION', 'FILES.BBS' ];
function loadDescHandler(path, cb) {
const DescIon = require('../../core/descript_ion_file.js');
@ -128,8 +128,8 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
async.eachSeries(files, (fileName, nextFile) => {
const fullPath = paths.join(physDir, fileName);
if(SCAN_IGNORE_FILENAMES.includes(fileName.toUpperCase())) {
process.stdout.write(`Ignoring ${fullPath}`);
if(SCAN_EXCLUDE_FILENAMES.includes(fileName.toUpperCase())) {
console.info(`Excluding ${fullPath}`);
return nextFile(null);
}

View File

@ -372,7 +372,7 @@ exports.getModule = class FileAreaList extends MenuModule {
return self.populateCurrentEntryInfo(callback);
});
},
function populateViews(callback) {
function populateDesc(callback) {
if(_.isString(self.currentFileEntry.desc)) {
const descView = self.viewControllers.browse.getView(MciViewIds.browse.desc);
if(descView) {
@ -384,8 +384,6 @@ exports.getModule = class FileAreaList extends MenuModule {
forceLineTerm : true
},
() => {
self.updateQueueIndicator();
self.populateCustomLabels('browse', MciViewIds.browse.customRangeStart);
return callback(null);
}
);
@ -395,11 +393,13 @@ exports.getModule = class FileAreaList extends MenuModule {
}
}
} else {
self.updateQueueIndicator();
self.populateCustomLabels('browse', MciViewIds.browse.customRangeStart);
return callback(null);
}
},
function populateAdditionalViews(callback) {
self.updateQueueIndicator();
self.populateCustomLabels('browse', MciViewIds.browse.customRangeStart);
return callback(null);
}
],
err => {