Merge branch 'master' of github.com:chrislusf/weed-fs

3 files changed, 10 insertions, 3 deletions

diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go
index 9a9f63ddb..eb2d8d459 100644
--- a/go/storage/needle_read_write.go
+++ b/go/storage/needle_read_write.go
@@ -120,7 +120,7 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) {
 					return
 				}
 			}
-			if n.HasTtl() {
+			if n.HasTtl() && n.Ttl != nil {
 				n.Ttl.ToBytes(header[0:TtlBytesLength])
 				if _, err = w.Write(header[0:TtlBytesLength]); err != nil {
 					return
diff --git a/go/storage/volume.go b/go/storage/volume.go
index 0e6cadecc..998b0dd64 100644
--- a/go/storage/volume.go
+++ b/go/storage/volume.go
@@ -152,6 +152,9 @@ func (v *Volume) NeedToReplicate() bool {
 // isFileUnchanged checks whether this needle to write is same as last one.
 // It requires serialized access in the same volume.
 func (v *Volume) isFileUnchanged(n *Needle) bool {
+	if v.Ttl == EMPTY_TTL || v.Ttl.String() == "" {
+		return true
+	}
 	nv, ok := v.nm.Get(n.Id)
 	if ok && nv.Offset > 0 {
 		oldNeedle := new(Needle)
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