collection.MoveFilesIntoAnotherCollection: allow insta-creating new collection

Author: joonas-fi

pkg/stoserver/commandhandlerscollectionmutations.go

@@ -25,25 +25,30 @@ func (c *cHandlers) CollectionMoveFilesIntoAnotherCollection(cmd *stoservertypes
 		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 {
 			return err
 		}
 
-		collDst, err := stodb.Read(tx).Collection(cmd.Destination)
+		collDst, err := func() (*stotypes.Collection, error) {
+			if nameNewCollection := cmd.NameNewCollection; nameNewCollection != "" {
+				if cmd.Destination != "" {
+					return nil, errors.New("in the case of making a new collection the destination must be empty")
+				}
+				return createCollection(nameNewCollection, collSrc.Directory, c.conf.KeyStore, tx)
+			} else {
+				if cmd.Destination == "" || cmd.Source == cmd.Destination {
+					return nil, errors.New("source and destination cannot be same")
+				}
+
+				return stodb.Read(tx).Collection(cmd.Destination)
+			}
+		}()
 		if err != nil {
 			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

pkg/stoserver/stoservertypes/commands.json

@@ -481,7 +481,8 @@
 		"fields": [
 			{ "key": "Source", "hideIfDefaultValue": true },
 			{ "key": "Files", "type": "StringList", "hideIfDefaultValue": true },
-			{ "key": "Destination", "title": "Destination collection", "placeholder": "(search)", "type": "custom/string" }
+			{ "key": "Destination", "title": "Destination collection", "placeholder": "(search)", "type": "custom/string", "optional": true },
+			{ "key": "NameNewCollection", "title": "Name of new collection", "placeholder": "(create new collection)", "optional": true, "help": "If defined, new collection is created (as sibling of source collection). In this case leave destination unset." }
 		]
 	},
 	{