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

more efficient higher/lower than last

Browse source
This commit is contained in:
BroodjeAap 2023-01-15 11:11:07 +00:00
parent ec4f16e274
commit aa8ceebd79
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scraping.go
View file

@ -749,16 +749,15 @@ func getFilterResultConditionDiff(filter *Filter, db *gorm.DB) {
func getFilterResultConditionLowerLast(filter *Filter, db *gorm.DB) { func getFilterResultConditionLowerLast(filter *Filter, db *gorm.DB) {
var previousOutput FilterOutput var previousOutput FilterOutput
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)
lastValue, lastValueErr := strconv.ParseFloat(previousOutput.Value, 64)
if lastValueErr != nil {
filter.log("Could not convert previous value to number all will pass: '", previousOutput.Value, "'")
}
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 { } else {
lastValue, err := strconv.ParseFloat(previousOutput.Value, 64)
if err != nil {
filter.log("Could not convert previous value to number: '", previousOutput.Value, "'")
continue
}
number, err := strconv.ParseFloat(result, 64) number, err := strconv.ParseFloat(result, 64)
if err != nil { if err != nil {
if len(result) > 50 { if len(result) > 50 {
@ -768,7 +767,7 @@ func getFilterResultConditionLowerLast(filter *Filter, db *gorm.DB) {
} }
continue continue
} }
if number < lastValue { if lastValueErr != nil || number < lastValue {
filter.Results = append(filter.Results, result) filter.Results = append(filter.Results, result)
} }
} }
@ -783,7 +782,6 @@ func getFilterResultConditionLowest(filter *Filter, db *gorm.DB) {
for _, previousOutput := range previousOutputs { for _, previousOutput := range previousOutputs {
number, err := strconv.ParseFloat(previousOutput.Value, 64) number, err := strconv.ParseFloat(previousOutput.Value, 64)
if err != nil { if err != nil {
filter.log("Could not convert result to number: '", previousOutput.Value, "'")
continue continue
} }
if number < lowest { if number < lowest {
@ -840,16 +838,15 @@ func getFilterResultConditionLowerThan(filter *Filter) {
func getFilterResultConditionHigherLast(filter *Filter, db *gorm.DB) { func getFilterResultConditionHigherLast(filter *Filter, db *gorm.DB) {
var previousOutput FilterOutput var previousOutput FilterOutput
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)
lastValue, lastValueErr := strconv.ParseFloat(previousOutput.Value, 64)
if lastValueErr != nil {
filter.log("Could not convert previous value to number all will pass: '", previousOutput.Value, "'")
}
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 { } else {
lastValue, err := strconv.ParseFloat(previousOutput.Value, 64)
if err != nil {
filter.log("Could not convert previous value to number: '", previousOutput.Value, "'")
continue
}
number, err := strconv.ParseFloat(result, 64) number, err := strconv.ParseFloat(result, 64)
if err != nil { if err != nil {
if len(result) > 50 { if len(result) > 50 {
@ -859,7 +856,7 @@ func getFilterResultConditionHigherLast(filter *Filter, db *gorm.DB) {
} }
continue continue
} }
if number > lastValue { if lastValueErr != nil || number > lastValue {
filter.Results = append(filter.Results, result) filter.Results = append(filter.Results, result)
} }
} }
@ -875,7 +872,6 @@ func getFilterResultConditionHighest(filter *Filter, db *gorm.DB) {
for _, previousOutput := range previousOutputs { for _, previousOutput := range previousOutputs {
number, err := strconv.ParseFloat(previousOutput.Value, 64) number, err := strconv.ParseFloat(previousOutput.Value, 64)
if err != nil { if err != nil {
filter.log("Could not convert result to number: '", previousOutput.Value, "'")
continue continue
} }
if number > highest { if number > highest {