zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-10 14:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add GLOB support to oputil fb scan...

Browse source
This commit is contained in:
Bryan Ashby 2018-03-10 11:37:23 -07:00
parent f6f1de4bd8
commit 9c87d45433
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/oputil/oputil_file_base.js
View file

@ -7,7 +7,10 @@ const ExitCodes = require('./oputil_common.js').ExitCodes;
const argv = require('./oputil_common.js').argv;
const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDatabases;
const getHelpFor = require('./oputil_help.js').getHelpFor;
const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage;
const {
getAreaAndStorage,
looksLikePattern
} = require('./oputil_common.js');
const Errors = require('../enig_error.js').Errors;
const async = require('async');
@ -16,6 +19,7 @@ const paths = require('path');
const _ = require('lodash');
const moment = require('moment');
const inq = require('inquirer');
const glob = require('glob');
exports.handleFileBaseCommand = handleFileBaseCommand;
@ -119,6 +123,14 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
const FileEntry = require('../file_entry.js');
const readDir = options.glob ?
(dir, next) => {
return glob(options.glob, { cwd : dir, nodir : true }, next);
} :
(dir, next) => {
return fs.readdir(dir, next);
};
async.eachSeries(storageLocations, (storageLoc, nextLocation) => {
async.waterfall(
[
@ -134,7 +146,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
function scanPhysFiles(descHandler, callback) {
const physDir = storageLoc.dir;
fs.readdir(physDir, (err, files) => {
readDir(physDir, (err, files) => {
if(err) {
return callback(err);
}
@ -498,6 +510,12 @@ function scanFileAreas() {
options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2));
const last = argv._[argv._.length - 1];
if(options.areaAndStorageInfo.length > 1 && looksLikePattern(last)) {
options.glob = last;
options.areaAndStorageInfo.length -= 1;
}
async.series(
[
function init(callback) {