Upgrade yt_dlp and download script
This commit is contained in:
@@ -5,7 +5,9 @@ from ..utils import (
|
||||
int_or_none,
|
||||
try_get,
|
||||
unified_strdate,
|
||||
url_or_none,
|
||||
)
|
||||
from ..utils.traversal import traverse_obj
|
||||
|
||||
|
||||
class CrowdBunkerIE(InfoExtractor):
|
||||
@@ -24,15 +26,16 @@ class CrowdBunkerIE(InfoExtractor):
|
||||
'uploader_id': 'UCeN_qQV829NYf0pvPJhW5dQ',
|
||||
'like_count': int,
|
||||
'upload_date': '20211218',
|
||||
'thumbnail': 'https://scw.divulg.org/cb-medias4/images/0z4Kms8pi8I/maxres.jpg'
|
||||
'thumbnail': 'https://scw.divulg.org/cb-medias4/images/0z4Kms8pi8I/maxres.jpg',
|
||||
},
|
||||
'params': {'skip_download': True}
|
||||
'params': {'skip_download': True},
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://api.divulg.org/post/{id}/details',
|
||||
id, headers={'accept': 'application/json, text/plain, */*'})
|
||||
video_id = self._match_id(url)
|
||||
data_json = self._download_json(
|
||||
f'https://api.divulg.org/post/{video_id}/details', video_id,
|
||||
headers={'accept': 'application/json, text/plain, */*'})
|
||||
video_json = data_json['video']
|
||||
formats, subtitles = [], {}
|
||||
for sub in video_json.get('captions') or []:
|
||||
@@ -43,16 +46,15 @@ class CrowdBunkerIE(InfoExtractor):
|
||||
'url': sub_url,
|
||||
})
|
||||
|
||||
mpd_url = try_get(video_json, lambda x: x['dashManifest']['url'])
|
||||
if mpd_url:
|
||||
fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, id)
|
||||
if mpd_url := traverse_obj(video_json, ('dashManifest', 'url', {url_or_none})):
|
||||
fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, video_id, mpd_id='dash', fatal=False)
|
||||
formats.extend(fmts)
|
||||
subtitles = self._merge_subtitles(subtitles, subs)
|
||||
m3u8_url = try_get(video_json, lambda x: x['hlsManifest']['url'])
|
||||
if m3u8_url:
|
||||
fmts, subs = self._extract_m3u8_formats_and_subtitles(mpd_url, id)
|
||||
self._merge_subtitles(subs, target=subtitles)
|
||||
|
||||
if m3u8_url := traverse_obj(video_json, ('hlsManifest', 'url', {url_or_none})):
|
||||
fmts, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, m3u8_id='hls', fatal=False)
|
||||
formats.extend(fmts)
|
||||
subtitles = self._merge_subtitles(subtitles, subs)
|
||||
self._merge_subtitles(subs, target=subtitles)
|
||||
|
||||
thumbnails = [{
|
||||
'url': image['url'],
|
||||
@@ -61,7 +63,7 @@ class CrowdBunkerIE(InfoExtractor):
|
||||
} for image in video_json.get('thumbnails') or [] if image.get('url')]
|
||||
|
||||
return {
|
||||
'id': id,
|
||||
'id': video_id,
|
||||
'title': video_json.get('title'),
|
||||
'description': video_json.get('description'),
|
||||
'view_count': video_json.get('viewCount'),
|
||||
@@ -87,23 +89,24 @@ class CrowdBunkerChannelIE(InfoExtractor):
|
||||
},
|
||||
}]
|
||||
|
||||
def _entries(self, id):
|
||||
def _entries(self, playlist_id):
|
||||
last = None
|
||||
|
||||
for page in itertools.count():
|
||||
channel_json = self._download_json(
|
||||
f'https://api.divulg.org/organization/{id}/posts', id, headers={'accept': 'application/json, text/plain, */*'},
|
||||
f'https://api.divulg.org/organization/{playlist_id}/posts', playlist_id,
|
||||
headers={'accept': 'application/json, text/plain, */*'},
|
||||
query={'after': last} if last else {}, note=f'Downloading Page {page}')
|
||||
for item in channel_json.get('items') or []:
|
||||
v_id = item.get('uid')
|
||||
if not v_id:
|
||||
continue
|
||||
yield self.url_result(
|
||||
'https://crowdbunker.com/v/%s' % v_id, ie=CrowdBunkerIE.ie_key(), video_id=v_id)
|
||||
f'https://crowdbunker.com/v/{v_id}', ie=CrowdBunkerIE.ie_key(), video_id=v_id)
|
||||
last = channel_json.get('last')
|
||||
if not last:
|
||||
break
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
return self.playlist_result(self._entries(id), playlist_id=id)
|
||||
playlist_id = self._match_id(url)
|
||||
return self.playlist_result(self._entries(playlist_id), playlist_id=playlist_id)
|
||||
|
Reference in New Issue
Block a user