From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 28 Oct 2013 09:44:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=ebc14f251c2968f4cb6cb18610b857ecb24348c8;hp=-c;p=youtube-dl.git

Merge remote-tracking branch 'origin/master'
---

ebc14f251c2968f4cb6cb18610b857ecb24348c8
diff --combined youtube_dl/extractor/common.py
index 458635f1e,8b067b48d..ce349fe20
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@@ -15,7 -15,6 +15,7 @@@ from ..utils import 
      compiled_regex_type,
      ExtractorError,
      RegexNotFoundError,
 +    sanitize_filename,
      unescapeHTML,
  )
  
@@@ -183,17 -182,6 +183,17 @@@ class InfoExtractor(object)
              self.to_screen(u'Dumping request to ' + url)
              dump = base64.b64encode(webpage_bytes).decode('ascii')
              self._downloader.to_screen(dump)
 +        if self._downloader.params.get('write_pages', False):
 +            try:
 +                url = url_or_request.get_full_url()
 +            except AttributeError:
 +                url = url_or_request
 +            raw_filename = ('%s_%s.dump' % (video_id, url))
 +            filename = sanitize_filename(raw_filename, restricted=True)
 +            self.to_screen(u'Saving request to ' + filename)
 +            with open(filename, 'wb') as outf:
 +                outf.write(webpage_bytes)
 +
          content = webpage_bytes.decode(encoding, 'replace')
          return (content, urlh)
  
@@@ -330,10 -318,10 +330,10 @@@
      def _og_search_title(self, html, **kargs):
          return self._og_search_property('title', html, **kargs)
  
-     def _og_search_video_url(self, html, name='video url', **kargs):
-         return self._html_search_regex([self._og_regex('video:secure_url'),
-                                         self._og_regex('video')],
-                                        html, name, **kargs)
+     def _og_search_video_url(self, html, name='video url', secure=True, **kargs):
+         regexes = [self._og_regex('video')]
+         if secure: regexes.insert(0, self._og_regex('video:secure_url'))
+         return self._html_search_regex(regexes, html, name, **kargs)
  
      def _rta_search(self, html):
          # See http://www.rtalabel.org/index.php?content=howtofaq#single