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

🎨 开源云端同步服务实现 https://github.com/siyuan-note/siyuan/issues/6445

Browse source
This commit is contained in:
Liang Ding 2022-11-02 20:15:46 +08:00
parent 46cec73e2a
commit f3d7568b52
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/model/sync.go
View file

@ -30,6 +30,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/siyuan-note/dejavu/cloud"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/conf"
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
@ -69,7 +70,11 @@ func BootSyncData() {
util.IncBootProgress(3, "Syncing data from the cloud...")
BootSyncSucc = 0
if !IsSubscriber() || !Conf.Sync.Enabled || "" == Conf.Sync.CloudName || !cloud.IsValidCloudDirName(Conf.Sync.CloudName) {
if !Conf.Sync.Enabled || !cloud.IsValidCloudDirName(Conf.Sync.CloudName) {
return
}
if !IsSubscriber() && conf.ProviderSiYuan == Conf.Sync.Provider {
return
}
@ -123,17 +128,25 @@ func SyncData(boot, exit, byHand bool) {
if exit {
ExitSyncSucc = 0
}
if !IsSubscriber() || !Conf.Sync.Enabled || "" == Conf.Sync.CloudName {
if !Conf.Sync.Enabled {
if byHand {
if "" == Conf.Sync.CloudName {
util.PushMsg(Conf.Language(123), 5000)
} else if !Conf.Sync.Enabled {
util.PushMsg(Conf.Language(124), 5000)
}
util.PushMsg(Conf.Language(124), 5000)
}
return
}
if !cloud.IsValidCloudDirName(Conf.Sync.CloudName) {
if byHand {
util.PushMsg(Conf.Language(123), 5000)
}
return
}
if !IsSubscriber() && conf.ProviderSiYuan == Conf.Sync.Provider {
return
}
if !cloud.IsValidCloudDirName(Conf.Sync.CloudName) {
return
}