From a658b0595e69a478f464132a382bb7fa3fd9722a Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Thu, 7 Jun 2018 14:44:18 +0200 Subject: [PATCH] Update version checker for github. --- common/check_new_version.cpp | 164 +++++++++++++++++------------------ 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/common/check_new_version.cpp b/common/check_new_version.cpp index dd6213d2..47f2156a 100644 --- a/common/check_new_version.cpp +++ b/common/check_new_version.cpp @@ -1,82 +1,82 @@ -#include "check_new_version.h" - -#include -#include -#include - -#include -#include -#include -#include -#include - -#define PREVIOUS_VERSION_TESTING "6.0.0" - -HttpVersionChecker::HttpVersionChecker() - :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home") -{ - connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &))); -} - -void HttpVersionChecker::checkNewVersion(const QByteArray & data) -{ - checkNewVersion(QString(data)); -} - -bool HttpVersionChecker::checkNewVersion(QString sourceContent) -{ -#ifdef Q_OS_WIN32 - QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32"); -#endif - -#if defined Q_OS_UNIX && !defined Q_OS_MAC - QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11"); -#endif - -#ifdef Q_OS_MAC - QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac"); -#endif - - int index = 0; - bool newVersion = false; - bool sameVersion = true; - //bool currentVersionIsNewer = false; -#ifdef QT_DEBUG - QString version(PREVIOUS_VERSION_TESTING); -#else - QString version(VERSION); -#endif - QStringList sl = version.split("."); - if((index = rx.indexIn(sourceContent))!=-1) - { - int length = qMin(sl.size(),(rx.cap(4)!="")?4:3); - for(int i=0;isl.at(i).toInt()){ - newVersion=true; - break; - } - else - sameVersion = sameVersion && rx.cap(i+1).toInt()==sl.at(i).toInt(); - } - if(!newVersion && sameVersion) - { - if((sl.size()==3)&&(rx.cap(4)!="")) - newVersion = true; - } - } - - if(newVersion == true) - { - emit newVersionDetected(); - return true; - } - else - { - return false; - } -} +#include "check_new_version.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#define PREVIOUS_VERSION_TESTING "6.0.0" + +HttpVersionChecker::HttpVersionChecker() + :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home") +{ + connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &))); +} + +void HttpVersionChecker::checkNewVersion(const QByteArray & data) +{ + checkNewVersion(QString(data)); +} + +bool HttpVersionChecker::checkNewVersion(QString sourceContent) +{ +#ifdef Q_OS_WIN32 + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32"); +#endif + +#if defined Q_OS_UNIX && !defined Q_OS_MAC + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11"); +#endif + +#ifdef Q_OS_MAC + QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac"); +#endif + + int index = 0; + bool newVersion = false; + bool sameVersion = true; + //bool currentVersionIsNewer = false; +#ifdef QT_DEBUG + QString version(PREVIOUS_VERSION_TESTING); +#else + QString version(VERSION); +#endif + QStringList sl = version.split("."); + if((index = rx.indexIn(sourceContent))!=-1) + { + int length = qMin(sl.size(),(rx.cap(4)!="")?4:3); + for(int i=0;isl.at(i).toInt()){ + newVersion=true; + break; + } + else + sameVersion = sameVersion && rx.cap(i+1).toInt()==sl.at(i).toInt(); + } + if(!newVersion && sameVersion) + { + if((sl.size()==3)&&(rx.cap(4)!="")) + newVersion = true; + } + } + + if(newVersion == true) + { + emit newVersionDetected(); + return true; + } + else + { + return false; + } +}