diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-02-07 12:55:18 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:17 +0200 |
commit | 7a71ecd8af0454e405b25080a4b266fc99306269 (patch) | |
tree | e1bb6527d5d968ddb41f2f281b46582dff5b9131 /logic/notifications/NotificationChecker.cpp | |
parent | 4e94de413ba60a1da91715a41c8ba8caa8474728 (diff) | |
download | MultiMC-7a71ecd8af0454e405b25080a4b266fc99306269.tar MultiMC-7a71ecd8af0454e405b25080a4b266fc99306269.tar.gz MultiMC-7a71ecd8af0454e405b25080a4b266fc99306269.tar.lz MultiMC-7a71ecd8af0454e405b25080a4b266fc99306269.tar.xz MultiMC-7a71ecd8af0454e405b25080a4b266fc99306269.zip |
NOISSUE fix notification checker
Diffstat (limited to 'logic/notifications/NotificationChecker.cpp')
-rw-r--r-- | logic/notifications/NotificationChecker.cpp | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/logic/notifications/NotificationChecker.cpp b/logic/notifications/NotificationChecker.cpp index 3f8b17ba..77721770 100644 --- a/logic/notifications/NotificationChecker.cpp +++ b/logic/notifications/NotificationChecker.cpp @@ -3,28 +3,37 @@ #include <QJsonDocument> #include <QJsonObject> #include <QJsonArray> +#include <QDebug> #include "logic/Env.h" -#include "BuildConfig.h" #include "logic/net/CacheDownload.h" -#include <QDebug> + NotificationChecker::NotificationChecker(QObject *parent) - : QObject(parent), m_notificationsUrl(QUrl(BuildConfig.NOTIFICATION_URL)) + : QObject(parent) { - // this will call checkForNotifications once the event loop is running - QMetaObject::invokeMethod(this, "checkForNotifications", Qt::QueuedConnection); } -QUrl NotificationChecker::notificationsUrl() const -{ - return m_notificationsUrl; -} void NotificationChecker::setNotificationsUrl(const QUrl ¬ificationsUrl) { m_notificationsUrl = notificationsUrl; } +void NotificationChecker::setApplicationChannel(QString channel) +{ + m_appVersionChannel = channel; +} + +void NotificationChecker::setApplicationFullVersion(QString version) +{ + m_appFullVersion = version; +} + +void NotificationChecker::setApplicationPlatform(QString platform) +{ + m_appPlatform = platform; +} + QList<NotificationChecker::NotificationEntry> NotificationChecker::notificationEntries() const { return m_entries; @@ -83,7 +92,8 @@ void NotificationChecker::downloadSucceeded(int) { entry.type = NotificationEntry::Information; } - m_entries.append(entry); + if(entryApplies(entry)) + m_entries.append(entry); } } @@ -92,19 +102,7 @@ void NotificationChecker::downloadSucceeded(int) emit notificationCheckFinished(); } -bool NotificationChecker::NotificationEntry::applies() const -{ - bool channelApplies = channel.isEmpty() || channel == BuildConfig.VERSION_CHANNEL; - bool platformApplies = platform.isEmpty() || platform == BuildConfig.BUILD_PLATFORM; - bool fromApplies = - from.isEmpty() || from == BuildConfig.FULL_VERSION_STR || !versionLessThan(BuildConfig.FULL_VERSION_STR, from); - bool toApplies = - to.isEmpty() || to == BuildConfig.FULL_VERSION_STR || !versionLessThan(to, BuildConfig.FULL_VERSION_STR); - return channelApplies && platformApplies && fromApplies && toApplies; -} - -bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1, - const QString &v2) +bool versionLessThan(const QString &v1, const QString &v2) { QStringList l1 = v1.split('.'); QStringList l2 = v2.split('.'); @@ -119,3 +117,14 @@ bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1, } return false; } + +bool NotificationChecker::entryApplies(const NotificationChecker::NotificationEntry& entry) const +{ + bool channelApplies = entry.channel.isEmpty() || entry.channel == m_appVersionChannel; + bool platformApplies = entry.platform.isEmpty() || entry.platform == m_appPlatform; + bool fromApplies = + entry.from.isEmpty() || entry.from == m_appFullVersion || !versionLessThan(m_appFullVersion, entry.from); + bool toApplies = + entry.to.isEmpty() || entry.to == m_appFullVersion || !versionLessThan(entry.to, m_appFullVersion); + return channelApplies && platformApplies && fromApplies && toApplies; +} |