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

Use object registry for args.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-23 22:13:10 +02:00
parent 297e37fdf2
commit 8af8e3530f
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/app.py
View File

@ -58,7 +58,7 @@ class Application(QApplication):
mainwindow: The MainWindow QWidget. mainwindow: The MainWindow QWidget.
config: The main ConfigManager config: The main ConfigManager
cmd_history: The "cmd_history" LineConfigParser instance. cmd_history: The "cmd_history" LineConfigParser instance.
args: ArgumentParser instance. _args: ArgumentParser instance.
_commandrunner: The main CommandRunner instance. _commandrunner: The main CommandRunner instance.
_debugconsole: The ConsoleWidget for debugging. _debugconsole: The ConsoleWidget for debugging.
_keyparsers: A mapping from modes to keyparsers. _keyparsers: A mapping from modes to keyparsers.
@ -101,7 +101,8 @@ class Application(QApplication):
sys.excepthook = self._exception_hook sys.excepthook = self._exception_hook
self.args = args self._args = args
self.registry['args'] = args
log.init.debug("Starting init...") log.init.debug("Starting init...")
self._init_misc() self._init_misc()
utils.actute_warning() utils.actute_warning()
@ -162,12 +163,12 @@ class Application(QApplication):
def _init_config(self): def _init_config(self):
"""Inizialize and read the config.""" """Inizialize and read the config."""
if self.args.confdir is None: if self._args.confdir is None:
confdir = utils.get_standard_dir(QStandardPaths.ConfigLocation) confdir = utils.get_standard_dir(QStandardPaths.ConfigLocation)
elif self.args.confdir == '': elif self._args.confdir == '':
confdir = None confdir = None
else: else:
confdir = self.args.confdir confdir = self._args.confdir
try: try:
self.config = config.ConfigManager(confdir, 'qutebrowser.conf', self.config = config.ConfigManager(confdir, 'qutebrowser.conf',
self) self)
@ -251,7 +252,7 @@ class Application(QApplication):
def _init_misc(self): def _init_misc(self):
"""Initialize misc things.""" """Initialize misc things."""
if self.args.version: if self._args.version:
print(version.version()) print(version.version())
print() print()
print() print()
@ -329,7 +330,7 @@ class Application(QApplication):
self.processEvents(QEventLoop.ExcludeUserInputEvents | self.processEvents(QEventLoop.ExcludeUserInputEvents |
QEventLoop.ExcludeSocketNotifiers) QEventLoop.ExcludeSocketNotifiers)
tabbedbrowser = self.registry['tabbedbrowser'] tabbedbrowser = self.registry['tabbedbrowser']
for cmd in self.args.command: for cmd in self._args.command:
if cmd.startswith(':'): if cmd.startswith(':'):
log.init.debug("Startup cmd {}".format(cmd)) log.init.debug("Startup cmd {}".format(cmd))
self._commandrunner.run_safely_init(cmd.lstrip(':')) self._commandrunner.run_safely_init(cmd.lstrip(':'))
@ -813,7 +814,7 @@ class Application(QApplication):
def exit(self, status): def exit(self, status):
"""Extend QApplication::exit to log the event.""" """Extend QApplication::exit to log the event."""
log.destroy.debug("Now calling QApplication::exit.") log.destroy.debug("Now calling QApplication::exit.")
if self.args.debug_exit: if self._args.debug_exit:
print("Now logging late shutdown.", file=sys.stderr) print("Now logging late shutdown.", file=sys.stderr)
debug.trace_lines(True) debug.trace_lines(True)
super().exit(status) super().exit(status)

10
qutebrowser/models/completion.py
View File

@ -19,11 +19,11 @@
"""CompletionModels for different usages.""" """CompletionModels for different usages."""
from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication from PyQt5.QtCore import pyqtSlot, Qt
from qutebrowser.config import config, configdata from qutebrowser.config import config, configdata
from qutebrowser.models import basecompletion from qutebrowser.models import basecompletion
from qutebrowser.utils import log, qtutils from qutebrowser.utils import log, qtutils, utils
from qutebrowser.commands import cmdutils from qutebrowser.commands import cmdutils
@ -155,8 +155,7 @@ class CommandCompletionModel(basecompletion.BaseCompletionModel):
assert cmdutils.cmd_dict assert cmdutils.cmd_dict
cmdlist = [] cmdlist = []
for obj in set(cmdutils.cmd_dict.values()): for obj in set(cmdutils.cmd_dict.values()):
if obj.hide or (obj.debug and not if obj.hide or (obj.debug and not utils.get_object('args').debug):
QCoreApplication.instance().args.debug):
pass pass
else: else:
cmdlist.append((obj.name, obj.desc)) cmdlist.append((obj.name, obj.desc))
@ -183,8 +182,7 @@ class HelpCompletionModel(basecompletion.BaseCompletionModel):
assert cmdutils.cmd_dict assert cmdutils.cmd_dict
cmdlist = [] cmdlist = []
for obj in set(cmdutils.cmd_dict.values()): for obj in set(cmdutils.cmd_dict.values()):
if obj.hide or (obj.debug and not if obj.hide or (obj.debug and not utils.get_object('args').debug):
QCoreApplication.instance().args.debug):
pass pass
else: else:
cmdlist.append((':' + obj.name, obj.desc)) cmdlist.append((':' + obj.name, obj.desc))