🎨 Improve exporting HTML/Word

This commit is contained in:
Daniel 2024-12-21 17:28:50 +08:00
parent 776b4fd6ee
commit b5bfbbe14a
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 32 additions and 3 deletions

View file

@ -65,6 +65,8 @@ func InitAppearance() {
}
Conf.Save()
util.InitEmojiChars()
}
func containTheme(name string, themes []*conf.AppearanceTheme) bool {

View file

@ -962,7 +962,7 @@ func MissingAssets() (ret []string) {
func emojisInTree(tree *parse.Tree) (ret []string) {
if icon := tree.Root.IALAttr("icon"); "" != icon {
if !strings.Contains(icon, "://") && !strings.HasPrefix(icon, "api/icon/") {
if !strings.Contains(icon, "://") && !strings.HasPrefix(icon, "api/icon/") && !util.NativeEmojiChars[icon] {
ret = append(ret, "/emojis/"+icon)
}
}

View file

@ -752,7 +752,6 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string
to := filepath.Join(savePath, emoji)
if err := filelock.Copy(from, to); err != nil {
logging.LogErrorf("copy emojis from [%s] to [%s] failed: %s", from, to, err)
return
}
}
@ -910,7 +909,6 @@ func ExportHTML(id, savePath string, pdf, image, keepFold, merge bool) (name, do
to := filepath.Join(savePath, emoji)
if err := filelock.Copy(from, to); err != nil {
logging.LogErrorf("copy emojis from [%s] to [%s] failed: %s", from, to, err)
return
}
}
}

View file

@ -17,10 +17,13 @@
package util
import (
"os"
"path/filepath"
"regexp"
"unicode"
"github.com/88250/gulu"
"github.com/siyuan-note/logging"
)
func ContainsCJK(text string) bool {
@ -65,3 +68,29 @@ func RemoveInvalid(text string) (ret string) {
ret = gulu.Str.RemovePUA(ret)
return
}
var NativeEmojiChars = map[string]bool{}
func InitEmojiChars() {
builtConfPath := filepath.Join(AppearancePath, "emojis", "conf.json")
data, err := os.ReadFile(builtConfPath)
if err != nil {
logging.LogErrorf("read emojis conf.json failed: %s", err)
return
}
var conf []map[string]interface{}
if err = gulu.JSON.UnmarshalJSON(data, &conf); err != nil {
logging.LogErrorf("unmarshal emojis conf.json failed: %s", err)
return
}
for _, emoji := range conf {
items := emoji["items"].([]interface{})
for _, item := range items {
e := item.(map[string]interface{})
NativeEmojiChars[e["unicode"].(string)] = true
}
}
return
}