projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into subtitles_rework
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index e11d6f994165bb5afa754ecbcc30a6a327f21742..fa7bb1387b4d349ccbac9db806ea1431fa42f71f 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-261,7
+261,7
@@
class YoutubeDL(object):
self.report_error(u'Erroneous output template')
return None
except ValueError as err:
self.report_error(u'Erroneous output template')
return None
except ValueError as err:
- self.report_error(u'
Insufficient system charset ' + repr(preferredencoding())
)
+ self.report_error(u'
Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')'
)
return None
def _match_entry(self, info_dict):
return None
def _match_entry(self, info_dict):
@@
-535,7
+535,7
@@
class YoutubeDL(object):
try:
success = self.fd._do_download(filename, info_dict)
except (OSError, IOError) as err:
try:
success = self.fd._do_download(filename, info_dict)
except (OSError, IOError) as err:
- raise UnavailableVideoError()
+ raise UnavailableVideoError(
err
)
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self.report_error(u'unable to download video data: %s' % str(err))
return
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self.report_error(u'unable to download video data: %s' % str(err))
return
@@
-582,7
+582,7
@@
class YoutubeDL(object):
# No clear decision yet, let IE decide
keep_video = keep_video_wish
except PostProcessingError as e:
# No clear decision yet, let IE decide
keep_video = keep_video_wish
except PostProcessingError as e:
- self.
to_stderr(u'ERROR: ' +
e.msg)
+ self.
report_error(
e.msg)
if keep_video is False and not self.params.get('keepvideo', False):
try:
self.to_screen(u'Deleting original file %s (pass -k to keep)' % filename)
if keep_video is False and not self.params.get('keepvideo', False):
try:
self.to_screen(u'Deleting original file %s (pass -k to keep)' % filename)