Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 10:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Refresh doc tree after data sync https://github.com/siyuan-note/siyuan/issues/12860

Browse source
This commit is contained in:
Daniel 2024-10-21 09:36:56 +08:00
parent eef7e47ce1
commit f7f48b23f6
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/model/repository.go
View file

@ -1550,6 +1550,7 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
if 0 < len(upsertRootIDs) || 0 < len(removeRootIDs) { if 0 < len(upsertRootIDs) || 0 < len(removeRootIDs) {
util.BroadcastByType("main", "syncMergeResult", 0, "", util.BroadcastByType("main", "syncMergeResult", 0, "",
map[string]interface{}{"upsertRootIDs": upsertRootIDs, "removeRootIDs": removeRootIDs}) map[string]interface{}{"upsertRootIDs": upsertRootIDs, "removeRootIDs": removeRootIDs})
util.PushReloadFiletree()
} }
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
@ -1951,23 +1952,23 @@ func buildCloudConf() (ret *cloud.Conf, err error) {
ret.Endpoint = util.GetCloudSyncServer() ret.Endpoint = util.GetCloudSyncServer()
case conf.ProviderS3: case conf.ProviderS3:
ret.S3 = &cloud.ConfS3{ ret.S3 = &cloud.ConfS3{
Endpoint: Conf.Sync.S3.Endpoint, Endpoint: Conf.Sync.S3.Endpoint,
AccessKey: Conf.Sync.S3.AccessKey, AccessKey: Conf.Sync.S3.AccessKey,
SecretKey: Conf.Sync.S3.SecretKey, SecretKey: Conf.Sync.S3.SecretKey,
Bucket: Conf.Sync.S3.Bucket, Bucket: Conf.Sync.S3.Bucket,
Region: Conf.Sync.S3.Region, Region: Conf.Sync.S3.Region,
PathStyle: Conf.Sync.S3.PathStyle, PathStyle: Conf.Sync.S3.PathStyle,
SkipTlsVerify: Conf.Sync.S3.SkipTlsVerify, SkipTlsVerify: Conf.Sync.S3.SkipTlsVerify,
Timeout: Conf.Sync.S3.Timeout, Timeout: Conf.Sync.S3.Timeout,
ConcurrentReqs: Conf.Sync.S3.ConcurrentReqs, ConcurrentReqs: Conf.Sync.S3.ConcurrentReqs,
} }
case conf.ProviderWebDAV: case conf.ProviderWebDAV:
ret.WebDAV = &cloud.ConfWebDAV{ ret.WebDAV = &cloud.ConfWebDAV{
Endpoint: Conf.Sync.WebDAV.Endpoint, Endpoint: Conf.Sync.WebDAV.Endpoint,
Username: Conf.Sync.WebDAV.Username, Username: Conf.Sync.WebDAV.Username,
Password: Conf.Sync.WebDAV.Password, Password: Conf.Sync.WebDAV.Password,
SkipTlsVerify: Conf.Sync.WebDAV.SkipTlsVerify, SkipTlsVerify: Conf.Sync.WebDAV.SkipTlsVerify,
Timeout: Conf.Sync.WebDAV.Timeout, Timeout: Conf.Sync.WebDAV.Timeout,
ConcurrentReqs: Conf.Sync.WebDAV.ConcurrentReqs, ConcurrentReqs: Conf.Sync.WebDAV.ConcurrentReqs,
} }
default: default: