Merge pull request #13443 from PennyDreadfulMTG/v1v1

Deck name sanitization and emoji improvements

decksite/deck_name.py

@@ -273,6 +273,11 @@ def normalize_version(name: str) -> str:
     if re.search(r'\d.*[a-uw-z,-].*\d', name, flags=re.IGNORECASE):
         return name
     name = normalize_parenthetical_versions(name)
+    # Convert trailing sequences of digits and spaces into dotted versions
+    trailing_nums = re.search(r'(\d+(?:\s+\d+)+)$', name)
+    if trailing_nums:
+        dotted_nums = re.sub(r'\s+', '.', trailing_nums.group(1))
+        name = name[:trailing_nums.start(1)] + dotted_nums
     patterns = [
         r'(\W?)[\[({]?(?:v|ver|version|rev|mk) ?(\d[\.\d]*)(?:[])}]|\b)',  # Explicitly marked as a version
         r'(\s)[\[({]?(\d[\.\d]*)[])}]?$',  # Number at end of name

decksite/deck_name_test.py

@@ -267,7 +267,7 @@
     ('depravity 500', 'Depravity 500', [], None, 6),
     ('catch 22', 'Catch 22', [], None, 22),
     ('the 0.02 tix printing of kaya was finally available', 'The 0.02 Tix Printing of Kaya Was Finally Available', [], None, 23),
-    ('crackling drake beatdown 1.3 3', 'Crackling Drake Beatdown v1.3 v3', [], None, 23),
+    ('crackling drake beatdown 1.3 3', 'Crackling Drake Beatdown v1.3.3', [], None, 23),
     ('70 rev 5 2.0', '70 Rev 5 2.0', [], None, 23),
     ('significantly worse 3 drops than season 19', 'Significantly Worse 3 Drops Than Season 19', [], None, 23),
     ('dr who: season 3, episode 10', 'Dr Who: Season 3, Episode 10', [], None, 23),
@@ -309,6 +309,7 @@
     ('Kiki-Titi', 'Kiki-Titi', ['U', 'R'], 'Izzet Twin', 32),
     ('Greasefag', 'Orzhov Greasefang', ['W', 'B'], 'Greasefang', 33),
     ('🏴‍☠️', '🏴‍☠️', ['U', 'R'], 'Pirates', 33),
+    ('S36 Human v1 1', 'Human v1.1', ['W'], 'Mono White Humans', 36),
 ]
 
 def test_replace_space_alternatives() -> None:

decksite/prepare.py

@@ -234,4 +234,4 @@ def set_legal_icons(o: Card | Deck) -> None:
 def season_icon_link(code: str) -> str:
     color = 'rare' if code in seasons.current_season_name() else 'common'
     n = seasons.SEASONS.index(code.upper()) + 1
-    return f'<a href="/seasons/{n}/"><i class="ss ss-{code.lower()} ss-{color} ss-grad">S{n}</i></a>'
+    return f'<a href="/seasons/{n}/"><i class="ss ss-{code.lower()} ss-{color} ss-grad"><span class="ss-num">{n}</span></i></a>'

decksite/templates/legal.mustache

@@ -3,7 +3,7 @@
 
     <p><span title="{{#public}}{{name}}{{/public}}{{^public}}This deck{{/public}}</span> is {{^pd_legal}}<b>not</b> {{/pd_legal}} currently Penny Dreadful legal">{{#pd_legal}}✅{{/pd_legal}}{{^pd_legal}}🚫 Not{{/pd_legal}} Legal</span></p>
     {{#has_legal_format}}
-        {{#legal_icons}}<p>{{{legal_icons}}}</p>{{/legal_icons}}
+        {{#legal_icons}}<p class="ss-grid">{{{legal_icons}}}</p>{{/legal_icons}}
         <div class="other-legal-formats">
             {{#non_pd_legal_formats}}
                 <div class="legal-format">{{.}}</div>