feat: remove the embed command

Author: 52funny

cmd/embed/embed.go

@@ -39,6 +39,7 @@ var QuotaCmd = &cobra.Command{
 func init() {
 	QuotaCmd.Flags().BoolVarP(&human, "human", "H", false, "display human readable format")
 }
+
 func displayStorage(s string) string {
 	size, _ := strconv.ParseFloat(s, 64)
 	cnt := 0

cmd/quota/quota.go

@@ -4,7 +4,6 @@ import (
 	"os"
 
 	"github.com/52funny/pikpakcli/cmd/download"
-	"github.com/52funny/pikpakcli/cmd/embed"
 	"github.com/52funny/pikpakcli/cmd/list"
 	"github.com/52funny/pikpakcli/cmd/new"
 	"github.com/52funny/pikpakcli/cmd/quota"
@@ -22,15 +21,15 @@ var rootCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		cmd.Help()
 	},
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+	PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
 		err := conf.InitConfig(configPath)
 		if err != nil {
-			logrus.Errorln(err)
-			os.Exit(1)
+			return err
 		}
 		if debug {
 			logrus.SetLevel(logrus.DebugLevel)
 		}
+		return nil
 	},
 }
 
@@ -46,11 +45,11 @@ func init() {
 	rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "debug mode")
 	// config
 	rootCmd.PersistentFlags().StringVar(&configPath, "config", "config.yml", "config file path")
+
 	rootCmd.AddCommand(upload.UploadCmd)
 	rootCmd.AddCommand(download.DownloadCmd)
 	rootCmd.AddCommand(share.ShareCommand)
 	rootCmd.AddCommand(new.NewCommand)
-	rootCmd.AddCommand(embed.EmbedCmd)
 	rootCmd.AddCommand(quota.QuotaCmd)
 	rootCmd.AddCommand(list.ListCmd)
 }

cmd/root.go

@@ -1,8 +1,6 @@
 package conf
 
 import (
-	"bytes"
-	"encoding/binary"
 	"fmt"
 	"io"
 	"os"
@@ -27,12 +25,7 @@ func (c *ConfigType) UseProxy() bool {
 
 // Initializing configuration information
 func InitConfig(path string) error {
-	// Firstly, read the config info from executable file
-	if readFromBinary() == nil {
-		return nil
-	}
-
-	// Secondly, it reads config.yml from the given path.
+	// Firstly, it reads config.yml from the given path.
 	// If there is no config.yml in the given path, it reads it from the default config path.
 	_, err := os.Stat(path)
 	switch os.IsNotExist(err) {
@@ -54,67 +47,6 @@ func InitConfig(path string) error {
 	return nil
 }
 
-// Read config from binary in the end
-// config_bytes: n bytes
-// end_magic: 10 bytes
-// size: 4 bytes
-// -----------------------------------
-// | config_bytes | size | end_magic |
-// -----------------------------------
-func readFromBinary() error {
-	f, err := os.Open(os.Args[0])
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	stat, err := f.Stat()
-	if err != nil {
-		return err
-	}
-
-	var end_magic = make([]byte, 10)
-	n, err := f.ReadAt(end_magic, stat.Size()-10)
-	if err != nil {
-		return err
-	}
-
-	if n != 10 {
-		return fmt.Errorf("read end_magic err: %d", n)
-	}
-
-	// Not have `config.yml` in the end
-	if !bytes.Equal(end_magic, []byte("config.yml")) {
-		return fmt.Errorf("not a pikpakcli binary")
-	}
-
-	var size = make([]byte, 4)
-	n, err = f.ReadAt(size, stat.Size()-14)
-
-	if err != nil {
-		return err
-	}
-
-	if n != 4 {
-		return fmt.Errorf("read size err: %d", n)
-	}
-
-	configSize := int64(binary.LittleEndian.Uint32(size))
-	configBuf := make([]byte, configSize)
-
-	n, err = f.ReadAt(configBuf, stat.Size()-14-configSize)
-
-	if err != nil || n != int(configSize) {
-		return err
-	}
-
-	if n != int(configSize) {
-		return fmt.Errorf("read config size err: %d", n)
-	}
-
-	// Unmarshal config
-	return yaml.Unmarshal(configBuf, &Config)
-}
-
 // Read configuration file from the given path
 func readFromPath(path string) error {
 	f, err := os.Open(path)