From 9a56c630184965c8b435488a1e6fdae517ad69cf Mon Sep 17 00:00:00 2001 From: raj_mathe Date: Sat, 6 Nov 2021 11:16:34 +0100 Subject: [PATCH] master > master: code - logik bei Einstellungen (debug default ein, quiet default aus beim interaktiven Modus) --- .../internal/core/logging/logging_settings.go | 2 +- code/golang/internal/endpoints/run/run.go | 2 +- .../internal/endpoints/run/run_menus.go | 2 +- code/golang/internal/setup/cli/cli.go | 4 ++-- code/golang/main.go | 24 ++++++++++--------- code/python/src/core/log.py | 2 +- code/python/src/main.py | 5 ++-- code/python/src/setup/cli.py | 4 ++-- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/code/golang/internal/core/logging/logging_settings.go b/code/golang/internal/core/logging/logging_settings.go index 9702189..04eb362 100644 --- a/code/golang/internal/core/logging/logging_settings.go +++ b/code/golang/internal/core/logging/logging_settings.go @@ -9,7 +9,7 @@ package logging * ---------------------------------------------------------------- */ var quietmode bool = false -var debugmode bool = false +var debugmode bool = true var ansimode bool = false var loggingPrefix string = "" var force bool = false diff --git a/code/golang/internal/endpoints/run/run.go b/code/golang/internal/endpoints/run/run.go index dc7b548..613f048 100644 --- a/code/golang/internal/endpoints/run/run.go +++ b/code/golang/internal/endpoints/run/run.go @@ -29,7 +29,7 @@ import ( func RunInteractive() error { logging.Plain(setup.Logo()) _, err := menuMain.ShowMenu() - logging.Info("Programm terminiert.") + logging.Plain("\033[2;3m...Programm terminiert.\033[0m") return err } diff --git a/code/golang/internal/endpoints/run/run_menus.go b/code/golang/internal/endpoints/run/run_menus.go index 3060662..222d034 100644 --- a/code/golang/internal/endpoints/run/run_menus.go +++ b/code/golang/internal/endpoints/run/run_menus.go @@ -78,7 +78,7 @@ var menuDebugMode = menus.Menu{ {Label: "aus", Action: actionDebugModeOff}, }, }, - Default: 1, + Default: 0, } var menuPrePostChecking = menus.Menu{ diff --git a/code/golang/internal/setup/cli/cli.go b/code/golang/internal/setup/cli/cli.go index c633410..1804170 100644 --- a/code/golang/internal/setup/cli/cli.go +++ b/code/golang/internal/setup/cli/cli.go @@ -37,13 +37,13 @@ var optionsChecks = argparse.Options{ } var optionsDebug = argparse.Options{ - Help: "Blendet die Debugging-Befehle ein.", + Help: "Blendet Debugging-Befehle ein.", Required: false, Default: false, } var optionsInteractive = argparse.Options{ - Help: "Startet die App im interaktiven Modus.", + Help: "Startet das Programm im interaktiven Modus.", Required: false, Default: false, } diff --git a/code/golang/main.go b/code/golang/main.go index ee552ba..d08dbbe 100644 --- a/code/golang/main.go +++ b/code/golang/main.go @@ -56,12 +56,10 @@ func main() { // initialisiere basic optionen wie Logging showChecks = false if err == nil { - quiet := arguments.QuietModeOn() - if arguments.InteractiveMode() { - quiet = false + if !(arguments.ModeRun.Happened() && arguments.InteractiveMode()) { + logging.SetQuietMode(arguments.QuietModeOn()) + logging.SetDebugMode(arguments.DebugModeOn()) } - logging.SetQuietMode(quiet) - logging.SetDebugMode(arguments.DebugModeOn()) logging.SetAnsiMode(arguments.ShowColour()) showChecks = arguments.ShowChecks() } @@ -73,22 +71,26 @@ func main() { if err == nil { if arguments.ModeVersion.Happened() { endpoints_print.Version() + return } else if arguments.ModeRun.Happened() { if arguments.InteractiveMode() { - err = endpoints_run.RunInteractive() + endpoints_run.RunInteractive() } else { err = endpoints_run.RunNonInteractive(arguments.GetConfigFile()) + if err != nil { + logging.Fatal(err) + } } + return } else if arguments.ModeHelp.Happened() { endpoints_print.Help() + return } else { - err = endpoints_run.RunInteractive() + endpoints_run.RunInteractive() } } else if cmdMissing { - err = endpoints_run.RunInteractive() - } - - if err != nil { + endpoints_run.RunInteractive() + } else { logging.Fatal(err) } } diff --git a/code/python/src/core/log.py b/code/python/src/core/log.py index cd1c899..7284059 100644 --- a/code/python/src/core/log.py +++ b/code/python/src/core/log.py @@ -18,7 +18,7 @@ from src.core.utils import StripAnsi; _logging_prefix: str = ''; _quietmode: bool = False; -_debugmode: bool = False; +_debugmode: bool = True; _ansimode: bool = False; # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/code/python/src/main.py b/code/python/src/main.py index aec251d..d3ba342 100644 --- a/code/python/src/main.py +++ b/code/python/src/main.py @@ -38,8 +38,9 @@ def enter( colour: bool, config: Any, **_ ): - SetQuietMode(quiet); - SetDebugMode(debug); + if not (mode == 'run' and it): + SetQuietMode(quiet); + SetDebugMode(debug); SetAnsiMode(colour); appconfig.SetAppConfigPerformChecks(checks); diff --git a/code/python/src/setup/cli.py b/code/python/src/setup/cli.py index 2bfa381..9e8f0f1 100644 --- a/code/python/src/setup/cli.py +++ b/code/python/src/setup/cli.py @@ -41,9 +41,9 @@ def GetArgumentParser() -> argparse.ArgumentParser: run = Algorithmen ausführen. '''), ); - parser.add_argument('--it', action='store_true', help='Startet die App im interaktiven Modus.') + parser.add_argument('--it', action='store_true', help='Startet das Programm im interaktiven Modus.') parser.add_argument('-q', '--quiet', action='store_true', help='Blendet alle Konsole-Messages aus.') - parser.add_argument('--debug', action='store_true', help='Blendet die Debugging-Befehle ein.') + parser.add_argument('--debug', action='store_true', help='Blendet Debugging-Befehle ein.') parser.add_argument('--checks', nargs=1, type=str, default=['False'], help=DedentIgnoreFirstLast(''' (bool) Ob vor und nach Ausführung von Algorithmen Checks