diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 3a1427628..f2f8e5c34 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -1,10 +1,36 @@ import sys +import argparse +import logging from PyQt5.QtWidgets import QWidget, QApplication from qutebrowser.widgets.mainwindow import MainWindow from qutebrowser.commands.keys import KeyParser import qutebrowser.commands.utils as cmdutils +def parseopts(): + parser = argparse.ArgumentParser("usage: %(prog)s [options]") + parser.add_argument('-l', '--log', dest='loglevel', help='Set loglevel', + default=0) + args = parser.parse_args() + return args + +def initlog(args): + """ Initialisation of the log """ + if (args.loglevel): + loglevel = args.loglevel + else: + loglevel = 'info' + numeric_level = getattr(logging, loglevel.upper(), None) + if not isinstance(numeric_level, int): + raise ValueError('Invalid log level: %s' % loglevel) + logging.basicConfig( + level=numeric_level, + format='%(asctime)s [%(levelname)s] [%(module)s:%(funcName)s:%(lineno)s] %(message)s', + datefmt='%Y-%m-%d %H:%M:%S') + def main(): + args = parseopts() + initlog(args) + app = QApplication(sys.argv) mw = MainWindow() diff --git a/qutebrowser/commands/keys.py b/qutebrowser/commands/keys.py index 11377eed2..4a599b6b2 100644 --- a/qutebrowser/commands/keys.py +++ b/qutebrowser/commands/keys.py @@ -1,6 +1,7 @@ from PyQt5.QtCore import QObject, Qt, pyqtSignal from PyQt5.QtWidgets import QShortcut from PyQt5.QtGui import QKeySequence +import logging class KeyParser(QObject): keyparent = None @@ -18,7 +19,7 @@ class KeyParser(QObject): def from_cmd_dict(self, d): for cmd in d.values(): if cmd.key is not None: - print('reg: {} -> {}'.format(cmd.name, cmd.key)) + logging.debug('registered: {} -> {}'.format(cmd.name, cmd.key)) sc = QShortcut(self.keyparent) sc.setKey(QKeySequence(cmd.key)) sc.setContext(Qt.WidgetWithChildrenShortcut)