X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=1e6b876e162302342337aa3c758a12111654d9db;hb=0086d1ec32139fab208648d39e9b275ba4a3f942;hp=adb4234c7be89d4507426d8cab3d66866474f0a5;hpb=9fcd8355e57b4ef5605a015a0039d1bbe2375cf3;p=youtube-dl.git diff --git a/youtube-dl b/youtube-dl index adb4234c7..1e6b876e1 100755 --- a/youtube-dl +++ b/youtube-dl @@ -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', @@ -55,8 +55,12 @@ 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. + ignoreerrors: Do not stop on download errors. """ _params = None @@ -147,9 +151,36 @@ class FileDownloader(object): 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 trouble(self, message=None): + """Determine action to take when a download problem appears. + + Depending on if the downloader has been configured to ignore + download errors or not, this method may exit the program or + not when errors are found, after printing the message. If it + doesn't exit, it returns an error code suitable to be returned + later as a program exit code to indicate error. + """ + if message is not None: + self.to_stderr(message) + if not self._params.get('ignoreerrors', False): + sys.exit(1) + return 1 def download(self, url_list): """Download a given list of URLs.""" + retcode = 0 + 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: @@ -157,39 +188,55 @@ class FileDownloader(object): continue # Suitable InfoExtractor found suitable_found = True - results = [x for x in ie.extract(url) if x is not None] + all_results = ie.extract(url) + results = [x for x in all_results if x is not None] + if len(results) != len(all_results): + retcode = self.trouble() - if (len(url_list) > 1 or len(results) > 1) and re.search(r'%\(.+?\)s', self._params['outtmpl']) is 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: + retcode = self.trouble('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)) + retcode = self.trouble('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)) + retcode = self.trouble('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)) + retcode = self.trouble('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)) + retcode = self.trouble('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) + retcode = self.trouble('ERROR: no suitable InfoExtractor: %s' % url) + + return retcode def _do_download(self, stream, url): request = urllib2.Request(url, None, std_headers) @@ -334,10 +381,10 @@ class YoutubeIE(InfoExtractor): self.to_stdout('[youtube] Logging in') login_results = urllib2.urlopen(request).read() if re.search(r'(?i)