wip

README.md

@@ -25,11 +25,11 @@ Usage
   Usage
   $ renamer <options> <files>
 
-  -f, --find <string>      The find string, or regular expression when --regex is set. If not set, the whole filename will be replaced.
-  -r, --replace <string>   The replace string. With --regex set, --replace can reference parenthesised substrings from --find with $1, $2, $3
+  -f, --find <string>      The find string, or regular expression when --regexp is set. If not set, the whole filename will be replaced.
+  -r, --replace <string>   The replace string. With --regexp set, --replace can reference parenthesised substrings from --find with $1, $2, $3
                            etc. If omitted, defaults to a blank string. The special token '{{index}}' will insert an incrementing number per
                            file processed.
-  -e, --regex              When set, --find is interpreted as a regular expression.
+  -e, --regexp              When set, --find is interpreted as a regular expression.
   -d, --dry-run            Used for test runs. Set this to do everything but rename the file.
   -i, --insensitive        Enable case-insensitive finds.
   -v, --verbose            Use to print additional information.
@@ -134,7 +134,7 @@ $ renamer --find 'Season 1 - ' *
 ### Simple filename cleanup
 
 ```sh
-$ renamer --regex --find '.*_(\d+)_.*' --replace 'Video $1.mp4' *
+$ renamer --regexp --find '.*_(\d+)_.*' --replace 'Video $1.mp4' *
 ```
 
 <table>
@@ -182,7 +182,7 @@ $ renamer --replace 'Image{{index}}.jpg' *
 ### do something about all those full stops
 
 ```sh
-$ renamer --regex --find '\.(?!\w+$)' --replace ' ' *
+$ renamer --regexp --find '\.(?!\w+$)' --replace ' ' *
 ```
 
 <table>
@@ -203,7 +203,7 @@ $ renamer --regex --find '\.(?!\w+$)' --replace ' ' *
 
 ### if not already done, add your name to a load of files
 ```sh
-$ renamer --regex --find '(data\d)(\.\w+)' --replace '$1 (checked by Lloyd)$2' *
+$ renamer --regexp --find '(data\d)(\.\w+)' --replace '$1 (checked by Lloyd)$2' *
 ```
 
 <table>
@@ -257,7 +257,7 @@ $ renamer --find 'pic' --replace 'photo' '**'
 ### prefix files and folders, recursively
 
 ```sh
-$ renamer --regex --find '^' --replace 'good-' '**'
+$ renamer --regexp --find '^' --replace 'good-' '**'
 ```
 
 <table>

lib/cli-app.js

@@ -23,8 +23,8 @@ class CliApp {
         const replacer = require('../').replacer
         const fileSet = require('file-set')
         const fileStats = fileSet(options.files)
-        /* folders must be renamed last */
-        const files = fileStats.files.concat(fileStats.dirs)
+        /* folders must be renamed last, sub-folders must be renamed before folders */
+        const files = fileStats.files.concat(fileStats.dirs.reverse())
         fileStats.notExisting.forEach(function (file) {
           this.logReplace(options.verbose, { from: file, error: 'does not exist' })
         })
@@ -43,9 +43,13 @@ class CliApp {
           for (const replace of replaces) {
             this.logReplace(options.verbose, replace)
           }
-          renamer(replaces).then(() => {
-            resolve()
-          })
+          renamer(replaces)
+            .then(() => {
+              resolve()
+            })
+            .catch(err => {
+              this.log(chalk.red(err.stack))
+            })
         }
       } else {
         this.log(chalk.red('No input files supplied'))

lib/cli-options.js

@@ -11,14 +11,14 @@ exports.optionDefinitions = [
     name: 'find',
     alias: 'f',
     type: String,
-    description: 'The find string, or regular expression when --regex is set. If not set, the whole filename will be replaced.'
+    description: 'The find string, or regular expression when --regexp is set. If not set, the whole filename will be replaced.'
   },
   {
     name: 'replace',
     alias: 'r',
     type: String,
     defaultValue: '',
-    description: "The replace string. With --regex set, --replace can reference parenthesised substrings from --find with $1, $2, $3 etc. If omitted, defaults to a blank string. The special token '\\{\\{index\\}\\}' will insert an incrementing number per file processed."
+    description: "The replace string. With --regexp set, --replace can reference parenthesised substrings from --find with $1, $2, $3 etc. If omitted, defaults to a blank string. The special token '\\{\\{index\\}\\}' will insert an incrementing number per file processed."
   },
   {
     name: 'regexp',