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

Galaxy: Display progress bar per file instead of per chunk

Browse Source
This commit is contained in:
Sude 2024-03-18 11:55:36 +02:00
parent 5cca5da0be
commit d463c02af5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/downloader.h
View File

@ -61,6 +61,9 @@ struct xferInfo
Timer timer; Timer timer;
std::deque< std::pair<time_t, uintmax_t> > TimeAndSize; std::deque< std::pair<time_t, uintmax_t> > TimeAndSize;
curl_off_t offset; curl_off_t offset;
bool isChunk = false;
curl_off_t chunk_file_total = 0;
curl_off_t chunk_file_offset = 0;
}; };
typedef struct typedef struct

13
src/downloader.cpp
View File

@ -3398,6 +3398,12 @@ int Downloader::progressCallbackForThread(void *clientp, curl_off_t dltotal, cur
info.dltotal = dltotal; info.dltotal = dltotal;
curl_off_t curl_rate; curl_off_t curl_rate;
if (xferinfo->isChunk)
{
info.dlnow += xferinfo->chunk_file_offset;
info.dltotal = xferinfo->chunk_file_total;
}
// trying to get rate and setting to NaN if it fails // trying to get rate and setting to NaN if it fails
if (CURLE_OK != curl_easy_getinfo(xferinfo->curlhandle, CURLINFO_SPEED_DOWNLOAD_T, &curl_rate)) if (CURLE_OK != curl_easy_getinfo(xferinfo->curlhandle, CURLINFO_SPEED_DOWNLOAD_T, &curl_rate))
info.rate_avg = std::numeric_limits<double>::quiet_NaN(); info.rate_avg = std::numeric_limits<double>::quiet_NaN();
@ -4159,6 +4165,10 @@ void Downloader::processGalaxyDownloadQueue(const std::string& install_path, Con
std::vector<std::string> cdnUrlTemplates; std::vector<std::string> cdnUrlTemplates;
while (dlQueueGalaxy.try_pop(item)) while (dlQueueGalaxy.try_pop(item))
{ {
xferinfo.isChunk = false;
xferinfo.chunk_file_offset = 0;
xferinfo.chunk_file_total = item.totalSizeCompressed;
if (item.product_id != prev_product_id) if (item.product_id != prev_product_id)
cdnUrlTemplates.clear(); cdnUrlTemplates.clear();
@ -4318,6 +4328,9 @@ void Downloader::processGalaxyDownloadQueue(const std::string& install_path, Con
} }
for (unsigned int j = start_chunk; j < item.chunks.size(); ++j) for (unsigned int j = start_chunk; j < item.chunks.size(); ++j)
{ {
xferinfo.isChunk = true;
xferinfo.chunk_file_offset = item.chunks[j].offset_compressed; // Set offset for progress info
// Refresh Galaxy login if token is expired // Refresh Galaxy login if token is expired
if (galaxy->isTokenExpired()) if (galaxy->isTokenExpired())
{ {