Amebis/Updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUpdCheckThread::DownloadUpdatePackage() does the file-existence check before calculating hash, to avoid unnecessary warning in the log

Browse Source
This commit is contained in:
Simon Rozman 2016-05-24 21:45:44 +02:00
parent ff28695e80
commit 66b2934da8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Updater/src/chkthread.cpp
View File

@ -394,18 +394,20 @@ bool wxUpdCheckThread::ReadUpdatePackageMeta()
bool wxUpdCheckThread::DownloadUpdatePackage() bool wxUpdCheckThread::DownloadUpdatePackage()
{ {
// Calculate file hash (if exists). if (wxFileExists(m_fileName)) {
wxCryptoHashSHA1 ch(*m_cs); // Calculate file hash.
if (ch.HashFile(m_fileName)) { wxCryptoHashSHA1 ch(*m_cs);
wxMemoryBuffer buf; if (ch.HashFile(m_fileName)) {
ch.GetValue(buf); wxMemoryBuffer buf;
ch.GetValue(buf);
if (buf.GetDataLen() == m_hash.GetDataLen() && if (buf.GetDataLen() == m_hash.GetDataLen() &&
memcmp(buf.GetData(), m_hash.GetData(), buf.GetDataLen()) == 0) memcmp(buf.GetData(), m_hash.GetData(), buf.GetDataLen()) == 0)
{ {
// Update package file exists and its hash is correct. // Update package file exists and its hash is correct.
wxLogStatus(_("Update package file already downloaded.")); wxLogStatus(_("Update package file already downloaded."));
return true; return true;
}
} }
} }