Merge pull request #86 from TheFinalJoke/dev

Dev

Author: TheFinalJoke

lib/binary_build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="1.1.0"
+VERSION="1.2.0"
 
 # Can't put full folders
 echo "Building the binary"

lib/sports/baseball/__init__.py renamed to lib/sports/apisports/__init__.py

@@ -0,0 +1,43 @@
+from lib.sports.sportbase import SportBase
+from lib.sports.apisports.baseball.baseball import Baseball
+from lib.sports.apisports.basketball.basketball import Basketball
+from lib.sports.apisports.hockey.hockey import Hockey
+from lib.sports.apisports.football.football import Football
+import json
+import sys
+import os
+
+class ApiSports(SportBase):
+    def __init__(self, config):
+        self.config = config
+        self.sport = self.config['sport']
+        try:
+            if "sport_token" in self.config['basic']:
+                self.token = self.config['basic'].get('sport_token')
+            else:
+                self.token = os.environ['SPORTTOKEN']
+        except KeyError:
+            self.logger.critical("No Sport Token")
+            sys.exit("No Sport Token")
+        self.headers = {'x-apisports-key': 'ebb2c44c416b9a9a0b538e2d73c7dbe6'}
+
+    async def run_api_sports(self):
+        sport_data = {"Sport": {}}
+        if 'football' == self.sport.get('sport').lower():
+            self.logger.debug("Running football data")
+            football = Football(self.token, self.config['sport'], self.headers)
+            football_return = await football.run()
+            sport_data['Sport'].update({'football': football_return})
+        elif 'baseball' == self.sport.get('sport').lower():
+            self.logger.debug('Running baseball data')
+            baseball = Baseball(self.token, self.config['sport'], self.headers)
+            sport_data = await baseball.run()
+        elif 'basketball' == self.sport.get('sport').lower():
+            self.logger.debug('Got basketball in config')
+            basketball = Basketball(self.token, self.config['sport'], self.headers)
+            sport_data = await basketball.run()
+        elif 'hockey' == self.sport.get('sport').lower():
+            self.logger.debug('Got Hockey from Config')
+            hockey = Hockey(self.token, self.config['sport'], self.headers)
+            sport_data = await hockey.run()
+        return sport_data

lib/sports/apisports/apisports.py

@@ -1,5 +1,6 @@
 from lib.run import Runner
 from datetime import datetime
+from lib.sports.apisports.result import SportApiResult
 
 class Baseball(Runner):
     def __init__(self, token, config, headers):
@@ -33,4 +34,5 @@ async def run(self):
         api_data = {}
         for section, url in self.url_builder(parsed).items():
             api_data.update({section: await self.get_data(url, self.headers)})
-        return api_data
+        api_data['sport'] = 'baseball'
+        return SportApiResult(api_data)

lib/sports/basketball/__init__.py renamed to lib/sports/apisports/baseball/__init__.py

@@ -1,5 +1,6 @@
 from lib.run import Runner
 from datetime import datetime
+from lib.sports.apisports.result import SportApiResult
 
 class Basketball(Runner):
     def __init__(self, token, config, headers):
@@ -24,9 +25,9 @@ def url_builder(self, args):
         urls = {}
         base = "https://v1.basketball.api-sports.io/"
         if 'standings' in args:
-            urls.update({'standings': base + f'standings?league=12&season=2020-2021'})
+            urls.update({'standings': base + f'standings?league=12&season=2019-2020'})
         if 'next_game' in args:
-            urls.update({'next_game': base + f"games?team={self.config.getint('team_id')}&league=12&season=2020-2021&timezone=America/Chicago"})
+            urls.update({'next_game': base + f"games?team={self.config.getint('team_id')}&league=12&season=2019-2020&timezone=America/Chicago"})
         return urls
 
     async def run(self):
@@ -35,4 +36,5 @@ async def run(self):
         api_data = {}
         for section, url in self.url_builder(parsed).items():
             api_data.update({section: await self.get_data(url, self.headers)})
-        return api_data
+        api_data['sport'] = 'basketball'
+        return SportApiResult(api_data)