From a931fe5cfdb436017a34b6965fbf55ef6fc45714 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:14:13 +0100 Subject: [PATCH] Add support for NO_COLOR and FORCE_COLOR --- novelwriter/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py index a75344ce..57ecfa7e 100644 --- a/novelwriter/__init__.py +++ b/novelwriter/__init__.py @@ -25,6 +25,7 @@ from __future__ import annotations import getopt import logging +import os import sys from typing import TYPE_CHECKING @@ -86,8 +87,11 @@ def main(sysArgs: list | None = None) -> GuiMain | None: if sysArgs is None: sysArgs = sys.argv[1:] + fColor = os.environ.get("FORCE_COLOR") + nColor = os.environ.get("NO_COLOR") + # Valid Input Options - shortOpt = "hv" + shortOpt = "hvc" longOpt = [ "help", "version", @@ -131,7 +135,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None: # Defaults logLevel = logging.WARN - fmtFlags = 0b00 + fmtFlags = 0b01 if fColor else 0b00 confPath = None dataPath = None qtStyle = "Fusion" @@ -161,7 +165,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None: CONFIG.isDebug = True fmtFlags = fmtFlags | 0b10 logLevel = logging.DEBUG - elif inOpt == "--color": + elif inOpt == "--color" and not nColor: fmtFlags = fmtFlags | 0b01 elif inOpt == "--style": qtStyle = inArg