Reconcile symmetry between handleGet and handlePut

mongofiles/mongofiles.go

@@ -419,21 +419,36 @@ func (mf *MongoFiles) put(id interface{}, name string) (bytesWritten int64, err
 }
 
 // handlePut contains the logic for the 'put' and 'put_id' commands
-func (mf *MongoFiles) handlePut(file string) error {
-	id, err := mf.parseOrCreateID()
-	if err != nil {
-		return err
-	}
+func (mf *MongoFiles) handlePut() error {
+	handlePutFile := func(mf *MongoFiles, file string) error {
+		id, err := mf.parseOrCreateID()
+		if err != nil {
+			return err
+		}
 
-	log.Logvf(log.Always, "adding gridFile: %v\n", file)
+		log.Logvf(log.Always, "adding gridFile: %v\n", file)
 
-	n, err := mf.put(id, file)
-	if err != nil {
-		log.Logvf(log.Always, "error adding gridFile: %v\n", err)
-		return err
+		n, err := mf.put(id, file)
+		if err != nil {
+			log.Logvf(log.Always, "error adding gridFile: %v\n", err)
+			return err
+		}
+		log.Logvf(log.DebugLow, "copied %v bytes to server", n)
+		log.Logvf(log.Always, "added gridFile: %v\n", file)
+
+		return nil
+	}
+
+	if mf.Command == Put {
+		for _, filename := range mf.FileNameList {
+			err := handlePutFile(mf, filename)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		return handlePutFile(mf, mf.FileName)
 	}
-	log.Logvf(log.DebugLow, "copied %v bytes to server", n)
-	log.Logvf(log.Always, "added gridFile: %v\n", file)
 
 	return nil
 }
@@ -500,18 +515,8 @@ func (mf *MongoFiles) Run(displayHost bool) (output string, finalErr error) {
 	case Get, GetID:
 		err = mf.handleGet()
 
-	case Put:
-		// If mongofiles --put ... is called, i.e. with multiple supporting
-		// arguments, then add gridFiles specified in mf.FileNameList
-		for _, filename := range mf.FileNameList {
-			err = mf.handlePut(filename)
-			if err != nil {
-				return "", err
-			}
-		}
-
-	case PutID:
-		err = mf.handlePut(mf.FileName)
+	case Put, PutID:
+		err = mf.handlePut()
 
 	case DeleteID:
 		err = mf.handleDeleteID()