refactor: Move output json to helper func

Signed-off-by: Tim Hårek Andreassen <tim@harek.no>

cmd/forecast.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"git.sr.ht/~timharek/yr/cmd/flags"
@@ -37,10 +36,7 @@ func forecast(cmd *cobra.Command, args []string) {
 	}
 
 	if helper.isJson {
-		j, err := json.MarshalIndent(f, "", "  ")
+		outputJson(f.Forecast)
-		cobra.CheckErr(err)
-		fmt.Printf("%s", j)
-		return
 	}
 
 	t := table.New()

cmd/forecast_helper.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 
@@ -57,8 +58,14 @@ func forecastHelper(cmd *cobra.Command, args []string) *forecastH {
 func openBrowser(u string, f *yr.ForecastResult) {
 	url := fmt.Sprintf(u, f.Coordinates.Latitude, f.Coordinates.Longitude)
 	err := browser.OpenURL(url)
-	if err != nil {
+	cobra.CheckErr(err)
-		cobra.CheckErr(err)
+	os.Exit(0)
-	}
+}
+
+// Returns forecast in pretty printed JSON and exits
+func outputJson(v any) {
+	j, err := json.MarshalIndent(v, "", "  ")
+	cobra.CheckErr(err)
+	fmt.Printf("%s\n", j)
 	os.Exit(0)
 }

cmd/now.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -30,10 +29,7 @@ func now(cmd *cobra.Command, args []string) {
 	n := f.Forecast[0]
 
 	if helper.isJson {
-		j, err := json.MarshalIndent(f, "", "  ")
+		outputJson(n)
-		cobra.CheckErr(err)
-		fmt.Printf("%s", j)
-		return
 	}
 
 	itemTime := n.Time.Local()

cmd/today.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -29,10 +28,7 @@ func today(cmd *cobra.Command, args []string) {
 	}
 
 	if helper.isJson {
-		j, err := json.MarshalIndent(f, "", "  ")
+		outputJson(f.Forecast)
-		cobra.CheckErr(err)
-		fmt.Printf("%s", j)
-		return
 	}
 
 	t := table.New()