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

Use global object dict for global objects

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-05 19:08:56 +02:00
parent 938fbd5608
commit bf2c7831c8
9 changed files with 65 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
qutebrowser/app.py
View File

@ -64,6 +64,7 @@ from qutebrowser.browser.cookies import CookieJar
from qutebrowser.utils.message import MessageBridge from qutebrowser.utils.message import MessageBridge
from qutebrowser.utils.appdirs import AppDirs from qutebrowser.utils.appdirs import AppDirs
from qutebrowser.utils.misc import dotted_getattr from qutebrowser.utils.misc import dotted_getattr
from qutebrowser.utils.usertypes import ImmutableDict
from qutebrowser.utils.debug import set_trace # pylint: disable=unused-import from qutebrowser.utils.debug import set_trace # pylint: disable=unused-import
@ -78,15 +79,7 @@ class QuteBrowser(QApplication):
Attributes: Attributes:
mainwindow: The MainWindow QWidget. mainwindow: The MainWindow QWidget.
commandmanager: The main CommandManager instance. obj: Dictionary containing global singleton objects.
searchmanager: The main SearchManager instance.
config: The main ConfigManager
stateconfig: The "state" ReadWriteConfigParser instance.
cmd_history: The "cmd_history" LineConfigParser instance.
messagebridge: The global MessageBridge instance.
modeman: The global ModeManager instance.
networkmanager: The global NetworkManager instance.
cookiejar: The global CookieJar instance.
_keyparsers: A mapping from modes to keyparsers. _keyparsers: A mapping from modes to keyparsers.
_dirs: AppDirs instance for config/cache directories. _dirs: AppDirs instance for config/cache directories.
_args: ArgumentParser instance. _args: ArgumentParser instance.
@ -96,9 +89,6 @@ class QuteBrowser(QApplication):
_opened_urls: List of opened URLs. _opened_urls: List of opened URLs.
""" """
# This also holds all our globals, so we're a bit over the top here.
# pylint: disable=too-many-instance-attributes
def __init__(self): def __init__(self):
super().__init__(sys.argv) super().__init__(sys.argv)
self._quit_status = {} self._quit_status = {}
@ -107,11 +97,7 @@ class QuteBrowser(QApplication):
self._shutting_down = False self._shutting_down = False
self._keyparsers = None self._keyparsers = None
self._dirs = None self._dirs = None
self.messagebridge = None self.obj = ImmutableDict()
self.stateconfig = None
self.modeman = None
self.cmd_history = None
self.config = None
sys.excepthook = self._exception_hook sys.excepthook = self._exception_hook
@ -121,18 +107,18 @@ class QuteBrowser(QApplication):
self._init_config() self._init_config()
self._init_modes() self._init_modes()
websettings.init(self._dirs.user_cache_dir) websettings.init(self._dirs.user_cache_dir)
self.cookiejar = CookieJar(self._dirs.user_data_dir) self.obj['cookiejar'] = CookieJar(self._dirs.user_data_dir)
self.networkmanager = NetworkManager(self.cookiejar) self.obj['networkmanager'] = NetworkManager(self.obj['cookiejar'])
self.commandmanager = CommandManager() self.obj['commandmanager'] = CommandManager()
self.searchmanager = SearchManager() self.obj['searchmanager'] = SearchManager()
self._init_cmds() self._init_cmds()
self.mainwindow = MainWindow() self.mainwindow = MainWindow()
self.installEventFilter(self.modeman) self.installEventFilter(self.obj['modeman'])
self.setQuitOnLastWindowClosed(False) self.setQuitOnLastWindowClosed(False)
self._connect_signals() self._connect_signals()
self.modeman.enter('normal') self.obj['modeman'].enter('normal')
self.mainwindow.show() self.mainwindow.show()
self._python_hacks() self._python_hacks()
@ -168,7 +154,7 @@ class QuteBrowser(QApplication):
else: else:
confdir = self._args.confdir confdir = self._args.confdir
try: try:
self.config = ConfigManager(confdir, 'qutebrowser.conf') self.obj['config'] = ConfigManager(confdir, 'qutebrowser.conf')
except (config.ValidationError, except (config.ValidationError,
config.NoOptionError, config.NoOptionError,
configparser.InterpolationError, configparser.InterpolationError,
@ -185,9 +171,9 @@ class QuteBrowser(QApplication):
msgbox.exec_() msgbox.exec_()
# We didn't really initialize much so far, so we just quit hard. # We didn't really initialize much so far, so we just quit hard.
sys.exit(1) sys.exit(1)
self.stateconfig = ReadWriteConfigParser(confdir, 'state') self.obj['stateconfig'] = ReadWriteConfigParser(confdir, 'state')
self.cmd_history = LineConfigParser(confdir, 'cmd_history', self.obj['cmd_history'] = LineConfigParser(
('completion', 'history-length')) confdir, 'cmd_history', ('completion', 'history-length'))
def _init_modes(self): def _init_modes(self):
"""Inizialize the mode manager and the keyparsers.""" """Inizialize the mode manager and the keyparsers."""
@ -198,16 +184,16 @@ class QuteBrowser(QApplication):
'passthrough': PassthroughKeyParser('keybind.passthrough', self), 'passthrough': PassthroughKeyParser('keybind.passthrough', self),
'command': PassthroughKeyParser('keybind.command', self), 'command': PassthroughKeyParser('keybind.command', self),
} }
self.modeman = ModeManager() modeman = ModeManager()
self.modeman.register('normal', self._keyparsers['normal'].handle) modeman.register('normal', self._keyparsers['normal'].handle)
self.modeman.register('hint', self._keyparsers['hint'].handle) modeman.register('hint', self._keyparsers['hint'].handle)
self.modeman.register('insert', self._keyparsers['insert'].handle, modeman.register('insert', self._keyparsers['insert'].handle,
passthrough=True) passthrough=True)
self.modeman.register('passthrough', modeman.register('passthrough', self._keyparsers['passthrough'].handle,
self._keyparsers['passthrough'].handle, passthrough=True)
passthrough=True) modeman.register('command', self._keyparsers['command'].handle,
self.modeman.register('command', self._keyparsers['command'].handle, passthrough=True)
passthrough=True) self.obj['modeman'] = modeman
def _init_log(self): def _init_log(self):
"""Initialisation of the logging output. """Initialisation of the logging output.
@ -231,7 +217,7 @@ class QuteBrowser(QApplication):
os.environ['QT_FATAL_WARNINGS'] = '1' os.environ['QT_FATAL_WARNINGS'] = '1'
self.setApplicationName("qutebrowser") self.setApplicationName("qutebrowser")
self.setApplicationVersion(qutebrowser.__version__) self.setApplicationVersion(qutebrowser.__version__)
self.messagebridge = MessageBridge() self.obj['messagebridge'] = MessageBridge()
def _init_cmds(self): def _init_cmds(self):
"""Initialisation of the qutebrowser commands. """Initialisation of the qutebrowser commands.
@ -260,7 +246,7 @@ class QuteBrowser(QApplication):
for e in self._args.command: for e in self._args.command:
if e.startswith(':'): if e.startswith(':'):
logging.debug("Startup cmd {}".format(e)) logging.debug("Startup cmd {}".format(e))
self.commandmanager.run_safely(e.lstrip(':')) self.obj['commandmanager'].run_safely(e.lstrip(':'))
else: else:
logging.debug("Startup url {}".format(e)) logging.debug("Startup url {}".format(e))
self._opened_urls.append(e) self._opened_urls.append(e)
@ -268,7 +254,7 @@ class QuteBrowser(QApplication):
if self.mainwindow.tabs.count() == 0: if self.mainwindow.tabs.count() == 0:
logging.debug("Opening startpage") logging.debug("Opening startpage")
for url in self.config.get('general', 'startpage'): for url in self.obj['config'].get('general', 'startpage'):
self.mainwindow.tabs.tabopen(url) self.mainwindow.tabs.tabopen(url)
def _python_hacks(self): def _python_hacks(self):
@ -292,6 +278,10 @@ class QuteBrowser(QApplication):
completion = self.mainwindow.completion completion = self.mainwindow.completion
tabs = self.mainwindow.tabs tabs = self.mainwindow.tabs
cmd = self.mainwindow.status.cmd cmd = self.mainwindow.status.cmd
searchmanager = self.obj['searchmanager']
conf = self.obj['config']
messagebridge = self.obj['messagebridge']
modeman = self.obj['modeman']
# misc # misc
self.lastWindowClosed.connect(self.shutdown) self.lastWindowClosed.connect(self.shutdown)
@ -299,17 +289,17 @@ class QuteBrowser(QApplication):
tabs.currentChanged.connect(self.mainwindow.update_inspector) tabs.currentChanged.connect(self.mainwindow.update_inspector)
# status bar # status bar
self.modeman.entered.connect(status.on_mode_entered) modeman.entered.connect(status.on_mode_entered)
self.modeman.left.connect(status.on_mode_left) modeman.left.connect(status.on_mode_left)
self.modeman.left.connect(status.cmd.on_mode_left) modeman.left.connect(status.cmd.on_mode_left)
self.modeman.key_pressed.connect(status.on_key_pressed) modeman.key_pressed.connect(status.on_key_pressed)
# commands # commands
cmd.got_cmd.connect(self.commandmanager.run_safely) cmd.got_cmd.connect(self.obj['commandmanager'].run_safely)
cmd.got_search.connect(self.searchmanager.search) cmd.got_search.connect(searchmanager.search)
cmd.got_search_rev.connect(self.searchmanager.search_rev) cmd.got_search_rev.connect(searchmanager.search_rev)
cmd.returnPressed.connect(tabs.setFocus) cmd.returnPressed.connect(tabs.setFocus)
self.searchmanager.do_search.connect(tabs.cur.search) searchmanager.do_search.connect(tabs.cur.search)
kp['normal'].keystring_updated.connect(status.keystring.setText) kp['normal'].keystring_updated.connect(status.keystring.setText)
# hints # hints
@ -319,16 +309,16 @@ class QuteBrowser(QApplication):
tabs.hint_strings_updated.connect(kp['hint'].on_hint_strings_updated) tabs.hint_strings_updated.connect(kp['hint'].on_hint_strings_updated)
# messages # messages
self.messagebridge.error.connect(status.disp_error) messagebridge.error.connect(status.disp_error)
self.messagebridge.info.connect(status.txt.set_temptext) messagebridge.info.connect(status.txt.set_temptext)
self.messagebridge.text.connect(status.txt.set_normaltext) messagebridge.text.connect(status.txt.set_normaltext)
self.messagebridge.set_cmd_text.connect(cmd.set_cmd_text) messagebridge.set_cmd_text.connect(cmd.set_cmd_text)
# config # config
self.config.style_changed.connect(style.invalidate_caches) conf.style_changed.connect(style.invalidate_caches)
for obj in [tabs, completion, self.mainwindow, self.cmd_history, for obj in [tabs, completion, self.mainwindow, self.obj['cmd_history'],
websettings, kp['normal'], self.modeman]: websettings, kp['normal'], modeman]:
self.config.changed.connect(obj.on_config_changed) conf.changed.connect(obj.on_config_changed)
# statusbar # statusbar
tabs.cur_progress.connect(status.prog.setValue) tabs.cur_progress.connect(status.prog.setValue)
@ -341,7 +331,7 @@ class QuteBrowser(QApplication):
tabs.cur_link_hovered.connect(status.url.set_hover_url) tabs.cur_link_hovered.connect(status.url.set_hover_url)
# command input / completion # command input / completion
self.modeman.left.connect(tabs.on_mode_left) modeman.left.connect(tabs.on_mode_left)
cmd.clear_completion_selection.connect( cmd.clear_completion_selection.connect(
completion.on_clear_completion_selection) completion.on_clear_completion_selection)
cmd.hide_completion.connect(completion.hide) cmd.hide_completion.connect(completion.hide)
@ -374,10 +364,10 @@ class QuteBrowser(QApplication):
"""Save the window geometry to the state config.""" """Save the window geometry to the state config."""
geom = b64encode(bytes(self.mainwindow.saveGeometry())).decode('ASCII') geom = b64encode(bytes(self.mainwindow.saveGeometry())).decode('ASCII')
try: try:
self.stateconfig.add_section('geometry') self.obj['stateconfig'].add_section('geometry')
except configparser.DuplicateSectionError: except configparser.DuplicateSectionError:
pass pass
self.stateconfig['geometry']['mainwindow'] = geom self.obj['stateconfig']['geometry']['mainwindow'] = geom
def _exception_hook(self, exctype, excvalue, tb): def _exception_hook(self, exctype, excvalue, tb):
"""Handle uncaught python exceptions. """Handle uncaught python exceptions.
@ -494,22 +484,22 @@ class QuteBrowser(QApplication):
return return
self._shutting_down = True self._shutting_down = True
logging.debug("Shutting down... (do_quit={})".format(do_quit)) logging.debug("Shutting down... (do_quit={})".format(do_quit))
if self.config.get('general', 'auto-save-config'): if self.obj['config'].get('general', 'auto-save-config'):
try: try:
self.config.save() self.obj['config'].save()
except AttributeError: except AttributeError:
logging.exception("Could not save config.") logging.exception("Could not save config.")
try: try:
self.cmd_history.save() self.obj['cmd_history'].save()
except AttributeError: except AttributeError:
logging.exception("Could not save command history.") logging.exception("Could not save command history.")
try: try:
self._save_geometry() self._save_geometry()
self.stateconfig.save() self.obj['stateconfig'].save()
except AttributeError: except AttributeError:
logging.exception("Could not save window geometry.") logging.exception("Could not save window geometry.")
try: try:
self.cookiejar.save() self.obj['cookiejar'].save()
except AttributeError: except AttributeError:
logging.exception("Could not save cookies.") logging.exception("Could not save cookies.")
try: try:

3
qutebrowser/browser/webpage.py
View File

@ -41,7 +41,8 @@ class BrowserPage(QWebPage):
self._extension_handlers = { self._extension_handlers = {
QWebPage.ErrorPageExtension: self._handle_errorpage, QWebPage.ErrorPageExtension: self._handle_errorpage,
} }
self.setNetworkAccessManager(QApplication.instance().networkmanager) netman = QApplication.instance().obj['networkmanager']
self.setNetworkAccessManager(netman)
def _handle_errorpage(self, opt, out): def _handle_errorpage(self, opt, out):
"""Display an error page if needed. """Display an error page if needed.

2
qutebrowser/commands/_command.py
View File

@ -85,7 +85,7 @@ class Command(QObject):
""" """
# We don't use modeman.instance() here to avoid a circular import # We don't use modeman.instance() here to avoid a circular import
# of qutebrowser.keyinput.modeman. # of qutebrowser.keyinput.modeman.
curmode = QApplication.instance().modeman.mode curmode = QApplication.instance().obj['modeman'].mode
if self.modes is not None and curmode not in self.modes: if self.modes is not None and curmode not in self.modes:
raise PrerequisitesError("{}: This command is only allowed in {} " raise PrerequisitesError("{}: This command is only allowed in {} "
"mode.".format(self.name, "mode.".format(self.name,

2
qutebrowser/config/config.py
View File

@ -42,7 +42,7 @@ from qutebrowser.config._conftypes import ValidationError
def instance(): def instance():
"""Get the global config instance.""" """Get the global config instance."""
return QApplication.instance().config return QApplication.instance().obj['config']
def get(*args, **kwargs): def get(*args, **kwargs):

2
qutebrowser/keyinput/modeman.py
View File

@ -34,7 +34,7 @@ import qutebrowser.utils.debug as debug
def instance(): def instance():
"""Get the global modeman instance.""" """Get the global modeman instance."""
return QApplication.instance().modeman return QApplication.instance().obj['modeman']
def enter(mode): def enter(mode):

2
qutebrowser/models/cmdhistory.py
View File

@ -51,7 +51,7 @@ class History:
def __init__(self): def __init__(self):
self._tmphist = None self._tmphist = None
history = QApplication.instance().cmd_history.data history = QApplication.instance().obj['cmd_history'].data
if history is None: if history is None:
self._history = [] self._history = []
else: else:

2
qutebrowser/utils/message.py
View File

@ -23,7 +23,7 @@ from PyQt5.QtWidgets import QApplication
def instance(): def instance():
"""Get the global messagebridge instance.""" """Get the global messagebridge instance."""
return QApplication.instance().messagebridge return QApplication.instance().obj['messagebridge']
def error(message): def error(message):

6
qutebrowser/widgets/mainwindow.py
View File

@ -49,10 +49,10 @@ class MainWindow(QWidget):
super().__init__() super().__init__()
self.setWindowTitle('qutebrowser') self.setWindowTitle('qutebrowser')
stateconfig = QApplication.instance().obj['stateconfig']
try: try:
geom = b64decode( geom = b64decode(stateconfig['geometry']['mainwindow'],
QApplication.instance().stateconfig['geometry']['mainwindow'], validate=True)
validate=True)
except (KeyError, binascii.Error): except (KeyError, binascii.Error):
self._set_default_geometry() self._set_default_geometry()
else: else:

2
qutebrowser/widgets/webview.py
View File

@ -209,7 +209,7 @@ class WebView(QWebView):
self.destroyed.connect(functools.partial(self._on_destroyed, self)) self.destroyed.connect(functools.partial(self._on_destroyed, self))
self.deleteLater() self.deleteLater()
netman = QApplication.instance().networkmanager netman = QApplication.instance().obj['networkmanager']
self._destroyed[netman] = False self._destroyed[netman] = False
netman.abort_requests() netman.abort_requests()
netman.destroyed.connect(functools.partial(self._on_destroyed, netman)) netman.destroyed.connect(functools.partial(self._on_destroyed, netman))