Merge pull request #194 from pixlise/feature/v4-post-release-fixes

Fixing EM uploads where data zip is uploaded again, and 2 zips are fo…

api/dataimport/internal/converters/pixlem/import.go

@@ -19,6 +19,7 @@ package pixlem
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 
@@ -44,7 +45,7 @@ func (p PIXLEM) Import(importPath string, pseudoIntensityRangesPath string, data
 		if entry.IsDir() {
 			// If it's not the first one, we can't do this
 			if len(subdir) > 0 {
-				return nil, "", errors.New("Found multiple subdirs, expected one in: " + importPath)
+				return nil, "", fmt.Errorf("Found multiple subdirs (\"%v\", \"%v\"), expected one in: \"%v\"", subdir, entry.Name(), importPath)
 			}
 			subdir = entry.Name()
 		}

api/ws/handlers/scan.go

@@ -394,13 +394,16 @@ func HandleScanUploadReq(req *protos.ScanUploadReq, hctx wsHelpers.HandlerContex
 			return nil, fmt.Errorf("Zip file missing RFS sub-directory")
 		}
 
-		// Save the contents as a zip file in the uploads area
-		savePath := path.Join(s3PathStart, "data.zip")
-		err = fs.WriteObject(destBucket, savePath, zippedData)
-		if err != nil {
-			return nil, err
-		}
-		logger.Infof("  Wrote: s3://%v/%v", destBucket, savePath)
+		// NOTE: we just downloaded the zip from here, no point uploading it again!
+		/*
+			// Save the contents as a zip file in the uploads area
+			savePath := path.Join(s3PathStart, "data.zip")
+			err = fs.WriteObject(destBucket, savePath, zippedData)
+			if err != nil {
+				return nil, err
+			}
+			logger.Infof("  Wrote: s3://%v/%v", destBucket, savePath)
+		*/
 	} else {
 		// Expecting flat zip of MSA files
 		count := 0