Fix xlsx sorting of promo sets

gwax · Dec 14, 2022 · a67ac2a · a67ac2a
1 parent 9b1b50f
commit a67ac2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /*.csv.bak*
 /*.xlsx
 /*.xlsx.bak*
+/.~lock.*
 
 # Profiling data
 *.prof

diff --git a/mtg_ssm/serialization/xlsx.py b/mtg_ssm/serialization/xlsx.py
@@ -34,9 +34,14 @@
 ]
 
 
-def _card_set_sort_key(cset: ScrySet) -> Tuple[dt.date, str]:
+def _card_set_sort_key(cset: ScrySet) -> Tuple[dt.date, str, int, str]:
     released_at = cset.released_at or dt.date.min
-    return released_at, cset.code
+    return (
+        released_at,
+        cset.parent_set_code or cset.code,
+        0 if cset.parent_set_code is None else 1,
+        cset.code,
+    )
 
 
 def create_all_sets(sheet: Worksheet, index: ScryfallDataIndex) -> None: