xing/wp-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

optimize code and fix bug

Browse Source
This commit is contained in:
xing 2024-04-10 23:48:23 +08:00
parent 9af2257650
commit a8d1dcdd5b
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/plugins/digest.go
View File

@ -9,6 +9,7 @@ import (
"github.com/fthvgb1/wp-go/cache/cachemanager" "github.com/fthvgb1/wp-go/cache/cachemanager"
"github.com/fthvgb1/wp-go/cache/reload" "github.com/fthvgb1/wp-go/cache/reload"
"github.com/fthvgb1/wp-go/helper" "github.com/fthvgb1/wp-go/helper"
"github.com/fthvgb1/wp-go/helper/maps"
str "github.com/fthvgb1/wp-go/helper/strings" str "github.com/fthvgb1/wp-go/helper/strings"
"github.com/fthvgb1/wp-go/plugin/digest" "github.com/fthvgb1/wp-go/plugin/digest"
"github.com/fthvgb1/wp-go/safety" "github.com/fthvgb1/wp-go/safety"
@ -74,12 +75,10 @@ func ParseDigestConf(c DigestConfig) map[string]digest.SpecialSolveConf {
if tag == "" { if tag == "" {
continue continue
} }
ec := make(map[rune]digest.SpecialSolve)
specialTags := make(map[string]digest.SpecialSolve)
tag = str.Join("<", tag) tag = str.Join("<", tag)
var ec map[rune]digest.SpecialSolve
var specialTags map[string]digest.SpecialSolve
if len(item.EscapeCharacter) > 0 { if len(item.EscapeCharacter) > 0 {
ec = make(map[rune]digest.SpecialSolve)
specialTags = make(map[string]digest.SpecialSolve)
for _, esc := range item.EscapeCharacter { for _, esc := range item.EscapeCharacter {
for _, i := range esc.Character { for _, i := range esc.Character {
s := []rune(i) s := []rune(i)
@ -106,12 +105,21 @@ func ParseDigestConf(c DigestConfig) map[string]digest.SpecialSolveConf {
} }
} }
} }
specialSolve[tag] = digest.SpecialSolveConf{ v, ok := specialSolve[tag]
Num: item.Num, if !ok {
ChuckOvered: item.ChuckOvered, specialSolve[tag] = digest.SpecialSolveConf{
EscapeCharacter: ec, Num: item.Num,
Tags: specialTags, ChuckOvered: item.ChuckOvered,
EscapeCharacter: ec,
Tags: specialTags,
}
continue
} }
v.Num = item.Num
v.ChuckOvered = item.ChuckOvered
v.EscapeCharacter = maps.Merge(v.EscapeCharacter, ec)
v.Tags = maps.Merge(v.Tags, specialTags)
specialSolve[tag] = v
} }
} }
return specialSolve return specialSolve

18
plugin/digest/digest.go
View File

@ -184,17 +184,17 @@ func CustomizeHtml(content string, limit int, m map[string]SpecialSolveConf) (st
} }
currentTags := allTags[len(allTags)-1] currentTags := allTags[len(allTags)-1]
mm, ok := m[currentTags] mm, ok := m[currentTags]
if !ok { if !ok || len(mm.EscapeCharacter) < 1 {
count++ count++
} else if len(mm.EscapeCharacter) > 0 { continue
if n, ok := mm.EscapeCharacter[runeContent[i]]; ok { }
if (count+n.Num) > limit && n.ChuckOvered { if n, ok := mm.EscapeCharacter[runeContent[i]]; ok {
break if (count+n.Num) > limit && n.ChuckOvered {
} break
count += n.Num
} else {
count++
} }
count += n.Num
} else {
count++
} }
} }
if i > runeTotal { if i > runeTotal {