From 1455f051e4762cf7409081f7db5cefb22d3c72bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 2 Jan 2014 23:58:53 +0100 Subject: Force cached updater binary to always resolve as stale --- logic/updater/DownloadUpdateTask.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'logic/updater') diff --git a/logic/updater/DownloadUpdateTask.cpp b/logic/updater/DownloadUpdateTask.cpp index 6e0a92f0..029286dd 100644 --- a/logic/updater/DownloadUpdateTask.cpp +++ b/logic/updater/DownloadUpdateTask.cpp @@ -404,11 +404,10 @@ DownloadUpdateTask::processFileLists(NetJob *job, { auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path); QLOG_DEBUG() << "Updater will be in " << cache_entry->getFullPath(); - if(cache_entry->stale) - { - auto download = CacheDownload::make(QUrl(source.url), cache_entry); - job->addNetAction(download); - } + // force check. + cache_entry->stale = true; + auto download = CacheDownload::make(QUrl(source.url), cache_entry); + job->addNetAction(download); } else { -- cgit v1.2.3 From b3dd1eba2146849cddd7e85b16aa3b8af9d2de23 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 3 Jan 2014 19:19:27 +0100 Subject: Notifications system. Mainly to be used in case the updater breaks. --- logic/updater/NotificationChecker.cpp | 113 ++++++++++++++++++++++++++++++++++ logic/updater/NotificationChecker.h | 54 ++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 logic/updater/NotificationChecker.cpp create mode 100644 logic/updater/NotificationChecker.h (limited to 'logic/updater') diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp new file mode 100644 index 00000000..a3d7a945 --- /dev/null +++ b/logic/updater/NotificationChecker.cpp @@ -0,0 +1,113 @@ +#include "NotificationChecker.h" + +#include +#include +#include + +#include "MultiMC.h" +#include "logic/net/CacheDownload.h" +#include "config.h" + +NotificationChecker::NotificationChecker(QObject *parent) + : QObject(parent), m_notificationsUrl(QUrl(NOTIFICATION_URL)) +{ + // 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; +} + +QList NotificationChecker::notificationEntries() const +{ + return m_entries; +} + +void NotificationChecker::checkForNotifications() +{ + if (m_checkJob) + { + return; + } + m_checkJob.reset(new NetJob("Checking for notifications")); + auto entry = MMC->metacache()->resolveEntry("root", "notifications.json"); + entry->stale = true; + m_checkJob->addNetAction(m_download = CacheDownload::make(m_notificationsUrl, entry)); + connect(m_download.get(), &CacheDownload::succeeded, this, + &NotificationChecker::downloadSucceeded); + m_checkJob->start(); +} + +void NotificationChecker::downloadSucceeded(int) +{ + m_entries.clear(); + + QFile file(m_download->m_output_file.fileName()); + if (file.open(QFile::ReadOnly)) + { + QJsonArray root = QJsonDocument::fromJson(file.readAll()).array(); + for (auto it = root.begin(); it != root.end(); ++it) + { + QJsonObject obj = (*it).toObject(); + NotificationEntry entry; + entry.id = obj.value("id").toInt(); + entry.message = obj.value("message").toString(); + entry.channel = obj.value("channel").toString(); + entry.buildtype = obj.value("buildtype").toString(); + entry.from = obj.value("from").toString(); + entry.to = obj.value("to").toString(); + const QString type = obj.value("type").toString("critical"); + if (type == "critical") + { + entry.type = NotificationEntry::Critical; + } + else if (type == "warning") + { + entry.type = NotificationEntry::Warning; + } + else if (type == "information") + { + entry.type = NotificationEntry::Information; + } + m_entries.append(entry); + } + } + + m_checkJob.reset(); + + emit notificationCheckFinished(); +} + +bool NotificationChecker::NotificationEntry::applies() const +{ + bool channelApplies = channel.isEmpty() || channel == VERSION_CHANNEL; + bool buildtypeApplies = buildtype.isEmpty() || buildtype == VERSION_BUILD_TYPE; + 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; +} + +bool NotificationChecker::NotificationEntry::versionLessThan(const QString &v1, + const QString &v2) +{ + QStringList l1 = v1.split('.'); + QStringList l2 = v2.split('.'); + while (!l1.isEmpty() && !l2.isEmpty()) + { + int one = l1.isEmpty() ? 0 : l1.takeFirst().toInt(); + int two = l2.isEmpty() ? 0 : l2.takeFirst().toInt(); + if (one != two) + { + return one < two; + } + } + return false; +} diff --git a/logic/updater/NotificationChecker.h b/logic/updater/NotificationChecker.h new file mode 100644 index 00000000..20541757 --- /dev/null +++ b/logic/updater/NotificationChecker.h @@ -0,0 +1,54 @@ +#pragma once + +#include + +#include "logic/net/NetJob.h" +#include "logic/net/CacheDownload.h" + +class NotificationChecker : public QObject +{ + Q_OBJECT + +public: + explicit NotificationChecker(QObject *parent = 0); + + QUrl notificationsUrl() const; + void setNotificationsUrl(const QUrl ¬ificationsUrl); + + struct NotificationEntry + { + int id; + QString message; + enum + { + Critical, + Warning, + Information + } type; + QString channel; + QString buildtype; + QString from; + QString to; + bool applies() const; + static bool versionLessThan(const QString &v1, const QString &v2); + }; + + QList notificationEntries() const; + +public +slots: + void checkForNotifications(); + +private +slots: + void downloadSucceeded(int); + +signals: + void notificationCheckFinished(); + +private: + QList m_entries; + QUrl m_notificationsUrl; + NetJobPtr m_checkJob; + CacheDownloadPtr m_download; +}; -- cgit v1.2.3 From df9f9a34ef325b55c34293cf4e3367c50084416b Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 3 Jan 2014 20:12:37 +0100 Subject: Fix for pre-Qt5.2 --- logic/updater/NotificationChecker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'logic/updater') diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp index a3d7a945..8540b5a1 100644 --- a/logic/updater/NotificationChecker.cpp +++ b/logic/updater/NotificationChecker.cpp @@ -56,7 +56,7 @@ void NotificationChecker::downloadSucceeded(int) { QJsonObject obj = (*it).toObject(); NotificationEntry entry; - entry.id = obj.value("id").toInt(); + entry.id = obj.value("id").toDouble(); entry.message = obj.value("message").toString(); entry.channel = obj.value("channel").toString(); entry.buildtype = obj.value("buildtype").toString(); -- cgit v1.2.3 From 71e1410b9fd785b62ece869f3d5448c14fdcba83 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 3 Jan 2014 20:39:21 +0100 Subject: Don't try to check for notifications if we don't have a URL for it --- logic/updater/NotificationChecker.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'logic/updater') diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp index 8540b5a1..40367eac 100644 --- a/logic/updater/NotificationChecker.cpp +++ b/logic/updater/NotificationChecker.cpp @@ -31,6 +31,13 @@ QList NotificationChecker::notificationE void NotificationChecker::checkForNotifications() { + if (!m_notificationsUrl.isValid()) + { + QLOG_ERROR() << "Failed to check for notifications. No notifications URL set." + << "If you'd like to use MultiMC's notification system, please pass the " + "URL to CMake at compile time."; + return; + } if (m_checkJob) { return; -- cgit v1.2.3