diff --git a/colors.py b/colors.py index 2cb36a4..d619c73 100644 --- a/colors.py +++ b/colors.py @@ -89,19 +89,24 @@ for event in log.log: thecard["name"] = card thecard["received"] = event["date"] thecard["mass"] = [] - thecard["priority"] = 0 + if thecard["name"] in variables.faves: + thecard["priority"] = 1 + else: + thecard["priority"] = 0 if card[0:4] != "sig_": for theme in variables.masscollect: try: if thedeck in variables.masscollect[theme]["decks"]: thecard["mass"].append(theme) - thecard["priority"] = 3 + if thecard["priority"] == 0: + thecard["priority"] = 3 except KeyError: pass try: if card in variables.masscollect[theme]["singles"]: thecard["mass"].append(theme) - thecard["priority"] = 2 + if thecard["priority"] == 0: + thecard["priority"] = 2 except KeyError: pass if card[0:4] == "sig_": @@ -123,7 +128,7 @@ for event in log.log: thecard["priority"] = 1 else: if thecard["priority"] == 0: - if thedeck in variables.highpriority or thecard["name"] in variables.faves: + if thedeck in variables.highpriority: thecard["priority"] = 1 elif len(thecard["mass"]) > 0: thecard["priority"] = 3