asterisk implies match for scanArgs

Author: evanx

README.md

@@ -27,15 +27,15 @@ redis-scan
 ```
 Actually, there is a `eachLimit` (default 1000) so it will only scan a 1000 keys (in batches, with sleeps inbetween), and exit with an error message "Limit reached."
 
-If the first parameter is a number, it is taken as the database number:
+If the first parameter is a number prefixed with `@` then it is taken as the database number:
 ```shell
-redis-scan 2
+redis-scan @2
 ```
 where this scans database number `2` via `redis-cli -n 2`
 
 We can and should use `match` to reduce the number of keys.
 ```shell
-redis-scan 0 match 'demo:*'
+redis-scan match 'demo:*'
 ```
 If a parameter contains an asterisk, then `match` is assumed:
 ```shell
@@ -55,13 +55,13 @@ where supported types are: `string, list, hash, set, zset.`
 
 We can specify an "each" command to be executed for each matching key:
 ```shell
-redis-scan 13 @hash -- hlen
+redis-scan @13 @hash -- hlen
 ```
 where we use a double-dash to delimit the `each` command. In this case we execute `hlen` against each key of type `hash`
 
 Actually the script knows that `hlen` is a hashes command, and so `@hash` can be omitted:
 ```shell
-redis-scan 13 -- hlen
+redis-scan @13 -- hlen
 ```
 where this will scan all keys in db `13,` and for each hashes key, print its `hlen.`
 

bin/bashrc.redis-scan.sh

@@ -50,9 +50,16 @@ RedisScan() { # scan command with sleep between iterations
   then
     scanCommand='scan'
   else
-    if echo "$1" | grep -q "^[0-9][0-9]*$"
+    if echo "$1" | grep -q "^[0-9][0-5]\{0,1\}$"
     then
-      local dbn=$1
+      rherror 'Use @dbn for the db number'
+      local dbn="$1"
+      shift
+      redisArgs=" -n $dbn"
+      rhinfo "dbn $dbn"
+    elif echo "$1" | grep -q "^@[0-9][0-5]\{0,1\}$"
+    then
+      local dbn=`echo "$1" | tail -c+2`
       shift
       redisArgs=" -n $dbn"
       rhinfo "dbn $dbn"
@@ -200,6 +207,9 @@ RedisScan() { # scan command with sleep between iterations
         shift
         rhdebug eachCommand $eachCommand
         break
+      elif printf '%s' "$arg" | grep -q '*'
+      then
+        scanArgs+=('match' "$arg")
       else
         scanArgs+=("$arg")
       fi