GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-08 21:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: move print QR func to utils

Browse Source
This commit is contained in:
tobyxdd 2023-07-14 15:44:37 -07:00
parent e21e5c67a8
commit 6aa60e12d1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/cmd/client.go
View File

@ -10,7 +10,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/mdp/qrterminal/v3"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"
@ -264,12 +263,7 @@ func runClient(cmd *cobra.Command, args []string) {
uri := config.ShareURI() uri := config.ShareURI()
logger.Info("use this URI to share your server", zap.String("uri", uri)) logger.Info("use this URI to share your server", zap.String("uri", uri))
if showQR { if showQR {
qrterminal.GenerateWithConfig(uri, qrterminal.Config{ printQR(uri)
Level: qrterminal.L,
Writer: os.Stdout,
BlackChar: qrterminal.BLACK,
WhiteChar: qrterminal.WHITE,
})
} }
// Modes // Modes

11
app/cmd/utils.go
View File

@ -2,8 +2,10 @@ package cmd
import ( import (
"fmt" "fmt"
"os"
"github.com/apernet/hysteria/extras/utils" "github.com/apernet/hysteria/extras/utils"
"github.com/mdp/qrterminal/v3"
) )
// convBandwidth handles both string and int types for bandwidth. // 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 { type configError struct {
Field string Field string
Err error Err error