ProjectHentai/alist
6
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat!: replace regex package (close #5755)

Browse Source
This commit is contained in:
Andy Hsu
2023-12-31 15:03:25 +08:00
parent 6b8f35e7fa
commit 478470f609
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/model/obj.go
View File

@ -2,13 +2,13 @@ package model
import (
"io"
"regexp"
"sort"
"strings"
"time"
"github.com/alist-org/alist/v3/pkg/http_range"
"github.com/alist-org/alist/v3/pkg/utils"
"github.com/dlclark/regexp2"
mapset "github.com/deckarep/golang-set/v2"
@ -169,7 +169,7 @@ func NewObjMerge() *ObjMerge {
}
type ObjMerge struct {
regs []*regexp.Regexp
regs []*regexp2.Regexp
set mapset.Set[string]
}
@ -190,7 +190,7 @@ func (om *ObjMerge) insertObjs(objs []Obj, objs_ ...Obj) []Obj {
func (om *ObjMerge) clickObj(obj Obj) bool {
for _, reg := range om.regs {
if reg.MatchString(obj.GetName()) {
if isMatch, _ := reg.MatchString(obj.GetName()); isMatch {
return false
}
}
@ -199,9 +199,9 @@ func (om *ObjMerge) clickObj(obj Obj) bool {
func (om *ObjMerge) InitHideReg(hides string) {
rs := strings.Split(hides, "\n")
om.regs = make([]*regexp.Regexp, 0, len(rs))
om.regs = make([]*regexp2.Regexp, 0, len(rs))
for _, r := range rs {
om.regs = append(om.regs, regexp.MustCompile(r))
om.regs = append(om.regs, regexp2.MustCompile(r, regexp2.None))
}
}