adam/yr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Move browser opening to function

Browse source 
Signed-off-by: Tim Hårek Andreassen <tim@harek.no>
This commit is contained in:
Tim Hårek Andreassen 2024-10-04 20:44:57 +02:00
parent 7f72ae918b
commit e06a647fd4
No known key found for this signature in database
GPG key ID: E59C7734F0E10EB5
4 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/forecast.go
View file

@ -3,11 +3,9 @@ package cmd
import (
"encoding/json"
"fmt"
"os"
"git.sr.ht/~timharek/yr/cmd/flags"
"git.sr.ht/~timharek/yr/cmd/internal/ui/table"
"github.com/pkg/browser"
"github.com/spf13/cobra"
)
@ -31,12 +29,7 @@ func forecast(cmd *cobra.Command, args []string) {
interval, _ := cmd.Flags().GetInt(flags.INTERVAL)
if helper.isWeb {
url := fmt.Sprintf("https://www.yr.no/en/forecast/daily-table/%.4f,%.4f", f.Coordinates.Latitude, f.Coordinates.Longitude)
err := browser.OpenURL(url)
if err != nil {
cobra.CheckErr(err)
}
os.Exit(0)
openBrowser("https://www.yr.no/en/forecast/daily-table/%.4f,%.4f", f)
}
if interval > 0 {

11
cmd/forecast_helper.go
View file

@ -7,6 +7,7 @@ import (
"git.sr.ht/~timharek/yr/cmd/flags"
"git.sr.ht/~timharek/yr/internal/nominatim"
"git.sr.ht/~timharek/yr/yr"
"github.com/pkg/browser"
"github.com/spf13/cobra"
)
@ -51,3 +52,13 @@ func forecastHelper(cmd *cobra.Command, args []string) *forecastH {
f,
}
}
// Opens u in browser with added coordinates and exits
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)
}
os.Exit(0)
}

9
cmd/now.go
View file

@ -3,9 +3,7 @@ package cmd
import (
"encoding/json"
"fmt"
"os"
"github.com/pkg/browser"
"github.com/spf13/cobra"
)
@ -26,12 +24,7 @@ func now(cmd *cobra.Command, args []string) {
f := helper.f
if helper.isWeb {
url := fmt.Sprintf("https://www.yr.no/en/forecast/hourly-table/%.4f,%.4f/?i=0", f.Coordinates.Latitude, f.Coordinates.Longitude)
err := browser.OpenURL(url)
if err != nil {
cobra.CheckErr(err)
}
os.Exit(0)
openBrowser("https://www.yr.no/en/forecast/hourly-table/%.4f,%.4f?i=0", f)
}
n := f.Forecast[0]

9
cmd/today.go
View file

@ -3,11 +3,9 @@ package cmd
import (
"encoding/json"
"fmt"
"os"
"time"
"git.sr.ht/~timharek/yr/cmd/internal/ui/table"
"github.com/pkg/browser"
"github.com/spf13/cobra"
)
@ -27,12 +25,7 @@ func today(cmd *cobra.Command, args []string) {
f := helper.f
if helper.isWeb {
url := fmt.Sprintf("https://www.yr.no/en/forecast/hourly-table/%.4f,%.4f?i=0", f.Coordinates.Latitude, f.Coordinates.Longitude)
err := browser.OpenURL(url)
if err != nil {
cobra.CheckErr(err)
}
os.Exit(0)
openBrowser("https://www.yr.no/en/forecast/hourly-table/%.4f,%.4f?i=0", f)
}
if helper.isJson {