From 301b8ca084da830cfa85a66888b5bfbed0df109f Mon Sep 17 00:00:00 2001 From: Slug-Boi Date: Mon, 28 Oct 2024 12:24:26 +0100 Subject: [PATCH] refactor: change user tui printout to remove weird line missalignment --- src_code/go_src/cmd/tui/tui_show_users.go | 2 +- src_code/go_src/cmd/users.go | 67 ++++++++++++----------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src_code/go_src/cmd/tui/tui_show_users.go b/src_code/go_src/cmd/tui/tui_show_users.go index 3a7b26b..25d4c7a 100644 --- a/src_code/go_src/cmd/tui/tui_show_users.go +++ b/src_code/go_src/cmd/tui/tui_show_users.go @@ -109,7 +109,7 @@ func loadData(author_file string) { for scanner.Scan() { //very hacky it basically just ensure glamour doesn't format the email - cnt.WriteString(":\b" + scanner.Text() + "\n") + cnt.WriteString(" " + scanner.Text() + "\n") } content = cnt.String() diff --git a/src_code/go_src/cmd/users.go b/src_code/go_src/cmd/users.go index 25a602f..a8e74eb 100644 --- a/src_code/go_src/cmd/users.go +++ b/src_code/go_src/cmd/users.go @@ -1,14 +1,15 @@ package cmd import ( - "github.com/Slug-Boi/cocommit/src_code/go_src/cmd/tui" - "github.com/Slug-Boi/cocommit/src_code/go_src/cmd/utils" "os" "os/exec" "slices" "sort" "strings" + "github.com/Slug-Boi/cocommit/src_code/go_src/cmd/tui" + "github.com/Slug-Boi/cocommit/src_code/go_src/cmd/utils" + "github.com/spf13/cobra" ) @@ -17,39 +18,39 @@ var authorfile = utils.Find_authorfile() // usersCmd represents the users command func UsersCmd() *cobra.Command { return &cobra.Command{ - Use: "users", - Short: "Displays all users from the author file located at: " + authorfile, - Long: `Displays all users from the author file located at: ` + authorfile, - Run: func(cmd *cobra.Command, args []string) { - //TODO: make this print a bit prettier (sort it and maybe use a table) - // check if the no pretty print flag is set - np, _ := cmd.Flags().GetBool("np") - if np { - println("List of users:\nFormat: / -> Username: Email: ") - seen_users := []utils.User{} - user_sb := []string{} - for name, usr := range utils.Users { - if !slices.Contains(seen_users, usr) { - user_sb = append(user_sb, utils.Users[name].Names+" ->"+" Username: "+usr.Username+" Email: "+usr.Email+"\n") - seen_users = append(seen_users, usr) + Use: "users", + Short: "Displays all users from the author file located at: " + authorfile, + Long: `Displays all users from the author file located at: ` + authorfile, + Run: func(cmd *cobra.Command, args []string) { + //TODO: make this print a bit prettier (sort it and maybe use a table) + // check if the no pretty print flag is set + np, _ := cmd.Flags().GetBool("np") + if np { + println("List of users:\nFormat: / -> Username: Email: ") + seen_users := []utils.User{} + user_sb := []string{} + for name, usr := range utils.Users { + if !slices.Contains(seen_users, usr) { + user_sb = append(user_sb, utils.Users[name].Names+" ->"+" Username: "+usr.Username+" Email: "+usr.Email+"\n") + seen_users = append(seen_users, usr) + } } + sort.Strings(user_sb) + println(strings.Join(user_sb, "")) + os.Exit(0) } - sort.Strings(user_sb) - println(strings.Join(user_sb, "")) - os.Exit(0) - } - bat_check := exec.Command("bat", "--version") - out, _ := bat_check.CombinedOutput() - if string(out) == "" { - tui.Entry_US(authorfile) - os.Exit(0) - } - bat := exec.Command("bat", authorfile) - bat.Stdout = os.Stdout - bat.Stderr = os.Stderr - bat.Run() - }, -} + bat_check := exec.Command("bat", "--version") + out, _ := bat_check.CombinedOutput() + if string(out) == "" { + tui.Entry_US(authorfile) + os.Exit(0) + } + bat := exec.Command("bat", authorfile) + bat.Stdout = os.Stdout + bat.Stderr = os.Stderr + bat.Run() + }, + } } func init() {