Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Only check for "beta" updates when using a pre-release build.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-02-12 22:17:42 +01:00
parent cdf9ac9b54
commit 1a027fb1e7
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Config.h
View File

@ -25,8 +25,8 @@
#define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0 #define VER_LAMEXP_MINOR_LO 0
#define VER_LAMEXP_BUILD 307 #define VER_LAMEXP_BUILD 308
#define VER_LAMEXP_SUFFIX Beta-4 #define VER_LAMEXP_SUFFIX RC-1
/* /*
* Tools versions * Tools versions

40
src/Dialog_Update.cpp
View File

@ -42,7 +42,12 @@
static const char *section_id = "LameXP"; static const char *section_id = "LameXP";
static const char *mirror_url_postfix = "update_beta.ver"; static const char *mirror_url_postfix[] =
{
"update.ver",
"update_beta.ver",
NULL
};
static const char *update_mirrors[] = static const char *update_mirrors[] =
{ {
@ -74,15 +79,16 @@ static char *USER_AGENT_STR = "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.
class UpdateInfo class UpdateInfo
{ {
public: public:
UpdateInfo(void) UpdateInfo(void) { resetInfo(); }
:
m_buildNo(0), void resetInfo(void)
m_buildDate(1900, 1, 1),
m_downloadSite(""),
m_downloadAddress(""),
m_downloadFilename(""),
m_downloadFilecode("")
{ {
m_buildNo = 0;
m_buildDate.setDate(1900, 1, 1);
m_downloadSite.clear();
m_downloadAddress.clear();
m_downloadFilename.clear();
m_downloadFilecode.clear();
} }
unsigned int m_buildNo; unsigned int m_buildNo;
@ -330,10 +336,10 @@ bool UpdateDialog::tryUpdateMirror(UpdateInfo *updateInfo, const QString &url)
QString outFileSignature = QString("%1/%2.sig").arg(lamexp_temp_folder(), randPart); QString outFileSignature = QString("%1/%2.sig").arg(lamexp_temp_folder(), randPart);
m_logFile->append(QStringList() << "" << "Downloading update info:"); m_logFile->append(QStringList() << "" << "Downloading update info:");
bool ok1 = getFile(QString("%1%2").arg(url,mirror_url_postfix), outFileVersionInfo); bool ok1 = getFile(QString("%1%2").arg(url, mirror_url_postfix[lamexp_version_demo() ? 1 : 0]), outFileVersionInfo);
m_logFile->append(QStringList() << "" << "Downloading signature:"); m_logFile->append(QStringList() << "" << "Downloading signature:");
bool ok2 = getFile(QString("%1%2.sig").arg(url,mirror_url_postfix), outFileSignature); bool ok2 = getFile(QString("%1%2.sig").arg(url, mirror_url_postfix[lamexp_version_demo() ? 1 : 0]), outFileSignature);
if(ok1 && ok2) if(ok1 && ok2)
{ {
@ -448,10 +454,11 @@ bool UpdateDialog::checkSignature(const QString &file, const QString &signature)
bool UpdateDialog::parseVersionInfo(const QString &file, UpdateInfo *updateInfo) bool UpdateDialog::parseVersionInfo(const QString &file, UpdateInfo *updateInfo)
{ {
QRegExp value("^(\\w+)=(.+)$"); QRegExp value("^(\\w+)=(.+)$");
QRegExp section("^\\[(.+)\\]$"); QRegExp section("^\\[(.+)\\]$");
updateInfo->resetInfo();
QFile data(file); QFile data(file);
if(!data.open(QIODevice::ReadOnly)) if(!data.open(QIODevice::ReadOnly))
{ {
@ -466,13 +473,13 @@ bool UpdateDialog::parseVersionInfo(const QString &file, UpdateInfo *updateInfo)
QString line = QString::fromLatin1(data.readLine()).trimmed(); QString line = QString::fromLatin1(data.readLine()).trimmed();
if(section.indexIn(line) >= 0) if(section.indexIn(line) >= 0)
{ {
m_logFile->append(QString("[%1]").arg(section.cap(1))); m_logFile->append(QString("Sec: [%1]").arg(section.cap(1)));
inSection = (section.cap(1).compare(section_id, Qt::CaseInsensitive) == 0); inSection = (section.cap(1).compare(section_id, Qt::CaseInsensitive) == 0);
continue; continue;
} }
if(inSection && value.indexIn(line) >= 0) if(inSection && value.indexIn(line) >= 0)
{ {
m_logFile->append(QString("'%1' ==> '%2").arg(value.cap(1), value.cap(2))); m_logFile->append(QString("Val: '%1' ==> '%2").arg(value.cap(1), value.cap(2)));
if(value.cap(1).compare("BuildNo", Qt::CaseInsensitive) == 0) if(value.cap(1).compare("BuildNo", Qt::CaseInsensitive) == 0)
{ {
bool ok = false; bool ok = false;
@ -512,6 +519,11 @@ bool UpdateDialog::parseVersionInfo(const QString &file, UpdateInfo *updateInfo)
if(updateInfo->m_downloadFilename.isEmpty()) complete = false; if(updateInfo->m_downloadFilename.isEmpty()) complete = false;
if(updateInfo->m_downloadFilecode.isEmpty()) complete = false; if(updateInfo->m_downloadFilecode.isEmpty()) complete = false;
if(!complete)
{
m_logFile->append("WARNING: Version info is incomplete!");
}
return complete; return complete;
} }

1
src/Global.cpp
View File

@ -188,7 +188,6 @@ unsigned int lamexp_toolver_neroaac(void) { return g_lamexp_toolver_neroaac; }
bool lamexp_version_demo(void) bool lamexp_version_demo(void)
{ {
return LAMEXP_DEBUG || !(strstr(g_lamexp_version.ver_release_name, "Final") || strstr(g_lamexp_version.ver_release_name, "Hotfix")); return LAMEXP_DEBUG || !(strstr(g_lamexp_version.ver_release_name, "Final") || strstr(g_lamexp_version.ver_release_name, "Hotfix"));
} }