Use natural ordering to sort files

Author: yaa110

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "nomino"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Navid <[email protected]>"]
 description = "Batch rename utility for developers"
 edition = "2018"
@@ -14,6 +14,7 @@ readme = "README.md"
 atty = "0.2"
 clap = { version = "2.33", features = ["yaml"] }
 colored = "1.9"
+natord = "1.0"
 prettytable-rs = "0.8"
 regex = "1.3"
 serde_json = "1.0"

Cargo.toml

@@ -51,7 +51,7 @@ OPTIONS:
     -g, --generate <PATH>    Stores a JSON map file in '<PATH>' after renaming files
     -m, --map <PATH>         Sets the path of map file to be used for renaming files
     -r, --regex <PATTERN>    Regex pattern (RE2 syntax) to match by filenames
-    -s, --sort <ORDER>       Sets the order of sorting (by name) to rename files using enumerator [possible values: ASC, DESC]
+    -s, --sort <ORDER>       Sets the order of natural sorting (by name) to rename files using enumerator [possible values: ASC, DESC]
 
 ARGS:
     <OUTPUT>    Output pattern to be used for renaming files

README.md

@@ -49,7 +49,7 @@ args:
   - sort:
       short: s
       long: sort
-      help: Sets the order of sorting (by name) to rename files using enumerator
+      help: Sets the order of natural sorting (by name) to rename files using enumerator
       multiple: false
       takes_value: true
       case_insensitive: true

data/opts-template.yml

@@ -1,5 +1,6 @@
 use crate::errors::{FormatError, SourceError};
 use crate::input::{Formatter, SortOrder, Source};
+use natord;
 use regex::Regex;
 use std::error::Error;
 use std::fs;
@@ -41,9 +42,9 @@ impl InputIterator {
             }
             inputs.sort_by(|a, b| {
                 if order == SortOrder::Asc {
-                    a.to_lowercase().as_str().cmp(b.to_lowercase().as_str())
+                    natord::compare(a, b)
                 } else {
-                    b.to_lowercase().as_str().cmp(a.to_lowercase().as_str())
+                    natord::compare(b, a)
                 }
             });
             for (i, input) in inputs.into_iter().enumerate() {