From f18ce22b4721085bb252c5778ee687a8fe032cf2 Mon Sep 17 00:00:00 2001 From: Mez Date: Sat, 6 Sep 2025 20:51:03 +0100 Subject: [PATCH] Do incomplete trades properly --- README.org | 2 +- colors.py | 10 ++++------ log-template.py | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.org b/README.org index f71bde1..cb952cb 100644 --- a/README.org +++ b/README.org @@ -69,5 +69,5 @@ Python scripts to generate a mobile-friendly static site for tracking tcg cards - Add level images manually to =build/assets/levels/= - Add custom CSS to =build/user.css= *** Updating and building -- For each transaction, add a dictionary ={}= to the =log= list like in the example (removing any of ="received"=, ="lost"=, ="crayons"=, ="decks"=, ="coupons"=, ="pend"=, ="unpend"=, ="randomsin"= that aren’t relevant). +- For each transaction, add a dictionary ={}= to the =log= list like in the example (removing any of ="received"=, ="lost"=, ="crayons"=, ="decks"=, ="coupons"=, ="pend"=, ="unpend"= that aren’t relevant). - Run =./build.sh= in this directory to download the relevant card images and then upload everything to the server. diff --git a/colors.py b/colors.py index 4c01e99..f30ede8 100644 --- a/colors.py +++ b/colors.py @@ -2343,16 +2343,14 @@ def pendtradesgen(): if variables.newtab: content.write(" target=\"_blank\"") content.write(">" + event["date"].strftime("%Y-%m-%d") + "

\n") + allin = 0 try: - allin = len(event["pend"]) + event["randomsin"] + allin += len(event["received"]) except: - try: - allin = len(event["pend"]) - except: - allin = 0 + pass try: if len(event["lost"]) > allin: - lostlist = event["lost"][-(allin):] + lostlist = event["lost"][-(len(event["lost"]) - allin):] else: lostlist = event["lost"] except: diff --git a/log-template.py b/log-template.py index e6af18b..5dd55b7 100644 --- a/log-template.py +++ b/log-template.py @@ -11,7 +11,6 @@ log = [ "decks":["deck1","deck2","deck3","deck4","deck5","deck6","deck7","deck8"], # only if "event":"portfolio" "sketch":-1, # for turning in 1 sketchpad "pend":["card05"], # to mark a card as pending - "unpend":["card06"], # to remove a card from the pending list if a trade is cancelled - "randomsin":0 # for incomplete trades where you anticipate receiving a specified number of random cards + "unpend":["card06"] # to remove a card from the pending list if a trade is cancelled } ]