Replace WebClient with HttpClient
This commit is contained in:
teinarss
@@ -11,10 +11,10 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using ICSharpCode.SharpZipLib.Zip;
|
||||
using OpenRA.Support;
|
||||
using OpenRA.Widgets;
|
||||
@@ -65,47 +65,35 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
|
||||
var cancelButton = panel.Get<ButtonWidget>("CANCEL_BUTTON");
|
||||
|
||||
var file = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
|
||||
|
||||
Action deleteTempFile = () =>
|
||||
{
|
||||
Log.Write("install", "Deleting temporary file " + file);
|
||||
File.Delete(file);
|
||||
};
|
||||
|
||||
Action<DownloadProgressChangedEventArgs> onDownloadProgress = i =>
|
||||
void OnDownloadProgress(long total, long read, int progressPercentage)
|
||||
{
|
||||
var dataReceived = 0.0f;
|
||||
var dataTotal = 0.0f;
|
||||
var mag = 0;
|
||||
var dataSuffix = "";
|
||||
|
||||
if (i.TotalBytesToReceive < 0)
|
||||
if (total < 0)
|
||||
{
|
||||
mag = (int)Math.Log(i.BytesReceived, 1024);
|
||||
dataReceived = i.BytesReceived / (float)(1L << (mag * 10));
|
||||
mag = (int)Math.Log(read, 1024);
|
||||
dataReceived = read / (float)(1L << (mag * 10));
|
||||
dataSuffix = SizeSuffixes[mag];
|
||||
|
||||
getStatusText = () => "Downloading from {2} {0:0.00} {1}".F(dataReceived,
|
||||
dataSuffix,
|
||||
downloadHost ?? "unknown host");
|
||||
getStatusText = () => "Downloading from {2} {0:0.00} {1}".F(dataReceived, dataSuffix, downloadHost ?? "unknown host");
|
||||
progressBar.Indeterminate = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
mag = (int)Math.Log(i.TotalBytesToReceive, 1024);
|
||||
dataTotal = i.TotalBytesToReceive / (float)(1L << (mag * 10));
|
||||
dataReceived = i.BytesReceived / (float)(1L << (mag * 10));
|
||||
mag = (int)Math.Log(total, 1024);
|
||||
dataTotal = total / (float)(1L << (mag * 10));
|
||||
dataReceived = read / (float)(1L << (mag * 10));
|
||||
dataSuffix = SizeSuffixes[mag];
|
||||
|
||||
getStatusText = () => "Downloading from {4} {1:0.00}/{2:0.00} {3} ({0}%)".F(i.ProgressPercentage,
|
||||
dataReceived, dataTotal, dataSuffix,
|
||||
downloadHost ?? "unknown host");
|
||||
getStatusText = () => "Downloading from {4} {1:0.00}/{2:0.00} {3} ({0}%)".F(progressPercentage, dataReceived, dataTotal, dataSuffix, downloadHost ?? "unknown host");
|
||||
progressBar.Indeterminate = false;
|
||||
}
|
||||
|
||||
progressBar.Percentage = i.ProgressPercentage;
|
||||
};
|
||||
progressBar.Percentage = progressPercentage;
|
||||
}
|
||||
|
||||
Action<string> onExtractProgress = s => Game.RunAfterTick(() => getStatusText = () => s);
|
||||
|
||||
@@ -120,137 +108,140 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
cancelButton.OnClick = Ui.CloseWindow;
|
||||
});
|
||||
|
||||
Action<AsyncCompletedEventArgs> onDownloadComplete = i =>
|
||||
{
|
||||
if (i.Cancelled)
|
||||
{
|
||||
deleteTempFile();
|
||||
Game.RunAfterTick(Ui.CloseWindow);
|
||||
return;
|
||||
}
|
||||
|
||||
if (i.Error != null)
|
||||
{
|
||||
deleteTempFile();
|
||||
onError(Download.FormatErrorMessage(i.Error));
|
||||
return;
|
||||
}
|
||||
|
||||
// Validate integrity
|
||||
if (!string.IsNullOrEmpty(download.SHA1))
|
||||
{
|
||||
getStatusText = () => "Verifying archive...";
|
||||
progressBar.Indeterminate = true;
|
||||
|
||||
var archiveValid = false;
|
||||
try
|
||||
{
|
||||
using (var stream = File.OpenRead(file))
|
||||
{
|
||||
var archiveSHA1 = CryptoUtil.SHA1Hash(stream);
|
||||
Log.Write("install", "Downloaded SHA1: " + archiveSHA1);
|
||||
Log.Write("install", "Expected SHA1: " + download.SHA1);
|
||||
|
||||
archiveValid = archiveSHA1 == download.SHA1;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("install", "SHA1 calculation failed: " + e.ToString());
|
||||
}
|
||||
|
||||
if (!archiveValid)
|
||||
{
|
||||
onError("Archive validation failed");
|
||||
deleteTempFile();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Automatically extract
|
||||
getStatusText = () => "Extracting...";
|
||||
progressBar.Indeterminate = true;
|
||||
|
||||
var extracted = new List<string>();
|
||||
try
|
||||
{
|
||||
using (var stream = File.OpenRead(file))
|
||||
using (var z = new ZipFile(stream))
|
||||
{
|
||||
foreach (var kv in download.Extract)
|
||||
{
|
||||
var entry = z.GetEntry(kv.Value);
|
||||
if (entry == null || !entry.IsFile)
|
||||
continue;
|
||||
|
||||
onExtractProgress("Extracting " + entry.Name);
|
||||
Log.Write("install", "Extracting " + entry.Name);
|
||||
var targetPath = Platform.ResolvePath(kv.Key);
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(targetPath));
|
||||
extracted.Add(targetPath);
|
||||
|
||||
using (var zz = z.GetInputStream(entry))
|
||||
using (var f = File.Create(targetPath))
|
||||
zz.CopyTo(f);
|
||||
}
|
||||
|
||||
z.Close();
|
||||
}
|
||||
|
||||
Game.RunAfterTick(() => { Ui.CloseWindow(); onSuccess(); });
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("install", "Archive extraction failed: " + e.ToString());
|
||||
|
||||
foreach (var f in extracted)
|
||||
{
|
||||
Log.Write("install", "Deleting " + f);
|
||||
File.Delete(f);
|
||||
}
|
||||
|
||||
onError("Archive extraction failed");
|
||||
}
|
||||
finally
|
||||
{
|
||||
deleteTempFile();
|
||||
}
|
||||
};
|
||||
|
||||
Action<string> downloadUrl = url =>
|
||||
{
|
||||
Log.Write("install", "Downloading " + url);
|
||||
|
||||
var tokenSource = new CancellationTokenSource();
|
||||
var token = tokenSource.Token;
|
||||
downloadHost = new Uri(url).Host;
|
||||
var dl = new Download(url, file, onDownloadProgress, onDownloadComplete);
|
||||
cancelButton.OnClick = dl.CancelAsync;
|
||||
|
||||
cancelButton.OnClick = () =>
|
||||
{
|
||||
tokenSource.Cancel();
|
||||
Game.RunAfterTick(Ui.CloseWindow);
|
||||
};
|
||||
|
||||
retryButton.OnClick = ShowDownloadDialog;
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
var file = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
|
||||
|
||||
try
|
||||
{
|
||||
var client = HttpClientFactory.Create();
|
||||
|
||||
var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
|
||||
|
||||
using (var fileStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.ReadWrite, 8192, true))
|
||||
{
|
||||
await response.ReadAsStreamWithProgress(fileStream, OnDownloadProgress, token);
|
||||
}
|
||||
|
||||
// Validate integrity
|
||||
if (!string.IsNullOrEmpty(download.SHA1))
|
||||
{
|
||||
getStatusText = () => "Verifying archive...";
|
||||
progressBar.Indeterminate = true;
|
||||
|
||||
var archiveValid = false;
|
||||
try
|
||||
{
|
||||
using (var stream = File.OpenRead(file))
|
||||
{
|
||||
var archiveSHA1 = CryptoUtil.SHA1Hash(stream);
|
||||
Log.Write("install", "Downloaded SHA1: " + archiveSHA1);
|
||||
Log.Write("install", "Expected SHA1: " + download.SHA1);
|
||||
|
||||
archiveValid = archiveSHA1 == download.SHA1;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("install", "SHA1 calculation failed: " + e.ToString());
|
||||
}
|
||||
|
||||
if (!archiveValid)
|
||||
{
|
||||
onError("Archive validation failed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Automatically extract
|
||||
getStatusText = () => "Extracting...";
|
||||
progressBar.Indeterminate = true;
|
||||
|
||||
var extracted = new List<string>();
|
||||
try
|
||||
{
|
||||
using (var stream = File.OpenRead(file))
|
||||
using (var z = new ZipFile(stream))
|
||||
{
|
||||
foreach (var kv in download.Extract)
|
||||
{
|
||||
var entry = z.GetEntry(kv.Value);
|
||||
if (entry == null || !entry.IsFile)
|
||||
continue;
|
||||
|
||||
onExtractProgress("Extracting " + entry.Name);
|
||||
Log.Write("install", "Extracting " + entry.Name);
|
||||
var targetPath = Platform.ResolvePath(kv.Key);
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(targetPath));
|
||||
extracted.Add(targetPath);
|
||||
|
||||
using (var zz = z.GetInputStream(entry))
|
||||
using (var f = File.Create(targetPath))
|
||||
zz.CopyTo(f);
|
||||
}
|
||||
|
||||
z.Close();
|
||||
}
|
||||
|
||||
Game.RunAfterTick(() =>
|
||||
{
|
||||
Ui.CloseWindow();
|
||||
onSuccess();
|
||||
});
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("install", "Archive extraction failed: " + e.ToString());
|
||||
|
||||
foreach (var f in extracted)
|
||||
{
|
||||
Log.Write("install", "Deleting " + f);
|
||||
File.Delete(f);
|
||||
}
|
||||
|
||||
onError("Archive extraction failed");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
onError(e.ToString());
|
||||
}
|
||||
finally
|
||||
{
|
||||
File.Delete(file);
|
||||
}
|
||||
}, token);
|
||||
};
|
||||
|
||||
if (download.MirrorList != null)
|
||||
{
|
||||
Log.Write("install", "Fetching mirrors from " + download.MirrorList);
|
||||
|
||||
Action<DownloadDataCompletedEventArgs> onFetchMirrorsComplete = i =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
progressBar.Indeterminate = true;
|
||||
|
||||
if (i.Cancelled)
|
||||
{
|
||||
Game.RunAfterTick(Ui.CloseWindow);
|
||||
return;
|
||||
}
|
||||
|
||||
if (i.Error != null)
|
||||
{
|
||||
onError(Download.FormatErrorMessage(i.Error));
|
||||
return;
|
||||
}
|
||||
var client = HttpClientFactory.Create();
|
||||
var httpResponseMessage = await client.GetAsync(download.MirrorList);
|
||||
var result = await httpResponseMessage.Content.ReadAsStringAsync();
|
||||
|
||||
try
|
||||
{
|
||||
var data = Encoding.UTF8.GetString(i.Result);
|
||||
var mirrorList = data.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
var mirrorList = result.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
downloadUrl(mirrorList.Random(new MersenneTwister()));
|
||||
}
|
||||
catch (Exception e)
|
||||
@@ -259,11 +250,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
||||
Log.Write("install", e.ToString());
|
||||
onError("Online mirror is not available. Please install from an original disc.");
|
||||
}
|
||||
};
|
||||
|
||||
var updateMirrors = new Download(download.MirrorList, onDownloadProgress, onFetchMirrorsComplete);
|
||||
cancelButton.OnClick = updateMirrors.CancelAsync;
|
||||
retryButton.OnClick = ShowDownloadDialog;
|
||||
});
|
||||
}
|
||||
else
|
||||
downloadUrl(download.URL);
|
||||
|
||||
Reference in New Issue
Block a user