youtube-dl

commit a36819731b09000d747e261c0b1b935bd9e91e1a
parent 181c8655c798562c85ae2af06f1ece7b01632ea9
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 21 Aug 2014 13:05:24 +0200

[escapist] Add support for og:video:url (Fixes #3557)

Diffstat:
M
youtube_dl/extractor/common.py
 | 
5
+++--
M
youtube_dl/extractor/escapist.py
 | 
2
+-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
@@ -463,8 +463,9 @@ class InfoExtractor(object):
         return self._og_search_property('title', html, **kargs)
 
     def _og_search_video_url(self, html, name='video url', secure=True, **kargs):
-        regexes = self._og_regexes('video')
-        if secure: regexes = self._og_regexes('video:secure_url') + regexes
+        regexes = self._og_regexes('video') + self._og_regexes('video:url')
+        if secure:
+            regexes = self._og_regexes('video:secure_url') + regexes
         return self._html_search_regex(regexes, html, name, **kargs)
 
     def _og_search_url(self, html, **kargs):
diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py
@@ -36,7 +36,7 @@ class EscapistIE(InfoExtractor):
             r'<meta name="description" content="([^"]*)"',
             webpage, 'description', fatal=False)
 
-        playerUrl = self._og_search_video_url(webpage, name=u'player URL')
+        playerUrl = self._og_search_video_url(webpage, name='player URL')
 
         title = self._html_search_regex(
             r'<meta name="title" content="([^"]*)"',