github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[dailymotion] Fix extraction and update _TESTS

Browse source 
Closes #10901

Seems all videos use player V5 syntax now
This commit is contained in:
Yen Chi Hsuan 2016-10-12 21:45:49 +08:00
parent a093cfc78b
commit 9feb1c9731
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -5,6 +5,7 @@ Core
* [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387) * [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387)
Extractors Extractors
* [dailymotion] Fix extraction (#10901)
* [vimeo:review] Fix extraction (#10900) * [vimeo:review] Fix extraction (#10900)
* [nhl] Correctly handle invalid formats (#10713) * [nhl] Correctly handle invalid formats (#10713)
* [footyroom] Fix extraction (#10810) * [footyroom] Fix extraction (#10810)

6
youtube_dl/extractor/dailymotion.py
View file

@ -94,7 +94,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
'title': 'Leanna Decker - Cyber Girl Of The Year Desires Nude [Playboy Plus]', 'title': 'Leanna Decker - Cyber Girl Of The Year Desires Nude [Playboy Plus]',
'uploader': 'HotWaves1012', 'uploader': 'HotWaves1012',
'age_limit': 18, 'age_limit': 18,
} },
'skip': 'video gone',
}, },
# geo-restricted, player v5 # geo-restricted, player v5
{ {
@ -144,7 +145,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
player_v5 = self._search_regex( player_v5 = self._search_regex(
[r'buildPlayer\(({.+?})\);\n', # See https://github.com/rg3/youtube-dl/issues/7826 [r'buildPlayer\(({.+?})\);\n', # See https://github.com/rg3/youtube-dl/issues/7826
r'playerV5\s*=\s*dmp\.create\([^,]+?,\s*({.+?})\);', r'playerV5\s*=\s*dmp\.create\([^,]+?,\s*({.+?})\);',
r'buildPlayer\(({.+?})\);'], r'buildPlayer\(({.+?})\);',
r'var\s+config\s*=\s*({.+?});'],
webpage, 'player v5', default=None) webpage, 'player v5', default=None)
if player_v5: if player_v5:
player = self._parse_json(player_v5, video_id) player = self._parse_json(player_v5, video_id)