diff --git a/build.go b/build.go index 092ff92..5ff1aa6 100644 --- a/build.go +++ b/build.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/build" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/osutils" diff --git a/cmd/lure-api-server/api.go b/cmd/lure-api-server/api.go index cdd3fdf..801a521 100644 --- a/cmd/lure-api-server/api.go +++ b/cmd/lure-api-server/api.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/twitchtv/twirp" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/api" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" diff --git a/cmd/lure-api-server/main.go b/cmd/lure-api-server/main.go index de6e1e4..dc9e11a 100644 --- a/cmd/lure-api-server/main.go +++ b/cmd/lure-api-server/main.go @@ -28,7 +28,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/twitchtv/twirp" "go.elara.ws/logger" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/api" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/repos" diff --git a/cmd/lure-api-server/webhook.go b/cmd/lure-api-server/webhook.go index b7ce1b9..bb19a59 100644 --- a/cmd/lure-api-server/webhook.go +++ b/cmd/lure-api-server/webhook.go @@ -29,7 +29,7 @@ import ( "os" "strings" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/repos" ) diff --git a/fix.go b/fix.go index eec332c..249c2bc 100644 --- a/fix.go +++ b/fix.go @@ -22,7 +22,7 @@ import ( "os" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/repos" diff --git a/info.go b/info.go index b983868..02a1f0e 100644 --- a/info.go +++ b/info.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "github.com/urfave/cli/v2" "go.elara.ws/lure/distro" diff --git a/install.go b/install.go index 79db45a..578e142 100644 --- a/install.go +++ b/install.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/build" "go.elara.ws/lure/internal/cliutils" "go.elara.ws/lure/internal/config" diff --git a/internal/build/build.go b/internal/build/build.go index 85b9377..7ec5007 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -20,7 +20,7 @@ import ( "github.com/goreleaser/nfpm/v2" "github.com/goreleaser/nfpm/v2/files" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/distro" "go.elara.ws/lure/internal/cliutils" "go.elara.ws/lure/internal/config" diff --git a/internal/build/install.go b/internal/build/install.go index c0ab693..ce6bb25 100644 --- a/internal/build/install.go +++ b/internal/build/install.go @@ -4,7 +4,7 @@ import ( "context" "path/filepath" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/types" diff --git a/internal/cliutils/prompt.go b/internal/cliutils/prompt.go index 86d5efc..121ce04 100644 --- a/internal/cliutils/prompt.go +++ b/internal/cliutils/prompt.go @@ -22,7 +22,7 @@ import ( "os" "github.com/AlecAivazis/survey/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/pager" diff --git a/internal/config/config.go b/internal/config/config.go index 0350446..a77781a 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -22,7 +22,7 @@ import ( "os" "github.com/pelletier/go-toml/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/types" ) diff --git a/internal/config/dirs.go b/internal/config/dirs.go index 90844d1..3dacc93 100644 --- a/internal/config/dirs.go +++ b/internal/config/dirs.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/pelletier/go-toml/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" ) type Paths struct { diff --git a/internal/config/lang.go b/internal/config/lang.go index 72490cb..1acb48e 100644 --- a/internal/config/lang.go +++ b/internal/config/lang.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "golang.org/x/text/language" ) diff --git a/internal/db/db.go b/internal/db/db.go index 8c977af..14cf471 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -27,7 +27,7 @@ import ( "os" "github.com/jmoiron/sqlx" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "golang.org/x/exp/slices" "modernc.org/sqlite" diff --git a/internal/dl/dl.go b/internal/dl/dl.go index 624edee..3c4e2f3 100644 --- a/internal/dl/dl.go +++ b/internal/dl/dl.go @@ -36,7 +36,7 @@ import ( "github.com/PuerkitoBio/purell" "github.com/vmihailenco/msgpack/v5" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/dlcache" "golang.org/x/exp/slices" ) diff --git a/internal/log/log.go b/internal/log/log.go new file mode 100644 index 0000000..524f98e --- /dev/null +++ b/internal/log/log.go @@ -0,0 +1,84 @@ +package log + +import ( + "os" + + "go.elara.ws/logger" +) + +var Logger logger.Logger = logger.NewCLI(os.Stderr) + +// NoPanic prevents the logger from panicking on panic events +func NoPanic() { + Logger.NoPanic() +} + +// NoExit prevents the logger from exiting on fatal events +func NoExit() { + Logger.NoExit() +} + +// SetLevel sets the log level of the logger +func SetLevel(l logger.LogLevel) { + Logger.SetLevel(l) +} + +// Debug creates a new debug event with the given message +func Debug(msg string) logger.LogBuilder { + return Logger.Debug(msg) +} + +// Debugf creates a new debug event with the formatted message +func Debugf(format string, v ...any) logger.LogBuilder { + return Logger.Debugf(format, v...) +} + +// Info creates a new info event with the given message +func Info(msg string) logger.LogBuilder { + return Logger.Info(msg) +} + +// Infof creates a new info event with the formatted message +func Infof(format string, v ...any) logger.LogBuilder { + return Logger.Infof(format, v...) +} + +// Warn creates a new warn event with the given message +func Warn(msg string) logger.LogBuilder { + return Logger.Warn(msg) +} + +// Warnf creates a new warn event with the formatted message +func Warnf(format string, v ...any) logger.LogBuilder { + return Logger.Warnf(format, v...) +} + +// Error creates a new error event with the given message +func Error(msg string) logger.LogBuilder { + return Logger.Error(msg) +} + +// Errorf creates a new error event with the formatted message +func Errorf(format string, v ...any) logger.LogBuilder { + return Logger.Errorf(format, v...) +} + +// Fatal creates a new fatal event with the given message +func Fatal(msg string) logger.LogBuilder { + return Logger.Fatal(msg) +} + +// Fatalf creates a new fatal event with the formatted message +func Fatalf(format string, v ...any) logger.LogBuilder { + return Logger.Fatalf(format, v...) +} + +// Fatal creates a new fatal event with the given message +func Panic(msg string) logger.LogBuilder { + return Logger.Panic(msg) +} + +// Fatalf creates a new fatal event with the formatted message +func Panicf(format string, v ...any) logger.LogBuilder { + return Logger.Panicf(format, v...) +} diff --git a/internal/repos/pull.go b/internal/repos/pull.go index fe3e45b..36fe5f7 100644 --- a/internal/repos/pull.go +++ b/internal/repos/pull.go @@ -34,7 +34,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/format/diff" "github.com/pelletier/go-toml/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/distro" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" diff --git a/internal/translations/translations.go b/internal/translations/translations.go index fb10ad4..a070270 100644 --- a/internal/translations/translations.go +++ b/internal/translations/translations.go @@ -4,7 +4,7 @@ import ( "embed" "go.elara.ws/logger" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/translate" "golang.org/x/text/language" ) diff --git a/list.go b/list.go index bcd0f1d..0ed8201 100644 --- a/list.go +++ b/list.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/repos" diff --git a/main.go b/main.go index 50d7fd2..96ee28f 100644 --- a/main.go +++ b/main.go @@ -28,9 +28,9 @@ import ( "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" "go.elara.ws/logger" - "go.elara.ws/logger/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/translations" "go.elara.ws/lure/manager" ) diff --git a/repo.go b/repo.go index cdf8cb5..fc612aa 100644 --- a/repo.go +++ b/repo.go @@ -24,7 +24,7 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/config" "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/repos" diff --git a/upgrade.go b/upgrade.go index 16701b0..743ff7b 100644 --- a/upgrade.go +++ b/upgrade.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "go.elara.ws/logger/log" + "go.elara.ws/lure/internal/log" "go.elara.ws/lure/distro" "go.elara.ws/lure/internal/build" "go.elara.ws/lure/internal/config"