]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[downloader/hls] Ask ffmpeg to quit when interrupting youtube-dl with 'Ctrl+C' (...
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 16 Jan 2016 20:51:25 +0000 (21:51 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Tue, 19 Jan 2016 21:07:14 +0000 (22:07 +0100)
Otherwise the mp4 file can't be played.

youtube_dl/downloader/hls.py

index d186d402d7aa8845df405691bb9446dcf8894429..10b83c6b2665a035c33788bbf136dd511662bf3e 100644 (file)
@@ -46,7 +46,16 @@ class HlsFD(FileDownloader):
 
         self._debug_cmd(args)
 
-        retval = subprocess.call(args, stdin=subprocess.PIPE)
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE)
+        try:
+            retval = proc.wait()
+        except KeyboardInterrupt:
+            # subprocces.run would send the SIGKILL signal to ffmpeg and the
+            # mp4 file couldn't be played, but if we ask ffmpeg to quit it
+            # produces a file that is playable (this is mostly useful for live
+            # streams)
+            proc.communicate(b'q')
+            raise
         if retval == 0:
             fsize = os.path.getsize(encodeFilename(tmpfilename))
             self.to_screen('\r[%s] %s bytes' % (args[0], fsize))