Merge pull request #28 from emkael/develv1.2.0

v1.2

1 files changed, 82 insertions, 18 deletions

diff --git a/jfr_playoff/tournamentinfo.py b/jfr_playoff/tournamentinfo.py
index ee96214..45a7752 100644
--- a/jfr_playoff/tournamentinfo.py
+++ b/jfr_playoff/tournamentinfo.py
@@ -3,8 +3,9 @@ import re
 
 import jfr_playoff.sql as p_sql
 from jfr_playoff.remote import RemoteUrl as p_remote
+from jfr_playoff.logger import PlayoffLogger
 
-SWISS_TIE_WARNING = 'WARNING: tie detected in swiss %s.' + \
+SWISS_TIE_WARNING = 'tie detected in swiss %s.' + \
                     ' Make sure to resolve the tie by arranging teams' + \
                     ' in configuration file.'
 
@@ -19,7 +20,9 @@ class TournamentInfo:
         if 'link' not in self.settings:
             raise KeyError('link not configured')
         if not self.settings['link'].endswith('leaderb.html'):
-            raise ValueError('unable to determine tournament results')
+            raise ValueError('invalid link to tournament results')
+        PlayoffLogger.get('tournamentinfo').info(
+            'fetching tournament results from leaderboard URL: %s', self.settings['link'])
         leaderboard = p_remote.fetch(self.settings['link'])
         result_links = [row.select('a[onmouseover]') for row in leaderboard.find_all('tr') if len(row.select('a[onmouseover]')) > 0]
         results = [None] * (len(result_links) * max([len(links) for links in result_links]))
@@ -39,15 +42,23 @@ class TournamentInfo:
                 if team_image is not None:
                     team_info.append(team_image['src'].replace('images/', ''))
                 teams.append(team_info)
+        PlayoffLogger.get('tournamentinfo').info(
+            'read tournament results from leaderboard: %s', teams)
         for table in range(1, int(ceil(len(teams)/2.0))+1):
             table_url = self.get_results_link('1t%d-1.html' % (table))
             table_content = p_remote.fetch(table_url)
+            PlayoffLogger.get('tournamentinfo').info(
+                'reading team shortnames from traveller: %s', table_url)
             for link in table_content.select('a.br'):
                 if link['href'] in team_links:
                     for team in teams:
                         if team[0] == team_links[link['href']]:
                             team[1] = link.text.strip(u'\xa0')
+                            PlayoffLogger.get('tournamentinfo').info(
+                                'shortname for %s: %s', team[0], team[1])
                             break
+        PlayoffLogger.get('tournamentinfo').info(
+            'tournament results from HTML: %s', teams)
         return teams
 
     def __get_db_results(self):
@@ -66,23 +77,44 @@ class TournamentInfo:
         swiss_results = sorted(
             swiss_results, key=lambda t: t[1], reverse=True)
         swiss_results = sorted(swiss_results, key=lambda team: team[2])
+        PlayoffLogger.get('tournamentinfo').info(
+            'fetched tournament results from database %s: %s',
+            self.settings['database'], swiss_results)
         prev_result = None
         for team in swiss_results:
             if prev_result == team[1]:
-                print SWISS_TIE_WARNING % (self.settings['database'])
+                PlayoffLogger.get('tournamentinfo').warning(
+                    SWISS_TIE_WARNING, self.settings['database'])
             prev_result = team[1]
         db_teams = [[team[0], team[3], team[4]] for team in swiss_results]
+        PlayoffLogger.get('tournamentinfo').info(
+            'fetched team list from database %s: %s',
+            self.settings['database'], db_teams)
         return db_teams
 
     def __get_html_finished(self):
         if 'link' not in self.settings:
             raise KeyError('link not configured')
         if not self.settings['link'].endswith('leaderb.html'):
-            raise ValueError('unable to determine tournament status')
+            raise ValueError('invalid tournament leaderboard link')
+        PlayoffLogger.get('tournamentinfo').info(
+            'fetching tournament finished status from HTML: %s',
+            self.settings['link'])
         leaderboard = p_remote.fetch(self.settings['link'])
         leaderb_heading = leaderboard.select('td.bdnl12')[0].text
+        contains_digits = any(char.isdigit() for char in leaderb_heading)
+        PlayoffLogger.get('tournamentinfo').info(
+            'tournament header from HTML: %s, %s',
+            leaderb_heading, 'contains digits' if contains_digits else "doesn't contain digits")
         non_zero_scores = [imps.text for imps in leaderboard.select('td.bdc small') if imps.text != '0-0']
