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

fixed some go-staticcheck warnings

Browse source
This commit is contained in:
BroodjeAap 2023-04-15 13:58:22 +00:00
parent ba39158fa2
commit 1e3608af6c
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
web/scraping.go
View file

@ -43,7 +43,7 @@ func ProcessFilters(filters []Filter, web *Web, watch *Watch, debug bool, schedu
// print out the name of the watch and schedule filter that called this function // print out the name of the watch and schedule filter that called this function
for _, filter := range filters { for _, filter := range filters {
if scheduleID != nil && filter.ID == *scheduleID { if scheduleID != nil && filter.ID == *scheduleID {
log.Println(fmt.Sprintf("Scheduled Watch for '%s', triggered by schedule '%s'", watch.Name, filter.Name)) log.Printf("Scheduled Watch for '%s', triggered by schedule '%s'", watch.Name, filter.Name)
} }
} }
@ -201,6 +201,10 @@ func getFilterResult(filters []Filter, filter *Filter, watch *Watch, web *Web, d
{ {
getFilterResultContains(filter) getFilterResultContains(filter)
} }
case filter.Type == "unique":
{
getFilterResultUnique(filter)
}
case filter.Type == "math": case filter.Type == "math":
{ {
switch { switch {
@ -767,9 +771,7 @@ func getFilterResultSubset(filter *Filter) {
results := make([]string, 0, numResults) results := make([]string, 0, numResults)
for _, parent := range filter.Parents { for _, parent := range filter.Parents {
for _, result := range parent.Results { results = append(results, parent.Results...)
results = append(results, result)
}
} }
substrings := strings.Split(filter.Var1, ",") substrings := strings.Split(filter.Var1, ",")
@ -848,6 +850,9 @@ func getFilterResultSubset(filter *Filter) {
// getFilterResultContains performs a regex contains on all the results of its parents // getFilterResultContains performs a regex contains on all the results of its parents
func getFilterResultContains(filter *Filter) { func getFilterResultContains(filter *Filter) {
r, err := regexp.Compile(filter.Var1) r, err := regexp.Compile(filter.Var1)
if err != nil {
filter.Log("Could not parse:", filter.Var1)
}
invert, err := strconv.ParseBool(filter.Var2) invert, err := strconv.ParseBool(filter.Var2)
if err != nil { if err != nil {
invert = false invert = false
@ -1165,15 +1170,13 @@ func getFilterResultConditionHighest(filter *Filter, db *gorm.DB) {
var previousOutputs []FilterOutput var previousOutputs []FilterOutput
db.Model(&FilterOutput{}).Where("watch_id = ? AND name = ?", filter.WatchID, filter.Var2).Find(&previousOutputs) db.Model(&FilterOutput{}).Where("watch_id = ? AND name = ?", filter.WatchID, filter.Var2).Find(&previousOutputs)
highest := -math.MaxFloat64 highest := -math.MaxFloat64
if previousOutputs != nil { 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 { continue
continue }
} if number > highest {
if number > highest { highest = number
highest = number
}
} }
} }

9
web/web.go
View file

@ -1201,6 +1201,9 @@ func (web *Web) backupFromFile(importID int, backup *Backup) (string, error) {
} }
defer backupReader.Close() defer backupReader.Close()
rawBytes, err := io.ReadAll(backupReader) rawBytes, err := io.ReadAll(backupReader)
if err != nil {
return "", err
}
err = json.Unmarshal(rawBytes, backup) err = json.Unmarshal(rawBytes, backup)
if err != nil { if err != nil {
return "", err return "", err
@ -1227,7 +1230,9 @@ func (web *Web) backupFromUpload(c *gin.Context, backup *Backup) (string, error)
} }
defer backupReader.Close() defer backupReader.Close()
rawBytes, err := io.ReadAll(backupReader) rawBytes, err := io.ReadAll(backupReader)
if err != nil {
return "", err
}
err = json.Unmarshal(rawBytes, &backup) err = json.Unmarshal(rawBytes, &backup)
if err != nil { if err != nil {
return "", err return "", err
@ -1539,7 +1544,7 @@ func (web *Web) importWatch(c *gin.Context) {
} }
importType := c.PostForm("type") importType := c.PostForm("type")
if !(importType == "clear" || importType == "add") { if !(importType == "clear" || importType == "add") {
c.AbortWithError(http.StatusBadRequest, errors.New("Unknown Import Type")) c.AbortWithError(http.StatusBadRequest, errors.New("unknown umport type"))
return return
} }
clearFilters := importType == "clear" clearFilters := importType == "clear"