mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-06-03 11:32:40 +09:00
Merge 5140730235343cc077b717bf5f13f79120795a62 into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6
This commit is contained in:
commit
8c54466b51
@ -420,10 +420,11 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
|
|||||||
r'(\d{2}\.\d{2}\.\d{4}) \| \d{2}:\d{2} Min<br/>',
|
r'(\d{2}\.\d{2}\.\d{4}) \| \d{2}:\d{2} Min<br/>',
|
||||||
]
|
]
|
||||||
_PAGE_TYPE_REGEXES = [
|
_PAGE_TYPE_REGEXES = [
|
||||||
r'<meta name="page_type" content="([^"]+)">',
|
r'<meta name="page_type" content="([^"]+)"/?>',
|
||||||
r"'itemType'\s*:\s*'([^']*)'",
|
r"'itemType'\s*:\s*'([^']*)'",
|
||||||
]
|
]
|
||||||
_PLAYLIST_ID_REGEXES = [
|
_PLAYLIST_ID_REGEXES = [
|
||||||
|
r'<meta name="node_id" content="([0-9]+)"/?>',
|
||||||
r'content[iI]d=(\d+)',
|
r'content[iI]d=(\d+)',
|
||||||
r"'itemId'\s*:\s*'([^']*)'",
|
r"'itemId'\s*:\s*'([^']*)'",
|
||||||
]
|
]
|
||||||
@ -464,11 +465,12 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
|
|||||||
self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')
|
self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')
|
||||||
playlist = self._parse_json(
|
playlist = self._parse_json(
|
||||||
self._search_regex(
|
self._search_regex(
|
||||||
r'var\s+contentResources\s*=\s*(\[.+?\]);\s*</script',
|
r'<script id="state" type="text/plain">(.+?)</script>',
|
||||||
webpage, 'playlist'),
|
webpage, 'playlist'),
|
||||||
playlist_id)
|
playlist_id).get('page').get('clips')
|
||||||
entries = []
|
entries = []
|
||||||
for item in playlist:
|
for playlist_item in playlist:
|
||||||
|
item = self._parse_json(playlist_item.get('contentResource'), playlist_id)[0]
|
||||||
clip_id = item.get('id') or item.get('upc')
|
clip_id = item.get('id') or item.get('upc')
|
||||||
if not clip_id:
|
if not clip_id:
|
||||||
continue
|
continue
|
||||||
|
Loading…
x
Reference in New Issue
Block a user