Integrated CDN downloads to PPC and MS.

1 files changed, 20 insertions, 18 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 537e652e6..cce6c32ab 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -249,27 +249,29 @@ namespace Tango.PPC.Common.MachineSetup
 
                 LogManager.Log("Downloading software package...");
 
-                long fileSize = 0;
-                UpdateProgress("Downloading software package", "Downloading...", false);
+                AutoFileDownloader downloader = new AutoFileDownloader(setup_response.BlobAddress, setup_response.CdnAddress, tempFile);
+                await downloader.ResolveMode();
 
-                await Task.Factory.StartNew(() =>
+                if (downloader.Mode == AutoFileDownloader.DownloadMode.Standard)
                 {
-                    using (FileStreamWrapper fs = new FileStreamWrapper(tempFile.Path, FileMode.Create, (current) =>
-                    {
-                        UpdateProgress("Downloading software package", "Downloading...", false, current, fileSize);
-                    }))
-                    {
+                    LogManager.Log($"Connecting to storage CDN with address {downloader.Address}");
+                }
+                else
+                {
+                    LogManager.Log($"Connecting to storage blob with address {downloader.Address}");
+                }
 
-                        LogManager.Log($"Connecting to storage blob with address {setup_response.BlobAddress}");
-                        CloudBlockBlob blob = new CloudBlockBlob(new Uri(setup_response.BlobAddress));
-                        LogManager.Log("Fetching blob attributes...");
-                        blob.FetchAttributes();
-                        fileSize = blob.Properties.Length;
-                        LogManager.Log("Download size: " + fileSize + " bytes.");
-                        LogManager.Log("Starting blob download...");
-                        blob.DownloadToStream(fs);
-                    }
-                });
+                downloader.Progress += (x, e) =>
+                {
+                    UpdateProgress("Downloading software package", "Downloading...", false, e.Current, e.Total);
+                };
+
+                var size = await downloader.GetFileSize();
+                LogManager.Log("Download size: " + size + " bytes.");
+                LogManager.Log("Starting file download...");
+                await downloader.Download();
+
+                downloader.Dispose();
 
                 UpdateProgress("Downloading software package", "Extracting package...");