mtg-ssm 2.6.9.dev3__tar.gz → 2.6.10.dev1__tar.gz

{mtg_ssm-2.6.9.dev3 → mtg_ssm-2.6.10.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.9.dev3
+Version: 2.6.10.dev1
 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
@@ -459,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
 -----
@@ -501,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.dev3 → mtg_ssm-2.6.10.dev1}/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
@@ -398,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
 -----
@@ -440,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.dev3 → mtg_ssm-2.6.10.dev1}/mtg_ssm/_version.py

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

{mtg_ssm-2.6.9.dev3 → mtg_ssm-2.6.10.dev1}/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.dev3 → mtg_ssm-2.6.10.dev1}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.9.dev3
+Version: 2.6.10.dev1
 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
@@ -459,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
 -----
@@ -501,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.dev3 → mtg_ssm-2.6.10.dev1}/tests/scryfall/test_fetcher.py

@@ -23,7 +23,7 @@ ENDPOINT_TO_FILE: Dict[Union[str, Pattern[str]], Path] = {
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def _scryurls(requests_mock: RequestsMock) -> None:
     """Populate mock responses for scryfall urls."""
     for endpoint, filename in ENDPOINT_TO_FILE.items():

{mtg_ssm-2.6.9.dev3 → mtg_ssm-2.6.10.dev1}/tests/serialization/__snapshots__/test_xlsx.ambr

@@ -71,10 +71,13 @@
       'release',
       'block',
       'type',
-      'cards',
+      'printed',
+      'have',
       'unique',
       'playsets',
-      'count',
+      'extras',
+      'nonfoil',
+      'foil',
       'value',
     ]),
     list([
@@ -88,6 +91,9 @@
       '=SUM(H3:H65535)',
       '=SUM(I3:I65535)',
       '=SUM(J3:J65535)',
+      '=SUM(K3:K65535)',
+      '=SUM(L3:L65535)',
+      '=SUM(M3:M65535)',
     ]),
     list([
       'LEA',
@@ -96,9 +102,12 @@
       'Core Set',
       'core',
       4,
+      "=SUM('LEA'!A:A)",
       '=COUNTIF(\'LEA\'!A:A,">0")',
       '=COUNTIF(\'LEA\'!A:A,">=4")',
-      "=SUM('LEA'!A:A)",
+      '=SUMIF(\'LEA\'!A:A,">4")-4*COUNTIF(\'LEA\'!A:A,">4")',
+      "=SUM('LEA'!I:I)",
+      "=SUM('LEA'!J:J)",
       "=SUM('LEA'!B:B)",
     ]),
     list([
@@ -108,9 +117,12 @@
       None,
       'expansion',
       4,
+      "=SUM('FEM'!A:A)",
       '=COUNTIF(\'FEM\'!A:A,">0")',
       '=COUNTIF(\'FEM\'!A:A,">=4")',
-      "=SUM('FEM'!A:A)",
+      '=SUMIF(\'FEM\'!A:A,">4")-4*COUNTIF(\'FEM\'!A:A,">4")',
+      "=SUM('FEM'!I:I)",
+      "=SUM('FEM'!J:J)",
       "=SUM('FEM'!B:B)",
     ]),
     list([
@@ -120,9 +132,12 @@
       'Ice Age',
       'expansion',
       5,
+      "=SUM('ICE'!A:A)",
       '=COUNTIF(\'ICE\'!A:A,">0")',
       '=COUNTIF(\'ICE\'!A:A,">=4")',
-      "=SUM('ICE'!A:A)",
+      '=SUMIF(\'ICE\'!A:A,">4")-4*COUNTIF(\'ICE\'!A:A,">4")',
+      "=SUM('ICE'!I:I)",
+      "=SUM('ICE'!J:J)",
       "=SUM('ICE'!B:B)",
     ]),
     list([
@@ -132,9 +147,12 @@
       None,
       'starter',
       1,
+      "=SUM('S00'!A:A)",
       '=COUNTIF(\'S00\'!A:A,">0")',
       '=COUNTIF(\'S00\'!A:A,">=4")',
-      "=SUM('S00'!A:A)",
+      '=SUMIF(\'S00\'!A:A,">4")-4*COUNTIF(\'S00\'!A:A,">4")',
+      "=SUM('S00'!I:I)",
+      "=SUM('S00'!J:J)",
       "=SUM('S00'!B:B)",
     ]),
     list([
@@ -144,9 +162,12 @@
       'Kamigawa',
       'expansion',
       2,
+      "=SUM('CHK'!A:A)",
       '=COUNTIF(\'CHK\'!A:A,">0")',
       '=COUNTIF(\'CHK\'!A:A,">=4")',
-      "=SUM('CHK'!A:A)",
+      '=SUMIF(\'CHK\'!A:A,">4")-4*COUNTIF(\'CHK\'!A:A,">4")',
+      "=SUM('CHK'!I:I)",
+      "=SUM('CHK'!J:J)",
       "=SUM('CHK'!B:B)",
     ]),
     list([
@@ -156,9 +177,12 @@
       'Kamigawa',
       'expansion',
       1,
+      "=SUM('BOK'!A:A)",
       '=COUNTIF(\'BOK\'!A:A,">0")',
       '=COUNTIF(\'BOK\'!A:A,">=4")',
-      "=SUM('BOK'!A:A)",
+      '=SUMIF(\'BOK\'!A:A,">4")-4*COUNTIF(\'BOK\'!A:A,">4")',
+      "=SUM('BOK'!I:I)",
+      "=SUM('BOK'!J:J)",
       "=SUM('BOK'!B:B)",
     ]),
     list([
@@ -168,9 +192,12 @@
       'Kamigawa',
       'expansion',
       1,
+      "=SUM('SOK'!A:A)",
       '=COUNTIF(\'SOK\'!A:A,">0")',
       '=COUNTIF(\'SOK\'!A:A,">=4")',
-      "=SUM('SOK'!A:A)",
+      '=SUMIF(\'SOK\'!A:A,">4")-4*COUNTIF(\'SOK\'!A:A,">4")',
+      "=SUM('SOK'!I:I)",
+      "=SUM('SOK'!J:J)",
       "=SUM('SOK'!B:B)",
     ]),
     list([
@@ -180,9 +207,12 @@
       None,
       'planechase',
       2,
+      "=SUM('HOP'!A:A)",
       '=COUNTIF(\'HOP\'!A:A,">0")',
       '=COUNTIF(\'HOP\'!A:A,">=4")',
-      "=SUM('HOP'!A:A)",
+      '=SUMIF(\'HOP\'!A:A,">4")-4*COUNTIF(\'HOP\'!A:A,">4")',
+      "=SUM('HOP'!I:I)",
+      "=SUM('HOP'!J:J)",
       "=SUM('HOP'!B:B)",
     ]),
     list([
@@ -192,9 +222,12 @@
       'Scars of Mirrodin',
       'promo',
       1,
+      "=SUM('PMBS'!A:A)",
       '=COUNTIF(\'PMBS\'!A:A,">0")',
       '=COUNTIF(\'PMBS\'!A:A,">=4")',
-      "=SUM('PMBS'!A:A)",
+      '=SUMIF(\'PMBS\'!A:A,">4")-4*COUNTIF(\'PMBS\'!A:A,">4")',
+      "=SUM('PMBS'!I:I)",
+      "=SUM('PMBS'!J:J)",
       "=SUM('PMBS'!B:B)",
     ]),
     list([
@@ -204,9 +237,12 @@
       'Scars of Mirrodin',
       'expansion',
       2,
+      "=SUM('MBS'!A:A)",
       '=COUNTIF(\'MBS\'!A:A,">0")',
       '=COUNTIF(\'MBS\'!A:A,">=4")',
-      "=SUM('MBS'!A:A)",
+      '=SUMIF(\'MBS\'!A:A,">4")-4*COUNTIF(\'MBS\'!A:A,">4")',
+      "=SUM('MBS'!I:I)",
+      "=SUM('MBS'!J:J)",
       "=SUM('MBS'!B:B)",
     ]),
     list([
@@ -216,9 +252,12 @@
       None,
       'expansion',
       3,
+      "=SUM('NEO'!A:A)",
       '=COUNTIF(\'NEO\'!A:A,">0")',
       '=COUNTIF(\'NEO\'!A:A,">=4")',
-      "=SUM('NEO'!A:A)",
+      '=SUMIF(\'NEO\'!A:A,">4")-4*COUNTIF(\'NEO\'!A:A,">4")',
+      "=SUM('NEO'!I:I)",
+      "=SUM('NEO'!J:J)",
       "=SUM('NEO'!B:B)",
     ]),
     list([
@@ -228,9 +267,12 @@
       None,
       'promo',
       2,
+      "=SUM('PNEO'!A:A)",
       '=COUNTIF(\'PNEO\'!A:A,">0")',
       '=COUNTIF(\'PNEO\'!A:A,">=4")',
-      "=SUM('PNEO'!A:A)",
+      '=SUMIF(\'PNEO\'!A:A,">4")-4*COUNTIF(\'PNEO\'!A:A,">4")',
+      "=SUM('PNEO'!I:I)",
+      "=SUM('PNEO'!J:J)",
       "=SUM('PNEO'!B:B)",
     ]),
   ])
