diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-07-08 18:12:15 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-07-08 18:12:15 +0700 |
| commit | a49804816c0246d81b9d34d9f89f99fae06da887 (patch) | |
| tree | bf9fe149d9740b10286256d3fe784d3a0c1e3f29 | |
| parent | eadd313321f4fbacac2ec10f2f382197e401d7f7 (diff) | |
| download | youtube-dl-a49804816c0246d81b9d34d9f89f99fae06da887.tar.gz youtube-dl-a49804816c0246d81b9d34d9f89f99fae06da887.tar.xz youtube-dl-a49804816c0246d81b9d34d9f89f99fae06da887.zip | |
[dailymotion] Add support for new layout (close #13580)
| -rw-r--r-- | youtube_dl/extractor/dailymotion.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index f8db76c18..74e991331 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -147,7 +147,7 @@ class DailymotionIE(DailymotionBaseInfoExtractor): view_count_str = self._search_regex( (r'<meta[^>]+itemprop="interactionCount"[^>]+content="UserPlays:([\s\d,.]+)"', r'video_views_count[^>]+>\s+([\s\d\,.]+)'), - webpage, 'view count', fatal=False) + webpage, 'view count', default=None) if view_count_str: view_count_str = re.sub(r'\s', '', view_count_str) view_count = str_to_int(view_count_str) @@ -159,7 +159,9 @@ class DailymotionIE(DailymotionBaseInfoExtractor): [r'buildPlayer\(({.+?})\);\n', # See https://github.com/rg3/youtube-dl/issues/7826 r'playerV5\s*=\s*dmp\.create\([^,]+?,\s*({.+?})\);', r'buildPlayer\(({.+?})\);', - r'var\s+config\s*=\s*({.+?});'], + r'var\s+config\s*=\s*({.+?});', + # New layout regex (see https://github.com/rg3/youtube-dl/issues/13580) + r'__PLAYER_CONFIG__\s*=\s*({.+?});'], webpage, 'player v5', default=None) if player_v5: player = self._parse_json(player_v5, video_id) |