Skip to content

Commit 8c7a76d

Browse files
committed
- release 1.6.2
1 parent 6ccf930 commit 8c7a76d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "xnxx_api"
7-
version = "1.6.1"
7+
version = "1.6.2"
88
description = "A Python API for the Porn Site xnxx.com"
99
readme = "README.md"
1010
requires-python = ">=3.6"

xnxx_api/xnxx_api.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def html_content(self) -> str:
219219
def total_pages(self) -> str:
220220
return REGEX_SEARCH_TOTAL_PAGES.search(self.html_content).group(1)
221221

222-
def videos(self, pages_concurrency: int = 2, videos_concurrency: int = 5, pages: int = 0) -> Generator[Video, None, None]:
222+
def videos(self, pages_concurrency: int = None, videos_concurrency: int = None, pages: int = 0) -> Generator[Video, None, None]:
223223
self.url = f"https://www.xnxx.com/search{self.mode}{self.upload_time}{self.length}{self.searching_quality}/{self.query}"
224224

225225
if pages >= int(self.total_pages):
@@ -228,6 +228,8 @@ def videos(self, pages_concurrency: int = 2, videos_concurrency: int = 5, pages
228228

229229
page_urls = [self.url]
230230
page_urls.extend([f"{self.url}/{page}" for page in range(1, int(pages))])
231+
videos_concurrency = videos_concurrency or self.core.config.videos_concurrency
232+
pages_concurrency = pages_concurrency or self.core.config.pages_concurrency
231233

232234
yield from self.iterator(page_urls=page_urls, videos_concurrency=videos_concurrency,
233235
pages_concurrency=pages_concurrency, extractor=extractor_html)
@@ -251,14 +253,16 @@ def base_json(self):
251253
data = json.loads(html.unescape(content))
252254
return data
253255

254-
def videos(self, videos_concurrency: int = 5, pages_concurrency: int = 2,
256+
def videos(self, videos_concurrency: int = None, pages_concurrency: int = None,
255257
pages: int = 0) -> Generator[Video, None, None]:
256258

257259
if pages > self.total_pages:
258260
self.logger.warning(f"You are trying to fetch more pages than there are... Reducing to: {self.total_pages}")
259261
pages = int(self.total_pages)
260262

261263
page_urls = [f"{self.url}/videos/best/{page}" for page in range(pages)]
264+
videos_concurrency = videos_concurrency or self.core.config.videos_concurrency
265+
pages_concurrency = pages_concurrency or self.core.config.pages_concurrency
262266
yield from self.iterator(page_urls=page_urls, videos_concurrency=videos_concurrency,
263267
pages_concurrency=pages_concurrency, extractor=extractor_json)
264268

0 commit comments

Comments
 (0)