master > master: code - logik bei Einstellungen (debug default ein, quiet default aus beim interaktiven Modus)

This commit is contained in:
RD 2021-11-06 11:16:34 +01:00
parent d878c0b77d
commit 9a56c63018
8 changed files with 24 additions and 21 deletions

View File

@ -9,7 +9,7 @@ package logging
* ---------------------------------------------------------------- */ * ---------------------------------------------------------------- */
var quietmode bool = false var quietmode bool = false
var debugmode bool = false var debugmode bool = true
var ansimode bool = false var ansimode bool = false
var loggingPrefix string = "" var loggingPrefix string = ""
var force bool = false var force bool = false

View File

@ -29,7 +29,7 @@ import (
func RunInteractive() error { func RunInteractive() error {
logging.Plain(setup.Logo()) logging.Plain(setup.Logo())
_, err := menuMain.ShowMenu() _, err := menuMain.ShowMenu()
logging.Info("Programm terminiert.") logging.Plain("\033[2;3m...Programm terminiert.\033[0m")
return err return err
} }

View File

@ -78,7 +78,7 @@ var menuDebugMode = menus.Menu{
{Label: "aus", Action: actionDebugModeOff}, {Label: "aus", Action: actionDebugModeOff},
}, },
}, },
Default: 1, Default: 0,
} }
var menuPrePostChecking = menus.Menu{ var menuPrePostChecking = menus.Menu{

View File

@ -37,13 +37,13 @@ var optionsChecks = argparse.Options{
} }
var optionsDebug = argparse.Options{ var optionsDebug = argparse.Options{
Help: "Blendet die Debugging-Befehle ein.", Help: "Blendet Debugging-Befehle ein.",
Required: false, Required: false,
Default: false, Default: false,
} }
var optionsInteractive = argparse.Options{ var optionsInteractive = argparse.Options{
Help: "Startet die App im interaktiven Modus.", Help: "Startet das Programm im interaktiven Modus.",
Required: false, Required: false,
Default: false, Default: false,
} }

View File

@ -56,12 +56,10 @@ func main() {
// initialisiere basic optionen wie Logging // initialisiere basic optionen wie Logging
showChecks = false showChecks = false
if err == nil { if err == nil {
quiet := arguments.QuietModeOn() if !(arguments.ModeRun.Happened() && arguments.InteractiveMode()) {
if arguments.InteractiveMode() { logging.SetQuietMode(arguments.QuietModeOn())
quiet = false logging.SetDebugMode(arguments.DebugModeOn())
} }
logging.SetQuietMode(quiet)
logging.SetDebugMode(arguments.DebugModeOn())
logging.SetAnsiMode(arguments.ShowColour()) logging.SetAnsiMode(arguments.ShowColour())
showChecks = arguments.ShowChecks() showChecks = arguments.ShowChecks()
} }
@ -73,22 +71,26 @@ func main() {
if err == nil { if err == nil {
if arguments.ModeVersion.Happened() { if arguments.ModeVersion.Happened() {
endpoints_print.Version() endpoints_print.Version()
return
} else if arguments.ModeRun.Happened() { } else if arguments.ModeRun.Happened() {
if arguments.InteractiveMode() { if arguments.InteractiveMode() {
err = endpoints_run.RunInteractive() endpoints_run.RunInteractive()
} else { } else {
err = endpoints_run.RunNonInteractive(arguments.GetConfigFile()) err = endpoints_run.RunNonInteractive(arguments.GetConfigFile())
if err != nil {
logging.Fatal(err)
}
} }
return
} else if arguments.ModeHelp.Happened() { } else if arguments.ModeHelp.Happened() {
endpoints_print.Help() endpoints_print.Help()
return
} else { } else {
err = endpoints_run.RunInteractive() endpoints_run.RunInteractive()
} }
} else if cmdMissing { } else if cmdMissing {
err = endpoints_run.RunInteractive() endpoints_run.RunInteractive()
} } else {
if err != nil {
logging.Fatal(err) logging.Fatal(err)
} }
} }

View File

@ -18,7 +18,7 @@ from src.core.utils import StripAnsi;
_logging_prefix: str = ''; _logging_prefix: str = '';
_quietmode: bool = False; _quietmode: bool = False;
_debugmode: bool = False; _debugmode: bool = True;
_ansimode: bool = False; _ansimode: bool = False;
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -38,8 +38,9 @@ def enter(
colour: bool, colour: bool,
config: Any, **_ config: Any, **_
): ):
SetQuietMode(quiet); if not (mode == 'run' and it):
SetDebugMode(debug); SetQuietMode(quiet);
SetDebugMode(debug);
SetAnsiMode(colour); SetAnsiMode(colour);
appconfig.SetAppConfigPerformChecks(checks); appconfig.SetAppConfigPerformChecks(checks);

View File

@ -41,9 +41,9 @@ def GetArgumentParser() -> argparse.ArgumentParser:
run = Algorithmen ausführen. 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('-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'], parser.add_argument('--checks', nargs=1, type=str, default=['False'],
help=DedentIgnoreFirstLast(''' help=DedentIgnoreFirstLast('''
(bool) Ob vor und nach Ausführung von Algorithmen Checks (bool) Ob vor und nach Ausführung von Algorithmen Checks