Browse Source

:art: Improve upload assets tip

Daniel 1 year ago
parent
commit
b9f1da33f0

+ 1 - 1
app/appearance/langs/en_US.json

@@ -1200,7 +1200,7 @@
     "38": "Too many keywords mentioned [%d], adjust if necessary [Settings - Search - Backlink Mentions - Keyword Limit]",
     "39": "Deleting index %s",
     "40": "Inserting index %s",
-    "41": "Upload completed",
+    "41": "Upload completed [%d]",
     "42": "The setting is complete, the application will be closed automatically, please restart later...",
     "43": "The maximum storage capacity of cloud space [%s] has been exceeded, and data upload cannot continue",
     "44": "Parse template failed: %s",

+ 1 - 1
app/appearance/langs/es_ES.json

@@ -1200,7 +1200,7 @@
     "38": "Demasiadas palabras clave mencionadas [%d], ajústelas si es necesario [Configuración - Búsqueda - Menciones de backlinks - Límite de palabras clave]",
     "39": "Eliminando índice %s",
     "40": "Insertando índice %s",
-    "41": "Carga completada",
+    "41": "Carga completada [%d]",
     "42": "La configuración se ha completado, la aplicación se cerrará automáticamente, por favor reinicie más tarde...",
     "43": "Se ha superado la capacidad máxima de almacenamiento del espacio en la nube [%s] y la carga de datos no puede continuar",
     "44": "El proceso de análisis de la plantilla ha fallado: %s",

+ 1 - 1
app/appearance/langs/fr_FR.json

@@ -1200,7 +1200,7 @@
     "38": "Trop de mots-clés mentionnés [%d], ajustez si nécessaire [Paramètres - Recherche - Mentions de backlink - Limite de mots-clés]",
     "39": "Suppression de l'index %s",
     "40": "Insertion de l'index %s",
-    "41": "Transfert complété",
+    "41": "Transfert complété [%d]",
     "42": "Le paramétrage est terminé, l'application se fermera automatiquement, merci de redémarrer plus tard...",
     "43": "La capacité de stockage maximale de l'espace cloud [%s] a été dépassée et le téléchargement des données ne peut pas continuer",
     "44": "L'analyse du template a échoué : %s",

+ 1 - 1
app/appearance/langs/zh_CHT.json

@@ -1200,7 +1200,7 @@
     "38": "提及關鍵字數量 [%d] 過多,如有需要可以調整 [設置 - 搜索 - 反連提及 - 關鍵字數量限制]",
     "39": "正在刪除索引 %s",
     "40": "正在插入索引 %s",
-    "41": "上傳完畢",
+    "41": "上傳完畢 [%d]",
     "42": "設置完成,即將自動關閉應用,請稍後重新啟動...",
     "43": "已超過雲端空間最大存儲容量 [%s],無法繼續上傳資料",
     "44": "範本解析失敗:%s",

+ 1 - 1
app/appearance/langs/zh_CN.json

@@ -1200,7 +1200,7 @@
     "38": "提及关键字数量 [%d] 过多,如有需要可以调整 [设置 - 搜索 - 反链提及 - 关键字数量限制]",
     "39": "正在删除索引 %s",
     "40": "正在插入索引 %s",
-    "41": "上传完毕",
+    "41": "上传完毕 [%d]",
     "42": "设置完成,即将自动关闭应用,请稍后重新启动...",
     "43": "已超过云端空间最大存储容量 [%s],无法继续上传数据",
     "44": "模板解析失败:%s",

+ 5 - 3
kernel/api/asset.go

@@ -17,6 +17,7 @@
 package api
 
 import (
+	"fmt"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -257,14 +258,15 @@ func uploadCloud(c *gin.Context) {
 	}
 
 	rootID := arg["id"].(string)
-	err := model.UploadAssets2Cloud(rootID)
+	count, err := model.UploadAssets2Cloud(rootID)
 	if nil != err {
 		ret.Code = -1
 		ret.Msg = err.Error()
 		ret.Data = map[string]interface{}{"closeTimeout": 3000}
-	} else {
-		util.PushMsg(model.Conf.Language(41), 3000)
+		return
 	}
+
+	util.PushMsg(fmt.Sprintf(model.Conf.Language(41), count), 3000)
 }
 
 func insertLocalAssets(c *gin.Context) {

+ 5 - 1
kernel/model/assets.go

@@ -509,13 +509,17 @@ func GetAssetAbsPath(relativePath string) (ret string, err error) {
 	return "", errors.New(fmt.Sprintf(Conf.Language(12), relativePath))
 }
 
-func UploadAssets2Cloud(rootID string) (err error) {
+func UploadAssets2Cloud(rootID string) (count int, err error) {
 	if !IsSubscriber() {
 		return
 	}
 
 	sqlAssets := sql.QueryRootBlockAssets(rootID)
 	err = uploadAssets2Cloud(sqlAssets, bizTypeUploadAssets)
+	if nil != err {
+		return
+	}
+	count = len(sqlAssets)
 	return
 }