OSDN Git Service

Some code refactoring in UpdateChecker class.
[mutilities/MUtilities.git] / src / UpdateChecker.cpp
index 386e1ff..103c1ef 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2015 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>
 
-using namespace MUtils;
+#include "Mirrors.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // CONSTANTS
@@ -47,184 +51,70 @@ static const char *mirror_url_postfix[] =
        NULL
 };
 
-static const char *update_mirrors_prim[] =
-{
-       "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 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 char *update_mirrors_back[] =
-{
-       "http://mplayer.savedonthe.net/",
-       NULL
-};
+static const int VERSION_INFO_EXPIRES_MONTHS = 6;
+static char *USER_AGENT_STR = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0"; /*use something innocuous*/
+
+#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)
+
+////////////////////////////////////////////////////////////
+// Helper Functions
+////////////////////////////////////////////////////////////
 
-static const char *known_hosts[] =             //Taken form: http://www.alexa.com/topsites !!!
+static int getMaxProgress(void)
 {
-       "http://www.163.com/",
-       "http://www.7-zip.org/",
-       "http://www.ac3filter.net/",
-       "http://clbianco.altervista.org/",
-       "http://status.aws.amazon.com/",
-       "http://build.antergos.com/",
-       "http://www.aol.com/",
-       "http://www.apache.org/",
-       "http://www.apple.com/",
-       "http://www.adobe.com/",
-       "http://archive.org/web/",
-       "http://www.artlebedev.ru/",
-       "http://web.audacityteam.org/",
-       "http://status.automattic.com/",
-       "http://www.avidemux.org/",
-       "http://www.babylon.com/",
-       "http://www.baidu.com/",
-       "http://bandcamp.com/",
-       "http://www.bbc.co.uk/",
-       "http://www.berlios.de/",
-       "http://www.bing.com/",
-       "http://www.bingeandgrab.com/",
-       "http://www.bucketheadpikes.com/",
-       "http://www.buckethead-coop.com/",
-       "http://www.buzzfeed.com/",
-       "http://www.ccc.de/",
-       "http://www.citizeninsomniac.com/WMV/",
-       "http://www.cnet.com/",
-       "http://cnzz.com/",
-       "http://www.codeplex.com/",
-       "http://www.codeproject.com/",
-       "http://www.der-postillon.com/",
-       "http://www.ebay.com/",
-       "http://www.equation.com/",
-       "http://www.farbrausch.de/",
-       "http://fc2.com/",
-       "http://fedoraproject.org/wiki/Fedora_Project_Wiki",
-       "http://blog.fefe.de/",
-       "http://www.ffmpeg.org/",
-       "http://blog.flickr.net/en",
-       "http://free-codecs.com/",
-       "http://git-scm.com/",
-       "http://doc.gitlab.com/",
-       "http://www.gmx.net/",
-       "http://news.gnome.org/",
-       "http://www.gnu.org/",
-       "http://go.com/",
-       "http://code.google.com/",
-       "http://haali.su/mkv/",
-       "http://www.heise.de/",
-       "http://www.huffingtonpost.co.uk/",
-       "http://www.iana.org/",
-       "http://www.imdb.com/",
-       "http://www.imgburn.com/",
-       "http://imgur.com/",
-       "http://www.jd.com/contact/",
-       "http://www.jiscdigitalmedia.ac.uk/",
-       "http://kannmanumdieuhrzeitschonnbierchentrinken.de/",
-       "http://mirrors.kernel.org/",
-       "http://komisar.gin.by/",
-       "http://lame.sourceforge.net/",
-       "http://www.libav.org/",
-       "http://blog.linkedin.com/",
-       "http://www.linuxmint.com/",
-       "http://www.livedoor.com/",
-       "http://www.livejournal.com/",
-       "http://longplayer.org/",
-       "http://go.mail.ru/",
-       "http://marknelson.us/",
-       "http://www.mediafire.com/about/",
-       "http://www.mod-technologies.com/",
-       "http://ftp.mozilla.org/",
-       "http://mplayerhq.hu/",
-       "http://www.msn.com/en-us/",
-       "http://wiki.multimedia.cx/",
-       "http://www.nch.com.au/",
-       "http://mirror.netcologne.de/",
-       "http://oss.netfarm.it/",
-       "http://blog.netflix.com/",
-       "http://netrenderer.de/",
-       "http://www.nytimes.com/",
-       "http://www.opera.com/",
-       "http://www.partha.com/",
-       "http://pastebin.com/",
-       "http://pastie.org/",
-       "http://portableapps.com/about",
-       "http://www.portablefreeware.com/",
-       "http://support.proboards.com/",
-       "http://www.qq.com/",
-       "http://www.qt.io/",
-       "http://www.quakelive.com/",
-       "http://rationalqm.us/mine.html",
-       "http://www.seamonkey-project.org/",
-       "http://selfhtml.org/",
-       "http://www.sina.com.cn/",
-       "http://www.sohu.com/",
-       "http://help.sogou.com/",
-       "http://sourceforge.net/",
-       "http://www.spiegel.de/",
-       "http://www.sputnikmusic.com/",
-       "http://stackoverflow.com/",
-       "http://www.t-online.de/",
-       "http://www.tagesschau.de/",
-       "http://tdm-gcc.tdragon.net/",
-       "http://www.tdrsmusic.com/",
-       "http://www.ubuntu.com/",
-       "http://www.uol.com.br/",
-       "http://www.videohelp.com/",
-       "http://www.videolan.org/",
-       "http://virtualdub.org/",
-       "http://blog.virustotal.com/",
-       "http://www.vkgoeswild.com/",
-       "http://www.warr.org/WAhere.html",
-       "http://www.weibo.com/login.php",
-       "http://status.wikimedia.org/",
-       "http://www.winamp.com/",
-       "http://www.winhoros.de/",
-       "http://wpde.org/",
-       "http://x265.org/",
-       "http://xhmikosr.1f0.de/",
-       "http://xiph.org/",
-       "http://us.mail.yahoo.com/",
-       "http://www.youtube.com/yt/about/",
-       "http://www.zedo.com/",
-       "http://ffmpeg.zeranoe.com/",
-       NULL
-};
+       int counter = 0;
+       while (update_mirrors[counter])
+       {
+               counter++;
+       }
+       counter += MIN_CONNSCORE + QUICK_MIRRORS + 2;
+       return counter; ;
+}
 
