youtube-dl

commit: 1ede5b2481a271fcfd0e179a494ef84cca2576b7
parent 964ae0a1228c9a0853e2b9142452d66e7333bf8c
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Fri, 24 Oct 2014 15:34:19 +0200

[glide] Simplify

Diffstat:
M
youtube_dl/extractor/common.py
2
+-
M
youtube_dl/extractor/glide.py
19
+++++++++++++------

2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
@@ -618,7 +618,7 @@ class InfoExtractor(object):
         formats.sort(key=_formats_key)
 
     def http_scheme(self):
-        """ Either "https:" or "https:", depending on the user's preferences """
+        """ Either "http:" or "https:", depending on the user's preferences """
         return (
             'http:'
             if self._downloader.params.get('prefer_insecure', False)
diff --git a/youtube_dl/extractor/glide.py b/youtube_dl/extractor/glide.py
@@ -14,20 +14,27 @@ class GlideIE(InfoExtractor):
             'id': 'UZF8zlmuQbe4mr+7dCiQ0w==',
             'ext': 'mp4',
             'title': 'Damon Timm\'s Glide message',
-            'thumbnail' : 'http://dk608k4lm7m9j.cloudfront.net/3ee7da5af87065a1eeb8c6c9a864ba5b_2.jpg'
+            'thumbnail': 're:^https?://.*?\.cloudfront\.net/.*\.jpg$',
         }
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
-        video_url = self._search_regex(r'<source src="(.*?)" type="video/mp4">', webpage, 'video_url')
-        thumbnail_url = self._search_regex(r'<img id="video-thumbnail" src="(.*?)" alt="Video thumbnail">', webpage, 'thumbnail_url')
+        title = self._html_search_regex(
+            r'<title>(.*?)</title>', webpage, 'title')
+        video_url = self.http_scheme() + self._search_regex(
+            r'<source src="(.*?)" type="video/mp4">', webpage, 'video URL')
+        thumbnail_url = self._search_regex(
+            r'<img id="video-thumbnail" src="(.*?)"',
+            webpage, 'thumbnail url', fatal=False)
+        thumbnail = (
+            thumbnail_url if thumbnail_url is None
+            else self.http_scheme() + thumbnail_url)
 
         return {
             'id': video_id,
             'title': title,
-            'url' : 'http:' + video_url,
-            'thumbnail' : 'http:' + thumbnail_url
+            'url': video_url,
+            'thumbnail': thumbnail,
         }