This commit is contained in:
Liang Ding 2022-11-01 00:05:42 +08:00
parent ea89f6a78a
commit dc1afe1a46
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 11 additions and 9 deletions

View file

@ -34,8 +34,8 @@ import (
"github.com/88250/gulu"
"github.com/dustin/go-humanize"
"github.com/siyuan-note/dejavu"
"github.com/siyuan-note/dejavu/cloud"
"github.com/siyuan-note/dejavu/entity"
"github.com/siyuan-note/dejavu/transport"
"github.com/siyuan-note/encryption"
"github.com/siyuan-note/eventbus"
"github.com/siyuan-note/httpclient"
@ -809,17 +809,17 @@ func resetRepository(repo *dejavu.Repo) (index *entity.Index, err error) {
}
func newRepository() (ret *dejavu.Repo, err error) {
transportConf, err := buildRepoTransportConf()
cloudConf, err := buildCloudConf()
if nil != err {
return
}
// TODO: 数据同步支持接入第三方对象存储服务 https://github.com/siyuan-note/siyuan/issues/6426
siyuanTransport := &transport.SiYuan{Conf: transportConf}
cloudSiYuan := &cloud.SiYuan{Conf: cloudConf}
ignoreLines := getIgnoreLines()
ignoreLines = append(ignoreLines, "/.siyuan/conf.json") // 忽略旧版同步配置
ret, err = dejavu.NewRepo(util.DataDir, util.RepoDir, util.HistoryDir, util.TempDir, Conf.Repo.Key, ignoreLines, siyuanTransport)
ret, err = dejavu.NewRepo(util.DataDir, util.RepoDir, util.HistoryDir, util.TempDir, Conf.Repo.Key, ignoreLines, cloudSiYuan)
if nil != err {
logging.LogErrorf("init data repo failed: %s", err)
}
@ -998,7 +998,7 @@ func subscribeEvents() {
})
}
func buildRepoTransportConf() (ret *transport.Conf, err error) {
func buildCloudConf() (ret *cloud.Conf, err error) {
if !IsValidCloudDirName(Conf.Sync.CloudName) {
logging.LogWarnf("invalid cloud repo name, rename it to [main]")
Conf.Sync.CloudName = "main"
@ -1011,7 +1011,7 @@ func buildRepoTransportConf() (ret *transport.Conf, err error) {
token = Conf.User.UserToken
}
ret = &transport.Conf{
ret = &cloud.Conf{
Dir: Conf.Sync.CloudName,
UserID: userId,
Token: token,