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

Merge pull request #182 from vkbo/switches

Browse Source 
Command Line Switches
This commit is contained in:
Veronica K. Berglyd Olsen
2020-04-14 20:34:51 +02:00
committed by GitHub
parent 6a5d4e4d0b c942718575
commit 6a9ff4c46b
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/__init__.py
+21 -19
View File
@@ -77,19 +77,19 @@ def main(sysArgs=None):
sysArgs = sys.argv[1:]
# Valid Input Options
shortOpt = "hdiql:v"
shortOpt = "hidvql:"
longOpt = [
"help",
"debug",
"version",
"info",
"debug",
"verbose",
"quiet",
"logfile=",
"version",
"style=",
"config=",
"data=",
"testmode",
"style=",
]
helpMsg = (
@@ -98,16 +98,16 @@ def main(sysArgs=None):
"\n"
"Usage:\n"
" -h, --help Print this message.\n"
" -v, --version Print program version and exit.\n"
" --version Print program version and exit.\n"
" -i, --info Print additional runtime information.\n"
" -d, --debug Print debug output.\n"
" --verbose Increase verbosity of debug output.\n"
" -d, --debug Print debug output. Includes -i.\n"
" -v, --verbose Increase verbosity of debug output. Includes -d.\n"
" -q, --quiet Disable output to command line. Does not affect 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"
" --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(
appname = __package__,
version = __version__,
@@ -117,7 +117,7 @@ def main(sysArgs=None):
# Defaults
debugLevel = logging.WARN
debugStr = "{levelname:8} {message:}"
logFormat = "{levelname:8} {message:}"
logFile = ""
toFile = False
toStd = True
@@ -130,8 +130,9 @@ def main(sysArgs=None):
# Parse Options
try:
inOpts, inRemain = getopt.getopt(sysArgs,shortOpt,longOpt)
except getopt.GetoptError:
except getopt.GetoptError as E:
print(helpMsg)
print("ERROR: %s" % str(E))
sys.exit(2)
if len(inRemain) > 0:
@@ -141,28 +142,29 @@ def main(sysArgs=None):
if inOpt in ("-h","--help"):
print(helpMsg)
sys.exit()
elif inOpt in ("-v", "--version"):
elif inOpt == "--version":
print("%s %s Version %s" % (__package__,__status__,__version__))
sys.exit()
elif inOpt in ("-i", "--info"):
debugLevel = logging.INFO
elif inOpt in ("-d", "--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"):
logFile = inArg
toFile = True
elif inOpt in ("-q","--quiet"):
toStd = False
elif inOpt in ("--verbose"):
elif inOpt in ("-v","--verbose"):
debugLevel = VERBOSE
elif inOpt in ("--style"):
logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}"
elif inOpt == "--style":
qtStyle = inArg
elif inOpt in ("--config"):
elif inOpt == "--config":
confPath = inArg
elif inOpt in ("--data"):
elif inOpt == "--data":
dataPath = inArg
elif inOpt in ("--testmode"):
elif inOpt == "--testmode":
testMode = True
# Set Config Options
@@ -171,7 +173,7 @@ def main(sysArgs=None):
CONFIG.cmdOpen = cmdOpen
# 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 path.isfile(logFile+".bak"):