From d32a4ea99e2d3ff691c14b6ba8ff8ec6d3d4a35a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 10 Dec 2017 23:45:43 +0000
Subject: [PATCH] Seperate _output from guiprocess and keep window opening in
 spawn.

This removes the extraneous variable, and makes testing easier.
---
 qutebrowser/browser/commands.py |  8 ++++++--
 qutebrowser/misc/guiprocess.py  | 33 ++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 7ad73708a..495d48414 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1210,13 +1210,17 @@ class CommandDispatcher:
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
-                                         parent=self._tabbed_browser,
-                                         output=output)
+                                         parent=self._tabbed_browser)
             if detach:
                 proc.start_detached(cmd, args)
             else:
                 proc.start(cmd, args)
 
+        if output:
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window='last-focused')
+            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def home(self):
         """Open main startpage in current tab."""
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 9d0b50be6..80803f53f 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -22,9 +22,9 @@
 import shlex
 
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess,
-                          QProcessEnvironment, QUrl)
+                          QProcessEnvironment)
 
-from qutebrowser.utils import message, log, objreg
+from qutebrowser.utils import message, log
 from qutebrowser.browser import qutescheme
 
 # A mapping of QProcess::ErrorCode's to human-readable strings.
@@ -49,7 +49,6 @@ class GUIProcess(QObject):
         cmd: The command which was started.
         args: A list of arguments which gets passed.
         verbose: Whether to show more messages.
-        _output: Whether to show the output in a new tab.
         _started: Whether the underlying process is started.
         _proc: The underlying QProcess.
         _what: What kind of thing is spawned (process/editor/userscript/...).
@@ -64,11 +63,10 @@ class GUIProcess(QObject):
     started = pyqtSignal()
 
     def __init__(self, what, *, verbose=False, additional_env=None,
-                 parent=None, output=False):
+                 parent=None):
         super().__init__(parent)
         self._what = what
         self.verbose = verbose
-        self._output = output
         self._started = False
         self.cmd = None
         self.args = None
@@ -103,18 +101,8 @@ class GUIProcess(QObject):
         stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
         stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
 
-        spawn_log = "Process finished with code {}, status {}.".format(
-            code, status)
-
-        spawn_log += "\nProcess stdout:\n" + (stdout or "(No output)").strip()
-        spawn_log += "\nProcess stderr:\n" + (stderr or "(No output)").strip()
-
-        qutescheme.spawn_output = spawn_log
-
-        if self._output:
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                    window='last-focused')
-            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+        qutescheme.spawn_output = self.spawn_format(code, status,
+                                                    stdout, stderr)
 
         if status == QProcess.CrashExit:
             message.error("{} crashed!".format(self._what.capitalize()))
@@ -134,6 +122,17 @@ class GUIProcess(QObject):
             if stderr:
                 log.procs.error("Process stderr:\n" + stderr.strip())
 
+    def spawn_format(self, code=0, status=0, stdout="", stderr=""):
+        """Produce a formatted string for spawn output."""
+        stdout = (stdout or "(No output)").strip()
+        stderr = (stderr or "(No output)").strip()
+
+        spawn_string = ("Process finished with code {}, status {}\n"
+                        "\nProcess stdout:\n {}"
+                        "\nProcess stderr:\n {}").format(code, status,
+                                                       stdout, stderr)
+        return spawn_string
+
     @pyqtSlot()
     def on_started(self):
         """Called when the process started successfully."""