Merge branch 'tomlm/storageProvider' of https://github.com/jinek/Cons…

…olonia into tomlm/storageProvider
jinek · Nov 25, 2024 · b701be0 · b701be0
2 parents d083d59 + a0cd574
commit b701be0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs b/src/Consolonia.Core/Controls/FileOpenPicker.axaml.cs
@@ -19,11 +19,11 @@ public FileOpenPicker(FilePickerOpenOptions options)
         }
 
         /// <summary>
-        /// Gets the view model associated with this picker.
+        ///     Gets the view model associated with this picker.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when the DataContext is null or not of type FileOpenPickerViewModel.</exception>
-        public FileOpenPickerViewModel ViewModel => 
-            DataContext as FileOpenPickerViewModel 
+        public FileOpenPickerViewModel ViewModel =>
+            DataContext as FileOpenPickerViewModel
             ?? throw new InvalidOperationException("DataContext is not properly initialized.");
 
         private void InitializeComponent()

diff --git a/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs b/src/Consolonia.Core/Controls/FileSavePicker.axaml.cs
@@ -22,20 +22,20 @@ public FileSavePicker(FilePickerSaveOptions options)
         }
 
         /// <summary>
-        /// Gets the file picker save options associated with this dialog.
+        ///     Gets the file picker save options associated with this dialog.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
         public FilePickerSaveOptions Options =>
-            (DataContext as FileSavePickerViewModel)?.Options 
-                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+            (DataContext as FileSavePickerViewModel)?.Options
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
         /// <summary>
-        /// Gets the view model associated with this dialog.
+        ///     Gets the view model associated with this dialog.
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown when DataContext is null or of incorrect type.</exception>
-        public FileSavePickerViewModel ViewModel => 
-            DataContext as FileSavePickerViewModel 
-                ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
+        public FileSavePickerViewModel ViewModel =>
+            DataContext as FileSavePickerViewModel
+            ?? throw new InvalidOperationException($"Invalid DataContext. Expected {nameof(FileSavePickerViewModel)}");
 
         private void InitializeComponent()
         {

diff --git a/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs b/src/Consolonia.Core/Infrastructure/ConsoloniaStorageProvider.cs
@@ -82,7 +82,8 @@ public Task<IStorageFolder> TryGetWellKnownFolderAsync(WellKnownFolder wellKnown
             {
                 WellKnownFolder.Desktop => Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
                 WellKnownFolder.Documents => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                WellKnownFolder.Downloads => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                WellKnownFolder.Downloads => Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                 WellKnownFolder.Pictures => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures),
                 WellKnownFolder.Music => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic),
                 WellKnownFolder.Videos => Environment.GetFolderPath(Environment.SpecialFolder.MyVideos),

diff --git a/src/Tests/Consolonia.Core.Tests/StorageTests.cs b/src/Tests/Consolonia.Core.Tests/StorageTests.cs
@@ -112,7 +112,8 @@ public async Task TestWellKnownFolder()
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Downloads);
             if (folder != null)
-                Assert.AreEqual(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                Assert.AreEqual(
+                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
                     folder.Path.LocalPath);
 
             folder = await storageProvider.TryGetWellKnownFolderAsync(WellKnownFolder.Desktop);