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

🎨 Sign in to use S3/WebDAV data sync https://github.com/siyuan-note/siyuan/issues/8779

Browse source
This commit is contained in:
Daniel 2023-07-21 20:45:56 +08:00
parent 38f15e5f59
commit fa6212a8b4
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
7 changed files with 76 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

65
kernel/model/repository.go
View file

@ -627,6 +627,19 @@ func DownloadCloudSnapshot(tag, id string) (err error) {
return
}
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
util.PushErrMsg(Conf.Language(29), 5000)
return
}
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
util.PushErrMsg(Conf.Language(214), 5000)
return
}
}
defer util.PushClearProgress()
var downloadFileCount, downloadChunkCount int
@ -656,6 +669,19 @@ func UploadCloudSnapshot(tag, id string) (err error) {
return
}
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
util.PushErrMsg(Conf.Language(29), 5000)
return
}
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
util.PushErrMsg(Conf.Language(214), 5000)
return
}
}
util.PushEndlessProgress(Conf.Language(116))
defer util.PushClearProgress()
uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBarAndProgress})
@ -689,6 +715,19 @@ func RemoveCloudRepoTag(tag string) (err error) {
return
}
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
util.PushErrMsg(Conf.Language(29), 5000)
return
}
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
util.PushErrMsg(Conf.Language(214), 5000)
return
}
}
err = repo.RemoveCloudRepoTag(tag)
if nil != err {
return
@ -708,6 +747,19 @@ func GetCloudRepoTagSnapshots() (ret []*dejavu.Log, err error) {
return
}
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
util.PushErrMsg(Conf.Language(29), 5000)
return
}
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
util.PushErrMsg(Conf.Language(214), 5000)
return
}
}
logs, err := repo.GetCloudRepoTagLogs(map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar})
if nil != err {
return
@ -731,6 +783,19 @@ func GetCloudRepoSnapshots(page int) (ret []*dejavu.Log, pageCount, totalCount i
return
}
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
util.PushErrMsg(Conf.Language(29), 5000)
return
}
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
util.PushErrMsg(Conf.Language(214), 5000)
return
}
}
if 1 > page {
page = 1
}

6
kernel/model/sync.go
View file

@ -234,11 +234,7 @@ func checkSync(boot, exit, byHand bool) bool {
if !IsSubscriber() {
return false
}
case conf.ProviderWebDAV:
if !IsThirdPartySyncPaid() {
return false
}
case conf.ProviderS3:
case conf.ProviderWebDAV, conf.ProviderS3:
if !IsThirdPartySyncPaid() {
return false
}