]> Raphaël G. Git Repositories - youtubedl/commitdiff
Imported Upstream version 2010.10.24
authorRogério Brito <rbrito@ime.usp.br>
Sat, 18 Jun 2011 05:16:58 +0000 (02:16 -0300)
committerRogério Brito <rbrito@ime.usp.br>
Sat, 18 Jun 2011 05:16:58 +0000 (02:16 -0300)
.hg_archival.txt
LATEST_VERSION
youtube-dl

index 6f2bddf837683221769ebe96390885b59398c041..21226b5a0568658e094f2ecd45dd58f3c74eb6c6 100644 (file)
@@ -1,5 +1,4 @@
 repo: f87cf8f2527c4adda57b14bd79a354f815164a41
 repo: f87cf8f2527c4adda57b14bd79a354f815164a41
-node: 190d2d0fd729eecabaf246813801f5228050e0ad
+node: 3b1889cc83b5085e178593f4dfa376b429f5be0d
 branch: default
 branch: default
-latesttag: 2010.10.03
-latesttagdistance: 1
+tag: 2010.10.24
index 92947daa5e956bbc4fa9f73ca09b38d41f0b6505..8418210b77811034bf31cc5a86d4d80d6506f65b 100644 (file)
@@ -1 +1 @@
-2010.10.03
+2010.10.24
index 51344f27be8932102674821016fb30506c155691..466b506b5fc93af86e5c18b9a569a43c9d474dde 100755 (executable)
@@ -4,6 +4,7 @@
 # Author: Danny Colligan
 # Author: Benjamin Johnson
 # License: Public domain code
 # Author: Danny Colligan
 # Author: Benjamin Johnson
 # License: Public domain code
+import cookielib
 import htmlentitydefs
 import httplib
 import locale
 import htmlentitydefs
 import httplib
 import locale
@@ -27,7 +28,7 @@ except ImportError:
        from cgi import parse_qs
 
 std_headers = {
        from cgi import parse_qs
 
 std_headers = {
-       'User-Agent': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.8) Gecko/20100723 Firefox/3.6.8',
+       'User-Agent': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.11) Gecko/20101019 Firefox/3.6.11',
        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
        'Accept-Language': 'en-us,en;q=0.5',
        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
        'Accept-Language': 'en-us,en;q=0.5',
@@ -94,6 +95,9 @@ def sanitize_open(filename, open_mode):
        """
        try:
                if filename == u'-':
        """
        try:
                if filename == u'-':
+                       if sys.platform == 'win32':
+                               import msvcrt
+                               msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
                        return (sys.stdout, filename)
                stream = open(filename, open_mode)
                return (stream, filename)
                        return (sys.stdout, filename)
                stream = open(filename, open_mode)
                return (stream, filename)
@@ -181,22 +185,26 @@ class FileDownloader(object):
 
        Available options:
 
 
        Available options:
 
-       username:       Username for authentication purposes.
-       password:       Password for authentication purposes.
-       usenetrc:       Use netrc for authentication instead.
-       quiet:          Do not print messages to stdout.
-       forceurl:       Force printing final URL.
-       forcetitle:     Force printing title.
-       simulate:       Do not download the video files.
-       format:         Video format code.
-       format_limit:   Highest quality format to try.
-       outtmpl:        Template for output names.
-       ignoreerrors:   Do not stop on download errors.
-       ratelimit:      Download speed limit, in bytes/sec.
-       nooverwrites:   Prevent overwriting files.
-       retries:        Number of times to retry for HTTP error 5xx
-       continuedl:     Try to continue downloads if possible.
-       noprogress:     Do not print the progress bar.
+       username:         Username for authentication purposes.
+       password:         Password for authentication purposes.
+       usenetrc:         Use netrc for authentication instead.
+       quiet:            Do not print messages to stdout.
+       forceurl:         Force printing final URL.
+       forcetitle:       Force printing title.
+       forcethumbnail:   Force printing thumbnail URL.
+       forcedescription: Force printing description.
+       simulate:         Do not download the video files.
+       format:           Video format code.
+       format_limit:     Highest quality format to try.
+       outtmpl:          Template for output names.
+       ignoreerrors:     Do not stop on download errors.
+       ratelimit:        Download speed limit, in bytes/sec.
+       nooverwrites:     Prevent overwriting files.
+       retries:          Number of times to retry for HTTP error 5xx
+       continuedl:       Try to continue downloads if possible.
+       noprogress:       Do not print the progress bar.
+       playliststart:    Playlist item to start at.
+       logtostderr:      Log messages to stderr instead of stdout.
        """
 
        params = None
        """
 
        params = None
