hltv-async-api 0.4.3__tar.gz → 0.4.4__tar.gz

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.4.3
+Version: 0.4.4
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/hltv_async_api/__init__.py

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

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/hltv_async_api/aiohltv.py

@@ -12,7 +12,6 @@ from aiohttp.client_exceptions import ClientProxyConnectionError, ClientResponse
     ServerDisconnectedError, ClientHttpProxyError
 import re
 
-
 import logging
 
 
@@ -236,7 +235,7 @@ class Hltv:
             else:
                 return await self.get_top_teams()
 
-    async def get_live_matches(self, max_ = 10):
+    async def get_live_matches(self, max_=10):
         """returns a list of all LIVE matches on HLTV along with the maps being played and the star ratings"""
         r = await self._fetch("https://www.hltv.org/matches")
         if not r:
@@ -244,30 +243,28 @@ class Hltv:
 
         live_matches = r.find("div", {'class', "liveMatchesContainer"})
 
-        #cant find a way, mby use socketio by hltv-score-bot ?? | other url ?
-
+        # cant find a way, mby use socketio by hltv-score-bot ?? | other url ?
 
     async def get_upcoming_matches(self, days: int = 7, min_rating: int = 1):
         """returns a list of all upcoming matches on HLTV"""
         r = await self._fetch("https://www.hltv.org/matches")
-        if not r:return
+        if not r: return
 
         matches = []
         try:
 
-
             for i, date_div in enumerate(r.find_all('div', {'class': 'upcomingMatchesSection'}), start=1):
                 if i > days:
                     break
                 date_ = date_div.find('span', {'class': 'matchDayHeadline'}).text.split()[-1]
-                matches_today = []
 
                 for match in date_div.find_all('div', {'class': 'upcomingMatch'}):
                     time_ = match.find('div', {'class': 'matchTime'}).text
                     rating = int(match['stars'])
                     if rating >= min_rating:
                         match_id_ = match.find('a')['href'].split('/')[2]
-
+                        t1_id = match['team1']
+                        t2_id = match['team2']
                         maps = match.find('div', {'class': 'matchMeta'}).text[-1:]
                         try:
                             teams = match.find_all('div', {'class': 'matchTeamName text-ellipsis'})
@@ -287,29 +284,28 @@ class Hltv:
                             except AttributeError:
                                 event = ''
 
-                        matches_today.append({
-                            'match_id': match_id_,
+                        matches.append({
+                            'id': match_id_,
+                            'date': date_,
+                            'time': time_,
                             'team1': team1,
                             'team2': team2,
-                            'time': time_,
+                            't1_id': t1_id,
+                            't2_id': t2_id,
                             'maps': maps,
                             'rating': rating,
                             'event': event
-                    })
+                        })
 
-                matches.append({
-                    'date': date_,
-                    'matches': matches_today
-                })
         except AttributeError:
             return None
         return matches
 
     async def get_match_info(self, match_id: str, team1: str, team2: str, event_title: str, stats: bool = True):
         r = await self._fetch(f"https://www.hltv.org/matches/{match_id}/"
-                             f"{team1.replace(' ', '-')}-vs-"
-                             f"{team2.replace(' ', '-')}-"
-                             f"{event_title.replace(' ', '-')}")
+                              f"{team1.replace(' ', '-')}-vs-"
+                              f"{team2.replace(' ', '-')}-"
+                              f"{event_title.replace(' ', '-')}")
         if not r:
             return
 
@@ -322,19 +318,18 @@ class Hltv:
             score1 = scores[0].get_text().replace('\n', '')[-1]
             score2 = scores[1].get_text().replace('\n', '')[-1]
 
-
         maps = []
         for map_div in r.find_all('div', {'class': 'mapholder'}):
 
-                mapname = map_div.find('div', {'class': 'mapname'}).text
-                try:
-                    r_teams = map_div.find_all('div', {'class': 'results-team-score'})
-                    r_team1 = r_teams[0].text
-                    r_team2 = r_teams[1].text
-                except AttributeError:
-                    r_team1 = '0'
-                    r_team2 = '0'
-                maps.append({'mapname': mapname, 'r_team1': r_team1, 'r_team2': r_team2})
+            mapname = map_div.find('div', {'class': 'mapname'}).text
+            try:
+                r_teams = map_div.find_all('div', {'class': 'results-team-score'})
+                r_team1 = r_teams[0].text
+                r_team2 = r_teams[1].text
+            except AttributeError:
+                r_team1 = '0'
+                r_team2 = '0'
+            maps.append({'mapname': mapname, 'r_team1': r_team1, 'r_team2': r_team2})
 
         stats_ = []
         if stats and status == 'Match over':
@@ -373,7 +368,6 @@ class Hltv:
 
         return match_id, score1, score2, status, maps, stats_
 
