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

🎨 云端同步冲突时支持设置是否产生冲突文档 https://github.com/siyuan-note/siyuan/issues/6110

Browse source
This commit is contained in:
Liang Ding 2022-10-09 10:36:41 +08:00
parent 6e7e154a3c
commit 698f773ee2
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/conf/sync.go
View file

@ -17,17 +17,19 @@
package conf
type Sync struct {
CloudName string `json:"cloudName"` // 云端同步目录名称
Enabled bool `json:"enabled"` // 是否开启同步
Mode int `json:"mode"` // 同步模式，0：未设置（为兼容已有配置，initConf 函数中会转换为 1），1：自动，2：手动 https://github.com/siyuan-note/siyuan/issues/5089
Synced int64 `json:"synced"` // 最近同步时间
Stat string `json:"stat"` // 最近同步统计信息
CloudName string `json:"cloudName"` // 云端同步目录名称
Enabled bool `json:"enabled"` // 是否开启同步
Mode int `json:"mode"` // 同步模式，0：未设置（为兼容已有配置，initConf 函数中会转换为 1），1：自动，2：手动 https://github.com/siyuan-note/siyuan/issues/5089
Synced int64 `json:"synced"` // 最近同步时间
Stat string `json:"stat"` // 最近同步统计信息
GenerateConflictDoc bool `json:"generateConflictDoc"` // 云端同步冲突时是否生成冲突文档
}
func NewSync() *Sync {
return &Sync{
CloudName: "main",
Enabled: false,
Mode: 1,
CloudName: "main",
Enabled: false,
Mode: 1,
GenerateConflictDoc: false,
}
}