-        return (not any(char.isdigit() for char in leaderb_heading)) and (len(non_zero_scores) > 0)
+        PlayoffLogger.get('tournamentinfo').info(
+            'tournament leaderboard from HTML: has %d non-zero scores',
+            len(non_zero_scores))
+        finished = (not contains_digits) and (len(non_zero_scores) > 0)
+        PlayoffLogger.get('tournamentinfo').info(
+            'tournament leaderboard from HTML indicates finished: %s',
+            finished)
+        return finished
 
     def __get_db_finished(self):
         if self.database is None:
@@ -91,14 +123,21 @@ class TournamentInfo:
             raise KeyError('database not configured')
         finished = self.database.fetch(
             self.settings['database'], p_sql.SWISS_ENDED, {})
+        PlayoffLogger.get('tournamentinfo').info(
+            'fetching tournament finished status from DB %s: %s',
+            self.settings['database'], finished)
         return (len(finished) > 0) and (finished[0] > 0)
 
     def __get_html_link(self, suffix='leaderb.html'):
         if 'link' not in self.settings:
             raise KeyError('link not configured')
         if not self.settings['link'].endswith('leaderb.html'):
-            raise ValueError('unable to determine html link')
-        return re.sub(r'leaderb.html$', suffix, self.settings['link'])
+            raise ValueError('invalid tournament leaderboard link')
+        link = re.sub(r'leaderb.html$', suffix, self.settings['link'])
+        PlayoffLogger.get('tournamentinfo').info(
+            'generating tournament-specific link from leaderboard link %s: %s -> %s',
+            self.settings['link'], suffix, link)
+        return link
 
     def __get_db_link(self, suffix='leaderb.html'):
         if self.database is None:
@@ -109,20 +148,33 @@ class TournamentInfo:
             self.settings['database'], p_sql.PREFIX, ())
         if row is not None:
             if len(row) > 0:
-                return row[0] + suffix
+                link = row[0] + suffix
+                PlayoffLogger.get('tournamentinfo').info(
+                    'generating tournament-specific link from DB %s prefix: %s -> %s',
+                    self.settings['database'], suffix, link)
+                return link
         raise ValueError('unable to fetch db link')
 
     def get_tournament_results(self):
         teams = []
         try:
             teams = self.__get_db_results()
-        except (IOError, TypeError, IndexError, KeyError):
+        except (IOError, TypeError, IndexError, KeyError) as e:
+            PlayoffLogger.get('tournamentinfo').warning(
+                'cannot determine tournament results from DB: %s(%s)',
+                type(e).__name__, str(e))
             try:
                 teams = self.__get_html_results()
-            except (TypeError, IndexError, KeyError, IOError, ValueError):
-                pass
-        if self.is_finished() and 'final_positions' in self.settings:
-            for position in self.settings['final_positions']:
+            except (TypeError, IndexError, KeyError, IOError, ValueError) as e:
+                PlayoffLogger.get('tournamentinfo').warning(
+                    'cannot determine tournament results from HTML: %s(%s)',
+                    type(e).__name__, str(e))
+        if self.is_finished():
+            final_positions = self.settings.get('final_positions', [])
+            PlayoffLogger.get('tournamentinfo').info(
+                'setting final positions from tournament results: %s',
+                final_positions)
+            for position in final_positions:
                 if len(teams) >= position:
                     teams[position-1].append(position)
         return teams
@@ -130,19 +182,31 @@ class TournamentInfo:
     def is_finished(self):
         try:
             return self.__get_db_finished()
-        except (IOError, TypeError, IndexError, KeyError):
+        except (IOError, TypeError, IndexError, KeyError) as e:
+            PlayoffLogger.get('tournamentinfo').warning(
+                'cannot determine tournament finished status from DB: %s(%s)',
+                type(e).__name__, str(e))
             try:
                 return self.__get_html_finished()
-            except (TypeError, IndexError, KeyError, IOError, ValueError):
-                pass
+            except (TypeError, IndexError, KeyError, IOError, ValueError) as e:
+                PlayoffLogger.get('tournamentinfo').warning(
+                    'cannot determine tournament finished status from HTML: %s(%s)',
+                    type(e).__name__, str(e))
+        PlayoffLogger.get('tournamentinfo').info(
+            'assuming tournament is finished')
         return True
 
     def get_results_link(self, suffix='leaderb.html'):
         try:
             return self.__get_db_link(suffix)
-        except (IOError, TypeError, IndexError, KeyError):
+        except (IOError, TypeError, IndexError, KeyError) as e:
+            PlayoffLogger.get('tournamentinfo').warning(
+                'cannot determine tournament link from DB: %s(%s)',
+                type(e).__name__, str(e))
             try:
                 return self.__get_html_link(suffix)
             except (KeyError, ValueError):
-                pass
+                PlayoffLogger.get('tournamentinfo').warning(
+                    'cannot determine tournament link from HTML: %s(%s)',
+                    type(e).__name__, str(e))
         return None