Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve iCloud path checking (#9066)

Browse source 
* fix: icloud目录判断范围太广

icloud 目录匹配包含导致全局无法正常使用

* fix: 提交修复icloud判断问题

1.删除无用的else块
2.完善simpleCheckIcloudPath方法 添加 桌面 和文档的路径判断
This commit is contained in:
Jason Zhang 2023-08-29 21:01:36 +08:00 • committed by GitHub
parent 2bfefbe885
commit b0b7b6f17a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/electron/init.html
View file

@ -421,17 +421,45 @@
// macOS 端对工作空间放置在 iCloud 路径下做检查 https://github.com/siyuan-note/siyuan/issues/7747
const path = require('path')
const iCloudRoot = path.join(decodeURIComponent(getSearch('home')), 'Library', 'Mobile Documents')
const allFiles = walk(iCloudRoot)
const homePath = decodeURIComponent(getSearch('home'))
const absPathLower = absPath.toLowerCase()
for (const file of allFiles) {
if (-1 < absPathLower.indexOf(file.toLowerCase())) {
return true
const iCloudRoot = path.join(homePath, 'Library', 'Mobile Documents')
if(!simpleCheckIcloudPath(absPath, homePath)){
//简单判断无法通过则复杂验证
const allFiles = walk(iCloudRoot)
for (const file of allFiles) {
if (-1 < absPathLower.indexOf(file.toLowerCase())) {
return true
}
}
}
}
return false
}
//简单判断Icloud同步目录
//不允许 为桌面 文档 和 icloud 文件夹 和软链接
const simpleCheckIcloudPath =(absPath, homePath)=>{
const fs = require('fs')
let stat = fs.lstatSync(absPath)
if(stat.isSymbolicLink()){
return false
}
const path = require('path')
const absPathLower = absPath.toLowerCase()
const iCloudRoot = path.join(homePath, 'Library', 'Mobile Documents')
if(absPathLower.startsWith(iCloudRoot.toLowerCase())){
return false
}
const documentsRoot = path.join(homePath, 'Documents')
if (absPathLower.startsWith(documentsRoot.toLowerCase())) {
return false
}
const desktopRoot = path.join(homePath, 'Desktop')
if (absPathLower.startsWith(desktopRoot.toLowerCase())) {
return false
}
return true
}
const walk = (dir, files = []) => {
let dirFiles;
const fs = require('fs')
@ -440,7 +468,6 @@
console.log("dir [" + dir + "] not exists")
return files
}
dirFiles = fs.readdirSync(dir)
} catch (e) {
console.error("read dir [" + dir + "] failed: ", e)
@ -459,9 +486,8 @@
if (files.includes(dir + path.sep + f)) {
continue
}
walk(dir + path.sep + f, files)
} else {
files.push(dir + path.sep + f)
walk(dir + path.sep + f, files)
}
}
return files