From ee9ba3fcf044af73910a0d7619f1df27a537da39 Mon Sep 17 00:00:00 2001 From: xing Date: Tue, 9 Apr 2024 23:51:45 +0800 Subject: [PATCH] revise digest add more complex config --- app/plugins/digest.go | 93 +++++++++++++++++----- config.example.yaml | 47 +++++++++-- helper/html/html.go | 7 ++ plugin/digest/digest.go | 167 ++++++++++++++++++++++++++++++++++------ 4 files changed, 265 insertions(+), 49 deletions(-) diff --git a/app/plugins/digest.go b/app/plugins/digest.go index 4d775e6..a4ad493 100644 --- a/app/plugins/digest.go +++ b/app/plugins/digest.go @@ -22,6 +22,24 @@ var more = regexp.MustCompile("") var removeWpBlock = regexp.MustCompile("") +type DigestConfig struct { + DigestWordCount int `yaml:"digestWordCount"` + DigestAllowTag string `yaml:"digestAllowTag"` + DigestRegex string `yaml:"digestRegex"` + DigestTagOccupyNum []struct { + Tag string `yaml:"tag"` + Num int `yaml:"num"` + ChuckOvered bool `yaml:"chuckOvered"` + EscapeCharacter []struct { + Tags string `yaml:"tags"` + Character []string `yaml:"character"` + Num int `yaml:"num"` + ChuckOvered bool `yaml:"chuckOvered"` + } `yaml:"escapeCharacter"` + } `yaml:"digestTagOccupyNum"` + specialSolve map[string]digest.SpecialSolveConf +} + var digestConfig *safety.Var[DigestConfig] func InitDigestCache() { @@ -37,15 +55,57 @@ func InitDigestCache() { c.DigestAllowTag = config.GetConfig().DigestAllowTag return c } - if len(c.DigestTagOccupyNum) > 0 { - c.tagNum = map[string]int{} - for _, item := range c.DigestTagOccupyNum { - tags := strings.Split(item.Tag, "<") - for _, tag := range tags { - if tag == "" { - continue + if c.DigestRegex != "" { + digest.SetQutos(c.DigestRegex) + } + if len(c.DigestTagOccupyNum) <= 1 { + return c + } + c.specialSolve = map[string]digest.SpecialSolveConf{} + for _, item := range c.DigestTagOccupyNum { + tags := strings.Split(strings.ReplaceAll(item.Tag, " ", ""), "<") + for _, tag := range tags { + if tag == "" { + continue + } + tag = str.Join("<", tag) + var ec map[rune]digest.SpecialSolve + var specialTags map[string]digest.SpecialSolve + if len(item.EscapeCharacter) > 0 { + ec = make(map[rune]digest.SpecialSolve) + for _, esc := range item.EscapeCharacter { + for _, i := range esc.Character { + s := []rune(i) + if len(s) == 1 { + ec[s[0]] = digest.SpecialSolve{ + Num: esc.Num, + ChuckOvered: esc.ChuckOvered, + } + } + } + if esc.Tags == "" { + continue + } + tagss := strings.Split(strings.ReplaceAll(esc.Tags, " ", ""), "<") + specialTags = make(map[string]digest.SpecialSolve) + for _, t := range tagss { + if t == "" { + continue + } + t = str.Join("<", t) + specialTags[t] = digest.SpecialSolve{ + Num: esc.Num, + ChuckOvered: esc.ChuckOvered, + } + } } - c.tagNum[str.Join("<", tag)] = item.Num + + } + c.specialSolve[tag] = digest.SpecialSolveConf{ + Num: item.Num, + ChuckOvered: item.ChuckOvered, + EscapeCharacter: ec, + Tags: specialTags, } } } @@ -53,16 +113,6 @@ func InitDigestCache() { }, "digestConfig") } -type DigestConfig struct { - DigestWordCount int `yaml:"digestWordCount"` - DigestAllowTag string `yaml:"digestAllowTag"` - DigestTagOccupyNum []struct { - Tag string `yaml:"tag"` - Num int `yaml:"num"` - } `yaml:"digestTagOccupyNum"` - tagNum map[string]int -} - func RemoveWpBlock(s string) string { return removeWpBlock.ReplaceAllString(s, "") } @@ -94,7 +144,12 @@ func Digests(content string, id uint64, limit int, fn func(id uint64, content, c if length <= limit { return content } - content, closeTag = digest.Html(content, limit, c.tagNum) + if len(c.specialSolve) > 0 { + content, closeTag = digest.CustomizeHtml(content, limit, c.specialSolve) + } else { + content, closeTag = digest.Html(content, limit) + } + if fn == nil { return PostsMore(id, content, closeTag) } diff --git a/config.example.yaml b/config.example.yaml index f2a2033..af91112 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -67,13 +67,46 @@ digestWordCount: 300 # 摘要允许的标签 默认为