Merge branch 'release/v1.1'

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

@@ -32,6 +32,10 @@ The key is kept in `C:\Users\USERNAME\Documents\weather_data`
 ## Usage
 To use application, just simply type:
 ```bash
+weather
+```
+To get weather info from a specified city, type:
+```bash
 weather -c "City Name"
 ```
 
@@ -59,7 +63,7 @@ Weather Alerts:
 ```
 ## Acknowledgements
 
- - [NuGet Package page](https://www.nuget.org/packages/console-weather/)
+ - [NuGet Page](https://www.nuget.org/packages/console-weather/)
 
 
 ## License and support
@@ -71,3 +75,4 @@ 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

@@ -20,7 +20,7 @@ private string GetRequest() {
         try {
             // Get API Key if invalid or not given
             while (!CheckApiKeyValidity(apiKey)) {
-                apiKey = SetApiKey();
+                SetApiKey();
             }
 
             // Client options

console-weather/API/ApiKeyHandler.cs

@@ -21,7 +21,7 @@ public class ApiKeyHandler {
     }
 
     // Set API Key 
-    public static string? SetApiKey() {
+    public static void SetApiKey() {
         string filePath = CONFIGPATH;
 
         Console.Write("\nYour API Key is invalid or missing." +
@@ -35,7 +35,5 @@ public class ApiKeyHandler {
         config["api-key"] = apiKey;
 
         File.WriteAllText(filePath, config.ToString());
-
-        return GetApiKey();
     }
 }

console-weather/Program.cs

@@ -26,6 +26,9 @@ public static async Task<int> Main(string[] args) {
     }
 
     private static void OnHandle(string str) {
+        // Get city name from IP address if city name not provided
+        str ??= "auto:ip";
+        
         ApiData.CITYNAME = str;
         ApiData data = new ApiData();
 

console-weather/Weather/Weather.cs

@@ -9,7 +9,7 @@ public class Weather {
     public override string ToString() {
         string str = $"Weather for {Location.Name}, {Location.Country} (last update: {Current.LastUpdated}):";
 
-        str += $"\n\nTeperature: {Current.Temperature}°C (feels like: {Current.FeelsLikeTemp}°C)";
+        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";
@@ -21,14 +21,16 @@ public override string ToString() {
     }
 
     private string ShowWeatherAlerts() {
-        string str = "";
+        // Return "<none>" if no alerts issued
+        if (Alerts.WeatherAlerts.Count == 0) {
+            return "<none>";
+        }
 
-        if (Alerts.WeatherAlerts.Count > 0) {
-            foreach (var alert in Alerts.WeatherAlerts) {
-                str += $"{alert.AlertEvent} issued by {alert.AlertHeadline}:\n{alert.AlertDescription}\n\n";
-            }
+        string str = "";
+        
+        foreach (var alert in Alerts.WeatherAlerts) {
+            str += $"{alert.AlertEvent} issued by {alert.AlertHeadline}:\n{alert.AlertDescription}\n\n";
         }
-        else str = "<none>";
 
         return str;
     }

console-weather/console-weather.csproj

@@ -15,12 +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.0</PackageVersion>
+        <PackageVersion>1.1</PackageVersion>
+        <VersionPrefix>1.1</VersionPrefix>
         <Title>Console Weather</Title>
         <Copyright>Copyright (c) 2023 pazurk0ta</Copyright>
         <RepositoryUrl>https://github.com/pazurkota/console-weather</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
+        <PackageReleaseNotes>Added auto-city lookup via IP</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>