From 53e8fa0ffe96c8d5c6b67c5e2c4368aef702b72a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 8 Nov 2021 17:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go          | 18 +++++++++++-------
 templates/repo/modelmanage/download.tmpl |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index d95a9db0f..692c34774 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -110,12 +110,17 @@ func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir
 	}
 	var size int64
 	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/") + "/"
+	destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(modelUUID) + "/"
 	for _, modelFile := range modelDbResult {
-		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(modelUUID) + "/"
-
-		log.Info("copy file, bucket=" + setting.Bucket + ", src keyname=" + prefix + modelFile.FileName)
-		log.Info("Dest key name=" + destKeyNamePrefix + modelFile.FileName)
-		err := storage.ObsCopyFile(setting.Bucket, prefix+modelFile.FileName, setting.Bucket, destKeyNamePrefix+modelFile.FileName)
+		if modelFile.IsDir {
+			log.Info("copy dir, continue. dir=" + modelFile.FileName)
+			continue
+		}
+		srcKeyName := prefix + modelFile.ParenDir + modelFile.FileName
+		log.Info("copy file, bucket=" + setting.Bucket + ", src keyname=" + srcKeyName)
+		destKeyName := destKeyNamePrefix + modelFile.ParenDir + modelFile.FileName
+		log.Info("Dest key name=" + destKeyName)
+		err := storage.ObsCopyFile(setting.Bucket, srcKeyName, setting.Bucket, destKeyName)
 		if err != nil {
 			log.Info("copy failed.")
 		}
@@ -207,14 +212,13 @@ func ShowSingleModel(ctx *context.Context) {
 		ctx.ServerError("GetObsListObject:", err)
 		return
 	} else {
-		log.Info("get model file,size=" + fmt.Sprint(models))
+		log.Info("get model file,size=" + fmt.Sprint(len(models)))
 	}
 
 	ctx.Data["Dirs"] = models
 	ctx.Data["task"] = task
 	ctx.Data["ID"] = id
 	ctx.HTML(200, tplModelManageDownload)
-
 }
 
 func ShowModelPageInfo(ctx *context.Context) {
diff --git a/templates/repo/modelmanage/download.tmpl b/templates/repo/modelmanage/download.tmpl
index 495e2e371..235529859 100644
--- a/templates/repo/modelmanage/download.tmpl
+++ b/templates/repo/modelmanage/download.tmpl
@@ -18,7 +18,7 @@
           <div class="dir list">
              <a class="title" href="{{$.RepoLink}}/modelmanage/downloadall?id={{.ID}}">
                   下载所有
-            </a>
+             </a>
             {{if .Dirs}}
                 <table id="repo-files-table" class="ui single line table">
                   <tbody>