From 1d86be6e34f9e28f1997501625e8bfb8f8795823 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 29 Aug 2017 20:10:34 -0600
Subject: [PATCH] Fix views in area browser, change 'ignore' to 'exclude'
 during scan

---
 core/oputil/oputil_file_base.js |  6 +++---
 mods/file_area_list.js          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index a1cfd345..5cbe10e3 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -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);
 							}
 
diff --git a/mods/file_area_list.js b/mods/file_area_list.js
index 4717715b..87f1f47a 100644
--- a/mods/file_area_list.js
+++ b/mods/file_area_list.js
@@ -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 => {