Merge pull request #5 from heyudude/show-player-details

Show player details

Author: heyudude

.gitignore

@@ -8,10 +8,10 @@ __pycache__/
 
 # vscode
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
+.vscode/settings.json
+.vscode/tasks.json
+.vscode/launch.json
+.vscode/extensions.json
 *.code-workspace
 
 # Local History for Visual Studio Code

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "python.pythonPath": "/home/hans/repo/BrawlStars-Club-Tools/.env/bin/python3.8"
+    "python.pythonPath": "bin/python"
 }

README.rst

@@ -68,7 +68,7 @@ optional arguments:
 Optional config file
 ==================================================
 
-bstools looks for a config file in your home directory called .bstools
+bstools looks by default for a config file in your home directory called /home/<name>/myclub/bstools.ini
 
 This is an INI file. As of current version, there's only one possible
 parameter: api_key. The file should look like:

bstools/__init__.py

@@ -7,7 +7,7 @@
 from ._version import __version__
 from .bstools import build_dashboard
 from .config import load_config_file
-from .memberfactory import MemberFactory
+from .factory import MemberFactory, PlayerFactory, BrawlerFactory
 from .scorecalc import ScoreCalculator
 
 logger = logging.getLogger(__name__)
@@ -58,7 +58,7 @@ def parse_args(argv):
 
     return parser.parse_args(argv)
 
-def get_config_from_args(args, check_config_file=True, config_default='~/.bstools'):
+def get_config_from_args(args, check_config_file=True, config_default='~/myclub/bstools.ini'):
     if args.version:
         print(__version__)
         exit(0)

bstools/_version.py

@@ -1 +1 @@
-__version__ = "0.0.2"
+__version__ = "0.0.3"

bstools/api_wrapper.py

@@ -21,15 +21,37 @@ def __init__(self, config):
         self.clubs = pybrawl.ClubsApi(pybrawl.ApiClient(api_config))
         self.players = pybrawl.PlayersApi(pybrawl.ApiClient(api_config))
 
-    def get_data_from_api(self): # pragma: no coverage
+    def get_club_from_api(self): # pragma: no coverage
         try:
             # Get Club data from API 
             club = self.clubs.get_club(self.config['api']['club_id'])
-            player = self.players.get_player(self.config['api']['player_id'])
             logger.info('- Found Club: {} ({})'.format(club.tag, club.name))
+
+            return (club)
+        except pybrawl.ApiException as e:
+            if e.body:
+                body = json.loads(e.body)
+                if body['reason'] == 'accessDenied':
+                    logger.error('403: developer.brawlstars.com claims that your API key is invalid. Please make sure you are setting up bstools with a valid key.')
+                elif body['reason'] == 'accessDenied.invalidIp':
+                    logger.error('developer.brawlstars.com says: {}'.format(body['message']))
+                else:
+                    logger.error('error: {}'.format(body))
+            else:
+                logger.error('error: {}'.format(e))
+        except pybrawl.OpenApiException as e:
+            logger.error('Apiwrapper error: {}'.format(e))
+
+        # If we've gotten here, something has gone wrong. We need to abort the application.
+        exit(0)
+
+    def get_player_from_api(self, player_tag): # pragma: no coverage
+        try:
+            # Get player data from API 
+            player = self.players.get_player(player_tag)
             logger.info('- Found Player: {} ({})'.format(player.tag, player.name))
 
-            return (club, player)
+            return (player)
         except pybrawl.ApiException as e:
             if e.body:
                 body = json.loads(e.body)
@@ -46,3 +68,33 @@ def get_data_from_api(self): # pragma: no coverage
 
         # If we've gotten here, something has gone wrong. We need to abort the application.
         exit(0)
+
+    def get_brawlers_for_player(self, member_tag):
+
+        logger.debug("Getting brawlers for player {}".format(member_tag))
+        try:
+            # Get player data and brawlers from API.
+            player = self.players.get_player(member_tag)
+
+            logger.debug("Player: {}".format(player.name))
+            for brawler in player.brawlers:
+                logger.debug("Brawler: {}".format(brawler.name))
+            return 
+
+        except pybrawl.ApiException as e:
+            if e.body:
+                body = json.loads(e.body)
+                if body['reason'] == 'accessDenied':
+                    logger.error(
+                        'developer.brawlstars.com claims that your API key is invalid. Please make sure you are setting up crtools with a valid key.')
+                elif body['reason'] == 'accessDenied.invalidIp':
+                    logger.error(
+                        'developer.brawlstars.com says: {}'.format(body['message']))
+                else:
+                    logger.error('error: {}'.format(body))
+            else:
+                logger.error('error: {}'.format(e))
+        except pyroyale.OpenApiException as e:
+            logger.error('error: {}'.format(e))
+
+        return False

bstools/bstools.py

@@ -20,8 +20,8 @@
 from bstools import fankit
 from bstools import io
 from bstools import discord
