Updates to upload check, docs

This commit is contained in:
Bryan Ashby
2017-02-09 22:03:21 -07:00
parent f9e91987ac
commit 2e10fdfdf5
5 changed files with 39 additions and 20 deletions

View File

@@ -121,23 +121,21 @@ function shutdownSystem() {
},
function stopListeningServers(callback) {
return require('./listening_server.js').shutdown( () => {
// :TODO: log err
return callback(null); // ignore err
});
},
function stopEventScheduler(callback) {
if(initServices.eventScheduler) {
return initServices.eventScheduler.shutdown( () => {
callback(null); // ignore err
return callback(null); // ignore err
});
} else {
return callback(null);
}
},
function stopFileAreaWeb(callback) {
require('./file_area_web.js').startup(err => {
// :TODO: Log me if err
return callback(null);
require('./file_area_web.js').startup( () => {
return callback(null); // ignore err
});
},
function stopMsgNetwork(callback) {

View File

@@ -566,6 +566,12 @@ function scanFile(filePath, options, iterator, cb) {
getExistingFileEntriesBySha256(fileEntry.fileSha256, (err, dupeEntries) => {
return callback(err, dupeEntries);
});
},
function finished(dupeEntries, callback) {
stepInfo.step = 'finished';
callIter( () => {
return callback(null, dupeEntries);
});
}
],
(err, dupeEntries) => {

View File

@@ -401,8 +401,9 @@ exports.MenuModule = class MenuModule extends PluginModule {
let textView;
let customMciId = startId;
const config = this.menuConfig.config;
const endId = options.endId || 99; // we'll fail to get a view before 99
while( (textView = this.viewControllers[formName].getView(customMciId)) ) {
while(customMciId <= endId && (textView = this.viewControllers[formName].getView(customMciId)) ) {
const key = `${formName}InfoFormat${customMciId}`; // e.g. "mainInfoFormat10"
const format = config[key];