-static const int MIN_CONNSCORE = 8;
-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 QStringList buildRandomList(const char *const values[])
+{
+       QStringList list;
+       for (int index = 0; values[index]; index++)
+       {
+               const int pos = MUtils::next_rand_u32() % (index + 1);
+               list.insert(pos, QString::fromLatin1(values[index]));
+       }
+       return list;
+}
 
-//Helper function
-static int getMaxProgress(void)
+static const QHash<QString, QString> *initEnvVars(void)
 {
-       int counter = MIN_CONNSCORE + 2;
-       for(int i = 0; update_mirrors_prim[i]; i++) counter++;
-       for(int i = 0; update_mirrors_back[i]; i++) counter++;
-       return counter;
+       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);
@@ -235,7 +125,7 @@ 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;
@@ -252,91 +142,114 @@ bool UpdateCheckerInfo::isComplete(void)
 // Constructor & Destructor
 ////////////////////////////////////////////////////////////
 
-UpdateChecker::UpdateChecker(const QString &binWGet, 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_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(getMaxProgress()),
+       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 ----- //
 
-       int connectionScore = 0;
-       int maxConnectTries = (3 * MIN_CONNSCORE) / 2;
-       
-       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(500);
        setProgress(1);
 
        // ----- Test Known Hosts Connectivity ----- //
 
-       QStringList hostList;
-       for(int i = 0; known_hosts[i]; i++)
-       {
-               hostList << QString::fromLatin1(known_hosts[i]);
-       }
+       int connectionScore = 0;
+       QStringList mirrorList = buildRandomList(known_hosts);
 
-       while(!(hostList.isEmpty() || (connectionScore >= MIN_CONNSCORE) || (maxConnectTries < 1)))
+       for(int connectionTimout = 1000; connectionTimout <= MAX_CONN_TIMEOUT; connectionTimout *= 2)
        {
-               switch(tryContactHost(hostList.takeAt(next_rand32() % hostList.count())))
+               QElapsedTimer elapsedTimer;
+               elapsedTimer.start();
+               const int globalTimout = 2 * MIN_CONNSCORE * connectionTimout;
+               while (!elapsedTimer.hasExpired(globalTimout))
                {
-                       case 01: connectionScore += 1; break;
-                       case 02: connectionScore += 2; break;
-                       default: maxConnectTries -= 1; break;
+                       const QString hostName = mirrorList.takeFirst();
+                       if (tryContactHost(hostName, connectionTimout))
+                       {
+                               connectionScore += 1;
+                               setProgress(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1));
+                               elapsedTimer.restart();
+                               if (connectionScore >= MIN_CONNSCORE)
+                               {
+                                       goto endLoop; /*success*/
+                               }
+                       }
+                       else
+                       {
+                               mirrorList.append(hostName); /*re-schedule*/
+                       }
+                       CHECK_CANCELLED();
+                       msleep(1);
                }
-               setProgress(qBound(1, connectionScore + 1, MIN_CONNSCORE + 1));
-               msleep(64);
        }
 
+endLoop:
        if(connectionScore < MIN_CONNSCORE)
        {
                log("", "Connectivity test has failed: Internet connection appears to be broken!");
@@ -345,53 +258,42 @@ void UpdateChecker::checkForUpdates(void)
                return;
        }
 
-       // ----- Build Mirror List ----- //
+       // ----- Fetch Update Info From Server ----- //
 
-       log("", "----", "", "Checking for updates online...");
+       log("----", "", "Internet connection is operational, checking for updates online...");
        setStatus(UpdateStatus_FetchingUpdates);
 
-       QStringList mirrorList;
-       for(int index = 0; update_mirrors_prim[index]; index++)
-       {
-               mirrorList << QString::fromLatin1(update_mirrors_prim[index]);
-       }
-
-       if(const int len = mirrorList.count())
-       {
-               const int rounds = len * 1097;
-               for(int i = 0; i < rounds; i++)
-               {
-                       mirrorList.swap(i % len, next_rand32() % len);
-               }
-       }
-
-       for(int index = 0; update_mirrors_back[index]; index++)
-       {
-               mirrorList << QString::fromLatin1(update_mirrors_back[index]);
-       }
-       
-       // ----- Fetch Update Info From Server ----- //
+       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(64);
+                       mirrorList.append(currentMirror); /*re-schedule*/
                }
+               CHECK_CANCELLED();
+               msleep(1);
        }
        
-       setProgress(m_maxProgress);
+       while (m_progress < m_maxProgress)
+       {
+               msleep(16);
+               setProgress(m_progress + 1);
+               CHECK_CANCELLED();
+       }
 
-       if(m_success)
+       // ----- Generate final result ----- //
+
+       if(MUTILS_BOOLIFY(m_success))
        {
                if(m_updateInfo->m_buildNo > m_installedBuildNo)
                {
@@ -412,38 +314,63 @@ void UpdateChecker::checkForUpdates(void)
        }
 }
 
-void UpdateChecker::testKnownHosts(void)
+void MUtils::UpdateChecker::testMirrorsList(void)
 {
-       QStringList hostList;
-       for(int i = 0; known_hosts[i]; i++)
+       // ----- Test update mirrors ----- //
+
+       QStringList mirrorList;
+       for(int i = 0; update_mirrors[i]; i++)
        {
-               hostList << QString::fromLatin1(known_hosts[i]);
+               mirrorList << QString::fromLatin1(update_mirrors[i]);
        }
 
-       qDebug("\n[Known Hosts]");
-       log("Testing all known hosts...", "", "---");
+       qDebug("\n[Mirror Sites]");
+       log("Testing all known mirror sites...", "", "---");
 
-       int hostCount = hostList.count();
-       while(!hostList.isEmpty())
+       UpdateCheckerInfo updateInfo;
+       while (!mirrorList.isEmpty())
        {
-               QString currentHost = hostList.takeFirst();
-               qDebug("Testing: %s", currentHost.toLatin1().constData());
-               log("", "Testing:", currentHost, "");
-               QString outFile = QString("%1/%2.htm").arg(temp_folder(), rand_str());
-               bool httpOk = false;
-               if(!getFile(currentHost, outFile, 0, &httpOk))
+               const QString currentMirror = mirrorList.takeFirst();
+               bool success = false;
+               qDebug("Testing: %s", MUTILS_L1STR(currentMirror));
+               log("", "Testing:", currentMirror, "");
+               for (quint8 attempt = 0; attempt < 3; ++attempt)
                {
-                       if(httpOk)
+                       updateInfo.resetInfo();
+                       if (tryUpdateMirror(&updateInfo, currentMirror, (!attempt)))
                        {
-                               qWarning("\nConnectivity test was SLOW on the following site:\n%s\n", currentHost.toLatin1().constData());
-                       }
-                       else
-                       {
-                               qWarning("\nConnectivity test FAILED on the following site:\n%s\n", currentHost.toLatin1().constData());
+                               success = true;
+                               break;
                        }
                }
+               if (!success)
+               {
+                       qWarning("\nUpdate mirror seems to be unavailable:\n%s\n", MUTILS_L1STR(currentMirror));
+               }
+               log("", "---");
+       }
+
+       // ----- Test known hosts ----- //
+
+       QStringList knownHostList;
+       for (int i = 0; known_hosts[i]; i++)
+       {
+               knownHostList << QString::fromLatin1(known_hosts[i]);
+       }
+
+       qDebug("\n[Known Hosts]");
+       log("Testing all known hosts...", "", "---");
+
+       while(!knownHostList.isEmpty())
+       {
+               const QString currentHost = knownHostList.takeFirst();
+               qDebug("Testing: %s", MUTILS_L1STR(currentHost));
+               log(QLatin1String(""), "Testing:", currentHost, "");
+               if (!tryContactHost(currentHost, DOWNLOAD_TIMEOUT))
+               {
+                       qWarning("\nConnectivity test FAILED on the following host:\n%s\n", MUTILS_L1STR(currentHost));
+               }
                log("", "---");
-               QFile::remove(outFile);
        }
 }
 
@@ -451,7 +378,7 @@ void UpdateChecker::testKnownHosts(void)
 // PRIVATE FUNCTIONS
 ////////////////////////////////////////////////////////////
 
-void UpdateChecker::setStatus(const int status)
+void MUtils::UpdateChecker::setStatus(const int status)
 {
        if(m_status != status)
        {
@@ -460,7 +387,7 @@ void UpdateChecker::setStatus(const int status)
        }
 }
 
-void UpdateChecker::setProgress(const int progress)
+void MUtils::UpdateChecker::setProgress(const int progress)
 {
        if(m_progress != progress)
        {
@@ -469,7 +396,7 @@ void UpdateChecker::setProgress(const int progress)
        }
 }
 
-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);
@@ -477,55 +404,35 @@ void UpdateChecker::log(const QString &str1, const QString &str2, const QString
        if(!str4.isNull()) emit messageLogged(str4);
 }
 
-int UpdateChecker::tryContactHost(const QString &url)
+bool MUtils::UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url, const bool &quick)
 {
-               int result = -1; bool httpOkay = false;
-               const QString outFile = QString("%1/%2.htm").arg(temp_folder(), rand_str());
-               log("", "Testing host:", url);
+       bool success = false;
+       log("", "Trying mirror:", url, "");
 
-               if(getFile(url, outFile, 0, &httpOkay))
-               {
-                       log("Connection to host was established successfully.");
-                       result = 2;
-               }
-               else
+       if (quick)
+       {
+               if (!tryContactHost(QUrl(url).host(), (MAX_CONN_TIMEOUT / 8)))
                {
-                       if(httpOkay)
-                       {
-                               log("Connection to host timed out after HTTP OK was received.");
-                               result = 1;
-                       }
-                       else
-                       {
-                               log("Connection failed: The host could not be reached!");
-                               result = 0;
-                       }
+                       log("", "Mirror is too slow, skipping!");
+                       return false;
                }
+       }
 
-               QFile::remove(outFile);
-               return result;
-}
-
-bool UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url)
-{
-       bool success = false;
-       log("", "Trying mirror:", url);
-
-       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("Download completed, verifying signature:", "");
+               if (checkSignature(outFileVers, outFileSign))
                {
-                       log("", "Signature okay, parsing info:");
+                       log("", "Signature is valid, parsing info:", "");
                        success = parseVersionInfo(outFileVers, updateInfo);
                }
                else
                {
-                       log("", "Bad signature, take care!");
+                       log("", "Bad signature, take care !!!");
                }
        }
        else
@@ -539,173 +446,24 @@ bool UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString
        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))
-       {
-               return false;
-       }
-
-       log("", "Downloading signature:");
-       if(!getFile(QString("%1%2.sig2").arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0]), outFileSign))
-       {
-               return false;
-       }
-
-       return true;
-}
-
-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)
-{
-       QFileInfo output(outFile);
-       output.setCaching(false);
-       if(httpOk) *httpOk = false;
-
-       if(output.exists())
-       {
-               QFile::remove(output.canonicalFilePath());
-               if(output.exists())
-               {
-                       return false;
-               }
-       }
-
-       QProcess process;
-       init_process(process, output.absolutePath());
-
-       QStringList args;
-       if(forceIp4)
-       {
-               args << "-4";
-       }
-
-       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()));
-
-       const QRegExp httpResponseOK("200 OK$");
-       
-       process.start(m_binaryWGet, args);
-       
-       if(!process.waitForStarted())
-       {
-               return false;
-       }
-
-       timer.start(25000);
-
-       while(process.state() != QProcess::NotRunning)
+       log("Downloading update info:", "");
+       if(getFile(QUrl(QString("%1%2").arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0])), outFileVers))
        {
-               loop.exec();
-               const bool bTimeOut = (!timer.isActive());
-               while(process.canReadLine())
+               if (!m_cancelled)
                {
-                       QString line = QString::fromLatin1(process.readLine()).simplified();
-                       if(line.contains(httpResponseOK))
+                       log( "Downloading signature file:", "");
+                       if (getFile(QUrl(QString("%1%2.sig2").arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0])), outFileSign))
                        {
-                               line.append(" [OK]");
-                               if(httpOk) *httpOk = true;
+                               return true;
                        }
-                       log(line);
-               }
-               if(bTimeOut)
-               {
-                       qWarning("WGet process timed out <-- killing!");
-                       process.kill();
-                       process.waitForFinished();
-                       log("!!! TIMEOUT !!!");
-                       return false;
-               }
-       }
-       
-       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();
-}
-
-bool UpdateChecker::checkSignature(const QString &file, const QString &signature)
-{
-       if(QFileInfo(file).absolutePath().compare(QFileInfo(signature).absolutePath(), Qt::CaseInsensitive) != 0)
-       {
-               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))
-               {
-                       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());
-               }
-       }
-       
-       if(removeKeyring)
-       {
-               remove_file(keyRingPath);
-       }
-
-       log(QString().sprintf("Exited with code %d", process.exitCode()));
-       return (process.exitCode() == 0);
+       return false;
 }
 
-bool UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *updateInfo)
+bool MUtils::UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *updateInfo)
 {
        QRegExp value("^(\\w+)=(.+)$");
        QRegExp section("^\\[(.+)\\]$");
@@ -808,6 +566,174 @@ bool UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *upd
        return true;
 }
 
+//----------------------------------------------------------
+// EXTERNAL TOOLS
+//----------------------------------------------------------
+
+bool MUtils::UpdateChecker::getFile(const QUrl &url, const QString &outFile, const unsigned int maxRedir)
+{
+       QFileInfo output(outFile);
+       output.setCaching(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);
+}
+
+bool MUtils::UpdateChecker::tryContactHost(const QString &hostname, const int &timeoutMsec)
+{
+       log(QString("Connecting to host: %1").arg(hostname), "");
+
+       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)
+       {
+               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))
+               {
+                       qWarning("CheckSignature: Failed to copy the key-ring file!");
+                       return false;
+               }
+       }
+
+       QStringList args;
+       args << QStringList() << "--homedir" << ".";
+       args << "--keyring" << QFileInfo(keyRingPath).fileName();
+       args << QFileInfo(signature).fileName();
+       args << QFileInfo(file).fileName();
+
+       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 (removeKeyring)
+       {
+               remove_file(keyRingPath);
+       }
+
+       return (exitCode == 0); /*completed*/
+}
+
+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)
+       {
+               switch (exitCode)
+               {
+                       case -1:
+                       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;
+               }
+       }
+
+       return (exitCode == 0); /*completed*/
+}
+
+int MUtils::UpdateChecker::execProcess(const QString &programFile, const QStringList &args, const QString &workingDir, const int timeout)
+{
+       QProcess process;
+       init_process(process, workingDir, true, NULL, m_environment.data());
+
+       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()));
+
+       process.start(programFile, args);
+       if (!process.waitForStarted())
+       {
+               log("PROCESS FAILED TO START !!!", "");
+               qWarning("WARNING: %s process could not be created!", MUTILS_UTF8(QFileInfo(programFile).fileName()));
+               return INT_MAX; /*failed to start*/
+       }
+
+       bool bAborted = false;
+       timer.start(qMax(timeout, 1500));
+
+       while (process.state() != QProcess::NotRunning)
+       {
+               loop.exec();
+               while (process.canReadLine())
+               {
+                       const QString line = QString::fromLatin1(process.readLine()).simplified();
+                       if ((!line.isEmpty()) && line.compare(QLatin1String("<")) && line.compare(QLatin1String(">")))
+                       {
+                               log(line);
+                       }
+               }
+               const bool bCancelled = MUTILS_BOOLIFY(m_cancelled);
+               if (bAborted = (bCancelled || ((!timer.isActive()) && (!process.waitForFinished(125)))))
+               {
+                       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 (bAborted)
+       {
+               process.kill();
+               process.waitForFinished(-1);
+       }
+
+       while (process.canReadLine())
+       {
+               const QString line = QString::fromLatin1(process.readLine()).simplified();
+               if ((!line.isEmpty()) && line.compare(QLatin1String("<")) && line.compare(QLatin1String(">")))
+               {
+                       log(line);
+               }
+       }
+
+       return bAborted ? INT_MAX : process.exitCode();
+}
+
 ////////////////////////////////////////////////////////////
 // SLOTS
 ////////////////////////////////////////////////////////////