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

moved 'store' filter processing after all other filters

Browse source
This commit is contained in:
BroodjeAap 2022-11-13 12:21:15 +00:00
parent 9fcd2c4fa2
commit d572fc5452
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scraping.go
View file

@ -23,9 +23,16 @@ import (
func processFilters(filters []Filter, web *Web, watch *Watch, debug bool) { func processFilters(filters []Filter, web *Web, watch *Watch, debug bool) {
allFilters := filters allFilters := filters
processedMap := make(map[uint]bool, len(filters)) processedMap := make(map[uint]bool, len(filters))
// collect 'store' filters so we can process them separately at the end
storeFilters := make([]Filter, 5)
for len(filters) > 0 { for len(filters) > 0 {
filter := &filters[0] filter := &filters[0]
filters = filters[1:] filters = filters[1:]
if filter.Type == "store" {
storeFilters = append(storeFilters, *filter)
continue
}
var allParentsProcessed = true var allParentsProcessed = true
for _, parent := range filter.Parents { for _, parent := range filter.Parents {
if _, contains := processedMap[parent.ID]; !contains && parent.Type != "cron" { if _, contains := processedMap[parent.ID]; !contains && parent.Type != "cron" {
@ -40,6 +47,11 @@ func processFilters(filters []Filter, web *Web, watch *Watch, debug bool) {
getFilterResult(allFilters, filter, watch, web, debug) getFilterResult(allFilters, filter, watch, web, debug)
processedMap[filter.ID] = true processedMap[filter.ID] = true
} }
// process the store filters last
for _, storeFilter := range storeFilters {
getFilterResult(allFilters, &storeFilter, watch, web, debug)
}
} }
func getFilterResult(filters []Filter, filter *Filter, watch *Watch, web *Web, debug bool) { func getFilterResult(filters []Filter, filter *Filter, watch *Watch, web *Web, debug bool) {