diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-10-12 21:45:49 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-10-12 21:45:49 +0800 |
| commit | 9feb1c97318bbd575af6c2737dfe66412e1c0bb6 (patch) | |
| tree | 7a2b37b756b5a8a73f17676cc0202b17255a200f | |
| parent | a093cfc78b584a6e5dbc4bbca525f9e40af9522d (diff) | |
| download | youtube-dl-9feb1c97318bbd575af6c2737dfe66412e1c0bb6.tar.gz youtube-dl-9feb1c97318bbd575af6c2737dfe66412e1c0bb6.tar.xz youtube-dl-9feb1c97318bbd575af6c2737dfe66412e1c0bb6.zip | |
[dailymotion] Fix extraction and update _TESTS
Closes #10901 Seems all videos use player V5 syntax now
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/dailymotion.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3e16a2cb3..fd3e8c2fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Core * [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387) Extractors +* [dailymotion] Fix extraction (#10901) * [vimeo:review] Fix extraction (#10900) * [nhl] Correctly handle invalid formats (#10713) * [footyroom] Fix extraction (#10810) diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index 62b0747a5..4a3314ea7 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -94,7 +94,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor): 'title': 'Leanna Decker - Cyber Girl Of The Year Desires Nude [Playboy Plus]', 'uploader': 'HotWaves1012', 'age_limit': 18, - } + }, + 'skip': 'video gone', }, # geo-restricted, player v5 { @@ -144,7 +145,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor): player_v5 = self._search_regex( [r'buildPlayer\(({.+?})\);\n', # See https://github.com/rg3/youtube-dl/issues/7826 r'playerV5\s*=\s*dmp\.create\([^,]+?,\s*({.+?})\);', - r'buildPlayer\(({.+?})\);'], + r'buildPlayer\(({.+?})\);', + r'var\s+config\s*=\s*({.+?});'], webpage, 'player v5', default=None) if player_v5: player = self._parse_json(player_v5, video_id) |