From f793a05288247ac6af1d44fbc3d843b408d51596 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 5 Feb 2025 06:28:51 -0600 Subject: [PATCH] switch to Disabled() --- bool.go | 12 ------------ error.go | 2 +- flags.go | 18 +++++------------- info.go | 10 ++-------- log.go | 4 ++-- verbose.go | 5 +---- warn.go | 5 +---- 7 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 bool.go diff --git a/bool.go b/bool.go deleted file mode 100644 index 7bcefa2..0000000 --- a/bool.go +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2024 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package log - -func Bool(b bool, a ...any) { - if !b { - return - } - realPrintln(a...) -} diff --git a/error.go b/error.go index 983b522..c1544d3 100644 --- a/error.go +++ b/error.go @@ -5,7 +5,7 @@ package log func Error(err error, a ...any) { - if !ERROR.Get() { + if ERROR.Disabled() { return } realPrintln("Error:", err) diff --git a/flags.go b/flags.go index ce99aa8..a93b74a 100644 --- a/flags.go +++ b/flags.go @@ -142,21 +142,13 @@ func ProcessFlags(callback func(*LogFlag)) { } -// probably a better name than Get() -// switch to this -func (f *LogFlag) Bool() bool { +// is the output flag disabled? +// if so, don't print anything! +func (f *LogFlag) Disabled() bool { if !f.Ok() { - return false + return true } - return f.b -} - -// returns the value of the flag -func (f *LogFlag) Get() bool { - if !f.Ok() { - return false - } - return f.b + return ! f.b } /* diff --git a/info.go b/info.go index 0219fdc..dd85ab8 100644 --- a/info.go +++ b/info.go @@ -5,20 +5,14 @@ package log func Info(a ...any) { - if !INFO.Ok() { - return - } - if !INFO.b { + if INFO.Disabled() { return } realPrintln(a...) } func Infof(s string, a ...any) { - if !INFO.Ok() { - return - } - if !INFO.b { + if INFO.Disabled() { return } realPrintf(s, a...) diff --git a/log.go b/log.go index deb15a0..fe94cf2 100644 --- a/log.go +++ b/log.go @@ -28,7 +28,7 @@ func Log(f *LogFlag, a ...any) { realPrintln(a...) return } - if !f.Get() { + if f.Disabled() { return } a = append([]any{f.short}, a...) @@ -36,7 +36,7 @@ func Log(f *LogFlag, a ...any) { } func Logf(f *LogFlag, s string, a ...any) { - if !f.Get() { + if f.Disabled() { return } s = f.short + " " + s diff --git a/verbose.go b/verbose.go index 15ac95d..93c7b37 100644 --- a/verbose.go +++ b/verbose.go @@ -5,10 +5,7 @@ package log func Verbose(a ...any) { - if !VERBOSE.Ok() { - return - } - if !VERBOSE.b { + if VERBOSE.Disabled() { return } realPrintln(a...) diff --git a/warn.go b/warn.go index f94e255..d115e6e 100644 --- a/warn.go +++ b/warn.go @@ -5,10 +5,7 @@ package log func Warn(a ...any) { - if !WARN.Ok() { - return - } - if !WARN.b { + if WARN.Disabled() { return } realPrintln(a...)