Merge branch 'release/v1.7'

Author: unknown

README.md

@@ -36,6 +36,7 @@ $ dotnet tool update --global console-weather
 ```
 ## Usage
 
+### Commands:
 ```console
 # To use aplication, type:
 $ weather
@@ -59,6 +60,34 @@ $ weather -a
 $ weather --dont-show-icons
 ```
 
+### Default settings:
+This project uses default settings that are stored in `config.json` file. You can change them by editing this file:
+```json
+{
+  "api-key": "api-key",
+  "default-city": "Sydney",
+  "dont-show-alerts": false,
+  "show-forecast": false,
+  "units": "EU",
+  "air-quality": true,
+  "dont-show-icons": false
+}
+```
+
+- `"default-city"` - default city that will be used if you don't specify it in command
+- `"dont-show-alerts"` - if set to `true`, weather alerts won't be shown
+- `"show-forecast"` - if set to `true`, weather forecast will be shown
+- `"units"` - units that will be used to show weather data. Possible values: `eu`, `si`, `us`, `uk`
+- `"air-quality"` - if set to `true`, air quality data will be shown
+- `"dont-show-icons"` - if set to `true`, weather icons won't be shown
+
+> **Note**: These settings is not required. You can use application without them.
+
+The config file is kept in:
+- Windows: `C:\Users\USERNAME\Documents\weather_data\config.json`
+- MacOS: `/Users/USERNAME/Documents/weather_data/config.json`
+- Linux: `/home/USERNAME/Documents/weather_data/config.json`
+
 
 ## Demo
 ```console

console-weather/Program.cs

@@ -16,31 +16,31 @@ public static async Task<int> Main(string[] args) {
 
         var alertsOption = new Option<bool>(
             "--no-alerts",
-            () => false,
+            DefaultSettings.DontShowAlerts,
             "Hide weather alerts"
         );
 
         var forecastOption = new Option<bool>(
             new []{"--forecast", "-f"},
-            () => false,
+            DefaultSettings.ShowForecast,
             "Show weather forecast"
         );
 
         var unitsOption = new Option<Units.UnitType>(
             new []{"--units", "-u"},
-            () => Units.UnitType.Eu,
+            DefaultSettings.GetUnitType,
             "Set weather units"
         );
 
         var airQualityOption = new Option<bool>(
             new []{"--air-quality", "-a"},
-            () => false,
+            DefaultSettings.GetAirQuality,
             "Show air quality"
         );
-        
+
         var iconsOption = new Option<bool>(
-            new []{"--dont-show-icons"},
-            () => false,
+            new[] { "--dont-show-icons" },
+            DefaultSettings.DontShowIcons,
             "Disable weather icons"
         );
 
@@ -62,7 +62,7 @@ public static async Task<int> Main(string[] args) {
     }
 
     private static void OnHandle(string cityName, bool showAlerts, bool showForecast, Units.UnitType units, bool airQuality, bool showIcons) {
-        CityName = cityName ?? "auto:ip";
+        CityName = cityName ?? DefaultSettings.GetCityName();
         DontShowAlerts = showAlerts;
         ShowForecast = showForecast;
         Settings.Units = units;

console-weather/Utility/DefaultSettings.cs

@@ -0,0 +1,65 @@
+using Newtonsoft.Json.Linq;
+using console_weather.API;
+
+namespace console_weather.Utility; 
+
+public class DefaultSettings {
+    private static string GetJsonContent() {
+        string filePath = JsonHandler.Configpath;
+        
+        if (!File.Exists(filePath)) {
+            JsonHandler.CreateConfigJsonFile();
+        }
+        
+        string jsonText = File.ReadAllText(filePath);
+        return jsonText;
+    }
+
+    public static bool DontShowAlerts() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        bool dontShowAlerts = jObject["dont-show-alerts"]?.ToObject<bool>() ?? false;
+
+        return dontShowAlerts;
+    }
+
+    public static bool ShowForecast() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        bool showForecast = jObject["show-forecast"]?.ToObject<bool>() ?? false;
+        
+        return showForecast;
+    }
+
+    public static Units.UnitType GetUnitType() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        string unitType = jObject["units"]?.ToObject<string>()?.ToLower() ?? "eu";
+        
+        return unitType switch {
+            "eu" => Units.UnitType.Eu,
+            "us" => Units.UnitType.Us,
+            "si" => Units.UnitType.Si,
+            "uk" => Units.UnitType.Uk,
+            _ => Units.UnitType.Eu
+        };
+    }
+    
+    public static bool GetAirQuality() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        bool airQuality = jObject["air-quality"]?.ToObject<bool>() ?? false;
+        
+        return airQuality;
+    }
+    
+    public static bool DontShowIcons() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        bool dontShowIcons = jObject["dont-show-icons"]?.ToObject<bool>() ?? false;
+        
+        return dontShowIcons;
+    }
+
+    public static string GetCityName() {
+        JObject jObject = JObject.Parse(GetJsonContent());
+        string cityName = jObject["default-city"]?.ToObject<string>() ?? "auto:ip";
+        
+        return cityName;
+    }
+}