@@ -204,6 +212,7 @@ class FileDownloader(object):
        _pps = []
        _download_retcode = None
        _num_downloads = None
        _pps = []
        _download_retcode = None
        _num_downloads = None
+       _screen_file = None
 
        def __init__(self, params):
                """Create a FileDownloader object with the given options."""
 
        def __init__(self, params):
                """Create a FileDownloader object with the given options."""
@@ -211,6 +220,7 @@ class FileDownloader(object):
                self._pps = []
                self._download_retcode = 0
                self._num_downloads = 0
                self._pps = []
                self._download_retcode = 0
                self._num_downloads = 0
+               self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
                self.params = params
        
        @staticmethod
                self.params = params
        
        @staticmethod
@@ -297,12 +307,13 @@ class FileDownloader(object):
                self._pps.append(pp)
                pp.set_downloader(self)
        
                self._pps.append(pp)
                pp.set_downloader(self)
        
-       def to_stdout(self, message, skip_eol=False, ignore_encoding_errors=False):
+       def to_screen(self, message, skip_eol=False, ignore_encoding_errors=False):
                """Print message to stdout if not in quiet mode."""
                try:
                        if not self.params.get('quiet', False):
                """Print message to stdout if not in quiet mode."""
                try:
                        if not self.params.get('quiet', False):
-                               print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
-                       sys.stdout.flush()
+                               terminator = [u'\n', u''][skip_eol]
+                               print >>self._screen_file, (u'%s%s' % (message, terminator)).encode(preferredencoding()),
+                       self._screen_file.flush()
                except (UnicodeEncodeError), err:
                        if not ignore_encoding_errors:
                                raise
                except (UnicodeEncodeError), err:
                        if not ignore_encoding_errors:
                                raise
@@ -343,40 +354,40 @@ class FileDownloader(object):
 
        def report_destination(self, filename):
                """Report destination filename."""
 
        def report_destination(self, filename):
                """Report destination filename."""
-               self.to_stdout(u'[download] Destination: %s' % filename, ignore_encoding_errors=True)
+               self.to_screen(u'[download] Destination: %s' % filename, ignore_encoding_errors=True)
        
        def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
                """Report download progress."""
                if self.params.get('noprogress', False):
                        return
        
        def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
                """Report download progress."""
                if self.params.get('noprogress', False):
                        return
-               self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+               self.to_screen(u'\r[download] %s of %s at %s ETA %s' %
                                (percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
 
        def report_resuming_byte(self, resume_len):
                """Report attempt to resume at given byte."""
                                (percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
 
        def report_resuming_byte(self, resume_len):
                """Report attempt to resume at given byte."""
-               self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+               self.to_screen(u'[download] Resuming download at byte %s' % resume_len)
        
        def report_retry(self, count, retries):
                """Report retry in case of HTTP error 5xx"""
        
        def report_retry(self, count, retries):
                """Report retry in case of HTTP error 5xx"""
-               self.to_stdout(u'[download] Got server HTTP error. Retrying (attempt %d of %d)...' % (count, retries))
+               self.to_screen(u'[download] Got server HTTP error. Retrying (attempt %d of %d)...' % (count, retries))
        
        def report_file_already_downloaded(self, file_name):
                """Report file has already been fully downloaded."""
                try:
        
        def report_file_already_downloaded(self, file_name):
                """Report file has already been fully downloaded."""
                try:
-                       self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+                       self.to_screen(u'[download] %s has already been downloaded' % file_name)
                except (UnicodeEncodeError), err:
                except (UnicodeEncodeError), err:
-                       self.to_stdout(u'[download] The file has already been downloaded')
+                       self.to_screen(u'[download] The file has already been downloaded')
        
        def report_unable_to_resume(self):
                """Report it was impossible to resume download."""
        
        def report_unable_to_resume(self):
                """Report it was impossible to resume download."""
-               self.to_stdout(u'[download] Unable to resume')
+               self.to_screen(u'[download] Unable to resume')
        
        def report_finish(self):
                """Report download finished."""
                if self.params.get('noprogress', False):
        
        def report_finish(self):
                """Report download finished."""
                if self.params.get('noprogress', False):
-                       self.to_stdout(u'[download] Download completed')
+                       self.to_screen(u'[download] Download completed')
                else:
                else:
-                       self.to_stdout(u'')
+                       self.to_screen(u'')
        
        def increment_downloads(self):
                """Increment the ordinal that assigns a number to each file."""
        
        def increment_downloads(self):
                """Increment the ordinal that assigns a number to each file."""
@@ -486,14 +497,14 @@ class FileDownloader(object):
                retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)])
                while retval == 2 or retval == 1:
                        prevsize = os.path.getsize(filename)
                retval = subprocess.call(basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)])
                while retval == 2 or retval == 1:
                        prevsize = os.path.getsize(filename)
