From c591aced94dbdfc1eaebbb5bab1f80e2fb555ade Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 2 Oct 2026 09:58:29 +0000 Subject: [PATCH] feat(tools): add pack-installer command Appends a TPK1 payload to Titano.Setup.exe from repeatable --component Id=folder options, as release.yml invokes it. Known components (Titano, Uploader, Server) get display names, default selection, Start menu/desktop shortcuts and the .titano file type; prints file count and sizes. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC --- src/Titano.Core/Packaging/PayloadWriter.cs | 4 +- .../Commands/PackInstallerCommand.cs | 109 ++++++++++++++++++ src/Titano.Tools/Program.cs | 1 + 3 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 src/Titano.Tools/Commands/PackInstallerCommand.cs diff --git a/src/Titano.Core/Packaging/PayloadWriter.cs b/src/Titano.Core/Packaging/PayloadWriter.cs index 65d7db84..09b3d5ac 100644 --- a/src/Titano.Core/Packaging/PayloadWriter.cs +++ b/src/Titano.Core/Packaging/PayloadWriter.cs @@ -100,7 +100,7 @@ public static class PayloadWriter var root = Path.TrimEndingDirectorySeparator(Path.GetFullPath(component.Folder)); if (!Directory.Exists(root)) throw new DirectoryNotFoundException($"Component folder '{component.Folder}' does not exist."); if (output.StartsWith(root + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)) - throw new ArgumentException($"The installer cannot be written inside the component folder '{component.Folder}'.", nameof(output)); + throw new ArgumentException($"The installer cannot be written inside the component folder '{component.Folder}'."); inputs.AddRange(Directory.EnumerateFiles(root, "*", options) .Select(f => new Input(component.Id, PayloadPath.FromRelative(Path.GetRelativePath(root, f)), f)) .OrderBy(i => i.Path, StringComparer.Ordinal)); @@ -189,7 +189,7 @@ public static class PayloadWriter { using (var stub = new FileStream(stubPath, FileMode.Open, FileAccess.Read, FileShare.Read, BufferSize)) { - if (PayloadReader.HasFooter(stub)) throw new ArgumentException($"'{stubPath}' already carries a payload; use the plain setup program.", nameof(stubPath)); + if (PayloadReader.HasFooter(stub)) throw new ArgumentException($"'{stubPath}' already carries a payload; use the plain setup program."); var buffer = ArrayPool.Shared.Rent(BufferSize); try { diff --git a/src/Titano.Tools/Commands/PackInstallerCommand.cs b/src/Titano.Tools/Commands/PackInstallerCommand.cs new file mode 100644 index 00000000..24720315 --- /dev/null +++ b/src/Titano.Tools/Commands/PackInstallerCommand.cs @@ -0,0 +1,109 @@ +using System.Globalization; +using Titano.Core.Packaging; + +namespace Titano.Tools.Commands; + +/// +/// pack-installer --setup Titano.Setup.exe --product Titano --version 1.2.3 --component Id=folder … --out file: +/// appends a TPK1 payload (BRIEF §18) to the setup program. Known component ids carry their display name, default +/// selection, shortcuts and file types; unknown ids are packed as plain, preselected components. +/// +internal sealed class PackInstallerCommand : ICommand +{ + private sealed record KnownComponent(string DisplayName, bool DefaultSelected, string Program, bool Desktop, PayloadAssociation? Association); + + private static readonly Dictionary Known = new(StringComparer.OrdinalIgnoreCase) + { + ["Titano"] = new("Titano", true, "Titano.exe", Desktop: true, + new PayloadAssociation { Component = "Titano", Extension = ".titano", ProgId = "Titano.Project", Description = "Titano project", Target = "Titano.exe" }), + ["Uploader"] = new("Titano Uploader", true, "Titano.Uploader.exe", Desktop: true, null), + ["Server"] = new("Titano Server", false, "Titano.Server.exe", Desktop: false, null), + }; + + public string Name => "pack-installer"; + public string Summary => "--setup --product --version --component Id=dir … --out "; + + public Task RunAsync(string[] args) + { + var options = Parse(args); + var setup = Required(options, "setup"); + var output = Required(options, "out"); + if (!File.Exists(setup)) throw new ToolException($"Setup program '{setup}' not found."); + if (!options.TryGetValue("component", out var specs)) throw new ToolException("At least one --component Id=folder is required."); + + var components = new List(); + var shortcuts = new List(); + var associations = new List(); + foreach (var spec in specs) + { + var eq = spec.IndexOf('=', StringComparison.Ordinal); + if (eq <= 0 || eq == spec.Length - 1) throw new ToolException($"--component expects Id=folder, got '{spec}'."); + var id = spec[..eq]; + var folder = spec[(eq + 1)..]; + if (!PayloadManifest.IdentifierRegex().IsMatch(id)) throw new ToolException($"Component id '{id}' must be letters and digits."); + if (components.Any(c => c.Id.Equals(id, StringComparison.OrdinalIgnoreCase))) throw new ToolException($"Component '{id}' given twice."); + if (!Directory.Exists(folder)) throw new ToolException($"Component folder '{folder}' not found."); + + if (!Known.TryGetValue(id, out var known)) + { + components.Add(new PayloadComponentSource(id, id, true, folder)); + continue; + } + components.Add(new PayloadComponentSource(id, known.DisplayName, known.DefaultSelected, folder)); + if (!File.Exists(Path.Combine(folder, known.Program))) + { + Console.Error.WriteLine($"warning: {id} has no {known.Program}; no shortcut or file type registered."); + continue; + } + shortcuts.Add(new PayloadShortcut { Component = id, Name = known.DisplayName, Target = known.Program, StartMenu = true, Desktop = known.Desktop }); + if (known.Association is { } association) associations.Add(association); + } + + var source = new PayloadSource + { + Product = Required(options, "product"), + Version = Required(options, "version"), + Components = components, + Shortcuts = shortcuts, + Associations = associations, + }; + try + { + Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(output))!); + var result = PayloadWriter.Write(setup, source, output); + Console.WriteLine(string.Create(CultureInfo.InvariantCulture, + $"{output}: {result.FileCount} files in {components.Count} component(s), {Megabytes(result.InstallerBytes)} ({result.InstallerBytes:N0} bytes), installs {Megabytes(result.InstalledBytes)}")); + return Task.FromResult(0); + } + catch (Exception ex) when (ex is PayloadException or ArgumentException or IOException) + { + throw new ToolException("pack-installer: " + ex.Message); + } + } + + /// --key value pairs; every key may repeat (only --component is meant to). + private static Dictionary> Parse(string[] args) + { + var allowed = new HashSet(StringComparer.OrdinalIgnoreCase) { "setup", "product", "version", "component", "out" }; + var options = new Dictionary>(StringComparer.OrdinalIgnoreCase); + for (var i = 0; i < args.Length; i++) + { + if (!args[i].StartsWith("--", StringComparison.Ordinal) || !allowed.Contains(args[i][2..])) + throw new ToolException($"Unexpected argument '{args[i]}'."); + if (i + 1 >= args.Length) throw new ToolException($"{args[i]} needs a value."); + var key = args[i][2..]; + if (!options.TryGetValue(key, out var values)) options[key] = values = []; + values.Add(args[++i]); + } + return options; + } + + private static string Required(Dictionary> options, string key) + { + if (!options.TryGetValue(key, out var values) || string.IsNullOrWhiteSpace(values[^1])) throw new ToolException($"--{key} is required."); + if (values.Count > 1) throw new ToolException($"--{key} given more than once."); + return values[0]; + } + + private static string Megabytes(long bytes) => (bytes / 1_000_000d).ToString("0.0", CultureInfo.InvariantCulture) + " MB"; +} diff --git a/src/Titano.Tools/Program.cs b/src/Titano.Tools/Program.cs index d5575d16..78f6e44d 100644 --- a/src/Titano.Tools/Program.cs +++ b/src/Titano.Tools/Program.cs @@ -8,6 +8,7 @@ var commands = new ICommand[] new XamlLintCommand(), new PackageGuardCommand(), new ChangelogCommand(), + new PackInstallerCommand(), }; if (args.Length == 0 || args[0] is "-h" or "--help" or "help")