Merge pull request #1483 from nono/dont-recreate-thumbnails

Do not recreate thumbnails if not needed

Author: jinroh

pkg/vfs/vfsafero/impl.go

@@ -775,6 +775,9 @@ func (f *aferoFileCreation) Close() (err error) {
 	}
 
 	newdoc, olddoc, written := f.newdoc, f.olddoc, f.w
+	if olddoc == nil {
+		olddoc = newdoc.Clone().(*vfs.FileDoc)
+	}
 
 	if f.meta != nil {
 		if errc := (*f.meta).Close(); errc == nil {
@@ -806,12 +809,9 @@ func (f *aferoFileCreation) Close() (err error) {
 	// The document is already added to the index when closing the file creation
 	// handler. When updating the content of the document with the final
 	// informations (size, md5, ...) we can reuse the same document as olddoc.
-	if olddoc == nil || !olddoc.Trashed {
+	if f.olddoc == nil || !f.olddoc.Trashed {
 		newdoc.Trashed = false
 	}
-	if olddoc == nil {
-		olddoc = newdoc.Clone().(*vfs.FileDoc)
-	}
 	lockerr := f.afs.mu.Lock()
 	if lockerr != nil {
 		return lockerr

pkg/vfs/vfsswift/impl_v1.go

@@ -841,6 +841,10 @@ func (f *swiftFileCreation) Close() (err error) {
 	}
 
 	newdoc, olddoc, written := f.newdoc, f.olddoc, f.w
+	if olddoc == nil {
+		olddoc = newdoc.Clone().(*vfs.FileDoc)
+	}
+
 	if f.meta != nil {
 		if errc := (*f.meta).Close(); errc == nil {
 			newdoc.Metadata = (*f.meta).Result()
@@ -886,12 +890,9 @@ func (f *swiftFileCreation) Close() (err error) {
 	// The document is already added to the index when closing the file creation
 	// handler. When updating the content of the document with the final
 	// informations (size, md5, ...) we can reuse the same document as olddoc.
-	if olddoc == nil || !olddoc.Trashed {
+	if f.olddoc == nil || !f.olddoc.Trashed {
 		newdoc.Trashed = false
 	}
-	if olddoc == nil {
-		olddoc = newdoc.Clone().(*vfs.FileDoc)
-	}
 	lockerr := f.fs.mu.Lock()
 	if lockerr != nil {
 		return lockerr

pkg/vfs/vfsswift/impl_v2.go

@@ -723,6 +723,10 @@ func (f *swiftFileCreationV2) Close() (err error) {
 	}
 
 	newdoc, olddoc, written := f.newdoc, f.olddoc, f.w
+	if olddoc == nil {
+		olddoc = newdoc.Clone().(*vfs.FileDoc)
+	}
+
 	if f.meta != nil {
 		if errc := (*f.meta).Close(); errc == nil {
 			newdoc.Metadata = (*f.meta).Result()
@@ -768,12 +772,9 @@ func (f *swiftFileCreationV2) Close() (err error) {
 	// The document is already added to the index when closing the file creation
 	// handler. When updating the content of the document with the final
 	// informations (size, md5, ...) we can reuse the same document as olddoc.
-	if olddoc == nil || !olddoc.Trashed {
+	if f.olddoc == nil || !f.olddoc.Trashed {
 		newdoc.Trashed = false
 	}
-	if olddoc == nil {
-		olddoc = newdoc.Clone().(*vfs.FileDoc)
-	}
 	lockerr := f.fs.mu.Lock()
 	if lockerr != nil {
 		return lockerr

pkg/workers/thumbnail/thumbnail.go

@@ -62,6 +62,9 @@ func Worker(ctx *jobs.WorkerContext) error {
 	if img.Verb != "DELETED" && img.Doc.Trashed {
 		return nil
 	}
+	if img.OldDoc != nil && sameImg(&img.Doc, img.OldDoc) {
+		return nil
+	}
 
 	log := ctx.Logger()
 	log.WithField("nspace", "thumbnail").Debugf("%s %s", img.Verb, img.Doc.ID())
@@ -83,6 +86,20 @@ func Worker(ctx *jobs.WorkerContext) error {
 	return fmt.Errorf("Unknown type %s for image event", img.Verb)
 }
 
+func sameImg(doc, old *vfs.FileDoc) bool {
+	// XXX It is needed for a file that has just been uploaded. The first
+	// revision will have the size and md5sum, but is marked as trashed,
+	// and we have to wait for the second revision to have the file to generate
+	// the thumbnails
+	if doc.Trashed != old.Trashed {
+		return false
+	}
+	if doc.ByteSize != old.ByteSize {
+		return false
+	}
+	return bytes.Equal(doc.MD5Sum, old.MD5Sum)
+}
+
 type thumbnailMsg struct {
 	WithMetadata bool `json:"with_metadata"`
 }