-
     async def get_big_results(self, offset=0) -> list[dict[str, Any]] | None:
         """returns a list of big event matches results"""
         r = await self._fetch("https://www.hltv.org/results?offset=" + str(offset))
@@ -442,7 +436,8 @@ class Hltv:
         live_matches: List | Any
         matches = []
         try:
-            live_matches = r.find("div", {'class', 'liveMatchesSection'}).find_all("div", {'class', 'liveMatch-container'})
+            live_matches = r.find("div", {'class', 'liveMatchesSection'}).find_all("div",
+                                                                                   {'class', 'liveMatch-container'})
         except AttributeError:
             live_matches = []
         for live in live_matches:
@@ -453,7 +448,6 @@ class Hltv:
             t1_id = live['team1']
             t2_id = live['team2']
 
-
             # TODO FIX SCORES
             """try:
                 scores = live.find("td", class_="matchTeamScore").text.strip().split('-')
@@ -491,22 +485,24 @@ class Hltv:
                     pass
 
                 matches.append({
-                        'id': id_,
-                        'date': date_,
-                        'time': time_,
-                        'team1': team1_,
-                        'team2': team2_,
-                        't1_id': t1_id,
-                        't2_id': t2_id
-                    })
+                    'id': id_,
+                    'date': date_,
+                    'time': time_,
+                    'team1': team1_,
+                    'team2': team2_,
+                    't1_id': t1_id,
+                    't2_id': t2_id
+                })
 
         return matches
+
     async def get_featured_events(self, max_: int = 1):
         r = await self._fetch('https://www.hltv.org/events')
 
         events = []
         try:
-            for i, event in enumerate(r.find('div', {'class': 'tab-content', 'id': 'FEATURED'}).find_all('a', {'class': 'a-reset ongoing-event'}), start=1):
+            for i, event in enumerate(r.find('div', {'class': 'tab-content', 'id': 'FEATURED'}).find_all('a', {
+                'class': 'a-reset ongoing-event'}), start=1):
                 if i > max_:
                     break
                 event_name = event.find('div', {'class': 'text-ellipsis'}).text.strip()
@@ -527,6 +523,7 @@ class Hltv:
             pass
 
         return events
+
     async def get_events(self, featured=True, outgoing=True, future=True, max_events=10):
         """Returns events
         :params:
@@ -545,7 +542,7 @@ class Hltv:
 
         if outgoing:
             for event in r.find('div', {'class': 'tab-content', 'id': 'TODAY'}).find_all('a', {
-                                'class': 'a-reset ongoing-event'}):
+                'class': 'a-reset ongoing-event'}):
                 event_name = event.find('div', {'class': 'text-ellipsis'}).text.strip()
                 event_start_date = self._normalize_date(
                     event.find('span', {'data-time-format': 'MMM do'}).text.strip().split())
@@ -584,7 +581,7 @@ class Hltv:
         return events
 
     async def get_event_info(self, event_id: str | int, event_title: str):
-        #TODO ADD WINNER?
+        # TODO ADD WINNER?
 
         r = await self._fetch(f"https://www.hltv.org/events/{str(event_id)}/{event_title.replace(' ', '-')}")
         if not r:
@@ -786,7 +783,8 @@ class Hltv:
             date_ = article_days[i]
             f_news = []
             reg_news = []
-            for featured_news_div in news_date_div.find_all('a', {'class': 'newsline article featured breaking-featured'}):
+            for featured_news_div in news_date_div.find_all('a',
+                                                            {'class': 'newsline article featured breaking-featured'}):
                 featured_id = featured_news_div['href'].split('/')[2]
                 featured_title = featured_news_div.find('div', {'class': 'featured-newstext'}).text
                 featured_description = featured_news_div.find('div', {'class': 'featured-small-newstext'}).text
@@ -798,7 +796,7 @@ class Hltv:
 
             if not only_featured and reg_news_num < max_reg_news:
                 for news_div in news_date_div.find_all('a',
-                                                           {'class': 'newsline article'}):
+                                                       {'class': 'newsline article'}):
                     if reg_news_num > max_reg_news:
                         break
                     if news_div['class'] != 'newsline article featured breaking-featured':
@@ -837,5 +835,6 @@ async def test():
     print(await hltv.get_top_teams())
     print(await hltv.get_best_players())
 
+
 if __name__ == "__main__":
     asyncio.run(test())

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/hltv_async_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.4.3
+Version: 0.4.4
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hltv_async_api"
-version = "0.4.3"
+version = "0.4.4"
 authors = [
   { name="Akim Slys", email="akimslys2003@gmail.com" },
 ]

{hltv_async_api-0.4.3 → hltv_async_api-0.4.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hltv_async_api',
-    version='0.4.3',
+    version='0.4.4',
     author='akimerslys',
     author_email='akimslys2003@gmail.com',
     description='Hltv-aio: An unofficial asynchronous HLTV API Wrapper for Python',