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

Better handling of connection issues

Browse Source 
Assume that we have connection error and abort transfer with CURLE_OPERATION_TIMEDOUT if download speed is less than 200 B/s for 30 seconds
This commit is contained in:
Sude 2015-06-28 07:38:39 +03:00
parent 0f2268cb67
commit de301d7e8c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/downloader.cpp
View File

@ -73,6 +73,10 @@ int Downloader::init()
curl_easy_setopt(curlhandle, CURLOPT_PROGRESSFUNCTION, Downloader::progressCallback); curl_easy_setopt(curlhandle, CURLOPT_PROGRESSFUNCTION, Downloader::progressCallback);
curl_easy_setopt(curlhandle, CURLOPT_MAX_RECV_SPEED_LARGE, config.iDownloadRate); curl_easy_setopt(curlhandle, CURLOPT_MAX_RECV_SPEED_LARGE, config.iDownloadRate);
// Assume that we have connection error and abort transfer with CURLE_OPERATION_TIMEDOUT if download speed is less than 200 B/s for 30 seconds
curl_easy_setopt(curlhandle, CURLOPT_LOW_SPEED_TIME, 30);
curl_easy_setopt(curlhandle, CURLOPT_LOW_SPEED_LIMIT, 200);
// Create new API handle and set curl options for the API // Create new API handle and set curl options for the API
gogAPI = new API(config.sToken, config.sSecret); gogAPI = new API(config.sToken, config.sSecret);
gogAPI->curlSetOpt(CURLOPT_VERBOSE, config.bVerbose); gogAPI->curlSetOpt(CURLOPT_VERBOSE, config.bVerbose);
@ -1335,9 +1339,18 @@ CURLcode Downloader::downloadFile(const std::string& url, const std::string& fil
} }
// Retry partially downloaded file // Retry partially downloaded file
if (res == CURLE_PARTIAL_FILE && (this->retries < config.iRetries) ) // Retry if we aborted the transfer due to low speed limit
if ((res == CURLE_PARTIAL_FILE || res == CURLE_OPERATION_TIMEDOUT) && (this->retries < config.iRetries) )
{ {
this->retries++; this->retries++;
std::cerr << std::endl << "Retry " << this->retries << "/" << config.iRetries;
if (res == CURLE_PARTIAL_FILE)
std::cerr << " (partial download)";
else if (res == CURLE_OPERATION_TIMEDOUT)
std::cerr << " (timeout)";
std::cerr << std::endl;
res = this->downloadFile(url, filepath, xml_data, gamename); res = this->downloadFile(url, filepath, xml_data, gamename);
} }
else else