Support change of FileTransfer to interface

3 files changed, 40 insertions, 39 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 119cbd55..3aad0709 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -26,6 +26,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         {
             this.Messaging = context.ServiceProvider.GetService<IMessaging>();
 
+            this.BackendHelper = context.ServiceProvider.GetService<IBackendHelper>();
+
             this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
 
             this.CabbingThreadCount = context.CabbingThreadCount;
@@ -43,6 +45,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.BackendExtensions = backendExtension;
         }
 
+        private IMessaging Messaging { get; }
+
+        private IBackendHelper BackendHelper { get; }
+
         private int Codepage { get; }
 
         private int CabbingThreadCount { get; }
@@ -63,8 +69,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private Intermediate Intermediate { get; }
 
-        private IMessaging Messaging { get; }
-
         private string OutputPath { get; }
 
         private bool SuppressAddingValidationRows { get; }
@@ -77,7 +81,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private Validator Validator { get; }
 
-        public IEnumerable<FileTransfer> FileTransfers { get; private set; }
+        public IEnumerable<IFileTransfer> FileTransfers { get; private set; }
 
         public IEnumerable<string> ContentFilePaths { get; private set; }
 
@@ -87,7 +91,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         {
             var section = this.Intermediate.Sections.Single();
 
-            var fileTransfers = new List<FileTransfer>();
+            var fileTransfers = new List<IFileTransfer>();
 
             var containsMergeModules = false;
             var suppressedTableNames = new HashSet<string>();
@@ -375,7 +379,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 this.Messaging.Write(VerboseMessages.CreatingCabinetFiles());
 
-                var command = new CreateCabinetsCommand();
+                var command = new CreateCabinetsCommand(this.BackendHelper);
                 command.CabbingThreadCount = this.CabbingThreadCount;
                 command.CabCachePath = this.CabCachePath;
                 command.DefaultCompressionLevel = this.DefaultCompressionLevel;
@@ -415,11 +419,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             string tempDatabaseFile = Path.Combine(this.IntermediateFolder, Path.GetFileName(this.OutputPath));
             this.GenerateDatabase(output, tempDatabaseFile, false, false);
 
-            if (FileTransfer.TryCreate(tempDatabaseFile, this.OutputPath, true, output.Type.ToString(), null, out var transfer)) // note where this database needs to move in the future
-            {
-                transfer.Built = true;
-                fileTransfers.Add(transfer);
-            }
+            var transfer = this.BackendHelper.CreateFileTransfer(tempDatabaseFile, this.OutputPath, true, FileTransferType.Built); // note where this database needs to move in the future
+            fileTransfers.Add(transfer);
 
             // Stop processing if an error previously occurred.
             if (this.Messaging.EncounteredError)
@@ -491,7 +492,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Process uncompressed files.
             if (!this.Messaging.EncounteredError && !this.SuppressLayout && uncompressedFiles.Any())
             {
-                var command = new ProcessUncompressedFilesCommand(section);
+                var command = new ProcessUncompressedFilesCommand(section, this.BackendHelper);
                 command.Compressed = compressed;
                 command.FileFacades = uncompressedFiles;
                 command.LayoutDirectory = layoutDirectory;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 328bb082..ed8f0ece 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -26,19 +26,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         public const int DefaultMaximumUncompressedMediaSize = 200; // Default value is 200 MB
         public const int MaxValueOfMaxCabSizeForLargeFileSplitting = 2 * 1024; // 2048 MB (i.e. 2 GB)
 
-        private List<FileTransfer> fileTransfers;
+        private List<IFileTransfer> fileTransfers;
 
         private FileSplitCabNamesCallback newCabNamesCallBack;
 
         private Dictionary<string, string> lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence
 
-        public CreateCabinetsCommand()
+        public CreateCabinetsCommand(IBackendHelper backendHelper)
         {
-            this.fileTransfers = new List<FileTransfer>();
+            this.fileTransfers = new List<IFileTransfer>();
 
             this.newCabNamesCallBack = this.NewCabNamesCallBack;
+
+            this.BackendHelper = backendHelper;
         }
 
+        public IBackendHelper BackendHelper { get; }
+
         /// <summary>
         /// Sets the number of threads to use for cabinet creation.
         /// </summary>
@@ -72,7 +76,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public IEnumerable<WixMediaTuple> WixMediaTuples { private get; set; }
 
-        public IEnumerable<FileTransfer> FileTransfers => this.fileTransfers;
+        public IEnumerable<IFileTransfer> FileTransfers => this.fileTransfers;
 
         /// <param name="output">Output to generate image for.</param>
         /// <param name="fileTransfers">Array of files to be transfered.</param>
@@ -186,7 +190,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         /// <param name="fileFacades">Collection of files in this cabinet.</param>
         /// <param name="fileTransfers">Array of files to be transfered.</param>
         /// <returns>created CabinetWorkItem object</returns>
-        private CabinetWorkItem CreateCabinetWorkItem(Output output, string cabinetDir, MediaTuple mediaRow, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades, List<FileTransfer> fileTransfers)
+        private CabinetWorkItem CreateCabinetWorkItem(Output output, string cabinetDir, MediaTuple mediaRow, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades, List<IFileTransfer> fileTransfers)
         {
             CabinetWorkItem cabinetWorkItem = null;
             string tempCabinetFileX = Path.Combine(this.TempFilesLocation, mediaRow.Cabinet);
@@ -254,12 +258,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             else
             {
-                string destinationPath = Path.Combine(cabinetDir, mediaRow.Cabinet);
-                if (FileTransfer.TryCreate(resolvedCabinet.Path, destinationPath, CabinetBuildOption.BuildAndMove == resolvedCabinet.BuildOption, "Cabinet", mediaRow.SourceLineNumbers, out var transfer))
-                {
-                    transfer.Built = true;
-                    fileTransfers.Add(transfer);
-                }
+                var destinationPath = Path.Combine(cabinetDir, mediaRow.Cabinet);
+                var transfer = this.BackendHelper.CreateFileTransfer(resolvedCabinet.Path, destinationPath, CabinetBuildOption.BuildAndMove == resolvedCabinet.BuildOption, FileTransferType.Built, mediaRow.SourceLineNumbers);
+                fileTransfers.Add(transfer);
             }
 
             return cabinetWorkItem;
@@ -315,21 +316,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 bool transferAdded = false; // Used for Error Handling
 
                 // Create File Transfer for new Cabinet using transfer of Base Cabinet
-                foreach (FileTransfer transfer in this.FileTransfers)
+                foreach (var transfer in this.FileTransfers)
                 {
                     if (firstCabinetName.Equals(Path.GetFileName(transfer.Source), StringComparison.InvariantCultureIgnoreCase))
                     {
                         string newCabSourcePath = Path.Combine(Path.GetDirectoryName(transfer.Source), newCabinetName);
                         string newCabTargetPath = Path.Combine(Path.GetDirectoryName(transfer.Destination), newCabinetName);
 
-                        FileTransfer newTransfer;
-                        if (FileTransfer.TryCreate(newCabSourcePath, newCabTargetPath, transfer.Move, "Cabinet", transfer.SourceLineNumbers, out newTransfer))
-                        {
-                            newTransfer.Built = true;
-                            this.fileTransfers.Add(newTransfer);
-                            transferAdded = true;
-                            break;
-                        }
+                        var newTransfer = this.BackendHelper.CreateFileTransfer(newCabSourcePath, newCabTargetPath, transfer.Move, FileTransferType.Built, transfer.SourceLineNumbers);
+                        this.fileTransfers.Add(newTransfer);
+
+                        transferAdded = true;
+                        break;
                     }
                 }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 4b143ead..b09f92bb 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
 
     /// <summary>
@@ -18,13 +19,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     /// </summary>
     internal class ProcessUncompressedFilesCommand
     {
-        public ProcessUncompressedFilesCommand(IntermediateSection section)
+        public ProcessUncompressedFilesCommand(IntermediateSection section, IBackendHelper backendHelper)
         {
             this.Section = section;
+            this.BackendHelper = backendHelper;
         }
 
         private IntermediateSection Section { get; }
 
+        public IBackendHelper BackendHelper { get; }
+
         public string DatabasePath { private get; set; }
 
         public IEnumerable<FileFacade> FileFacades { private get; set; }
@@ -37,11 +41,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public Func<MediaTuple, string, string, string> ResolveMedia { private get; set; }
 
-        public IEnumerable<FileTransfer> FileTransfers { get; private set; }
+        public IEnumerable<IFileTransfer> FileTransfers { get; private set; }
 
         public void Execute()
         {
-            var fileTransfers = new List<FileTransfer>();
+            var fileTransfers = new List<IFileTransfer>();
 
             var directories = new Dictionary<string, ResolvedDirectory>();
 
@@ -103,11 +107,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             }
 
                             // finally put together the base media layout path and the relative file layout path
-                            string fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath);
-                            if (FileTransfer.TryCreate(facade.WixFile.Source.Path, fileLayoutPath, false, "File", facade.File.SourceLineNumbers, out var transfer))
-                            {
-                                fileTransfers.Add(transfer);
-                            }
+                            var fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath);
+                            var transfer = this.BackendHelper.CreateFileTransfer(facade.WixFile.Source.Path, fileLayoutPath, false, FileTransferType.Content, facade.File.SourceLineNumbers);
+                            fileTransfers.Add(transfer);
                         }
                     }
                 }