lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-08-24 07:25:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Easier variable names

Browse Source
This commit is contained in:
chrislusf 2015-06-02 00:33:13 -07:00
parent 26cdd11d8f
commit fd2e6bcf5d
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
go/weed/export.go
View File

@ -48,14 +48,14 @@ func init() {
} }
var ( var (
dest = cmdExport.Flag.String("o", "", "output tar file name, must ends with .tar, or just a \"-\" for stdout") 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 format, default to {{.Mime}}/{{.Id}}:{{.Name}}")
newer = cmdExport.Flag.String("newer", "", "export only files newer than this time, default is all files. Must be specified in RFC3339 without timezone") newer = cmdExport.Flag.String("newer", "", "export only files newer than this time, default is all files. Must be specified in RFC3339 without timezone")
tarFh *tar.Writer tarOutputFile *tar.Writer
tarHeader tar.Header tarHeader tar.Header
fnTmpl *template.Template fileNameTemplate *template.Template
fnTmplBuf = bytes.NewBuffer(nil) fileNameTemplateBuffer = bytes.NewBuffer(nil)
newerThan time.Time newerThan time.Time
newerThanUnix int64 = -1 newerThanUnix int64 = -1
localLocation, _ = time.LoadLocation("Local") localLocation, _ = time.LoadLocation("Local")
@ -77,28 +77,28 @@ func runExport(cmd *Command, args []string) bool {
return false return false
} }
if *dest != "" { if *output != "" {
if *dest != "-" && !strings.HasSuffix(*dest, ".tar") { if *output != "-" && !strings.HasSuffix(*output, ".tar") {
fmt.Println("the output file", *dest, "should be '-' or end with .tar") fmt.Println("the output file", *output, "should be '-' or end with .tar")
return false return false
} }
if fnTmpl, err = template.New("name").Parse(*format); err != nil { if fileNameTemplate, err = template.New("name").Parse(*format); err != nil {
fmt.Println("cannot parse format " + *format + ": " + err.Error()) fmt.Println("cannot parse format " + *format + ": " + err.Error())
return false return false
} }
var fh *os.File var outputFile *os.File
if *dest == "-" { if *output == "-" {
fh = os.Stdout outputFile = os.Stdout
} else { } else {
if fh, err = os.Create(*dest); err != nil { if outputFile, err = os.Create(*output); err != nil {
glog.Fatalf("cannot open output tar %s: %s", *dest, err) glog.Fatalf("cannot open output tar %s: %s", *output, err)
} }
} }
defer fh.Close() defer outputFile.Close()
tarFh = tar.NewWriter(fh) tarOutputFile = tar.NewWriter(outputFile)
defer tarFh.Close() defer tarOutputFile.Close()
t := time.Now() t := time.Now()
tarHeader = tar.Header{Mode: 0644, tarHeader = tar.Header{Mode: 0644,
ModTime: t, Uid: os.Getuid(), Gid: os.Getgid(), ModTime: t, Uid: os.Getuid(), Gid: os.Getgid(),
@ -117,7 +117,7 @@ func runExport(cmd *Command, args []string) bool {
} }
defer indexFile.Close() defer indexFile.Close()
nm, err := storage.LoadNeedleMap(indexFile) needleMap, err := storage.LoadNeedleMap(indexFile)
if err != nil { if err != nil {
glog.Fatalf("cannot load needle map from %s: %s", indexFile.Name(), err) glog.Fatalf("cannot load needle map from %s: %s", indexFile.Name(), err)
} }
@ -130,7 +130,7 @@ func runExport(cmd *Command, args []string) bool {
version = superBlock.Version() version = superBlock.Version()
return nil return nil
}, true, func(n *storage.Needle, offset int64) error { }, true, func(n *storage.Needle, offset int64) error {
nv, ok := nm.Get(n.Id) nv, ok := needleMap.Get(n.Id)
glog.V(3).Infof("key %d offset %d size %d disk_size %d gzip %v ok %v nv %+v", glog.V(3).Infof("key %d offset %d size %d disk_size %d gzip %v ok %v nv %+v",
n.Id, offset, n.Size, n.DiskSize(), n.IsGzipped(), ok, nv) n.Id, offset, n.Size, n.DiskSize(), n.IsGzipped(), ok, nv)
if ok && nv.Size > 0 && int64(nv.Offset)*8 == offset { if ok && nv.Size > 0 && int64(nv.Offset)*8 == offset {
@ -163,9 +163,9 @@ type nameParams struct {
func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (err error) { func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (err error) {
key := storage.NewFileIdFromNeedle(vid, n).String() key := storage.NewFileIdFromNeedle(vid, n).String()
if tarFh != nil { if tarOutputFile != nil {
fnTmplBuf.Reset() fileNameTemplateBuffer.Reset()
if err = fnTmpl.Execute(fnTmplBuf, if err = fileNameTemplate.Execute(fileNameTemplateBuffer,
nameParams{Name: string(n.Name), nameParams{Name: string(n.Name),
Id: n.Id, Id: n.Id,
Mime: string(n.Mime), Mime: string(n.Mime),
@ -174,23 +174,24 @@ func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (e
); err != nil { ); err != nil {
return err return err
} }
nm := fnTmplBuf.String()
if n.IsGzipped() && path.Ext(nm) != ".gz" { fileName := fileNameTemplateBuffer.String()
nm = nm + ".gz"
if n.IsGzipped() && path.Ext(fileName) != ".gz" {
fileName = fileName + ".gz"
} }
tarHeader.Name, tarHeader.Size = nm, int64(len(n.Data)) tarHeader.Name, tarHeader.Size = fileName, int64(len(n.Data))
if n.HasLastModifiedDate() { if n.HasLastModifiedDate() {
tarHeader.ModTime = time.Unix(int64(n.LastModified), 0) tarHeader.ModTime = time.Unix(int64(n.LastModified), 0)
} else { } else {
tarHeader.ModTime = time.Unix(0, 0) tarHeader.ModTime = time.Unix(0, 0)
} }
tarHeader.ChangeTime = tarHeader.ModTime tarHeader.ChangeTime = tarHeader.ModTime
if err = tarFh.WriteHeader(&tarHeader); err != nil { if err = tarOutputFile.WriteHeader(&tarHeader); err != nil {
return err return err
} }
_, err = tarFh.Write(n.Data) _, err = tarOutputFile.Write(n.Data)
} else { } else {
size := n.DataSize size := n.DataSize
if version == storage.Version1 { if version == storage.Version1 {