0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework version numbering system.

Browse Source 
Again...
This commit is contained in:
Forkk
2014-01-07 18:09:05 -06:00
parent 28cb66e85c
commit 3202b972f8
6 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
logic/updater/NotificationChecker.cpp
View File

@@ -5,8 +5,8 @@
#include <QJsonArray>
#include "MultiMC.h"
#include "MultiMCVersion.h"
#include "logic/net/CacheDownload.h"
#include "config.h"
NotificationChecker::NotificationChecker(QObject *parent)
: QObject(parent), m_notificationsUrl(QUrl(NOTIFICATION_URL))
@@ -66,7 +66,7 @@ void NotificationChecker::downloadSucceeded(int)
entry.id = obj.value("id").toDouble();
entry.message = obj.value("message").toString();
entry.channel = obj.value("channel").toString();
entry.buildtype = obj.value("buildtype").toString();
entry.platform = obj.value("platform").toString();
entry.from = obj.value("from").toString();
entry.to = obj.value("to").toString();
const QString type = obj.value("type").toString("critical");
@@ -93,13 +93,14 @@ void NotificationChecker::downloadSucceeded(int)
bool NotificationChecker::NotificationEntry::applies() const
{
bool channelApplies = channel.isEmpty() || channel == VERSION_CHANNEL;
bool buildtypeApplies = buildtype.isEmpty() || buildtype == VERSION_BUILD_TYPE;
MultiMCVersion version = MMC->version();
bool channelApplies = channel.isEmpty() || channel == version.channel;
bool platformApplies = platform.isEmpty() || platform == version.platform;
bool fromApplies =
from.isEmpty() || from == FULL_VERSION_STR || !versionLessThan(FULL_VERSION_STR, from);
bool toApplies =
to.isEmpty() || to == FULL_VERSION_STR || !versionLessThan(to, FULL_VERSION_STR);
return channelApplies && buildtypeApplies && fromApplies && toApplies;
return channelApplies && platformApplies && fromApplies && toApplies;
}
bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1,

2
logic/updater/NotificationChecker.h
View File

@@ -26,7 +26,7 @@ public:
Information
} type;
QString channel;
QString buildtype;
QString platform;
QString from;
QString to;
bool applies() const;