This commit is contained in:
@@ -27,11 +27,6 @@ namespace PluginManager.Online
|
||||
|
||||
try
|
||||
{
|
||||
/*#pragma warning disable SYSLIB0014
|
||||
WebClient client = new WebClient();
|
||||
#pragma warning restore SYSLIB0014
|
||||
Stream data = await client.OpenReadTaskAsync(link);
|
||||
string[] lines = (await new StreamReader(data).ReadToEndAsync()).Split('\n');*/
|
||||
List<string> list = await ServerCom.ReadTextFromFile(link);
|
||||
string[] lines = list.ToArray();
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace PluginManager.Online
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (op == PluginManager.Others.OperatingSystem.LINUX)
|
||||
else if (op == Others.OperatingSystem.LINUX)
|
||||
{
|
||||
if (content[4].Contains("Linux"))
|
||||
{
|
||||
|
||||
@@ -57,11 +57,8 @@ namespace PluginManager.Online
|
||||
bool isDownloading = true;
|
||||
int c_progress = 0;
|
||||
|
||||
long secondsPast = 0;
|
||||
long m_dwBytes = 0;
|
||||
double c_downloadSpeed = 0f;
|
||||
string c_downloadUnit = "MB";
|
||||
|
||||
//long m_dwBytes = 0;
|
||||
|
||||
Others.Console_Utilities.ProgressBar pbar = new Others.Console_Utilities.ProgressBar(100, "");
|
||||
|
||||
IProgress<float> progress = new Progress<float>(percent =>
|
||||
@@ -71,39 +68,20 @@ namespace PluginManager.Online
|
||||
|
||||
IProgress<long> progress_downloaded = new Progress<long>(downloadedBytes =>
|
||||
{
|
||||
m_dwBytes = downloadedBytes;
|
||||
//m_dwBytes = downloadedBytes;
|
||||
});
|
||||
|
||||
Task updateProgressBarTask = new Task(async () =>
|
||||
{
|
||||
while (isDownloading)
|
||||
{
|
||||
//pbar.Update(c_progress, c_downloadSpeed, c_downloadUnit);
|
||||
pbar.Update(c_progress);
|
||||
if (c_progress == 100)
|
||||
break;
|
||||
System.Threading.Thread.Sleep(500);
|
||||
}
|
||||
});
|
||||
|
||||
Task calculateDownloadSpeed = new Task(async () =>
|
||||
{
|
||||
|
||||
while (isDownloading)
|
||||
{
|
||||
secondsPast++;
|
||||
c_downloadSpeed = m_dwBytes / secondsPast;
|
||||
|
||||
c_downloadSpeed /= 1024; // in KB
|
||||
c_downloadSpeed /= 1024; // in MB
|
||||
|
||||
c_downloadSpeed = Math.Round(c_downloadSpeed, 2, MidpointRounding.AwayFromZero);
|
||||
|
||||
System.Threading.Thread.Sleep(1000);
|
||||
}
|
||||
});
|
||||
|
||||
// new System.Threading.Thread(calculateDownloadSpeed.Start).Start();
|
||||
|
||||
new System.Threading.Thread(updateProgressBarTask.Start).Start();
|
||||
await DownloadFileAsync(URL, location, progress, progress_downloaded);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user