From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../Bind/AssignMediaCommand.cs | 100 ++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs index 773b3225..eccc97d2 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; /// @@ -40,7 +40,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Gets cabinets with their file rows. /// - public Dictionary> FileFacadesByCabinetMedia { get; private set; } + public Dictionary> FileFacadesByCabinetMedia { get; private set; } /// /// Get uncompressed file rows. This will contain file rows of File elements that are marked with compression=no. @@ -50,49 +50,49 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var mediaTuples = this.Section.Tuples.OfType().ToList(); - var mediaTemplateTuples = this.Section.Tuples.OfType().ToList(); + var mediaSymbols = this.Section.Symbols.OfType().ToList(); + var mediaTemplateSymbols = this.Section.Symbols.OfType().ToList(); - // If both tuples are authored, it is an error. - if (mediaTemplateTuples.Count > 0 && mediaTuples.Count > 1) + // If both symbols are authored, it is an error. + if (mediaTemplateSymbols.Count > 0 && mediaSymbols.Count > 1) { throw new WixException(ErrorMessages.MediaTableCollision(null)); } - // If neither tuple is authored, default to a media template. - if (SectionType.Product == this.Section.Type && mediaTemplateTuples.Count == 0 && mediaTuples.Count == 0) + // If neither symbol is authored, default to a media template. + if (SectionType.Product == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0) { - var mediaTemplate = new WixMediaTemplateTuple() + var mediaTemplate = new WixMediaTemplateSymbol() { CabinetTemplate = "cab{0}.cab", }; - this.Section.AddTuple(mediaTemplate); - mediaTemplateTuples.Add(mediaTemplate); + this.Section.AddSymbol(mediaTemplate); + mediaTemplateSymbols.Add(mediaTemplate); } // When building merge module, all the files go to "#MergeModule.CABinet". if (SectionType.Module == this.Section.Type) { - var mergeModuleMediaTuple = this.Section.AddTuple(new MediaTuple + var mergeModuleMediaSymbol = this.Section.AddSymbol(new MediaSymbol { Cabinet = "#MergeModule.CABinet", }); - this.FileFacadesByCabinetMedia = new Dictionary> + this.FileFacadesByCabinetMedia = new Dictionary> { - { mergeModuleMediaTuple, this.FileFacades } + { mergeModuleMediaSymbol, this.FileFacades } }; this.UncompressedFileFacades = Array.Empty(); } - else if (mediaTemplateTuples.Count == 0) + else if (mediaTemplateSymbols.Count == 0) { - var filesByCabinetMedia = new Dictionary>(); + var filesByCabinetMedia = new Dictionary>(); var uncompressedFiles = new List(); - this.ManuallyAssignFiles(mediaTuples, filesByCabinetMedia, uncompressedFiles); + this.ManuallyAssignFiles(mediaSymbols, filesByCabinetMedia, uncompressedFiles); this.FileFacadesByCabinetMedia = filesByCabinetMedia.ToDictionary(kvp => kvp.Key, kvp => (IEnumerable)kvp.Value); @@ -100,11 +100,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else { - var filesByCabinetMedia = new Dictionary>(); + var filesByCabinetMedia = new Dictionary>(); var uncompressedFiles = new List(); - this.AutoAssignFiles(mediaTuples, filesByCabinetMedia, uncompressedFiles); + this.AutoAssignFiles(mediaSymbols, filesByCabinetMedia, uncompressedFiles); this.FileFacadesByCabinetMedia = filesByCabinetMedia.ToDictionary(kvp => kvp.Key, kvp => (IEnumerable)kvp.Value); @@ -116,7 +116,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Assign files to cabinets based on MediaTemplate authoring. /// /// FileRowCollection - private void AutoAssignFiles(List mediaTable, Dictionary> filesByCabinetMedia, List uncompressedFiles) + private void AutoAssignFiles(List mediaTable, Dictionary> filesByCabinetMedia, List uncompressedFiles) { const int MaxCabIndex = 999; @@ -125,15 +125,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind var maxPreCabSizeInMB = 0; var currentCabIndex = 0; - MediaTuple currentMediaRow = null; + MediaSymbol currentMediaRow = null; - var mediaTemplateTable = this.Section.Tuples.OfType(); + var mediaTemplateTable = this.Section.Symbols.OfType(); - // Remove all previous media tuples since they will be replaced with + // Remove all previous media symbols since they will be replaced with // media template. - foreach (var mediaTuple in mediaTable) + foreach (var mediaSymbol in mediaTable) { - this.Section.Tuples.Remove(mediaTuple); + this.Section.Symbols.Remove(mediaSymbol); } // Auto assign files to cabinets based on maximum uncompressed media size @@ -169,7 +169,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind throw new WixException(ErrorMessages.MaximumUncompressedMediaSizeTooLarge(null, maxPreCabSizeInMB)); } - var mediaTuplesByDiskId = new Dictionary(); + var mediaSymbolsByDiskId = new Dictionary(); foreach (var facade in this.FileFacades) { @@ -193,8 +193,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Overflow due to current file if (currentPreCabSize > maxPreCabSizeInBytes) { - currentMediaRow = this.AddMediaTuple(mediaTemplateRow, ++currentCabIndex); - mediaTuplesByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); + currentMediaRow = this.AddMediaSymbol(mediaTemplateRow, ++currentCabIndex); + mediaSymbolsByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); filesByCabinetMedia.Add(currentMediaRow, new List()); // Now files larger than MaxUncompressedMediaSize will be the only file in its cabinet so as to respect MaxUncompressedMediaSize @@ -205,8 +205,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (currentMediaRow == null) { // Create new cab and MediaRow - currentMediaRow = this.AddMediaTuple(mediaTemplateRow, ++currentCabIndex); - mediaTuplesByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); + currentMediaRow = this.AddMediaSymbol(mediaTemplateRow, ++currentCabIndex); + mediaSymbolsByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); filesByCabinetMedia.Add(currentMediaRow, new List()); } } @@ -219,52 +219,52 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // If there are uncompressed files and no MediaRow, create a default one. - if (uncompressedFiles.Count > 0 && !this.Section.Tuples.OfType().Any()) + if (uncompressedFiles.Count > 0 && !this.Section.Symbols.OfType().Any()) { - var defaultMediaRow = this.Section.AddTuple(new MediaTuple(null, new Identifier(AccessModifier.Private, 1)) + var defaultMediaRow = this.Section.AddSymbol(new MediaSymbol(null, new Identifier(AccessModifier.Private, 1)) { DiskId = 1, }); - mediaTuplesByDiskId.Add(1, defaultMediaRow); + mediaSymbolsByDiskId.Add(1, defaultMediaRow); } } /// /// Assign files to cabinets based on Media authoring. /// - private void ManuallyAssignFiles(List mediaTuples, Dictionary> filesByCabinetMedia, List uncompressedFiles) + private void ManuallyAssignFiles(List mediaSymbols, Dictionary> filesByCabinetMedia, List uncompressedFiles) { - var mediaTuplesByDiskId = new Dictionary(); + var mediaSymbolsByDiskId = new Dictionary(); - if (mediaTuples.Any()) + if (mediaSymbols.Any()) { - var cabinetMediaTuples = new Dictionary(StringComparer.OrdinalIgnoreCase); - foreach (var mediaTuple in mediaTuples) + var cabinetMediaSymbols = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var mediaSymbol in mediaSymbols) { // If the Media row has a cabinet, make sure it is unique across all Media rows. - if (!String.IsNullOrEmpty(mediaTuple.Cabinet)) + if (!String.IsNullOrEmpty(mediaSymbol.Cabinet)) { - if (cabinetMediaTuples.TryGetValue(mediaTuple.Cabinet, out var existingRow)) + if (cabinetMediaSymbols.TryGetValue(mediaSymbol.Cabinet, out var existingRow)) { - this.Messaging.Write(ErrorMessages.DuplicateCabinetName(mediaTuple.SourceLineNumbers, mediaTuple.Cabinet)); + this.Messaging.Write(ErrorMessages.DuplicateCabinetName(mediaSymbol.SourceLineNumbers, mediaSymbol.Cabinet)); this.Messaging.Write(ErrorMessages.DuplicateCabinetName2(existingRow.SourceLineNumbers, existingRow.Cabinet)); } else { - cabinetMediaTuples.Add(mediaTuple.Cabinet, mediaTuple); + cabinetMediaSymbols.Add(mediaSymbol.Cabinet, mediaSymbol); } - filesByCabinetMedia.Add(mediaTuple, new List()); + filesByCabinetMedia.Add(mediaSymbol, new List()); } - mediaTuplesByDiskId.Add(mediaTuple.DiskId, mediaTuple); + mediaSymbolsByDiskId.Add(mediaSymbol.DiskId, mediaSymbol); } } foreach (var facade in this.FileFacades) { - if (!mediaTuplesByDiskId.TryGetValue(facade.DiskId, out var mediaTuple)) + if (!mediaSymbolsByDiskId.TryGetValue(facade.DiskId, out var mediaSymbol)) { this.Messaging.Write(ErrorMessages.MissingMedia(facade.SourceLineNumber, facade.DiskId)); continue; @@ -280,7 +280,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else // file is marked compressed. { - if (filesByCabinetMedia.TryGetValue(mediaTuple, out var cabinetFiles)) + if (filesByCabinetMedia.TryGetValue(mediaSymbol, out var cabinetFiles)) { cabinetFiles.Add(facade); } @@ -293,18 +293,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind } /// - /// Adds a tuple to the section with cab name template filled in. + /// Adds a symbol to the section with cab name template filled in. /// /// /// /// - private MediaTuple AddMediaTuple(WixMediaTemplateTuple mediaTemplateTuple, int cabIndex) + private MediaSymbol AddMediaSymbol(WixMediaTemplateSymbol mediaTemplateSymbol, int cabIndex) { - return this.Section.AddTuple(new MediaTuple(mediaTemplateTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex)) + return this.Section.AddSymbol(new MediaSymbol(mediaTemplateSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex)) { DiskId = cabIndex, Cabinet = String.Format(CultureInfo.InvariantCulture, this.CabinetNameTemplate, cabIndex), - CompressionLevel = mediaTemplateTuple.CompressionLevel, + CompressionLevel = mediaTemplateSymbol.CompressionLevel, }); } } -- cgit v1.2.3-55-g6feb