mtg-ssm 2.6.9.dev2__tar.gz → 2.6.10__tar.gz

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.9.dev2
+Version: 2.6.10
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -223,13 +223,13 @@ Acknowledgments
     early '90s.
 -   `Scryfall`_: Scryfall is a fantastic resource for anyone trying to lookup
     cards or build software on top of up to date Magic card information.
--   `MTG JSON`_: MTG JSON is an amazing resource for anyone looking to build
-    tools around magic card data. Before Scryfall, MTG JSON was my primary
-    source for card data and, without it, mtg-ssm would not exist.
+-   `MTGJSON`_: MTGJSON is an amazing resource for anyone looking to build
+    tools around magic card data. Before Scryfall, MTGJSON was my primary
+    source for card data and, without it, mtg-ssm would have died long ago.
 
 .. _Wizards of the Coast: http://magic.wizards.com
 .. _Scryfall: https://scryfall.com
-.. _MTG JSON: http://mtgjson.com
+.. _MTGJSON: http://mtgjson.com
 
 
 Changelog
@@ -240,6 +240,11 @@ Development
 
 -   ...
 
+2.6.9
+-----
+
+-   Fix sorting of cards with collector number prefixes (primarily PLST).
+
 2.6.1
 -----
 
@@ -454,7 +459,7 @@ Development
 1.2.3
 -----
 
--   Hack to work around missing "releaseDate" and "type" in MTG JSON 3.3.14
+-   Hack to work around missing "releaseDate" and "type" in MTGJSON 3.3.14
 
 1.2.2
 -----
@@ -496,3 +501,13 @@ Development
 -----
 
 -   Initial stable release.
+
+GsMtgJson
+---------
+
+Before mtg-ssm, this tool lived as a Google Apps Script project called
+`GsMtgJson`_. As Magic added more cards, eventually the script became
+too slow to function inside the constraints of Google Apps Script and
+Google Sheets.
+
+.. _GsMtgJson: https://github.com/gwax/GsMtgJson

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/README.rst

@@ -162,13 +162,13 @@ Acknowledgments
     early '90s.
 -   `Scryfall`_: Scryfall is a fantastic resource for anyone trying to lookup
     cards or build software on top of up to date Magic card information.
--   `MTG JSON`_: MTG JSON is an amazing resource for anyone looking to build
-    tools around magic card data. Before Scryfall, MTG JSON was my primary
-    source for card data and, without it, mtg-ssm would not exist.
+-   `MTGJSON`_: MTGJSON is an amazing resource for anyone looking to build
+    tools around magic card data. Before Scryfall, MTGJSON was my primary
+    source for card data and, without it, mtg-ssm would have died long ago.
 
 .. _Wizards of the Coast: http://magic.wizards.com
 .. _Scryfall: https://scryfall.com
-.. _MTG JSON: http://mtgjson.com
+.. _MTGJSON: http://mtgjson.com
 
 
 Changelog
@@ -179,6 +179,11 @@ Development
 
 -   ...
 
+2.6.9
+-----
+
+-   Fix sorting of cards with collector number prefixes (primarily PLST).
+
 2.6.1
 -----
 
@@ -393,7 +398,7 @@ Development
 1.2.3
 -----
 
--   Hack to work around missing "releaseDate" and "type" in MTG JSON 3.3.14
+-   Hack to work around missing "releaseDate" and "type" in MTGJSON 3.3.14
 
 1.2.2
 -----
@@ -435,3 +440,13 @@ Development
 -----
 
 -   Initial stable release.
+
+GsMtgJson
+---------
+
+Before mtg-ssm, this tool lived as a Google Apps Script project called
+`GsMtgJson`_. As Magic added more cards, eventually the script became
+too slow to function inside the constraints of Google Apps Script and
+Google Sheets.
+
+.. _GsMtgJson: https://github.com/gwax/GsMtgJson

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/mtg_ssm/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.9.dev2'
-__version_tuple__ = version_tuple = (2, 6, 9, 'dev2')
+__version__ = version = '2.6.10'
+__version_tuple__ = version_tuple = (2, 6, 10)

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/mtg_ssm/containers/indexes.py

