Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update DownloadHandle.cs

Browse source
This commit is contained in:
2dust 2019-11-27 13:15:02 +08:00
parent 3f1688f8b7
commit b08a0212ff
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
v2rayN/v2rayN/Handler/DownloadHandle.cs
View file

@ -96,6 +96,7 @@ namespace v2rayN.Handler
} }
progressPercentage = -1; progressPercentage = -1;
totalBytesToReceive = 0;
WebClientEx ws = new WebClientEx(); WebClientEx ws = new WebClientEx();
DownloadTimeout = downloadTimeout; DownloadTimeout = downloadTimeout;
@ -106,8 +107,7 @@ namespace v2rayN.Handler
ws.DownloadFileCompleted += ws_DownloadFileCompleted; ws.DownloadFileCompleted += ws_DownloadFileCompleted;
ws.DownloadProgressChanged += ws_DownloadProgressChanged; ws.DownloadProgressChanged += ws_DownloadProgressChanged;
ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName)); ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
totalBytesToReceive = 0;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -122,14 +122,6 @@ namespace v2rayN.Handler
{ {
if (UpdateCompleted != null) if (UpdateCompleted != null)
{ {
if (DownloadTimeout != -1)
{
if ((DateTime.Now - totalDatetime).TotalSeconds > DownloadTimeout)
{
((WebClientEx)sender).CancelAsync();
}
}
if (totalBytesToReceive == 0) if (totalBytesToReceive == 0)
{ {
totalDatetime = DateTime.Now; totalDatetime = DateTime.Now;
@ -138,6 +130,13 @@ namespace v2rayN.Handler
} }
totalBytesToReceive = e.BytesReceived; totalBytesToReceive = e.BytesReceived;
if (DownloadTimeout != -1)
{
if ((DateTime.Now - totalDatetime).TotalSeconds > DownloadTimeout)
{
((WebClientEx)sender).CancelAsync();
}
}
if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0) if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
{ {
progressPercentage = e.ProgressPercentage; progressPercentage = e.ProgressPercentage;