aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/AssetsUtils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/minecraft/AssetsUtils.cpp')
-rw-r--r--launcher/minecraft/AssetsUtils.cpp121
1 files changed, 43 insertions, 78 deletions
diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 65ad6da6..4ef00707 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -33,21 +33,21 @@
* limitations under the License.
*/
-#include <QFileInfo>
+#include <QCryptographicHash>
+#include <QDebug>
#include <QDir>
#include <QDirIterator>
-#include <QCryptographicHash>
-#include <QJsonParseError>
+#include <QFileInfo>
#include <QJsonDocument>
#include <QJsonObject>
+#include <QJsonParseError>
#include <QVariant>
-#include <QDebug>
#include "AssetsUtils.h"
+#include "BuildConfig.h"
#include "FileSystem.h"
#include "net/ApiDownload.h"
#include "net/ChecksumValidator.h"
-#include "BuildConfig.h"
#include "Application.h"
@@ -56,37 +56,32 @@ QSet<QString> collectPathsFromDir(QString dirPath)
{
QFileInfo dirInfo(dirPath);
- if (!dirInfo.exists())
- {
+ if (!dirInfo.exists()) {
return {};
}
QSet<QString> out;
QDirIterator iter(dirPath, QDirIterator::Subdirectories);
- while (iter.hasNext())
- {
+ while (iter.hasNext()) {
QString value = iter.next();
QFileInfo info(value);
- if(info.isFile())
- {
+ if (info.isFile()) {
out.insert(value);
qDebug() << value;
}
}
return out;
}
-}
+} // namespace
-
-namespace AssetsUtils
-{
+namespace AssetsUtils {
/*
* Returns true on success, with index populated
* index is undefined otherwise
*/
-bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsIndex& index)
+bool loadAssetsIndexJson(const QString& assetsId, const QString& path, AssetsIndex& index)
{
/*
{
@@ -105,8 +100,7 @@ bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsInd
// Try to open the file and fail if we can't.
// TODO: We should probably report this error to the user.
- if (!file.open(QIODevice::ReadOnly))
- {
+ if (!file.open(QIODevice::ReadOnly)) {
qCritical() << "Failed to read assets index file" << path;
return false;
}
@@ -120,16 +114,14 @@ bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsInd
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parseError);
// Fail if the JSON is invalid.
- if (parseError.error != QJsonParseError::NoError)
- {
- qCritical() << "Failed to parse assets index file:" << parseError.errorString()
- << "at offset " << QString::number(parseError.offset);
+ if (parseError.error != QJsonParseError::NoError) {
+ qCritical() << "Failed to parse assets index file:" << parseError.errorString() << "at offset "
+ << QString::number(parseError.offset);
return false;
}
// Make sure the root is an object.
- if (!jsonDoc.isObject())
- {
+ if (!jsonDoc.isObject()) {
qCritical() << "Invalid assets index JSON: Root should be an array.";
return false;
}
@@ -137,22 +129,19 @@ bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsInd
QJsonObject root = jsonDoc.object();
QJsonValue isVirtual = root.value("virtual");
- if (!isVirtual.isUndefined())
- {
+ if (!isVirtual.isUndefined()) {
index.isVirtual = isVirtual.toBool(false);
}
QJsonValue mapToResources = root.value("map_to_resources");
- if (!mapToResources.isUndefined())
- {
+ if (!mapToResources.isUndefined()) {
index.mapToResources = mapToResources.toBool(false);
}
QJsonValue objects = root.value("objects");
QVariantMap map = objects.toVariant().toMap();
- for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter)
- {
+ for (QVariantMap::const_iterator iter = map.begin(); iter != map.end(); ++iter) {
// qDebug() << iter.key();
QVariant variant = iter.value();
@@ -160,19 +149,14 @@ bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsInd
AssetObject object;
- for (QVariantMap::const_iterator nested_iter = nested_objects.begin();
- nested_iter != nested_objects.end(); ++nested_iter)
- {
+ for (QVariantMap::const_iterator nested_iter = nested_objects.begin(); nested_iter != nested_objects.end(); ++nested_iter) {
// qDebug() << nested_iter.key() << nested_iter.value().toString();
QString key = nested_iter.key();
QVariant value = nested_iter.value();
- if (key == "hash")
- {
+ if (key == "hash") {
object.hash = value.toString();
- }
- else if (key == "size")
- {
+ } else if (key == "size") {
object.size = value.toDouble();
}
}
@@ -184,7 +168,7 @@ bool loadAssetsIndexJson(const QString &assetsId, const QString &path, AssetsInd
}
// FIXME: ugly code duplication
-QDir getAssetsDir(const QString &assetsId, const QString &resourcesFolder)
+QDir getAssetsDir(const QString& assetsId, const QString& resourcesFolder)
{
QDir assetsDir = QDir("assets/");
QDir indexDir = QDir(FS::PathCombine(assetsDir.path(), "indexes"));
@@ -195,26 +179,21 @@ QDir getAssetsDir(const QString &assetsId, const QString &resourcesFolder)
QFile indexFile(indexPath);
QDir virtualRoot(FS::PathCombine(virtualDir.path(), assetsId));
- if (!indexFile.exists())
- {
+ if (!indexFile.exists()) {
qCritical() << "No assets index file" << indexPath << "; can't determine assets path!";
return virtualRoot;
}
AssetsIndex index;
- if(!AssetsUtils::loadAssetsIndexJson(assetsId, indexPath, index))
- {
+ if (!AssetsUtils::loadAssetsIndexJson(assetsId, indexPath, index)) {
qCritical() << "Failed to load asset index file" << indexPath << "; can't determine assets path!";
return virtualRoot;
}
QString targetPath;
- if(index.isVirtual)
- {
+ if (index.isVirtual) {
return virtualRoot;
- }
- else if(index.mapToResources)
- {
+ } else if (index.mapToResources) {
return QDir(resourcesFolder);
}
return virtualRoot;
@@ -232,8 +211,7 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
QFile indexFile(indexPath);
QDir virtualRoot(FS::PathCombine(virtualDir.path(), assetsId));
- if (!indexFile.exists())
- {
+ if (!indexFile.exists()) {
qCritical() << "No assets index file" << indexPath << "; can't reconstruct assets!";
return false;
}
@@ -241,31 +219,25 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
qDebug() << "reconstructAssets" << assetsDir.path() << indexDir.path() << objectDir.path() << virtualDir.path() << virtualRoot.path();
AssetsIndex index;
- if(!AssetsUtils::loadAssetsIndexJson(assetsId, indexPath, index))
- {
+ if (!AssetsUtils::loadAssetsIndexJson(assetsId, indexPath, index)) {
qCritical() << "Failed to load asset index file" << indexPath << "; can't reconstruct assets!";
return false;
}
QString targetPath;
bool removeLeftovers = false;
- if(index.isVirtual)
- {
+ if (index.isVirtual) {
targetPath = virtualRoot.path();
removeLeftovers = true;
qDebug() << "Reconstructing virtual assets folder at" << targetPath;
- }
- else if(index.mapToResources)
- {
+ } else if (index.mapToResources) {
targetPath = resourcesFolder;
qDebug() << "Reconstructing resources folder at" << targetPath;
}
- if (!targetPath.isNull())
- {
+ if (!targetPath.isNull()) {
auto presentFiles = collectPathsFromDir(targetPath);
- for (QString map : index.objects.keys())
- {
+ for (QString map : index.objects.keys()) {
AssetObject asset_object = index.objects.value(map);
QString target_path = FS::PathCombine(targetPath, map);
QFile target(target_path);
@@ -279,8 +251,7 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
presentFiles.remove(target_path);
- if (!target.exists())
- {
+ if (!target.exists()) {
QFileInfo info(target_path);
QDir target_dir = info.dir();
@@ -293,10 +264,8 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
}
// TODO: Write last used time to virtualRoot/.lastused
- if(removeLeftovers)
- {
- for(auto & file: presentFiles)
- {
+ if (removeLeftovers) {
+ for (auto& file : presentFiles) {
qDebug() << "Would remove" << file;
}
}
@@ -304,16 +273,14 @@ bool reconstructAssets(QString assetsId, QString resourcesFolder)
return true;
}
-}
+} // namespace AssetsUtils
NetAction::Ptr AssetObject::getDownloadAction()
{
QFileInfo objectFile(getLocalPath());
- if ((!objectFile.isFile()) || (objectFile.size() != size))
- {
+ if ((!objectFile.isFile()) || (objectFile.size() != size)) {
auto objectDL = Net::ApiDownload::makeFile(getUrl(), objectFile.filePath());
- if(hash.size())
- {
+ if (hash.size()) {
auto rawHash = QByteArray::fromHex(hash.toLatin1());
objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash));
}
@@ -341,15 +308,13 @@ QString AssetObject::getRelPath()
NetJob::Ptr AssetsIndex::getDownloadJob()
{
auto job = makeShared<NetJob>(QObject::tr("Assets for %1").arg(id), APPLICATION->network());
- for (auto &object : objects.values())
- {
+ for (auto& object : objects.values()) {
auto dl = object.getDownloadAction();
- if(dl)
- {
+ if (dl) {
job->addNetAction(dl);
}
}
- if(job->size())
+ if (job->size())
return job;
return nullptr;
}
generated by cgit (git 2.46.0) at 2025-02-02 13:51:36 +0000