Merge pull request #11700 from PennyDreadfulMTG/universes-within

When someone signs up with a universes beyond name, use within name

magic/decklist.py

@@ -107,7 +107,10 @@ def vivify(decklist: DecklistType) -> Deck:
     for section in ['maindeck', 'sideboard']:
         for name, n in decklist.get(section, {}).items():
             try:
-                validated[section][oracle.valid_name(name)] = n
+                canonical_name = oracle.valid_name(name)
+                if validated[section].get(canonical_name):
+                    raise InvalidDataException(f'More than one entry for {canonical_name} in {section}')
+                validated[section][canonical_name] = n
             except InvalidDataException:
                 invalid_names.add(name)
     if invalid_names:

magic/decklist_test.py

@@ -802,3 +802,28 @@ def test_maindeck_not_sideboard() -> None:
     d = decklist.parse(s)
     assert sum(d['maindeck'].values()) == 60
     assert sum(d['sideboard'].values()) == 0
+
+def test_vivify_universes_beyond() -> None:
+    s = """
+        4 Negan, the Cold-Blooded
+        56 Swamp
+    """
+    s = textwrap.dedent(s)
+    d = decklist.parse(s)
+    v = decklist.vivify(d)
+    assert v.maindeck[0].name == 'Malik, Grim Manipulator'
+    assert v.maindeck[0].n == 4
+    assert v.maindeck[1].name == 'Swamp'
+    assert v.maindeck[1].n == 56
+
+    s = """
+        4 Malik, Grim Manipulator
+        56 Swamp
+    """
+    s = textwrap.dedent(s)
+    d = decklist.parse(s)
+    v = decklist.vivify(d)
+    assert v.maindeck[0].name == 'Malik, Grim Manipulator'
+    assert v.maindeck[0].n == 4
+    assert v.maindeck[1].name == 'Swamp'
+    assert v.maindeck[1].n == 56

magic/oracle.py

@@ -25,7 +25,7 @@ def init(force: bool = False) -> None:
 
 def valid_name(name: str) -> str:
     if name in CARDS_BY_NAME:
-        return name
+        return CARDS_BY_NAME[name].name
     try:
         front = name[0:name.index('/')].strip()
     except ValueError: