From 3aced60e8cc814b965670c153dda93b3b352359c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 7 Jun 2022 18:27:51 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20`=E5=B7=A5=E4=BD=9C=E7=A9=BA?= =?UTF-8?q?=E9=97=B4/incremental/`=20=E6=96=87=E4=BB=B6=E5=A4=B9=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0=20`=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4/temp?= =?UTF-8?q?/incremental/`=20Fix=20https://github.com/siyuan-note/siyuan/is?= =?UTF-8?q?sues/5119?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/system.go | 4 ++-- kernel/model/backup.go | 4 ++-- kernel/model/conf.go | 1 + kernel/model/sync.go | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/api/system.go b/kernel/api/system.go index 12336d3d3..bddd3288c 100644 --- a/kernel/api/system.go +++ b/kernel/api/system.go @@ -347,12 +347,12 @@ func setE2EEPasswd(c *gin.Context) { ret.Msg = err.Error() return } - if err := os.RemoveAll(filepath.Join(util.WorkspaceDir, "incremental")); nil != err { + if err := os.RemoveAll(filepath.Join(util.TempDir, "incremental")); nil != err { ret.Code = -1 ret.Msg = err.Error() return } - if err := os.MkdirAll(filepath.Join(util.WorkspaceDir, "incremental"), 0755); nil != err { + if err := os.MkdirAll(filepath.Join(util.TempDir, "incremental"), 0755); nil != err { ret.Code = -1 ret.Msg = err.Error() return diff --git a/kernel/model/backup.go b/kernel/model/backup.go index 4eab44826..ddf95bd3c 100644 --- a/kernel/model/backup.go +++ b/kernel/model/backup.go @@ -379,7 +379,7 @@ func UploadBackup() (err error) { var pathJSON = fmt.Sprintf("%x", md5.Sum([]byte("paths.json"))) // 6952277a5a37c17aa6a7c6d86cd507b1 func encryptDataDir(passwd string) (encryptedDataDir string, err error) { - encryptedDataDir = filepath.Join(util.WorkspaceDir, "incremental", "backup-encrypt") + encryptedDataDir = filepath.Join(util.TempDir, "incremental", "backup-encrypt") if err = os.RemoveAll(encryptedDataDir); nil != err { return } @@ -511,7 +511,7 @@ func encryptDataDir(passwd string) (encryptedDataDir string, err error) { } func decryptDataDir(passwd string) (decryptedDataDir string, err error) { - decryptedDataDir = filepath.Join(util.WorkspaceDir, "incremental", "backup-decrypt") + decryptedDataDir = filepath.Join(util.TempDir, "incremental", "backup-decrypt") if err = os.RemoveAll(decryptedDataDir); nil != err { return } diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 987af968c..f698c40da 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -537,6 +537,7 @@ func clearWorkspaceTemp() { os.RemoveAll(filepath.Join(util.TempDir, "bazaar")) os.RemoveAll(filepath.Join(util.TempDir, "export")) os.RemoveAll(filepath.Join(util.TempDir, "import")) + os.RemoveAll(filepath.Join(util.WorkspaceDir, "incremental")) // `工作空间/incremental/` 文件夹移动到 `工作空间/temp/incremental/` https://github.com/siyuan-note/siyuan/issues/5119 tmps, err := filepath.Glob(filepath.Join(util.TempDir, "*.tmp")) if nil != err { diff --git a/kernel/model/sync.go b/kernel/model/sync.go index e70e1a598..892e0efab 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -663,7 +663,7 @@ func genCloudIndex(localDirPath string, excludes map[string]bool, calcHash bool) func recoverSyncData(metaPath, indexPath string, modified map[string]bool) (decryptedDataDir string, upsertFiles []string, err error) { passwd := Conf.E2EEPasswd - decryptedDataDir = filepath.Join(util.WorkspaceDir, "incremental", "sync-decrypt") + decryptedDataDir = filepath.Join(util.TempDir, "incremental", "sync-decrypt") if err = os.RemoveAll(decryptedDataDir); nil != err { return } @@ -772,7 +772,7 @@ func recoverSyncData(metaPath, indexPath string, modified map[string]bool) (decr } func prepareSyncData(passwd string, unchangedDataList map[string]bool) (encryptedDataDir string, upsertList map[string]bool, err error) { - encryptedDataDir = filepath.Join(util.WorkspaceDir, "incremental", "sync-encrypt") + encryptedDataDir = filepath.Join(util.TempDir, "incremental", "sync-encrypt") if err = os.RemoveAll(encryptedDataDir); nil != err { return }