diff --git a/WHATSNEW.md b/WHATSNEW.md index 72eaeba6..fc6ed98f 100644 --- a/WHATSNEW.md +++ b/WHATSNEW.md @@ -9,7 +9,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For * New ACS codes for new 2FA/OTP: `AR` and `AF`. See [ACS](/docs/configuration/acs.md) for details. + `oputil.js user 2fa USERNAME TYPE` enables 2-factor authentication for a user. * `oputil.js user info USERNAME --security` can now display additional security information such as 2FA/OTP. -* `oputil.js fb scan --quick` is now the default. Override with `--full-scan`. +* `oputil.js fb scan --quick` is now the default. Override with `--full`. * ACS checks can now be applied to form actions. For example: ```hjson { diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js index efefa05b..67962fc0 100644 --- a/core/oputil/oputil_file_base.js +++ b/core/oputil/oputil_file_base.js @@ -209,7 +209,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) { async.series( [ function quickCheck(next) { - if(options['full-scan']) { + if(options['full']) { return next(null); } @@ -229,6 +229,16 @@ function scanFileAreaForChanges(areaInfo, options, cb) { areaTag : areaInfo.areaTag, storageTag : storageLoc.storageTag }, + (stepInfo, next) => { + if(argv.verbose) { + if(stepInfo.error) { + console.error(` error: ${stepInfo.error}`); + } else { + console.info(` processing: ${stepInfo.step}`); + } + } + return next(null); + }, (err, fileEntry, dupeEntries) => { if(err) { console.info(`Error: ${err.message}`); @@ -477,7 +487,7 @@ function scanFileAreas() { } options.descFile = argv['desc-file']; // --desc-file or --desc-file PATH - options['full-scan'] = argv['-full-scan']; + options['full'] = argv.full; options.areaAndStorageInfo = getAreaAndStorage(argv._.slice(2)); diff --git a/core/oputil/oputil_help.js b/core/oputil/oputil_help.js index 62c47297..abcf61fe 100644 --- a/core/oputil/oputil_help.js +++ b/core/oputil/oputil_help.js @@ -14,6 +14,7 @@ const usageHelp = exports.USAGE_HELP = { Global arguments: -c, --config PATH Specify config path (default is ${getDefaultConfigPath()}) -n, --no-prompt Assume defaults (don't prompt for input where possible) + --verbose Verbose output, where applicable Commands: user User management @@ -131,7 +132,7 @@ scan arguments: DESCRIPT.ION file. --update Attempt to update information for existing entries - --full-scan Perform a full scan (default is quick) + --full Perform a full scan (default is quick) info arguments: --show-desc Display short description, if any @@ -152,7 +153,7 @@ General Information: Generally an area tag can also include an optional storage tag. For example, the area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main - When performing an initial import of a large area or storage backing, --full-scan + When performing an initial import of a large area or storage backing, --full is the best option. If re-scanning an area for updates a standard / quick scan is generally good enough. diff --git a/docs/admin/oputil.md b/docs/admin/oputil.md index 7190d268..0b05f7aa 100644 --- a/docs/admin/oputil.md +++ b/docs/admin/oputil.md @@ -14,6 +14,7 @@ usage: oputil.js [--version] [--help] Global arguments: -c, --config PATH Specify config path (default is ./config/) -n, --no-prompt Assume defaults (don't prompt for input where possible) + --verbose Verbose output, where applicable Commands: user User management @@ -178,7 +179,7 @@ scan arguments: DESCRIPT.ION file. --update Attempt to update information for existing entries - --full-scan Perform a full scan (default is quick) + --full Perform a full scan (default is quick) info arguments: --show-desc Display short description, if any @@ -197,7 +198,7 @@ General Information: Generally an area tag can also include an optional storage tag. For example, the area of 'bbswarez' stored using 'bbswarez_main': bbswarez@bbswarez_main - When performing an initial import of a large area or storage backing, --full-scan + When performing an initial import of a large area or storage backing, --full is the best option. If re-scanning an area for updates a standard / quick scan is generally good enough.