mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 09:08:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed greedy regular expresions in HttpVersionChecker

Browse Source
This commit is contained in:
Luis Ángel San Martín 2016-01-06 10:55:25 +01:00
parent 4b1ab90aa2
commit 799cb10c02
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/check_new_version.cpp
View File

@ -10,10 +10,10 @@
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#define PREVIOUS_VERSION "6.0.0" #define PREVIOUS_VERSION_TESTING "6.0.0"
HttpVersionChecker::HttpVersionChecker() HttpVersionChecker::HttpVersionChecker()
:HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home") :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home")
{ {
connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &))); connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &)));
} }
@ -26,15 +26,15 @@ void HttpVersionChecker::checkNewVersion(const QByteArray & data)
bool HttpVersionChecker::checkNewVersion(QString sourceContent) bool HttpVersionChecker::checkNewVersion(QString sourceContent)
{ {
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32.*"); QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32");
#endif #endif
#if defined Q_OS_UNIX && !defined Q_OS_MAC #if defined Q_OS_UNIX && !defined Q_OS_MAC
QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11.*"); QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11");
#endif #endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac.*"); QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac");
#endif #endif
int index = 0; int index = 0;
@ -42,9 +42,9 @@ bool HttpVersionChecker::checkNewVersion(QString sourceContent)
bool sameVersion = true; bool sameVersion = true;
//bool currentVersionIsNewer = false; //bool currentVersionIsNewer = false;
#ifdef QT_DEBUG #ifdef QT_DEBUG
QString version(PREVIOUS_VERSION); QString version(PREVIOUS_VERSION_TESTING);
#else #else
QString version(VERSION); QString version(VERSION);
#endif #endif
QStringList sl = version.split("."); QStringList sl = version.split(".");
if((index = rx.indexIn(sourceContent))!=-1) if((index = rx.indexIn(sourceContent))!=-1)
@ -68,8 +68,6 @@ bool HttpVersionChecker::checkNewVersion(QString sourceContent)
if((sl.size()==3)&&(rx.cap(4)!="")) if((sl.size()==3)&&(rx.cap(4)!=""))
newVersion = true; newVersion = true;
} }
} }
if(newVersion == true) if(newVersion == true)