From 6aa60e12d15e1b4daceb293cd5273919d2e71b42 Mon Sep 17 00:00:00 2001 From: tobyxdd Date: Fri, 14 Jul 2023 15:44:37 -0700 Subject: [PATCH] chore: move print QR func to utils --- app/cmd/client.go | 8 +------- app/cmd/utils.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/cmd/client.go b/app/cmd/client.go index e060805..0131db4 100644 --- a/app/cmd/client.go +++ b/app/cmd/client.go @@ -10,7 +10,6 @@ import ( "sync" "time" - "github.com/mdp/qrterminal/v3" "github.com/spf13/cobra" "github.com/spf13/viper" "go.uber.org/zap" @@ -264,12 +263,7 @@ func runClient(cmd *cobra.Command, args []string) { uri := config.ShareURI() logger.Info("use this URI to share your server", zap.String("uri", uri)) if showQR { - qrterminal.GenerateWithConfig(uri, qrterminal.Config{ - Level: qrterminal.L, - Writer: os.Stdout, - BlackChar: qrterminal.BLACK, - WhiteChar: qrterminal.WHITE, - }) + printQR(uri) } // Modes diff --git a/app/cmd/utils.go b/app/cmd/utils.go index d0970fa..8ecb5d6 100644 --- a/app/cmd/utils.go +++ b/app/cmd/utils.go @@ -2,8 +2,10 @@ package cmd import ( "fmt" + "os" "github.com/apernet/hysteria/extras/utils" + "github.com/mdp/qrterminal/v3" ) // convBandwidth handles both string and int types for bandwidth. @@ -21,6 +23,15 @@ func convBandwidth(bw interface{}) (uint64, error) { } } +func printQR(str string) { + qrterminal.GenerateWithConfig(str, qrterminal.Config{ + Level: qrterminal.L, + Writer: os.Stdout, + BlackChar: qrterminal.BLACK, + WhiteChar: qrterminal.WHITE, + }) +} + type configError struct { Field string Err error