summaryrefslogtreecommitdiff
path: root/jfr_playoff/matchinfo.py
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2018-10-01 16:09:07 +0200
committeremkael <emkael@tlen.pl>2018-10-01 16:09:07 +0200
commit03ab8b041179daa2ed75966a3c2255e239f8fde7 (patch)
tree2f81c45931ddce766dd91eeacb36e1f054585236 /jfr_playoff/matchinfo.py
parent6f147d1b37de5c12b77c51ca2f80031cbec6ae20 (diff)
Explicitly counting known teams for match boxes
Diffstat (limited to 'jfr_playoff/matchinfo.py')
-rw-r--r--jfr_playoff/matchinfo.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/jfr_playoff/matchinfo.py b/jfr_playoff/matchinfo.py
index e9854c5..f7a156d 100644
--- a/jfr_playoff/matchinfo.py
+++ b/jfr_playoff/matchinfo.py
@@ -77,8 +77,9 @@ class MatchInfo:
row = self.database.fetch(
self.config['database'], p_sql.MATCH_RESULTS,
(self.config['table'], self.config['round']))
- teams[0].name = [row[0]]
- teams[1].name = [row[1]]
+ for i in range(0, 2):
+ teams[i].name = [row[i]]
+ teams[i].known_teams = 1
if fetch_scores:
teams[0].score = row[3] + row[5]
teams[1].score = row[4] + row[6]
@@ -148,6 +149,7 @@ class MatchInfo:
for link in row.select('a[onmouseover]')]
for i in range(0, 2):
teams[i].name = [team_names[i]]
+ teams[i].known_teams = 1
teams[i].score = scores[i]
PlayoffLogger.get('matchinfo').info(
'HTML scores for match #%d: %s',
@@ -174,12 +176,8 @@ class MatchInfo:
match_teams += [
self.teams[place-1][0]
for place in self.config['teams'][i]['place']]
- known_teams = [team for team in match_teams if team is not None]
- if len(known_teams) > 0:
- teams[i].name = [team if team is not None
- else '??' for team in match_teams]
- else:
- teams[i].name = ['']
+ teams[i].name = match_teams
+ teams[i].known_teams = len([team for team in match_teams if team is not None])
PlayoffLogger.get('matchinfo').info(
'config scores for match #%d: %s',
self.info.id, teams)
@@ -340,8 +338,8 @@ class MatchInfo:
else boards_played
def __determine_outcome(self):
- if (len(self.info.teams[0].name) == 1) \
- and (len(self.info.teams[1].name) == 1):
+ if (self.info.teams[0].known_teams == 1) \
+ and (self.info.teams[1].known_teams == 1):
if self.info.running == -1:
if self.info.teams[0].score > self.info.teams[1].score:
self.info.winner = self.info.teams[0].name[0]