big refactor to (maybe?) make gowatch a proper 'module'

models.go

@@ -1,63 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"html"
-	"time"
-
-	"github.com/robfig/cron/v3"
-)
-
-type Watch struct {
-	ID        uint        `form:"watch_id" yaml:"watch_id"`
-	Name      string      `form:"watch_name" gorm:"index" yaml:"watch_name" binding:"required" validate:"min=1"`
-	CronEntry *cron.Entry `gorm:"-:all"`
-	LastValue string      `gorm:"-:all"`
-}
-
-type Filter struct {
-	ID       uint      `form:"filter_id" yaml:"filter_id" json:"filter_id"`
-	WatchID  uint      `form:"filter_watch_id" gorm:"index" yaml:"filter_watch_id" json:"filter_watch_id" binding:"required"`
-	Name     string    `form:"filter_name" gorm:"index" yaml:"filter_name" json:"filter_name" binding:"required" validate:"min=1"`
-	X        int       `form:"x" yaml:"x" json:"x" validate:"default=0"`
-	Y        int       `form:"y" yaml:"y" json:"y" validate:"default=0"`
-	Type     string    `form:"filter_type" yaml:"filter_type" json:"filter_type" binding:"required" validate:"oneof=url xpath json css replace match substring math store condition cron"`
-	Var1     string    `form:"var1" yaml:"var1" json:"var1" binding:"required"`
-	Var2     *string   `form:"var2" yaml:"var2" json:"var2"`
-	Var3     *string   `form:"var3" yaml:"var3" json:"var3"`
-	Parents  []*Filter `gorm:"-:all"`
-	Children []*Filter `gorm:"-:all"`
-	Results  []string  `gorm:"-:all"`
-	Logs     []string  `gorm:"-:all"`
-}
-
-func (filter *Filter) log(v ...any) {
-	filter.Logs = append(filter.Logs, html.EscapeString(fmt.Sprint(v...)))
-}
-
-type FilterConnection struct {
-	ID       uint `form:"filter_connection_id" yaml:"filter_connection_id" json:"filter_connection_id"`
-	WatchID  uint `form:"connection_watch_id" gorm:"index" yaml:"connection_watch_id" json:"connection_watch_id" binding:"required"`
-	OutputID uint `form:"filter_output_id" gorm:"index" yaml:"filter_output_id" json:"filter_output_id" binding:"required"`
-	InputID  uint `form:"filter_input_id" gorm:"index" yaml:"filter_input_id" json:"filter_input_id" binding:"required"`
-}
-
-type FilterOutput struct {
-	ID      uint      `yaml:"filter_output_id" json:"filter_output_id"`
-	WatchID uint      `yaml:"filter_output_watch_id" gorm:"index" json:"filter_output_watch_id"`
-	Name    string    `yaml:"filter_output_name" json:"filter_output_name"`
-	Value   string    `yaml:"filter_output_value" json:"filter_output_value"`
-	Time    time.Time `yaml:"filter_output_time" json:"filter_output_time"`
-}
-
-type WatchExport struct {
-	Filters     []Filter           `json:"filters"`
-	Connections []FilterConnection `json:"connections"`
-}
-
-type Backup struct {
-	Watches     []Watch            `json:"watches"`
-	Filters     []Filter           `json:"filters"`
-	Connections []FilterConnection `json:"connections"`
-	Values      []FilterOutput     `json:"values"`
-}

models/backup.go

@@ -0,0 +1,8 @@
+package models
+
+type Backup struct {
+	Watches     []Watch            `json:"watches"`
+	Filters     []Filter           `json:"filters"`
+	Connections []FilterConnection `json:"connections"`
+	Values      []FilterOutput     `json:"values"`
+}

models/connection.go

