瀏覽代碼

[downloader/external] Properly handle live stream downloading cancellation (closes #8932)

Sergey M․ 8 年之前
父節點
當前提交
e7db6759e4
共有 1 個文件被更改,包括 11 次插入1 次删除
  1. 11 1
      youtube_dl/downloader/external.py

+ 11 - 1
youtube_dl/downloader/external.py

@@ -29,7 +29,17 @@ class ExternalFD(FileDownloader):
         self.report_destination(filename)
         self.report_destination(filename)
         tmpfilename = self.temp_name(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:
         if retval == 0:
             fsize = os.path.getsize(encodeFilename(tmpfilename))
             fsize = os.path.getsize(encodeFilename(tmpfilename))
             self.to_screen('\r[%s] Downloaded %s bytes' % (self.get_basename(), fsize))
             self.to_screen('\r[%s] Downloaded %s bytes' % (self.get_basename(), fsize))