From 5e2b1d1dc902ba53fc537b31e835d82c0e55dfb6 Mon Sep 17 00:00:00 2001 From: Philipp Tanlak Date: Thu, 17 Aug 2023 20:15:41 +0200 Subject: print json correctly --- cmd/flyscrape/run.go | 14 +++++++++++--- cmd/flyscrape/watch.go | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/flyscrape/run.go b/cmd/flyscrape/run.go index 2577c25..9a2a7bb 100644 --- a/cmd/flyscrape/run.go +++ b/cmd/flyscrape/run.go @@ -45,16 +45,24 @@ func (c *RunCommand) Run(args []string) error { count := 0 start := time.Now() + for result := range svc.Scrape() { + if count > 0 { + fmt.Println(",") + } + if count == 0 { + fmt.Println("[") + } if *noPrettyPrint { - flyscrape.Print(result) + fmt.Print(flyscrape.Print(result, " ")) } else { - flyscrape.PrettyPrint(result) + fmt.Print(flyscrape.PrettyPrint(result, " ")) } count++ } - log.Printf("Scraped %d websites in %v\n", count, time.Since(start)) + fmt.Println("\n]") + log.Printf("Scraped %d websites in %v\n", count, time.Since(start)) return nil } diff --git a/cmd/flyscrape/watch.go b/cmd/flyscrape/watch.go index 99fac4e..46da25e 100644 --- a/cmd/flyscrape/watch.go +++ b/cmd/flyscrape/watch.go @@ -50,7 +50,7 @@ func (c *WatchCommand) Run(args []string) error { screen.Clear() screen.MoveTopLeft() - flyscrape.PrettyPrint(result) + fmt.Println(flyscrape.PrettyPrint(result, "")) return nil }) if err != nil && err != flyscrape.StopWatch { -- cgit v1.2.3