@@ -0,0 +1,8 @@
+package models
+
+type FilterConnection struct {
+	ID       uint `form:"filter_connection_id" yaml:"filter_connection_id" json:"filter_connection_id"`
+	WatchID  uint `form:"connection_watch_id" gorm:"index" yaml:"connection_watch_id" json:"connection_watch_id" binding:"required"`
+	OutputID uint `form:"filter_output_id" gorm:"index" yaml:"filter_output_id" json:"filter_output_id" binding:"required"`
+	InputID  uint `form:"filter_input_id" gorm:"index" yaml:"filter_input_id" json:"filter_input_id" binding:"required"`
+}

models/export.go

@@ -0,0 +1,6 @@
+package models
+
+type WatchExport struct {
+	Filters     []Filter           `json:"filters"`
+	Connections []FilterConnection `json:"connections"`
+}

models/filter.go

@@ -0,0 +1,26 @@
+package models
+
+import (
+	"fmt"
+	"html"
+)
+
+type Filter struct {
+	ID       uint      `form:"filter_id" yaml:"filter_id" json:"filter_id"`
+	WatchID  uint      `form:"filter_watch_id" gorm:"index" yaml:"filter_watch_id" json:"filter_watch_id" binding:"required"`
+	Name     string    `form:"filter_name" gorm:"index" yaml:"filter_name" json:"filter_name" binding:"required" validate:"min=1"`
+	X        int       `form:"x" yaml:"x" json:"x" validate:"default=0"`
+	Y        int       `form:"y" yaml:"y" json:"y" validate:"default=0"`
+	Type     string    `form:"filter_type" yaml:"filter_type" json:"filter_type" binding:"required" validate:"oneof=url xpath json css replace match substring math store condition cron"`
+	Var1     string    `form:"var1" yaml:"var1" json:"var1" binding:"required"`
+	Var2     *string   `form:"var2" yaml:"var2" json:"var2"`
+	Var3     *string   `form:"var3" yaml:"var3" json:"var3"`
+	Parents  []*Filter `gorm:"-:all"`
+	Children []*Filter `gorm:"-:all"`
+	Results  []string  `gorm:"-:all"`
+	Logs     []string  `gorm:"-:all"`
+}
+
+func (filter *Filter) Log(v ...any) {
+	filter.Logs = append(filter.Logs, html.EscapeString(fmt.Sprint(v...)))
+}

models/filteroutput.go

@@ -0,0 +1,11 @@
+package models
+
+import "time"
+
+type FilterOutput struct {
+	ID      uint      `yaml:"filter_output_id" json:"filter_output_id"`
+	WatchID uint      `yaml:"filter_output_watch_id" gorm:"index" json:"filter_output_watch_id"`
+	Name    string    `yaml:"filter_output_name" json:"filter_output_name"`
+	Value   string    `yaml:"filter_output_value" json:"filter_output_value"`
+	Time    time.Time `yaml:"filter_output_time" json:"filter_output_time"`
+}

models/watch.go

@@ -0,0 +1,12 @@
+package models
+
+import (
+	"github.com/robfig/cron/v3"
+)
+
+type Watch struct {
+	ID        uint        `form:"watch_id" yaml:"watch_id"`
+	Name      string      `form:"watch_name" gorm:"index" yaml:"watch_name" binding:"required" validate:"min=1"`
+	CronEntry *cron.Entry `gorm:"-:all"`
+	LastValue string      `gorm:"-:all"`
+}

web/scraping.go