@@ -325,10 +367,13 @@
       'release',
       'block',
       'type',
-      'cards',
+      'printed',
+      'have',
       'unique',
       'playsets',
-      'count',
+      'extras',
+      'nonfoil',
+      'foil',
       'value',
     ]),
     list([
@@ -342,6 +387,9 @@
       '=SUM(H3:H65535)',
       '=SUM(I3:I65535)',
       '=SUM(J3:J65535)',
+      '=SUM(K3:K65535)',
+      '=SUM(L3:L65535)',
+      '=SUM(M3:M65535)',
     ]),
     list([
       'LEA',
@@ -350,9 +398,12 @@
       'Core Set',
       'core',
       4,
+      "=SUM('LEA'!A:A)",
       '=COUNTIF(\'LEA\'!A:A,">0")',
       '=COUNTIF(\'LEA\'!A:A,">=4")',
-      "=SUM('LEA'!A:A)",
+      '=SUMIF(\'LEA\'!A:A,">4")-4*COUNTIF(\'LEA\'!A:A,">4")',
+      "=SUM('LEA'!I:I)",
+      "=SUM('LEA'!J:J)",
       "=SUM('LEA'!B:B)",
     ]),
     list([
@@ -362,9 +413,12 @@
       None,
       'expansion',
       4,
+      "=SUM('FEM'!A:A)",
       '=COUNTIF(\'FEM\'!A:A,">0")',
       '=COUNTIF(\'FEM\'!A:A,">=4")',
-      "=SUM('FEM'!A:A)",
+      '=SUMIF(\'FEM\'!A:A,">4")-4*COUNTIF(\'FEM\'!A:A,">4")',
+      "=SUM('FEM'!I:I)",
+      "=SUM('FEM'!J:J)",
       "=SUM('FEM'!B:B)",
     ]),
     list([
@@ -374,9 +428,12 @@
       'Ice Age',
       'expansion',
       5,
+      "=SUM('ICE'!A:A)",
       '=COUNTIF(\'ICE\'!A:A,">0")',
       '=COUNTIF(\'ICE\'!A:A,">=4")',
-      "=SUM('ICE'!A:A)",
+      '=SUMIF(\'ICE\'!A:A,">4")-4*COUNTIF(\'ICE\'!A:A,">4")',
+      "=SUM('ICE'!I:I)",
+      "=SUM('ICE'!J:J)",
       "=SUM('ICE'!B:B)",
     ]),
     list([
@@ -386,9 +443,12 @@
       None,
       'starter',
       1,
+      "=SUM('S00'!A:A)",
       '=COUNTIF(\'S00\'!A:A,">0")',
       '=COUNTIF(\'S00\'!A:A,">=4")',
-      "=SUM('S00'!A:A)",
+      '=SUMIF(\'S00\'!A:A,">4")-4*COUNTIF(\'S00\'!A:A,">4")',
+      "=SUM('S00'!I:I)",
+      "=SUM('S00'!J:J)",
       "=SUM('S00'!B:B)",
     ]),
     list([
@@ -398,9 +458,12 @@
       'Kamigawa',
       'expansion',
       2,
+      "=SUM('CHK'!A:A)",
       '=COUNTIF(\'CHK\'!A:A,">0")',
       '=COUNTIF(\'CHK\'!A:A,">=4")',
-      "=SUM('CHK'!A:A)",
+      '=SUMIF(\'CHK\'!A:A,">4")-4*COUNTIF(\'CHK\'!A:A,">4")',
+      "=SUM('CHK'!I:I)",
+      "=SUM('CHK'!J:J)",
       "=SUM('CHK'!B:B)",
     ]),
     list([
@@ -410,9 +473,12 @@
       'Kamigawa',
       'expansion',
       1,
+      "=SUM('BOK'!A:A)",
       '=COUNTIF(\'BOK\'!A:A,">0")',
       '=COUNTIF(\'BOK\'!A:A,">=4")',
-      "=SUM('BOK'!A:A)",
+      '=SUMIF(\'BOK\'!A:A,">4")-4*COUNTIF(\'BOK\'!A:A,">4")',
+      "=SUM('BOK'!I:I)",
+      "=SUM('BOK'!J:J)",
       "=SUM('BOK'!B:B)",
     ]),
     list([
@@ -422,9 +488,12 @@
       'Kamigawa',
       'expansion',
       1,
+      "=SUM('SOK'!A:A)",
       '=COUNTIF(\'SOK\'!A:A,">0")',
       '=COUNTIF(\'SOK\'!A:A,">=4")',
-      "=SUM('SOK'!A:A)",
+      '=SUMIF(\'SOK\'!A:A,">4")-4*COUNTIF(\'SOK\'!A:A,">4")',
+      "=SUM('SOK'!I:I)",
+      "=SUM('SOK'!J:J)",
       "=SUM('SOK'!B:B)",
     ]),
     list([
@@ -434,9 +503,12 @@
       None,
       'planechase',
       2,
+      "=SUM('HOP'!A:A)",
       '=COUNTIF(\'HOP\'!A:A,">0")',
       '=COUNTIF(\'HOP\'!A:A,">=4")',
-      "=SUM('HOP'!A:A)",
+      '=SUMIF(\'HOP\'!A:A,">4")-4*COUNTIF(\'HOP\'!A:A,">4")',
+      "=SUM('HOP'!I:I)",
+      "=SUM('HOP'!J:J)",
       "=SUM('HOP'!B:B)",
     ]),
     list([
@@ -446,9 +518,12 @@
       'Scars of Mirrodin',
       'promo',
       1,
+      "=SUM('PMBS'!A:A)",
       '=COUNTIF(\'PMBS\'!A:A,">0")',
       '=COUNTIF(\'PMBS\'!A:A,">=4")',
-      "=SUM('PMBS'!A:A)",
+      '=SUMIF(\'PMBS\'!A:A,">4")-4*COUNTIF(\'PMBS\'!A:A,">4")',
+      "=SUM('PMBS'!I:I)",
+      "=SUM('PMBS'!J:J)",
       "=SUM('PMBS'!B:B)",
     ]),
     list([
@@ -458,9 +533,12 @@
       'Scars of Mirrodin',
       'expansion',
       2,
+      "=SUM('MBS'!A:A)",
       '=COUNTIF(\'MBS\'!A:A,">0")',
       '=COUNTIF(\'MBS\'!A:A,">=4")',
-      "=SUM('MBS'!A:A)",
+      '=SUMIF(\'MBS\'!A:A,">4")-4*COUNTIF(\'MBS\'!A:A,">4")',
+      "=SUM('MBS'!I:I)",
+      "=SUM('MBS'!J:J)",
       "=SUM('MBS'!B:B)",
     ]),
     list([
@@ -470,9 +548,12 @@
       None,
       'expansion',
       3,
+      "=SUM('NEO'!A:A)",
       '=COUNTIF(\'NEO\'!A:A,">0")',
       '=COUNTIF(\'NEO\'!A:A,">=4")',
-      "=SUM('NEO'!A:A)",
+      '=SUMIF(\'NEO\'!A:A,">4")-4*COUNTIF(\'NEO\'!A:A,">4")',
+      "=SUM('NEO'!I:I)",
+      "=SUM('NEO'!J:J)",
       "=SUM('NEO'!B:B)",
     ]),
     list([
@@ -482,9 +563,12 @@
       None,
       'promo',
       2,
+      "=SUM('PNEO'!A:A)",
       '=COUNTIF(\'PNEO\'!A:A,">0")',
       '=COUNTIF(\'PNEO\'!A:A,">=4")',
-      "=SUM('PNEO'!A:A)",
+      '=SUMIF(\'PNEO\'!A:A,">4")-4*COUNTIF(\'PNEO\'!A:A,">4")',
+      "=SUM('PNEO'!I:I)",
+      "=SUM('PNEO'!J:J)",
       "=SUM('PNEO'!B:B)",
     ]),
   ])

{mtg_ssm-2.6.9.dev3 → mtg_ssm-2.6.10.dev1}/tests/serialization/test_csv.py

@@ -32,14 +32,14 @@ def oracle(scryfall_data: ScryfallDataSet) -> Oracle:
 
 
 def test_header() -> None:
-    assert [
+    assert csv.CSV_HEADER == [
         "set",
         "name",
         "collector_number",
         "scryfall_id",
         "nonfoil",
         "foil",
-    ] == csv.CSV_HEADER
+    ]
 
 
 def test_row_for_card(id_to_card: Dict[UUID, ScryCard]) -> None: