collection.MoveFilesIntoAnotherCollection: move related (e.g. thumbs) together

Author: joonas-fi

pkg/stateresolver/resolver.go

@@ -36,6 +36,8 @@ func (s *StateAt) FileList() []stotypes.File {
 		files = append(files, file)
 	}
 
+	// since these represent files over multiple directories, the only sorting strategy that makes sense is by path
+	// (to make files in same directory be closer to each other)
 	sort.Slice(files, func(i, j int) bool {
 		return files[i].Path < files[j].Path
 	})

pkg/stomediascanner/thumbnailer.go

@@ -150,7 +150,7 @@ func collectionThumbnailsOneBatch(
 				deletedFiles = append(deletedFiles, thumb.Path)
 
 				// move into thumb path, assume it has sensible dimensions (suitable as a thumbnail)
-				thumbPath := collectionThumbPath(file)
+				thumbPath := CollectionThumbPath(file)
 
 				// there already exists thumbnail? delete it (by updating)
 				if toReplace, thumbExists := collFiles[thumbPath]; thumbExists {
@@ -171,7 +171,7 @@ func collectionThumbnailsOneBatch(
 	}
 
 	alreadyThumbnailed := func(file stotypes.File) bool {
-		thumbPath := collectionThumbPath(file)
+		thumbPath := CollectionThumbPath(file)
 
 		// since thumbPath is based on file content, "foo.jpg" and "foo (Copy).jpg" have
 		// same thumb path (if they have same content)
@@ -229,7 +229,7 @@ func collectionThumbnailsOneBatch(
 
 		createdThumbnail, err := stoclient.ScanAndDiscoverBlobs(
 			ctx,
-			collectionThumbPath(file),
+			CollectionThumbPath(file),
 			thumbOutput,
 			0,
 			fileModifiedTime, // created
@@ -269,7 +269,7 @@ func collectionThumbnailsOneBatch(
 	return more, err
 }
 
-func collectionThumbPath(f stotypes.File) string {
+func CollectionThumbPath(f stotypes.File) string {
 	return ".sto/thumb/" + f.Sha256[0:10] + ".jpg"
 }
 

pkg/stoserver/commandhandlerscollectionmutations.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/function61/eventkit/command"
 	"github.com/function61/varasto/pkg/stateresolver"
+	"github.com/function61/varasto/pkg/stomediascanner"
 	"github.com/function61/varasto/pkg/stoserver/stodb"
 	"github.com/function61/varasto/pkg/stoserver/stoservertypes"
 	"github.com/function61/varasto/pkg/stotypes"
@@ -16,16 +17,18 @@ import (
 )
 
 func (c *cHandlers) CollectionMoveFilesIntoAnotherCollection(cmd *stoservertypes.CollectionMoveFilesIntoAnotherCollection, ctx *command.Ctx) error {
-	filesToMove := *cmd.Files
-
-	if len(filesToMove) == 0 {
+	if len(*cmd.Files) == 0 {
 		return nil // no-op
 	}
 
-	if err := noDuplicates(filesToMove); err != nil {
+	if err := noDuplicates(*cmd.Files); err != nil {
 		return err
 	}
 
+	if cmd.Source == cmd.Destination {
+		return errors.New("source and destination cannot be same")
+	}
+
 	return c.db.Update(func(tx *bbolt.Tx) error {
 		collSrc, err := stodb.Read(tx).Collection(cmd.Source)
 		if err != nil {
@@ -37,10 +40,6 @@ func (c *cHandlers) CollectionMoveFilesIntoAnotherCollection(cmd *stoservertypes
 			return err
 		}
 
-		if cmd.Source == cmd.Destination {
-			return errors.New("Source and destination cannot be same")
-		}
-
 		sourceState, err := stateresolver.ComputeStateAtHead(*collSrc)
 		if err != nil {
 			return err
@@ -51,7 +50,12 @@ func (c *cHandlers) CollectionMoveFilesIntoAnotherCollection(cmd *stoservertypes
 
 		filesInSource := sourceState.Files()
 
-		for _, filePathToMove := range filesToMove {
+		relatedFiles := discoverRelatedFilePaths(*cmd.Files, filesInSource)
+
+		// now includes thumbnails and such
+		filesAndRelatedFilesToMove := append(*cmd.Files, relatedFiles...)
+
+		for _, filePathToMove := range filesAndRelatedFilesToMove {
 			fileToMove, found := filesInSource[filePathToMove]
 			if !found {
 				return fmt.Errorf("file to move not found: %s", filePathToMove)
@@ -228,3 +232,22 @@ func noDuplicates(items []string) error {
 
 	return nil
 }
+
+// related files = thumbnails and metadata content belonging to a primary file
+func discoverRelatedFilePaths(filesForToDiscover []string, collectionAllFiles map[string]stotypes.File) []string {
+	relatedFiles := []string{}
+
+	for _, item := range filesForToDiscover {
+		file, found := collectionAllFiles[item]
+		if !found { // should not happen, but let's ignore here since this error is caught in later code
+			continue
+		}
+
+		thumbPath := stomediascanner.CollectionThumbPath(file)
+		if _, haveThumb := collectionAllFiles[thumbPath]; haveThumb {
+			relatedFiles = append(relatedFiles, thumbPath)
+		}
+	}
+
+	return relatedFiles
+}