瀏覽代碼

:recycle: `工作空间/incremental/` 文件夹移动到 `工作空间/temp/incremental/` Fix https://github.com/siyuan-note/siyuan/issues/5119

Liang Ding 3 年之前
父節點
當前提交
3aced60e8c
共有 4 個文件被更改,包括 7 次插入6 次删除
  1. 2 2
      kernel/api/system.go
  2. 2 2
      kernel/model/backup.go
  3. 1 0
      kernel/model/conf.go
  4. 2 2
      kernel/model/sync.go

+ 2 - 2
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

+ 2 - 2
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
 	}

+ 1 - 0
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 {

+ 2 - 2
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
 	}