Browse Source
[downloader/external] Properly handle live stream downloading cancellation (closes #8932)
master
Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with
11 additions and
1 deletions
-
youtube_dl/downloader/external.py
|
|
@ -29,7 +29,17 @@ class ExternalFD(FileDownloader): |
|
|
|
self.report_destination(filename) |
|
|
|
tmpfilename = self.temp_name(filename) |
|
|
|
|
|
|
|
retval = self._call_downloader(tmpfilename, info_dict) |
|
|
|
try: |
|
|
|
retval = self._call_downloader(tmpfilename, info_dict) |
|
|
|
except KeyboardInterrupt: |
|
|
|
if not info_dict.get('is_live'): |
|
|
|
raise |
|
|
|
# Live stream downloading cancellation should be considered as |
|
|
|
# correct and expected termination thus all postprocessing |
|
|
|
# should take place |
|
|
|
retval = 0 |
|
|
|
self.to_screen('[%s] Interrupted by user' % self.get_basename()) |
|
|
|
|
|
|
|
if retval == 0: |
|
|
|
fsize = os.path.getsize(encodeFilename(tmpfilename)) |
|
|
|
self.to_screen('\r[%s] Downloaded %s bytes' % (self.get_basename(), fsize)) |
|
|
|