From 8d2d6abdbc3a249c99c2ad7baa49557331cd4216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Thu, 13 Mar 2025 20:32:54 +0000 Subject: [PATCH 1/2] minor tweaks --- build/style.css | 4 ---- new.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/style.css b/build/style.css index f29203e..e875c83 100644 --- a/build/style.css +++ b/build/style.css @@ -576,10 +576,6 @@ td:has(.pending) { position: relative; } -td:has(.pending) img { - filter: hue-rotate(180deg); -} - td p.pending { position: absolute; font-size: 10px; diff --git a/new.py b/new.py index 809b939..47f3453 100644 --- a/new.py +++ b/new.py @@ -1115,7 +1115,7 @@ def indexgen(): content.write("\">") masteredcount += 1 if len(mastereddecks) > variables.maxmastered: - content.write(" see all") + content.write(" see all") content.write("

\n") sigs = [] for card in cardlist: From 19c56c6abfc87564d623089480aaedcd5efa49bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Wed, 26 Mar 2025 20:34:03 +0000 Subject: [PATCH 2/2] Account for anniversary decks --- build/style.css | 2 +- new.py | 63 ++++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/build/style.css b/build/style.css index e875c83..772b76b 100644 --- a/build/style.css +++ b/build/style.css @@ -122,7 +122,7 @@ table.decktable.gray th, details.deckwrap:has(.gray) summary { color: white; } -table.decktable.special th, details.deckwrap:has(.special) summary { +table.decktable.special th, details.deckwrap:has(.special) summary, table.decktable.limited th, details.deckwrap:has(.limited) summary { background: linear-gradient(90deg, hsl(0, 100%, 70%), hsl(30, 100%, 70%), hsl(60, 100%, 70%), hsl(90, 100%, 70%), hsl(120, 100%, 70%), hsl(150, 100%, 70%), hsl(180, 100%, 70%), hsl(210, 100%, 70%), hsl(240, 100%, 70%), hsl(270, 100%, 70%), hsl(300, 100%, 70%), hsl(330, 100%, 70%), hsl(360, 100%, 70%)); color: black; } diff --git a/new.py b/new.py index 47f3453..d8e732e 100644 --- a/new.py +++ b/new.py @@ -3,7 +3,7 @@ from bs4 import BeautifulSoup from collections import Counter import log,variables -values = ["red","orange","yellow","green","blue","purple","brown","gray","special"] +values = ["red","orange","yellow","green","blue","purple","brown","gray","special","limited"] numbers = ["01","02","03","04","05","06","07","08","09","10","11","12","13","14","15","16","17","18","19","20"] print("Getting list of deck colours") @@ -33,6 +33,8 @@ for row in souprows: decktype = soupcells[3].text.lower() if decktype in values: deckkey[deckname] = decktype + elif decktype == "n/a": + deckkey[deckname] = "limited" print("Parsing log") @@ -305,7 +307,7 @@ for deck in decks: thedeck["mastered"] = dates[-1] else: thedeck["mastered"] = False - if deck in variables.highpriority or count >= variables.highthreshold or deck in portdecks: + if deck in variables.highpriority or count >= variables.highthreshold or deck in portdecks or thedeck["colour"] == "limited": thedeck["priority"] = 1 elif len(thedeck["mass"]) > 0 or count >= variables.mediumthreshold: thedeck["priority"] = 2 @@ -505,33 +507,34 @@ def printcard(card): def cardtext(card): cardtext = "" - if card["colour"] == "sig": - cardtext += "✍" + card["name"] + "" - else: - if card["colour"] == "red": - cardtext += "🔴" - elif card["colour"] == "orange": - cardtext += "🟠" - elif card["colour"] == "yellow": - cardtext += "🟡" - elif card["colour"] == "green": - cardtext += "🟢" - elif card["colour"] == "blue": - cardtext += "🔵" - elif card["colour"] == "purple": - cardtext += "🟣" - elif card["colour"] == "brown": - cardtext += "🟤" - elif card["colour"] == "gray": - cardtext += "⚪" - elif card["colour"] == "special": - cardtext += "✨" - cardtext += card["name"] + "" + if card["colour"] == "red": + cardtext += "🔴" + elif card["colour"] == "orange": + cardtext += "🟠" + elif card["colour"] == "yellow": + cardtext += "🟡" + elif card["colour"] == "green": + cardtext += "🟢" + elif card["colour"] == "blue": + cardtext += "🔵" + elif card["colour"] == "purple": + cardtext += "🟣" + elif card["colour"] == "brown": + cardtext += "🟤" + elif card["colour"] == "gray": + cardtext += "⚪" + elif card["colour"] == "special": + cardtext += "✨" + elif card["colour"] == "limited": + cardtext += "🌈" + elif card["colour"] == "sig": + cardtext += "✍" + cardtext += card["name"] + "" return cardtext def portfoliogen(theportfolio,thetype,portnumber): @@ -819,7 +822,7 @@ def filterwrite(page,colour=False,sigs=False): filterstring += "grey" else: filterstring += "gray" - filterstring += "\">⚪ ✨" + filterstring += "\">⚪ ✨ 🌈" if sigs: filterstring += " ✍" filterstring += "

\n"