]> gitweb @ CieloNegro.org - youtube-dl.git/blobdiff - youtube-dl
Minor improvements and changes
[youtube-dl.git] / youtube-dl
index 45773fda2480257a7cf42b5907118ee9664d629b..607109bb26f7db3442ec10133f00f536e40830c0 100755 (executable)
@@ -17,7 +17,7 @@ import urllib
 import urllib2
 
 std_headers = {        
-       'User-Agent': 'UserAgent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9) Gecko/2008052906 Firefox/3.0',
+       'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.1) Gecko/2008070208 Firefox/3.0.1',
        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
        'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
        'Accept-Language': 'en-us,en;q=0.5',
@@ -38,7 +38,7 @@ class FileDownloader(object):
        For this, file downloader objects have a method that allows
        InfoExtractors to be registered in a given order. When it is passed
        a URL, the file downloader handles it to the first InfoExtractor it
-       finds that reports it's able to handle it. The InfoExtractor returns
+       finds that reports being able to handle it. The InfoExtractor returns
        all the information to the FileDownloader and the latter downloads the
        file or does whatever it's instructed to do.
 
@@ -55,6 +55,9 @@ class FileDownloader(object):
        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.
        outtmpl:        Template for output names.
        """
@@ -84,8 +87,6 @@ class FileDownloader(object):
                else:
                        exponent = long(math.log(float(bytes), 1024.0))
                suffix = 'bkMGTPEZY'[exponent]
-               if exponent == 0:
-                       return '%s%s' % (bytes, suffix)
                converted = float(bytes) / float(1024**exponent)
                return '%.2f%s' % (converted, suffix)
 
@@ -113,7 +114,7 @@ class FileDownloader(object):
        def calc_speed(start, now, bytes):
                dif = now - start
                if bytes == 0 or dif < 0.001: # One millisecond
-                       return '%9s' % 'N/A b/s'
+                       return '%10s' % '---b/s'
                return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
 
        @staticmethod
@@ -144,8 +145,25 @@ class FileDownloader(object):
                self._ies.append(ie)
                ie.set_downloader(self)
        
+       def to_stdout(self, message, skip_eol=False):
+               """Print message to stdout if not in quiet mode."""
+               if not self._params.get('quiet', False):
+                       sys.stdout.write('%s%s' % (message, ['\n', ''][skip_eol]))
+                       sys.stdout.flush()
+       
+       def to_stderr(self, message):
+               """Print message to stderr."""
+               sys.stderr.write('%s\n' % message)
+       
+       def fixed_template(self):
+               """Checks if the output template is fixed."""
+               return (re.search(ur'(?u)%\(.+?\)s', self._params['outtmpl']) is None)
+
        def download(self, url_list):
                """Download a given list of URLs."""
+               if len(url_list) > 1 and self.fixed_template():
+                       sys.exit('ERROR: fixed output name but more than one file to download')
+
                for url in url_list:
                        suitable_found = False
                        for ie in self._ies:
@@ -153,36 +171,50 @@ class FileDownloader(object):
                                        continue
                                # Suitable InfoExtractor found
                                suitable_found = True
-                               for result in ie.extract(url):
-                                       if result is None:
+                               results = [x for x in ie.extract(url) if x is not None]
+
+                               if len(results) > 1 and self.fixed_template():
+                                       sys.exit('ERROR: fixed output name but more than one file to download')
+
+                               for result in results:
+
+                                       # Forced printings
+                                       if self._params.get('forcetitle', False):
+                                               print result['title']
+                                       if self._params.get('forceurl', False):
+                                               print result['url']
+                                               
+                                       # Do nothing else if in simulate mode
+                                       if self._params.get('simulate', False):
                                                continue
+
                                        try:
                                                filename = self._params['outtmpl'] % result
-                                       except (KeyError), err:
-                                               sys.stderr.write('ERROR: invalid output template: %s\n' % str(err))
+                                       except (ValueError, KeyError), err:
+                                               self.to_stderr('ERROR: invalid output template: %s' % str(err))
                                                continue
                                        try:
                                                self.pmkdir(filename)
                                        except (OSError, IOError), err:
-                                               sys.stderr.write('ERROR: unable to create directories: %s\n' % str(err))
+                                               self.to_stderr('ERROR: unable to create directories: %s' % str(err))
                                                continue
                                        try:
                                                outstream = open(filename, 'wb')
                                        except (OSError, IOError), err:
-                                               sys.stderr.write('ERROR: unable to open for writing: %s\n' % str(err))
+                                               self.to_stderr('ERROR: unable to open for writing: %s' % str(err))
                                                continue
                                        try:
                                                self._do_download(outstream, result['url'])
                                                outstream.close()
                                        except (OSError, IOError), err:
-                                               sys.stderr.write('ERROR: unable to write video data: %s\n' % str(err))
+                                               self.to_stderr('ERROR: unable to write video data: %s' % str(err))
                                                continue
                                        except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                                               sys.stderr.write('ERROR: unable to download video data: %s\n' % str(err))
+                                               self.to_stderr('ERROR: unable to download video data: %s' % str(err))
                                                continue
                                break
                        if not suitable_found:
-                               sys.stderr.write('ERROR: no suitable InfoExtractor: %s\n' % url)
+                               self.to_stderr('ERROR: no suitable InfoExtractor: %s' % url)
        
        def _do_download(self, stream, url):
                request = urllib2.Request(url, None, std_headers)
@@ -196,11 +228,8 @@ class FileDownloader(object):
                        percent_str = self.calc_percent(byte_counter, data_len)
                        eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
                        speed_str = self.calc_speed(start, time.time(), byte_counter)
-
-                       if not self._params.get('quiet', False):
-                               sys.stdout.write('\r[download] %s of %s at %s ETA %s' %
-                                               (percent_str, data_len_str, speed_str, eta_str))
-                               sys.stdout.flush()
+                       self.to_stdout('\r[download] %s of %s at %s ETA %s' %
+                                       (percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
 
                        before = time.time()
                        data_block = data.read(block_size)
@@ -212,9 +241,7 @@ class FileDownloader(object):
                        stream.write(data_block)
                        block_size = self.best_block_size(after - before, data_block_len)
 
-               if not self._params.get('quiet', False):
-                       print
-
+               self.to_stdout('')
                if data_len is not None and str(byte_counter) != data_len:
                        raise ValueError('Content too short: %s/%s bytes' % (byte_counter, data_len))
 
@@ -320,11 +347,13 @@ class YoutubeIE(InfoExtractor):
                        return
 
                # Log in
-               login_form = {  'current_form': 'loginForm',
+               login_form = {
+                               'current_form': 'loginForm',
                                'next':         '/',
                                'action_login': 'Log In',
                                'username':     username,
-                               'password':     password,       }
+                               'password':     password,
+                               }
                request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
                try:
                        self.to_stdout('[youtube] Logging in')
@@ -337,8 +366,10 @@ class YoutubeIE(InfoExtractor):
                        return
        
                # Confirm age
-               age_form = {    'next_url':             '/',
-                               'action_confirm':       'Confirm',      }
+               age_form = {
+                               'next_url':             '/',
+                               'action_confirm':       'Confirm',
+                               }
                request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
                try:
                        self.to_stdout('[youtube] Confirming age')
@@ -361,7 +392,7 @@ class YoutubeIE(InfoExtractor):
                        format_param = params.get('format', None)
 
                # Extension
-               video_extension = {18: 'mp4'}.get(format_param, 'flv')
+               video_extension = {'18': 'mp4'}.get(format_param, 'flv')
 
                # Normalize URL, including format
                normalized_url = 'http://www.youtube.com/watch?v=%s' % video_id
@@ -383,6 +414,7 @@ class YoutubeIE(InfoExtractor):
                video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s' % (video_id, mobj.group(1))
                if format_param is not None:
                        video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+               self.to_stdout('[youtube] %s: URL: %s' % (video_id, video_real_url))
 
                # uploader
                mobj = re.search(r'More From: ([^<]*)<', video_webpage)
@@ -397,42 +429,55 @@ class YoutubeIE(InfoExtractor):
                        self.to_stderr('ERROR: Unable to extract video title')
                        return [None]
                video_title = mobj.group(1).decode('utf-8')
-               video_title = re.sub(u'&(.+?);', lambda x: unichr(htmlentitydefs.name2codepoint[x.group(1)]), video_title)
+               video_title = re.sub(ur'(?u)&(.+?);', lambda x: unichr(htmlentitydefs.name2codepoint[x.group(1)]), video_title)
 
                # simplified title
-               simple_title = re.sub(u'([^%s]+)' % simple_title_chars, u'_', video_title)
-               simple_title = simple_title.strip(u'_')
+               simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+               simple_title = simple_title.strip(ur'_')
 
                # Return information
-               return [{       'id':           video_id,
-                               'url':          video_real_url,
-                               'uploader':     video_uploader,
-                               'title':        video_title,
-                               'stitle':       simple_title,
-                               'ext':          video_extension,
-                               }]
+               return [{
+                       'id':           video_id,
+                       'url':          video_real_url,
+                       'uploader':     video_uploader,
+                       'title':        video_title,
+                       'stitle':       simple_title,
+                       'ext':          video_extension,
+                       }]
 
 if __name__ == '__main__':
        try:
+               # Modules needed only when running the main program
+               import optparse
+
                # 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)
+
+               # Parse command line
 
                # Information extractors
                youtube_ie = YoutubeIE()
 
                # File downloader
-               fd = FileDownloader({   'usenetrc': False,
-                                       'username': None,
-                                       'password': None,
-                                       'quiet': False,
-                                       'format': None,
-                                       'outtmpl': '%(id)s.%(ext)s'
-                                       })
+               fd = FileDownloader({
+                       'usenetrc': False,
+                       'username': None,
+                       'password': None,
+                       'quiet': True,
+                       'forceurl': True,
+                       'forcetitle': True,
+                       'simulate': True,
+                       'format': None,
+                       'outtmpl': '%(id)s.%(ext)s'
+                       })
                fd.add_info_extractor(youtube_ie)
-               fd.download([   'http://www.youtube.com/watch?v=t7qdwI7TVe8',
-                               'http://www.youtube.com/watch?v=IJyn3pRcy_Q',
-                               'http://www.youtube.com/watch?v=DZRXe1wtC-M',   ])
+               fd.download([
+                       'http://www.youtube.com/watch?v=t7qdwI7TVe8',
+                       'http://www.youtube.com/watch?v=IJyn3pRcy_Q',
+                       'http://www.youtube.com/watch?v=DZRXe1wtC-M',
+                       ])
 
        except KeyboardInterrupt:
                sys.exit('\nERROR: Interrupted by user')