diff --git a/kernel/go.mod b/kernel/go.mod index c605a9b0d..a9bf77f91 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -36,7 +36,7 @@ require ( github.com/panjf2000/ants/v2 v2.6.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/radovskyb/watcher v1.0.7 - github.com/siyuan-note/dejavu v0.0.0-20221031154617-cd9466fb0785 + github.com/siyuan-note/dejavu v0.0.0-20221031160243-9bedc511961f github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20220916025349-3ac6e75522da github.com/siyuan-note/filelock v0.0.0-20221007163134-7e64809023ef diff --git a/kernel/go.sum b/kernel/go.sum index 21566afb1..456a6d624 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -355,6 +355,8 @@ github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYED github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/siyuan-note/dejavu v0.0.0-20221031154617-cd9466fb0785 h1:ZvlTJvaYf7AsME4cR+qMZVxvRff23KRlkqtiHc/W4wI= github.com/siyuan-note/dejavu v0.0.0-20221031154617-cd9466fb0785/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= +github.com/siyuan-note/dejavu v0.0.0-20221031160243-9bedc511961f h1:pN62Dby/Pt4gejJqNJJxWW72LXBKP1ZF2f1vYh7L5Wg= +github.com/siyuan-note/dejavu v0.0.0-20221031160243-9bedc511961f/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= 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-20220916025349-3ac6e75522da h1:/jNhl7LC+9BhkWvNxuJDdsNfA/2wvfuj9mqWx4CbV90= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 518a734f8..e04fce17e 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -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, diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 9321cc35d..a1b895d73 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -29,7 +29,7 @@ import ( "github.com/88250/gulu" "github.com/dustin/go-humanize" - "github.com/siyuan-note/dejavu/transport" + "github.com/siyuan-note/dejavu/cloud" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/treenode" @@ -378,7 +378,7 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) { } func formatErrorMsg(err error) string { - if errors.Is(err, transport.ErrCloudAuthFailed) { + if errors.Is(err, cloud.ErrCloudAuthFailed) { return Conf.Language(31) + " v" + util.Ver }