Merge branch 'release/v1.2'

Author: pazurkota

.gitignore

@@ -5,3 +5,5 @@ riderModule.iml
 /_ReSharper.Caches/
 .idea/.idea.console-weather/.idea/
 console-weather/config.json
+
+console-weather/nupkg/

README.md

@@ -9,15 +9,22 @@ Console Weather project is a simple application project to check weather in cons
 - Show current Wind Speed and Direction
 - Show Air Pressure, Humidity and Cloud Cover
 - Show Weather Alerts (if exists)
+- Show Weather Forecast (for a next day)
 
 
 
 ## Installation
 
 If you installed [.NET 7.0 or newer](https://dotnet.microsoft.com/en-us/download), just simply paste this command into console:
 ```bash
-dotnet tool install --global console-weather --version 1.1.0
+dotnet tool install --global console-weather --version 1.2.0
 ```
+
+If you want to update, just type:
+```bash
+dotnet tool update --global console-weather
+```
+
 If you running app first time, it will ask you for the [Weather API](https://www.weatherapi.com/):
 ``` 
 Error: API returned status code Forbidden
@@ -39,31 +46,47 @@ To get weather info from a specified city, type:
 weather -c "City Name"
 ```
 
+To get weather information without alerts, type:
+```bash
+weather --no-alerts
+```
+
+To get forecast for the next day, type:
+```bash
+weather -f
+```
+
+Full command list:
+```bash
+  -c, --city <city>  Get city name
+  --no-alerts        Hide weather alerts [default: False]
+  -f, --forecast     Show weather forecast [default: False]
+  --version          Show version information
+  -?, -h, --help     Show help and usage information
+```
+
 
 ## Demo
 
 Example input:
-```bash
-weather -c "London"
+```
+weather -c "Kansas City" --no-alerts
 ```
 
 Example output:
 ```
-Weather for London, United Kingdom (last update: 2023-04-15 16:00):
-
-Teperature: 14,0°C (feels like: 13,7°C)
-Weather Condition: Partly cloudy
-Wind Speed: 13,0kmp (WNW)
-Air Pressure: 1021,0 mbar
-Humidity: 59%
-Cloud Cover: 25%
-
-Weather Alerts:
-<none>
+The current weather for Kansas City in United States of America is Sunny
+The temperature is 16,1°C, but feels like: 16,1°C
+
+Current Wind speed is 16,9 kmp SSW
+Current Air Pressure is 1020,0 mbar
+Current Humidity is 33%
+Current Cloud Cover is 0%
+Last update: 2023-04-24 12:30
 ```
 ## Acknowledgements
 
- - [NuGet Package page](https://www.nuget.org/packages/console-weather/)
+- [NuGet Page](https://www.nuget.org/packages/console-weather/)
 
 
 ## License and support
@@ -75,3 +98,7 @@ For any project-related cases, please contact me on Discord: pazurkota#1001
 ## Lessons Learned
 
 This project basically was created to learn how to work with the API (in this case, weather API) and creating CLI apps using C#
+
+
+
+

console-weather/API/ApiData.cs

@@ -5,17 +5,17 @@
 using Newtonsoft.Json;
 using RestSharp;
 using static console_weather.API.ApiKeyHandler;
+using static console_weather.Settings;
 
 namespace console_weather.API; 
 
 public class ApiData {
     private const string BASE_URL = "http://api.weatherapi.com/v1/"; // Base API URL
-    public static string CITYNAME; // City name
 
     // Get request from API
     private string GetRequest() {
         string? apiKey = GetApiKey();
-        string cityName = CITYNAME;
+        string cityName = CityName;
 
         try {
             // Get API Key if invalid or not given
@@ -30,7 +30,7 @@ private string GetRequest() {
             };
 
             var client = new RestClient(options);
-            var request = new RestRequest($"forecast.json?key={apiKey}&q={cityName}&aqi=no&alerts=yes");
+            var request = new RestRequest($"forecast.json?key={apiKey}&q={cityName}&aqi=no&alerts=yes&days=2");
 
             var response = client.Execute(request).Content;
 
@@ -78,7 +78,8 @@ public Weather.Weather ParseData() {
         return new Weather.Weather {
             Current = jsonText.Current,
             Location = jsonText.Location,
-            Alerts = jsonText.Alerts
+            Alerts = jsonText.Alerts,
+            Forecast = jsonText.Forecast
         };
     }
 }

console-weather/Program.cs

@@ -1,8 +1,8 @@
 using System.CommandLine;
 using System.CommandLine.Builder;
 using System.CommandLine.Parsing;
-using console_weather;
 using console_weather.API;
+using static console_weather.Settings;
 
 namespace console_weather;
 
@@ -13,10 +13,24 @@ public static async Task<int> Main(string[] args) {
             "Get city name"
         );
 
+        var alertsOption = new Option<bool>(
+            "--no-alerts",
+            () => false,
+            "Hide weather alerts"
+        );
+
+        var forecastOption = new Option<bool>(
+            new []{"--forecast", "-f"},
+            () => false,
+            "Show weather forecast"
+        );
+
         var rootCommand = new RootCommand() {
-            cityOption
+            cityOption,
+            alertsOption,
+            forecastOption
         };
-        rootCommand.SetHandler(OnHandle, cityOption);
+        rootCommand.SetHandler(OnHandle, cityOption, alertsOption, forecastOption);
 
         var commandLineBuilder = new CommandLineBuilder(rootCommand)
             .UseDefaults();
@@ -25,13 +39,15 @@ public static async Task<int> Main(string[] args) {
         return await parser.InvokeAsync(args).ConfigureAwait(false);
     }
 
-    private static void OnHandle(string str) {
-        // Get city name from IP address if city name not provided
+    private static void OnHandle(string str, bool showAlerts, bool showForecast) {
         str ??= "auto:ip";
 
-        ApiData.CITYNAME = str;
-        ApiData data = new ApiData();
+        CityName = str;
+        DontShowAlerts = showAlerts;
+        ShowForecast = showForecast;
 
+        // Parse and show data
+        ApiData data = new ApiData();
         Console.WriteLine(data.ParseData());
     }
 }

console-weather/Settings.cs

@@ -0,0 +1,7 @@
+namespace console_weather; 
+
+public struct Settings {
+    public static string CityName { get; set; } = null!;
+    public static bool DontShowAlerts { get; set; }
+    public static bool ShowForecast { get; set; }
+}

console-weather/Weather/Alert.cs

@@ -16,4 +16,18 @@ public class Alert {
 public class Alerts {
     [JsonProperty("alert")]
     public List<Alert> WeatherAlerts { get; set; }
+
+    public override string ToString() {
+        if (Settings.DontShowAlerts || WeatherAlerts.Count == 0) {
+            return null;
+        }
+
+        string str = "";
+        
+        foreach (var alert in WeatherAlerts) {
+            str += $"{alert.AlertHeadline}:\n{alert.AlertDescription}\n\n";
+        }
+
+        return str;
+    }
 }

console-weather/Weather/Forecast.cs

@@ -0,0 +1,46 @@
+using Newtonsoft.Json;
+
+namespace console_weather.Weather; 
+
+public class ForecastDay {
+    [JsonProperty("date")] public string Date { get; set; } = null!;
+    [JsonProperty("day")] public Day Day { get; set; } = null!;
+}
+
+public class Day {
+    [JsonProperty("avgtemp_c")] public decimal AvgTemp { get; set; }
+    [JsonProperty("maxtemp_c")] public decimal MaxTemp { get; set; }
+    [JsonProperty("mintemp_c")] public decimal MinTemp { get; set; }
+    [JsonProperty("maxwind_kph")] public decimal MaxWindSpeed { get; set; }
+    [JsonProperty("daily_chance_of_rain")] public decimal ChanceOfRain { get; set; }
+    [JsonProperty("daily_chance_of_snow")] public decimal ChanceOfSnow { get; set; }
+    [JsonProperty("condition")] public Condition Condition { get; set; } = null!;
+}
+
+public class Forecast {
+    [JsonProperty("forecastday")] public List<ForecastDay> ForecastsDay { get; set; } = null!;
+
+    public override string ToString() {
+        if (!Settings.ShowForecast) {
+            return null;
+        }
+
+        string conditionState = ForecastsDay[1].Day.Condition.ConditionState;
+        
+        string maxTemp = ForecastsDay[1].Day.MaxTemp.ToString();
+        string minTemp = ForecastsDay[1].Day.MinTemp.ToString();
+        string avgTemp = ForecastsDay[1].Day.MinTemp.ToString();
+
+        string maxWind = ForecastsDay[1].Day.MaxTemp.ToString();
+
+        string chanceOfRain = ForecastsDay[1].Day.ChanceOfRain.ToString();
+        string chanceOfSnow = ForecastsDay[1].Day.ChanceOfSnow.ToString();
+        
+        string str = $"\n\nTomorrow it will be {conditionState}"
+                     + $"\nThe temperature range will be around {minTemp}°C to {maxTemp}°C, with average of {avgTemp}°C"
+                     + $"\nThe maximum wind speed will be around {maxWind} kph" 
+                     + $"\nThe chance of rain/snow: {chanceOfRain}% / {chanceOfSnow}%";
+
+        return str;
+    }
+}

console-weather/Weather/Weather.cs

@@ -5,32 +5,19 @@ public class Weather {
     public Location Location;
     public Current Current;
     public Alerts Alerts;
+    public Forecast Forecast;
 
     public override string ToString() {
-        string str = $"Weather for {Location.Name}, {Location.Country} (last update: {Current.LastUpdated}):";
+        string str = $"The current weather for {Location.Name} in {Location.Country} is {Current.Condition.ConditionState}\n" +
+                     $"The temperature is {Current.Temperature}°C, but feels like: {Current.FeelsLikeTemp}°C\n\n";
 
-        str += $"\n\nTemperature: {Current.Temperature}°C (feels like: {Current.FeelsLikeTemp}°C)";
-        str += $"\nWeather Condition: {Current.Condition.ConditionState}";
-        str += $"\nWind Speed: {Current.WindSpeed}kmp ({Current.WindDirection})";
-        str += $"\nAir Pressure: {Current.Pressure} mbar";
-        str += $"\nHumidity: {Current.Humidity}%";
-        str += $"\nCloud Cover: {Current.Cloud}%";
-        str += $"\n\nWeather Alerts:\n{ShowWeatherAlerts()}";
-
-        return str;
-    }
-
-    private string ShowWeatherAlerts() {
-        // Return "<none>" if no alerts issued
-        if (Alerts.WeatherAlerts.Count == 0) {
-            return "<none>";
-        }
-
-        string str = "";
-        
-        foreach (var alert in Alerts.WeatherAlerts) {
-            str += $"{alert.AlertEvent} issued by {alert.AlertHeadline}:\n{alert.AlertDescription}\n\n";
-        }
+        str += $"{Alerts}";
+        str += $"Current Wind speed is {Current.WindSpeed} kmp {Current.WindDirection}\n";
+        str += $"Current Air Pressure is {Current.Pressure} mbar\n";
+        str += $"Current Humidity is {Current.Humidity}%\n";
+        str += $"Current Cloud Cover is {Current.Cloud}%\n";
+        str += $"Last update: {Current.LastUpdated}";
+        str += $"{Forecast}";
 
         return str;
     }

console-weather/console-weather.csproj

@@ -15,13 +15,13 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/pazurkota/console-weather</PackageProjectUrl>
         <Description>Simple CLI App to check weather in C#</Description>
-        <PackageVersion>1.1</PackageVersion>
-        <VersionPrefix>1.1</VersionPrefix>
+        <PackageVersion>1.2</PackageVersion>
+        <VersionPrefix>1.2</VersionPrefix>
         <Title>Console Weather</Title>
         <Copyright>Copyright (c) 2023 pazurk0ta</Copyright>
         <RepositoryUrl>https://github.com/pazurkota/console-weather</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageReleaseNotes>Added auto-city lookup via IP</PackageReleaseNotes>
+        <PackageReleaseNotes>Added "--no-alerts" and "--forecast" arguments :D</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>