diff --git a/nw/__init__.py b/nw/__init__.py index 8c5199d9..85b5cab4 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -44,7 +44,7 @@ __version__ = "0.5" __date__ = "2020-05-09" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__status__ = "Development" +__status__ = "Pre-Release" __url__ = "https://github.com/vkbo/novelWriter" __docurl__ = "https://novelwriter.readthedocs.io" __credits__ = [ @@ -92,7 +92,7 @@ def main(sysArgs=None): sysArgs = sys.argv[1:] # Valid Input Options - shortOpt = "hidvql:" + shortOpt = "hvq" longOpt = [ "help", "version", @@ -108,7 +108,7 @@ def main(sysArgs=None): ] helpMsg = ( - "{appname} {version} ({status})\n" + "{appname} {version} ({status} {date})\n" "{copyright}\n" "\n" "This program is distributed in the hope that it will be useful,\n" @@ -118,12 +118,12 @@ def main(sysArgs=None): "\n" "Usage:\n" " -h, --help Print this message.\n" - " --version Print program version and exit.\n" - " -i, --info Print additional runtime information.\n" - " -d, --debug Print debug output. Includes -i.\n" - " -v, --verbose Increase verbosity of debug output. Includes -d.\n" + " -v, --version Print program version and exit.\n" + " --info Print additional runtime information.\n" + " --debug Print debug output. Includes --info.\n" + " --verbose Increase verbosity of debug output. Includes --debug.\n" " -q, --quiet Disable output to command line. Does not affect log file.\n" - " -l, --logfile= Specify log file.\n" + " --logfile= Specify log file.\n" " --style= Sets Qt5 style flag. Defaults to 'Fusion'.\n" " --config= Alternative config file.\n" " --data= Alternative user data path.\n" @@ -132,7 +132,8 @@ def main(sysArgs=None): appname = __package__, version = __version__, status = __status__, - copyright = __copyright__ + copyright = __copyright__, + date = __date__, ) # Defaults @@ -162,20 +163,20 @@ def main(sysArgs=None): if inOpt in ("-h","--help"): print(helpMsg) sys.exit() - elif inOpt == "--version": - print("%s %s Version %s" % (__package__,__status__,__version__)) + elif inOpt in ("-v", "--version"): + print("%s %s Version %s [%s]" % (__package__,__status__,__version__,__date__)) sys.exit() - elif inOpt in ("-i", "--info"): + elif inOpt == "--info": debugLevel = logging.INFO - elif inOpt in ("-d", "--debug"): + elif inOpt == "--debug": debugLevel = logging.DEBUG logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" - elif inOpt in ("-l","--logfile"): + elif inOpt == "--logfile": logFile = inArg toFile = True elif inOpt in ("-q","--quiet"): toStd = False - elif inOpt in ("-v","--verbose"): + elif inOpt == "--verbose": debugLevel = VERBOSE logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" elif inOpt == "--style": diff --git a/nw/config.py b/nw/config.py index e031cb79..c0c34215 100644 --- a/nw/config.py +++ b/nw/config.py @@ -228,6 +228,9 @@ class Config: self.iconPath = path.join(self.assetPath,"icons") self.appIcon = path.join(self.iconPath, nwFiles.APP_ICON) + logger.verbose("App path: %s" % self.appPath) + logger.verbose("Home path: %s" % self.homePath) + # If config folder does not exist, make it. # This assumes that the os config folder itself exists. if not path.isdir(self.confPath):