youtube-dl

commit cea364f70c97dad933fa38698f3c9df1bdb485cf
parent 55642487f072565bea3b2826b836a1a3159a3807
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Wed, 12 Oct 2016 01:40:28 +0800

[extractor/common] Support HTML media elements without child nodes

Diffstat:
M
ChangeLog
 | 
1
+
M
youtube_dl/extractor/common.py
 | 
6
+++++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 version <unreleased>
 
 Core
++ Support HTML media elements without child nodes
 * [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387)
 
 Extractors
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
@@ -1802,7 +1802,11 @@ class InfoExtractor(object):
             return is_plain_url, formats
 
         entries = []
-        for media_tag, media_type, media_content in re.findall(r'(?s)(<(?P<tag>video|audio)[^>]*>)(.*?)</(?P=tag)>', webpage):
+        media_tags = [(media_tag, media_type, '')
+                      for media_tag, media_type
+                      in re.findall(r'(?s)(<(video|audio)[^>]*/>)', webpage)]
+        media_tags.extend(re.findall(r'(?s)(<(?P<tag>video|audio)[^>]*>)(.*?)</(?P=tag)>', webpage))
+        for media_tag, media_type, media_content in media_tags:
             media_info = {
                 'formats': [],
                 'subtitles': {},