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

🎨 Refactor symlink read

Browse source
This commit is contained in:
Daniel 2023-09-13 08:58:25 +08:00
parent 736256e26a
commit d997382644
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/export.go
View file

@ -528,7 +528,7 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string
if util.IsSymlinkPath(util.AppearancePath) { if util.IsSymlinkPath(util.AppearancePath) {
// Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173 // Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173
var readErr error var readErr error
appearancePath, readErr = os.Readlink(util.AppearancePath) appearancePath, readErr = filepath.EvalSymlinks(util.AppearancePath)
if nil != readErr { if nil != readErr {
logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr) logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr)
return return
@ -678,7 +678,7 @@ func ExportHTML(id, savePath string, pdf, image, keepFold, merge bool) (name, do
if util.IsSymlinkPath(util.AppearancePath) { if util.IsSymlinkPath(util.AppearancePath) {
// Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173 // Support for symlinked theme folder when exporting HTML https://github.com/siyuan-note/siyuan/issues/9173
var readErr error var readErr error
appearancePath, readErr = os.Readlink(util.AppearancePath) appearancePath, readErr = filepath.EvalSymlinks(util.AppearancePath)
if nil != readErr { if nil != readErr {
logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr) logging.LogErrorf("readlink [%s] failed: %s", util.AppearancePath, readErr)
return return

11
kernel/util/working.go
View file

@ -392,15 +392,10 @@ func initMime() {
func GetDataAssetsAbsPath() (ret string) { func GetDataAssetsAbsPath() (ret string) {
ret = filepath.Join(DataDir, "assets") ret = filepath.Join(DataDir, "assets")
var err error if IsSymlinkPath(ret) {
stat, err := os.Lstat(ret)
if nil != err {
logging.LogErrorf("stat assets failed: %s", err)
return
}
if 0 != stat.Mode()&os.ModeSymlink {
// 跟随符号链接 https://github.com/siyuan-note/siyuan/issues/5480 // 跟随符号链接 https://github.com/siyuan-note/siyuan/issues/5480
ret, err = os.Readlink(ret) var err error
ret, err = filepath.EvalSymlinks(ret)
if nil != err { if nil != err {
logging.LogErrorf("read assets link failed: %s", err) logging.LogErrorf("read assets link failed: %s", err)
} }