Integration Features

src/DtronixPackage.Tests/PackageManagerViewModelTests/TestPackageManagerViewModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using System.Threading.Tasks;
 using DtronixPackage.ViewModel;
@@ -56,21 +57,27 @@
             e.Package.Opening = PackageOpening;
         }
 
-        protected override bool BrowseOpenFile(out string path, out bool openReadOnly)
+        protected override async ValueTask<BrowseFileResult> BrowseOpenFile()
         {
             var args = new BrowseEventArgs();
             BrowsingOpen?.Invoke(args);
-            path = args.Path;
-            openReadOnly = args.ReadOnly;
-            return args.Result;
+            return new BrowseFileResult()
+            {
+                Success = args.Result,
+                Path = args.Path,
+                OpenReadOnly = args.ReadOnly
+            };
         }
 
-        protected override bool BrowseSaveFile(out string path)
+        protected override async ValueTask<BrowseFileResult> BrowseSaveFile()
         {
             var args = new BrowseEventArgs();
             BrowsingSave?.Invoke(args);
-            path = args.Path;
-            return args.Result;
+            return new BrowseFileResult()
+            {
+                Success = args.Result,
+                Path = args.Path
+            };
         }
 
         internal override async Task<bool> SaveAsInternal(PackageManagerViewModelPackage package)

src/DtronixPackage/ViewModel/BrowseFileResult.cs

@@ -0,0 +1,20 @@
+namespace DtronixPackage.ViewModel;
+
+public class BrowseFileResult
+{
+    /// <summary>
+    /// True on successful open/selection.  If false, cancel the process
+    /// </summary>
+    public bool Success { get; set; }
+
+    /// <summary>
+    /// The path to the file
+    /// </summary>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// Set to true to open the package in a read-only state; False to open normally.
+    /// Only used with BrowseOpenFile
+    /// </summary>
+    public bool OpenReadOnly { get; set; }
+}

src/DtronixPackage/ViewModel/PackageManagerViewModel.cs

@@ -117,22 +117,18 @@ protected PackageManagerViewModel(string appName)
 
     protected abstract void InvokeOnDispatcher(Action action);
 
+
     /// <summary>
-    /// Called when browsing for a package to open.  Normally paired with OpenFileDialog
+    /// Called when browsing for a package to open.
     /// </summary>
-    /// <remarks>Normally paired with SaveFileDialog</remarks>
-    /// <param name="path">Path of the package to open.  Must exist.</param>
-    /// <param name="openReadOnly">Set to true to open the package in a read-only state; False to open normally.</param>
-    /// <returns>True on successful opening of package. False to cancel the opening process.</returns>
-    protected abstract bool BrowseOpenFile(out string path, out bool openReadOnly);
+    /// <returns>Result of the open process. Success will be set to false if the opening process should be canceled.</returns>
+    protected abstract ValueTask<BrowseFileResult> BrowseOpenFile();
 
     /// <summary>
     /// Called when browsing for destination to save a package.
     /// </summary>
-    /// <remarks>Normally paired with SaveFileDialog</remarks>
-    /// <param name="path">Destination path for the package to save.</param>
-    /// <returns>True on successful selection of package destination. False to cancel the saving process.</returns>
-    protected abstract bool BrowseSaveFile(out string path);
+    /// <returns>Result of the open process. Success will be set to false if the saving process should be canceled.</returns>
+    protected abstract ValueTask<BrowseFileResult> BrowseSaveFile();
 
     protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     {
@@ -268,12 +264,12 @@ public virtual async Task<bool> Open()
         if (!await TryClose())
             return false;
 
-        var result = BrowseOpenFile(out var path, out var readOnly);
+        var result = await BrowseOpenFile();
 
-        if (result != true)
+        if (result.Success != true)
             return false;
 
-        return await Open(path, readOnly);
+        return await Open(result.Path, result.OpenReadOnly);
     }
 
     public virtual async Task<bool> Open(string path, bool forceReadOnly)
@@ -434,9 +430,11 @@ internal virtual async Task<bool> SaveAsInternal(TPackage? package)
         if (package == null)
             return false;
 
-        if (BrowseSaveFile(out var path))
+        var browseResult = await BrowseSaveFile();
+
+        if (browseResult.Success)
         {
-            var result = await package.Save(path);
+            var result = await package.Save(browseResult.Path);
 
             switch (result.SaveResult)
             {
@@ -513,4 +511,4 @@ private void PackageOnMonitoredChanged(object? sender, EventArgs e)
             SaveCommand.SetCanExecute(Package?.IsContentModified == true);
         });
     }
-}
+}