[xtube] Fix extraction (closes #12023)
authorSergey M․ <dstftw@gmail.com>
Thu, 9 Feb 2017 18:03:35 +0000 (01:03 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 9 Feb 2017 18:03:35 +0000 (01:03 +0700)
youtube_dl/extractor/xtube.py

index 83bc1fef2095b322a67199c60e27fcc6f8f1bcbc..91bae7ee7a215a881468d97680948270c9212d4c 100644 (file)
@@ -60,7 +60,8 @@ class XTubeIE(InfoExtractor):
         webpage = self._download_webpage(req, display_id)
 
         sources = self._parse_json(self._search_regex(
-            r'sources\s*:\s*({.+?}),', webpage, 'sources'), video_id)
+            r'(["\'])sources\1\s*:\s*(?P<sources>{.+?}),',
+            webpage, 'sources', group='sources'), video_id)
 
         formats = []
         for format_id, format_url in sources.items():
@@ -81,10 +82,10 @@ class XTubeIE(InfoExtractor):
              r'<span[^>]+class="nickname"[^>]*>([^<]+)'),
             webpage, 'uploader', fatal=False)
         duration = parse_duration(self._search_regex(
-            r'<dt>Runtime:</dt>\s*<dd>([^<]+)</dd>',
+            r'<dt>Runtime:?</dt>\s*<dd>([^<]+)</dd>',
             webpage, 'duration', fatal=False))
         view_count = str_to_int(self._search_regex(
-            r'<dt>Views:</dt>\s*<dd>([\d,\.]+)</dd>',
+            r'<dt>Views:?</dt>\s*<dd>([\d,\.]+)</dd>',
             webpage, 'view count', fatal=False))
         comment_count = str_to_int(self._html_search_regex(
             r'>Comments? \(([\d,\.]+)\)<',