From 8eefdc593609df5c5e4aae5f60e1ba1648b8f8e7 Mon Sep 17 00:00:00 2001 From: long Date: Wed, 26 Feb 2025 22:24:27 -0600 Subject: [PATCH] more debug logging, minor refactor --- src/orchestrator.go | 4 ++-- src/scrapers.go | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/orchestrator.go b/src/orchestrator.go index c43b9fc..1efb059 100644 --- a/src/orchestrator.go +++ b/src/orchestrator.go @@ -12,7 +12,7 @@ type Scraper func(ClientScraper) (*[]*event.Event, error) func ScrapeEventsLoop(q *event.Queries, client ClientScraper, tapology bool) { for { time.Sleep(time.Duration(1) * time.Hour) - slog.Debug("Running hourly scraper") + slog.Debug("Running hourly scraper") ScrapeEvents(q, client, tapology) } } @@ -66,7 +66,7 @@ func UpdateTapology(q *event.Queries, client ClientScraper, events *[]*event.Eve link, err := GetTapologyLink(client, ff.Name) if err != nil { slog.Error("Failed getting tapology from site", "name", ff.Name, "error", err) - } else if len(link) > 0 { + } else { slog.Debug("Got new tapology link", "name", ff.Name, "link", link) err := q.CreateTapology(context.Background(), event.CreateTapologyParams{Name: ff.Name, Url: link}) if err != nil { diff --git a/src/scrapers.go b/src/scrapers.go index d507a2a..16ec032 100644 --- a/src/scrapers.go +++ b/src/scrapers.go @@ -269,7 +269,7 @@ func GetTapologyLink(client ClientScraper, name string) (string, error) { return "", fmt.Errorf("CSRF token not set.") } - slog.Debug("Scraping tapology link", "name", name) + slog.Debug("Scraping tapology link", "name", name) selection, err := client.Get(TAPOLOGY_URL+"/search/nav", func(r *http.Request) { query := url.Values{} @@ -292,7 +292,7 @@ func GetTapologyLink(client ClientScraper, name string) (string, error) { }) if len(results) == 0 { - return "", nil + return "", fmt.Errorf("No tapology results for %s", name) } slices.SortStableFunc(results, func(a, b TapologyResult) int { @@ -308,5 +308,11 @@ func GetTapologyLink(client ClientScraper, name string) (string, error) { } }) - return TAPOLOGY_URL + results[0].Url, nil + link := TAPOLOGY_URL + results[0].Url + + if len(link) == 0 { + return "", fmt.Errorf("Tapology link is empty for %s", name) + } else { + return TAPOLOGY_URL + results[0].Url, nil + } }