midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Philipp Hagemeister 2014-08-21 13:05:24 +02:00
parent 181c8655c7
commit a36819731b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
youtube_dl/extractor/common.py
View file

@ -463,8 +463,9 @@ class InfoExtractor(object):
return self._og_search_property('title', html, **kargs) return self._og_search_property('title', html, **kargs)
def _og_search_video_url(self, html, name='video url', secure=True, **kargs): def _og_search_video_url(self, html, name='video url', secure=True, **kargs):
regexes = self._og_regexes('video') regexes = self._og_regexes('video') + self._og_regexes('video:url')
if secure: regexes = self._og_regexes('video:secure_url') + regexes if secure:
regexes = self._og_regexes('video:secure_url') + regexes
return self._html_search_regex(regexes, html, name, **kargs) return self._html_search_regex(regexes, html, name, **kargs)
def _og_search_url(self, html, **kargs): def _og_search_url(self, html, **kargs):

2
youtube_dl/extractor/escapist.py
View file

@ -36,7 +36,7 @@ class EscapistIE(InfoExtractor):
r'<meta name="description" content="([^"]*)"', r'<meta name="description" content="([^"]*)"',
webpage, 'description', fatal=False) 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( title = self._html_search_regex(
r'<meta name="title" content="([^"]*)"', r'<meta name="title" content="([^"]*)"',