-                       self.to_stdout(u'\r[rtmpdump] %s bytes' % prevsize, skip_eol=True)
+                       self.to_screen(u'\r[rtmpdump] %s bytes' % prevsize, skip_eol=True)
                        time.sleep(5.0) # This seems to be needed
                        retval = subprocess.call(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1])
                        cursize = os.path.getsize(filename)
                        if prevsize == cursize and retval == 1:
                                break
                if retval == 0:
                        time.sleep(5.0) # This seems to be needed
                        retval = subprocess.call(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1])
                        cursize = os.path.getsize(filename)
                        if prevsize == cursize and retval == 1:
                                break
                if retval == 0:
-                       self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
+                       self.to_screen(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
                        return True
                else:
                        self.trouble(u'\nERROR: rtmpdump exited with code %d' % retval)
                        return True
                else:
                        self.trouble(u'\nERROR: rtmpdump exited with code %d' % retval)
@@ -686,9 +697,9 @@ class InfoExtractor(object):
 class YoutubeIE(InfoExtractor):
        """Information extractor for youtube.com."""
 
 class YoutubeIE(InfoExtractor):
        """Information extractor for youtube.com."""
 
-       _VALID_URL = r'^((?:http://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/(?:(?:v/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))))?([0-9A-Za-z_-]+)(?(1).+)?$'
+       _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/(?:(?:v/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))))?([0-9A-Za-z_-]+)(?(1).+)?$'
        _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
        _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
-       _LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+       _LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en'
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality
@@ -710,35 +721,35 @@ class YoutubeIE(InfoExtractor):
 
        def report_lang(self):
                """Report attempt to set language."""
 
        def report_lang(self):
                """Report attempt to set language."""
-               self._downloader.to_stdout(u'[youtube] Setting language')
+               self._downloader.to_screen(u'[youtube] Setting language')
 
        def report_login(self):
                """Report attempt to log in."""
 
        def report_login(self):
                """Report attempt to log in."""
-               self._downloader.to_stdout(u'[youtube] Logging in')
+               self._downloader.to_screen(u'[youtube] Logging in')
        
        def report_age_confirmation(self):
                """Report attempt to confirm age."""
        
        def report_age_confirmation(self):
                """Report attempt to confirm age."""
-               self._downloader.to_stdout(u'[youtube] Confirming age')
+               self._downloader.to_screen(u'[youtube] Confirming age')
        
        def report_video_webpage_download(self, video_id):
                """Report attempt to download video webpage."""
        
        def report_video_webpage_download(self, video_id):
                """Report attempt to download video webpage."""
-               self._downloader.to_stdout(u'[youtube] %s: Downloading video webpage' % video_id)
+               self._downloader.to_screen(u'[youtube] %s: Downloading video webpage' % video_id)
        
        def report_video_info_webpage_download(self, video_id):
                """Report attempt to download video info webpage."""
        
        def report_video_info_webpage_download(self, video_id):
                """Report attempt to download video info webpage."""
-               self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+               self._downloader.to_screen(u'[youtube] %s: Downloading video info webpage' % video_id)
        
        def report_information_extraction(self, video_id):
                """Report attempt to extract video information."""
        
        def report_information_extraction(self, video_id):
                """Report attempt to extract video information."""
-               self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+               self._downloader.to_screen(u'[youtube] %s: Extracting video information' % video_id)
        
        def report_unavailable_format(self, video_id, format):
                """Report extracted video URL."""
        
        def report_unavailable_format(self, video_id, format):
                """Report extracted video URL."""
-               self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+               self._downloader.to_screen(u'[youtube] %s: Format %s not available' % (video_id, format))
        
        def report_rtmp_download(self):
                """Indicate the download will use the RTMP protocol."""
        
        def report_rtmp_download(self):
                """Indicate the download will use the RTMP protocol."""
-               self._downloader.to_stdout(u'[youtube] RTMP download detected')
+               self._downloader.to_screen(u'[youtube] RTMP download detected')
        
        def _real_initialize(self):
                if self._downloader is None:
        
        def _real_initialize(self):
                if self._downloader is None:
@@ -966,19 +977,19 @@ class MetacafeIE(InfoExtractor):
 
        def report_disclaimer(self):
                """Report disclaimer retrieval."""
 
        def report_disclaimer(self):
                """Report disclaimer retrieval."""
-               self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+               self._downloader.to_screen(u'[metacafe] Retrieving disclaimer')
 
        def report_age_confirmation(self):
                """Report attempt to confirm age."""
 
        def report_age_confirmation(self):
                """Report attempt to confirm age."""
-               self._downloader.to_stdout(u'[metacafe] Confirming age')
+               self._downloader.to_screen(u'[metacafe] Confirming age')
        
        def report_download_webpage(self, video_id):
                """Report webpage download."""
        
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[metacafe] %s: Downloading webpage' % video_id)
        
        def report_extraction(self, video_id):
                """Report information extraction."""
        
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[metacafe] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                # Retrieve disclaimer
 
        def _real_initialize(self):
                # Retrieve disclaimer
@@ -1106,11 +1117,11 @@ class DailymotionIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'[dailymotion] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[dailymotion] %s: Downloading webpage' % video_id)
        
        def report_extraction(self, video_id):
                """Report information extraction."""
        
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[dailymotion] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[dailymotion] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
 
        def _real_initialize(self):
                return
@@ -1193,11 +1204,11 @@ class GoogleIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'[video.google] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[video.google] %s: Downloading webpage' % video_id)
 
        def report_extraction(self, video_id):
                """Report information extraction."""
 
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[video.google] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[video.google] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
 
        def _real_initialize(self):
                return
@@ -1303,11 +1314,11 @@ class PhotobucketIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'[photobucket] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[photobucket] %s: Downloading webpage' % video_id)
 
        def report_extraction(self, video_id):
                """Report information extraction."""
 
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[photobucket] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[photobucket] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
 
        def _real_initialize(self):
                return
@@ -1387,11 +1398,11 @@ class YahooIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'[video.yahoo] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[video.yahoo] %s: Downloading webpage' % video_id)
 
        def report_extraction(self, video_id):
                """Report information extraction."""
 
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[video.yahoo] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[video.yahoo] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
 
        def _real_initialize(self):
                return
