hltv-async-api 0.4.4__tar.gz → 0.4.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/PKG-INFO +1 -1
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api/__init__.py +1 -1
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api/aiohltv.py +14 -18
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api.egg-info/PKG-INFO +1 -1
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/pyproject.toml +1 -1
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/setup.py +2 -1
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/LICENSE +0 -0
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/README.md +0 -0
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api.egg-info/SOURCES.txt +0 -0
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api.egg-info/dependency_links.txt +0 -0
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/hltv_async_api.egg-info/top_level.txt +0 -0
- {hltv_async_api-0.4.4 → hltv_async_api-0.4.6}/setup.cfg +0 -0
|
@@ -63,6 +63,7 @@ class Hltv:
|
|
|
63
63
|
if self.session:
|
|
64
64
|
self.logger.debug('Closing Session')
|
|
65
65
|
await self.session.close()
|
|
66
|
+
self.session = None
|
|
66
67
|
|
|
67
68
|
def config(self, max_delay: int | None = None,
|
|
68
69
|
timeout: int | None = None,
|
|
@@ -115,7 +116,8 @@ class Hltv:
|
|
|
115
116
|
self.PROXY_LIST = self.PROXY_LIST[1:] + [(self.PROXY_LIST[0])]
|
|
116
117
|
self.logger.info(f"New proxy: {self.PROXY_LIST[0] if self.PROXY_LIST[0] else 'No Proxy'}")
|
|
117
118
|
|
|
118
|
-
|
|
119
|
+
@staticmethod
|
|
120
|
+
def _f(result):
|
|
119
121
|
return BeautifulSoup(result, "lxml")
|
|
120
122
|
|
|
121
123
|
async def _cloudflare_check(self, result) -> bool:
|
|
@@ -173,11 +175,13 @@ class Hltv:
|
|
|
173
175
|
status = False
|
|
174
176
|
try_ = 1
|
|
175
177
|
result = None
|
|
178
|
+
|
|
179
|
+
# parse until success or not maxretries
|
|
176
180
|
while (not status) and (try_ != self.max_retries):
|
|
177
181
|
self.logger.debug(f'Trying connect to {url}, try {try_}/{self.max_retries}')
|
|
178
182
|
|
|
179
183
|
# if status = True, result = page,
|
|
180
|
-
# if status = False result = delay (default=0)
|
|
184
|
+
# if status = False, result = delay (default=0)
|
|
181
185
|
status, result = await self._parse(url, delay)
|
|
182
186
|
|
|
183
187
|
if not status and result:
|
|
@@ -186,9 +190,8 @@ class Hltv:
|
|
|
186
190
|
|
|
187
191
|
# After Parse
|
|
188
192
|
if not self.TRUE_SESSION:
|
|
189
|
-
#
|
|
193
|
+
# Automatically close session after parse
|
|
190
194
|
await self.close_session()
|
|
191
|
-
self.session = None
|
|
192
195
|
|
|
193
196
|
if status:
|
|
194
197
|
loop = get_running_loop()
|
|
@@ -198,10 +201,6 @@ class Hltv:
|
|
|
198
201
|
self.logger.error('Connection failed')
|
|
199
202
|
return None
|
|
200
203
|
|
|
201
|
-
def save_error(self, page):
|
|
202
|
-
with open("error.html", "w") as file:
|
|
203
|
-
file.write(page.prettify())
|
|
204
|
-
|
|
205
204
|
@staticmethod
|
|
206
205
|
def _normalize_date(parts) -> str:
|
|
207
206
|
month_abbreviations = {
|
|
@@ -326,7 +325,7 @@ class Hltv:
|
|
|
326
325
|
r_teams = map_div.find_all('div', {'class': 'results-team-score'})
|
|
327
326
|
r_team1 = r_teams[0].text
|
|
328
327
|
r_team2 = r_teams[1].text
|
|
329
|
-
except AttributeError:
|
|
328
|
+
except (AttributeError, IndexError):
|
|
330
329
|
r_team1 = '0'
|
|
331
330
|
r_team2 = '0'
|
|
332
331
|
maps.append({'mapname': mapname, 'r_team1': r_team1, 'r_team2': r_team2})
|
|
@@ -344,7 +343,7 @@ class Hltv:
|
|
|
344
343
|
rating = player.find('td', class_='rating').text.strip()
|
|
345
344
|
stats_.append({
|
|
346
345
|
'id': player_id,
|
|
347
|
-
'
|
|
346
|
+
'nickname': nickname,
|
|
348
347
|
'kd': kd,
|
|
349
348
|
'adr': adr,
|
|
350
349
|
'rating': rating
|
|
@@ -404,7 +403,6 @@ class Hltv:
|
|
|
404
403
|
|
|
405
404
|
for result in r.find("div", {'class', 'results-holder'}).find_all("div", {'class', 'results-sublist'}):
|
|
406
405
|
date = result.find("span", class_="standard-headline").text.strip()
|
|
407
|
-
match_date = []
|
|
408
406
|
for match in result.find_all("a", class_="a-reset"):
|
|
409
407
|
id_ = match['href'].split('/')[2]
|
|
410
408
|
teams = match.find_all("div", class_="team")
|
|
@@ -415,17 +413,15 @@ class Hltv:
|
|
|
415
413
|
score_t1 = scores[0].strip()
|
|
416
414
|
score_t2 = scores[1].strip()
|
|
417
415
|
|
|
418
|
-
|
|
416
|
+
# add team ids?
|
|
417
|
+
match_results.append({
|
|
419
418
|
'id': id_,
|
|
419
|
+
'date': date,
|
|
420
420
|
'team1': team1,
|
|
421
421
|
'team2': team2,
|
|
422
422
|
'score1': score_t1,
|
|
423
423
|
'score2': score_t2,
|
|
424
424
|
})
|
|
425
|
-
match_results.append({
|
|
426
|
-
'date': date,
|
|
427
|
-
'matches': match_date,
|
|
428
|
-
})
|
|
429
425
|
return match_results
|
|
430
426
|
|
|
431
427
|
async def get_event_matches(self, event_id: str | int, days: int = 1):
|
|
@@ -515,7 +511,7 @@ class Hltv:
|
|
|
515
511
|
|
|
516
512
|
events.append({
|
|
517
513
|
'id': event_id,
|
|
518
|
-
'
|
|
514
|
+
'title': event_name,
|
|
519
515
|
'start_date': event_start_date,
|
|
520
516
|
'end_date': event_end_date,
|
|
521
517
|
})
|
|
@@ -553,7 +549,7 @@ class Hltv:
|
|
|
553
549
|
|
|
554
550
|
events.append({
|
|
555
551
|
'id': event_id,
|
|
556
|
-
'
|
|
552
|
+
'title': event_name,
|
|
557
553
|
'start_date': event_start_date,
|
|
558
554
|
'end_date': event_end_date,
|
|
559
555
|
})
|
|
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
|
|
2
2
|
|
|
3
3
|
setup(
|
|
4
4
|
name='hltv_async_api',
|
|
5
|
-
version='0.4.
|
|
5
|
+
version='0.4.6',
|
|
6
6
|
author='akimerslys',
|
|
7
7
|
author_email='akimslys2003@gmail.com',
|
|
8
8
|
description='Hltv-aio: An unofficial asynchronous HLTV API Wrapper for Python',
|
|
@@ -22,6 +22,7 @@ setup(
|
|
|
22
22
|
'lxml==5.2.0',
|
|
23
23
|
'soupsieve==2.5',
|
|
24
24
|
'yarl==1.9.4',
|
|
25
|
+
'pytz==2024.1',
|
|
25
26
|
],
|
|
26
27
|
classifiers=[
|
|
27
28
|
'Programming Language :: Python :: 3',
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|