-from bstools.memberfactory import MemberFactory
-from bstools.models import FormerMember, ProcessedClub, ProcessedPlayer
+from bstools.factory import MemberFactory, PlayerFactory, BrawlerFactory
+from bstools.models import FormerMember, ProcessedClub, ProcessedPlayer, ProcessedBrawler
 
 MAX_CLAN_SIZE = 100
 
@@ -119,23 +119,50 @@ def process_members(config, club, member_history):
     api_config = pybrawl.Configuration()
     api_config.api_key['authorization'] = config['api']['api_key']
     api_config.access_token = config['api']['api_key']
-    logger.debug("players instance")
-    players = pybrawl.PlayersApi(pybrawl.ApiClient(api_config))
-    factory = MemberFactory(
+ 
+    mfactory = MemberFactory(
         config=config,
         club=club,
         member_history=member_history)
     members_processed = []
     rank = 0
     for member_src in club.members:
         playertag = member_src.tag
-        player = players.get_player(playertag)
-        explevel = player.exp_level
         rank = rank + 1
-        members_processed.append(factory.get_processed_member(member_src, rank, explevel))
+        members_processed.append(mfactory.get_processed_member(member_src, rank))
 
     return members_processed
- 
+
+def process_players(config, club):
+    """ Process player and brawlers list """
+
+    # process player with results from the API
+    api_config = pybrawl.Configuration()
+    api_config.api_key['authorization'] = config['api']['api_key']
+    api_config.access_token = config['api']['api_key']
+    api = ApiWrapper(config)
+
+
+    # bfactory = BrawlerFactory(
+    #     config=config,
+    #     brawler=brawler)
+
+    players_processed = []
+    for player_src in club.members:
+        logger.debug("Process player: {}".format(player_src.name))
+        player = api.get_player_from_api(player_src.tag)
+        pfactory = PlayerFactory(
+            config=config,
+            player=player)
+        players_processed.append(pfactory.get_processed_player(player))
+        # for brawler_src in player.brawlers:
+        #     logger.debug("Process brawler: {}".format(brawler_src.name))
+        #     #player_tag = player_src.tag
+        #     brawler_tag = brawler_src.name
+        #     brawlers_processed.append(bfactory.get_processed_brawler(brawler_src))
+
+    return players_processed
+
 def process_absent_members(config, historical_members):
     absent_members = []
 
@@ -166,7 +193,7 @@ def build_dashboard(config): # pragma: no coverage
     print('- info: requesting info for Club id: {}'.format(config['api']['club_id']))
 
     api = ApiWrapper(config)
-    club, player = api.get_data_from_api()
+    club = api.get_club_from_api()
 
     # Create temporary directory. All file writes, until the very end,
     # will happen in this directory, so that no matter what we do, it
@@ -179,7 +206,8 @@ def build_dashboard(config): # pragma: no coverage
 
         # process data from API
         club_processed = ProcessedClub(club, config)
-        player_processed = ProcessedPlayer(player, config)
+        players_processed = process_players(config, club)
+    
         member_history = history.get_member_history(club.members, config['bstools']['timestamp'], io.get_previous_history(output_path))
         members_processed = process_members(config, club, member_history)
         former_members = process_absent_members(config, member_history['members'])
@@ -190,6 +218,7 @@ def build_dashboard(config): # pragma: no coverage
             tempdir,
             club_processed,
             members_processed,
+            players_processed,
             former_members,
             get_suggestions(config, members_processed, club_processed.required_trophies),
             get_scoring_rules(config)
@@ -202,8 +231,9 @@ def build_dashboard(config): # pragma: no coverage
                 {
                     'club'                  : club.to_dict(),
                     'club-processed'        : club_processed,
-                    'player-processed'      : player_processed,
+                    'players-processed'     : players_processed,
                     'members-processed'     : members_processed,
+                    'former-members'        : former_members,
                 }
             )
 

bstools/config.py

@@ -171,12 +171,12 @@ def __localize_strings(locale_id):
         'labelMemberLastActivity'   : _('Last Active'),
         'labelBeforeHistory'        : _('Before recorded history'),
         'labelArena'                : _('Arena'),
-        'labelXpLevel'              : _('XP Level'),
+        'labelExpLevel'             : _('Exp Level'),
         'labelScore'                : _('Score'),
         'labelRank'                 : _('Rank'),
         'labelTrophies'             : _('Trophies'),
-        'labelDonations'            : _('Dona­tions'),
-        'labelDonationsRecieved'    : _('Donations received'),
+        'labelDonations'            : _('Donations'),
+        'labelDonationsReceived'    : _('Donations received'),
         'labelDaysInactive'         : _('Days Inactive'),
         'labelDays'                 : _('Days'),
         'labelMonths'               : _('Months'),
@@ -223,6 +223,12 @@ def __localize_strings(locale_id):
 
         'dialogTitleMemberDetails'  : _('Member Details'),
         'dialogLabelPlayerStats'    : _('Player Stats and Info'),
