Merge pull request #9 from paradeum-team/yuan

fix some bugs.

MANUAL.md

@@ -68,7 +68,7 @@ gcscmd config
 The `get` command allows you to retrieve an object from the system. Use the following syntax:
 
 ```shell
-gcscmd get cs://<BUCKET> [--name=<name>] [--cid=<cid>]
+gcscmd get cs://<BUCKET> [--name=<name>] [--cid=<cid>] [--downloadfolder=<downloadfolder>] [flags]
 ```
 
 Replace `<BUCKET>` with the name of the bucket where the object is located. You can optionally specify the name or CID of the object using the `--name` or `--cid` flags, respectively.
@@ -77,6 +77,7 @@ Replace `<BUCKET>` with the name of the bucket where the object is located. You
 
 - `-c, --cid <cid>`: The CID of the object you want to retrieve.
 - `-n, --name <name>`: The name of the object you want to retrieve.
+- `-d, --downloadfolder <downloadfolder>`: The folder of download.
 
 #### Example
 
@@ -142,7 +143,8 @@ To manage and show logs of the running daemon, use the following command:
 gcscmd log <level>
 ```
 
-Replace `<level>` with the desired log level, such as `debug`, `info`, `warn`, or `error`.
+Replace `<level>` with the desired log level, such as `trace`, `debug`, `info`, `warn`, or `error`.
+
 
 This command will manage and display logs of the specified log level.
 
@@ -597,7 +599,3 @@ The logger configuration allows you to specify various settings related to loggi
 - Description: The name of the log file.
 - Type: String
 - Default Value: `chainstorage-cli-log`
-
-
-
-

cmd/getCmd.go

@@ -27,7 +27,7 @@ import (
 
 // getCmd represents the get command
 var getCmd = &cobra.Command{
-	Use:   "get cs://BUCKET [--name=<name>] [--cid=<cid>]",
+	Use:   "get cs://BUCKET [--name=<name>] [--cid=<cid>] [--downloadfolder=<downloadfolder>]",
 	Short: "get object",
 	Long:  `get object`,
 	Run: func(cmd *cobra.Command, args []string) {

cmd/object.go

@@ -508,10 +508,12 @@ func objectRemoveRun(cmd *cobra.Command, args []string) {
 
 	count := respObjectList.Data.Count
 	if count == 1 {
-		// todo：模糊匹配还是精准匹配?
-		rawObjectName := respObjectList.Data.List[0].ObjectName
-		if !force && rawObjectName != objectName {
-			Error(cmd, args, sdkcode.ErrObjectNotFound)
+		if len(objectName) != 0 {
+			// todo：模糊匹配还是精准匹配?
+			rawObjectName := respObjectList.Data.List[0].ObjectName
+			if !force && rawObjectName != objectName {
+				Error(cmd, args, sdkcode.ErrObjectNotFound)
+			}
 		}
 
 		objectId := respObjectList.Data.List[0].Id

cmd/system.go

@@ -5,6 +5,7 @@ import (
 	"github.com/paradeum-team/chainstorage-sdk/model"
 	"github.com/spf13/cobra"
 	"os"
+	"strings"
 	"text/template"
 )
 
@@ -52,15 +53,31 @@ func versionRun(cmd *cobra.Command, args []string) {
 
 func versionRunOutput(cmd *cobra.Command, args []string, versionInfo *VersionInfo) {
 	templateContent := `
-Client Version: version.Info{Version:"v{{.Version}}"}
-Server Version: version.Info{Version:"v{{.ApiVersion}}"}
+Client Version: version.Info{Version:"{{.Version}}"}
+Server Version: version.Info{Version:"{{.ApiVersion}}"}
 `
 
 	t, err := template.New("versionTemplate").Parse(templateContent)
 	if err != nil {
 		Error(cmd, args, err)
 	}
 
+	clientVersion := versionInfo.Version
+	clientVersion = strings.ToLower(clientVersion)
+	if !strings.HasPrefix(clientVersion, "v") {
+		clientVersion = "v" + clientVersion
+	}
+	versionInfo.Version = clientVersion
+
+	apiVersion := versionInfo.ApiVersion
+	apiVersion = strings.ToLower(apiVersion)
+	if !strings.HasPrefix(apiVersion, "v") && apiVersion != "latest" {
+		apiVersion = "v" + apiVersion
+	}
+	apiVersion = strings.TrimSuffix(apiVersion, "\r")
+	apiVersion = strings.TrimSuffix(apiVersion, "\n")
+	versionInfo.ApiVersion = apiVersion
+
 	err = t.Execute(os.Stdout, versionInfo)
 	if err != nil {
 		Error(cmd, args, err)

cmd/versionCmd.go

@@ -28,8 +28,8 @@ import (
 // versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Show IPFS version information",
-	Long:  `Show IPFS version information`,
+	Short: "Show gcscmd version information",
+	Long:  `Show gcscmd version information`,
 	Run: func(cmd *cobra.Command, args []string) {
 		//fmt.Println("version called")
 		versionRun(cmd, args)

config.toml.sample

@@ -2,7 +2,7 @@
 ipfsGateway = "chainstorage-gateway.solarfs.io/ipfs/"
 useHttpsProtocol = true
 bucketPrefix = 'cs://'
-listOffset = 20
+listOffset = 10
 cleanTmpData = true
 maxRetries = 3
 retryDelay = 3