@@ -10,16 +10,14 @@ from mtg_ssm.mtg import util
 from mtg_ssm.scryfall.models import ScryCard, ScryMigrationStrategy, ScrySet
 
 
-def name_card_sort_key(card: ScryCard) -> Tuple[str, int, str]:
+def name_card_sort_key(card: ScryCard) -> Tuple[str, str, int, str]:
     """Key function for sorting cards in a by-name list."""
-    card_num, card_var = util.collector_int_var(card)
-    return (card.set, card_num or 0, card_var or "")  # TODO: sort by set release date
+    return (card.set, *util.collector_number_parts(card.collector_number))
 
 
-def set_card_sort_key(card: ScryCard) -> Tuple[int, str]:
+def set_card_sort_key(card: ScryCard) -> Tuple[str, int, str]:
     """Key function for sorting cards in a by-set list."""
-    card_num, card_var = util.collector_int_var(card)
-    return (card_num or 0, card_var or "")
+    return util.collector_number_parts(card.collector_number)
 
 
 def build_snnmas(

mtg_ssm-2.6.10/mtg_ssm/mtg/util.py

@@ -0,0 +1,26 @@
+"""Utility functions for working with card data."""
+
+import functools
+import re
+from typing import Tuple
+
+STRICT_BASICS = frozenset({"Plains", "Island", "Swamp", "Mountain", "Forest"})
+
+COLLECTOR_NUMBER_RE = re.compile(r"(?P<prefix>.*-|\D+)?(?P<number>\d+)?(?P<suffix>\D.*)?")
+
+
+@functools.lru_cache(maxsize=None)
+def collector_number_parts(collector_number: str) -> Tuple[str, int, str]:
+    """Split a collector number into its parts."""
+    match = COLLECTOR_NUMBER_RE.match(collector_number)
+    if not match:
+        return ("", 0, "")
+    prefix: str = match.group("prefix") or ""
+    number: int = int(match.group("number")) if match.group("number") else 0
+    suffix: str = match.group("suffix") or ""
+    return (prefix, number, suffix)
+
+
+def is_strict_basic(card_name: str) -> bool:
+    """Is the card on of the five basic lands (not Snow or Wastes)."""
+    return card_name in STRICT_BASICS

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/mtg_ssm/serialization/xlsx.py

@@ -28,15 +28,18 @@ ALL_SETS_SHEET_HEADER: Sequence[str] = [
     "release",
     "block",
     "type",
-    "cards",
+    "printed",
+    "have",
     "unique",
     "playsets",
-    "count",
+    "extras",
+    "nonfoil",
+    "foil",
     "value",
 ]
 
 ALL_SETS_SHEET_TOTALS: Sequence[Optional[str]] = ["Total", None, None, None, None] + [
-    f"=SUM({c}3:{c}65535)" for c in "FGHIJ"
+    f"=SUM({c}3:{c}65535)" for c in "FGHIJKLM"
 ]
 
 
@@ -64,9 +67,12 @@ def create_all_sets(sheet: Worksheet, index: ScryfallDataIndex) -> None:
             card_set.block,
             card_set.set_type.value,
             len(index.setcode_to_cards[card_set.code]),
+            f"=SUM('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')})",
             f"=COUNTIF('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')},\">0\")",
             f"=COUNTIF('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')},\">=4\")",
-            f"=SUM('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')})",
+            f"=SUMIF('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')},\">4\")-4*COUNTIF('{setcode}'!{_setsheet_col('have')}:{_setsheet_col('have')},\">4\")",
+            f"=SUM('{setcode}'!{_setsheet_col('nonfoil')}:{_setsheet_col('nonfoil')})",
+            f"=SUM('{setcode}'!{_setsheet_col('foil')}:{_setsheet_col('foil')})",
             f"=SUM('{setcode}'!{_setsheet_col('value')}:{_setsheet_col('value')})",
         ]
         sheet.append(row)
@@ -81,11 +87,14 @@ def style_all_sets(sheet: Worksheet) -> None:
         ("C", 12, True, None),
         ("D", 22, True, None),
         ("E", 15, True, None),