+        'dialogLabelPlayerDetails'  : _('Brawlers'),
+        'dialogLabelPlayerBra'      : _('Brawler'),
+        'dialogLabelPlayerBtr'      : _('Trophies'),
+        'dialogLabelPlayerBht'      : _('Highest Trophies'),
+        'dialogLabelPlayerBpo'      : _('Power'),
+        'dialogLabelPlayerBrn'      : _('Rank'),
         'dialogMemberStatsRoyale'   : _('See on BrawlStats'),
         'dialogMemberRoyaleApi'     : _('See on BrawlStats'),
         'dialogLabelPlayerHistory'  : _('Player History'),

bstools/memberfactory.py renamed to bstools/factory.py

@@ -1,7 +1,8 @@
+from bstools.models import ProcessedPlayer
 from datetime import datetime
 import logging
 
-from bstools.models import Demerit, ProcessedMember
+from bstools.models import Demerit, ProcessedMember, ProcessedPlayer, ProcessedBrawler
 from bstools import history
 from bstools.scorecalc import ScoreCalculator
 
@@ -11,22 +12,20 @@ class MemberFactory:
     def __init__(self, config, club, member_history, days_from_donation_reset=0):
         self.config = config
         self.club = club
-        # self.current_war = current_war
-        # self.warlog = warlog
         self.member_history = member_history
         self.days_from_donation_reset = days_from_donation_reset
         self.now = config['bstools']['timestamp']
         self.history_start_timestamp = member_history['history_start']
         self.max_days_from_join = (self.now - datetime.fromtimestamp(self.history_start_timestamp)).days
 
 
-    def get_processed_member(self, member, rank, explevel):
-        processed_member = ProcessedMember(member, rank, explevel)
+    def get_processed_member(self, member, rank):
+        processed_member = ProcessedMember(member, rank)
 
         self.enrich_member_with_history(processed_member, self.member_history['members'][processed_member.tag])
         self.calc_special_status(processed_member)
         self.calc_derived_member_stats(processed_member)
-
+    
         return processed_member
 
     def enrich_member_with_history(self, member, historical_member):
@@ -140,7 +139,6 @@ def calc_derived_member_stats(self, member):
         #member.donation_score = score_calc.get_member_donations_score(member) # TODO
         member.donation_score = 0
 
-
         # calculate score based on war participation # TODO
         member.war_score = 0
         # for war in member.warlog:
@@ -271,3 +269,29 @@ def calc_activity_status(self, days_inactive):
             return 'ok'
 
         return 'normal'
+
+# Process Players brawlers / battles
+class PlayerFactory:
+    def __init__(self, config, player):
+        self.config = config
+        self.player = player
+
+    def get_processed_player(self, player):
+
+        processed_player = ProcessedPlayer(player)
+
+        return processed_player
+
+# Process Players brawlers / battles 
+class BrawlerFactory:
+    def __init__(self, config, brawler):
+        self.config = config
+        self.brawler = brawler
+
+    def get_processed_brawler(self, brawler):
+
+        processed_brawler = ProcessedBrawler(brawler)
+
+        return processed_brawler
+   
+# EOF

bstools/io.py

@@ -19,7 +19,7 @@
     'show_rank'                 : 'rank',
     'show_rank_previous'        : 'rank.previous',
     'show_name'                 : 'name',
-    'show_xp_level'             : 'xp-level',
+    'show_xp_level'             : 'exp-level',
     'show_score'                : 'score',
     'show_trophies'             : 'trophies',
     'show_last_seen'            : 'last-seen',
@@ -67,7 +67,7 @@ def copy_static_assets(tempdir, club_logo_path, favicon_path):
     shutil.copyfile(favicon_path, os.path.join(tempdir, FAVICON_FILENAME))
 
 
-def parse_templates(config, history, tempdir, club, members, former_members, suggestions, scoring_rules): # pragma: no coverage
+def parse_templates(config, history, tempdir, club, members, players, former_members, suggestions, scoring_rules): # pragma: no coverage
     # Create environment for template parser
     env = Environment(
         loader=PackageLoader('bstools', 'templates'),
@@ -86,6 +86,7 @@ def parse_templates(config, history, tempdir, club, members, former_members, sug
         strings           = config['strings'],
         update_date       = datetime.now().strftime('%c'),
         members           = members,
+        players           = players,
         club              = club,
         club_hero         = config['paths']['description_html_src'],
         suggestions       = suggestions,
@@ -111,6 +112,12 @@ def parse_templates(config, history, tempdir, club, members, former_members, sug
         write_object_to_file(os.path.join(tempdir, 'sitemap.xml'), sitemap_xml)
         write_object_to_file(os.path.join(tempdir, 'robots.txt'), robots_txt)
 
+        # test
+        # p_html = env.get_template('p.html.j2').render(
+        #     players = players
+        # )
+        # write_object_to_file(os.path.join(tempdir, 'p.html'), p_html)
+    
 def dump_debug_logs(tempdir, objects_to_dump):
     """ archive outputs of API and other objects for debugging """
     log_path = os.path.join(tempdir, 'log')