diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-07-11 01:07:12 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-07-11 01:07:12 -0700 |
| commit | 9bf10975bd832759963c0be350bc5a48ddbbae4d (patch) | |
| tree | fa379ed10e653937fb77af2cb503ee9ffd707f65 /go/weed/export.go | |
| parent | a6aa79aab2cf4f87ebe38cc7deae751e536d486f (diff) | |
| parent | 2c595d2d16629f7163587e1a08f2419c3df78ecc (diff) | |
| download | seaweedfs-9bf10975bd832759963c0be350bc5a48ddbbae4d.tar.xz seaweedfs-9bf10975bd832759963c0be350bc5a48ddbbae4d.zip | |
Merge branch 'master' of github.com:chrislusf/weed-fs
Diffstat (limited to 'go/weed/export.go')
| -rw-r--r-- | go/weed/export.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/go/weed/export.go b/go/weed/export.go index 963d2aaba..4417c65f4 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path" + "path/filepath" "strconv" "strings" "text/template" @@ -49,7 +50,7 @@ func init() { var ( output = cmdExport.Flag.String("o", "", "output tar file name, must ends with .tar, or just a \"-\" for stdout") - format = cmdExport.Flag.String("fileNameFormat", defaultFnFormat, "filename format, default to {{.Mime}}/{{.Id}}:{{.Name}}") + format = cmdExport.Flag.String("fileNameFormat", defaultFnFormat, "filename formatted with {{.Mime}} {{.Id}} {{.Name}} {{.Ext}}") newer = cmdExport.Flag.String("newer", "", "export only files newer than this time, default is all files. Must be specified in RFC3339 without timezone") tarOutputFile *tar.Writer @@ -159,6 +160,7 @@ type nameParams struct { Id uint64 Mime string Key string + Ext string } func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (err error) { @@ -166,10 +168,12 @@ func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (e if tarOutputFile != nil { fileNameTemplateBuffer.Reset() if err = fileNameTemplate.Execute(fileNameTemplateBuffer, - nameParams{Name: string(n.Name), + nameParams{ + Name: string(n.Name), Id: n.Id, Mime: string(n.Mime), Key: key, + Ext: filepath.Ext(string(n.Name)), }, ); err != nil { return err |