commit b5ba16c64871a640672f76eaf150de45a092f848
parent b99a102515a9cd69d1ba7a39992353662d9e3cd1
Author: alex wennerberg <alex@alexwennerberg.com>
Date: Sat, 10 Feb 2024 17:07:12 -0500
fix data issues
Diffstat:
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/getdata.py b/getdata.py
@@ -81,7 +81,8 @@ create table if not exists match (
);"""]
def save_sheet(cur, sheet, n, final):
- rows = [[cell.value for cell in row if cell.value != None] for row in sheet.rows]
+ sheetrows = list(sheet.rows)
+ rows = [[cell.value for cell in row if cell.value != None] for row in sheetrows]
group = ""
i = 0
while i < len(rows):
@@ -90,11 +91,15 @@ def save_sheet(cur, sheet, n, final):
if len(row) < 3:
continue
group = row[0].partition(" ")[2]
+ print(row)
if final:
group = "final"
try:
start = row.index("VS") + 1
end = row.index("Score")
+ if sheetrows[0][0].value == None: # missing text in upper left cell
+ start += 1
+ end += 1
except ValueError:
start = 2
end = len(row)
@@ -104,7 +109,7 @@ def save_sheet(cur, sheet, n, final):
i += 1
player = row[0]
if len(player) > 50 and player[0] == "B":
- player = "Beefman"
+ player = "Beefman" # messy unicode
cards = row[1].split("\n")
if not final: #already done
cur.execute("insert into deck values (?,?,?,?,?);", (n, player, clean_card(cards[0]), clean_card(cards[1]), clean_card(cards[2])))
@@ -190,5 +195,4 @@ if __name__ == "__main__":
con.execute(table)
update_bans()
main()
- export_html()
diff --git a/templates/index.html b/templates/index.html
@@ -12,10 +12,10 @@ tr:hover {background-color: #ddd;}
</head>
<body>
<h1>3 Card Blind Data Analysis</h1>
- Full, cleaned data for <a href="//3cardmagic.org">3 card blind metashape</a>. Source code can be found <a href="//git.alexw.nyc/3cardblind">here</a>.
+ Full, cleaned data for <a href="//3cardmagic.org">3 card blind metashape</a>. Source code can be found <a href="//git.alexw.nyc/3cardblind">here</a>. <a href="export.tsv">Download</a> an export as tsv-formatted data.
<p>Click on a header to sort by that value.</p>
<table class="sortable">
- <th><td>player</td><td>card_1</td><td>card 2</td>
+ <th><td>player</td><td>card 1</td><td>card 2</td>
<td>card 3</td><td>group</td><td>score</td><td>final</td>
</th>
{% for deck in decks %}
