From 6f147d1b37de5c12b77c51ca2f80031cbec6ae20 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Mon, 1 Oct 2018 14:54:58 +0200
Subject: Refactoring team name list in matches as actual list

---
 jfr_playoff/matchinfo.py | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'jfr_playoff/matchinfo.py')

diff --git a/jfr_playoff/matchinfo.py b/jfr_playoff/matchinfo.py
index ab742d4..e9854c5 100644
--- a/jfr_playoff/matchinfo.py
+++ b/jfr_playoff/matchinfo.py
@@ -58,9 +58,9 @@ class MatchInfo:
                     teams[i].score = self.config['score'][score]
                     try:
                         team_no = int(score)
-                        teams[i].name = self.teams[team_no-1][0]
+                        teams[i].name = [self.teams[team_no-1][0]]
                     except ValueError:
-                        teams[i].name = score
+                        teams[i].name = [score]
                     teams_fetched = True
                 else:
                     teams[i].score = score
@@ -77,8 +77,8 @@ 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]
+        teams[0].name = [row[0]]
+        teams[1].name = [row[1]]
         if fetch_scores:
             teams[0].score = row[3] + row[5]
             teams[1].score = row[4] + row[6]
@@ -147,7 +147,7 @@ class MatchInfo:
                        if isinstance(text, unicode)][0].strip(u'\xa0')
                       for link in row.select('a[onmouseover]')]
         for i in range(0, 2):
-            teams[i].name = team_names[i]
+            teams[i].name = [team_names[i]]
             teams[i].score = scores[i]
         PlayoffLogger.get('matchinfo').info(
             'HTML scores for match #%d: %s',
@@ -158,9 +158,9 @@ class MatchInfo:
         for i in range(0, 2):
             match_teams = []
             if isinstance(self.config['teams'][i], basestring):
-                teams[i].name = self.config['teams'][i]
+                teams[i].name = [self.config['teams'][i]]
             elif isinstance(self.config['teams'][i], list):
-                teams[i].name = '<br />'.join(self.config['teams'][i])
+                teams[i].name = self.config['teams'][i]
             else:
                 if 'winner' in self.config['teams'][i]:
                     match_teams += [
@@ -176,11 +176,10 @@ class MatchInfo:
                         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 = '<br />'.join([
-                    team if team is not None
-                    else '??' for team in match_teams])
+                teams[i].name = [team if team is not None
+                                 else '??' for team in match_teams]
             else:
-                teams[i].name = ''
+                teams[i].name = ['']
         PlayoffLogger.get('matchinfo').info(
             'config scores for match #%d: %s',
             self.info.id, teams)
@@ -341,13 +340,15 @@ class MatchInfo:
                                    else boards_played
 
     def __determine_outcome(self):
-        if (self.info.running == -1):
-            if self.info.teams[0].score > self.info.teams[1].score:
-                self.info.winner = self.info.teams[0].name
-                self.info.loser = self.info.teams[1].name
-            else:
-                self.info.loser = self.info.teams[0].name
-                self.info.winner = self.info.teams[1].name
+        if (len(self.info.teams[0].name) == 1) \
+           and (len(self.info.teams[1].name) == 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]
+                    self.info.loser = self.info.teams[1].name[0]
+                else:
+                    self.info.loser = self.info.teams[0].name[0]
+                    self.info.winner = self.info.teams[1].name[0]
 
     def __get_db_running_link(self, prefix, round_no):
         current_segment = int(
-- 
cgit v1.2.3