///////////////////////////////////////////////////////////////////////////////
// MuldeR's Utilities for Qt
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2017 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 <QUrl>
#include <QEventLoop>
#include <QTimer>
+#include <QElapsedTimer>
using namespace MUtils;
static const char *update_mirrors[] =
{
"http://muldersoft.com/",
- "http://mulder.bplaced.net/", //"http://mulder.cwsurf.de/",
+ "http://mulder.bplaced.net/",
"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://mulder.000webhostapp.com/", //"http://mulder.webuda.com/",
+ "http://mulder.pe.hu/",
+ "http://muldersoft.square7.ch/",
"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://muldersoft.bitbucket.io/", //http://lord_mulder.bitbucket.org/
"http://www.tricksoft.de/",
+ "http://repo.or.cz/LameXP.git/blob_plain/gh-pages:/",
+ "http://gitlab.com/lamexp/lamexp/raw/gh-pages/",
NULL
};
"www.bucketheadpikes.com",
"www.buckethead-coop.com",
"www.buzzfeed.com",
+ "www.cam.ac.uk",
"www.ccc.de",
+ "home.cern",
"www.citizeninsomniac.com",
"www.cnet.com",
"cnzz.com",
+ "www.cuhk.edu.hk",
"www.codeplex.com",
"www.codeproject.com",
"www.der-postillon.com",
"blog.fefe.de",
"www.ffmpeg.org",
"blog.flickr.net",
+ "www.fraunhofer.de",
"free-codecs.com",
"git-scm.com",
"doc.gitlab.com",
"go.com",
"code.google.com",
"haali.su",
+ "www.harvard.edu",
"www.heise.de",
+ "www.helmholtz.de",
"www.huffingtonpost.co.uk",
+ "www.hu-berlin.de",
"www.iana.org",
"www.imdb.com",
"www.imgburn.com",
"imgur.com",
+ "www.iuj.ac.jp",
"www.jd.com",
"www.jiscdigitalmedia.ac.uk",
"kannmanumdieuhrzeitschonnbierchentrinken.de",
"go.mail.ru",
"marknelson.us",
"www.mediafire.com",
+ "web.mit.edu",
"www.mod-technologies.com",
"ftp.mozilla.org",
+ "www.mpg.de",
"mplayerhq.hu",
"www.msn.com",
"wiki.multimedia.cx",
"www.nch.com.au",
+ "neocities.org",
"mirror.netcologne.de",
"oss.netfarm.it",
"blog.netflix.com",
"netrenderer.de",
"www.nytimes.com",
"www.opera.com",
+ "www.oxford.gov.uk",
"www.partha.com",
"pastebin.com",
"pastie.org",
"www.qt.io",
"www.quakelive.com",
"rationalqm.us",
+ "www.rwth-aachen.de",
"www.seamonkey-project.org",
"selfhtml.org",
"www.sina.com.cn",
"www.spiegel.de",
"www.sputnikmusic.com",
"stackoverflow.com",
+ "www.stanford.edu",
"www.t-online.de",
"www.tagesschau.de",
"tdm-gcc.tdragon.net",
"www.tdrsmusic.com",
+ "tu-dresden.de",
"www.ubuntu.com",
"www.uol.com.br",
"www.videohelp.com",
NULL
};
-static const int MIN_CONNSCORE = 8;
+static const int MIN_CONNSCORE = 5;
+static const int QUICK_MIRRORS = 3;
+static const int MAX_CONN_TIMEOUT = 8000;
+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 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.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
+////////////////////////////////////////////////////////////
-//Helper function
static int getMaxProgress(void)
{
- int counter = MIN_CONNSCORE + 2;
- for(int i = 0; update_mirrors[i]; i++) counter++;
- return counter;
+ int counter = 0;
+ while (update_mirrors[counter])
+ {
+ counter++;
+ }
+ counter += MIN_CONNSCORE + QUICK_MIRRORS + 2;
+ return counter; ;
}
static QStringList buildRandomList(const char *const values[])
QStringList list;
for (int index = 0; values[index]; index++)
{
- const int pos = next_rand32() % (index + 1);
+ const int pos = next_rand_u32() % (index + 1);
list.insert(pos, QString::fromLatin1(values[index]));
}
return list;
// 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)
+UpdateChecker::UpdateChecker(const QString &binWGet, const QString &binMCat, 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_binaryMCat(binMCat),
m_binaryGnuPG(binGnuPG),
m_binaryKeys(binKeys),
m_applicationId(applicationId),
m_testMode(testMode),
m_maxProgress(getMaxProgress())
{
- m_success = false;
m_status = UpdateStatus_NotStartedYet;
m_progress = 0;
}
////////////////////////////////////////////////////////////
+// Public slots
+////////////////////////////////////////////////////////////
+
+void UpdateChecker::start(Priority priority)
+{
+ m_success.fetchAndStoreOrdered(0);
+ m_cancelled.fetchAndStoreOrdered(0);
+ QThread::start(priority);
+}
+
+////////////////////////////////////////////////////////////
// Protected functions
////////////////////////////////////////////////////////////
{
// ----- Initialization ----- //
- m_success = false;
m_updateInfo->resetInfo();
- seed_rand();
setProgress(0);
// ----- Test Internet Connection ----- //
// ----- Test Known Hosts Connectivity ----- //
int connectionScore = 0;
+ QStringList mirrorList = buildRandomList(known_hosts);
- QStringList hostList = buildRandomList(known_hosts);
- while(!(hostList.isEmpty() || (connectionScore >= MIN_CONNSCORE)))
+ for(int connectionTimout = 250; connectionTimout <= MAX_CONN_TIMEOUT; connectionTimout *= 2)
{
- if(tryContactHost(hostList.takeFirst()))
+ QElapsedTimer elapsedTimer;
+ elapsedTimer.start();
+ const int globalTimout = 2 * MIN_CONNSCORE * connectionTimout;
+ while (!elapsedTimer.hasExpired(globalTimout))
{
- connectionScore += 1;
+ 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!");
log("----", "", "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);
+ 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)
{
QString currentHost = hostList.takeFirst();
qDebug("Testing: %s", currentHost.toLatin1().constData());
log("", "Testing:", currentHost, "");
- if (!tryContactHost(currentHost))
+ if (!tryContactHost(currentHost, DOWNLOAD_TIMEOUT))
{
qWarning("\nConnectivity test FAILED on the following host:\n%s\n", currentHost.toLatin1().constData());
}
if(!str4.isNull()) emit messageLogged(str4);
}
-bool UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url)
+bool UpdateChecker::tryUpdateMirror(UpdateCheckerInfo *updateInfo, const QString &url, const bool &quick)
{
bool success = false;
- log("", "Trying mirror:", url);
+ log("", "Trying mirror:", url, "");
+
+ if (!tryContactHost(QUrl(url).host(), quick ? (MAX_CONN_TIMEOUT / 10) : MAX_CONN_TIMEOUT))
+ {
+ log("", quick ? "Mirror is too slow!" :"Mirror is unreachable!");
+ 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))
+ if (checkSignature(outFileVers, outFileSign))
{
- log("", "Signature okay, parsing info:");
+ log("", "Signature okay, parsing info:", "");
success = parseVersionInfo(outFileVers, updateInfo);
}
else
bool 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 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;
+ if (!m_cancelled)
+ {
+ log("", "Downloading signature:", "");
+ if (getFile(QString("%1%2.sig2").arg(url, mirror_url_postfix[m_betaUpdates ? 1 : 0]), outFileSign))
+ {
+ return true;
+ }
+ }
}
-
- return true;
+ return false;
}
bool UpdateChecker::parseVersionInfo(const QString &file, UpdateCheckerInfo *updateInfo)
// EXTERNAL TOOLS
//----------------------------------------------------------
-bool UpdateChecker::getFile(const QString &url, const QString &outFile, const unsigned int maxRedir, bool *httpOk)
+bool UpdateChecker::getFile(const QString &url, const QString &outFile, const unsigned int maxRedir)
{
for (int i = 0; i < 2; i++)
{
- if (getFile(url, (i > 0), outFile, maxRedir, httpOk))
+ if (getFile(url, (i > 0), outFile, maxRedir))
{
return true;
}
+ if (MUTILS_BOOLIFY(m_cancelled))
+ {
+ break; /*cancelled*/
+ }
}
return false;
}
-bool UpdateChecker::getFile(const QString &url, const bool forceIp4, const QString &outFile, const unsigned int maxRedir, bool *httpOk)
+bool UpdateChecker::getFile(const QString &url, const bool forceIp4, const QString &outFile, const unsigned int maxRedir)
{
QFileInfo output(outFile);
output.setCaching(false);
- if (httpOk) *httpOk = false;
if (output.exists())
{
args << "-4";
}
- args << "-T" << "15" << "--no-cache" << "--no-dns-cache" << QString().sprintf("--max-redirect=%u", maxRedir);
+ args << "--no-config" << "--no-cache" << "--no-dns-cache" << "--no-check-certificate" << "--no-hsts";
+ args << QString().sprintf("--max-redirect=%u", maxRedir) << QString().sprintf("--timeout=%u", DOWNLOAD_TIMEOUT / 1000);
args << QString("--referer=%1://%2/").arg(QUrl(url).scheme(), QUrl(url).host()) << "-U" << USER_AGENT_STR;
args << "-O" << output.fileName() << url;
return false;
}
- timer.start(25000);
+ timer.start(DOWNLOAD_TIMEOUT);
while (process.state() != QProcess::NotRunning)
{
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;
- }
+ const QString line = QString::fromLatin1(process.readLine()).simplified();
log(line);
}
- if (bTimeOut)
+ if (bTimeOut || MUTILS_BOOLIFY(m_cancelled))
{
qWarning("WGet process timed out <-- killing!");
process.kill();
process.waitForFinished();
- log("!!! TIMEOUT !!!");
+ log(bTimeOut ? "!!! TIMEOUT !!!": "!!! CANCELLED !!!");
return false;
}
}
return (process.exitCode() == 0) && output.exists() && output.isFile();
}
-bool UpdateChecker::tryContactHost(const QString &hostname)
+bool UpdateChecker::tryContactHost(const QString &hostname, const int &timeoutMsec)
{
- log(QString("Connecting to host: %1").arg(hostname));
+ log(QString("Connecting to host: %1").arg(hostname), "");
QProcess process;
init_process(process, temp_folder());
QStringList args;
- args << "-z" << hostname << QString::number(80);
+ args << "--retry" << QString::number(3) << hostname << QString::number(80);
QEventLoop loop;
connect(&process, SIGNAL(error(QProcess::ProcessError)), &loop, SLOT(quit()));
timer.setSingleShot(true);
connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
- process.start(m_binaryNC, args);
+ process.start(m_binaryMCat, args);
if (!process.waitForStarted())
{
return false;
}
- timer.start(25000);
+ timer.start(timeoutMsec);
while (process.state() != QProcess::NotRunning)
{
QString line = QString::fromLatin1(process.readLine()).simplified();
log(line);
}
- if (bTimeOut)
+ if (bTimeOut || MUTILS_BOOLIFY(m_cancelled))
{
- qWarning("NC process timed out <-- killing!");
+ qWarning("MCat process timed out <-- killing!");
process.kill();
process.waitForFinished();
- log("!!! TIMEOUT !!!");
+ log(bTimeOut ? "!!! TIMEOUT !!!" : "!!! CANCELLED !!!");
return false;
}
}
OSDN Git Service