@@ -1539,12 +1550,12 @@ class GenericIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_stdout(u'WARNING: Falling back on generic information extractor.')
-               self._downloader.to_stdout(u'[generic] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'WARNING: Falling back on generic information extractor.')
+               self._downloader.to_screen(u'[generic] %s: Downloading webpage' % video_id)
 
        def report_extraction(self, video_id):
                """Report information extraction."""
 
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_stdout(u'[generic] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[generic] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
 
        def _real_initialize(self):
                return
@@ -1646,7 +1657,7 @@ class YoutubeSearchIE(InfoExtractor):
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
-               self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
+               self._downloader.to_screen(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
@@ -1737,7 +1748,7 @@ class GoogleSearchIE(InfoExtractor):
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
-               self._downloader.to_stdout(u'[video.google] query "%s": Downloading page %s' % (query, pagenum))
+               self._downloader.to_screen(u'[video.google] query "%s": Downloading page %s' % (query, pagenum))
 
        def _real_initialize(self):
                self._google_ie.initialize()
 
        def _real_initialize(self):
                self._google_ie.initialize()
@@ -1828,7 +1839,7 @@ class YahooSearchIE(InfoExtractor):
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
        def report_download_page(self, query, pagenum):
                """Report attempt to download playlist page with given number."""
                query = query.decode(preferredencoding())
-               self._downloader.to_stdout(u'[video.yahoo] query "%s": Downloading page %s' % (query, pagenum))
+               self._downloader.to_screen(u'[video.yahoo] query "%s": Downloading page %s' % (query, pagenum))
 
        def _real_initialize(self):
                self._yahoo_ie.initialize()
 
        def _real_initialize(self):
                self._yahoo_ie.initialize()
@@ -1918,7 +1929,7 @@ class YoutubePlaylistIE(InfoExtractor):
 
        def report_download_page(self, playlist_id, pagenum):
                """Report attempt to download playlist page with given number."""
 
        def report_download_page(self, playlist_id, pagenum):
                """Report attempt to download playlist page with given number."""
-               self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
+               self._downloader.to_screen(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
@@ -1982,7 +1993,7 @@ class YoutubeUserIE(InfoExtractor):
 
        def report_download_page(self, username):
                """Report attempt to download user page."""
 
        def report_download_page(self, username):
                """Report attempt to download user page."""
-               self._downloader.to_stdout(u'[youtube] user %s: Downloading page ' % (username))
+               self._downloader.to_screen(u'[youtube] user %s: Downloading page ' % (username))
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
@@ -2083,7 +2094,7 @@ if __name__ == '__main__':
                        if not os.access (filename, os.W_OK):
                                sys.exit('ERROR: no write permissions on %s' % filename)
 
                        if not os.access (filename, os.W_OK):
                                sys.exit('ERROR: no write permissions on %s' % filename)
 
-                       downloader.to_stdout('Updating to latest stable version...')
+                       downloader.to_screen('Updating to latest stable version...')
                        latest_url = 'http://bitbucket.org/rg3/youtube-dl/raw/tip/LATEST_VERSION'
                        latest_version = urllib.urlopen(latest_url).read().strip()
                        prog_url = 'http://bitbucket.org/rg3/youtube-dl/raw/%s/youtube-dl' % latest_version
                        latest_url = 'http://bitbucket.org/rg3/youtube-dl/raw/tip/LATEST_VERSION'
                        latest_version = urllib.urlopen(latest_url).read().strip()
                        prog_url = 'http://bitbucket.org/rg3/youtube-dl/raw/%s/youtube-dl' % latest_version
@@ -2091,17 +2102,12 @@ if __name__ == '__main__':
                        stream = open(filename, 'w')
                        stream.write(newcontent)
                        stream.close()
                        stream = open(filename, 'w')
                        stream.write(newcontent)
                        stream.close()
-                       downloader.to_stdout('Updated to version %s' % latest_version)
-
-               # General configuration
-               urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-               urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-               socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+                       downloader.to_screen('Updated to version %s' % latest_version)
 
                # Parse command line
                parser = optparse.OptionParser(
                        usage='Usage: %prog [options] url...',
 
                # Parse command line
                parser = optparse.OptionParser(
                        usage='Usage: %prog [options] url...',
-                       version='2010.10.03',
+                       version='2010.10.24',
                        conflict_handler='resolve',
                )
 
                        conflict_handler='resolve',
                )
 
@@ -2172,10 +2178,29 @@ if __name__ == '__main__':
                                action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
                filesystem.add_option('-c', '--continue',
                                action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
                                action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
                filesystem.add_option('-c', '--continue',
                                action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+               filesystem.add_option('--cookies',
+                               dest='cookiefile', metavar='FILE', help='file to dump cookie jar to')
                parser.add_option_group(filesystem)
 
                (opts, args) = parser.parse_args()
 
                parser.add_option_group(filesystem)
 
                (opts, args) = parser.parse_args()
 
+               # Open appropriate CookieJar
+               if opts.cookiefile is None:
+                       jar = cookielib.CookieJar()
+               else:
+                       try:
+                               jar = cookielib.MozillaCookieJar(opts.cookiefile)
+                               if os.path.isfile(opts.cookiefile) and os.access(opts.cookiefile, os.R_OK):
+                                       jar.load()
+                       except (IOError, OSError), err:
+                               sys.exit(u'ERROR: unable to open cookie file')
+
+               # General configuration
+               cookie_processor = urllib2.HTTPCookieProcessor(jar)
+               urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+               urllib2.install_opener(urllib2.build_opener(cookie_processor))
+               socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
                # Batch file verification
                batchurls = []
                if opts.batchfile is not None:
                # Batch file verification
                batchurls = []
                if opts.batchfile is not None:
@@ -2261,6 +2286,7 @@ if __name__ == '__main__':
                        'continuedl': opts.continue_dl,
                        'noprogress': opts.noprogress,
                        'playliststart': opts.playliststart,
                        'continuedl': opts.continue_dl,
                        'noprogress': opts.noprogress,
                        'playliststart': opts.playliststart,
+                       'logtostderr': opts.outtmpl == '-',
                        })
                fd.add_info_extractor(youtube_search_ie)
                fd.add_info_extractor(youtube_pl_ie)
                        })
                fd.add_info_extractor(youtube_search_ie)
                fd.add_info_extractor(youtube_pl_ie)
@@ -2289,6 +2315,14 @@ if __name__ == '__main__':
                        else:
                                sys.exit()
                retcode = fd.download(all_urls)
                        else:
                                sys.exit()
                retcode = fd.download(all_urls)
+
+               # Dump cookie jar if requested
+               if opts.cookiefile is not None:
+                       try:
+                               jar.save()
+                       except (IOError, OSError), err:
+                               sys.exit(u'ERROR: unable to save cookie jar')
+
                sys.exit(retcode)
 
        except DownloadError:
                sys.exit(retcode)
 
        except DownloadError: