Merge branch 'multi-dataset' of https://git.openi.org.cn/OpenI/aiforge into multi-dataset

models/cloudbrain.go

@@ -1986,8 +1986,9 @@ func GetDatasetInfo(uuidStr string) (map[string]DatasetInfo, string, error) {
 		return nil, datasetNames, err
 	}
 	for i, attach := range attachs {
+		fileName := strings.TrimSuffix(strings.TrimSuffix(strings.TrimSuffix(attach.Name, ".zip"), ".tar.gz"), ".tgz")
 		for _, datasetInfo := range datasetInfos {
-			if attach.Name == datasetInfo.Name {
+			if fileName == datasetInfo.Name {
 				log.Error("the dataset name is same: %v", attach.Name)
 				return nil, datasetNames, errors.New("the dataset name is same")
 			}
@@ -1999,7 +2000,6 @@ func GetDatasetInfo(uuidStr string) (map[string]DatasetInfo, string, error) {
 			AttachmentRelativePath(attach.UUID) +
 			attach.UUID
 
-		fileName := strings.TrimSuffix(strings.TrimSuffix(strings.TrimSuffix(attach.Name, ".zip"), ".tar.gz"), ".tgz")
 		datasetInfos[attach.UUID] = DatasetInfo{
 			DataLocalPath: dataLocalPath,
 			Name:          fileName,