projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean duplicate method report_download_webpage in InfoExtractors
[youtube-dl]
/
youtube_dl
/
FileDownloader.py
diff --git
a/youtube_dl/FileDownloader.py
b/youtube_dl/FileDownloader.py
index 7139adf6bb6490b31dc3661b0fc220df30b0dad2..d0378fb148cfee2f638184fb48cd882834d34ac9 100644
(file)
--- a/
youtube_dl/FileDownloader.py
+++ b/
youtube_dl/FileDownloader.py
@@
-121,7
+121,7
@@
class FileDownloader(object):
exponent = 0
else:
exponent = int(math.log(bytes, 1024.0))
exponent = 0
else:
exponent = int(math.log(bytes, 1024.0))
- suffix =
'bkMGTPEZY'
[exponent]
+ suffix =
['B','KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB']
[exponent]
converted = float(bytes) / float(1024 ** exponent)
return '%.2f%s' % (converted, suffix)
converted = float(bytes) / float(1024 ** exponent)
return '%.2f%s' % (converted, suffix)
@@
-254,7
+254,7
@@
class FileDownloader(object):
Print the message to stderr, it will be prefixed with 'WARNING:'
If stderr is a tty file the 'WARNING:' will be colored
'''
Print the message to stderr, it will be prefixed with 'WARNING:'
If stderr is a tty file the 'WARNING:' will be colored
'''
- if sys.stderr.isatty():
+ if sys.stderr.isatty()
and os.name != 'nt'
:
_msg_header=u'\033[0;33mWARNING:\033[0m'
else:
_msg_header=u'WARNING:'
_msg_header=u'\033[0;33mWARNING:\033[0m'
else:
_msg_header=u'WARNING:'
@@
-266,7
+266,7
@@
class FileDownloader(object):
Do the same as trouble, but prefixes the message with 'ERROR:', colored
in red if stderr is a tty file.
'''
Do the same as trouble, but prefixes the message with 'ERROR:', colored
in red if stderr is a tty file.
'''
- if sys.stderr.isatty():
+ if sys.stderr.isatty()
and os.name != 'nt'
:
_msg_header = u'\033[0;31mERROR:\033[0m'
else:
_msg_header = u'ERROR:'
_msg_header = u'\033[0;31mERROR:\033[0m'
else:
_msg_header = u'ERROR:'
@@
-406,10
+406,10
@@
class FileDownloader(object):
filename = self.params['outtmpl'] % template_dict
return filename
except KeyError as err:
filename = self.params['outtmpl'] % template_dict
return filename
except KeyError as err:
- self.
trouble(u'ERROR:
Erroneous output template')
+ self.
report_error(u'
Erroneous output template')
return None
except ValueError as err:
return None
except ValueError as err:
- self.
trouble(u'ERROR:
Insufficient system charset ' + repr(preferredencoding()))
+ self.
report_error(u'
Insufficient system charset ' + repr(preferredencoding()))
return None
def _match_entry(self, info_dict):
return None
def _match_entry(self, info_dict):
@@
-468,16
+468,16
@@
class FileDownloader(object):
results.append(self.process_ie_result(ie_result, download))
return results
except ExtractorError as de: # An error we somewhat expected
results.append(self.process_ie_result(ie_result, download))
return results
except ExtractorError as de: # An error we somewhat expected
- self.
trouble(u'ERROR: ' +
compat_str(de), de.format_traceback())
+ self.
report_error(
compat_str(de), de.format_traceback())
break
except Exception as e:
if self.params.get('ignoreerrors', False):
break
except Exception as e:
if self.params.get('ignoreerrors', False):
- self.
trouble(u'ERROR: ' +
compat_str(e), tb=compat_str(traceback.format_exc()))
+ self.
report_error(
compat_str(e), tb=compat_str(traceback.format_exc()))
break
else:
raise
if not suitable_found:
break
else:
raise
if not suitable_found:
- self.
trouble(u'ERROR:
no suitable InfoExtractor: %s' % url)
+ self.
report_error(u'
no suitable InfoExtractor: %s' % url)
def process_ie_result(self, ie_result, download = True):
"""
def process_ie_result(self, ie_result, download = True):
"""
@@
-636,7
+636,7
@@
class FileDownloader(object):
with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8') as subfile:
subfile.write(sub)
except (OSError, IOError):
with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8') as subfile:
subfile.write(sub)
except (OSError, IOError):
- self.
trouble(u'ERROR:
Cannot write subtitles file ' + descfn)
+ self.
report_error(u'
Cannot write subtitles file ' + descfn)
return
if self.params.get('onlysubtitles', False):
return
return
if self.params.get('onlysubtitles', False):
return
@@
-683,7
+683,7
@@
class FileDownloader(object):
#It also downloads the videos
videos = self.extract_info(url)
except UnavailableVideoError:
#It also downloads the videos
videos = self.extract_info(url)
except UnavailableVideoError:
- self.
trouble(u'\nERROR:
unable to download video')
+ self.
report_error(u'
unable to download video')
except MaxDownloadsReached:
self.to_screen(u'[info] Maximum number of downloaded files reached.')
raise
except MaxDownloadsReached:
self.to_screen(u'[info] Maximum number of downloaded files reached.')
raise