Record payload size in uninstall registry (#122)

Author: SuperJMN

src/DotnetPackaging.Exe.Installer/Core/DefaultInstallerPayload.cs

@@ -11,6 +11,9 @@ public sealed class DefaultInstallerPayload : IInstallerPayload
     public Task<Result<InstallerMetadata>> GetMetadata(CancellationToken ct = default)
         => EnsureLoaded(ct).Map(p => p.Metadata);
 
+    public Task<Result<long>> GetContentSize(CancellationToken ct = default)
+        => EnsureLoaded(ct).Map(p => p.ContentSizeBytes);
+
     public Task<Result> CopyContents(string targetDirectory, IObserver<Progress>? progressObserver = null, CancellationToken ct = default)
         => EnsureLoaded(ct).Bind(p => Task.Run(() =>
             PayloadExtractor.CopyContentTo(p, targetDirectory, progressObserver), ct));

src/DotnetPackaging.Exe.Installer/Core/IInstallerPayload.cs

@@ -7,6 +7,8 @@ public interface IInstallerPayload
 {
     Task<Result<InstallerMetadata>> GetMetadata(CancellationToken ct = default);
 
+    Task<Result<long>> GetContentSize(CancellationToken ct = default);
+
     Task<Result> CopyContents(
         string targetDirectory,
         IObserver<Progress>? progressObserver = null,

src/DotnetPackaging.Exe.Installer/Core/Installer.cs

@@ -6,14 +6,14 @@ namespace DotnetPackaging.Exe.Installer.Core;
 
 internal static class Installer
 {
-    public static Result<string> Install(string targetDir, InstallerMetadata meta)
+    public static Result<string> Install(string targetDir, InstallerMetadata meta, long payloadSizeBytes)
     {
         return ResolveMainExe(targetDir, meta)
             .Tap(exePath => ShortcutService.TryCreateStartMenuShortcut(meta.ApplicationName, exePath))
-            .Tap(exePath => RegisterUninstaller(targetDir, meta, exePath));
+            .Tap(exePath => RegisterUninstaller(targetDir, meta, exePath, payloadSizeBytes));
     }
 
-    private static void RegisterUninstaller(string targetDir, InstallerMetadata meta, string mainExePath)
+    private static void RegisterUninstaller(string targetDir, InstallerMetadata meta, string mainExePath, long payloadSizeBytes)
     {
         if (Environment.ProcessPath is null)
         {
@@ -44,11 +44,12 @@ private static void RegisterUninstaller(string targetDir, InstallerMetadata meta
             WindowsRegistryService.Register(
                 meta.AppId,
                 meta.ApplicationName,
-                meta.Version, 
-                meta.Vendor, 
-                targetDir, 
-                $"\"{uninstallerPath}\" --uninstall", 
-                mainExePath);
+                meta.Version,
+                meta.Vendor,
+                targetDir,
+                $"\"{uninstallerPath}\" --uninstall",
+                mainExePath,
+                payloadSizeBytes);
         }
         catch (Exception ex)
         {

src/DotnetPackaging.Exe.Installer/Core/MetadataFilePayload.cs

@@ -49,6 +49,11 @@ public Task<Result<InstallerMetadata>> GetMetadata(CancellationToken ct = defaul
         }, ex => $"Failed to read metadata: {ex.Message}"));
     }
 
+    public Task<Result<long>> GetContentSize(CancellationToken ct = default)
+    {
+        return Task.FromResult(Result.Failure<long>("Disk-only payload does not provide installation content."));
+    }
+
     public Task<Result> CopyContents(string targetDirectory, IObserver<Progress>? progressObserver = null, CancellationToken ct = default)
     {
         return Task.FromResult(Result.Failure("Disk-only payload does not provide installation content."));

src/DotnetPackaging.Exe.Installer/Core/PayloadExtractor.cs

@@ -152,8 +152,12 @@ public static Result CopyContentTo(InstallerPayload payload, string targetDirect
             } 
             catch { }
 
-            var fileEntries = contentEntries.Where(entry => !IsDirectoryEntry(entry));
-            long totalBytes = fileEntries.Sum(entry => entry.Length);
+            var fileEntries = contentEntries.Where(entry => !IsDirectoryEntry(entry)).ToList();
+            long totalBytes = payload.ContentSizeBytes;
+            if (totalBytes <= 0)
+            {
+                totalBytes = fileEntries.Sum(entry => entry.Length);
+            }
             long safeTotal = totalBytes == 0 ? 1 : totalBytes;
             long copiedBytes = 0;
             var targetRoot = System.IO.Path.GetFullPath(targetDirectory);
@@ -212,10 +216,11 @@ private static Result<InstallerPayload> CreatePayload(PayloadLocation location)
 
         var result = bytesResult
             .Bind(bytes => ReadMetadata(bytes)
-                .Map(metadata => new InstallerPayload(
-                    metadata,
+                .Map(payloadMetadata => new InstallerPayload(
+                    payloadMetadata.Metadata,
                     ByteSource.FromBytes(bytes),
-                    location.TempDir)));
+                    location.TempDir,
+                    payloadMetadata.ContentSizeBytes)));
 
         TryDeleteFile(location.ZipPath);
 
@@ -227,7 +232,7 @@ private static Result<InstallerPayload> CreatePayload(PayloadLocation location)
         return result;
     }
 
-    private static Result<InstallerMetadata> ReadMetadata(byte[] zipBytes)
+    private static Result<PayloadMetadata> ReadMetadata(byte[] zipBytes)
     {
         return Result.Try(() =>
         {
@@ -236,10 +241,18 @@ private static Result<InstallerMetadata> ReadMetadata(byte[] zipBytes)
             var metaEntry = archive.GetEntry("metadata.json") ?? throw new InvalidOperationException("metadata.json missing");
             using var entryStream = metaEntry.Open();
             var opts = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
-            return JsonSerializer.Deserialize<InstallerMetadata>(entryStream, opts)!;
+            var metadata = JsonSerializer.Deserialize<InstallerMetadata>(entryStream, opts)!;
+            var contentSizeBytes = archive.Entries
+                .Where(IsContentEntry)
+                .Where(entry => !IsDirectoryEntry(entry))
+                .Sum(entry => entry.Length);
+
+            return new PayloadMetadata(metadata, contentSizeBytes);
         }, ex => $"Error reading payload metadata: {ex.Message}");
     }
 
+    private sealed record PayloadMetadata(InstallerMetadata Metadata, long ContentSizeBytes);
+
     private static Maybe<PayloadLocation> TryExtractFromManagedResource()
     {
         try
@@ -591,10 +604,19 @@ private static Result<InstallerPayload> CreateDebugPayload()
             }
 
             var tempDir = Directory.CreateTempSubdirectory("dp-inst-debug-").FullName;
-            return new InstallerPayload(metadata, ByteSource.FromBytes(ms.ToArray()), tempDir);
+            var payloadBytes = ms.ToArray();
+            var payloadMetadataResult = ReadMetadata(payloadBytes);
+            if (payloadMetadataResult.IsFailure)
+            {
+                throw new InvalidOperationException($"Failed to prepare debug payload: {payloadMetadataResult.Error}");
+            }
+
+            var payloadMetadata = payloadMetadataResult.Value;
+
+            return new InstallerPayload(metadata, ByteSource.FromBytes(payloadBytes), tempDir, payloadMetadata.ContentSizeBytes);
         }, ex => $"Failed to create debug payload: {ex.Message}");
     }
 #endif
 }
 
