aboutsummaryrefslogtreecommitdiff
path: root/launcher/net/HttpMetaCache.cpp
diff options
context:
space:
mode:
authorflow <thiagodonato300@gmail.com>2022-04-27 18:36:11 -0300
committerflow <thiagodonato300@gmail.com>2022-05-12 18:11:55 -0300
commit040ee919e5ea71364daa08c30e09c843976f5734 (patch)
treec65db37c7aa199592135020d3114aa808415764c /launcher/net/HttpMetaCache.cpp
parentefa3fbff39bf0dabebdf1c6330090ee320895a4d (diff)
downloadPrismLauncher-040ee919e5ea71364daa08c30e09c843976f5734.tar.gz
PrismLauncher-040ee919e5ea71364daa08c30e09c843976f5734.tar.bz2
PrismLauncher-040ee919e5ea71364daa08c30e09c843976f5734.zip
refactor: more net cleanup
This runs clang-tidy on some other files in launcher/net/. This also makes use of some JSON wrappers in HttpMetaCache, instead of using the Qt stuff directly. Lastly, this removes useless null checks (crashes don't occur because of this, but because of concurrent usage / free of the QByteArray pointer), and fix a fixme in Download.h
Diffstat (limited to 'launcher/net/HttpMetaCache.cpp')
-rw-r--r--launcher/net/HttpMetaCache.cpp184
1 files changed, 82 insertions, 102 deletions
diff --git a/launcher/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp
index 8734e0bf..b41a18b1 100644
--- a/launcher/net/HttpMetaCache.cpp
+++ b/launcher/net/HttpMetaCache.cpp
@@ -15,29 +15,26 @@
#include "HttpMetaCache.h"
#include "FileSystem.h"
+#include "Json.h"
-#include <QFileInfo>
-#include <QFile>
-#include <QDateTime>
#include <QCryptographicHash>
+#include <QDateTime>
+#include <QFile>
+#include <QFileInfo>
#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-
-QString MetaEntry::getFullPath()
+auto MetaEntry::getFullPath() -> QString
{
// FIXME: make local?
return FS::PathCombine(basePath, relativePath);
}
-HttpMetaCache::HttpMetaCache(QString path) : QObject()
+HttpMetaCache::HttpMetaCache(QString path) : QObject(), m_index_file(path)
{
- m_index_file = path;
saveBatchingTimer.setSingleShot(true);
saveBatchingTimer.setTimerType(Qt::VeryCoarseTimer);
+
connect(&saveBatchingTimer, SIGNAL(timeout()), SLOT(SaveNow()));
}
@@ -47,45 +44,42 @@ HttpMetaCache::~HttpMetaCache()
SaveNow();
}
-MetaEntryPtr HttpMetaCache::getEntry(QString base, QString resource_path)
+auto HttpMetaCache::getEntry(QString base, QString resource_path) -> MetaEntryPtr
{
// no base. no base path. can't store
- if (!m_entries.contains(base))
- {
+ if (!m_entries.contains(base)) {
// TODO: log problem
- return MetaEntryPtr();
+ return {};
}
- EntryMap &map = m_entries[base];
- if (map.entry_list.contains(resource_path))
- {
+
+ EntryMap& map = m_entries[base];
+ if (map.entry_list.contains(resource_path)) {
return map.entry_list[resource_path];
}
- return MetaEntryPtr();
+
+ return {};
}
-MetaEntryPtr HttpMetaCache::resolveEntry(QString base, QString resource_path, QString expected_etag)
+auto HttpMetaCache::resolveEntry(QString base, QString resource_path, QString expected_etag) -> MetaEntryPtr
{
auto entry = getEntry(base, resource_path);
// it's not present? generate a default stale entry
- if (!entry)
- {
+ if (!entry) {
return staleEntry(base, resource_path);
}
- auto &selected_base = m_entries[base];
+ auto& selected_base = m_entries[base];
QString real_path = FS::PathCombine(selected_base.base_path, resource_path);
QFileInfo finfo(real_path);
// is the file really there? if not -> stale
- if (!finfo.isFile() || !finfo.isReadable())
- {
+ if (!finfo.isFile() || !finfo.isReadable()) {
// if the file doesn't exist, we disown the entry
selected_base.entry_list.remove(resource_path);
return staleEntry(base, resource_path);
}
- if (!expected_etag.isEmpty() && expected_etag != entry->etag)
- {
+ if (!expected_etag.isEmpty() && expected_etag != entry->etag) {
// if the etag doesn't match expected, we disown the entry
selected_base.entry_list.remove(resource_path);
return staleEntry(base, resource_path);
@@ -93,18 +87,15 @@ MetaEntryPtr HttpMetaCache::resolveEntry(QString base, QString resource_path, QS
// if the file changed, check md5sum
qint64 file_last_changed = finfo.lastModified().toUTC().toMSecsSinceEpoch();
- if (file_last_changed != entry->local_changed_timestamp)
- {
+ if (file_last_changed != entry->local_changed_timestamp) {
QFile input(real_path);
input.open(QIODevice::ReadOnly);
- QString md5sum = QCryptographicHash::hash(input.readAll(), QCryptographicHash::Md5)
- .toHex()
- .constData();
- if (entry->md5sum != md5sum)
- {
+ QString md5sum = QCryptographicHash::hash(input.readAll(), QCryptographicHash::Md5).toHex().constData();
+ if (entry->md5sum != md5sum) {
selected_base.entry_list.remove(resource_path);
return staleEntry(base, resource_path);
}
+
// md5sums matched... keep entry and save the new state to file
entry->local_changed_timestamp = file_last_changed;
SaveEventually();
@@ -115,42 +106,42 @@ MetaEntryPtr HttpMetaCache::resolveEntry(QString base, QString resource_path, QS
return entry;
}
-bool HttpMetaCache::updateEntry(MetaEntryPtr stale_entry)
+auto HttpMetaCache::updateEntry(MetaEntryPtr stale_entry) -> bool
{
- if (!m_entries.contains(stale_entry->baseId))
- {
- qCritical() << "Cannot add entry with unknown base: "
- << stale_entry->baseId.toLocal8Bit();
+ if (!m_entries.contains(stale_entry->baseId)) {
+ qCritical() << "Cannot add entry with unknown base: " << stale_entry->baseId.toLocal8Bit();
return false;
}
- if (stale_entry->stale)
- {
+
+ if (stale_entry->stale) {
qCritical() << "Cannot add stale entry: " << stale_entry->getFullPath().toLocal8Bit();
return false;
}
+
m_entries[stale_entry->baseId].entry_list[stale_entry->relativePath] = stale_entry;
SaveEventually();
+
return true;
}
-bool HttpMetaCache::evictEntry(MetaEntryPtr entry)
+auto HttpMetaCache::evictEntry(MetaEntryPtr entry) -> bool
{
- if(entry)
- {
- entry->stale = true;
- SaveEventually();
- return true;
- }
- return false;
+ if (!entry)
+ return false;
+
+ entry->stale = true;
+ SaveEventually();
+ return true;
}
-MetaEntryPtr HttpMetaCache::staleEntry(QString base, QString resource_path)
+auto HttpMetaCache::staleEntry(QString base, QString resource_path) -> MetaEntryPtr
{
auto foo = new MetaEntry();
foo->baseId = base;
foo->basePath = getBasePath(base);
foo->relativePath = resource_path;
foo->stale = true;
+
return MetaEntryPtr(foo);
}
@@ -159,24 +150,25 @@ void HttpMetaCache::addBase(QString base, QString base_root)
// TODO: report error
if (m_entries.contains(base))
return;
+
// TODO: check if the base path is valid
EntryMap foo;
foo.base_path = base_root;
m_entries[base] = foo;
}
-QString HttpMetaCache::getBasePath(QString base)
+auto HttpMetaCache::getBasePath(QString base) -> QString
{
- if (m_entries.contains(base))
- {
+ if (m_entries.contains(base)) {
return m_entries[base].base_path;
}
- return QString();
+
+ return {};
}
void HttpMetaCache::Load()
{
- if(m_index_file.isNull())
+ if (m_index_file.isNull())
return;
QFile index(m_index_file);
@@ -184,41 +176,35 @@ void HttpMetaCache::Load()
return;
QJsonDocument json = QJsonDocument::fromJson(index.readAll());
- if (!json.isObject())
- return;
- auto root = json.object();
+
+ auto root = Json::requireObject(json, "HttpMetaCache root");
+
// check file version first
- auto version_val = root.value("version");
- if (!version_val.isString())
- return;
- if (version_val.toString() != "1")
+ auto version_val = Json::ensureString(root, "version");
+ if (version_val != "1")
return;
// read the entry array
- auto entries_val = root.value("entries");
- if (!entries_val.isArray())
- return;
- QJsonArray array = entries_val.toArray();
- for (auto element : array)
- {
- if (!element.isObject())
- return;
- auto element_obj = element.toObject();
- QString base = element_obj.value("base").toString();
+ auto array = Json::ensureArray(root, "entries");
+ for (auto element : array) {
+ auto element_obj = Json::ensureObject(element);
+ auto base = Json::ensureString(element_obj, "base");
if (!m_entries.contains(base))
continue;
- auto &entrymap = m_entries[base];
+
+ auto& entrymap = m_entries[base];
+
auto foo = new MetaEntry();
foo->baseId = base;
- QString path = foo->relativePath = element_obj.value("path").toString();
- foo->md5sum = element_obj.value("md5sum").toString();
- foo->etag = element_obj.value("etag").toString();
- foo->local_changed_timestamp = element_obj.value("last_changed_timestamp").toDouble();
- foo->remote_changed_timestamp =
- element_obj.value("remote_changed_timestamp").toString();
+ foo->relativePath = Json::ensureString(element_obj, "path");
+ foo->md5sum = Json::ensureString(element_obj, "md5sum");
+ foo->etag = Json::ensureString(element_obj, "etag");
+ foo->local_changed_timestamp = Json::ensureDouble(element_obj, "last_changed_timestamp");
+ foo->remote_changed_timestamp = Json::ensureString(element_obj, "remote_changed_timestamp");
// presumed innocent until closer examination
foo->stale = false;
- entrymap.entry_list[path] = MetaEntryPtr(foo);
+
+ entrymap.entry_list[foo->relativePath] = MetaEntryPtr(foo);
}
}
@@ -231,42 +217,36 @@ void HttpMetaCache::SaveEventually()
void HttpMetaCache::SaveNow()
{
- if(m_index_file.isNull())
+ if (m_index_file.isNull())
return;
+
QJsonObject toplevel;
- toplevel.insert("version", QJsonValue(QString("1")));
+ Json::writeString(toplevel, "version", "1");
+
QJsonArray entriesArr;
- for (auto group : m_entries)
- {
- for (auto entry : group.entry_list)
- {
+ for (auto group : m_entries) {
+ for (auto entry : group.entry_list) {
// do not save stale entries. they are dead.
- if(entry->stale)
- {
+ if (entry->stale) {
continue;
}
+
QJsonObject entryObj;
- entryObj.insert("base", QJsonValue(entry->baseId));
- entryObj.insert("path", QJsonValue(entry->relativePath));
- entryObj.insert("md5sum", QJsonValue(entry->md5sum));
- entryObj.insert("etag", QJsonValue(entry->etag));
- entryObj.insert("last_changed_timestamp",
- QJsonValue(double(entry->local_changed_timestamp)));
+ Json::writeString(entryObj, "base", entry->baseId);
+ Json::writeString(entryObj, "path", entry->relativePath);
+ Json::writeString(entryObj, "md5sum", entry->md5sum);
+ Json::writeString(entryObj, "etag", entry->etag);
+ entryObj.insert("last_changed_timestamp", QJsonValue(double(entry->local_changed_timestamp)));
if (!entry->remote_changed_timestamp.isEmpty())
- entryObj.insert("remote_changed_timestamp",
- QJsonValue(entry->remote_changed_timestamp));
+ entryObj.insert("remote_changed_timestamp", QJsonValue(entry->remote_changed_timestamp));
entriesArr.append(entryObj);
}
}
toplevel.insert("entries", entriesArr);
- QJsonDocument doc(toplevel);
- try
- {
- FS::write(m_index_file, doc.toJson());
- }
- catch (const Exception &e)
- {
+ try {
+ Json::write(toplevel, m_index_file);
+ } catch (const Exception& e) {
qWarning() << e.what();
}
}
generated by cgit (git 2.46.0) at 2025-03-12 08:07:16 +0000