move parseArgs to the top of aqt.run()

By placing argument parsing at the top, we skip starting up all the QT
stuff when using options like --help or --version that cause the program
to exit anyway.
This commit is contained in:
hut 2013-02-21 20:51:06 +01:00
parent 4dc60e4f1e
commit 370fd6507d

View File

@ -174,6 +174,11 @@ def run():
global mw global mw
from anki.utils import isMac from anki.utils import isMac
# parse args
opts, args = parseArgs(sys.argv)
opts.base = unicode(opts.base or "", sys.getfilesystemencoding())
opts.profile = unicode(opts.profile or "", sys.getfilesystemencoding())
# on osx we'll need to add the qt plugins to the search path # on osx we'll need to add the qt plugins to the search path
if isMac and getattr(sys, 'frozen', None): if isMac and getattr(sys, 'frozen', None):
rd = os.path.abspath(moduleDir + "/../../..") rd = os.path.abspath(moduleDir + "/../../..")
@ -203,11 +208,6 @@ environment points to a valid, writable folder.""")
"upgrade to a newer Qt, you may experience issues such as images " "upgrade to a newer Qt, you may experience issues such as images "
"failing to show up during review.") "failing to show up during review.")
# parse args
opts, args = parseArgs(sys.argv)
opts.base = unicode(opts.base or "", sys.getfilesystemencoding())
opts.profile = unicode(opts.profile or "", sys.getfilesystemencoding())
# profile manager # profile manager
from aqt.profiles import ProfileManager from aqt.profiles import ProfileManager
pm = ProfileManager(opts.base, opts.profile) pm = ProfileManager(opts.base, opts.profile)