From 5282c1fd267989fba5b2e595d08abc1452bc10ec Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Thu, 24 Oct 2024 06:33:53 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Get=20rid=20of=20internal=20pack?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don't need to hide anything --- Taskfile.yml | 2 +- internal/cli/cli.go => cli/err/err.go | 2 +- cmd/convids/main.go | 6 +++--- convids/methods.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename internal/cli/cli.go => cli/err/err.go (90%) diff --git a/Taskfile.yml b/Taskfile.yml index 47ccef9..e1e9ec8 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -18,7 +18,7 @@ tasks: sources: - cmd/convids/**/*.go - convids/**/*.go - - internal/cli/*.go + - cli/err/*go generates: - build/convids cmds: diff --git a/internal/cli/cli.go b/cli/err/err.go similarity index 90% rename from internal/cli/cli.go rename to cli/err/err.go index f0517dd..dcab16e 100644 --- a/internal/cli/cli.go +++ b/cli/err/err.go @@ -1,4 +1,4 @@ -package cli +package err import ( "fmt" diff --git a/cmd/convids/main.go b/cmd/convids/main.go index f07e8db..08479a0 100644 --- a/cmd/convids/main.go +++ b/cmd/convids/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" + e "codeberg.org/danjones000/utils/cli/err" "codeberg.org/danjones000/utils/convids" - "codeberg.org/danjones000/utils/internal/cli" "github.com/spf13/pflag" ) @@ -26,11 +26,11 @@ func main() { } data, err := convids.NewData(dataPath) - cli.HandleErr(err) + e.HandleErr(err) convids.WalkFiles(data, false, false, func(s *convids.Show, path string) error { fmt.Printf("%s for %+v\n", path, s) return nil }) - fmt.Println("\nDone!") + fmt.Println("Done!") } diff --git a/convids/methods.go b/convids/methods.go index c79c873..69ce198 100644 --- a/convids/methods.go +++ b/convids/methods.go @@ -71,7 +71,7 @@ func (d *Data) AllShows(silent bool) iter.Seq[*Show] { continue } if !silent { - fmt.Println("\nChecking", show, "shows\n") + fmt.Println("Checking", show, "shows\n") } for s := range sh.All() { if s == nil {