tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ui.detector class

Browse Source 
The ui.detector class was not really needed and leads to the illusion
that we provide GUI plugins. For the sake of code maintainability we
don't :-).

Rather than having GUI names equivalent to the classes they are in
(which leads to weird names like TTY.TTYUI), this patch allows to give
each GUI an arbitrary string name. GUI names remain still unchanged in
this patch, the default UI when none was configured is TTY.TTYUI.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Sebastian Spaeth
2011-01-05 17:00:54 +01:00
committed by Nicolas Sebrecht
parent ff3eb17b0f
commit c3540de763
3 changed files with 26 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
offlineimap/init.py
View File

@ -22,7 +22,6 @@ from offlineimap.localeval import LocalEval
from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
import offlineimap.ui
from offlineimap.CustomConfig import CustomConfigParser
from offlineimap.ui.detector import DEFAULT_UI_LIST
from optparse import OptionParser
import re, os, sys
from threading import *
@ -151,7 +150,7 @@ class OfflineImap:
"configuration file. The UI specified with -u will "
"be forced to be used, even if checks determine that it is "
"not usable. Possible interface choices are: %s " %
", ".join(DEFAULT_UI_LIST))
", ".join(offlineimap.ui.UI_LIST.keys()))
(options, args) = parser.parse_args()
@ -187,10 +186,19 @@ class OfflineImap:
section = "general"
config.set(section, key, value)
#init the ui, and set up additional log files
ui = offlineimap.ui.detector.findUI(config, options.interface)
#init the ui, cmd line option overrides config file
ui_type = config.getdefault('general','ui', 'TTY.TTYUI')
if options.interface != None:
ui_type = options.interface
try:
ui = offlineimap.ui.UI_LIST[ui_type](config)
except KeyError:
logging.error("UI '%s' does not exist, choose one of: %s" % \
(ui_type,', '.join(offlineimap.ui.UI_LIST.keys())))
sys.exit(1)
offlineimap.ui.UIBase.setglobalui(ui)
#set up additional log files
if options.logfile:
ui.setlogfd(open(options.logfile, 'wt'))
@ -236,7 +244,7 @@ class OfflineImap:
def sigterm_handler(self, signum, frame):
# die immediately
ui = BaseUI.getglobalui()
ui = offlineimap.ui.getglobalui()
ui.terminate(errormsg="terminating...")
signal.signal(signal.SIGTERM,sigterm_handler)