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

fixes in scraping

Browse source
This commit is contained in:
BroodjeAap 2022-11-21 19:13:22 +00:00
parent a497fe06b9
commit 18df244895
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scraping.go
View file

@ -31,6 +31,7 @@ func processFilters(filters []Filter, web *Web, watch *Watch, debug bool) {
filters = filters[1:] filters = filters[1:]
if filter.Type == "store" { if filter.Type == "store" {
storeFilters = append(storeFilters, *filter) storeFilters = append(storeFilters, *filter)
processedMap[filter.ID] = true
continue continue
} }
var allParentsProcessed = true var allParentsProcessed = true
@ -527,6 +528,7 @@ func storeFilterResult(filter *Filter, db *gorm.DB, debug bool) {
if debug { if debug {
return return
} }
filterOutputs := make([]FilterOutput, 1) filterOutputs := make([]FilterOutput, 1)
for _, parent := range filter.Parents { for _, parent := range filter.Parents {
for _, result := range parent.Results { for _, result := range parent.Results {
@ -546,7 +548,6 @@ func getFilterResultConditionDiff(filter *Filter, db *gorm.DB) {
db.Model(&FilterOutput{}).Order("time desc").Where("watch_id = ? AND name = ?", filter.WatchID, filter.Var2).Limit(1).Find(&previousOutput) db.Model(&FilterOutput{}).Order("time desc").Where("watch_id = ? AND name = ?", filter.WatchID, filter.Var2).Limit(1).Find(&previousOutput)
for _, parent := range filter.Parents { for _, parent := range filter.Parents {
for _, result := range parent.Results { for _, result := range parent.Results {
if previousOutput.WatchID == 0 { if previousOutput.WatchID == 0 {
filter.Results = append(filter.Results, result) filter.Results = append(filter.Results, result)
} else if previousOutput.Value != result { } else if previousOutput.Value != result {
@ -752,11 +753,13 @@ func notifyFilter(filters []Filter, filter *Filter, watch *Watch, web *Web, debu
} }
if !haveResults { if !haveResults {
filter.log("No output from previous filter(s), need at least 1 to 'trigger'") filter.log("No output from previous filter(s), need at least 1 to 'trigger'")
log.Println("No output from previous filter(s), need at least 1 to 'trigger'")
return return
} }
tmpl, err := template.New("notify").Parse(filter.Var1) tmpl, err := template.New("notify").Parse(filter.Var1)
if err != nil { if err != nil {
filter.log("Could not parse template: ", err) filter.log("Could not parse template: ", err)
log.Println("Could not parse template: ", err)
return return
} }