Update logic for saving when there is no write permission #137

Ruben2776 · Apr 11, 2024 · e9e272e · e9e272e
1 parent 1edb313
commit e9e272e
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 31 deletions.
diff --git a/src/PicView.Avalonia/Keybindings/KeybindingsHelper.cs b/src/PicView.Avalonia/Keybindings/KeybindingsHelper.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using PicView.Core.Keybindings;
 
 namespace PicView.Avalonia.Keybindings;
 
@@ -117,9 +118,7 @@ public static async Task UpdateKeyBindingsFile()
  var json = JsonSerializer.Serialize(
  CustomShortcuts.ToDictionary(kvp => kvp.Key.ToString(),
  kvp => GetFunctionNameByFunction(kvp.Value)), typeof(Dictionary<string, string>), SourceGenerationContext.Default);
-
- var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config/keybindings.json");
- await File.WriteAllTextAsync(path, json).ConfigureAwait(false);
+ await KeybindingFunctions.SaveKeyBindingsFile(json).ConfigureAwait(false);
  }
  catch (Exception exception)
  {

diff --git a/src/PicView.Core/Config/SettingsHelper.cs b/src/PicView.Core/Config/SettingsHelper.cs
@@ -122,9 +122,14 @@ public static async Task<bool> SaveSettingsAsync()
  var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config/UserSettings.json");
  await PerformSave(path).ConfigureAwait(false);
  }
- catch (UnauthorizedAccessException ex)
+ catch (Exception ex)
  {
  var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ruben2776/PicView/Config/UserSettings.json");
+ if (!File.Exists(path))
+ {
+ var fileInfo = new FileInfo(path);
+ fileInfo.Directory?.Create();
+ }
  try
  {
  await PerformSave(path).ConfigureAwait(false);
@@ -135,11 +140,6 @@ public static async Task<bool> SaveSettingsAsync()
  return false;
  }
  }
- catch (Exception ex)
- {
- Trace.WriteLine($"{nameof(SaveSettingsAsync)} error saving settings:\n {ex.Message}");
- return false;
- }
  return true;
  }
 

diff --git a/src/PicView.Core/Keybindings/KeybindingFunctions.cs b/src/PicView.Core/Keybindings/KeybindingFunctions.cs
@@ -0,0 +1,25 @@
+namespace PicView.Core.Keybindings;
+
+public static class KeybindingFunctions
+{
+ public static async Task SaveKeyBindingsFile(string json)
+ {
+ try
+ {
+ var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config/keybindings.json");
+ await using var writer = new StreamWriter(path);
+ await writer.WriteAsync(json).ConfigureAwait(false);
+ }
+ catch (Exception)
+ {
+ var newPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ruben2776/PicView/Config/keybindings.json");
+ if (!File.Exists(newPath))
+ {
+ var fileInfo = new FileInfo(newPath);
+ fileInfo.Directory?.Create();
+ }
+ await using var newWriter = new StreamWriter(newPath);
+ await newWriter.WriteAsync(json).ConfigureAwait(false);
+ }
+ }
+}
diff --git a/src/PicView.WPF/Shortcuts/CustomKeybindings.cs b/src/PicView.WPF/Shortcuts/CustomKeybindings.cs
@@ -1,5 +1,5 @@
-using PicView.WPF.UILogic;
-using System.Diagnostics;
+using PicView.Core.Keybindings;
+using PicView.WPF.UILogic;
 using System.IO;
 using System.Text.Json;
 using System.Windows.Input;
@@ -117,27 +117,15 @@ internal static async Task UpdateKeybindings(string json)
  /// </summary>
  internal static async Task UpdateKeyBindingsFile()
  {
- try
- {
- // Serialize the CustomShortcuts dictionary to JSON
- var json =
- JsonSerializer.Serialize(CustomShortcuts.ToDictionary(kvp => kvp.Key.ToString(),
- kvp => UIHelper.GetFunctionNameByFunction(kvp.Value)), new JsonSerializerOptions
- {
- WriteIndented = true
- });
+ // Serialize the CustomShortcuts dictionary to JSON
+ var json =
+ JsonSerializer.Serialize(CustomShortcuts.ToDictionary(kvp => kvp.Key.ToString(),
+ kvp => UIHelper.GetFunctionNameByFunction(kvp.Value)), new JsonSerializerOptions
+ {
+ WriteIndented = true
+ });
 
- // Write the JSON to the keybindings.json file
- var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config/keybindings.json");
- await File.WriteAllTextAsync(path, json).ConfigureAwait(false);
- }
- catch (Exception exception)
- {
-#if DEBUG
- Trace.WriteLine($"{nameof(UpdateKeyBindingsFile)} exception:\n{exception.Message}");
-#endif
- Tooltip.ShowTooltipMessage(exception.Message, true, TimeSpan.FromSeconds(5));
- }
+ await KeybindingFunctions.SaveKeyBindingsFile(json).ConfigureAwait(false);
  }
 
  internal static async Task SetDefaultKeybindings()