Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-20 05:47:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix displayed page number

Browse Source
This commit is contained in:
Synarp 2024-06-12 02:45:36 +02:00
parent 5ea1d902d3
commit 440238ebc9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yt_dlp/extractor/lbry.py
View File

@ -78,7 +78,7 @@ def _parse_stream(self, stream, url):
return info return info
def _fetch_page(self, display_id, url, params, page): def _fetch_page(self, display_id, url, params, metapage_nr, page):
page += 1 page += 1
page_params = { page_params = {
'no_totals': True, 'no_totals': True,
@ -86,8 +86,12 @@ def _fetch_page(self, display_id, url, params, page):
'page_size': self._PAGE_SIZE, 'page_size': self._PAGE_SIZE,
**params, **params,
} }
if metapage_nr == 0:
resource = f'page {page}'
else:
resource = f'page {metapage_nr+1}_{page}'
result = self._call_api_proxy( result = self._call_api_proxy(
'claim_search', display_id, page_params, f'page {page}') 'claim_search', display_id, page_params, resource)
for item in traverse_obj(result, ('items', lambda _, v: v['name'] and v['claim_id'])): for item in traverse_obj(result, ('items', lambda _, v: v['name'] and v['claim_id'])):
yield { yield {
**self._parse_stream(item, url), **self._parse_stream(item, url),
@ -104,9 +108,10 @@ def _metapage_entries(self, display_id, url, params):
last_metapage = [] last_metapage = []
metapage = OnDemandPagedList( metapage = OnDemandPagedList(
functools.partial(self._fetch_page, display_id, url, params), functools.partial(self._fetch_page, display_id, url, params, 0),
self._PAGE_SIZE).getslice() self._PAGE_SIZE).getslice()
metapage_nr = 1
while len(metapage) > 0: while len(metapage) > 0:
yield from metapage yield from metapage
@ -116,9 +121,10 @@ def _metapage_entries(self, display_id, url, params):
} }
last_metapage = metapage last_metapage = metapage
metapage = OnDemandPagedList( metapage = OnDemandPagedList(
functools.partial(self._fetch_page, display_id, url, next_metapage_params), functools.partial(self._fetch_page, display_id, url, next_metapage_params, metapage_nr),
self._PAGE_SIZE).getslice() self._PAGE_SIZE).getslice()
metapage = [x for x in metapage if x not in last_metapage] metapage = [x for x in metapage if x not in last_metapage]
metapage_nr += 1
def _playlist_entries(self, url, display_id, claim_param, metadata): def _playlist_entries(self, url, display_id, claim_param, metadata):
qs = parse_qs(url) qs = parse_qs(url)
@ -152,7 +158,7 @@ def _playlist_entries(self, url, display_id, claim_param, metadata):
else: else:
self.report_warning('Extraction is limited to 1000 Videos when not sorting by newest.') self.report_warning('Extraction is limited to 1000 Videos when not sorting by newest.')
entries = OnDemandPagedList( entries = OnDemandPagedList(
functools.partial(self._fetch_page, display_id, url, params), functools.partial(self._fetch_page, display_id, url, params, 0),
self._PAGE_SIZE) self._PAGE_SIZE)
return self.playlist_result( return self.playlist_result(