ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding a progress function for download, it is a bit too verbose...

Browse Source 
Error handling

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5646 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
xapantu 2010-07-05 14:19:00 +00:00
parent 764c70a108
commit 29a5a265ee
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/addons/network.cpp
View File

@ -27,7 +27,7 @@
#include "io/file_manager.hpp"
// ------------------------------------------------------------------------------------------------------
void download(std::string file, std::string save)
bool download(std::string file, std::string save)
{
CURL *session = curl_easy_init();
std::cout << "Downloading: " << std::string(UserConfigParams::m_server_addons.toString() + "/" + file) << std::endl;
@ -39,10 +39,22 @@ void download(std::string file, std::string save)
fp = fopen(std::string(file_manager->getConfigDir() + std::string("/") + file).c_str(), "w");
curl_easy_setopt(session, CURLOPT_WRITEDATA, fp);
curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, fwrite);
curl_easy_perform(session);
curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, &progressDownload);
curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0);
int succes = curl_easy_perform(session);
fclose(fp);
curl_easy_cleanup(session);
std::cout << UserConfigParams::m_server_addons.toString() << std::endl;
if(succes == 0)
std::cout << "Download successfull" << std::endl;
else
std::cout << "Download failed... check your network connexion" << std::endl;
}
int progressDownload (void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
{
int progress = dlnow/dltotal*100;
if(isnan(dlnow/dltotal*100))
progress = 0;
std::cout << "Download progress: " << progress << "%" << std::endl;
return 0;
}
#endif

3
src/addons/network.hpp
View File

@ -21,7 +21,8 @@
#define HEADER_NETWORK_HPP
/** Download a file. The file name isn't absolute, the server in the config will be added to file. */
void download(std::string file, std::string save = "");
bool download(std::string file, std::string save = "");
int progressDownload (void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
#endif
#endif