youtube-dl

commit 0d173446ff5edacdfa9419dcb6a7f44aaad09a5b
parent 320e26a0af46dcefd53ba06656c986def933bc6b
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Wed, 24 Apr 2013 22:11:57 +0200

InfoExtractors: use report_download_webpage in _request_webpage

Allows to show the warning when falling back on GenericIE

Diffstat:
M
youtube_dl/InfoExtractors.py
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
@@ -114,8 +114,8 @@ class InfoExtractor(object):
     def _request_webpage(self, url_or_request, video_id, note=None, errnote=None):
         """ Returns the response handle """
         if note is None:
-            note = u'Downloading video webpage'
-        if note is not False:
+            self.report_download_webpage(video_id)
+        elif note is not False:
             self.to_screen(u'%s: %s' % (video_id, note))
         try:
             return compat_urllib_request.urlopen(url_or_request)
@@ -1318,7 +1318,7 @@ class GenericIE(InfoExtractor):
         """Report webpage download."""
         if not self._downloader.params.get('test', False):
             self._downloader.report_warning(u'Falling back on generic information extractor.')
-        self.to_screen(u'%s: Downloading webpage' % video_id)
+        super(GenericIE, self).report_download_webpage(video_id)
 
     def report_following_redirect(self, new_url):
         """Report information extraction."""