From 8d77634807d6bbec42c038f0b2dde0401c9f46aa Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 6 Jan 2023 18:34:44 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E8=BF=9B=E7=A8=8B=E6=A0=B9=E6=8D=AE=20Electron=20?= =?UTF-8?q?=E4=B8=BB=E8=BF=9B=E7=A8=8B=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA=20Fix=20https://github.com?= =?UTF-8?q?/siyuan-note/siyuan/issues/7002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/conf.go | 6 +++++- kernel/model/process.go | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 00c9a09dc..842f246a0 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -675,7 +675,6 @@ func clearWorkspaceTemp() { os.RemoveAll(filepath.Join(util.TempDir, "import")) os.RemoveAll(filepath.Join(util.TempDir, "repo")) os.RemoveAll(filepath.Join(util.TempDir, "os")) - os.RemoveAll(filepath.Join(util.DataDir, "assets", ".siyuan", "assets.json")) // 退出时自动删除超过 7 天的安装包 https://github.com/siyuan-note/siyuan/issues/6128 install := filepath.Join(util.TempDir, "install") @@ -720,5 +719,10 @@ func clearWorkspaceTemp() { } } + // 老版本遗留文件清理 + os.RemoveAll(filepath.Join(util.DataDir, "assets", ".siyuan", "assets.json")) + os.RemoveAll(filepath.Join(util.WorkspaceDir, "backup")) + os.RemoveAll(filepath.Join(util.WorkspaceDir, "sync")) + logging.LogInfof("cleared workspace temp") } diff --git a/kernel/model/process.go b/kernel/model/process.go index 8785a9b69..0f73e8165 100644 --- a/kernel/model/process.go +++ b/kernel/model/process.go @@ -42,7 +42,6 @@ func HookDesktopUIProc() { return } - time.Sleep(30 * time.Second) uiProcNames := []string{"siyuan", "electron"} existUIProc := false for range time.Tick(7 * time.Second) {