Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Some code refactoring.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-04-18 21:03:38 +02:00
parent 7706412a30
commit 35e9484834
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/MUtils/UpdateChecker.h
View File

@ -90,7 +90,7 @@ namespace MUtils
const int getCurrentProgress(void) const { return m_progress; }; const int getCurrentProgress(void) const { return m_progress; };
const UpdateCheckerInfo *getUpdateInfo(void) const { return m_updateInfo.data(); } const UpdateCheckerInfo *getUpdateInfo(void) const { return m_updateInfo.data(); }
void cancel(void) { m_cancelled = true; } bool cancel(void) { return m_cancelled.ref(); }
public slots: public slots:
void start(Priority = InheritPriority); void start(Priority = InheritPriority);
@ -121,7 +121,7 @@ namespace MUtils
const QString m_binaryKeys; const QString m_binaryKeys;
volatile bool m_success; volatile bool m_success;
volatile bool m_cancelled; QAtomicInt m_cancelled;
int m_status; int m_status;
int m_progress; int m_progress;

14
src/UpdateChecker.cpp
View File

@ -222,9 +222,10 @@ static const int DOWNLOAD_TIMEOUT = 30000;
static const int VERSION_INFO_EXPIRES_MONTHS = 6; static const int VERSION_INFO_EXPIRES_MONTHS = 6;
static char *USER_AGENT_STR = "Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.0"; /*use something innocuous*/ static char *USER_AGENT_STR = "Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.0"; /*use something innocuous*/
#define IS_CANCELLED (!(!m_cancelled))
#define CHECK_CANCELLED() do \ #define CHECK_CANCELLED() do \
{ \ { \
if(m_cancelled) \ if(IS_CANCELLED) \
{ \ { \
m_success = false; \ m_success = false; \
log("", "Update check has been cancelled by user!"); \ log("", "Update check has been cancelled by user!"); \
@ -311,7 +312,7 @@ UpdateChecker::UpdateChecker(const QString &binWGet, const QString &binMCat, con
m_testMode(testMode), m_testMode(testMode),
m_maxProgress(getMaxProgress()) m_maxProgress(getMaxProgress())
{ {
m_success = m_cancelled = false; m_success = false;
m_status = UpdateStatus_NotStartedYet; m_status = UpdateStatus_NotStartedYet;
m_progress = 0; m_progress = 0;
@ -331,7 +332,8 @@ UpdateChecker::~UpdateChecker(void)
void UpdateChecker::start(Priority priority) void UpdateChecker::start(Priority priority)
{ {
m_cancelled = m_success = false; m_success = false;
m_cancelled.fetchAndStoreOrdered(0);
QThread::start(priority); QThread::start(priority);
} }
@ -692,7 +694,7 @@ bool UpdateChecker::getFile(const QString &url, const QString &outFile, const un
{ {
return true; return true;
} }
if (m_cancelled) if (IS_CANCELLED)
{ {
break; /*cancelled*/ break; /*cancelled*/
} }
@ -757,7 +759,7 @@ bool UpdateChecker::getFile(const QString &url, const bool forceIp4, const QStri
const QString line = QString::fromLatin1(process.readLine()).simplified(); const QString line = QString::fromLatin1(process.readLine()).simplified();
log(line); log(line);
} }
if (bTimeOut || m_cancelled) if (bTimeOut || IS_CANCELLED)
{ {
qWarning("WGet process timed out <-- killing!"); qWarning("WGet process timed out <-- killing!");
process.kill(); process.kill();
@ -811,7 +813,7 @@ bool UpdateChecker::tryContactHost(const QString &hostname, const int &timeoutMs
QString line = QString::fromLatin1(process.readLine()).simplified(); QString line = QString::fromLatin1(process.readLine()).simplified();
log(line); log(line);
} }
if (bTimeOut || m_cancelled) if (bTimeOut || IS_CANCELLED)
{ {
qWarning("MCat process timed out <-- killing!"); qWarning("MCat process timed out <-- killing!");
process.kill(); process.kill();