From 148ad02da05070245c8345d6650e2a70bd4706be Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 12 Apr 2020 11:19:14 +1000 Subject: Merge and move default tuple logic from CreateOutputFromIRCommand to WindowsInstallerBackendHelper. --- .../Bind/BindDatabaseCommand.cs | 5 +- .../Bind/CreateOutputFromIRCommand.cs | 62 ++++------------------ .../WindowsInstallerBackendHelper.cs | 17 ++++-- .../ExampleWindowsInstallerBackendExtension.cs | 9 ++-- 4 files changed, 31 insertions(+), 62 deletions(-) diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 5d1e89ac..489fdacb 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -33,6 +33,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.Messaging = context.ServiceProvider.GetService(); this.BackendHelper = context.ServiceProvider.GetService(); + this.WindowsInstallerBackendHelper = context.ServiceProvider.GetService(); this.PathResolver = this.ServiceProvider.GetService(); @@ -60,6 +61,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IBackendHelper BackendHelper { get; } + private IWindowsInstallerBackendHelper WindowsInstallerBackendHelper { get; } + private IPathResolver PathResolver { get; } private int Codepage { get; } @@ -343,7 +346,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Time to create the output object. Try to put as much above here as possible, updating the IR is better. { - var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); + var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions, this.WindowsInstallerBackendHelper); command.Execute(); output = command.Output; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 15b53a55..c3bedfc7 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -20,16 +20,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind private static readonly char[] ColonCharacter = new[] { ':' }; - public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable backendExtensions) + public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable backendExtensions, IWindowsInstallerBackendHelper backendHelper) { this.Messaging = messaging; this.Section = section; this.TableDefinitions = tableDefinitions; this.BackendExtensions = backendExtensions; + this.BackendHelper = backendHelper; } private IEnumerable BackendExtensions { get; } + private IWindowsInstallerBackendHelper BackendHelper { get; } + private IMessaging Messaging { get; } private TableDefinitionCollection TableDefinitions { get; } @@ -173,10 +176,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddShortcutTuple((ShortcutTuple)tuple); break; - case TupleDefinitionType.SummaryInformation: - this.AddTupleDefaultly(tuple, tableName: "_SummaryInformation"); - break; - case TupleDefinitionType.TextStyle: this.AddTextStyleTuple((TextStyleTuple)tuple); break; @@ -1034,48 +1033,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind { foreach (var extension in this.BackendExtensions) { - if (extension.TryAddTupleToOutput(tuple, this.Output)) + if (extension.TryAddTupleToOutput(this.Section, tuple, this.Output, this.TableDefinitions)) { break; } } } - private void AddTupleDefaultly(IntermediateTuple tuple, string tableName = null) - { - if (!this.TableDefinitions.TryGet(tableName ?? tuple.Definition.Name, out var tableDefinition)) - { - return; - } - - var row = this.CreateRow(tuple, tableDefinition); - var rowOffset = 0; - - if (tableDefinition.TupleIdIsPrimaryKey) - { - row[0] = tuple.Id.Id; - rowOffset = 1; - } - - for (var i = 0; i < tuple.Fields.Length; ++i) - { - if (i < tableDefinition.Columns.Length) - { - var column = tableDefinition.Columns[i + rowOffset]; - - switch (column.Type) - { - case ColumnType.Number: - row[i + rowOffset] = column.Nullable ? tuple.AsNullableNumber(i) : tuple.AsNumber(i); - break; - - default: - row[i + rowOffset] = tuple.AsString(i); - break; - } - } - } - } + private void AddTupleDefaultly(IntermediateTuple tuple) => + this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(this.Section, tuple, this.Output, this.TableDefinitions); private static OutputType SectionTypeToOutputType(SectionType type) { @@ -1097,17 +1063,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private Row CreateRow(IntermediateTuple tuple, string tableDefinitionName) => this.CreateRow(tuple, this.TableDefinitions[tableDefinitionName]); - - private Row CreateRow(IntermediateTuple tuple, TableDefinition tableDefinition) - { - var table = this.Output.EnsureTable(tableDefinition); - - var row = table.CreateRow(tuple.SourceLineNumbers); - row.SectionId = this.Section.Id; + private Row CreateRow(IntermediateTuple tuple, string tableDefinitionName) => + this.CreateRow(tuple, this.TableDefinitions[tableDefinitionName]); - return row; - } + private Row CreateRow(IntermediateTuple tuple, TableDefinition tableDefinition) => + this.BackendHelper.CreateRow(this.Section, tuple, this.Output, tableDefinition); private static string GetMsiFilenameValue(string shortName, string longName) { diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs index 80179d1c..753b8b34 100644 --- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -2,7 +2,6 @@ namespace WixToolset.Core.ExtensibilityServices { - using System.Collections.Generic; using System.Linq; using WixToolset.Data; using WixToolset.Data.WindowsInstaller; @@ -10,17 +9,25 @@ namespace WixToolset.Core.ExtensibilityServices internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper { - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions) + public Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition) { - var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name); + var table = output.EnsureTable(tableDefinition); + + var row = table.CreateRow(tuple.SourceLineNumbers); + row.SectionId = section.Id; + + return row; + } + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) + { + var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name); if (tableDefinition == null) { return false; } - var table = output.EnsureTable(tableDefinition); - var row = table.CreateRow(tuple.SourceLineNumbers); + var row = this.CreateRow(section, tuple, output, tableDefinition); var rowOffset = 0; if (tableDefinition.TupleIdIsPrimaryKey) diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs index af9c8489..4ee682d3 100644 --- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs +++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs @@ -11,15 +11,14 @@ namespace Example.Extension { public override IEnumerable TableDefinitions => ExampleTableDefinitions.All; - public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) + public override bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) { #if ALTERNATIVE_TO_USING_HELPER switch (tuple.Definition.Name) { - case TupleDefinitions.ExampleName: + case ExampleTupleDefinitions.ExampleName: { - var table = output.EnsureTable(ExampleTableDefinitions.ExampleTable); - var row = table.CreateRow(tuple.SourceLineNumbers); + var row = this.BackendHelper.CreateRow(section, tuple, output, ExampleTableDefinitions.ExampleTable); row[0] = tuple[0].AsString(); row[1] = tuple[1].AsString(); } @@ -28,7 +27,7 @@ namespace Example.Extension return false; #else - return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, ExampleTableDefinitions.All); + return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions); #endif } } -- cgit v1.2.3-55-g6feb