hltv-async-api 0.2.8__tar.gz → 0.3.0__tar.gz

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/PKG-INFO

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

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/hltv_async_api/__init__.py

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

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/hltv_async_api/aiohltv.py

@@ -42,6 +42,10 @@ class Hltv:
         self._configure_logging()
         self.logger = logging.getLogger(__name__)
 
+        if self.PROXY_PATH:
+            with open(self.PROXY_PATH, "r") as file:
+                self.PROXY_LIST = [line.strip() for line in file.readlines()]
+
     def _configure_logging(self):
         level = logging.DEBUG if self.DEBUG else logging.INFO
         logging.basicConfig(level=level, format="%(message)s")
@@ -62,8 +66,6 @@ class Hltv:
             self.timeout = timeout
         if use_proxy:
             self.USE_PROXY = use_proxy
-        if proxy_file_path:
-            self.PROXY_PATH = proxy_file_path
         if proxy_list:
             self.PROXY_LIST = proxy_list
         if max_retries:
@@ -75,37 +77,26 @@ class Hltv:
         if debug:
             self.DEBUG = debug
             self._configure_logging()
+        if proxy_file_path:
+            with open(self.PROXY_PATH, "r") as file:
+                self.PROXY_LIST = [line.strip() for line in file.readlines()]
 
     async def get_proxy(self):
-        proxy = ''
-        if self.PROXY_PATH:
-            async with aiofiles.open(self.PROXY_PATH, "r") as file:
-                new_proxy = await file.readline().strip()
-                if new_proxy:
-                    proxy = new_proxy
-
-        else:
-            proxy = self.PROXY_LIST[0]
+        proxy = self.PROXY_LIST[0]
 
         if self.PROXY_PROTOCOL and proxy != '' and self.PROXY_PROTOCOL not in proxy:
             proxy = self.PROXY_PROTOCOL + '://' + proxy
 
         return proxy
 
-    async def switch_proxy(self, proxy):
-        if self.PROXY_PATH:
-            if self.PROXY_PROTOCOL:
-                proxy = proxy.replace(self.PROXY_PROTOCOL + '://', '')
-            async with aiofiles.open(self.PROXY_PATH, "r+") as file:
-                proxies = await file.readlines()
-                await file.seek(0)
-                for line in proxies:
-                    if line.strip() != proxy:
-                        await file.write(line)
-                if not self.REMOVE_PROXY:
-                    await file.write(proxy + "\n")
+    async def switch_proxy(self):
+        if self.REMOVE_PROXY:
+            self.logger.debug(f'Removing proxy {self.PROXY_LIST[0]}')
+            self.PROXY_LIST = self.PROXY_LIST[1:]
         else:
-            self.PROXY_LIST = self.PROXY_LIST[1:] + [self.PROXY_LIST[0]]
+            self.logger.debug(f"Switching proxy {self.PROXY_LIST[0]}")
+            self.PROXY_LIST = self.PROXY_LIST[1:] + self.PROXY_LIST[0]
+            self.logger.info(f"New proxy: {self.PROXY_LIST[0]}")
 
     def f(self, result):
         return BeautifulSoup(result, "lxml")
@@ -121,9 +112,7 @@ class Hltv:
 
     async def parse_error_handler(self, proxy, delay: int = 0) -> int:
         if self.USE_PROXY:
-            self.logger.debug(f"Switching proxy {proxy}")
-            await self.switch_proxy(proxy)
-            self.logger.info(f"New proxy: {await self.get_proxy()}")
+            await self.switch_proxy()
         else:
             if delay < self.MAX_DELAY:
                 delay += 1
@@ -689,7 +678,7 @@ class Hltv:
 
 
 async def test():
-    hltv = Hltv()
+    hltv = Hltv(use_proxy=True, proxy_path='proxies.txt', debug=True, remove_proxy=True, proxy_protocol='http')
     print(await hltv.get_last_news(only_today=True, max_reg_news=1))
 
 

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/hltv_async_api.egg-info/PKG-INFO

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

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/pyproject.toml

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

{hltv_async_api-0.2.8 → hltv_async_api-0.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hltv_async_api',
-    version='0.2.8',
+    version='0.3.0',
     author='akimerslys',
     author_email='akimslys2003@gmail.com',
     description='Hltv-aio: An unofficial asynchronous HLTV API Wrapper for Python',
@@ -14,6 +14,7 @@ setup(
     install_requires=[
         'aiohttp==3.9.3',
         'aiosignal==1.3.1',
+        'aiofiles==23.2.1',
         'attrs==23.2.0',
         'beautifulsoup4==4.12.3',
         'frozenlist==1.4.1',