a/weather-cli
1
0
Fork 0
mirror of https://codeberg.org/andyscott/weather-cli.git synced 2024-09-18 23:08:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor updates to prompts and error messages

Browse source
This commit is contained in:
Andrew Scott 2022-08-08 05:56:25 -04:00
parent e3511cdacd
commit a688c5a1d9
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
4 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/advanced.go
View file

@ -83,8 +83,8 @@ func validateHistorical(app *Application) bool {
if app.HistoricalForecast.Temp != -500.00 { if app.HistoricalForecast.Temp != -500.00 {
isValid = true isValid = true
} else { } else {
fmt.Println("I couldn't get any information for that location.") fmt.Println("I couldn't get any information for that location and date.")
fmt.Println("Please double check the location you entered.") fmt.Println("Please double check the information you entered.")
} }
return isValid return isValid
} }

10
cmd/history.go
View file

@ -11,9 +11,7 @@ import (
// Get a date from the user and save it to the config // Get a date from the user and save it to the config
func getDate(app *Application) { func getDate(app *Application) {
var isValid bool var isValid bool
for !isValid { for !isValid {
fmt.Print("\nEnter 4-digit year: ") fmt.Print("\nEnter 4-digit year: ")
_, err := fmt.Scanf("%d", &app.Config.Date.Year) _, err := fmt.Scanf("%d", &app.Config.Date.Year)
@ -40,9 +38,7 @@ func getDate(app *Application) {
// Query SimplrWeather for date in Unix time // Query SimplrWeather for date in Unix time
func getUnixTime(c pb.RouteGuideClient) int32 { func getUnixTime(c pb.RouteGuideClient) int32 {
var year, month, day int32 var year, month, day int32
res, err := c.GetUnixTime(context.Background(), &pb.Date{ res, err := c.GetUnixTime(context.Background(), &pb.Date{
Year: year, Year: year,
Month: month, Month: month,
@ -86,11 +82,9 @@ func getHistoricalData(c pb.RouteGuideClient, app *Application) {
convertUnits(app) convertUnits(app)
} }
// Convert historical data from standard to user defined units // Convert historical data from standard to users preferred units
func convertUnits(app *Application) { func convertUnits(app *Application) {
units := app.Config.Units units := app.Config.Units
switch units { switch units {
case "imperial": case "imperial":
app.HistoricalForecast.Temp = convertKToF(app.HistoricalForecast.Temp) app.HistoricalForecast.Temp = convertKToF(app.HistoricalForecast.Temp)
@ -101,9 +95,7 @@ func convertUnits(app *Application) {
app.HistoricalForecast.FeelsLike = convertKToC(app.HistoricalForecast.FeelsLike) app.HistoricalForecast.FeelsLike = convertKToC(app.HistoricalForecast.FeelsLike)
default: default:
fmt.Println("\nUnable to convert units, temperature will default to Kelvin and speed will default to meters per second.") fmt.Println("\nUnable to convert units, temperature will default to Kelvin and speed will default to meters per second.")
return
} }
} }
// Convert Kelvin to Fahrenheit // Convert Kelvin to Fahrenheit

2
cmd/main.go
View file

@ -98,7 +98,5 @@ func main() {
Version: version, Version: version,
Client: pb.NewRouteGuideClient(conn), Client: pb.NewRouteGuideClient(conn),
} }
mainMenu(&app) mainMenu(&app)
} }

8
cmd/menu.go
View file

@ -11,9 +11,9 @@ import (
// Displays news and calls loop with menu options // Displays news and calls loop with menu options
func mainMenu(app *Application) { func mainMenu(app *Application) {
fmt.Println("\n=====================================================") fmt.Println("\n================================================")
fmt.Printf("| Welcome to the OpenWeatherMap-gRPC Client! v%s |\n", app.Version) fmt.Printf("| Welcome to the OpenWeatherMap Client! v%s |\n", app.Version)
fmt.Println("=====================================================") fmt.Println("================================================")
fmt.Printf("New in version %s:\n", app.Version) fmt.Printf("New in version %s:\n", app.Version)
fmt.Println(" - Search by zip code") fmt.Println(" - Search by zip code")
@ -32,7 +32,7 @@ func mainMenuLoop(app *Application) {
fmt.Println("1. Use current location (default)") fmt.Println("1. Use current location (default)")
fmt.Println("2. Search by zip code") fmt.Println("2. Search by zip code")
fmt.Println("3. Search by city") fmt.Println("3. Search by city")
fmt.Println("4. Advanced options") fmt.Println("4. Advanced options (Change units, precise location, etc.)")
fmt.Print("0. Exit\n\n") fmt.Print("0. Exit\n\n")
// Read user input // Read user input