From 57cb8ab3f0ee56a3d0fff802cf62ef88c5bf1e3f Mon Sep 17 00:00:00 2001
From: Michael Lazar <lazar.michael22@gmail.com>
Date: Tue, 27 Sep 2016 01:17:54 -0700
Subject: [PATCH] Use communicate() to avoid subprocess hanging.

---
 rtv/terminal.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/rtv/terminal.py b/rtv/terminal.py
index 4f8a92d..a036716 100644
--- a/rtv/terminal.py
+++ b/rtv/terminal.py
@@ -7,6 +7,7 @@ import time
 import codecs
 import curses
 import logging
+import threading
 import webbrowser
 import subprocess
 import curses.ascii
@@ -369,11 +370,10 @@ class Terminal(object):
                 p = subprocess.Popen(
                     [command], stderr=subprocess.PIPE,
                     universal_newlines=True, shell=True)
-                code = p.wait()
+                _, stderr = p.communicate()
                 if copious_output:
                     six.moves.input('Press any key to continue')
-            if code != 0:
-                _, stderr = p.communicate()
+            if p.poll() != 0:
                 _logger.warning(stderr)
                 self.show_notification(
                     'Program exited with status={0}\n{1}'.format(
@@ -396,6 +396,13 @@ class Terminal(object):
                         'Program exited with status={0}\n{1}'.format(
                             code, stderr.strip()))
 
+                # Spin off a thread with p.communicate() to avoid subprocess
+                # hang when the stodout/stderr PIPE gets filled up. This
+                # behavior was discovered when opening long gifs with mpv
+                # because mpv sends a progress bar to stderr.
+                # https://thraxil.org/users/anders/posts/2008/03/13/
+                threading.Thread(target=p.communicate).start()
+
     def get_mailcap_entry(self, url):
         """
         Search through the mime handlers list and attempt to find the
@@ -519,10 +526,8 @@ class Terminal(object):
         try:
             with self.suspend():
                 p = subprocess.Popen([pager], stdin=subprocess.PIPE)
-                p.stdin.write(data.encode('utf-8'))
-                p.stdin.close()
                 try:
-                    p.wait()
+                    p.communicate(data.encode('utf-8'))
                 except KeyboardInterrupt:
                     p.terminate()
         except OSError:
@@ -560,7 +565,7 @@ class Terminal(object):
             with self.suspend():
                 p = subprocess.Popen([editor, filepath])
                 try:
-                    p.wait()
+                    p.communicate()
                 except KeyboardInterrupt:
                     p.terminate()
         except OSError: