OSDN Git Service

Use simplified() method to clean-up input lines.
[mutilities/MUtilities.git] / src / UpdateChecker.cpp
index fb64ef2..a829f41 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 #include <QStringList>
 #include <QFile>
 #include <QFileInfo>
+#include <QDir>
 #include <QProcess>
 #include <QUrl>
 #include <QEventLoop>
 #include <QTimer>
+#include <QElapsedTimer>
+#include <QSet>
+#include <QHash>
+#include <QQueue>
 
-using namespace MUtils;
+#include "Mirrors.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CONSTANTS
 ///////////////////////////////////////////////////////////////////////////////
 
-static const char *header_id = "!Update";
+static const char *GLOBALHEADER_ID = "!Update";
 
-static const char *mirror_url_postfix[] = 
+static const char *MIRROR_URL_POSTFIX[] = 
 {
        "update.ver",
        "update_beta.ver",
        NULL
 };
 
-static const char *update_mirrors[] =
-{
-       "http://muldersoft.com/",
-       "http://mulder.bplaced.net/",                   //"http://mulder.cwsurf.de/",
-       "http://mulder.6te.net/",
-       "http://mulder.webuda.com/",                    //"http://mulder.byethost13.com/",
-       "http://mulder.pe.hu/",                                 //"http://muldersoft.kilu.de/",
-       "http://muldersoft.square7.ch/",                //"http://muldersoft.zxq.net/",
-       "http://muldersoft.co.nf/",
-       "http://muldersoft.eu.pn/",
-       "http://muldersoft.lima-city.de/",
-       "http://www.muldersoft.keepfree.de/",
-       "http://lamexp.sourceforge.net/",
-       "http://lordmulder.github.io/LameXP/",
-       "http://lord_mulder.bitbucket.org/",
-       "http://www.tricksoft.de/",
-       NULL
-};
-
-static const char *known_hosts[] =             //Taken form: http://www.alexa.com/topsites !!!
-{
-       "www.163.com",
-       "www.7-zip.org",
-       "www.ac3filter.net",
-       "clbianco.altervista.org",
-       "status.aws.amazon.com",
-       "build.antergos.com",
-       "www.aol.com",
-       "www.apache.org",
-       "www.apple.com",
-       "www.adobe.com",
-       "archive.org",
-       "www.artlebedev.ru",
-       "web.audacityteam.org",
-       "status.automattic.com",
-       "www.avidemux.org",
-       "www.babylon.com",
-       "www.baidu.com",
-       "bandcamp.com",
-       "www.bbc.co.uk",
-       "www.berlios.de",
-       "www.bing.com",
-       "www.bingeandgrab.com",
-       "www.bucketheadpikes.com",
-       "www.buckethead-coop.com",
-       "www.buzzfeed.com",
-       "www.ccc.de",
-       "www.citizeninsomniac.com",
-       "www.cnet.com",
-       "cnzz.com",
-       "www.codeplex.com",
-       "www.codeproject.com",
-       "www.der-postillon.com",
-       "www.ebay.com",
-       "www.equation.com",
-       "www.farbrausch.de",
-       "fc2.com",
-       "fedoraproject.org",
-       "blog.fefe.de",
-       "www.ffmpeg.org",
-       "blog.flickr.net",
-       "free-codecs.com",
-       "git-scm.com",
-       "doc.gitlab.com",
-       "www.gmx.net",
-       "news.gnome.org",
-       "www.gnu.org",
-       "go.com",
-       "code.google.com",
-       "haali.su",
-       "www.heise.de",
-       "www.huffingtonpost.co.uk",
-       "www.iana.org",
-       "www.imdb.com",
-       "www.imgburn.com",
-       "imgur.com",
-       "www.jd.com",
-       "www.jiscdigitalmedia.ac.uk",
-       "kannmanumdieuhrzeitschonnbierchentrinken.de",
-       "mirrors.kernel.org",
-       "komisar.gin.by",
-       "lame.sourceforge.net",
-       "www.libav.org",
-       "blog.linkedin.com",
-       "www.linuxmint.com",
-       "www.livedoor.com",
-       "www.livejournal.com",
-       "longplayer.org",
-       "go.mail.ru",
-       "marknelson.us",
-       "www.mediafire.com",
-       "www.mod-technologies.com",
-       "ftp.mozilla.org",
-       "mplayerhq.hu",
-       "www.msn.com",
-       "wiki.multimedia.cx",
-       "www.nch.com.au",
-       "mirror.netcologne.de",
-       "oss.netfarm.it",
-       "blog.netflix.com",
-       "netrenderer.de",
-       "www.nytimes.com",
-       "www.opera.com",
-       "www.partha.com",
-       "pastebin.com",
-       "pastie.org",
-       "portableapps.com",
-       "www.portablefreeware.com",
-       "support.proboards.com",
-       "www.qq.com",
-       "www.qt.io",
-       "www.quakelive.com",
-       "rationalqm.us",
-       "www.seamonkey-project.org",
-       "selfhtml.org",
-       "www.sina.com.cn",
-       "www.sohu.com",
-       "help.sogou.com",
-       "sourceforge.net",
-       "www.spiegel.de",
-       "www.sputnikmusic.com",
-       "stackoverflow.com",
-       "www.t-online.de",
-       "www.tagesschau.de",
-       "tdm-gcc.tdragon.net",
-       "www.tdrsmusic.com",
-       "www.ubuntu.com",
-       "www.uol.com.br",
-       "www.videohelp.com",
-       "www.videolan.org",
-       "virtualdub.org",
-       "blog.virustotal.com",
-       "www.vkgoeswild.com",
-       "www.warr.org",
-       "www.weibo.com",
-       "status.wikimedia.org",
-       "www.winamp.com",
-       "www.winhoros.de",
-       "wpde.org",
-       "x265.org",
-       "xhmikosr.1f0.de",
-       "xiph.org",
-       "us.mail.yahoo.com",
-       "www.youtube.com",
-       "www.zedo.com",
-       "ffmpeg.zeranoe.com",
-       NULL
-};
-
 static const int MIN_CONNSCORE = 5;
+static const int QUICK_MIRRORS = 3;
+static const int MAX_CONN_TIMEOUT = 16000;
+static const int DOWNLOAD_TIMEOUT = 30000;
+
 static const int VERSION_INFO_EXPIRES_MONTHS = 6;
-static char *USER_AGENT_STR = "Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20111106 IceCat/7.0.1";
+static char *USER_AGENT_STR = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0"; /*use something innocuous*/
 
 ////////////////////////////////////////////////////////////
-// Helper Functions
+// Utility Macros
 ////////////////////////////////////////////////////////////
 
-static int getMaxProgress(void)
-{
-       int counter = MIN_CONNSCORE + 2;
-       for(int i = 0; update_mirrors[i]; i++) counter++;
-       return counter;
-}
+#define CHECK_CANCELLED() do \
+{ \
+       if(MUTILS_BOOLIFY(m_cancelled)) \
+       { \
+               m_success.fetchAndStoreOrdered(0); \
+               log("", "Update check has been cancelled by user!"); \
+               setProgress(m_maxProgress); \
+               setStatus(UpdateStatus_CancelledByUser); \
+               return; \
+       } \
+} \
+while(0)
+
+#define LOG_MESSAGE_HELPER(X) do \
+{ \
+       if (!(X).isNull()) \
+       { \
+               emit messageLogged((X)); \
+       } \
+} \
+while(0)
+
+#define STRICMP(X,Y) ((X).compare((Y), Qt::CaseInsensitive) == 0)
+
+////////////////////////////////////////////////////////////
+// Helper Functions
+////////////////////////////////////////////////////////////
 
-static QStringList buildRandomList(const char *const values[])
+static QQueue<QString> buildRandomList(const char *const *values)
 {
-       QStringList list;
-       for (int index = 0; values[index]; index++)
+       QQueue<QString> list;
+       while(*values)
        {
-               const int pos = next_rand32() % (index + 1);
-               list.insert(pos, QString::fromLatin1(values[index]));
+               list.insert(MUtils::next_rand_u32(list.size() + 1), QString::fromLatin1(*(values++)));
        }
        return list;
 }
 
+static const QHash<QString, QString> *initEnvVars(void)
+{
+       QHash<QString, QString> *const environment = new QHash<QString, QString>();
+       environment->insert(QLatin1String("CURL_HOME"), QDir::toNativeSeparators(MUtils::temp_folder()));
+       return environment;
+}
+
 ////////////////////////////////////////////////////////////
 // Update Info Class
 ////////////////////////////////////////////////////////////
 
-UpdateCheckerInfo::UpdateCheckerInfo(void)
+MUtils::UpdateCheckerInfo::UpdateCheckerInfo(void)
 {
        resetInfo();
 }
        
-void UpdateCheckerInfo::resetInfo(void)
+void MUtils::UpdateCheckerInfo::resetInfo(void)
 {
        m_buildNo = 0;
        m_buildDate.setDate(1900, 1, 1);
@@ -242,103 +129,131 @@ void UpdateCheckerInfo::resetInfo(void)
        m_downloadChecksum.clear();
 }
 
-bool UpdateCheckerInfo::isComplete(void)
+bool MUtils::UpdateCheckerInfo::isComplete(void)
 {
-       if(this->m_buildNo < 1)                return false;
-       if(this->m_buildDate.year() < 2010)    return false;
-       if(this->m_downloadSite.isEmpty())     return false;
-       if(this->m_downloadAddress.isEmpty())  return false;
-       if(this->m_downloadFilename.isEmpty()) return false;
-       if(this->m_downloadFilecode.isEmpty()) return false;
-       if(this->m_downloadChecksum.isEmpty()) return false;
-
-       return true;
+       return (this->m_buildNo > 0) &&
+               (this->m_buildDate.year() >= 2010) &&
+               (!this->m_downloadSite.isEmpty()) &&
+               (!this->m_downloadAddress.isEmpty()) &&
+               (!this->m_downloadFilename.isEmpty()) &&
+               (!this->m_downloadFilecode.isEmpty()) &&
+               (!this->m_downloadChecksum.isEmpty());
 }
 
 ////////////////////////////////////////////////////////////
 // Constructor & Destructor
 ////////////////////////////////////////////////////////////
 
-UpdateChecker::UpdateChecker(const QString &binWGet, const QString &binNC, const QString &binGnuPG, const QString &binKeys, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode)
+MUtils::UpdateChecker::UpdateChecker(const QString &binCurl, const QString &binGnuPG, const QString &binKeys, const QString &applicationId, const quint32 &installedBuildNo, const bool betaUpdates, const bool testMode)
 :
        m_updateInfo(new UpdateCheckerInfo()),
-       m_binaryWGet(binWGet),
-       m_binaryNC(binNC),
+       m_binaryCurl(binCurl),
        m_binaryGnuPG(binGnuPG),
        m_binaryKeys(binKeys),
        m_applicationId(applicationId),
        m_installedBuildNo(installedBuildNo),
        m_betaUpdates(betaUpdates),
        m_testMode(testMode),
-       m_maxProgress(getMaxProgress())
+       m_maxProgress(MIN_CONNSCORE + 5),
+       m_environment(initEnvVars())
 {
-       m_success = false;
        m_status = UpdateStatus_NotStartedYet;
        m_progress = 0;
 
-       if(m_binaryWGet.isEmpty() || m_binaryGnuPG.isEmpty() || m_binaryKeys.isEmpty())
+       if(m_binaryCurl.isEmpty() || m_binaryGnuPG.isEmpty() || m_binaryKeys.isEmpty())
        {
                MUTILS_THROW("Tools not initialized correctly!");
        }
 }
 
-UpdateChecker::~UpdateChecker(void)
+MUtils::UpdateChecker::~UpdateChecker(void)
 {
 }
 
 ////////////////////////////////////////////////////////////
+// Public slots
+////////////////////////////////////////////////////////////
+
+void MUtils::UpdateChecker::start(Priority priority)
+{
+       m_success.fetchAndStoreOrdered(0);
+       m_cancelled.fetchAndStoreOrdered(0);
+       QThread::start(priority);
+}
+
+////////////////////////////////////////////////////////////
 // Protected functions
 ////////////////////////////////////////////////////////////
 
-void UpdateChecker::run(void)
+void MUtils::UpdateChecker::run(void)
 {
        qDebug("Update checker thread started!");
-       MUTILS_EXCEPTION_HANDLER(m_testMode ? testKnownHosts() : checkForUpdates());
+       MUTILS_EXCEPTION_HANDLER(m_testMode ? testMirrorsList() : checkForUpdates());
        qDebug("Update checker thread completed.");
 }
 
-void UpdateChecker::checkForUpdates(void)
+void MUtils::UpdateChecker::checkForUpdates(void)
 {
        // ----- Initialization ----- //
 
-       m_success = false;
        m_updateInfo->resetInfo();
-       seed_rand();
        setProgress(0);
 
        // ----- Test Internet Connection ----- //
 
-       log("Checking internet connection...", "");
+       log("Checking your Internet connection...", "");
        setStatus(UpdateStatus_CheckingConnection);
 
        const int networkStatus = OS::network_status();
        if(networkStatus == OS::NETWORK_TYPE_NON)
        {
-               log("Operating system reports that the computer is currently offline !!!");
-               setProgress(m_maxProgress);
-               setStatus(UpdateStatus_ErrorNoConnection);
-               return;
+               if (!MUtils::OS::arguments().contains("ignore-network-status"))
+               {
+                       log("Operating system reports that the computer is currently offline !!!");
+                       setProgress(m_maxProgress);
+                       setStatus(UpdateStatus_ErrorNoConnection);
+                       return;
+               }
        }
        
+       msleep(333);
        setProgress(1);
 
        // ----- Test Known Hosts Connectivity ----- //
 
-       int connectionScore = 0, connectionRetry = MIN_CONNSCORE;
+       int connectionScore = 0;
+       QQueue<QString> mirrorList = buildRandomList(known_hosts);
 
-       QStringList hostList = buildRandomList(known_hosts);
-       while((!hostList.isEmpty()) && (connectionScore < MIN_CONNSCORE) && (connectionRetry > 0))
+       for(int connectionTimeout = 1000; connectionTimeout <= MAX_CONN_TIMEOUT; connectionTimeout *= 2)
        {
-               connectionRetry--;
-               if(tryContactHost(hostList.takeFirst()))
+               QElapsedTimer elapsedTimer;
+               elapsedTimer.start();
+               const int globalTimeout = 2 * MIN_CONNSCORE * connectionTimeout, count = mirrorList.count();
+               for(int i = 0; i < count; ++i)
                {
-                       connectionScore += 1;
-                       connectionRetry = MIN_CONNSCORE;
+                       Q_ASSERT(!mirrorList.isEmpty());
+                       const QString hostName = mirrorList.dequeue();
+                       if (tryContactHost(hostName, connectionTimeout))
+                       {
+                               setProgress(1 + (++connectionScore));
+                               if (connectionScore >= MIN_CONNSCORE)
+                               {
+                                       goto endLoop; /*success*/
+                               }
+                       }
+                       else
+                       {
+                               mirrorList.enqueue(hostName);
+                               if(elapsedTimer.hasExpired(globalTimeout))
+                               {
+                                       break; /*timer expired*/
+                               }
+                       }
+                       CHECK_CANCELLED();
                }
-               setProgress(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1));
-               msleep(25);
        }
 
+endLoop:
        if(connectionScore < MIN_CONNSCORE)
        {
                log("", "Connectivity test has failed: Internet connection appears to be broken!");
@@ -349,30 +264,35 @@ void UpdateChecker::checkForUpdates(void)
 
        // ----- Fetch Update Info From Server ----- //
 
-       log("----", "", "Checking for updates online...");
+       log("----", "", "Internet connection is operational, checking for updates online...");
        setStatus(UpdateStatus_FetchingUpdates);
 
-       QStringList mirrorList = buildRandomList(update_mirrors);
+       int mirrorCount = 0;
+       mirrorList = buildRandomList(update_mirrors);
+
        while(!mirrorList.isEmpty())
        {
-               QString currentMirror = mirrorList.takeFirst();
-               setProgress(m_progress + 1);
-               if(!m_success)
+               const QString currentMirror = mirrorList.takeFirst();
+               const bool isQuick = (mirrorCount++ < QUICK_MIRRORS);
+               if(tryUpdateMirror(m_updateInfo.data(), currentMirror, isQuick))
                {
-                       if(tryUpdateMirror(m_updateInfo.data(), currentMirror))
-                       {
-                               m_success = true;
-                       }
+                       m_success.ref(); /*success*/
+                       break;
                }
-               else
+               if (isQuick)
                {
-                       msleep(25);
+                       mirrorList.append(currentMirror); /*re-schedule*/
                }
+               CHECK_CANCELLED();
+               msleep(1);
        }
-       
-       setProgress(m_maxProgress);
 
-       if(m_success)
+       msleep(333);
+       setProgress(MIN_CONNSCORE + 5);
+
+       // ----- Generate final result ----- //
+
+       if(MUTILS_BOOLIFY(m_success))
        {
                if(m_updateInfo->m_buildNo > m_installedBuildNo)
                {
@@ -393,28 +313,63 @@ void UpdateChecker::checkForUpdates(void)
        }
 }
 
-void UpdateChecker::testKnownHosts(void)
+void MUtils::UpdateChecker::testMirrorsList(void)
 {
-       QStringList hostList;
-       for(int i = 0; known_hosts[i]; i++)
+       QQueue<QString> mirrorList;
+       for(int i = 0; update_mirrors[i]; i++)
+       {
+               mirrorList.enqueue(QString::fromLatin1(update_mirrors[i]));
+       }
+
+       // ----- Test update mirrors ----- //
+
+       qDebug("\n[Mirror Sites]");
+       log("Testing all known mirror sites...", "", "---");
+
+       UpdateCheckerInfo updateInfo;
+       while (!mirrorList.isEmpty())
+       {
+               const QString currentMirror = mirrorList.dequeue();
+               bool success = false;
+               qDebug("Testing: %s", MUTILS_L1STR(currentMirror));
+               log("", "Testing mirror:", currentMirror, "");
+               for (quint8 attempt = 0; attempt < 3; ++attempt)
+               {
+                       updateInfo.resetInfo();
+                       if (tryUpdateMirror(&updateInfo, currentMirror, (!attempt)))
+                       {
+                               success = true;
+                               break;
+                       }
+               }
+               if (!success)
+               {
+                       qWarning("\nUpdate mirror seems to be unavailable:\n%s\n", MUTILS_L1STR(currentMirror));
+               }
+               log("", "---");
+       }
+
+       // ----- Test known hosts ----- //
+
+       mirrorList.clear();
+       for (int i = 0; known_hosts[i]; i++)
        {
-               hostList << QString::fromLatin1(known_hosts[i]);
+               mirrorList.enqueue(QString::fromLatin1(known_hosts[i]));
        }
 
        qDebug("\n[Known Hosts]");
        log("Testing all known hosts...", "", "---");
 
-       int hostCount = hostList.count();
-       while(!hostList.isEmpty())
+       while(!mirrorList.isEmpty())
        {
-               QString currentHost = hostList.takeFirst();
-               qDebug("Testing: %s", currentHost.toLatin1().constData());
-               log("", "Testing:", currentHost, "");
-               if (!tryContactHost(currentHost))
+               const QString currentHost = mirrorList.dequeue();
+               qDebug("Testing: %s", MUTILS_L1STR(currentHost));
+               log(QLatin1String(""), "Testing host:", currentHost, "");
+               if (!tryContactHost(currentHost, DOWNLOAD_TIMEOUT))
                {
-                       qWarning("\nConnectivity test FAILED on the following host:\n%s\n", currentHost.toLatin1().constData());
+                       qWarning("\nConnectivity test FAILED on the following host:\n%s\n", MUTILS_L1STR(currentHost));
                }
-               log("", "---");
+               log("---");
        }
 }
 
@@ -422,7 +377,7 @@ void UpdateChecker::testKnownHosts(void)
 // PRIVATE FUNCTIONS
 ////////////////////////////////////////////////////////////
 
-void UpdateChecker::setStatus(const int status)
+void MUtils::UpdateChecker::setStatus(const int status)
 {
        if(m_status != status)
        {
@@ -431,79 +386,127 @@ void UpdateChecker::setStatus(const int status)
        }
 }
 
-void UpdateChecker::setProgress(const int progress)
+void MUtils::UpdateChecker::setProgress(const int progress)
 {
-       if(m_progress != progress)
+       const int value = qBound(0, progress, m_maxProgress);
+       if(m_progress != value)
        {
-               m_progress = progress;
-               emit progressChanged(progress);
+               emit progressChanged(m_progress = value);
        }
 }
 
-void UpdateChecker::log(const QString &str1, const QString &str2, const QString &str3, const QString &str4)
+void MUtils::UpdateChecker::log(const QString &str1, const QString &str2, const QString &str3, const QString &str4)
 {
-       if(!str1.isNull()) emit messageLogged(str1);
-       if(!str2.isNull()) emit messageLogged(str2);
-       if(!str3.isNull()) emit messageLogged(str3);
-       if(!str4.isNull()) emit messageLogged(str4);
+       LOG_MESSAGE_HELPER(str1);
+       LOG_MESSAGE_HELPER(str2);
+       LOG_MESSAGE_HELPER(str3);
+       LOG_MESSAGE_HELPER(str4);
 }
 
-bool UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url)
+bool MUtils::UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url, const bool &quick)
 {
        bool success = false;
-       log("", "Trying mirror:", url);
+       log("", "Trying update mirror:", url, "");
+
+       if (quick)
+       {
+               setProgress(MIN_CONNSCORE + 1);
+               if (!tryContactHost(QUrl(url).host(), (MAX_CONN_TIMEOUT / 8)))
+               {
+                       log("", "Mirror is too slow, skipping!");
+                       return false;
+               }
+       }
 
-       const QString randPart = rand_str();
+       const QString randPart = next_rand_str();
        const QString outFileVers = QString("%1/%2.ver").arg(temp_folder(), randPart);
        const QString outFileSign = QString("%1/%2.sig").arg(temp_folder(), randPart);
 
-       if(getUpdateInfo(url, outFileVers, outFileSign))
+       if (!getUpdateInfo(url, outFileVers, outFileSign))
        {
-               log("", "Download okay, checking signature:");
-               if(checkSignature(outFileVers, outFileSign))
-               {
-                       log("", "Signature okay, parsing info:");
-                       success = parseVersionInfo(outFileVers, updateInfo);
-               }
-               else
-               {
-                       log("", "Bad signature, take care!");
-               }
+               log("", "Oops: Download of update information has failed!");
+               goto cleanUp;
        }
-       else
+
+       log("Download completed, verifying signature:", "");
+       setProgress(MIN_CONNSCORE + 4);
+       if (!checkSignature(outFileVers, outFileSign))
        {
-               log("", "Download has failed!");
+               log("", "Bad signature detected, take care !!!");
+               goto cleanUp;
        }
 
+       log("", "Signature is valid, parsing update information:", "");
+       success = parseVersionInfo(outFileVers, updateInfo);
+
+cleanUp:
        QFile::remove(outFileVers);
        QFile::remove(outFileSign);
-       
        return success;
 }
 
-bool UpdateChecker::getUpdateInfo(const QString &url, const QString &outFileVers, const QString &outFileSign)
+bool MUtils::UpdateChecker::getUpdateInfo(const QString &url, const QString &outFileVers, const QString &outFileSign)
 {
-       log("", "Downloading update info:");
-       if(!getFile(QString("%1%2"     ).arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0]), outFileVers))
+       log("Downloading update information:", "");
+       setProgress(MIN_CONNSCORE + 2);
+       if(getFile(QUrl(QString("%1%2").arg(url, MIRROR_URL_POSTFIX[m_betaUpdates ? 1 : 0])), outFileVers))
        {
-               return false;
+               if (!m_cancelled)
+               {
+                       log( "Downloading signature file:", "");
+                       setProgress(MIN_CONNSCORE + 3);
+                       if (getFile(QUrl(QString("%1%2.sig2").arg(url, MIRROR_URL_POSTFIX[m_betaUpdates ? 1 : 0])), outFileSign))
+                       {
+                               return true; /*completed*/
+                       }
+               }
        }
+       return false;
+}
 
-       log("", "Downloading signature:");
-       if(!getFile(QString("%1%2.sig2").arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0]), outFileSign))
-       {
-               return false;
+//----------------------------------------------------------
+// PARSE UPDATE INFO
+//----------------------------------------------------------
+
+#define _CHECK_HEADER(ID,NAME) \
+       if (STRICMP(name, (NAME))) \
+       { \
+               sectionId = (ID); \
+               continue; \
        }
 
-       return true;
-}
+#define _PARSE_TEXT(OUT,KEY) \
+       if (STRICMP(key, (KEY))) \
+       { \
+               (OUT) = val; \
+               break; \
+       }
 
-bool UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *updateInfo)
-{
-       QRegExp value("^(\\w+)=(.+)$");
-       QRegExp section("^\\[(.+)\\]$");
+#define _PARSE_UINT(OUT,KEY) \
+       if (STRICMP(key, (KEY))) \
+       { \
+               bool _ok = false; \
+               const unsigned int _tmp = val.toUInt(&_ok); \
+               if (_ok) \
+               { \
+                       (OUT) = _tmp; \
+                       break; \
+               } \
+       }
 
-       QDate updateInfoDate;
+#define _PARSE_DATE(OUT,KEY) \
+       if (STRICMP(key, (KEY))) \
+       { \
+               const QDate _tmp = QDate::fromString(val, Qt::ISODate); \
+               if (_tmp.isValid()) \
+               { \
+                       (OUT) = _tmp; \
+                       break; \
+               } \
+       }
+
+bool MUtils::UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *const updateInfo)
+{
        updateInfo->resetInfo();
 
        QFile data(file);
@@ -512,199 +515,180 @@ bool UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *upd
                qWarning("Cannot open update info file for reading!");
                return false;
        }
-       
-       bool inHdr = false;
-       bool inSec = false;
-       
+
+       QDate updateInfoDate;
+       int sectionId = 0;
+       QRegExp regex_sec("^\\[(.+)\\]$"), regex_val("^([^=]+)=(.+)$");
+
        while(!data.atEnd())
        {
-               QString line = QString::fromLatin1(data.readLine()).trimmed();
-               if(section.indexIn(line) >= 0)
+               QString line = QString::fromLatin1(data.readLine()).simplified();
+               if (regex_sec.indexIn(line) >= 0)
                {
-                       log(QString("Sec: [%1]").arg(section.cap(1)));
-                       inSec = (section.cap(1).compare(m_applicationId, Qt::CaseInsensitive) == 0);
-                       inHdr = (section.cap(1).compare(QString::fromLatin1(header_id), Qt::CaseInsensitive) == 0);
+                       sectionId = 0; /*unknown section*/
+                       const QString name = regex_sec.cap(1).trimmed();
+                       log(QString("Sec: [%1]").arg(name));
+                       _CHECK_HEADER(1, GLOBALHEADER_ID)
+                       _CHECK_HEADER(2, m_applicationId)
                        continue;
                }
-               if(inSec && (value.indexIn(line) >= 0))
-               {
-                       log(QString("Val: '%1' ==> '%2").arg(value.cap(1), value.cap(2)));
-                       if(value.cap(1).compare("BuildNo", Qt::CaseInsensitive) == 0)
-                       {
-                               bool ok = false;
-                               const unsigned int temp = value.cap(2).toUInt(&ok);
-                               if(ok) updateInfo->m_buildNo = temp;
-                       }
-                       else if(value.cap(1).compare("BuildDate", Qt::CaseInsensitive) == 0)
-                       {
-                               const QDate temp = QDate::fromString(value.cap(2).trimmed(), Qt::ISODate);
-                               if(temp.isValid()) updateInfo->m_buildDate = temp;
-                       }
-                       else if(value.cap(1).compare("DownloadSite", Qt::CaseInsensitive) == 0)
-                       {
-                               updateInfo->m_downloadSite = value.cap(2).trimmed();
-                       }
-                       else if(value.cap(1).compare("DownloadAddress", Qt::CaseInsensitive) == 0)
-                       {
-                               updateInfo->m_downloadAddress = value.cap(2).trimmed();
-                       }
-                       else if(value.cap(1).compare("DownloadFilename", Qt::CaseInsensitive) == 0)
-                       {
-                               updateInfo->m_downloadFilename = value.cap(2).trimmed();
-                       }
-                       else if(value.cap(1).compare("DownloadFilecode", Qt::CaseInsensitive) == 0)
-                       {
-                               updateInfo->m_downloadFilecode = value.cap(2).trimmed();
-                       }
-                       else if(value.cap(1).compare("DownloadChecksum", Qt::CaseInsensitive) == 0)
-                       {
-                               updateInfo->m_downloadChecksum = value.cap(2).trimmed();
-                       }
-               }
-               if(inHdr && (value.indexIn(line) >= 0))
+               if (regex_val.indexIn(line) >= 0)
                {
-                       log(QString("Val: '%1' ==> '%2").arg(value.cap(1), value.cap(2)));
-                       if(value.cap(1).compare("TimestampCreated", Qt::CaseInsensitive) == 0)
+                       const QString key = regex_val.cap(1).trimmed();
+                       const QString val = regex_val.cap(2).trimmed();
+                       log(QString("Val: \"%1\" = \"%2\"").arg(key, val));
+                       switch (sectionId)
                        {
-                               QDate temp = QDate::fromString(value.cap(2).trimmed(), Qt::ISODate);
-                               if(temp.isValid()) updateInfoDate = temp;
+                       case 1:
+                               _PARSE_DATE(updateInfoDate, "TimestampCreated")
+                               break;
+                       case 2:
+                               _PARSE_UINT(updateInfo->m_buildNo,          "BuildNo")
+                               _PARSE_DATE(updateInfo->m_buildDate,        "BuildDate")
+                               _PARSE_TEXT(updateInfo->m_downloadSite,     "DownloadSite")
+                               _PARSE_TEXT(updateInfo->m_downloadAddress,  "DownloadAddress")
+                               _PARSE_TEXT(updateInfo->m_downloadFilename, "DownloadFilename")
+                               _PARSE_TEXT(updateInfo->m_downloadFilecode, "DownloadFilecode")
+                               _PARSE_TEXT(updateInfo->m_downloadChecksum, "DownloadChecksum")
+                               break;
                        }
                }
        }
 
-       if(!updateInfoDate.isValid())
+       if (!updateInfo->isComplete())
        {
-               updateInfo->resetInfo();
-               log("WARNING: Version info timestamp is missing!");
-               return false;
+               log("", "WARNING: Update information is incomplete!");
+               goto failure;
        }
-       
-       const QDate currentDate = OS::current_date();
-       if(updateInfoDate.addMonths(VERSION_INFO_EXPIRES_MONTHS) < currentDate)
-       {
-               updateInfo->resetInfo();
-               log(QString::fromLatin1("WARNING: This version info has expired at %1!").arg(updateInfoDate.addMonths(VERSION_INFO_EXPIRES_MONTHS).toString(Qt::ISODate)));
-               return false;
-       }
-       else if(currentDate < updateInfoDate)
+
+       if(updateInfoDate.isValid())
        {
-               log("Version info is from the future, take care!");
-               qWarning("Version info is from the future, take care!");
+               const QDate expiredDate = updateInfoDate.addMonths(VERSION_INFO_EXPIRES_MONTHS);
+               if (expiredDate < OS::current_date())
+               {
+                       log("", QString("WARNING: Update information has expired at %1!").arg(expiredDate.toString(Qt::ISODate)));
+                       goto failure;
+               }
        }
-       
-       if(!updateInfo->isComplete())
+       else
        {
-               log("WARNING: Version info is incomplete!");
-               return false;
+               log("", "WARNING: Timestamp is missing from update information header!");
+               goto failure;
        }
 
-       return true;
+       log("", "Success: Update information is complete.");
+       return true; /*success*/
+
+failure:
+       updateInfo->resetInfo();
+       return false;
 }
 
 //----------------------------------------------------------
 // EXTERNAL TOOLS
 //----------------------------------------------------------
 
-bool UpdateChecker::getFile(const QString &url, const QString &outFile, const unsigned int maxRedir, bool *httpOk)
-{
-       for (int i = 0; i < 2; i++)
-       {
-               if (getFile(url, (i > 0), outFile, maxRedir, httpOk))
-               {
-                       return true;
-               }
-       }
-       return false;
-}
-
-bool UpdateChecker::getFile(const QString &url, const bool forceIp4, const QString &outFile, const unsigned int maxRedir, bool *httpOk)
+bool MUtils::UpdateChecker::getFile(const QUrl &url, const QString &outFile, const unsigned int maxRedir)
 {
        QFileInfo output(outFile);
        output.setCaching(false);
-       if (httpOk) *httpOk = false;
 
        if (output.exists())
        {
                QFile::remove(output.canonicalFilePath());
                if (output.exists())
                {
+                       qWarning("Existing output file could not be found!");
                        return false;
                }
        }
+       
+       QStringList args(QLatin1String("-vsSNqkfL"));
+       args << "-m" << QString::number(DOWNLOAD_TIMEOUT / 1000);
+       args << "--max-redirs" << QString::number(maxRedir);
+       args << "-A" << USER_AGENT_STR;
+       args << "-e" << QString("%1://%2/;auto").arg(url.scheme(), url.host());
+       args << "-o" << output.fileName() << url.toString();
+
+       return execCurl(args, output.absolutePath(), DOWNLOAD_TIMEOUT);
+}
 
-       QProcess process;
-       init_process(process, output.absolutePath());
+bool MUtils::UpdateChecker::tryContactHost(const QString &hostname, const int &timeoutMsec)
+{
+       log(QString("Connecting to host: %1").arg(hostname), "");
 
-       QStringList args;
-       if (forceIp4)
+       QStringList args(QLatin1String("-vsSNqkI"));
+       args << "-m" << QString::number(qMax(1, timeoutMsec / 1000));
+       args << "-A" << USER_AGENT_STR;
+       args << "-o" << OS::null_device() << QString("http://%1/").arg(hostname);
+       
+       return execCurl(args, temp_folder(), timeoutMsec);
+}
+
+bool MUtils::UpdateChecker::checkSignature(const QString &file, const QString &signature)
+{
+       if (QFileInfo(file).absolutePath().compare(QFileInfo(signature).absolutePath(), Qt::CaseInsensitive) != 0)
        {
-               args << "-4";
+               qWarning("CheckSignature: File and signature should be in same folder!");
+               return false;
        }
 
-       args << "-T" << "15" << "--no-cache" << "--no-dns-cache" << QString().sprintf("--max-redirect=%u", maxRedir);
-       args << QString("--referer=%1://%2/").arg(QUrl(url).scheme(), QUrl(url).host()) << "-U" << USER_AGENT_STR;
-       args << "-O" << output.fileName() << url;
-
-       QEventLoop loop;
-       connect(&process, SIGNAL(error(QProcess::ProcessError)), &loop, SLOT(quit()));
-       connect(&process, SIGNAL(finished(int, QProcess::ExitStatus)), &loop, SLOT(quit()));
-       connect(&process, SIGNAL(readyRead()), &loop, SLOT(quit()));
-
-       QTimer timer;
-       timer.setSingleShot(true);
-       connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+       QString keyRingPath(m_binaryKeys);
+       bool removeKeyring = false;
+       if (QFileInfo(file).absolutePath().compare(QFileInfo(m_binaryKeys).absolutePath(), Qt::CaseInsensitive) != 0)
+       {
+               keyRingPath = make_temp_file(QFileInfo(file).absolutePath(), "gpg");
+               removeKeyring = true;
+               if (!QFile::copy(m_binaryKeys, keyRingPath))
+               {
+                       qWarning("CheckSignature: Failed to copy the key-ring file!");
+                       return false;
+               }
+       }
 
-       const QRegExp httpResponseOK("200 OK$");
+       QStringList args;
+       args << QStringList() << "--homedir" << ".";
+       args << "--keyring" << QFileInfo(keyRingPath).fileName();
+       args << QFileInfo(signature).fileName();
+       args << QFileInfo(file).fileName();
 
-       process.start(m_binaryWGet, args);
+       const int exitCode = execProcess(m_binaryGnuPG, args, QFileInfo(file).absolutePath(), DOWNLOAD_TIMEOUT);
+       if (exitCode != INT_MAX)
+       {
+               log(QString().sprintf("Exited with code %d", exitCode));
+       }
 
-       if (!process.waitForStarted())
+       if (removeKeyring)
        {
-               return false;
+               remove_file(keyRingPath);
        }
 
-       timer.start(25000);
+       return (exitCode == 0); /*completed*/
+}
 
-       while (process.state() != QProcess::NotRunning)
+bool MUtils::UpdateChecker::execCurl(const QStringList &args, const QString &workingDir, const int timeout)
+{
+       const int exitCode = execProcess(m_binaryCurl, args, workingDir, timeout + (timeout / 2));
+       if (exitCode != INT_MAX)
        {
-               loop.exec();
-               const bool bTimeOut = (!timer.isActive());
-               while (process.canReadLine())
-               {
-                       QString line = QString::fromLatin1(process.readLine()).simplified();
-                       if (line.contains(httpResponseOK))
-                       {
-                               line.append(" [OK]");
-                               if (httpOk) *httpOk = true;
-                       }
-                       log(line);
-               }
-               if (bTimeOut)
+               switch (exitCode)
                {
-                       qWarning("WGet process timed out <-- killing!");
-                       process.kill();
-                       process.waitForFinished();
-                       log("!!! TIMEOUT !!!");
-                       return false;
+                       case  0: log(QLatin1String("DONE: Transfer completed successfully."), "");                     break;
+                       case  6: log(QLatin1String("ERROR: Remote host could not be resolved!"), "");                  break;
+                       case  7: log(QLatin1String("ERROR: Connection to remote host could not be established!"), ""); break;
+                       case 22: log(QLatin1String("ERROR: Requested URL was not found or returned an error!"), "");   break;
+                       case 28: log(QLatin1String("ERROR: Operation timed out !!!"), "");                             break;
+                       default: log(QString().sprintf("ERROR: Terminated with unknown code %d", exitCode), "");       break;
                }
        }
 
-       timer.stop();
-       timer.disconnect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-
-       log(QString().sprintf("Exited with code %d", process.exitCode()));
-       return (process.exitCode() == 0) && output.exists() && output.isFile();
+       return (exitCode == 0); /*completed*/
 }
 
-bool UpdateChecker::tryContactHost(const QString &hostname)
+int MUtils::UpdateChecker::execProcess(const QString &programFile, const QStringList &args, const QString &workingDir, const int timeout)
 {
-       log(QString("Connecting to host: %1").arg(hostname));
-
        QProcess process;
-       init_process(process, temp_folder());
-
-       QStringList args;
-       args << "-z" << hostname << QString::number(80);
+       init_process(process, workingDir, true, NULL, m_environment.data());
 
        QEventLoop loop;
        connect(&process, SIGNAL(error(QProcess::ProcessError)), &loop, SLOT(quit()));
@@ -715,102 +699,56 @@ bool UpdateChecker::tryContactHost(const QString &hostname)
        timer.setSingleShot(true);
        connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
 
-       process.start(m_binaryNC, args);
-
+       process.start(programFile, args);
        if (!process.waitForStarted())
        {
-               return false;
+               log("PROCESS FAILED TO START !!!", "");
+               qWarning("WARNING: %s process could not be created!", MUTILS_UTF8(QFileInfo(programFile).fileName()));
+               return INT_MAX; /*failed to start*/
        }
 
-       timer.start(10000);
+       bool bAborted = false;
+       timer.start(qMax(timeout, 1500));
 
        while (process.state() != QProcess::NotRunning)
        {
                loop.exec();
-               const bool bTimeOut = (!timer.isActive());
                while (process.canReadLine())
                {
-                       QString line = QString::fromLatin1(process.readLine()).simplified();
-                       log(line);
+                       const QString line = QString::fromLatin1(process.readLine()).simplified();
+                       if (line.length() > 1)
+                       {
+                               log(line);
+                       }
                }
-               if (bTimeOut)
+               const bool bCancelled = MUTILS_BOOLIFY(m_cancelled);
+               if (bAborted = (bCancelled || ((!timer.isActive()) && (!process.waitForFinished(125)))))
                {
-                       qWarning("NC process timed out <-- killing!");
-                       process.kill();
-                       process.waitForFinished();
-                       log("!!! TIMEOUT !!!");
-                       return false;
+                       log(bCancelled ? "CANCELLED BY USER !!!" : "PROCESS TIMEOUT !!!", "");
+                       qWarning("WARNING: %s process %s!", MUTILS_UTF8(QFileInfo(programFile).fileName()), bCancelled ? "cancelled" : "timed out");
+                       break; /*abort process*/
                }
        }
 
        timer.stop();
        timer.disconnect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
 
-       if (process.exitCode() != 0)
+       if (bAborted)
        {
-               log("Connection has failed!");
+               process.kill();
+               process.waitForFinished(-1);
        }
 
-       log(QString().sprintf("Exited with code %d", process.exitCode()), "");
-       return (process.exitCode() == 0);
-}
-
-bool UpdateChecker::checkSignature(const QString &file, const QString &signature)
-{
-       if (QFileInfo(file).absolutePath().compare(QFileInfo(signature).absolutePath(), Qt::CaseInsensitive) != 0)
+       while (process.canReadLine())
        {
-               qWarning("CheckSignature: File and signature should be in same folder!");
-               return false;
-       }
-
-       QString keyRingPath(m_binaryKeys);
-       bool removeKeyring = false;
-       if (QFileInfo(file).absolutePath().compare(QFileInfo(m_binaryKeys).absolutePath(), Qt::CaseInsensitive) != 0)
-       {
-               keyRingPath = make_temp_file(QFileInfo(file).absolutePath(), "gpg");
-               removeKeyring = true;
-               if (!QFile::copy(m_binaryKeys, keyRingPath))
+               const QString line = QString::fromLatin1(process.readLine()).simplified();
+               if (line.length() > 1)
                {
-                       qWarning("CheckSignature: Failed to copy the key-ring file!");
-                       return false;
-               }
-       }
-
-       QProcess process;
-       init_process(process, QFileInfo(file).absolutePath());
-
-       QEventLoop loop;
-       connect(&process, SIGNAL(error(QProcess::ProcessError)), &loop, SLOT(quit()));
-       connect(&process, SIGNAL(finished(int, QProcess::ExitStatus)), &loop, SLOT(quit()));
-       connect(&process, SIGNAL(readyRead()), &loop, SLOT(quit()));
-
-       process.start(m_binaryGnuPG, QStringList() << "--homedir" << "." << "--keyring" << QFileInfo(keyRingPath).fileName() << QFileInfo(signature).fileName() << QFileInfo(file).fileName());
-
-       if (!process.waitForStarted())
-       {
-               if (removeKeyring)
-               {
-                       remove_file(keyRingPath);
-               }
-               return false;
-       }
-
-       while (process.state() == QProcess::Running)
-       {
-               loop.exec();
-               while (process.canReadLine())
-               {
-                       log(QString::fromLatin1(process.readLine()).simplified());
+                       log(line);
                }
        }
 
-       if (removeKeyring)
-       {
-               remove_file(keyRingPath);
-       }
-
-       log(QString().sprintf("Exited with code %d", process.exitCode()));
-       return (process.exitCode() == 0);
+       return bAborted ? INT_MAX : process.exitCode();
 }
 
 ////////////////////////////////////////////////////////////