Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup for repairFile function

Browse Source
This commit is contained in:
Sude 2013-04-29 11:06:15 +03:00
parent 01430a5735
commit bc787e5f6c
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/downloader.cpp
View File

@ -649,19 +649,11 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
{ {
int res = 0; int res = 0;
FILE *outfile; FILE *outfile;
size_t offset=0; size_t offset=0, from_offset, to_offset, filesize;
std::string filehash;
size_t from_offset, to_offset; int chunks;
std::vector<size_t> chunk_from, chunk_to;
struct FileInfo { std::vector<std::string> chunk_hash;
std::string filename;
std::string hash;
size_t size;
int chunks;
std::vector<size_t> chunk_from;
std::vector<size_t> chunk_to;
std::vector<std::string> chunk_hash;
} info;
// Get filename // Get filename
boost::filesystem::path pathname = filepath; boost::filesystem::path pathname = filepath;
@ -689,10 +681,10 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
{ {
std::cout << "XML: Valid XML" << std::endl; std::cout << "XML: Valid XML" << std::endl;
TiXmlElement *fileElem = fileNode->ToElement(); TiXmlElement *fileElem = fileNode->ToElement();
info.filename = fileElem->Attribute("name"); filename = fileElem->Attribute("name");
info.hash = fileElem->Attribute("md5"); filehash = fileElem->Attribute("md5");
std::stringstream(fileElem->Attribute("chunks")) >> info.chunks; std::stringstream(fileElem->Attribute("chunks")) >> chunks;
std::stringstream(fileElem->Attribute("total_size")) >> info.size; std::stringstream(fileElem->Attribute("total_size")) >> filesize;
//Iterate through all chunk nodes //Iterate through all chunk nodes
TiXmlNode *chunkNode = fileNode->FirstChild(); TiXmlNode *chunkNode = fileNode->FirstChild();
@ -701,18 +693,18 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
TiXmlElement *chunkElem = chunkNode->ToElement(); TiXmlElement *chunkElem = chunkNode->ToElement();
std::stringstream(chunkElem->Attribute("from")) >> from_offset; std::stringstream(chunkElem->Attribute("from")) >> from_offset;
std::stringstream(chunkElem->Attribute("to")) >> to_offset; std::stringstream(chunkElem->Attribute("to")) >> to_offset;
info.chunk_from.push_back(from_offset); chunk_from.push_back(from_offset);
info.chunk_to.push_back(to_offset); chunk_to.push_back(to_offset);
info.chunk_hash.push_back(chunkElem->GetText()); chunk_hash.push_back(chunkElem->GetText());
chunkNode = fileNode->IterateChildren(chunkNode); chunkNode = fileNode->IterateChildren(chunkNode);
} }
} }
std::cout << "XML: Parsing finished" << std::endl << std::endl std::cout << "XML: Parsing finished" << std::endl << std::endl
<< info.filename << std::endl << filename << std::endl
<< "\tMD5:\t" << info.hash << std::endl << "\tMD5:\t" << filehash << std::endl
<< "\tChunks:\t" << info.chunks << std::endl << "\tChunks:\t" << chunks << std::endl
<< "\tSize:\t" << info.size << " bytes" << std::endl << std::endl; << "\tSize:\t" << filesize << " bytes" << std::endl << std::endl;
// Check if file exists // Check if file exists
if ((outfile=fopen(filepath.c_str(), "r"))!=NULL) if ((outfile=fopen(filepath.c_str(), "r"))!=NULL)
@ -735,7 +727,7 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
return res; return res;
} }
if (offset != info.size) if (offset != filesize)
{ {
std::cout << "Filesizes don't match" << std::endl std::cout << "Filesizes don't match" << std::endl
<< "Incomplete download or different version" << std::endl; << "Incomplete download or different version" << std::endl;
@ -762,18 +754,18 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
return res; return res;
} }
for (int i=0; i<info.chunks; i++) for (int i=0; i<chunks; i++)
{ {
size_t begin = info.chunk_from.at(i); size_t chunk_begin = chunk_from.at(i);
size_t end = info.chunk_to.at(i); size_t chunk_end = chunk_to.at(i);
size_t size=0, chunk_size = end - begin + 1; size_t size=0, chunk_size = chunk_end - chunk_begin + 1;
std::stringstream ss; std::stringstream ss;
ss << begin << "-" << end; ss << chunk_begin << "-" << chunk_end;
std::string range = ss.str(); std::string range = ss.str();
ss.str(std::string()); ss.str(std::string());
std::cout << "\033[0K\rChunk " << i << " (" << chunk_size << " bytes): "; std::cout << "\033[0K\rChunk " << i << " (" << chunk_size << " bytes): ";
fseek(outfile, begin, SEEK_SET); fseek(outfile, chunk_begin, SEEK_SET);
unsigned char *chunk = (unsigned char *) malloc(chunk_size * sizeof(unsigned char *)); unsigned char *chunk = (unsigned char *) malloc(chunk_size * sizeof(unsigned char *));
if (chunk == NULL) if (chunk == NULL)
{ {
@ -788,10 +780,10 @@ int Downloader::repairFile(const std::string& url, const std::string& filepath,
return res; return res;
} }
std::string hash = Util::getChunkHash(chunk, chunk_size, RHASH_MD5); std::string hash = Util::getChunkHash(chunk, chunk_size, RHASH_MD5);
if (hash != info.chunk_hash.at(i)) if (hash != chunk_hash.at(i))
{ {
std::cout << "Failed - downloading chunk" << std::endl; std::cout << "Failed - downloading chunk" << std::endl;
fseek(outfile, begin, SEEK_SET); fseek(outfile, chunk_begin, SEEK_SET);
curl_easy_setopt(curlhandle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curlhandle, CURLOPT_URL, url.c_str());
curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, Downloader::writeData); curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, Downloader::writeData);
curl_easy_setopt(curlhandle, CURLOPT_READFUNCTION, Downloader::readData); curl_easy_setopt(curlhandle, CURLOPT_READFUNCTION, Downloader::readData);