Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-18 04:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ 数据同步支持接入第三方 WebDAV 服务 https://github.com/siyuan-note/siyuan/issues/6446

Browse source
This commit is contained in:
Liang Ding 2022-11-02 23:33:05 +08:00
parent d7f6456424
commit b6a1512105
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 87 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/model/conf.go
View file

@ -242,18 +242,18 @@ func InitConf() {
if 0 == Conf.Sync.Mode {
Conf.Sync.Mode = 1
}
if nil == Conf.Sync.OSS {
Conf.Sync.OSS = &conf.OSS{}
if nil == Conf.Sync.Qiniu {
Conf.Sync.Qiniu = &conf.Qiniu{}
}
endpoint := Conf.Sync.OSS.Endpoint
endpoint = strings.TrimSpace(endpoint)
if !strings.HasPrefix(endpoint, "http://") && !strings.HasPrefix(endpoint, "https://") {
endpoint = "http://" + endpoint
Conf.Sync.Qiniu.Endpoint = util.NormalizeEndpoint(Conf.Sync.Qiniu.Endpoint)
if nil == Conf.Sync.S3 {
Conf.Sync.S3 = &conf.S3{}
}
if !strings.HasSuffix(endpoint, "/") {
endpoint = endpoint + "/"
Conf.Sync.S3.Endpoint = util.NormalizeEndpoint(Conf.Sync.S3.Endpoint)
if nil == Conf.Sync.WebDAV {
Conf.Sync.WebDAV = &conf.WebDAV{}
}
Conf.Sync.OSS.Endpoint = endpoint
Conf.Sync.WebDAV.Endpoint = util.NormalizeEndpoint(Conf.Sync.WebDAV.Endpoint)
if nil == Conf.Api {
Conf.Api = conf.NewAPI()

36
kernel/model/repository.go
View file

@ -44,6 +44,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
"github.com/studio-b12/gowebdav"
)
func init() {
@ -822,6 +823,13 @@ func newRepository() (ret *dejavu.Repo, err error) {
cloudRepo = &cloud.SiYuan{BaseCloud: &cloud.BaseCloud{Conf: cloudConf}}
case conf.ProviderQiniu:
cloudRepo = &cloud.Qiniu{BaseCloud: &cloud.BaseCloud{Conf: cloudConf}}
case conf.ProviderWebDAV:
webdavClient := gowebdav.NewClient(cloudConf.Endpoint, cloudConf.Username, cloudConf.Password)
a := cloudConf.Username + ":" + cloudConf.Password
auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(a))
webdavClient.SetHeader("Authorization", auth)
webdavClient.SetTimeout(30 * time.Second)
cloudRepo = &cloud.WebDAV{BaseCloud: &cloud.BaseCloud{Conf: cloudConf}, Client: webdavClient}
default:
err = fmt.Errorf("unknown cloud provider [%d]", Conf.Sync.Provider)
return
@ -832,6 +840,7 @@ func newRepository() (ret *dejavu.Repo, err error) {
ret, err = dejavu.NewRepo(util.DataDir, util.RepoDir, util.HistoryDir, util.TempDir, Conf.Repo.Key, ignoreLines, cloudRepo)
if nil != err {
logging.LogErrorf("init data repo failed: %s", err)
return
}
return
}
@ -1029,14 +1038,29 @@ func buildCloudConf() (ret *cloud.Conf, err error) {
AvailableSize: availableSize,
Server: util.AliyunServer,
Endpoint: Conf.Sync.OSS.Endpoint,
AccessKey: Conf.Sync.OSS.AccessKey,
SecretKey: Conf.Sync.OSS.SecretKey,
Bucket: Conf.Sync.OSS.Bucket,
Region: Conf.Sync.OSS.Region,
// S3
AccessKey: Conf.Sync.S3.AccessKey,
SecretKey: Conf.Sync.S3.SecretKey,
Bucket: Conf.Sync.S3.Bucket,
Region: Conf.Sync.S3.Region,
// WebDAV
Username: Conf.Sync.WebDAV.Username,
Password: Conf.Sync.WebDAV.Password,
}
if conf.ProviderSiYuan == Conf.Sync.Provider {
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
ret.Endpoint = "https://siyuan-data.b3logfile.com/"
case conf.ProviderQiniu:
ret.Endpoint = Conf.Sync.Qiniu.Endpoint
case conf.ProviderS3:
ret.Endpoint = Conf.Sync.S3.Endpoint
case conf.ProviderWebDAV:
ret.Endpoint = Conf.Sync.WebDAV.Endpoint
default:
err = fmt.Errorf("invalid provider [%d]", Conf.Sync.Provider)
return
}
return
}