Sort wantlist in a more granular fashion
This commit is contained in:
parent
26ce704b79
commit
ae082c586e
1 changed files with 48 additions and 31 deletions
37
colors.py
37
colors.py
|
@ -553,6 +553,7 @@ for deck in decklist:
|
||||||
wantedcard["series"] = deck["series"]
|
wantedcard["series"] = deck["series"]
|
||||||
wantedcard["priority"] = deck["priority"]
|
wantedcard["priority"] = deck["priority"]
|
||||||
wantedcard["mass"] = deck["mass"]
|
wantedcard["mass"] = deck["mass"]
|
||||||
|
wantedcard["count"] = deck["count"]
|
||||||
wantedlist.append(wantedcard)
|
wantedlist.append(wantedcard)
|
||||||
|
|
||||||
decknames = []
|
decknames = []
|
||||||
|
@ -571,6 +572,7 @@ for deck in variables.lowpriority:
|
||||||
wantedcard["colour"] = deckkey[deck]["type"]
|
wantedcard["colour"] = deckkey[deck]["type"]
|
||||||
wantedcard["series"] = deckkey[deck]["series"]
|
wantedcard["series"] = deckkey[deck]["series"]
|
||||||
wantedcard["priority"] = 3
|
wantedcard["priority"] = 3
|
||||||
|
wantedcard["count"] = 0
|
||||||
wantedlist.append(wantedcard)
|
wantedlist.append(wantedcard)
|
||||||
|
|
||||||
for theme in variables.masscollect:
|
for theme in variables.masscollect:
|
||||||
|
@ -585,6 +587,7 @@ for theme in variables.masscollect:
|
||||||
wantedcard["colour"] = deckkey[deck]["type"]
|
wantedcard["colour"] = deckkey[deck]["type"]
|
||||||
wantedcard["series"] = deckkey[deck]["series"]
|
wantedcard["series"] = deckkey[deck]["series"]
|
||||||
wantedcard["priority"] = 3
|
wantedcard["priority"] = 3
|
||||||
|
wantedcard["count"] = 0
|
||||||
wantedlist.append(wantedcard)
|
wantedlist.append(wantedcard)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
@ -597,6 +600,7 @@ for theme in variables.masscollect:
|
||||||
wantedcard["colour"] = deckkey[deck]["type"]
|
wantedcard["colour"] = deckkey[deck]["type"]
|
||||||
wantedcard["series"] = deckkey[deck]["series"]
|
wantedcard["series"] = deckkey[deck]["series"]
|
||||||
wantedcard["priority"] = 3
|
wantedcard["priority"] = 3
|
||||||
|
wantedcard["count"] = 0
|
||||||
wantedlist.append(wantedcard)
|
wantedlist.append(wantedcard)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
@ -608,11 +612,13 @@ for theme in variables.masscollect:
|
||||||
wantedcard["colour"] = deckkey[card[:-2]]["type"]
|
wantedcard["colour"] = deckkey[card[:-2]]["type"]
|
||||||
wantedcard["series"] = deckkey[card[:-2]]["series"]
|
wantedcard["series"] = deckkey[card[:-2]]["series"]
|
||||||
wantedcard["priority"] = 3
|
wantedcard["priority"] = 3
|
||||||
|
wantedcard["count"] = 0
|
||||||
wantedlist.append(wantedcard)
|
wantedlist.append(wantedcard)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
wantedlist = sorted(wantedlist, key=lambda d: d["name"])
|
wantedlist = sorted(wantedlist, key=lambda d: d["name"])
|
||||||
|
wantedlist = sorted(wantedlist, key=lambda d: d["count"],reverse=True)
|
||||||
wantedlist = sorted(wantedlist, key=lambda d: d["priority"])
|
wantedlist = sorted(wantedlist, key=lambda d: d["priority"])
|
||||||
|
|
||||||
removelist = []
|
removelist = []
|
||||||
|
@ -2420,50 +2426,61 @@ def wantedgen():
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(card["name"])
|
content.write(card["name"])
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
|
||||||
content.write("</textarea>\n<h2>High priority</h2>\n<textarea readonly>")
|
content.write("</textarea>\n<h2>High priority</h2>\n<textarea readonly>")
|
||||||
|
wanthigh = []
|
||||||
for card in wantedlist:
|
for card in wantedlist:
|
||||||
if card["priority"] == 1:
|
if card["priority"] == 1:
|
||||||
|
wanthigh.append(card)
|
||||||
|
wanthigh = sorted(wanthigh, key=lambda d: d["name"])
|
||||||
|
precomma = False
|
||||||
|
for card in wanthigh:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(card["name"])
|
content.write(card["name"])
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
|
||||||
content.write("</textarea>\n<p>")
|
content.write("</textarea>\n<p>")
|
||||||
for card in wantedlist:
|
precomma = False
|
||||||
if card["priority"] == 1:
|
for card in wanthigh:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(cardtext(card))
|
content.write(cardtext(card))
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
precomma = False
|
||||||
content.write("</p>\n<h2>Medium priority</h2>\n<textarea readonly>")
|
content.write("</p>\n<h2>Medium priority</h2>\n<textarea readonly>")
|
||||||
|
wantmed = []
|
||||||
for card in wantedlist:
|
for card in wantedlist:
|
||||||
if card["priority"] == 2:
|
if card["priority"] == 2:
|
||||||
|
wantmed.append(card)
|
||||||
|
wantmed = sorted(wantmed, key=lambda d: d["name"])
|
||||||
|
precomma = False
|
||||||
|
for card in wantmed:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(card["name"])
|
content.write(card["name"])
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
|
||||||
content.write("</textarea>\n<p>")
|
content.write("</textarea>\n<p>")
|
||||||
for card in wantedlist:
|
precomma = False
|
||||||
if card["priority"] == 2:
|
for card in wantmed:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(cardtext(card))
|
content.write(cardtext(card))
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
precomma = False
|
||||||
content.write("</p>\n<h2>Low priority</h2>\n<textarea readonly>")
|
content.write("</p>\n<h2>Low priority</h2>\n<textarea readonly>")
|
||||||
|
wantlow = []
|
||||||
for card in wantedlist:
|
for card in wantedlist:
|
||||||
if card["priority"] == 3:
|
if card["priority"] == 3:
|
||||||
|
wantlow.append(card)
|
||||||
|
wantlow = sorted(wantlow, key=lambda d: d["name"])
|
||||||
|
precomma = False
|
||||||
|
for card in wantlow:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(card["name"])
|
content.write(card["name"])
|
||||||
precomma = True
|
precomma = True
|
||||||
precomma = False
|
|
||||||
content.write("</textarea>\n<p>")
|
content.write("</textarea>\n<p>")
|
||||||
for card in wantedlist:
|
precomma = False
|
||||||
if card["priority"] == 3:
|
for card in wantlow:
|
||||||
if precomma:
|
if precomma:
|
||||||
content.write(", ")
|
content.write(", ")
|
||||||
content.write(cardtext(card))
|
content.write(cardtext(card))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue