hltv-async-api 0.2.4__tar.gz → 0.2.6__tar.gz

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.2.4
+Version: 0.2.6
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys
@@ -14,7 +14,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
+# hltv-async-api an unofficial asynchronous HLTV API Wrapper for Python
 
 # Features
 
@@ -30,7 +30,7 @@ License-File: LICENSE
 # Installation
 
 ```
-pip install hltv-aio
+pip install hltv_async_api
 ```
 
 ---
@@ -39,7 +39,7 @@ pip install hltv-aio
 # Simple Usage
 
 ```
-from hltv-aio import Hltv
+from hltv_async_api import Hltv
 
 hltv = Hltv()
 live_matches = await hltv.get_live_matches()
@@ -83,6 +83,9 @@ hltv = Hltv(use_proxy=True, proxy_list=proxy_list, proxy_protocol='http')
 ****Simple Example****
 
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv()
@@ -96,6 +99,9 @@ if __name__ == "__main__":
 
 ****Proxy Parser****
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv(debug=True, use_proxy=True, proxy_path='proxy_test.txt', timeout=1, remove_proxy=True, proxy_protocol='http')

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/README.md

@@ -1,4 +1,4 @@
-# Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
+# hltv-async-api an unofficial asynchronous HLTV API Wrapper for Python
 
 # Features
 
@@ -14,7 +14,7 @@
 # Installation
 
 ```
-pip install hltv-aio
+pip install hltv_async_api
 ```
 
 ---
@@ -23,7 +23,7 @@ pip install hltv-aio
 # Simple Usage
 
 ```
-from hltv-aio import Hltv
+from hltv_async_api import Hltv
 
 hltv = Hltv()
 live_matches = await hltv.get_live_matches()
@@ -67,6 +67,9 @@ hltv = Hltv(use_proxy=True, proxy_list=proxy_list, proxy_protocol='http')
 ****Simple Example****
 
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv()
@@ -80,6 +83,9 @@ if __name__ == "__main__":
 
 ****Proxy Parser****
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv(debug=True, use_proxy=True, proxy_path='proxy_test.txt', timeout=1, remove_proxy=True, proxy_protocol='http')

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/hltv_async_api/__init__.py

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

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/hltv_async_api/aiohltv.py

@@ -86,8 +86,8 @@ class Hltv:
         else:
             proxy = self.PROXY_LIST[0]
 
-        if self.PROXY_PROTOCOL not in proxy and proxy != '':
-            proxy = self.PROXY_PROTOCOL + '://' + proxy
+        if self.PROXY_PROTOCOL and proxy != '' and self.PROXY_PROTOCOL not in proxy:
+       	    proxy = self.PROXY_PROTOCOL + '://' + proxy
 
         return proxy
 
@@ -145,12 +145,12 @@ class Hltv:
                 self.logger.info(f"Fetching {url}, code: {response.status}")
                 if response.status == 403 or response.status == 404:
                     self.logger.debug("Got 403 forbitten")
-                    return False, self.parse_error_handler(proxy, delay)
+                    return False, await self.parse_error_handler(proxy, delay)
 
                 # checking for challenge page.
                 result = await response.text()
                 if await self.cloudflare_check(result):
-                    return False, self.parse_error_handler(proxy, delay)
+                    return False, await self.parse_error_handler(proxy, delay)
 
                 return True, result
         except (ClientProxyConnectionError, ClientResponseError, ClientOSError,
@@ -213,18 +213,60 @@ class Hltv:
             stars = [line.get('stars') for line in liveMatchContainer]
             return [{'teams': teams, 'maps': maps, 'stars': stars} for teams, maps, stars in zip(matches, maps, stars)]
 
-    async def get_upcoming_matches(self):
+    async def get_upcoming_matches(self, days: int = 7, star_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:
-            teams = [line.getText() for line in r.find("div",
-                                                       {'class', "upcomingMatchesContainer"}).find_all(
-                class_=lambda v: v is not None and (v == "team text-ellipsis" or v == "matchTeamName text-ellipsis"))]
+
+            days = 7
+            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 >= star_rating:
+                        maps = match.find('div', {'class': 'matchMeta'}).text[-1:]
+                        try:
+                            teams = match.find_all('div', {'class': 'matchTeamName text-ellipsis'})
+
+                            team1 = teams[0].text
+                            team2 = teams[1].text
+                        except (IndexError, AttributeError):
+                            team1 = 'TBD'
+                            team2 = 'TBD'
+
+                        try:
+                            event = match.find('div', {'class', 'matchEventName gtSmartphone-only'}).text
+                        except AttributeError:
+
+                            try:
+                                event = match.find('span', {'class': 'line-clamp-3'}).text
+                            except AttributeError:
+                                event = ''
+
+                        matches_today.append({
+                            'team1': team1,
+                            'team2': team2,
+                            'time': time_,
+                            'maps': maps,
+                            'rating': rating,
+                            'event': event
+                    })
+
+                matches.append({
+                    'date': date_,
+                    'matches': matches_today
+                })
         except AttributeError:
             return None
-        return [(team1, team2) for team1, team2 in tuple(zip(teams, teams[1:]))[::2]]
+        return matches
 
     async def get_important_upcoming_matches(self, star_rating=1):
         """returns a list of all upcoming matches on HLTV with the star rating argument (should be between 0 and 5)"""
@@ -597,7 +639,7 @@ class Hltv:
 
 async def test():
     hltv = Hltv()
-    print(await hltv.get_event_info(7148, 'pgl-cs2-major-copenhagen-2024'))
+    print(await hltv.get_upcoming_matches())
 
 
 if __name__ == "__main__":

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/hltv_async_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.2.4
+Version: 0.2.6
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys
@@ -14,7 +14,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
+# hltv-async-api an unofficial asynchronous HLTV API Wrapper for Python
 
 # Features
 
@@ -30,7 +30,7 @@ License-File: LICENSE
 # Installation
 
 ```
-pip install hltv-aio
+pip install hltv_async_api
 ```
 
 ---
@@ -39,7 +39,7 @@ pip install hltv-aio
 # Simple Usage
 
 ```
-from hltv-aio import Hltv
+from hltv_async_api import Hltv
 
 hltv = Hltv()
 live_matches = await hltv.get_live_matches()
@@ -83,6 +83,9 @@ hltv = Hltv(use_proxy=True, proxy_list=proxy_list, proxy_protocol='http')
 ****Simple Example****
 
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv()
@@ -96,6 +99,9 @@ if __name__ == "__main__":
 
 ****Proxy Parser****
 ```
+from hltv_async_api import Hltv
+
+
 async def test():
 
     hltv = Hltv(debug=True, use_proxy=True, proxy_path='proxy_test.txt', timeout=1, remove_proxy=True, proxy_protocol='http')

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/pyproject.toml

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

{hltv_async_api-0.2.4 → hltv_async_api-0.2.6}/setup.py

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