mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-10-03 07:41:27 +02:00
Compare commits
No commits in common. "e439693f729daf6fb15457baea1bca10ef5da34d" and "e3ce2b385ec1f03fac9d4210c57fda77134495fc" have entirely different histories.
e439693f72
...
e3ce2b385e
|
@ -1305,26 +1305,6 @@ class BilibiliPlaylistIE(BilibiliSpaceListBaseIE):
|
||||||
'upload_date': '20211127',
|
'upload_date': '20211127',
|
||||||
},
|
},
|
||||||
'playlist_mincount': 513,
|
'playlist_mincount': 513,
|
||||||
}, {
|
|
||||||
'url': 'https://www.bilibili.com/list/1958703906?sid=547718&oid=687146339&bvid=BV1DU4y1r7tz',
|
|
||||||
'info_dict': {
|
|
||||||
'id': 'BV1DU4y1r7tz',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': '【直播回放】8.20晚9:30 3d发布喵 2022年8月20日21点场',
|
|
||||||
'upload_date': '20220820',
|
|
||||||
'description': '',
|
|
||||||
'timestamp': 1661016330,
|
|
||||||
'uploader_id': '1958703906',
|
|
||||||
'uploader': '靡烟miya',
|
|
||||||
'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
|
|
||||||
'duration': 9552.903,
|
|
||||||
'tags': list,
|
|
||||||
'comment_count': int,
|
|
||||||
'view_count': int,
|
|
||||||
'like_count': int,
|
|
||||||
'_old_archive_ids': ['bilibili 687146339_part1'],
|
|
||||||
},
|
|
||||||
'params': {'noplaylist': True},
|
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://www.bilibili.com/medialist/play/1958703906?business=space_series&business_id=547718&desc=1',
|
'url': 'https://www.bilibili.com/medialist/play/1958703906?business=space_series&business_id=547718&desc=1',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
@ -1376,11 +1356,6 @@ class BilibiliPlaylistIE(BilibiliSpaceListBaseIE):
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
list_id = self._match_id(url)
|
list_id = self._match_id(url)
|
||||||
|
|
||||||
bvid = traverse_obj(parse_qs(url), ('bvid', 0))
|
|
||||||
if not self._yes_playlist(list_id, bvid):
|
|
||||||
return self.url_result(f'https://www.bilibili.com/video/{bvid}', BiliBiliIE)
|
|
||||||
|
|
||||||
webpage = self._download_webpage(url, list_id)
|
webpage = self._download_webpage(url, list_id)
|
||||||
initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', list_id)
|
initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', list_id)
|
||||||
if traverse_obj(initial_state, ('error', 'code', {int_or_none})) != 200:
|
if traverse_obj(initial_state, ('error', 'code', {int_or_none})) != 200:
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
ExtractorError,
|
|
||||||
encode_base_n,
|
encode_base_n,
|
||||||
get_elements_by_class,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
join_nonempty,
|
|
||||||
merge_dicts,
|
merge_dicts,
|
||||||
parse_duration,
|
parse_duration,
|
||||||
str_to_int,
|
str_to_int,
|
||||||
|
@ -83,7 +81,6 @@ class EpornerIE(InfoExtractor):
|
||||||
sources = video['sources']
|
sources = video['sources']
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
has_av1 = bool(get_elements_by_class('download-av1', webpage))
|
|
||||||
for kind, formats_dict in sources.items():
|
for kind, formats_dict in sources.items():
|
||||||
if not isinstance(formats_dict, dict):
|
if not isinstance(formats_dict, dict):
|
||||||
continue
|
continue
|
||||||
|
@ -109,14 +106,6 @@ class EpornerIE(InfoExtractor):
|
||||||
'height': height,
|
'height': height,
|
||||||
'fps': fps,
|
'fps': fps,
|
||||||
})
|
})
|
||||||
if has_av1:
|
|
||||||
formats.append({
|
|
||||||
'url': src.replace('.mp4', '-av1.mp4'),
|
|
||||||
'format_id': join_nonempty('av1', format_id),
|
|
||||||
'height': height,
|
|
||||||
'fps': fps,
|
|
||||||
'vcodec': 'av1',
|
|
||||||
})
|
|
||||||
|
|
||||||
json_ld = self._search_json_ld(webpage, display_id, default={})
|
json_ld = self._search_json_ld(webpage, display_id, default={})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user