go-4devs/console
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update input/outpu

Browse Source
This commit is contained in:
andrey1s
2020-10-25 19:20:19 +03:00
parent 1c7e9623ce
commit 8886872c77
41 changed files with 660 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
output/output.go
View File

@@ -5,76 +5,70 @@ import (
"fmt"
"io"
"os"
"gitoa.ru/go-4devs/console/output/verbosity"
)
type Verbosity int
const (
VerbosityQuiet Verbosity = iota - 1
VerbosityNorm
VerbosityInfo
VerbosityDebug
VerbosityTrace
)
func writeError(n int, err error) {
fmt.Fprint(os.Stderr, err)
func writeError(_ int, err error) {
if err != nil {
fmt.Fprint(os.Stderr, err)
}
}
type Output func(ctx context.Context, verb Verbosity, msg string, args ...KeyValue) (int, error)
type Output func(ctx context.Context, verb verbosity.Verbosity, msg string, args ...KeyValue) (int, error)
func (o Output) Print(ctx context.Context, args ...interface{}) {
writeError(o(ctx, VerbosityNorm, fmt.Sprint(args...)))
writeError(o(ctx, verbosity.Norm, fmt.Sprint(args...)))
}
func (o Output) PrintKV(ctx context.Context, msg string, kv ...KeyValue) {
writeError(o(ctx, VerbosityNorm, msg, kv...))
writeError(o(ctx, verbosity.Norm, msg, kv...))
}
func (o Output) Printf(ctx context.Context, format string, args ...interface{}) {
writeError(o(ctx, VerbosityNorm, fmt.Sprintf(format, args...)))
writeError(o(ctx, verbosity.Norm, fmt.Sprintf(format, args...)))
}
func (o Output) Println(ctx context.Context, args ...interface{}) {
writeError(o(ctx, VerbosityNorm, fmt.Sprintln(args...)))
writeError(o(ctx, verbosity.Norm, fmt.Sprintln(args...)))
}
func (o Output) Info(ctx context.Context, args ...interface{}) {
writeError(o(ctx, VerbosityInfo, fmt.Sprint(args...)))
writeError(o(ctx, verbosity.Info, fmt.Sprint(args...)))
}
func (o Output) InfoKV(ctx context.Context, msg string, kv ...KeyValue) {
writeError(o(ctx, VerbosityInfo, msg, kv...))
writeError(o(ctx, verbosity.Info, msg, kv...))
}
func (o Output) Debug(ctx context.Context, args ...interface{}) {
writeError(o(ctx, VerbosityDebug, fmt.Sprint(args...)))
writeError(o(ctx, verbosity.Debug, fmt.Sprint(args...)))
}
func (o Output) DebugKV(ctx context.Context, msg string, kv ...KeyValue) {
writeError(o(ctx, VerbosityDebug, msg, kv...))
writeError(o(ctx, verbosity.Debug, msg, kv...))
}
func (o Output) Trace(ctx context.Context, args ...interface{}) {
writeError(o(ctx, VerbosityTrace, fmt.Sprint(args...)))
writeError(o(ctx, verbosity.Trace, fmt.Sprint(args...)))
}
func (o Output) TraceKV(ctx context.Context, msg string, kv ...KeyValue) {
writeError(o(ctx, VerbosityTrace, msg, kv...))
writeError(o(ctx, verbosity.Trace, msg, kv...))
}
func (o Output) Write(b []byte) (int, error) {
return o(context.Background(), VerbosityNorm, string(b))
return o(context.Background(), verbosity.Norm, string(b))
}
func (o Output) Writer(ctx context.Context, verb Verbosity) io.Writer {
func (o Output) Writer(ctx context.Context, verb verbosity.Verbosity) io.Writer {
return verbosityWriter{ctx, o, verb}
}
type verbosityWriter struct {
ctx context.Context
out Output
verb Verbosity
verb verbosity.Verbosity
}
func (w verbosityWriter) Write(b []byte) (int, error) {