fix(files): report success cancellation and errors with safe next actions (U02)

2026-11-02 06:23:59 +01:00
parent a3c1bee09e
commit 5e0ad197f0
15 changed files with 288 additions and 200 deletions
@@ -1,90 +1,49 @@
+using Duempelkas.App.Services.Models;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Duempelkas.App.Services;

 namespace Duempelkas.Infrastructure.Services;

-public class FileSaveService : IFileSaveService
+public class FileSaveService(IFileDialogService dialogs) : IFileSaveService
 {
-    public async Task<string?> SaveFileAsync(byte[] content, string suggestedFileName)
+    public async Task<FileOperationResult> SaveFileAsync(byte[] content, string suggestedFileName)
    {
-        var filePath = await ShowSaveDialogAsync(suggestedFileName);
-        if (filePath == null) return null;
-
-        await File.WriteAllBytesAsync(filePath, content);
-        return filePath;
-    }
-
-    public Task OpenFileAsync(string filePath)
-    {
-        if (string.IsNullOrWhiteSpace(filePath) || !File.Exists(filePath))
+        string? staged = null;
+        try
        {
-            return Task.CompletedTask;
+            var path = await dialogs.SaveAsync(suggestedFileName);
+            if (string.IsNullOrWhiteSpace(path)) return FileOperationResult.Cancelled();
+            staged = path + $".{Guid.NewGuid():N}.tmp";
+            await File.WriteAllBytesAsync(staged, content);
+            File.Move(staged, path, overwrite: true);
+            return new(FileOperationStatus.Success, "Datei gespeichert.", path);
        }
-
-        return Task.Run(() =>
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = filePath,
-                    UseShellExecute = true
-                });
-
-                return;
-            }
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                Process.Start("open", filePath);
-                return;
-            }
-
-            Process.Start("xdg-open", filePath);
-        });
+        catch (Exception ex) { return FileOperationResult.Error(ex); }
+        finally { try { if (staged != null && File.Exists(staged)) File.Delete(staged); } catch { } }
    }

-    private static Task<string?> ShowSaveDialogAsync(string suggestedFileName)
+    public Task<FileOperationResult> OpenFileAsync(string filePath) => OpenAsync(filePath, false);
+    public Task<FileOperationResult> OpenFolderAsync(string filePath) => OpenAsync(filePath, true);
+
+    private static Task<FileOperationResult> OpenAsync(string filePath, bool folder) => Task.Run(() =>
    {
-        return Task.Run(() =>
+        try
        {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Fallback: save to Documents folder
-                var documentsPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-                return Path.Combine(documentsPath, suggestedFileName);
-            }
+            var path = folder ? Path.GetDirectoryName(Path.GetFullPath(filePath))! : filePath;
+            if (folder ? !Directory.Exists(path) : !File.Exists(path))
+                throw new FileNotFoundException("Der gespeicherte Pfad ist nicht mehr vorhanden.");
+            var start = new ProcessStartInfo { UseShellExecute = true };
+            if (OperatingSystem.IsWindows()) start.FileName = path;
+            else { start.FileName = OperatingSystem.IsMacOS() ? "open" : "xdg-open"; start.ArgumentList.Add(path); }
+            using var process = Process.Start(start) ?? throw new IOException("Kein Programm zum Öffnen gefunden.");
+            return new FileOperationResult(FileOperationStatus.Success, folder ? "Ordner geöffnet." : "Datei geöffnet.");
+        }
+        catch (Exception ex)
+        {
+            return new FileOperationResult(FileOperationStatus.Error,
+                "Der Pfad konnte nicht geöffnet werden. Die gespeicherte Datei bleibt erhalten; bitte den Speicherort im Datei-Explorer öffnen.", filePath, ex.Message);
+        }
+    });

-            var extension = Path.GetExtension(suggestedFileName);
-            var filterName = extension == ".pdf" ? "PDF-Dateien" : "Dateien";
-            var filter = $"{filterName} (*{extension})|*{extension}|Alle Dateien (*.*)|*.*";
-
-            var script = $@"
-Add-Type -AssemblyName System.Windows.Forms
-$dialog = New-Object System.Windows.Forms.SaveFileDialog
-$dialog.Filter = '{filter}'
-$dialog.FileName = '{suggestedFileName.Replace("'", "''")}'
-$dialog.Title = 'Datei speichern'
-if ($dialog.ShowDialog() -eq 'OK') {{ $dialog.FileName }} else {{ '' }}
-";
-
-            var psi = new ProcessStartInfo
-            {
-                FileName = "powershell",
-                Arguments = $"-NoProfile -Command \"{script.Replace("\"", "\\\"\"")}\"",
-                RedirectStandardOutput = true,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-
-            using var process = Process.Start(psi);
-            if (process == null) return null;
-
-            var result = process.StandardOutput.ReadToEnd().Trim();
-            process.WaitForExit();
-
-            return string.IsNullOrWhiteSpace(result) ? null : result;
-        });
-    }
 }