From 670dd3940de1c88ad65ee3ced1e1faa34e0f7384 Mon Sep 17 00:00:00 2001 From: iyear Date: Wed, 14 Sep 2022 10:38:08 +0800 Subject: [PATCH] refactor(cmd): flags getter --- cmd/chat/ls.go | 12 +----------- cmd/dl/url.go | 12 +----------- cmd/login/login.go | 16 +--------------- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/cmd/chat/ls.go b/cmd/chat/ls.go index b6c747a..6dea70e 100644 --- a/cmd/chat/ls.go +++ b/cmd/chat/ls.go @@ -10,16 +10,6 @@ var cmdList = &cobra.Command{ Short: "List your all chats with info", Example: "", RunE: func(cmd *cobra.Command, args []string) error { - proxy, err := cmd.Flags().GetString("proxy") - if err != nil { - return err - } - - ns, err := cmd.Flags().GetString("ns") - if err != nil { - return err - } - - return chat.List(cmd.Context(), ns, proxy) + return chat.List(cmd.Context(), cmd.Flag("ns").Value.String(), cmd.Flag("proxy").Value.String()) }, } diff --git a/cmd/dl/url.go b/cmd/dl/url.go index f1448de..da5204c 100644 --- a/cmd/dl/url.go +++ b/cmd/dl/url.go @@ -14,17 +14,7 @@ var cmdURL = &cobra.Command{ Short: "Download in url mode", Example: "tdl dl url -n iyear --proxy socks5://127.0.0.1:1080 -u https://t.me/tdl/1 -u https://t.me/tdl/2 -s 262144 -t 16 -l 3", RunE: func(cmd *cobra.Command, args []string) error { - proxy, err := cmd.Flags().GetString("proxy") - if err != nil { - return err - } - - ns, err := cmd.Flags().GetString("ns") - if err != nil { - return err - } - - return dlurl.Run(cmd.Context(), ns, proxy, partSize, threads, limit, urls) + return dlurl.Run(cmd.Context(), cmd.Flag("ns").Value.String(), cmd.Flag("proxy").Value.String(), partSize, threads, limit, urls) }, } diff --git a/cmd/login/login.go b/cmd/login/login.go index 5964bd8..2e0adea 100644 --- a/cmd/login/login.go +++ b/cmd/login/login.go @@ -1,7 +1,6 @@ package login import ( - "fmt" "github.com/iyear/tdl/app/login" "github.com/spf13/cobra" ) @@ -11,19 +10,6 @@ var Cmd = &cobra.Command{ Short: "Login to Telegram", Example: "tdl login -n my-tdl --proxy socks5://localhost:1080", RunE: func(cmd *cobra.Command, args []string) error { - proxy, err := cmd.Flags().GetString("proxy") - if err != nil { - return err - } - - ns, err := cmd.Flags().GetString("ns") - if err != nil { - return err - } - - if err := login.Run(cmd.Context(), ns, proxy); err != nil { - return fmt.Errorf("login failed: %v", err) - } - return nil + return login.Run(cmd.Context(), cmd.Flag("ns").Value.String(), cmd.Flag("proxy").Value.String()) }, }