console-weather/Utility/PrintData.cs

@@ -20,11 +20,11 @@ public static string Print() {
         str += $"Current Precipitation: {ShowPrecipitation()}\n";
         str += $"Current Humidity: {Data.Current.Humidity}%\n";
         str += $"Current Cloud Cover: {Data.Current.Cloud}%\n";
-        str += $"Current UV Index: {Data.Current.UvIndex} ({ShowUvIndex()})";
+        str += $"Current UV Index: {Data.Current.UvIndex} ({ShowUvIndex()})\n\n";
         str += ShowAlerts();
         str += ShowForecast();
         str += ShowAirQuality();
-        str += $"\n\nLast Update: {Data.Current.LastUpdated}";
+        str += $"Last Update: {Data.Current.LastUpdated}";
 
         return str;
     }
@@ -41,7 +41,7 @@ private static string ShowAlerts() {
             return "";
         }
 
-        return alerts.WeatherAlerts.Aggregate("\n\nALERTS:\n", (current, alert) => current + $"{alert.AlertHeadline}:\n{alert.AlertDescription}\n\n");
+        return alerts.WeatherAlerts.Aggregate("ALERTS:\n", (current, alert) => current + $"{alert.AlertHeadline}:\n{alert.AlertDescription}\n\n");
     }
 
     private static string ShowForecast() {
@@ -53,14 +53,14 @@ private static string ShowForecast() {
 
         var forecast = Data.Forecast.ForecastsDay[1].Day;
 
-        str += "\n\nFORECAST:";
+        str += "FORECAST:";
         str += $"\nTomorrow it will be {forecast.Condition.ConditionState}";
         str += $"{ShowForecastTemp()}";
         str += $"\nMaximum Wind Speed: {ShowForecastWindSpeed()}";
         str += $"\nAverage Visibility: {ShowForecastVisibility()}";
         str += $"\nMaximum Precipitation: {ShowForecastPrecipitation()}";
         str += $"\nUV Index: {forecast.UvIndex} ({ShowForecastUvIndex()})";
-        str += $"\nChance of rain/snow: {forecast.ChanceOfRain}% / {forecast.ChanceOfSnow}%";
+        str += $"\nChance of rain/snow: {forecast.ChanceOfRain}% / {forecast.ChanceOfSnow}%\n\n";
 
         return str;
     }
@@ -135,14 +135,14 @@ private static string ShowAirQuality() {
 
         string str = "";
 
-        str += "\n\nAIR QUALITY:\n";
+        str += "AIR QUALITY:\n";
         str += $"Carbon Monoxide: {Math.Round(airQuality.Co, 2)} μg/m³\n";
         str += $"Nitrogen Dioxide: {Math.Round(airQuality.No2, 2)} μg/m³\n";
         str += $"Ozone: {Math.Round(airQuality.O3, 2)} μg/m³\n";
         str += $"Sulphur Dioxide: {Math.Round(airQuality.So2, 2)} μg/m³\n";
         str += $"Fine Particles Matter: {Math.Round(airQuality.Pm25, 2)} μg/m³\n";
         str += $"Coarse Particles Matter: {Math.Round(airQuality.Pm10, 2)} μg/m³\n";
-        str += $"US Epa Index: {airQuality.UsEpaIndex} ({PrintEpaStandards(airQuality.UsEpaIndex)})";
+        str += $"US Epa Index: {airQuality.UsEpaIndex} ({PrintEpaStandards(airQuality.UsEpaIndex)})\n\n";
 
         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.6.1</PackageVersion>
-        <VersionPrefix>1.6.1</VersionPrefix>
+        <PackageVersion>1.7</PackageVersion>
+        <VersionPrefix>1.7</VersionPrefix>
         <Title>Console Weather</Title>
         <Copyright>Copyright (c) 2023 pazurk0ta</Copyright>
         <RepositoryUrl>https://github.com/pazurkota/console-weather</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageReleaseNotes>Added weather icons and --dont-show-icons argument</PackageReleaseNotes>
+        <PackageReleaseNotes>Added default setting</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>