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

🎨 公测云端同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5337

Browse source
This commit is contained in:
Liang Ding 2022-07-06 10:55:39 +08:00
parent 5e8ca37d75
commit fc5895091a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/config/repos.ts
View file

@ -518,8 +518,16 @@ ${passwordHTML}
target.parentElement.setAttribute("disabled", "disabled");
fetchPost("/api/sync/getSyncDirection", {name: target.getAttribute("data-name")}, (response) => {
target.parentElement.removeAttribute("disabled");
const name = target.getAttribute("data-name");
if (40 == response.code) { // 使用数据仓库同步不需要对比同步方向
fetchPost("/api/sync/setCloudSyncDir", {name}, () => {
window.siyuan.config.sync.cloudName = name;
getCloudList(true);
});
return
}
confirmDialog(window.siyuan.languages.confirm, response.msg, () => {
const name = target.getAttribute("data-name");
fetchPost("/api/sync/setCloudSyncDir", {name}, () => {
window.siyuan.config.sync.cloudName = name;
getCloudList(true);

6
kernel/model/sync.go
View file

@ -1354,7 +1354,7 @@ func pathSha256Short(p, sep string) string {
return buf.String()
}
func GetSyncDirection(cloudDirName string) (code int, msg string) { // 0：失败，10：上传，20：下载，30：一致
func GetSyncDirection(cloudDirName string) (code int, msg string) { // 0：失败，10：上传，20：下载，30：一致，40：使用数据仓库同步
if !IsSubscriber() {
return
}
@ -1367,6 +1367,10 @@ func GetSyncDirection(cloudDirName string) (code int, msg string) { // 0：失
return
}
if Conf.Sync.UseDataRepo {
return 40, ""
}
syncConf, err := getWorkspaceDataConf()
if nil != err {
msg = fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))