PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-03 00:33:58 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'arix00-patch-1' of https://github.com/arix00/you-get-test into arix00-arix00-patch-1

Browse Source
This commit is contained in:
Mort Yao 2023-02-09 22:35:09 +01:00
commit 35182d6a29
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/you_get/extractors/bilibili.py
View File

@ -748,13 +748,20 @@ class Bilibili(VideoExtractor):
elif sort == 'space_channel_series': elif sort == 'space_channel_series':
m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/seriesdetail\?.*sid=(\d+)', self.url) m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/seriesdetail\?.*sid=(\d+)', self.url)
mid, sid = m.group(1), m.group(2) mid, sid = m.group(1), m.group(2)
api_url = self.bilibili_series_archives_api(mid, sid) pn = 1
video_list = []
while True:
api_url = self.bilibili_series_archives_api(mid, sid, pn)
api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url)) api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
archives_info = json.loads(api_content) archives_info = json.loads(api_content)
# TBD: channel of more than 100 videos video_list.extend(archives_info['data']['archives'])
if len(video_list) < archives_info['data']['page']['total'] and len(archives_info['data']['archives']) > 0:
pn += 1
else:
break
epn, i = len(archives_info['data']['archives']), 0 epn, i = len(video_list), 0
for video in archives_info['data']['archives']: for video in video_list:
i += 1; log.w('Extracting %s of %s videos ...' % (i, epn)) i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
url = 'https://www.bilibili.com/video/av%s' % video['aid'] url = 'https://www.bilibili.com/video/av%s' % video['aid']
self.__class__().download_playlist_by_url(url, **kwargs) self.__class__().download_playlist_by_url(url, **kwargs)
@ -762,13 +769,20 @@ class Bilibili(VideoExtractor):
elif sort == 'space_channel_collection': elif sort == 'space_channel_collection':
m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/collectiondetail\?.*sid=(\d+)', self.url) m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/collectiondetail\?.*sid=(\d+)', self.url)
mid, sid = m.group(1), m.group(2) mid, sid = m.group(1), m.group(2)
api_url = self.bilibili_space_collection_api(mid, sid) pn = 1
video_list = []
while True:
api_url = self.bilibili_space_collection_api(mid, sid, pn)
api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url)) api_content = get_content(api_url, headers=self.bilibili_headers(referer=self.url))
archives_info = json.loads(api_content) archives_info = json.loads(api_content)
# TBD: channel of more than 100 videos video_list.extend(archives_info['data']['archives'])
if len(video_list) < archives_info['data']['page']['total'] and len(archives_info['data']['archives']) > 0:
pn += 1
else:
break
epn, i = len(archives_info['data']['archives']), 0 epn, i = len(video_list), 0
for video in archives_info['data']['archives']: for video in video_list:
i += 1; log.w('Extracting %s of %s videos ...' % (i, epn)) i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
url = 'https://www.bilibili.com/video/av%s' % video['aid'] url = 'https://www.bilibili.com/video/av%s' % video['aid']
self.__class__().download_playlist_by_url(url, **kwargs) self.__class__().download_playlist_by_url(url, **kwargs)