@@ -1,4 +1,4 @@
-package main
+package web
 
 import (
 	"bytes"
@@ -25,9 +25,11 @@ import (
 	lua "github.com/yuin/gopher-lua"
 	"golang.org/x/net/html"
 	"gorm.io/gorm"
+
+	. "github.com/broodjeaap/go-watch/models"
 )
 
-func processFilters(filters []Filter, web *Web, watch *Watch, debug bool, scheduleID *uint) {
+func ProcessFilters(filters []Filter, web *Web, watch *Watch, debug bool, scheduleID *uint) {
 	processedMap := make(map[uint]bool, len(filters))
 	if scheduleID != nil {
 		processedMap[*scheduleID] = true
@@ -52,7 +54,7 @@ func processFilters(filters []Filter, web *Web, watch *Watch, debug bool, schedu
 			}
 		}
 		if cronParentCount > 1 {
-			filter.log("Multiple schedules on the same filter is not supported!")
+			filter.Log("Multiple schedules on the same filter is not supported!")
 			return
 		}
 	}
@@ -78,7 +80,7 @@ func processFilters(filters []Filter, web *Web, watch *Watch, debug bool, schedu
 			}
 			if debug && filter.Type == "cron" {
 				if filter.Var2 != nil && *filter.Var2 == "no" {
-					filter.log("Schedule is disabled")
+					filter.Log("Schedule is disabled")
 				}
 				processedMap[filter.ID] = true
 				getCronDebugResult(filter)
@@ -273,7 +275,7 @@ func getFilterResult(filters []Filter, filter *Filter, watch *Watch, web *Web, d
 			getFilterResultEcho(filter)
 		}
 	default:
-		filter.log("getFilterResult called with filter.Type == '", filter.Type, "'")
+		filter.Log("getFilterResult called with filter.Type == '", filter.Type, "'")
 	}
 }
 
@@ -287,7 +289,7 @@ func getFilterResultURL(filter *Filter, urlCache map[string]string, debug bool)
 	str, err := getURLContent(filter, fetchURL)
 	if err != nil {
 		log.Println("Could not fetch url: ", fetchURL, " - ", err)
-		filter.log("Could not fetch url: ", fetchURL, " - ", err)
+		filter.Log("Could not fetch url: ", fetchURL, " - ", err)
 		return
 	}
 	filter.Results = append(filter.Results, str)
@@ -309,7 +311,7 @@ func getFilterResultURLs(filter *Filter, urlCache map[string]string, debug bool)
 			str, err := getURLContent(filter, fetchURL)
 			if err != nil {
 				log.Println("Could not fetch url: ", fetchURL, " - ", err)
-				filter.log("Could not fetch url: ", fetchURL, " - ", err)
+				filter.Log("Could not fetch url: ", fetchURL, " - ", err)
 				continue
 			}
 			filter.Results = append(filter.Results, str)
@@ -345,7 +347,7 @@ func getURLContent(filter *Filter, fetchURL string) (string, error) {
 
 func getFilterResultBrowserlessURL(filter *Filter, urlCache map[string]string, debug bool) {
 	if filter.Var2 == nil {
-		filter.log("filter.Var2 == nil")
+		filter.Log("filter.Var2 == nil")
 		return
 	}
 	fetchURL := *filter.Var2
@@ -357,7 +359,7 @@ func getFilterResultBrowserlessURL(filter *Filter, urlCache map[string]string, d
 	str, err := getBrowserlessURLContent(filter, fetchURL)
 	if err != nil {
 		log.Println("Could not fetch url: ", fetchURL, " - ", err)
-		filter.log("Could not fetch url: ", fetchURL, " - ", err)
+		filter.Log("Could not fetch url: ", fetchURL, " - ", err)
 		return
 	}
 	filter.Results = append(filter.Results, str)
@@ -379,7 +381,7 @@ func getFilterResultBrowserlessURLs(filter *Filter, urlCache map[string]string,
 			str, err := getBrowserlessURLContent(filter, fetchURL)
 			if err != nil {
 				log.Println("Could not fetch url: ", fetchURL, " - ", err)
-				filter.log("Could not fetch url: ", fetchURL, " - ", err)
+				filter.Log("Could not fetch url: ", fetchURL, " - ", err)
 				continue
 			}
 			filter.Results = append(filter.Results, str)
@@ -403,20 +405,20 @@ func getBrowserlessURLContent(filter *Filter, fetchURL string) (string, error) {
 	jsn, err := json.Marshal(data)
 	if err != nil {
 		log.Println("Could not marshal url:", err)
-		filter.log("Could not marshal url:", err)
+		filter.Log("Could not marshal url:", err)
 		return "", err
 	}
 	browserlessURL = browserlessURL + "/content"
 	resp, err := http.Post(browserlessURL, "application/json", bytes.NewBuffer(jsn))
 	if err != nil {
 		log.Println("Could not get browserless response content:", err)
-		filter.log("Could not get browserless response content:", err)
+		filter.Log("Could not get browserless response content:", err)
 		return "", err
 	}
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Println("Could not fetch url through browserless: ", fetchURL, " - ", err)
-		filter.log("Could not fetch url through browserless: ", fetchURL, " - ", err)
+		filter.Log("Could not fetch url through browserless: ", fetchURL, " - ", err)
 		return "", err
 	}
 	return string(body), nil
@@ -426,7 +428,7 @@ func getBrowserlessFunctionResult(filter *Filter) {
 	result, err := getBrowserlessFunctionContent(filter, "")
 	if err != nil {
 		log.Println(err)
-		filter.log(err)
+		filter.Log(err)
 		return
 	}
 	filter.Results = append(filter.Results, result)
@@ -440,7 +442,7 @@ func getBrowserlessFunctionResults(filter *Filter) {
 			str, err := getBrowserlessFunctionContent(filter, fetchURL)
 			if err != nil {
 				log.Println(err)
-				filter.log(err)
+				filter.Log(err)
 				continue
 			}
 			filter.Results = append(filter.Results, str)
@@ -499,7 +501,7 @@ func getFilterResultXPath(filter *Filter) {
 		for _, result := range parent.Results {
 			doc, err := htmlquery.Parse(strings.NewReader(result))
 			if err != nil {
-				filter.log(err)
+				filter.Log(err)
 				continue
 			}
 			nodes, _ := htmlquery.QueryAll(doc, filter.Var1)
@@ -560,12 +562,12 @@ func getFilterResultCSS(filter *Filter) {
 		for _, result := range parent.Results {
 			doc, err := html.Parse(strings.NewReader(result))
 			if err != nil {
-				filter.log(err)
+				filter.Log(err)
 				continue
 			}
 			sel, err := cascadia.Parse(filter.Var1)
 			if err != nil {
-				filter.log(err)
+				filter.Log(err)
 				continue
 			}
 			for _, node := range cascadia.QueryAll(doc, sel) {
@@ -609,7 +611,7 @@ func getFilterResultCSS(filter *Filter) {
 func getFilterResultReplace(filter *Filter) {
 	r, err := regexp.Compile(filter.Var1)
 	if err != nil {
-		filter.log(err)
+		filter.Log(err)
 		return
 	}
 	for _, parent := range filter.Parents {
@@ -626,7 +628,7 @@ func getFilterResultReplace(filter *Filter) {
 func getFilterResultMatch(filter *Filter) {
 	r, err := regexp.Compile(filter.Var1)
 	if err != nil {
-		filter.log("Could not compile regex: ", err)
+		filter.Log("Could not compile regex: ", err)
 		return
 	}
 	for _, parent := range filter.Parents {
@@ -647,7 +649,7 @@ func getFilterResultSubstring(filter *Filter) {
 				if strings.Contains(substring, ":") {
 					from_to := strings.Split(substring, ":")
 					if len(from_to) != 2 {
-						filter.log("Missing value in range: '", substring, "'")
+						filter.Log("Missing value in range: '", substring, "'")
 						return
 					}
 					fromStr := from_to[0]
@@ -658,13 +660,13 @@ func getFilterResultSubstring(filter *Filter) {
 					from64, err := strconv.ParseInt(fromStr, 10, 32)
 					var from = int(from64)
 					if hasFrom && err != nil {
-						filter.log("Could not parse left side of: '", substring, "'")
+						filter.Log("Could not parse left side of: '", substring, "'")
 						return
 					} else if from < 0 {
 						from = len(asRunes) + from
 					}
 					if from < 0 {
-						filter.log("Out of bounds:", from_to)
+						filter.Log("Out of bounds:", from_to)
 						continue
 					}
 
@@ -676,19 +678,19 @@ func getFilterResultSubstring(filter *Filter) {
 					to64, err := strconv.ParseInt(toStr, 10, 32)
 					var to = int(to64)
 					if hasTo && err != nil {
-						filter.log("Could not parse right side of: '", substring, "'")
+						filter.Log("Could not parse right side of: '", substring, "'")
 						return
 					} else if to < 0 {
 						to = len(asRunes) + to
 					}
 					if to < 0 {
-						filter.log("Out of bounds:", from_to)
+						filter.Log("Out of bounds:", from_to)
 						continue
 					}
 					if hasFrom && hasTo {
 						_, err := sb.WriteString(string(asRunes[from:to]))
 						if err != nil {
-							filter.log("Could not substring: ", err)
+							filter.Log("Could not substring: ", err)
 						}
 					} else if hasFrom {
 						sb.WriteString(string(asRunes[from:]))
@@ -698,7 +700,7 @@ func getFilterResultSubstring(filter *Filter) {
 				} else {
 					pos, err := strconv.ParseInt(substring, 10, 32)
 					if err != nil || pos < 0 {
-						filter.log("Could not parse: '", substring, "'")
+						filter.Log("Could not parse: '", substring, "'")
 						return
 					}
 					sb.WriteRune(asRunes[pos])
@@ -736,9 +738,9 @@ func getFilterResultSum(filter *Filter) {
 				sum += number
 			} else {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 			}
 		}
@@ -758,10 +760,10 @@ func getFilterResultMin(filter *Filter) {
 				}
 			} else {
 				if len(result) > 50 {
-					filter.log("Could not convert value, '", result, "', to number")
-					//filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, '", result, "', to number")
+					//filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 			}
 		}
@@ -784,9 +786,9 @@ func getFilterResultMax(filter *Filter) {
 				}
 			} else {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 			}
 		}
@@ -807,9 +809,9 @@ func getFilterResultAverage(filter *Filter) {
 				count++
 			} else {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 			}
 		}
@@ -855,9 +857,9 @@ func getFilterResultRound(filter *Filter) {
 				filter.Results = append(filter.Results, fmt.Sprintf("%f", rounded))
 			} else {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 			}
 		}
@@ -904,7 +906,7 @@ func getFilterResultConditionLowerLast(filter *Filter, db *gorm.DB) {
 	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, "'")
+		filter.Log("Could not convert previous value to number all will pass: '", previousOutput.Value, "'")
 	}
 	for _, parent := range filter.Parents {
 		for _, result := range parent.Results {
@@ -914,9 +916,9 @@ func getFilterResultConditionLowerLast(filter *Filter, db *gorm.DB) {
 				number, err := strconv.ParseFloat(result, 64)
 				if err != nil {
 					if len(result) > 50 {
-						filter.log("Could not convert value, with length ", len(result), ", to number")
+						filter.Log("Could not convert value, with length ", len(result), ", to number")
 					} else {
-						filter.log("Could not convert value, '", result, "', to number")
+						filter.Log("Could not convert value, '", result, "', to number")
 					}
 					continue
 				}
@@ -947,9 +949,9 @@ func getFilterResultConditionLowest(filter *Filter, db *gorm.DB) {
 			number, err := strconv.ParseFloat(result, 64)
 			if err != nil {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 				continue
 			}
@@ -962,12 +964,12 @@ func getFilterResultConditionLowest(filter *Filter, db *gorm.DB) {
 
 func getFilterResultConditionLowerThan(filter *Filter) {
 	if filter.Var2 == nil {
-		filter.log("No threshold given")
+		filter.Log("No threshold given")
 		return
 	}
 	threshold, err := strconv.ParseFloat(*filter.Var2, 64)
 	if err != nil {
-		filter.log("Could not convert convert threshold to number: '", *filter.Var2, "'")
+		filter.Log("Could not convert convert threshold to number: '", *filter.Var2, "'")
 		return
 	}
 	for _, parent := range filter.Parents {
@@ -975,9 +977,9 @@ func getFilterResultConditionLowerThan(filter *Filter) {
 			number, err := strconv.ParseFloat(result, 64)
 			if err != nil {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 				continue
 			}
@@ -993,7 +995,7 @@ func getFilterResultConditionHigherLast(filter *Filter, db *gorm.DB) {
 	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, "'")
+		filter.Log("Could not convert previous value to number all will pass: '", previousOutput.Value, "'")
 	}
 	for _, parent := range filter.Parents {
 		for _, result := range parent.Results {
@@ -1003,9 +1005,9 @@ func getFilterResultConditionHigherLast(filter *Filter, db *gorm.DB) {
 				number, err := strconv.ParseFloat(result, 64)
 				if err != nil {
 					if len(result) > 50 {
-						filter.log("Could not convert value, with length ", len(result), ", to number")
+						filter.Log("Could not convert value, with length ", len(result), ", to number")
 					} else {
-						filter.log("Could not convert value, '", result, "', to number")
+						filter.Log("Could not convert value, '", result, "', to number")
 					}
 					continue
 				}
@@ -1038,9 +1040,9 @@ func getFilterResultConditionHighest(filter *Filter, db *gorm.DB) {
 			number, err := strconv.ParseFloat(result, 64)
 			if err != nil {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 				continue
 			}
@@ -1053,12 +1055,12 @@ func getFilterResultConditionHighest(filter *Filter, db *gorm.DB) {
 
 func getFilterResultConditionHigherThan(filter *Filter) {
 	if filter.Var2 == nil {
-		filter.log("No threshold given for Higher Than Filter")
+		filter.Log("No threshold given for Higher Than Filter")
 		return
 	}
 	threshold, err := strconv.ParseFloat(*filter.Var2, 64)
 	if err != nil {
-		filter.log("Could not convert convert threshold to number: '", *filter.Var2, "'")
+		filter.Log("Could not convert convert threshold to number: '", *filter.Var2, "'")
 		return
 	}
 	for _, parent := range filter.Parents {
@@ -1066,9 +1068,9 @@ func getFilterResultConditionHigherThan(filter *Filter) {
 			number, err := strconv.ParseFloat(result, 64)
 			if err != nil {
 				if len(result) > 50 {
-					filter.log("Could not convert value, with length ", len(result), ", to number")
+					filter.Log("Could not convert value, with length ", len(result), ", to number")
 				} else {
-					filter.log("Could not convert value, '", result, "', to number")
+					filter.Log("Could not convert value, '", result, "', to number")
 				}
 				continue
 			}
@@ -1105,7 +1107,7 @@ func notifyFilter(filters []Filter, filter *Filter, watch *Watch, web *Web, debu
 	}
 	tmpl, err := template.New("notify").Parse(filter.Var1)
 	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
 	}
@@ -1135,7 +1137,7 @@ func notifyFilter(filters []Filter, filter *Filter, watch *Watch, web *Web, debu
 
 }
 
-func triggerSchedule(watchID uint, web *Web, scheduleID *uint) {
+func TriggerSchedule(watchID uint, web *Web, scheduleID *uint) {
 	var watch *Watch
 	web.db.Model(&Watch{}).First(&watch, watchID)
 
@@ -1146,13 +1148,13 @@ func triggerSchedule(watchID uint, web *Web, scheduleID *uint) {
 	web.db.Model(&FilterConnection{}).Where("watch_id = ?", watch.ID).Find(&connections)
 
 	buildFilterTree(filters, connections)
-	processFilters(filters, web, watch, false, scheduleID)
+	ProcessFilters(filters, web, watch, false, scheduleID)
 }
 
 func getCronDebugResult(filter *Filter) {
 	_, err := cron.ParseStandard(filter.Var1)
 	if err != nil {
-		filter.log(err)
+		filter.Log(err)
 	}
 }
 
@@ -1178,7 +1180,7 @@ func getFilterResultLua(filter *Filter) {
 
 	err := L.DoString(filter.Var1)
 	if err != nil {
-		filter.log(err)
+		filter.Log(err)
 		return
 	}
 	outputs.ForEach(

web/scraping_test.go

@@ -1,4 +1,4 @@
-package main
+package web
 
 import (
 	"fmt"
@@ -10,6 +10,8 @@ import (
 
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+
+	. "github.com/broodjeaap/go-watch/models"
 )
 
 const HTML_STRING = `<html>
@@ -1494,7 +1496,7 @@ func TestEchoFilter(t *testing.T) {
 	filter1 := &filters[0]
 	connections := []FilterConnection{}
 	buildFilterTree(filters, connections)
-	processFilters(filters, nil, nil, false, nil)
+	ProcessFilters(filters, nil, nil, false, nil)
 
 	if !DeepEqualStringSlice(filter1.Results, []string{helloWorld}) {
 		t.Errorf("%s did not match %s", helloWorld, filter1.Results)
@@ -1558,7 +1560,7 @@ func TestSimpleWatch(t *testing.T) {
 	}
 
 	buildFilterTree(filters, connections)
-	processFilters(filters, nil, nil, false, nil)
+	ProcessFilters(filters, nil, nil, false, nil)
 
 	if !reflect.DeepEqual(minFilter.Results, []string{"100.000000"}) {
 		t.Errorf("%s did not match '100'", minFilter.Results)
@@ -1624,7 +1626,7 @@ func TestSimpleIDOrderWatch(t *testing.T) {
 	}
 
 	buildFilterTree(filters, connections)
-	processFilters(filters, nil, nil, false, nil)
+	ProcessFilters(filters, nil, nil, false, nil)
 
 	if !reflect.DeepEqual(minFilter.Results, []string{"100.000000"}) {
 		t.Errorf("%s did not match '100'", minFilter.Results)
@@ -1690,7 +1692,7 @@ func TestSimpleDebugWatch(t *testing.T) {
 	}
 
 	buildFilterTree(filters, connections)
-	processFilters(filters, nil, nil, true, nil)
+	ProcessFilters(filters, nil, nil, true, nil)
 
 	if !reflect.DeepEqual(minFilter.Results, []string{"100.000000"}) {
 		t.Errorf("%s did not match '100'", minFilter.Results)
@@ -1806,7 +1808,7 @@ func TestSimpleTriggeredWatch(t *testing.T) {
 
 	log.Println(connections[0])
 
-	triggerSchedule(watch.ID, &Web{db: db}, &scheduleFilter.ID)
+	TriggerSchedule(watch.ID, &Web{db: db}, &scheduleFilter.ID)
 
 	var filterOutputs []FilterOutput
 	db.Model(&FilterOutput{}).Find(&filterOutputs, fmt.Sprintf("watch_id = %d", watch.ID))
@@ -1866,7 +1868,7 @@ func TestDontAllowMultipleCronOnSingleFilter(t *testing.T) {
 	}
 
 	buildFilterTree(filters, connections)
-	processFilters(filters, nil, nil, false, nil)
+	ProcessFilters(filters, nil, nil, false, nil)
 
 	if len(filter.Logs) == 0 {
 		t.Errorf("Expected error message in filter log, found empty log: %s", filter.Logs)

web/util.go

@@ -1,10 +1,12 @@
-package main
+package web
 
 import (
 	"errors"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
+
+	. "github.com/broodjeaap/go-watch/models"
 )
 
 func bindAndValidateWatch(watch *Watch, c *gin.Context) (map[string]string, error) {