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

🎨 Workspace built-in Pandoc is no longer initialized after customizing Pandoc path https://github.com/siyuan-note/siyuan/issues/8377

Browse source
This commit is contained in:
Daniel 2023-05-28 11:54:48 +08:00
parent b39742f494
commit 78f2601471
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/util/pandoc.go
View file

@ -87,6 +87,24 @@ func initPandoc() {
} }
pandocDir := filepath.Join(TempDir, "pandoc") pandocDir := filepath.Join(TempDir, "pandoc")
if confPath := filepath.Join(ConfDir, "conf.json"); gulu.File.IsExist(confPath) {
// Workspace built-in Pandoc is no longer initialized after customizing Pandoc path https://github.com/siyuan-note/siyuan/issues/8377
if data, err := os.ReadFile(confPath); nil == err {
conf := map[string]interface{}{}
if err = gulu.JSON.UnmarshalJSON(data, &conf); nil == err && nil != conf["export"] {
export := conf["export"].(map[string]interface{})
if customPandocBinPath := export["pandocBin"].(string); !strings.HasPrefix(customPandocBinPath, pandocDir) {
if pandocVer := getPandocVer(customPandocBinPath); "" != pandocVer {
PandocBinPath = customPandocBinPath
logging.LogInfof("custom pandoc [ver=%s, bin=%s]", pandocVer, PandocBinPath)
return
}
}
}
}
}
if gulu.OS.IsWindows() { if gulu.OS.IsWindows() {
PandocBinPath = filepath.Join(pandocDir, "bin", "pandoc.exe") PandocBinPath = filepath.Join(pandocDir, "bin", "pandoc.exe")
} else if gulu.OS.IsDarwin() || gulu.OS.IsLinux() { } else if gulu.OS.IsDarwin() || gulu.OS.IsLinux() {