broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

got regex replace and regex match working

Browse source
This commit is contained in:
BroodjeAap 2022-08-11 18:27:43 +00:00
parent 1c3c38b614
commit 42dc916966
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scraping.go
View file

@ -32,7 +32,6 @@ func getGroupResult(group *FilterGroup) []string {
for _, resultString := range resultStrings { for _, resultString := range resultStrings {
getFilterResult(resultString, &filter, &newStrings) getFilterResult(resultString, &filter, &newStrings)
} }
log.Println(len(resultStrings), len(newStrings))
resultStrings = newStrings resultStrings = newStrings
newStrings = nil newStrings = nil
} }
@ -53,7 +52,7 @@ func getFilterResult(s string, filter *Filter, newStrings *[]string) {
{ {
getFilterResultReplace(s, filter, newStrings) getFilterResultReplace(s, filter, newStrings)
} }
case filter.Type == "regex": case filter.Type == "match":
{ {
getFilterResultMatch(s, filter, newStrings) getFilterResultMatch(s, filter, newStrings)
} }
@ -99,12 +98,12 @@ func getFilterResultCSS(s string, filter *Filter, newStrings *[]string) {
} }
func getFilterResultReplace(s string, filter *Filter, newStrings *[]string) { func getFilterResultReplace(s string, filter *Filter, newStrings *[]string) {
regex, err := regexp.Compile(filter.From) r, err := regexp.Compile(filter.From)
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return return
} }
*newStrings = append(*newStrings, regex.ReplaceAllString(filter.From, filter.To)) *newStrings = append(*newStrings, r.ReplaceAllString(s, filter.To))
} }
func getFilterResultMatch(s string, filter *Filter, newStrings *[]string) { func getFilterResultMatch(s string, filter *Filter, newStrings *[]string) {
@ -113,7 +112,10 @@ func getFilterResultMatch(s string, filter *Filter, newStrings *[]string) {
log.Print(err) log.Print(err)
return return
} }
*newStrings = append(*newStrings, r.ReplaceAllString(s, filter.To)) for _, str := range r.FindAllString(s, -1) {
*newStrings = append(*newStrings, str)
}
} }
func getFilterResultSubstring(s string, filter *Filter, newStrings *[]string) { func getFilterResultSubstring(s string, filter *Filter, newStrings *[]string) {