🎨 云端同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5142

app/appearance/langs/en_US.json

@@ -1,4 +1,5 @@
 {
+  "dataRepo": "Data repo",
   "newSubDoc": "Create sub doc",
   "newDocBelow": "Create doc below",
   "newDocAbove": "Create doc above",

app/appearance/langs/es_ES.json

@@ -1,4 +1,5 @@
 {
+  "dataRepo": "Repositorio de datos",
   "newSubDoc": "Crear subdocumento",
   "newDocBelow": "Crear documento a continuación",
   "newDocAbove": "Crear documento arriba",

app/appearance/langs/fr_FR.json

@@ -1,4 +1,5 @@
 {
+  "dataRepo": "Dépôt de données",
   "newSubDoc": "Créer un sous-doc",
   "newDocBelow": "Créer un document ci-dessous",
   "newDocAbove": "Créer un document ci-dessus",

app/appearance/langs/zh_CHT.json

@@ -1,4 +1,5 @@
 {
+  "dataRepo": "數據倉庫",
   "newSubDoc": "新建子文檔",
   "newDocBelow": "在下方新建文檔",
   "newDocAbove": "在上方新建文檔",

app/appearance/langs/zh_CN.json

@@ -1,4 +1,5 @@
 {
+  "dataRepo": "数据仓库",
   "newSubDoc": "新建子文档",
   "newDocBelow": "在下方新建文档",
   "newDocAbove": "在上方新建文档",

app/src/config/repos.ts

@@ -56,6 +56,7 @@ const renderCloudBackup = () => {
         <ul class="b3-list">
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sync}<span class="b3-list-item__meta">${response.data.sync ? response.data.sync.hSize : "0B"}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.backup}<span class="b3-list-item__meta">${response.data.backup ? response.data.backup.hSize : "0B"}</span></li>
+            <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.dataRepo}<span class="b3-list-item__meta">${response.data.hRepoSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;"><a href="https://ld246.com/settings/file?type=3" target="_blank">${window.siyuan.languages.cdn}</a><span class="b3-list-item__meta">${response.data.hAssetSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.total}<span class="b3-list-item__meta">${response.data.hSize}</span></li>
             <li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sizeLimit}<span class="b3-list-item__meta">${response.data.hTotalSize}</span></li>

kernel/api/backup.go

@@ -106,7 +106,7 @@ func getCloudSpace(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 
-	sync, backup, size, assetSize, totalSize, err := model.GetCloudSpace()
+	sync, backup, size, assetSize, repoSize, totalSize, err := model.GetCloudSpace()
 	if nil != err {
 		ret.Code = 1
 		ret.Msg = err.Error()
@@ -121,6 +121,7 @@ func getCloudSpace(c *gin.Context) {
 		"sync":                 sync,
 		"backup":               backup,
 		"hAssetSize":           assetSize,
+		"hRepoSize":            repoSize,
 		"hSize":                size,
 		"hTotalSize":           totalSize,
 		"hTrafficUploadSize":   hTrafficUploadSize,

kernel/model/backup.go

@@ -59,9 +59,7 @@ func RemoveCloudBackup() (err error) {
 }
 
 func getCloudAvailableBackupSize() (size int64, err error) {
-	var sync map[string]interface{}
+	sync, _, assetSize, repoSize, err := getCloudSpaceOSS()
-	var assetSize int64
-	sync, _, assetSize, err = getCloudSpaceOSS()
 	if nil != err {
 		return
 	}
@@ -70,16 +68,15 @@ func getCloudAvailableBackupSize() (size int64, err error) {
 	if nil != sync {
 		syncSize = int64(sync["size"].(float64))
 	}
-	size = int64(Conf.User.UserSiYuanRepoSize) - syncSize - assetSize
+	size = int64(Conf.User.UserSiYuanRepoSize) - syncSize - assetSize - repoSize
 	return
 }
 
-func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize string, err error) {
+func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hRepoSize, hTotalSize string, err error) {
-	var sync, backup map[string]interface{}
+	sync, backup, assetSize, repoSize, err := getCloudSpaceOSS()
-	var assetSize int64
-	sync, backup, assetSize, err = getCloudSpaceOSS()
 	if nil != err {
-		return nil, nil, "", "", "", errors.New(Conf.Language(30) + " " + err.Error())
+		err = errors.New(Conf.Language(30) + " " + err.Error())
+		return
 	}
 
 	var totalSize, syncSize, backupSize int64
@@ -103,8 +100,9 @@ func GetCloudSpace() (s *Sync, b *Backup, hSize, hAssetSize, hTotalSize string,
 		HSize:   humanize.Bytes(uint64(backupSize)),
 		Updated: backupUpdated,
 	}
-	totalSize = syncSize + backupSize + assetSize
+	totalSize = syncSize + backupSize + assetSize + repoSize
 	hAssetSize = humanize.Bytes(uint64(assetSize))
+	hRepoSize = humanize.Bytes(uint64(repoSize))
 	hSize = humanize.Bytes(uint64(totalSize))
 	hTotalSize = byteCountSI(int64(Conf.User.UserSiYuanRepoSize))
 	return

kernel/model/osssync.go

@@ -38,7 +38,7 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/util"
 )
 
-func getCloudSpaceOSS() (sync, backup map[string]interface{}, assetSize int64, err error) {
+func getCloudSpaceOSS() (sync, backup map[string]interface{}, assetSize, repoSize int64, err error) {
 	result := map[string]interface{}{}
 	request := httpclient.NewCloudRequest(Conf.System.NetworkProxy.String())
 	resp, err := request.
@@ -47,7 +47,8 @@ func getCloudSpaceOSS() (sync, backup map[string]interface{}, assetSize int64, e
 		Post(util.AliyunServer + "/apis/siyuan/data/getSiYuanWorkspace?uid=" + Conf.User.UserId)
 	if nil != err {
 		util.LogErrorf("get cloud space failed: %s", err)
-		return nil, nil, 0, ErrFailedToConnectCloudServer
+		err = ErrFailedToConnectCloudServer
+		return
 	}
 
 	if 401 == resp.StatusCode {
@@ -58,13 +59,15 @@ func getCloudSpaceOSS() (sync, backup map[string]interface{}, assetSize int64, e
 	code := result["code"].(float64)
 	if 0 != code {
 		util.LogErrorf("get cloud space failed: %s", result["msg"])
-		return nil, nil, 0, errors.New(result["msg"].(string))
+		err = errors.New(result["msg"].(string))
+		return
 	}
 
 	data := result["data"].(map[string]interface{})
 	sync = data["sync"].(map[string]interface{})
 	backup = data["backup"].(map[string]interface{})
 	assetSize = int64(data["assetSize"].(float64))
+	repoSize = int64(data["repoSize"].(float64))
 	return
 }