Merge pull request #55 from 3rob3/Weather-fixes,-warning-fixes

Weather fixes/changes
immichFrame · Apr 17, 2024 · 0978dcd · 0978dcd
2 parents 81384ec + aa9fa01
commit 0978dcd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/ImmichFrame/Helpers/WeatherHelper.cs b/ImmichFrame/Helpers/WeatherHelper.cs
@@ -1,4 +1,5 @@
 using ImmichFrame.Models;
+using Microsoft.Extensions.Options;
 using OpenWeatherMap;
 using OpenWeatherMap.Models;
 using System.Threading.Tasks;
@@ -7,18 +8,18 @@ namespace ImmichFrame.Helpers
 {
     public class WeatherHelper
     {
-        private static readonly OpenWeatherMapOptions Options = new OpenWeatherMapOptions
-        {
-            ApiKey = Settings.CurrentSettings.WeatherApiKey,
-            UnitSystem = Settings.CurrentSettings.UnitSystem,
-            Language = Settings.CurrentSettings.Language,
-        };
         public static Task<WeatherInfo?> GetWeather()
         {
             var settings = Settings.CurrentSettings;
-            return GetWeather(settings.WeatherLat, settings.WeatherLong);
+            OpenWeatherMapOptions options = new OpenWeatherMapOptions
+            {
+                ApiKey = Settings.CurrentSettings.WeatherApiKey,
+                UnitSystem = Settings.CurrentSettings.UnitSystem,
+                Language = Settings.CurrentSettings.Language,
+            };
+            return GetWeather(settings.WeatherLat, settings.WeatherLong, options);
         }
-        public static async Task<WeatherInfo?> GetWeather(double latitude, double longitude)
+        public static async Task<WeatherInfo?> GetWeather(double latitude, double longitude, OpenWeatherMapOptions Options)
         {
             try
             {

diff --git a/ImmichFrame/Models/AssetResponseDto.cs b/ImmichFrame/Models/AssetResponseDto.cs
@@ -60,7 +60,7 @@ private async Task<Stream> ServeImage()
         var localDir = Path.GetDirectoryName(localPath);
         if (!Directory.Exists(localDir))
         {
-            Directory.CreateDirectory(localDir);
+            Directory.CreateDirectory(localDir!);
         }
 
         if (File.Exists(localPath))

diff --git a/ImmichFrame/Models/Settings.cs b/ImmichFrame/Models/Settings.cs
@@ -209,7 +209,7 @@ private static Settings ParseSettings(Dictionary<string, object> SettingsValues)
             switch (SettingsValue.Key)
             {
                 case "ImmichServerUrl":
-                    var url = value.ToString().TrimEnd('/');
+                    var url = value.ToString()!.TrimEnd('/');
                     // Match URL or IP
                     if (!Regex.IsMatch(url, @"^(https?:\/\/)?(([a-zA-Z0-9\.\-_]+(\.[a-zA-Z]{2,})+)|(\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b))(\:\d{1,5})?$"))
                         throw new SettingsNotValidException($"Value of '{SettingsValue.Key}' is not valid. (' {value} ')");
@@ -263,14 +263,14 @@ private static Settings ParseSettings(Dictionary<string, object> SettingsValues)
                     property.SetValue(settings, value);
                     break;
                 case "UnitSystem":
-                    if (!Regex.IsMatch(value.ToString(), @"^(?i)(metric|imperial)$"))
+                    if (!Regex.IsMatch(value.ToString()!, @"^(?i)(metric|imperial)$"))
                         throw new SettingsNotValidException($"Value of '{SettingsValue.Key}' is not valid. ('{value}')");
-                    value = value.ToString().ToLower() == "metric" ? OpenWeatherMap.UnitSystem.Metric : OpenWeatherMap.UnitSystem.Imperial;
+                    value = value.ToString()!.ToLower() == "metric" ? OpenWeatherMap.UnitSystem.Metric : OpenWeatherMap.UnitSystem.Imperial;
                     property.SetValue(settings, value);
                     break;
                 case "WeatherLatLong":
                     // Regex match Lat/Lon
-                    if (!Regex.IsMatch(value.ToString(), @"^(-?\d+(\.\d+)?),\s*(-?\d+(\.\d+)?)$"))
+                    if (!Regex.IsMatch(value.ToString()!, @"^(-?\d+(\.\d+)?),\s*(-?\d+(\.\d+)?)$"))
                         throw new SettingsNotValidException($"Value of '{SettingsValue.Key}' is not valid. ('{value}')");
                     property.SetValue(settings, value);
                     break;

diff --git a/ImmichFrame/ViewModels/SettingsViewModel.cs b/ImmichFrame/ViewModels/SettingsViewModel.cs
@@ -56,7 +56,7 @@ public void AddPersonAction()
 
         public void RemovePersonAction(object param)
         {
-            var item = PeopleList.First(x => x.Id == Guid.Parse(param.ToString()));
+            var item = PeopleList.First(x => x.Id == Guid.Parse(param.ToString()!));
             PeopleList?.Remove(item);
         }
 
@@ -67,7 +67,7 @@ public void AddAlbumAction()
 
         public void RemoveAlbumAction(object param)
         {
-            var item = AlbumList.First(x => x.Id == Guid.Parse(param.ToString()));
+            var item = AlbumList.First(x => x.Id == Guid.Parse(param.ToString()!));
             AlbumList?.Remove(item);
         }
 

diff --git a/ImmichFrame/Views/MainView.axaml.cs b/ImmichFrame/Views/MainView.axaml.cs
@@ -173,7 +173,7 @@ public void btnSettings_Click(object? sender, RoutedEventArgs args)
         if (!Settings.IsFromXmlFile)
         {
             ExitView();
-            ((NavigatableViewModelBase)this.DataContext).Navigate(new SettingsViewModel());
+            ((NavigatableViewModelBase)this.DataContext!).Navigate(new SettingsViewModel());
         }
     }
 

diff --git a/ImmichFrame/Views/SettingsView.axaml b/ImmichFrame/Views/SettingsView.axaml
@@ -131,10 +131,6 @@
 					<TextBlock Text="ImageDescFontSize"/>
 					<TextBox Text="{Binding Settings.ImageDescFontSize}"/>
 				</StackPanel>
-				<StackPanel>
-					<TextBlock Text="ShowWeather"/>
-					<CheckBox IsChecked="{Binding Settings.ShowWeather}"/>
-				</StackPanel>
         <StackPanel>
           <TextBlock Text="WeatherFontSize"/>
           <TextBox Text="{Binding Settings.WeatherFontSize}"/>