🎨 公测云端同步数据仓库 #5337

siyuan-note · Jul 6, 2022 · fc58950 · fc58950
1 parent 5e8ca37
commit fc58950
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts
@@ -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);

diff --git a/kernel/model/sync.go b/kernel/model/sync.go
@@ -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))