hltv-async-api 0.5.0__tar.gz → 0.5.2__tar.gz

{hltv_async_api-0.5.0 → hltv_async_api-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.5.0
+Version: 0.5.2
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Author: Akim Slys
 Author-email: akimslys2003@gmail.com
@@ -209,7 +209,7 @@ pip install hltv-async-api
   
   ```
   
-  await hltv.get('matches', 2370773, 'res-regional-series-3-latam', 'FURIA', 'MIBR')
+  await hltv.get('matches', 2371201, 'res-regional-series-3-latam', 'IMPERIAL', 'MIBR')
   
   >>> (2371201, 0, 0, 'LIVE', [{'mapname': 'Vertigo', 'r_team1': '6', 'r_team2': '13'}, {'mapname': 'Mirage', 'r_team1': '-', 'r_team2': '-'}, {'mapname': 'Anubis', 'r_team1': '-', 'r_team2': '-'}], [])
   

{hltv_async_api-0.5.0 → hltv_async_api-0.5.2}/README.md

@@ -186,7 +186,7 @@ pip install hltv-async-api
   
   ```
   
-  await hltv.get('matches', 2370773, 'res-regional-series-3-latam', 'FURIA', 'MIBR')
+  await hltv.get('matches', 2371201, 'res-regional-series-3-latam', 'IMPERIAL', 'MIBR')
   
   >>> (2371201, 0, 0, 'LIVE', [{'mapname': 'Vertigo', 'r_team1': '6', 'r_team2': '13'}, {'mapname': 'Mirage', 'r_team1': '-', 'r_team2': '-'}, {'mapname': 'Anubis', 'r_team1': '-', 'r_team2': '-'}], [])
   

{hltv_async_api-0.5.0 → hltv_async_api-0.5.2}/hltv_async_api/__init__.py

@@ -6,4 +6,4 @@
 from .aiohltv import Hltv
 
 __author__ = 'akimerslys'
-__version__ = '0.5.0'
+__version__ = '0.5.2'

{hltv_async_api-0.5.0 → hltv_async_api-0.5.2}/hltv_async_api/aiohltv.py

@@ -282,7 +282,7 @@ class Hltv:
                             'event': event
                         })
 
-            if upcoming:
+            if future:
                 for i, date_div in enumerate(r.find_all('div', {'class': 'upcomingMatchesSection'}), start=1):
                     if i > days:
                         break
@@ -292,13 +292,18 @@ class Hltv:
                         time_ = match.find('div', {'class': 'matchTime'}).text
                         rating = int(match['stars'])
                         if rating >= min_rating:
+                            id_ = 0
+                            t1_id = 0
+                            t2_id = 0
+                            team1 = 'TBD'
+                            team2 = 'TBD'
+
                             try:
-                                match_id_ = match.find('a')['href'].split('/')[2]
+                                id_ = match.find('a')['href'].split('/')[2]
                                 t1_id = match['team1']
                                 t2_id = match['team2']
                             except (IndexError, AttributeError, KeyError):
-                                t1_id = 0
-                                t2_id = 0
+                                pass
                             maps = match.find('div', {'class': 'matchMeta'}).text[-1:]
                             try:
                                 teams = match.find_all('div', {'class': 'matchTeamName text-ellipsis'})
@@ -306,8 +311,7 @@ class Hltv:
                                 team1 = teams[0].text
                                 team2 = teams[1].text
                             except (IndexError, AttributeError):
-                                team1 = 'TBD'
-                                team2 = 'TBD'
+                                pass
 
                             try:
                                 event = match.find('div', {'class', 'matchEventName gtSmartphone-only'}).text
@@ -319,7 +323,7 @@ class Hltv:
                                     event = ''
 
                             matches.append({
-                                'id': match_id_,
+                                'id': id_,
                                 'date': date_,
                                 'time': time_,
                                 'team1': team1,
@@ -400,7 +404,7 @@ class Hltv:
                         score2 = 13
                         score1 = int(map["r_team1"])
 
-        return match_id, score1, score2, status, maps, stats_
+        return {'id': match_id, 'score1': score1, 'score2': score2, 'status': status, 'maps': maps, 'stats': stats_}
 
     async def get_results(self, days: int = 1,
                           min_rating: int = 1,
@@ -682,7 +686,7 @@ class Hltv:
     async def get_event_info(self, event_id: str | int, event_title: str):
         # TODO ADD WINNER?
 
-        r = await self._fetch(f"https://www.hltv.org/events/{str(event_id)}/{event_title.replace(' ', '-')}")
+        r = await self._fetch(f"https://hltv.org/events/{str(event_id)}/{event_title.replace(' ', '-')}")
         if not r:
             return
 
@@ -709,7 +713,14 @@ class Hltv:
         except AttributeError:
             groups = []
 
-        return event_id, event_title, event_start, event_end, prize, team_num, location, groups
+        return {'id': event_id,
+                'title': event_title,
+                'start': event_start,
+                'end': event_end,
+                'prize': prize,
+                'teams': team_num,
+                'location': location,
+                'group': groups}
 
     async def get_top_teams(self, max_teams=30):
         """
@@ -769,7 +780,7 @@ class Hltv:
 
         return teams
 
-    async def get_team_info(self, team_id: int | str, title: str) -> tuple | None:
+    async def get_team_info(self, team_id: int | str, title: str) -> dict[str, list[str]]:
         """
         Returns Information about team
         :params:
@@ -791,24 +802,35 @@ class Hltv:
             coach = ''
 
             for i, stat in enumerate(r.find_all('div', {'class': 'profile-team-stat'}), start=1):
-                if i == 1:
-                    rank = stat.find('a').text[1:]
-                elif i == 2:
-                    weeks = stat.find('span', {'class': 'right'}).text
-                elif i == 3:
-                    age = stat.find('span', {'class': 'right'}).text
-                elif i == 4:
-                    coach = stat.find('span', {'class': 'bold a-default'}).text[1:-1]
+                try:
+                    if i == 1:
+                        rank = stat.find('a').text[1:]
+                    elif i == 2:
+                        weeks = stat.find('span', {'class': 'right'}).text
+                    elif i == 3:
+                        age = stat.find('span', {'class': 'right'}).text
+                    elif i == 4:
+                        coach = stat.find('span', {'class': 'bold a-default'}).text[1:-1]
+                except AttributeError:
+                    pass
 
             last_trophy = None
-            total_trophys = None
+            total_trophies = None
             try:
                 last_trophy = r.find('div', {'class': 'trophyHolder'}).find('span')['title']
-                total_trophys = len(r.find_all('div', {'class': 'trophyHolder'}))
+                total_trophies = len(r.find_all('div', {'class': 'trophyHolder'}))
             except AttributeError:
                 pass
 
-            return team_id, title, rank, players, coach, age, weeks, last_trophy, total_trophys
+            return {'id': team_id,
+                    'title': title,
+                    'rank': rank,
+                    'players': players,
+                    'coach': coach,
+                    'age': age,
+                    'weekstop30': weeks,
+                    'last_trophy': last_trophy,
+                    'total_trophies': total_trophies}
         except AttributeError:
             raise AttributeError("Parsing error, probably page not fully loaded")
 

{hltv_async_api-0.5.0 → hltv_async_api-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hltv_async_api"
-version = "0.5.0"
+version = "0.5.2"
 authors = ["Akim Slys <akimslys2003@gmail.com>"]
 description = "Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python"
 readme = "README.md"