From 602cac8b4cc7ea6dea0edd5120a0df16e46908ac Mon Sep 17 00:00:00 2001 From: Sude Date: Sat, 4 Mar 2017 23:52:29 +0200 Subject: [PATCH] Add resume support to Downloader::galaxyInstallGame --- include/galaxyapi.h | 10 ++-- src/downloader.cpp | 110 ++++++++++++++++++++++++++++++++++++++++++-- src/galaxyapi.cpp | 3 ++ 3 files changed, 114 insertions(+), 9 deletions(-) diff --git a/include/galaxyapi.h b/include/galaxyapi.h index 9787324..5257654 100644 --- a/include/galaxyapi.h +++ b/include/galaxyapi.h @@ -22,8 +22,10 @@ struct galaxyDepotItemChunk { std::string md5_compressed; std::string md5_uncompressed; - off_t size_compressed; - off_t size_uncompressed; + uintmax_t size_compressed; + uintmax_t size_uncompressed; + uintmax_t offset_compressed; + uintmax_t offset_uncompressed; }; @@ -31,8 +33,8 @@ struct galaxyDepotItem { std::string path; std::vector chunks; - off_t totalSizeCompressed; - off_t totalSizeUncompressed; + uintmax_t totalSizeCompressed; + uintmax_t totalSizeUncompressed; std::string md5; }; diff --git a/src/downloader.cpp b/src/downloader.cpp index 05bac41..c09e9f1 100644 --- a/src/downloader.cpp +++ b/src/downloader.cpp @@ -3571,17 +3571,117 @@ void Downloader::galaxyInstallGame(const std::string& product_id, int build_inde } } + unsigned int start_chunk = 0; if (boost::filesystem::exists(path)) { std::cout << "File already exists: " << path.string() << std::endl; - if (Util::getFileHash(path.string(), RHASH_MD5) == items[i].md5) - std::cout << "\tOK" << std::endl; + + unsigned int resume_chunk = 0; + uintmax_t filesize = boost::filesystem::file_size(path); + if (filesize == items[i].totalSizeUncompressed) + { + // File is same size + if (Util::getFileHash(path.string(), RHASH_MD5) == items[i].md5) + { + std::cout << "\tOK" << std::endl; + continue; + } + else + { + std::cout << "\tMD5 mismatch" << std::endl; + if (!boost::filesystem::remove(path)) + { + std::cerr << "\tFailed to delete " << path << std::endl; + continue; + } + } + } + else if (filesize > items[i].totalSizeUncompressed) + { + // File is bigger than on server, delete old file and start from beginning + std::cout << "\tFile is bigger than expected. Deleting old file and starting from beginning." << std::endl; + if (!boost::filesystem::remove(path)) + { + std::cerr << "\tFailed to delete " << path << std::endl; + continue; + } + } else - std::cout << "\tMD5 mismatch" << std::endl; - continue; + { + // File is smaller than on server, resume + for (unsigned int j = 0; j < items[i].chunks.size(); ++j) + { + if (items[i].chunks[j].offset_uncompressed == filesize) + { + resume_chunk = j; + break; + } + } + + if (resume_chunk > 0) + { + std::cout << "\tResume from chunk " << resume_chunk << std::endl; + // Get chunk hash for previous chunk + FILE* f = fopen(path.string().c_str(), "r"); + if (!f) + { + std::cerr << "\tFailed to open: " << path << std::endl; + continue; + } + + unsigned int previous_chunk = resume_chunk - 1; + uintmax_t chunk_size = items[i].chunks[previous_chunk].size_uncompressed; + // use fseeko to support large files on 32 bit platforms + fseeko(f, items[i].chunks[previous_chunk].offset_uncompressed, SEEK_SET); + unsigned char *chunk = (unsigned char *) malloc(chunk_size * sizeof(unsigned char *)); + if (chunk == NULL) + { + std::cerr << "Memory error" << std::endl; + fclose(f); + continue; + } + + uintmax_t fread_size = fread(chunk, 1, chunk_size, f); + fclose(f); + + if (fread_size != chunk_size) + { + std::cerr << "Read error" << std::endl; + free(chunk); + continue; + } + std::string chunk_hash = Util::getChunkHash(chunk, chunk_size, RHASH_MD5); + free(chunk); + + if (chunk_hash == items[i].chunks[previous_chunk].md5_uncompressed) + { + // Hash for previous chunk matches, resume at this position + start_chunk = resume_chunk; + } + else + { + // Hash for previous chunk is different, delete old file and start from beginning + std::cout << "\tChunk hash is different. Deleting old file and starting from beginning." << std::endl; + if (!boost::filesystem::remove(path)) + { + std::cerr << "\tFailed to delete " << path << std::endl; + continue; + } + } + } + else + { + std::cout << "\tFailed to find valid resume position. Deleting old file and starting from beginning." << std::endl; + if (!boost::filesystem::remove(path)) + { + std::cerr << "\tFailed to delete " << path << std::endl; + continue; + } + } + } } - for (unsigned int j = 0; j < items[i].chunks.size(); ++j) + for (unsigned int j = start_chunk; j < items[i].chunks.size(); ++j) { ChunkMemoryStruct chunk; chunk.memory = (char *) malloc(1); diff --git a/src/galaxyapi.cpp b/src/galaxyapi.cpp index 44c35a8..a06c6b0 100644 --- a/src/galaxyapi.cpp +++ b/src/galaxyapi.cpp @@ -235,6 +235,9 @@ std::vector galaxyAPI::getDepotItemsVector(const std::string& h chunk.size_compressed = json["depot"]["items"][i]["chunks"][j]["compressedSize"].asLargestUInt(); chunk.size_uncompressed = json["depot"]["items"][i]["chunks"][j]["size"].asLargestUInt(); + chunk.offset_compressed = item.totalSizeCompressed; + chunk.offset_uncompressed = item.totalSizeUncompressed; + item.totalSizeCompressed += chunk.size_compressed; item.totalSizeUncompressed += chunk.size_uncompressed; item.chunks.push_back(chunk);