Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-27 10:46:09 +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

27
kernel/model/repository.go
View file

@ -272,13 +272,9 @@ func syncRepo(boot, exit, byHand bool) {
}
start := time.Now()
cloudInfo := &dejavu.CloudInfo{
Dir: "main",
UserID: Conf.User.UserId,
Token: Conf.User.UserToken,
LimitSize: int64(Conf.User.UserSiYuanRepoSize - Conf.User.UserSiYuanAssetSize),
ProxyURL: Conf.System.NetworkProxy.String(),
Server: util.AliyunServer,
cloudInfo, err := buildCloudInfo()
if nil != err {
return
}
syncContext := map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBar}
@ -471,3 +467,20 @@ func contextPushMsg(context map[string]interface{}, msg string) {
util.PushEndlessProgress(msg)
}
}
func buildCloudInfo() (ret *dejavu.CloudInfo, err error) {
if nil == Conf.User || "" == Conf.Sync.CloudName {
err = errors.New("invalid cloud info")
return
}
ret = &dejavu.CloudInfo{
Dir: Conf.Sync.CloudName,
UserID: Conf.User.UserId,
Token: Conf.User.UserToken,
LimitSize: int64(Conf.User.UserSiYuanRepoSize - Conf.User.UserSiYuanAssetSize),
ProxyURL: Conf.System.NetworkProxy.String(),
Server: util.AliyunServer,
}
return
}