diff --git a/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 b/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 index c4487f91527c37cd2a1c214031700a5d14821694..60f6cc49fb0728a5f494275430df8a9a237b430a 100644 Binary files a/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/GeneralUpdate/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/.vs/GeneralUpdate/FileContentIndex/290808fc-b31b-4500-8ea7-4e2804844be6.vsidx b/src/.vs/GeneralUpdate/FileContentIndex/290808fc-b31b-4500-8ea7-4e2804844be6.vsidx deleted file mode 100644 index 2f188f273c9d0798f465018ea12b75ea8d2bd30f..0000000000000000000000000000000000000000 Binary files a/src/.vs/GeneralUpdate/FileContentIndex/290808fc-b31b-4500-8ea7-4e2804844be6.vsidx and /dev/null differ diff --git a/src/.vs/GeneralUpdate/FileContentIndex/b5b59b60-3ceb-446c-b86c-032949639137.vsidx b/src/.vs/GeneralUpdate/FileContentIndex/b5b59b60-3ceb-446c-b86c-032949639137.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..3dd6b504f94963594924dc161031e134ceb96863 Binary files /dev/null and b/src/.vs/GeneralUpdate/FileContentIndex/b5b59b60-3ceb-446c-b86c-032949639137.vsidx differ diff --git a/src/.vs/GeneralUpdate/FileContentIndex/80fd772f-0e97-475a-a596-ba93e1d3d435.vsidx b/src/.vs/GeneralUpdate/FileContentIndex/e15ec6f6-ac94-471c-8604-20f9c35b0663.vsidx similarity index 65% rename from src/.vs/GeneralUpdate/FileContentIndex/80fd772f-0e97-475a-a596-ba93e1d3d435.vsidx rename to src/.vs/GeneralUpdate/FileContentIndex/e15ec6f6-ac94-471c-8604-20f9c35b0663.vsidx index d9c230abf6f652025e80e8a766d11de65a128a86..81bd6df193d03b9713dc16545c24b7cda86a60ed 100644 Binary files a/src/.vs/GeneralUpdate/FileContentIndex/80fd772f-0e97-475a-a596-ba93e1d3d435.vsidx and b/src/.vs/GeneralUpdate/FileContentIndex/e15ec6f6-ac94-471c-8604-20f9c35b0663.vsidx differ diff --git a/src/.vs/ProjectEvaluation/generalupdate.metadata.v2 b/src/.vs/ProjectEvaluation/generalupdate.metadata.v2 index e2b77df171e210e583106724c8179305cada6703..ebc76eb8927b63843af72cd3f7a3e25dd73ea135 100644 Binary files a/src/.vs/ProjectEvaluation/generalupdate.metadata.v2 and b/src/.vs/ProjectEvaluation/generalupdate.metadata.v2 differ diff --git a/src/.vs/ProjectEvaluation/generalupdate.projects.v2 b/src/.vs/ProjectEvaluation/generalupdate.projects.v2 index 0abbd14b9b69e45a777364e6e896204693122490..9111e1c35f12d08089c8d6bf374ea77a14409ad6 100644 Binary files a/src/.vs/ProjectEvaluation/generalupdate.projects.v2 and b/src/.vs/ProjectEvaluation/generalupdate.projects.v2 differ diff --git a/src/AutoUpdate.MinimalService/Program.cs b/src/AutoUpdate.MinimalService/Program.cs index 0aaa2caccff487f38286c74829bbe04e87dd69cc..4963dde254fb877d8631e49a68dd92ba54a55255 100644 --- a/src/AutoUpdate.MinimalService/Program.cs +++ b/src/AutoUpdate.MinimalService/Program.cs @@ -39,7 +39,7 @@ async Task> UpdateVersions(int clientType, string clientV { //TODO:Link database query information.Different version information can be returned according to the 'clientType' of request. var results = new List(); - results.Add(new UpdateVersionDTO("5fb75e44d7c45e3fc9d6aa47c05a0e9a", 1626711760, "9.1.3.0", + results.Add(new UpdateVersionDTO("5001fd3732b91dfe46196ceb0a5bc4b2", 1626711760, "9.1.3.0", "http://192.168.50.170/patchs.zip", "updatepacket1")); //results.Add(new UpdateVersionDTO("d9a3785f08ed3dd92872bd807ebfb917", 1626711820, "9.1.4.0", @@ -55,7 +55,7 @@ async Task> GetValidateInfos(int clientType, string clien { //TODO:Link database query information.Different version information can be returned according to the 'clientType' of request. var results = new List(); - results.Add(new UpdateVersionDTO("5fb75e44d7c45e3fc9d6aa47c05a0e9a", 1626711760, "9.1.3.0", null, null)); + results.Add(new UpdateVersionDTO("5001fd3732b91dfe46196ceb0a5bc4b2", 1626711760, "9.1.3.0", null, null)); //results.Add(new UpdateVersionDTO("d9a3785f08ed3dd92872bd807ebfb917", 1626711820, "9.1.4.0", null, null)); //results.Add(new UpdateVersionDTO("224da586553d60315c55e689a789b7bd", 1626711880, "9.1.5.0", null, null)); return await Task.FromResult(results); diff --git a/src/GeneralUpdate.Core/Download/AbstractTask.cs b/src/GeneralUpdate.Core/Download/AbstractTask.cs index bfb0feee5584849d26f21e57afc78b6de0df0599..ea397eca21de82a942635d195603c58c5fd7354c 100644 --- a/src/GeneralUpdate.Core/Download/AbstractTask.cs +++ b/src/GeneralUpdate.Core/Download/AbstractTask.cs @@ -139,9 +139,16 @@ namespace GeneralUpdate.Core.Download _state.Request = (HttpWebRequest)GetWebRequest(new Uri(url)); _state.Request.ReadWriteTimeout = _timeOut; _state.Request.Timeout = _timeOut; - if (startPos > 0) _state.Request.AddRange((int)startPos); - _state.Respone = _state.Request.GetResponse();//TODO: fix the bug + _state.Respone = _state.Request.GetResponse(); _state.Stream = _state.Respone.GetResponseStream(); + if (_state.Respone.ContentLength == startPos) + { + _state.Close(); + File.Move(_state.TempPath, _state.Path); + _state.Done(true); + return; + } + if (startPos > 0) _state.Request.AddRange((int)startPos); long totalBytesReceived = _state.Respone.ContentLength + startPos; long bytesReceived = startPos; if (totalBytesReceived != 0 && bytesReceived >= totalBytesReceived) @@ -170,10 +177,7 @@ namespace GeneralUpdate.Core.Download } finally { - if (_state != null) - { - _state.Close(); - } + if (_state != null) _state.Close(); } } @@ -217,6 +221,10 @@ namespace GeneralUpdate.Core.Download int readSize = state.Stream.Read(bytes, 0, 1024); while (readSize > 0 && state.IsRangeDownload) { + if (bytesReceived == 47664803) + { + + } if (state == null || state.FileStream == null) break; lock (state.FileStream) {