Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor changes to command line switches

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-04-14 10:22:34 +02:00
parent 6a5d4e4d0b
commit f856a520d0
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/__init__.py
+13 -12
View File
@@ -77,19 +77,19 @@ def main(sysArgs=None):
sysArgs = sys.argv[1:] sysArgs = sys.argv[1:]
# Valid Input Options # Valid Input Options
shortOpt = "hdiql:v" shortOpt = "hvidVql:"
longOpt = [ longOpt = [
"help", "help",
"debug", "version",
"info", "info",
"debug",
"verbose", "verbose",
"quiet", "quiet",
"logfile=", "logfile=",
"version", "style=",
"config=", "config=",
"data=", "data=",
"testmode", "testmode",
"style=",
] ]
helpMsg = ( helpMsg = (
@@ -100,14 +100,14 @@ def main(sysArgs=None):
" -h, --help Print this message.\n" " -h, --help Print this message.\n"
" -v, --version Print program version and exit.\n" " -v, --version Print program version and exit.\n"
" -i, --info Print additional runtime information.\n" " -i, --info Print additional runtime information.\n"
" -d, --debug Print debug output.\n" " -d, --debug Print debug output. Includes -i.\n"
" --verbose Increase verbosity of debug output.\n" " -V, --verbose Increase verbosity of debug output. Includes -d.\n"
" -q, --quiet Disable output to command line. Does not affect log file.\n" " -q, --quiet Disable output to command line. Does not affect log file.\n"
" -l, --logfile= Specify log file.\n" " -l, --logfile= Specify log file.\n"
" --style= Set Qt5 style flag. Defaults to 'Fusion'.\n" " --style= Sets Qt5 style flag. Defaults to 'Fusion'.\n"
" --config= Alternative config file.\n" " --config= Alternative config file.\n"
" --data= Alternative user data path.\n" " --data= Alternative user data path.\n"
" --headless Do not display GUI. Useful for testing scripts.\n" " --testmode Do not display GUI. Used by the test suite.\n"
).format( ).format(
appname = __package__, appname = __package__,
version = __version__, version = __version__,
@@ -117,7 +117,7 @@ def main(sysArgs=None):
# Defaults # Defaults
debugLevel = logging.WARN debugLevel = logging.WARN
debugStr = "{levelname:8} {message:}" logFormat = "{levelname:8} {message:}"
logFile = "" logFile = ""
toFile = False toFile = False
toStd = True toStd = True
@@ -148,14 +148,15 @@ def main(sysArgs=None):
debugLevel = logging.INFO debugLevel = logging.INFO
elif inOpt in ("-d", "--debug"): elif inOpt in ("-d", "--debug"):
debugLevel = logging.DEBUG debugLevel = logging.DEBUG
debugStr = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}"
elif inOpt in ("-l","--logfile"): elif inOpt in ("-l","--logfile"):
logFile = inArg logFile = inArg
toFile = True toFile = True
elif inOpt in ("-q","--quiet"): elif inOpt in ("-q","--quiet"):
toStd = False toStd = False
elif inOpt in ("--verbose"): elif inOpt in ("-V","--verbose"):
debugLevel = VERBOSE debugLevel = VERBOSE
logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}"
elif inOpt in ("--style"): elif inOpt in ("--style"):
qtStyle = inArg qtStyle = inArg
elif inOpt in ("--config"): elif inOpt in ("--config"):
@@ -171,7 +172,7 @@ def main(sysArgs=None):
CONFIG.cmdOpen = cmdOpen CONFIG.cmdOpen = cmdOpen
# Set Logging # Set Logging
logFmt = logging.Formatter(fmt=debugStr,datefmt="%Y-%m-%d %H:%M:%S",style="{") logFmt = logging.Formatter(fmt=logFormat,datefmt="%Y-%m-%d %H:%M:%S",style="{")
if not logFile == "" and toFile: if not logFile == "" and toFile:
if path.isfile(logFile+".bak"): if path.isfile(logFile+".bak"):