Merge pull request #217 from qiniu/develop

文档更新

Author: longbai

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.3.6
+1. 修复m3u8replace 上传的问题
+
 # 2.3.5
 1. 增加token命令，创建Qbox token, qiniuToken, uploadToken
 2. qshell配置文件支持设置accessKey和secretKey

Makefile

@@ -4,20 +4,20 @@ DARWIN=qshell_darwin_x64
 LINUX86=qshell_linux_x86
 LINUX64=qshell_linux_x64
 LINUXARM=qshell_linux_arm
+LDFLAGS='-extldflags "-static"'
 
-install:
-	GOOS=darwin GOARCH=amd64 go build -o $(DARWIN) .
-	cp ./$(DARWIN) /usr/local/bin/qshell && rm ./$(DARWIN)
+all: linux windows arm darwin
 
-all: linux windows arm
+darwin:
+	GOOS=darwin GOARCH=amd64 go build -o $(DARWIN)
 
 linux:
-	GOOS=linux GOARCH=386 go build -o $(LINUX86) .
-	GOOS=linux GOARCH=amd64 go build -o $(LINUX64) .
+	CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags  $(LDFLAGS) -o $(LINUX86) .
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -o $(LINUX64) .
 
 windows:
-	GOOS=windows GOARCH=386 go build -o $(WIN86) .
-	GOOS=windows GOARCH=amd64 go build -o $(WIN64) .
+	CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags $(LDFLAGS) -o $(WIN86) .
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags $(LDFLAGS) -o $(WIN64) .
 
 arm:
-	GOOS=linux GOARCH=arm go build -o $(LINUXARM)
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags $(LDFLAGS) -o $(LINUXARM)

README.md

