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

Add some more logging

Browse Source
This commit is contained in:
Florian Bruhin 2015-01-04 14:51:50 +01:00
parent ecc7f09f86
commit b1b1cecdb7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/commands/userscripts.py
View File

@ -52,6 +52,7 @@ class _QtFIFOReader(QObject):
@pyqtSlot() @pyqtSlot()
def read_line(self): def read_line(self):
"""(Try to) read a line from the fifo.""" """(Try to) read a line from the fifo."""
log.procs.debug("QSocketNotifier triggered!")
self._notifier.setEnabled(False) self._notifier.setEnabled(False)
for line in self.fifo: for line in self.fifo:
self.got_line.emit(line.rstrip('\r\n')) self.got_line.emit(line.rstrip('\r\n'))
@ -121,6 +122,7 @@ class _BaseUserscriptRunner(QObject):
def _cleanup(self): def _cleanup(self):
"""Clean up the temporary file.""" """Clean up the temporary file."""
log.procs.debug("Deleting temporary file {}.".format(self._filepath))
try: try:
os.remove(self._filepath) os.remove(self._filepath)
except OSError as e: except OSError as e:
@ -157,6 +159,7 @@ class _BaseUserscriptRunner(QObject):
# executed async. # executed async.
message.error(self._win_id, message.error(self._win_id,
"Error while calling userscript: {}".format(msg)) "Error while calling userscript: {}".format(msg))
log.procs.debug("Userscript process error: {} - {}".format(error, msg))
class _POSIXUserscriptRunner(_BaseUserscriptRunner): class _POSIXUserscriptRunner(_BaseUserscriptRunner):
@ -195,7 +198,7 @@ class _POSIXUserscriptRunner(_BaseUserscriptRunner):
def on_proc_finished(self): def on_proc_finished(self):
"""Interrupt the reader when the process finished.""" """Interrupt the reader when the process finished."""
log.procs.debug("proc finished") log.procs.debug("Userscript process finished.")
self.finish() self.finish()
def on_proc_error(self, error): def on_proc_error(self, error):
@ -245,7 +248,7 @@ class _WindowsUserscriptRunner(_BaseUserscriptRunner):
def on_proc_finished(self): def on_proc_finished(self):
"""Read back the commands when the process finished.""" """Read back the commands when the process finished."""
log.procs.debug("proc finished") log.procs.debug("Userscript process finished.")
try: try:
with open(self._filepath, 'r', encoding='utf-8') as f: with open(self._filepath, 'r', encoding='utf-8') as f:
for line in f: for line in f:
@ -310,6 +313,9 @@ def run(cmd, *args, url, win_id):
urlstr = url.toString(QUrl.FullyEncoded) urlstr = url.toString(QUrl.FullyEncoded)
commandrunner = runners.CommandRunner(win_id, tabbed_browser) commandrunner = runners.CommandRunner(win_id, tabbed_browser)
runner = UserscriptRunner(win_id, tabbed_browser) runner = UserscriptRunner(win_id, tabbed_browser)
runner.got_cmd.connect(
lambda cmd: log.commands.debug("Got userscript command: {}".format(
cmd)))
runner.got_cmd.connect(commandrunner.run_safely) runner.got_cmd.connect(commandrunner.run_safely)
runner.run(cmd, *args, env={'QUTE_URL': urlstr}) runner.run(cmd, *args, env={'QUTE_URL': urlstr})
runner.finished.connect(commandrunner.deleteLater) runner.finished.connect(commandrunner.deleteLater)