Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 23:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ 云端支持多个数据仓库目录 Fix https://github.com/siyuan-note/siyuan/issues/5335

Browse source
This commit is contained in:
Liang Ding 2022-07-05 00:30:47 +08:00
parent ce516e41fb
commit 114d85431f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 62 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

44
kernel/model/sync.go
View file

@ -35,6 +35,7 @@ import (
"github.com/88250/gulu"
"github.com/dustin/go-humanize"
gitignore "github.com/sabhiram/go-gitignore"
"github.com/siyuan-note/dejavu"
"github.com/siyuan-note/encryption"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/siyuan/kernel/cache"
@ -1150,9 +1151,16 @@ func CreateCloudSyncDir(name string) (err error) {
return errors.New(Conf.Language(37))
}
err = createCloudSyncDirOSS(name)
if nil != err {
return
if Conf.Sync.UseDataRepo {
var cloudInfo *dejavu.CloudInfo
cloudInfo, err = buildCloudInfo()
if nil != err {
return
}
err = dejavu.CreateCloudRepo(name, cloudInfo)
} else {
err = createCloudSyncDirOSS(name)
}
return
}
@ -1165,7 +1173,18 @@ func RemoveCloudSyncDir(name string) (err error) {
return
}
err = removeCloudDirPath("sync/" + name)
if Conf.Sync.UseDataRepo {
var cloudInfo *dejavu.CloudInfo
cloudInfo, err = buildCloudInfo()
if nil != err {
return
}
err = dejavu.RemoveCloudRepo(name, cloudInfo)
} else {
err = removeCloudDirPath("sync/" + name)
}
if nil != err {
return
}
@ -1179,8 +1198,23 @@ func RemoveCloudSyncDir(name string) (err error) {
func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) {
syncDirs = []*Sync{}
var dirs []map[string]interface{}
var size int64
if Conf.Sync.UseDataRepo {
var cloudInfo *dejavu.CloudInfo
cloudInfo, err = buildCloudInfo()
if nil != err {
return
}
dirs, size, err = dejavu.GetCloudRepos(cloudInfo)
} else {
dirs, size, err = listCloudSyncDirOSS()
}
if nil != err {
return
}
dirs, size, err := listCloudSyncDirOSS()
for _, d := range dirs {
dirSize := int64(d["size"].(float64))
syncDirs = append(syncDirs, &Sync{