Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 17:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Liang Ding 2023-04-21 20:50:24 +08:00
parent bec5fbc9cb
commit f3de2e9292
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/api/repo.go
View file

@ -186,9 +186,9 @@ func getCloudRepoSnapshots(c *gin.Context) {
return 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 { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -197,7 +197,8 @@ func getCloudRepoSnapshots(c *gin.Context) {
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"snapshots": snapshots, "snapshots": snapshots,
"nextMarker": nextMarker, "pageCount": pageCount,
"totalCount": totalCount,
} }
} }

2
kernel/go.mod
View file

@ -44,7 +44,7 @@ require (
github.com/radovskyb/watcher v1.0.7 github.com/radovskyb/watcher v1.0.7
github.com/sashabaranov/go-gpt3 v1.4.0 github.com/sashabaranov/go-gpt3 v1.4.0
github.com/shirou/gopsutil/v3 v3.23.2 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/encryption v0.0.0-20220713091850-5ecd92177b75
github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b
github.com/siyuan-note/filelock v0.0.0-20230417044524-125ee78b5cc9 github.com/siyuan-note/filelock v0.0.0-20230417044524-125ee78b5cc9

6
kernel/go.sum
View file

@ -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/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 h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= 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-20230421122923-cb79db5323e0 h1:iaqx8D2somQMoY5khaUTeUvL8j5geCKNiXH2cGvGSSU=
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/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 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= 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= github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b h1:828lTUW2C0uNiolODqoACu7J8sDUzswD4Xo04mUombg=

4
kernel/model/repository.go
View file

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