Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2025-02-02 05:52:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Retry on CURLE_RECV_ERROR

Browse Source
This commit is contained in:
Sude 2019-10-24 10:50:55 +03:00
parent 00df6d6099
commit 367c80293a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/downloader.cpp
View File

@ -1192,7 +1192,7 @@ CURLcode Downloader::downloadFile(const std::string& url, const std::string& fil
// Retry partially downloaded file // Retry partially downloaded file
// Retry if we aborted the transfer due to low speed limit // Retry if we aborted the transfer due to low speed limit
if ((res == CURLE_PARTIAL_FILE || res == CURLE_OPERATION_TIMEDOUT) && (this->retries < Globals::globalConfig.iRetries) ) if ((res == CURLE_PARTIAL_FILE || res == CURLE_OPERATION_TIMEDOUT || res == CURLE_RECV_ERROR) && (this->retries < Globals::globalConfig.iRetries) )
{ {
this->retries++; this->retries++;
@ -1201,6 +1201,8 @@ CURLcode Downloader::downloadFile(const std::string& url, const std::string& fil
std::cerr << " (partial download)"; std::cerr << " (partial download)";
else if (res == CURLE_OPERATION_TIMEDOUT) else if (res == CURLE_OPERATION_TIMEDOUT)
std::cerr << " (timeout)"; std::cerr << " (timeout)";
else if (res == CURLE_RECV_ERROR)
std::cerr << " (failed receiving network data)";
std::cerr << std::endl; std::cerr << std::endl;
res = this->downloadFile(url, filepath, xml_data, gamename); res = this->downloadFile(url, filepath, xml_data, gamename);
@ -2825,14 +2827,14 @@ void Downloader::processDownloadQueue(Config conf, const unsigned int& tid)
result = curl_easy_perform(dlhandle); result = curl_easy_perform(dlhandle);
fclose(outfile); fclose(outfile);
if (result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT) if (result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT || result == CURLE_RECV_ERROR)
{ {
iRetryCount++; iRetryCount++;
if (boost::filesystem::exists(filepath) && boost::filesystem::is_regular_file(filepath)) if (boost::filesystem::exists(filepath) && boost::filesystem::is_regular_file(filepath))
bResume = true; bResume = true;
} }
} while ((result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT) && (iRetryCount <= conf.iRetries)); } while ((result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT || result == CURLE_RECV_ERROR) && (iRetryCount <= conf.iRetries));
long int response_code = 0; long int response_code = 0;
if (result == CURLE_HTTP_RETURNED_ERROR) if (result == CURLE_HTTP_RETURNED_ERROR)
@ -4628,14 +4630,14 @@ void Downloader::processGalaxyDownloadQueue_MojoSetupHack(Config conf, const uns
result = curl_easy_perform(dlhandle); result = curl_easy_perform(dlhandle);
fclose(outfile); fclose(outfile);
if (result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT) if (result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT || result == CURLE_RECV_ERROR)
{ {
iRetryCount++; iRetryCount++;
if (boost::filesystem::exists(path_tmp) && boost::filesystem::is_regular_file(path_tmp)) if (boost::filesystem::exists(path_tmp) && boost::filesystem::is_regular_file(path_tmp))
resume_from = static_cast<off_t>(boost::filesystem::file_size(path_tmp)); resume_from = static_cast<off_t>(boost::filesystem::file_size(path_tmp));
} }
} while ((result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT) && (iRetryCount <= conf.iRetries)); } while ((result == CURLE_PARTIAL_FILE || result == CURLE_OPERATION_TIMEDOUT || result == CURLE_RECV_ERROR) && (iRetryCount <= conf.iRetries));
if (result == CURLE_OK) if (result == CURLE_OK)
{ {