Merge pull request #449 from pixlise/feature/3d

pnemere · web-flow · commit 11eeb59b56aa · 2025-10-15T22:10:33.000+10:00
Kick build, fixes downloader not returning error if it's not a docume…
diff --git a/api/dataimport/internal/converters/wds/import.go b/api/dataimport/internal/converters/wds/import.go
@@ -182,7 +182,6 @@ func (im ImageMaps) Import(importPath string, pseudoIntensityRangesPath string,
 	}
 
 	data.SetPMCData(beamLookup, hkData, spectraLookup, contextImgsPerPMC, pseudoIntensityData, map[int32]string{})
-	//return data, contextImageSrcDir, nil
 
 	return data, importPath, nil
 }
diff --git a/api/job/runner/runner.go b/api/job/runner/runner.go
@@ -247,6 +247,7 @@ func downloadFile(jobLog logger.ILogger, remoteFS fileaccess.FileAccess, bucket
 		if remoteFS.IsNotFoundError(err) {
 			return fmt.Errorf("Failed to download s3://%v/%v: Not found", bucket, remotePathAndFile)
 		}
+		return fmt.Errorf("Failed to download s3://%v/%v: %v", bucket, remotePathAndFile, err)
 	} else {
 		jobLog.Infof(" Downloaded %v bytes", len(data))
 	}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,6 @@ func (im ImageMaps) Import(importPath string, pseudoIntensityRangesPath string,`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`data.SetPMCData(beamLookup, hkData, spectraLookup, contextImgsPerPMC, pseudoIntensityData, map[int32]string{})`
`185`		`- //return data, contextImageSrcDir, nil`
`186`	`185`
`187`	`186`	`return data, importPath, nil`
`188`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ func downloadFile(jobLog logger.ILogger, remoteFS fileaccess.FileAccess, bucket`
`247`	`247`	`if remoteFS.IsNotFoundError(err) {`
`248`	`248`	`return fmt.Errorf("Failed to download s3://%v/%v: Not found", bucket, remotePathAndFile)`
`249`	`249`	`}`
	`250`	`+ return fmt.Errorf("Failed to download s3://%v/%v: %v", bucket, remotePathAndFile, err)`
`250`	`251`	`} else {`
`251`	`252`	`jobLog.Infof(" Downloaded %v bytes", len(data))`
`252`	`253`	`}`