From: Jaime Marquínez Ferrándiz Date: Fri, 5 Apr 2013 10:39:51 +0000 (+0200) Subject: Merge branch 'master' into extract_info_rewrite X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=14294236bf9623fac4ad748389689b77d52b3547;p=youtube-dl Merge branch 'master' into extract_info_rewrite --- 14294236bf9623fac4ad748389689b77d52b3547 diff --cc youtube_dl/FileDownloader.py index d2b9be9ef,7c5a52be1..2237d355d --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@@ -603,14 -556,53 +631,17 @@@ class FileDownloader(object) raise SameFileError(self.params['outtmpl']) for url in url_list: - suitable_found = False - for ie in self._ies: - # Go to next InfoExtractor if not suitable - if not ie.suitable(url): - continue - - # Warn if the _WORKING attribute is False - if not ie.working(): - self.report_warning(u'the program functionality for this site has been marked as broken, ' - u'and will probably not work. If you want to go on, use the -i option.') + videos = self.extract_info(url) - # Suitable InfoExtractor found - suitable_found = True - - # Extract information from URL and process it + for video in videos or []: try: - videos = ie.extract(url) - except ExtractorError as de: # An error we somewhat expected - self.trouble(u'ERROR: ' + compat_str(de), de.format_traceback()) - break + self.increment_downloads() + self.process_info(video) + except UnavailableVideoError: + self.trouble(u'\nERROR: unable to download video') + except MaxDownloadsReached: + self.to_screen(u'[info] Maximum number of downloaded files reached.') + raise - except Exception as e: - if self.params.get('ignoreerrors', False): - self.report_error(u'' + compat_str(e), tb=compat_str(traceback.format_exc())) - break - else: - raise - - if len(videos or []) > 1 and self.fixed_template(): - raise SameFileError(self.params['outtmpl']) - - for video in videos or []: - video['extractor'] = ie.IE_NAME - try: - self.increment_downloads() - self.process_info(video) - except UnavailableVideoError: - self.to_stderr(u"\n") - self.report_error(u'unable to download video') - - # Suitable InfoExtractor had been found; go to next URL - break - - if not suitable_found: - self.report_error(u'no suitable InfoExtractor: %s' % url) return self._download_retcode