Skip to content

Commit

Permalink
#99 refactored some pylint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Sh4kE committed Dec 10, 2016
1 parent da5afbd commit 2cd6997
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 49 deletions.
6 changes: 5 additions & 1 deletion core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ def __str__(self):
def get_iso(self):
return self.country

@staticmethod
def get_choices():
return dict(Country._meta.get_field('country').choices)


class League(models.Model):
LEAGUES = (
Expand All @@ -297,7 +301,7 @@ class League(models.Model):
country = models.ForeignKey(Country)

def __str__(self):
return "%s %s (%s)" % (self.LEAGUES[self.league][1], self.relay, self.country)
return "%s %s (%s)" % (self.LEAGUES[self.league][1], self.relay, self.country) # pylint: disable=invalid-sequence-index


class Player(models.Model):
Expand Down
67 changes: 23 additions & 44 deletions core/parsers/finances_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,57 +28,36 @@ def parse_html(self, soup):

finance_table = soup.find(id="einaus").find_all('table')[2]
finance_values = finance_table.find_all('tr')
balance = self._int_from_money(finance_values[25].find_all('td')[5].get_text())

income_visitors_league = self._int_from_money(finance_values[4].find_all('td')[3].div.get_text())
income_sponsoring = self._int_from_money(finance_values[5].find_all('td')[3].div.get_text())
income_cup = self._int_from_money(finance_values[6].find_all('td')[3].div.get_text())
income_interests = self._int_from_money(finance_values[7].find_all('td')[3].div.get_text())
income_loan = self._int_from_money(finance_values[8].find_all('td')[3].div.get_text())
income_transfer = self._int_from_money(finance_values[9].find_all('td')[3].div.get_text())
income_visitors_friendlies = self._int_from_money(finance_values[10].find_all('td')[3].div.get_text())
income_friendlies = self._int_from_money(finance_values[11].find_all('td')[3].div.get_text())
income_funcup = self._int_from_money(finance_values[12].find_all('td')[3].div.get_text())
income_betting = self._int_from_money(finance_values[13].find_all('td')[3].div.get_text())

expenses_player_salaries = self._int_from_money(finance_values[4].find_all('td')[11].div.get_text())
expenses_stadium = self._int_from_money(finance_values[5].find_all('td')[11].div.get_text())
expenses_youth = self._int_from_money(finance_values[6].find_all('td')[11].div.get_text())
expenses_interests = self._int_from_money(finance_values[7].find_all('td')[11].div.get_text())
expenses_trainings = self._int_from_money(finance_values[8].find_all('td')[11].div.get_text())
expenses_transfer = self._int_from_money(finance_values[9].find_all('td')[11].div.get_text())
expenses_compensation = self._int_from_money(finance_values[10].find_all('td')[11].div.get_text())
expenses_friendlies = self._int_from_money(finance_values[11].find_all('td')[11].div.get_text())
expenses_funcup = self._int_from_money(finance_values[12].find_all('td')[11].div.get_text())
expenses_betting = self._int_from_money(finance_values[13].find_all('td')[11].div.get_text())

finances, _ = Finance.objects.get_or_create(
user=self.user,
matchday=self.matchday,
)
logger.debug('===== Finance parsed: %s', finances)

finances.balance = balance
finances.income_visitors_league = income_visitors_league
finances.income_sponsoring = income_sponsoring
finances.income_cup = income_cup
finances.income_interests = income_interests
finances.income_loan = income_loan
finances.income_transfer = income_transfer
finances.income_visitors_friendlies = income_visitors_friendlies
finances.income_friendlies = income_friendlies
finances.income_funcup = income_funcup
finances.income_betting = income_betting
finances.expenses_player_salaries = expenses_player_salaries
finances.expenses_stadium = expenses_stadium
finances.expenses_youth = expenses_youth
finances.expenses_interests = expenses_interests
finances.expenses_trainings = expenses_trainings
finances.expenses_transfer = expenses_transfer
finances.expenses_compensation = expenses_compensation
finances.expenses_friendlies = expenses_friendlies
finances.expenses_funcup = expenses_funcup
finances.expenses_betting = expenses_betting
finances.balance = self._int_from_money(finance_values[25].find_all('td')[5].get_text())

finances.income_visitors_league = self._int_from_money(finance_values[4].find_all('td')[3].div.get_text())
finances.income_sponsoring = self._int_from_money(finance_values[5].find_all('td')[3].div.get_text())
finances.income_cup = self._int_from_money(finance_values[6].find_all('td')[3].div.get_text())
finances.income_interests = self._int_from_money(finance_values[7].find_all('td')[3].div.get_text())
finances.income_loan = self._int_from_money(finance_values[8].find_all('td')[3].div.get_text())
finances.income_transfer = self._int_from_money(finance_values[9].find_all('td')[3].div.get_text())
finances.income_visitors_friendlies = self._int_from_money(finance_values[10].find_all('td')[3].div.get_text())
finances.income_friendlies = self._int_from_money(finance_values[11].find_all('td')[3].div.get_text())
finances.income_funcup = self._int_from_money(finance_values[12].find_all('td')[3].div.get_text())
finances.income_betting = self._int_from_money(finance_values[13].find_all('td')[3].div.get_text())

finances.expenses_player_salaries = self._int_from_money(finance_values[4].find_all('td')[11].div.get_text())
finances.expenses_stadium = self._int_from_money(finance_values[5].find_all('td')[11].div.get_text())
finances.expenses_youth = self._int_from_money(finance_values[6].find_all('td')[11].div.get_text())
finances.expenses_interests = self._int_from_money(finance_values[7].find_all('td')[11].div.get_text())
finances.expenses_trainings = self._int_from_money(finance_values[8].find_all('td')[11].div.get_text())
finances.expenses_transfer = self._int_from_money(finance_values[9].find_all('td')[11].div.get_text())
finances.expenses_compensation = self._int_from_money(finance_values[10].find_all('td')[11].div.get_text())
finances.expenses_friendlies = self._int_from_money(finance_values[11].find_all('td')[11].div.get_text())
finances.expenses_funcup = self._int_from_money(finance_values[12].find_all('td')[11].div.get_text())
finances.expenses_betting = self._int_from_money(finance_values[13].find_all('td')[11].div.get_text())

finances.save()

Expand Down
7 changes: 4 additions & 3 deletions core/parsers/future_match_row_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ def parse_html(self, row):
"""

# we assume to have parsed the season beforehand (with the matchday)
season = Matchday.objects.all()[0].season
matchday_number = row.find_all('td')[0].get_text().replace('\n', '')
matchday, _ = Matchday.objects.get_or_create(season=season, number=matchday_number)
matchday, _ = Matchday.objects.get_or_create(
season=Matchday.objects.all()[0].season,
number=row.find_all('td')[0].get_text().replace('\n', '')
)

is_home_match = "black" in row.find_all('td')[1].a.get('class')

Expand Down
2 changes: 1 addition & 1 deletion core/parsers/players_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def parse_row(self, player_row):

displayed_country = player_values[8].get_text().replace('\n', '').replace('\t', '').strip(' ')
country_name = ''.join([i for i in displayed_country if not i.isdigit()])
country_choices = dict(Country._meta.get_field('country').choices)
country_choices = Country.get_choices()
country_no = list(country_choices.keys())[list(country_choices.values()).index(country_name)]
nationality, _ = Country.objects.get_or_create(country=country_no)

Expand Down

0 comments on commit 2cd6997

Please sign in to comment.