ratelimit: Download speed limit, in bytes/sec.
nooverwrites: Prevent overwriting files.
continuedl: Try to continue downloads if possible.
+ noprogress: Do not print the progress bar.
"""
params = None
self._pps.append(pp)
pp.set_downloader(self)
- def to_stdout(self, message, skip_eol=False):
+ def to_stdout(self, message, skip_eol=False, ignore_encoding_errors=False):
"""Print message to stdout if not in quiet mode."""
- if not self.params.get('quiet', False):
- print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+ try:
+ if not self.params.get('quiet', False):
+ print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
sys.stdout.flush()
+ except (UnicodeEncodeError), err:
+ if not ignore_encoding_errors:
+ raise
def to_stderr(self, message):
"""Print message to stderr."""
def report_destination(self, filename):
"""Report destination filename."""
- self.to_stdout(u'[download] Destination: %s' % filename)
+ self.to_stdout(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
self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
- self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+ try:
+ self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+ except (UnicodeEncodeError), err:
+ self.to_stdout(u'[download] The file has already been downloaded')
def report_unable_to_resume(self):
"""Report it was impossible to resume download."""
def report_finish(self):
"""Report download finished."""
- self.to_stdout(u'')
+ if self.params.get('noprogress', False):
+ self.to_stdout(u'[download] Download completed')
+ else:
+ self.to_stdout(u'')
def process_info(self, info_dict):
"""Process a single dictionary returned by an InfoExtractor."""
# Verify URL if it's an HTTP one
if info_dict['url'].startswith('http'):
try:
- info_dict['url'] = self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
+ self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
raise UnavailableFormatError
_LOGIN_URL = 'http://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'
- _available_formats = ['37', '22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+ _available_formats = ['37', '22', '35', '18', '34', '5', '17', '13', None] # listed in order of priority for -b flag
_video_extensions = {
'13': '3gp',
'17': 'mp4',
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
# Google Video doesn't show uploader nicknames?
video_uploader = 'NA'
'url': video_url.decode('utf-8'),
'uploader': video_uploader.decode('utf-8'),
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError:
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
video_uploader = mobj.group(2).decode('utf-8')
'url': video_url.decode('utf-8'),
'uploader': video_uploader,
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError:
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
# video uploader is domain name
mobj = re.match(r'(?:https?://)?([^/]*)/.*', url)
'url': video_url.decode('utf-8'),
'uploader': video_uploader,
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError:
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2010.02.13',
+ version='2010.03.07',
conflict_handler='resolve',
)
action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
verbosity.add_option('-e', '--get-title',
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+ verbosity.add_option('--no-progress',
+ action='store_true', dest='noprogress', help='do not print progress bar', default=False)
parser.add_option_group(verbosity)
filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
sys.exit(u'ERROR: batch file could not be read')
all_urls = batchurls + args
- # Make sure all URLs are in our preferred encoding
- for i in range(0, len(all_urls)):
- all_urls[i] = unicode(all_urls[i], preferredencoding())
-
# Conflicting, missing and erroneous options
if opts.usenetrc and (opts.username is not None or opts.password is not None):
parser.error(u'using .netrc conflicts with giving username/password')
'ratelimit': opts.ratelimit,
'nooverwrites': opts.nooverwrites,
'continuedl': opts.continue_dl,
+ 'noprogress': opts.noprogress,
})
fd.add_info_extractor(youtube_search_ie)
fd.add_info_extractor(youtube_pl_ie)
Rapsys Git / youtubedl / commitdiff