Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 23:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 Windows 端部分系统上内核崩溃 https://github.com/siyuan-note/siyuan/issues/7806

Browse source
This commit is contained in:
Liang Ding 2023-03-28 18:48:40 +08:00
parent aab3d88a7d
commit d55af3966d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/util/runtime.go
View file

@ -303,17 +303,21 @@ func existAvailabilityStatus(workspaceAbsPath string) bool {
// 改进 Windows 端第三方同步盘检测 https://github.com/siyuan-note/siyuan/issues/7777 // 改进 Windows 端第三方同步盘检测 https://github.com/siyuan-note/siyuan/issues/7777
defer logging.Recover() defer logging.Recover()
ole.CoInitialize(0)
defer ole.CoUninitialize()
dataAbsPath := filepath.Join(workspaceAbsPath, "data") checkAbsPath := filepath.Join(workspaceAbsPath, "data")
dir, file := filepath.Split(dataAbsPath) if !gulu.File.IsExist(checkAbsPath) {
checkAbsPath = workspaceAbsPath
if !gulu.File.IsExist(dataAbsPath) { }
dataAbsPath = workspaceAbsPath if !gulu.File.IsExist(checkAbsPath) {
logging.LogWarnf("check path [%s] not exist", checkAbsPath)
return false return false
} }
logging.LogInfof("check workspace [%s] availability status", checkAbsPath)
ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
defer ole.CoUninitialize()
dir, file := filepath.Split(checkAbsPath)
unknown, err := oleutil.CreateObject("Shell.Application") unknown, err := oleutil.CreateObject("Shell.Application")
if nil != err { if nil != err {
logging.LogWarnf("create shell application failed: %s", err) logging.LogWarnf("create shell application failed: %s", err)
@ -339,6 +343,10 @@ func existAvailabilityStatus(workspaceAbsPath string) bool {
return false return false
} }
fileObj := result.ToIDispatch() fileObj := result.ToIDispatch()
if nil == fileObj {
logging.LogWarnf("call shell [ParseName] file is nil [%s]", checkAbsPath)
return false
}
result, err = oleutil.CallMethod(folderObj, "GetDetailsOf", fileObj, 303) result, err = oleutil.CallMethod(folderObj, "GetDetailsOf", fileObj, 303)
if nil != err { if nil != err {
@ -357,7 +365,7 @@ func existAvailabilityStatus(workspaceAbsPath string) bool {
if strings.Contains(status, "sync") || strings.Contains(status, "同步") || if strings.Contains(status, "sync") || strings.Contains(status, "同步") ||
strings.Contains(status, "available on this device") || strings.Contains(status, "在此设备上可用") || strings.Contains(status, "available on this device") || strings.Contains(status, "在此设备上可用") ||
strings.Contains(status, "available when online") || strings.Contains(status, "联机时可用") { strings.Contains(status, "available when online") || strings.Contains(status, "联机时可用") {
logging.LogErrorf("[%s] third party sync status [%s]", dataAbsPath, status) logging.LogErrorf("[%s] third party sync status [%s]", checkAbsPath, status)
return true return true
} }
return false return false