From bd9e7f7acfd855d4685aa4544169c0e29cdbf205 Mon Sep 17 00:00:00 2001 From: Philipp Tanlak Date: Sun, 24 Sep 2023 23:36:00 +0200 Subject: clean up modules --- modules/jsonprinter/jsonprinter.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'modules/jsonprinter/jsonprinter.go') diff --git a/modules/jsonprinter/jsonprinter.go b/modules/jsonprinter/jsonprinter.go index 3936277..3026f29 100644 --- a/modules/jsonprinter/jsonprinter.go +++ b/modules/jsonprinter/jsonprinter.go @@ -6,6 +6,7 @@ package jsonprinter import ( "fmt" + "time" "github.com/philippta/flyscrape" ) @@ -18,10 +19,6 @@ type Module struct { first bool } -func (m *Module) ID() string { - return "jsonprinter" -} - func (m *Module) OnResponse(resp *flyscrape.Response) { if resp.Error == nil && resp.Data == nil { return @@ -33,15 +30,28 @@ func (m *Module) OnResponse(resp *flyscrape.Response) { fmt.Println(",") } - fmt.Print(flyscrape.PrettyPrint(resp.ScrapeResult, " ")) + o := output{ + URL: resp.Request.URL, + Data: resp.Data, + Error: resp.Error, + Timestamp: time.Now(), + } + + fmt.Print(flyscrape.PrettyPrint(o, " ")) } func (m *Module) OnComplete() { fmt.Println("\n]") } +type output struct { + URL string `json:"url,omitempty"` + Data any `json:"data,omitempty"` + Error error `json:"error,omitempty"` + Timestamp time.Time `json:"timestamp,omitempty"` +} + var ( - _ flyscrape.Module = (*Module)(nil) _ flyscrape.OnResponse = (*Module)(nil) _ flyscrape.OnComplete = (*Module)(nil) ) -- cgit v1.2.3