Add new option -w that prints in wave order

This replaces the old option -r which now prints in absolute release
order.

Author: Eetami

README.md

@@ -2,7 +2,7 @@
 
 Command-line interface for viewing decks and decklists.
 
-By default mcdbcli prints the deck sorted by aspect and pack.
+By default mcdbcli prints the deck sorted by aspect and release order.
 
 ## Options
 
@@ -20,6 +20,8 @@ mcdbcli -l 36680
 
 -r : Print in release order
 
+-w : Print in waves ordered by aspect
+
 Without -d or -l arguments `mcdbcli` will read deck as JSON from stdin
 
 ```sh
@@ -33,7 +35,7 @@ using the OAuth API yourself, and feed the JSON to mcdbcli via stdin.
 
 ## Example
 
-Print a popular decklist:
+Print a popular decklist by aspect:
 
 ```console
 $ mcdbcli -l 13922
@@ -80,10 +82,10 @@ Wild Tutor - Adam Warlock
   1 × Gamora (Wave #3 Drax #20)
 ```
 
-Print a popular decklist in release order:
+Print a popular decklist by wave and aspect:
 
 ```console
-$ mcdbcli -l 13922 -r
+$ mcdbcli -l 13922 -w
 Wild Tutor - Adam Warlock
 Wave #1
  Aggression cards
@@ -139,6 +141,47 @@ Wave #4
   1 × Shield Spell (Wave #4 The Mad Titan's Shadow #61)
 ```
 
+Print a popular deck in absolute release order:
+
+```console
+$ mcdbcli -l 13922 -r
+Wild Tutor - Adam Warlock
+  1 × The Power of Aggression (Wave #1 Core Set #55)
+  1 × The Power of Justice (Wave #1 Core Set #62)
+  1 × The Power of Leadership (Wave #1 Core Set #72)
+  1 × The Power of Protection (Wave #1 Core Set #79)
+  1 × Nick Fury (Wave #1 Core Set #84)
+  1 × Energy (Wave #1 Core Set #88)
+  1 × Genius (Wave #1 Core Set #89)
+  1 × Strength (Wave #1 Core Set #90)
+  1 × Tackle (Wave #1 Ms. Marvel #15)
+  1 × Concussive Blow (Wave #1 Ms. Marvel #31)
+  1 × Brother Voodoo (Wave #1 Doctor Strange #12)
+  1 × The Sorcerer Supreme (Wave #1 Doctor Strange #26)
+  1 × Drop Kick (Wave #1 Hulk #14)
+  1 × Martial Prowess (Wave #1 Hulk #18)
+  1 × The Power in All of Us (Wave #2 Wasp #24)
+  1 × Spiritual Meditation (Wave #2 Scarlet Witch #19)
+  1 × Deft Focus (Wave #3 Galaxy's Most Wanted #24)
+  1 × Gamora (Wave #3 Drax #20)
+  1 × "Think Fast!" (Wave #3 Drax #31)
+  1 × "Welcome Aboard" (Wave #3 Venom #27)
+  1 × Kaluu (Wave #4 The Mad Titan's Shadow #14)
+  1 × Pip the Troll (Wave #4 The Mad Titan's Shadow #32)
+  1 × Soul World (Wave #4 The Mad Titan's Shadow #33)
+  1 × Karmic Staff (Wave #4 The Mad Titan's Shadow #34)
+  1 × Warlock's Cape (Wave #4 The Mad Titan's Shadow #35)
+  2 × Cosmic Ward (Wave #4 The Mad Titan's Shadow #36)
+  2 × Mystic Senses (Wave #4 The Mad Titan's Shadow #37)
+  3 × Karmic Blast (Wave #4 The Mad Titan's Shadow #38)
+  2 × Cosmic Awareness (Wave #4 The Mad Titan's Shadow #39)
+  2 × Quantum Magic (Wave #4 The Mad Titan's Shadow #40)
+  1 × Magic Attack (Wave #4 The Mad Titan's Shadow #43)
+  1 × Zone of Silence (Wave #4 The Mad Titan's Shadow #50)
+  1 × Summoning Spell (Wave #4 The Mad Titan's Shadow #55)
+  1 × Shield Spell (Wave #4 The Mad Titan's Shadow #61)
+```
+
 ## Caching
 
 mcdbcli caches the loaded cards to your home directory under `~/.mcdb/cards`. To remove the cached cards run the following command

mcdbcli

@@ -2,6 +2,7 @@
 
 declare MCDB_API_URL='https://marvelcdb.com/api/public'
 declare CARDS_CACHE="${HOME}/.mcdb/cards"
+declare WAVE_ORDER=false
 declare RELEASE_ORDER=false
 declare DECK_JSON
 
@@ -160,6 +161,14 @@ print_waves() {
   done
 }
 
+print_cards() {
+  local IFS='
+'
+  for card_json in $(jq -cn 'inputs' "$@"); do
+    print_card "$card_json"
+  done
+}
+
 print_deck() {
   local deck_name=$(jq -r '.name' <<<"$DECK_JSON")
 
@@ -170,7 +179,7 @@ print_deck() {
     card_files+=($(get_card_file $card_id_json))
   done
 
-  if $RELEASE_ORDER; then
+  if $WAVE_ORDER; then
     local cards_json=$(jq -cn '[inputs] | group_by(.code | .[0:2] | tonumber |
     if . < 11 then 1
     elif . < 16 then 2
@@ -182,6 +191,9 @@ print_deck() {
     elif . < 50 then 8
     else 99 end)' "${card_files[@]}")
     print_waves "$cards_json"
+  elif $RELEASE_ORDER; then
+    # local cards_json=$(jq -cn '[inputs]' "${card_files[@]}")
+    print_cards "${card_files[@]}"
   else
     local cards_json=$(jq -cn '[inputs] | group_by(.faction_code |
       if . == "hero" then 1
@@ -196,7 +208,7 @@ print_deck() {
   fi
 }
 
-while getopts 'd:l:r' opt; do
+while getopts 'd:l:rw' opt; do
   case $opt in
     d)
       DECK_JSON="$(curl -s "${MCDB_API_URL}/deck/${OPTARG}")"
@@ -207,6 +219,9 @@ while getopts 'd:l:r' opt; do
     r)
       RELEASE_ORDER=true
       ;;
+    w)
+      WAVE_ORDER=true
+      ;;
   esac
 done