rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle editor errors

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-30 10:59:43 +02:00
parent 4e2517a94f
commit 903d1876af
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qutebrowser/browser/curcommand.py
View File

@ -356,12 +356,20 @@ class CurCommandDispatcher(QObject):
proc = QProcess(self) proc = QProcess(self)
proc.finished.connect(partial(self.on_editor_closed, elem, oshandle, proc.finished.connect(partial(self.on_editor_closed, elem, oshandle,
filename)) filename))
proc.error.connect(partial(self.on_editor_error, oshandle, filename))
editor = config.get('general', 'editor') editor = config.get('general', 'editor')
executable = editor[0] executable = editor[0]
args = [arg.replace('{}', filename) for arg in editor[1:]] args = [arg.replace('{}', filename) for arg in editor[1:]]
logging.debug("Calling \"{}\" with args {}".format(executable, args)) logging.debug("Calling \"{}\" with args {}".format(executable, args))
proc.start(executable, args) proc.start(executable, args)
def _on_editor_cleanup(self, oshandle, filename):
os.close(oshandle)
try:
os.remove(filename)
except PermissionError:
message.error("Failed to delete tempfile...")
def on_editor_closed(self, elem, oshandle, filename, exitcode, def on_editor_closed(self, elem, oshandle, filename, exitcode,
exitstatus): exitstatus):
"""Write the editor text into the form field and clean up tempfile. """Write the editor text into the form field and clean up tempfile.
@ -369,10 +377,13 @@ class CurCommandDispatcher(QObject):
Callback for QProcess when the editor was closed. Callback for QProcess when the editor was closed.
""" """
logging.debug("Editor closed") logging.debug("Editor closed")
if exitcode != 0 or exitstatus != QProcess.NormalExit: if exitcode != 0:
message.error("Editor did quit abnormally (status {})!".format( message.error("Editor did quit abnormally (status {})!".format(
exitcode)) exitcode))
return return
if exitstatus != QProcess.NormalExit:
# No error here, since we already handle this in on_editor_error
return
if elem.isNull(): if elem.isNull():
message.error("Element vanished while editing!") message.error("Element vanished while editing!")
return return
@ -381,8 +392,19 @@ class CurCommandDispatcher(QObject):
text = webelem.javascript_escape(text) text = webelem.javascript_escape(text)
logging.debug("Read back: {}".format(text)) logging.debug("Read back: {}".format(text))
elem.evaluateJavaScript("this.value='{}'".format(text)) elem.evaluateJavaScript("this.value='{}'".format(text))
os.close(oshandle) self._on_editor_cleanup(oshandle, filename)
try:
os.remove(filename) def on_editor_error(self, oshandle, filename, error):
except PermissionError: """Display an error message and clean up when editor crashed."""
message.error("Failed to delete tempfile...") messages = {
QProcess.FailedToStart: "The process failed to start.",
QProcess.Crashed: "The process crashed.",
QProcess.Timedout: "The last waitFor...() function timed out.",
QProcess.WriteError: ("An error occurred when attempting to write "
"to the process."),
QProcess.ReadError: ("An error occurred when attempting to read "
"from the process."),
QProcess.UnknownError: "An unknown error occurred.",
}
message.error("Error while calling editor: {}".format(messages[error]))
self._on_editor_cleanup(oshandle, filename)