Add option -p to print in pack order

Author: Eetami

README.md

@@ -18,9 +18,11 @@ mcdbcli -d 677339
 mcdbcli -l 36680
 ```
 
+-p : Print in pack order
+
 -r : Print in release order
 
--w : Print in waves ordered by aspect
+-w : Print in wave order
 
 Without -d or -l arguments `mcdbcli` will read deck as JSON from stdin
 
@@ -141,6 +143,78 @@ Wave #4
   1 × Shield Spell (Wave #4 The Mad Titan's Shadow #61)
 ```
 
+Print a popular deck by pack and aspect:
+
+```console
+$ mcdbcli -l 13922 -p
+Wild Tutor - Adam Warlock
+Core Set
+ Aggression cards
+  1 × The Power of Aggression (Wave #1 Core Set #55)
+ Justice cards
+  1 × The Power of Justice (Wave #1 Core Set #62)
+ Leadership cards
+  1 × The Power of Leadership (Wave #1 Core Set #72)
+ Protection cards
+  1 × The Power of Protection (Wave #1 Core Set #79)
+ Basic cards
+  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)
+Ms. Marvel
+ Justice cards
+  1 × Concussive Blow (Wave #1 Ms. Marvel #31)
+ Protection cards
+  1 × Tackle (Wave #1 Ms. Marvel #15)
+Doctor Strange
+ Protection cards
+  1 × Brother Voodoo (Wave #1 Doctor Strange #12)
+ Basic cards
+  1 × The Sorcerer Supreme (Wave #1 Doctor Strange #26)
+Hulk
+ Aggression cards
+  1 × Drop Kick (Wave #1 Hulk #14)
+  1 × Martial Prowess (Wave #1 Hulk #18)
+Wasp
+ Basic cards
+  1 × The Power in All of Us (Wave #2 Wasp #24)
+Scarlet Witch
+ Basic cards
+  1 × Spiritual Meditation (Wave #2 Scarlet Witch #19)
+Galaxy's Most Wanted
+ Basic cards
+  1 × Deft Focus (Wave #3 Galaxy's Most Wanted #24)
+Drax
+ Justice cards
+  1 × "Think Fast!" (Wave #3 Drax #31)
+ Basic cards
+  1 × Gamora (Wave #3 Drax #20)
+Venom
+ Leadership cards
+  1 × "Welcome Aboard" (Wave #3 Venom #27)
+The Mad Titan's Shadow
+ Adam Warlock cards
+  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)
+ Aggression cards
+  1 × Magic Attack (Wave #4 The Mad Titan's Shadow #43)
+ Justice cards
+  1 × Zone of Silence (Wave #4 The Mad Titan's Shadow #50)
+ Leadership cards
+  1 × Kaluu (Wave #4 The Mad Titan's Shadow #14)
+  1 × Summoning Spell (Wave #4 The Mad Titan's Shadow #55)
+ Protection cards
+  1 × Shield Spell (Wave #4 The Mad Titan's Shadow #61)
+```
+
 Print a popular deck in absolute release order:
 
 ```console

mcdbcli

@@ -2,8 +2,9 @@
 
 declare MCDB_API_URL='https://marvelcdb.com/api/public'
 declare CARDS_CACHE="${HOME}/.mcdb/cards"
-declare WAVE_ORDER=false
+declare PACK_ORDER=false
 declare RELEASE_ORDER=false
+declare WAVE_ORDER=false
 declare DECK_JSON
 
 print_faction_color() {
@@ -139,24 +140,44 @@ print_factions() {
   done
 }
 
-print_waves() {
+group_by_faction() {
   local cards_json="$1"
-
   local IFS='
 '
-  for wave_json in $(jq -c '.[]' <<<"$cards_json"); do
-    local card_id=$(jq -r '.[0].code' <<<"$wave_json")
-    local wave_number=$(get_wave_number $card_id)
-    printf 'Wave #%d\n' "$wave_number"
-    local faction_json=$(jq -c 'group_by(.faction_code |
+  jq -c 'group_by(.faction_code |
       if . == "hero" then 1
       elif . == "aggression" then 2
       elif . == "justice" then 3
       elif . == "leadership" then 4
       elif . == "protection" then 5
       elif . == "pool" then 5
       elif . == "basic" then 6
-      else 99 end)' <<<"$wave_json")
+      else 99 end)' <<<"$cards_json"
+}
+
+print_waves() {
+  local waves_json="$1"
+
+  local IFS='
+'
+  for wave_json in $(jq -c '.[]' <<<"$waves_json"); do
+    local card_id=$(jq -r '.[0].code' <<<"$wave_json")
+    local wave_number=$(get_wave_number $card_id)
+    printf 'Wave #%d\n' "$wave_number"
+    local faction_json=$(group_by_faction "$wave_json")
+    print_factions "$faction_json"
+  done
+}
+
+print_packs() {
+  local packs_json="$1"
+
+  local IFS='
+'
+  for pack_json in $(jq -c '.[]' <<<"$packs_json"); do
+    local pack_name=$(jq -r '.[0].pack_name' <<<"$pack_json")
+    printf '%s\n' "$pack_name"
+    local faction_json=$(group_by_faction "$pack_json")
     print_factions "$faction_json"
   done
 }
@@ -175,7 +196,7 @@ print_deck() {
   printf '%s\n' "$deck_name"
 
   local -a card_files
-  for card_id_json in $(jq -cr '.slots | keys | .[]' <<<"$DECK_JSON"); do
+  for card_id_json in $(jq -r '.slots | keys | .[]' <<<"$DECK_JSON"); do
     card_files+=($(get_card_file $card_id_json))
   done
 
@@ -191,8 +212,10 @@ print_deck() {
     elif . < 50 then 8
     else 99 end)' "${card_files[@]}")
     print_waves "$cards_json"
+  elif $PACK_ORDER; then
+    local cards_json=$(jq -cn '[inputs] | group_by(.code | .[0:2] | tonumber)' "${card_files[@]}")
+    print_packs "$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 |
@@ -208,14 +231,17 @@ print_deck() {
   fi
 }
 
-while getopts 'd:l:rw' opt; do
+while getopts 'd:l:rwp' opt; do
   case $opt in
     d)
       DECK_JSON="$(curl -s "${MCDB_API_URL}/deck/${OPTARG}")"
       ;;
     l)
       DECK_JSON="$(curl -s "${MCDB_API_URL}/decklist/${OPTARG}")"
       ;;
+    p)
+      PACK_ORDER=true
+      ;;
     r)
       RELEASE_ORDER=true
       ;;