@@ -12,7 +12,7 @@ qshell是利用[七牛文档上公开的API](http://developer.qiniu.com)实现
 
 |版本     |支持平台|链接|
 |--------|---------|----|
-|qshell-v2.3.5 |Mac OSX, Linux, Windows|[下载](http://devtools.qiniu.com/qshell-v2.3.5.zip)|
+|qshell-v2.3.6 |Mac OSX, Linux, Windows|[下载](http://devtools.qiniu.com/qshell-v2.3.6.zip)|
 
 ## 安装
 
@@ -252,6 +252,7 @@ fi
 |alilistbucket|第三方|列举阿里OSS空间里面的所有文件|[文档](docs/alilistbucket.md)|
 |get|存储|下载存储空间中的文件|[文档](docs/get.md)|
 |pfop|dora异步处理|提交异步音视频处理请求|[文档](docs/pfop.md)
+|token | 其他 | 计算upToken, Qbox token, Qiniu Token|[文档](docs/token.md)
 
 ## 问题反馈
 

cmd/cdn.go

@@ -46,6 +46,7 @@ func init() {
 	RootCmd.AddCommand(cdnPreCmd, cdnRefreshCmd)
 }
 
+// 刷新CDN
 func CdnRefresh(cmd *cobra.Command, params []string) {
 	var urlListFile string
 
@@ -122,6 +123,7 @@ func cdnRefresh(cm *cdn.CdnManager, urls []string, dirs []string) {
 	}
 }
 
+//  CDN 文件预取
 func CdnPrefetch(cmd *cobra.Command, params []string) {
 	var urlListFile string
 

cmd/qupload.go

@@ -66,6 +66,7 @@ func parseUploadConfigFile(uploadConfigFile string, uploadConfig *iqshell.Upload
 	return
 }
 
+// upload cmd
 func QiniuUpload(cmd *cobra.Command, params []string) {
 
 	configFile := params[0]

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/astaxie/beego/logs"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/qiniu/api.v7/storage"
 	"github.com/qiniu/qshell/iqshell"
 	"github.com/spf13/cobra"
@@ -15,8 +16,8 @@ import (
 )
 
 var (
-	DebugFlag   bool
-	VersionFlag bool
+	DebugFlag   bool // debug flag
+	VersionFlag bool // version flag
 	cfgFile     string
 	local       bool
 )
@@ -52,6 +53,7 @@ __custom_func() {
 `
 )
 
+// cobra root cmd
 var RootCmd = &cobra.Command{
 	Use:                    "qshell",
 	Short:                  "Qiniu commandline tool for managing your bucket and CDN",
@@ -111,12 +113,12 @@ func initConfig() {
 		}
 		iqshell.SetRootPath(dir + "/.qshell")
 	} else {
-		curUser, gErr := user.Current()
-		if gErr != nil {
-			fmt.Fprintf(os.Stderr, "Error: get current user error: %v\n", gErr)
+		homeDir, hErr := homedir.Dir()
+		if hErr != nil {
+			fmt.Fprintf(os.Stderr, "get current home directory: %v\n", hErr)
 			os.Exit(1)
 		}
-		iqshell.SetRootPath(curUser.HomeDir + "/.qshell")
+		iqshell.SetRootPath(homeDir + "/.qshell")
 	}
 	rootPath := iqshell.RootPath()
 

cmd/rs.go

@@ -424,7 +424,7 @@ func M3u8Delete(cmd *cobra.Command, params []string) {
 	bm := iqshell.GetBucketManager()
 	m3u8FileList, err := bm.M3u8FileList(bucket, m3u8Key)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Get m3u8 file list error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "Get m3u8 file list error: %v\n", err)
 		os.Exit(iqshell.STATUS_ERROR)
 	}
 	entryCnt := len(m3u8FileList)

cmd/rsbatch.go

@@ -246,7 +246,7 @@ func batchFetch(fItemChan chan *iqshell.FetchItem, fileExporter *iqshell.FileExp
 				if fErr != nil {
 					fmt.Fprintf(os.Stderr, "fetch %s => %s:%s failed\n", fetchItem.RemoteUrl, fetchItem.Bucket, fetchItem.Key)
 					if fileExporter != nil {
-						fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%v\n", fetchItem.RemoteUrl, fetchItem.Key, fErr))
+						fileExporter.WriteToFailedWriter(fmt.Sprintf("%s\t%s\t%v\n", fetchItem.RemoteUrl, fetchItem.Key, fErr))
 					}
 				} else {
 					fmt.Printf("fetch %s => %s:%s success\n", fetchItem.RemoteUrl, fetchItem.Bucket, fetchItem.Key)

cmd/token.go

@@ -162,7 +162,7 @@ func UploadToken(cmd *cobra.Command, args []string) {
 	} else {
 		mac, mErr = iqshell.GetMac()
 		if mErr != nil {
-			fmt.Errorf("get mac: %v\n", mErr)
+			fmt.Fprintf(os.Stderr, "get mac: %v\n", mErr)
 			os.Exit(1)
 		}
 	}

cmd/user.go

@@ -33,7 +33,7 @@ var userCleanCmd = &cobra.Command{
 }
 
 var userRmCmd = &cobra.Command{
-	Use:   "remove <UID>",
+	Use:   "remove <UserName>",
 	Short: "Remove user UID from inner db",
 	Args:  cobra.ExactArgs(1),
 	Run:   RmUser,
@@ -56,6 +56,8 @@ func init() {
 	RootCmd.AddCommand(userCmd)
 }
 
+// 切换用户
+// qshell user cu <Name>
 func ChUser(cmd *cobra.Command, params []string) {
 	var err error
 	var userName string
@@ -71,6 +73,8 @@ func ChUser(cmd *cobra.Command, params []string) {
 	}
 }
 
+// 列举本地数据库记录的账户
+// qshell user ls
 func ListUser(cmd *cobra.Command, params []string) {
 	err := iqshell.ListUser(userLsName)
 	if err != nil {
@@ -79,6 +83,8 @@ func ListUser(cmd *cobra.Command, params []string) {
 	}
 }
 
+// 删除本地记录的数据库
+// qshell user clean
 func CleanUser(cmd *cobra.Command, params []string) {
 	err := iqshell.CleanUser()
 	if err != nil {
@@ -87,6 +93,8 @@ func CleanUser(cmd *cobra.Command, params []string) {
 	}
 }
 
+// 删除用户
+// qshell user remove <UserName>
 func RmUser(cmd *cobra.Command, params []string) {
 	userName := params[0]
 	err := iqshell.RmUser(userName)
@@ -96,6 +104,8 @@ func RmUser(cmd *cobra.Command, params []string) {
 	}
 }
 
+// 查询用用户是否存在本地数据库中
+// qshell user lookup <UserName>
 func LookUp(cmd *cobra.Command, params []string) {
 	userName := params[0]
 	err := iqshell.LookUp(userName)