-public sealed record InstallerPayload(InstallerMetadata Metadata, IByteSource Content, string WorkingDirectory);
+public sealed record InstallerPayload(InstallerMetadata Metadata, IByteSource Content, string WorkingDirectory, long ContentSizeBytes);

src/DotnetPackaging.Exe.Installer/Core/WindowsRegistryService.cs

@@ -10,7 +10,7 @@ internal static class WindowsRegistryService
 {
     private const string UninstallKey = @"Software\Microsoft\Windows\CurrentVersion\Uninstall";
 
-    public static Result Register(string appId, string applicationName, string version, string publisher, string installLocation, string uninstallString, string displayIcon)
+    public static Result Register(string appId, string applicationName, string version, string publisher, string installLocation, string uninstallString, string displayIcon, long estimatedSizeBytes)
     {
         return Result.Try(() =>
         {
@@ -23,6 +23,12 @@ public static Result Register(string appId, string applicationName, string versi
             key.SetValue("DisplayIcon", displayIcon);
             key.SetValue("NoModify", 1);
             key.SetValue("NoRepair", 1);
+
+            if (estimatedSizeBytes > 0)
+            {
+                var estimatedSizeKb = (int)Math.Clamp((estimatedSizeBytes + 1023) / 1024, 1, int.MaxValue);
+                key.SetValue("EstimatedSize", estimatedSizeKb, RegistryValueKind.DWord);
+            }
         }, ex => $"Failed to create registry keys: {ex.Message}");
     }
 

src/DotnetPackaging.Exe.Installer/Installation/Wizard/Install/InstallViewModel.cs

@@ -28,7 +28,14 @@ private Task<Result<InstallationResult>> DoInstall(InstallerMetadata installerMe
         return Task.Run(async () =>
         {
             Log.Information("Starting installation to {InstallDirectory}", installDirectory);
-            
+
+            var payloadSizeResult = await payload.GetContentSize().ConfigureAwait(false);
+            if (payloadSizeResult.IsFailure)
+            {
+                Log.Warning("Failed to determine payload size: {Error}", payloadSizeResult.Error);
+            }
+            var payloadSize = payloadSizeResult.IsSuccess ? payloadSizeResult.Value : 0;
+
             var copyRes = await payload.CopyContents(installDirectory, progress).ConfigureAwait(false);
             if (copyRes.IsFailure)
             {
@@ -38,7 +45,7 @@ private Task<Result<InstallationResult>> DoInstall(InstallerMetadata installerMe
 
             Log.Information("Contents copied successfully, registering installation");
 
-            var installResult = Core.Installer.Install(installDirectory, installerMetadata)
+            var installResult = Core.Installer.Install(installDirectory, installerMetadata, payloadSize)
                 .Map(exePath => new InstallationResult(installerMetadata, installDirectory, exePath))
                 .Bind(result => InstallationRegistry.Register(result).Map(() => result));
 

src/DotnetPackaging.Exe.Installer/Installation/Wizard/InstallWizard.cs

@@ -53,7 +53,7 @@ private static Task<Result<InstallationResult>> InstallApplicationAsync(Installe
     {
         return Task.Run(() =>
             PayloadExtractor.CopyContentTo(payload, installDir, progressObserver)
-                .Bind(() => Core.Installer.Install(installDir, payload.Metadata))
+                .Bind(() => Core.Installer.Install(installDir, payload.Metadata, payload.ContentSizeBytes))
                 .Map(exePath => new InstallationResult(payload.Metadata, installDir, exePath)));
     }