Sfoglia il codice sorgente

:art: Support downloading cloud data snapshots to local on demand https://github.com/siyuan-note/siyuan/issues/8057

Liang Ding 2 anni fa
parent
commit
f3de2e9292
4 ha cambiato i file con 11 aggiunte e 8 eliminazioni
  1. 4 3
      kernel/api/repo.go
  2. 1 1
      kernel/go.mod
  3. 4 2
      kernel/go.sum
  4. 2 2
      kernel/model/repository.go

+ 4 - 3
kernel/api/repo.go

@@ -186,9 +186,9 @@ func getCloudRepoSnapshots(c *gin.Context) {
 		return
 	}
 
-	marker := arg["marker"].(string)
+	page := int(arg["page"].(float64))
 
-	snapshots, nextMarker, err := model.GetCloudRepoSnapshots(marker)
+	snapshots, pageCount, totalCount, err := model.GetCloudRepoSnapshots(page)
 	if nil != err {
 		ret.Code = -1
 		ret.Msg = err.Error()
@@ -197,7 +197,8 @@ func getCloudRepoSnapshots(c *gin.Context) {
 
 	ret.Data = map[string]interface{}{
 		"snapshots":  snapshots,
-		"nextMarker": nextMarker,
+		"pageCount":  pageCount,
+		"totalCount": totalCount,
 	}
 }
 

+ 1 - 1
kernel/go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/radovskyb/watcher v1.0.7
 	github.com/sashabaranov/go-gpt3 v1.4.0
 	github.com/shirou/gopsutil/v3 v3.23.2
-	github.com/siyuan-note/dejavu v0.0.0-20230421090246-20abbaa745d6
+	github.com/siyuan-note/dejavu v0.0.0-20230421124852-3096ef1f7c1a
 	github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
 	github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b
 	github.com/siyuan-note/filelock v0.0.0-20230417044524-125ee78b5cc9

+ 4 - 2
kernel/go.sum

@@ -277,8 +277,10 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
-github.com/siyuan-note/dejavu v0.0.0-20230421090246-20abbaa745d6 h1:s2BtWsabaCqDlS1D5A7zx63OCzpKjCW6Ke6rwpYhXCg=
-github.com/siyuan-note/dejavu v0.0.0-20230421090246-20abbaa745d6/go.mod h1:R3PnH4Y9/0TollG4g0tX7jGW7lvhNIEL9hYi5zQ4+sI=
+github.com/siyuan-note/dejavu v0.0.0-20230421122923-cb79db5323e0 h1:iaqx8D2somQMoY5khaUTeUvL8j5geCKNiXH2cGvGSSU=
+github.com/siyuan-note/dejavu v0.0.0-20230421122923-cb79db5323e0/go.mod h1:R3PnH4Y9/0TollG4g0tX7jGW7lvhNIEL9hYi5zQ4+sI=
+github.com/siyuan-note/dejavu v0.0.0-20230421124852-3096ef1f7c1a h1:peB9ArOWWcRim5D76DdFMEMEbj4rBtClnRCnw+BmWMA=
+github.com/siyuan-note/dejavu v0.0.0-20230421124852-3096ef1f7c1a/go.mod h1:R3PnH4Y9/0TollG4g0tX7jGW7lvhNIEL9hYi5zQ4+sI=
 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
 github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b h1:828lTUW2C0uNiolODqoACu7J8sDUzswD4Xo04mUombg=

+ 2 - 2
kernel/model/repository.go

@@ -672,7 +672,7 @@ func GetCloudRepoTagSnapshots() (ret []*dejavu.Log, err error) {
 	return
 }
 
-func GetCloudRepoSnapshots(marker string) (ret []*dejavu.Log, nextMarker string, err error) {
+func GetCloudRepoSnapshots(page int) (ret []*dejavu.Log, pageCount, totalCount int, err error) {
 	ret = []*dejavu.Log{}
 	if 1 > len(Conf.Repo.Key) {
 		err = errors.New(Conf.Language(26))
@@ -684,7 +684,7 @@ func GetCloudRepoSnapshots(marker string) (ret []*dejavu.Log, nextMarker string,
 		return
 	}
 
-	logs, nextMarker, err := repo.GetCloudRepoLogs(marker)
+	logs, pageCount, totalCount, err := repo.GetCloudRepoLogs(page)
 	if nil != err {
 		return
 	}