diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-07-13 20:33:23 +0200 | 
| commit | 36034aecc287f67a9f93fa00f374f45dcb0e2f77 (patch) | |
| tree | a24389f75c738587a46f09eb0888b457b50767f8 /youtube_dl/extractor/escapist.py | |
| parent | ffca4b5c32280e416131faf43afa0cb26c55c8b0 (diff) | |
| parent | 44dbe8903580e1e62ea6f3881b2fa469853c4a83 (diff) | |
Merge remote-tracking branch 'jaimeMF/opengraph'
Diffstat (limited to 'youtube_dl/extractor/escapist.py')
| -rw-r--r-- | youtube_dl/extractor/escapist.py | 8 | 
1 files changed, 2 insertions, 6 deletions
| diff --git a/youtube_dl/extractor/escapist.py b/youtube_dl/extractor/escapist.py index 794460e84..3aa2da52c 100644 --- a/youtube_dl/extractor/escapist.py +++ b/youtube_dl/extractor/escapist.py @@ -36,11 +36,7 @@ class EscapistIE(InfoExtractor):          videoDesc = self._html_search_regex('<meta name="description" content="([^"]*)"',              webpage, u'description', fatal=False) -        imgUrl = self._html_search_regex('<meta property="og:image" content="([^"]*)"', -            webpage, u'thumbnail', fatal=False) - -        playerUrl = self._html_search_regex('<meta property="og:video" content="([^"]*)"', -            webpage, u'player url') +        playerUrl = self._og_search_video_url(webpage, name='player url')          title = self._html_search_regex('<meta name="title" content="([^"]*)"',              webpage, u'player url').split(' : ')[-1] @@ -70,7 +66,7 @@ class EscapistIE(InfoExtractor):              'upload_date': None,              'title': title,              'ext': 'mp4', -            'thumbnail': imgUrl, +            'thumbnail': self._og_search_thumbnail(webpage),              'description': videoDesc,              'player_url': playerUrl,          } | 