-        ("F", 6, False, None),
-        ("G", 7, False, None),
-        ("H", 8, False, None),
-        ("I", 7, False, None),
-        ("J", 10, False, FORMAT_CURRENCY_USD_SIMPLE),
+        ("F", 7, False, None),
+        ("G", 6, False, None),
+        ("H", 7, False, None),
+        ("I", 8, False, None),
+        ("J", 6, False, None),
+        ("K", 7, False, None),
+        ("L", 5, False, None),
+        ("M", 10, False, FORMAT_CURRENCY_USD_SIMPLE),
     ]
     for col, width, hidden, number_format in col_width_hidden_format:
         cdim = sheet.column_dimensions[col]

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.9.dev2
+Version: 2.6.10
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -223,13 +223,13 @@ Acknowledgments
     early '90s.
 -   `Scryfall`_: Scryfall is a fantastic resource for anyone trying to lookup
     cards or build software on top of up to date Magic card information.
--   `MTG JSON`_: MTG JSON is an amazing resource for anyone looking to build
-    tools around magic card data. Before Scryfall, MTG JSON was my primary
-    source for card data and, without it, mtg-ssm would not exist.
+-   `MTGJSON`_: MTGJSON is an amazing resource for anyone looking to build
+    tools around magic card data. Before Scryfall, MTGJSON was my primary
+    source for card data and, without it, mtg-ssm would have died long ago.
 
 .. _Wizards of the Coast: http://magic.wizards.com
 .. _Scryfall: https://scryfall.com
-.. _MTG JSON: http://mtgjson.com
+.. _MTGJSON: http://mtgjson.com
 
 
 Changelog
@@ -240,6 +240,11 @@ Development
 
 -   ...
 
+2.6.9
+-----
+
+-   Fix sorting of cards with collector number prefixes (primarily PLST).
+
 2.6.1
 -----
 
@@ -454,7 +459,7 @@ Development
 1.2.3
 -----
 
--   Hack to work around missing "releaseDate" and "type" in MTG JSON 3.3.14
+-   Hack to work around missing "releaseDate" and "type" in MTGJSON 3.3.14
 
 1.2.2
 -----
@@ -496,3 +501,13 @@ Development
 -----
 
 -   Initial stable release.
+
+GsMtgJson
+---------
+
+Before mtg-ssm, this tool lived as a Google Apps Script project called
+`GsMtgJson`_. As Magic added more cards, eventually the script became
+too slow to function inside the constraints of Google Apps Script and
+Google Sheets.
+
+.. _GsMtgJson: https://github.com/gwax/GsMtgJson

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/tests/containers/test_indexes.py

@@ -67,6 +67,15 @@ def test_setcode_to_cards(scryfall_data: ScryfallDataSet) -> None:
         "74d",
     ]
 
+    # The List Sorting
+    assert [(c.collector_number, c.name) for c in index.setcode_to_cards["plst"]] == [
+        ("10E-20", "High Ground"),
+        ("10E-182", "Terror"),
+        ("AKH-2", "Anointed Procession"),
+        ("AKH-3", "Anointer Priest"),
+        ("ARB-1", "Ardent Plea"),
+    ]
+
 
 def test_id_to_setindex(scryfall_data: ScryfallDataSet) -> None:
     index = ScryfallDataIndex()

{mtg_ssm-2.6.9.dev2 → mtg_ssm-2.6.10}/tests/data/bulk_data.json

@@ -8,8 +8,8 @@
       "type": "default_cards",
       "name": "Default Cards",
       "description": "A JSON file containing every card object on Scryfall in English or the printed language if the card is only available in one language.",
-      "download_uri": "https://data.scryfall.io/default-cards/default-cards-20240510210636.json",
-      "updated_at": "2024-05-10T21:06:36.150000Z",
+      "download_uri": "https://data.scryfall.io/default-cards/default-cards-20240826212052.json",
+      "updated_at": "2024-08-26T21:20:52.469000Z",
       "content_type": "application/json",
       "content_encoding": "gzip"
     }