FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Packages: fix download progress

Browse Source 
(Broke it when improving zip/tar support)
This commit is contained in:
James Turner
2018-08-08 11:12:53 +02:00
parent 6f505f3a76
commit 264779e1d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/package/Install.cxx
+3 -3
View File
@@ -45,8 +45,7 @@ class Install::PackageArchiveDownloader : public HTTP::Request
public: public:
PackageArchiveDownloader(InstallRef aOwner) : PackageArchiveDownloader(InstallRef aOwner) :
HTTP::Request("" /* dummy URL */), HTTP::Request("" /* dummy URL */),
m_owner(aOwner), m_owner(aOwner)
m_downloaded(0)
{ {
m_urls = m_owner->package()->downloadUrls(); m_urls = m_owner->package()->downloadUrls();
if (m_urls.empty()) { if (m_urls.empty()) {
@@ -115,6 +114,7 @@ protected:
{ {
const uint8_t* ubytes = (uint8_t*) s; const uint8_t* ubytes = (uint8_t*) s;
SG_MD5Update(&m_md5, ubytes, n); SG_MD5Update(&m_md5, ubytes, n);
m_downloaded += n;
m_owner->installProgress(m_downloaded, responseLength()); m_owner->installProgress(m_downloaded, responseLength());
m_extractor->extractBytes(ubytes, n); m_extractor->extractBytes(ubytes, n);
} }
@@ -221,7 +221,7 @@ private:
string_list m_urls; string_list m_urls;
SG_MD5_CTX m_md5; SG_MD5_CTX m_md5;
SGPath m_extractPath; SGPath m_extractPath;
size_t m_downloaded; size_t m_downloaded = 0;
std::unique_ptr<ArchiveExtractor> m_extractor; std::unique_ptr<ArchiveExtractor> m_extractor;
}; };