From 55a4107017592e2aa9ed5f9c3c2ab456b678b421 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 16 Jun 2022 15:25:39 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=B8=8B=E8=BD=BD=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=8A=A5=E9=94=99=20Fix=20https://github.com?= =?UTF-8?q?/siyuan-note/siyuan/issues/5201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/osssync.go | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/kernel/model/osssync.go b/kernel/model/osssync.go index f1ce43f7c..742b826e8 100644 --- a/kernel/model/osssync.go +++ b/kernel/model/osssync.go @@ -172,15 +172,23 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil return } - // 将云端索引文件临时保存一下,后面下载数据时如果部分成功,需要用索引文件恢复部分成功的文件 syncDirUpsertWorkspaceData() - data, err := gulu.JSON.MarshalJSON(cloudFileList) - if nil != err { - return - } - tmpSyncDir := filepath.Join(util.TempDir, "sync") - tmpIndex := filepath.Join(tmpSyncDir, "index.json") - if err = os.WriteFile(tmpIndex, data, 0644); nil != err { - return + if "backup" != cloudDirPath { + // 将云端索引文件临时保存一下,后面下载数据时如果部分成功,需要用索引文件恢复部分成功的文件 syncDirUpsertWorkspaceData() + + var data []byte + data, err = gulu.JSON.MarshalJSON(cloudFileList) + if nil != err { + return + } + tmpSyncDir := filepath.Join(util.TempDir, "sync") + err = os.MkdirAll(tmpSyncDir, 0755) + if nil != err { + return + } + tmpIndex := filepath.Join(tmpSyncDir, "index.json") + if err = os.WriteFile(tmpIndex, data, 0644); nil != err { + return + } } localRemoves, cloudFetches, err := localUpsertRemoveListOSS(localDirPath, cloudFileList)