aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame/FileResolvingTask.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-05-23 10:47:30 +0200
committerGitHub <noreply@github.com>2022-05-23 10:47:30 +0200
commitdca4ea5ceaa30f1285570d2bf32ea112118b9204 (patch)
treee55d2a15106b505fd2be2551fd6e45f86fe1d9f7 /launcher/modplatform/flame/FileResolvingTask.cpp
parentbe1e2c07ecb9bda084995b86ec1b562cbc8dfbdf (diff)
parentcb69869836d2b4ed4b50a43694e95c4a801332f7 (diff)
downloadPrismLauncher-dca4ea5ceaa30f1285570d2bf32ea112118b9204.tar.gz
PrismLauncher-dca4ea5ceaa30f1285570d2bf32ea112118b9204.tar.bz2
PrismLauncher-dca4ea5ceaa30f1285570d2bf32ea112118b9204.zip
Merge pull request #621 from Scrumplex/remove-curseforge-workarounds
Diffstat (limited to 'launcher/modplatform/flame/FileResolvingTask.cpp')
-rw-r--r--launcher/modplatform/flame/FileResolvingTask.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 0deb99c4..95924a68 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -31,21 +31,7 @@ void Flame::FileResolvingTask::netJobFinished()
for (auto& bytes : results) {
auto& out = m_toProcess.files[index];
try {
- bool fail = (!out.parseFromBytes(bytes));
- if(fail){
- //failed :( probably disabled mod, try to add to the list
- auto doc = Json::requireDocument(bytes);
- if (!doc.isObject()) {
- throw JSONValidationError(QString("data is not an object? that's not supposed to happen"));
- }
- auto obj = Json::ensureObject(doc.object(), "data");
- //FIXME : HACK, MAY NOT WORK FOR LONG
- out.url = QUrl(QString("https://media.forgecdn.net/files/%1/%2/%3")
- .arg(QString::number(QString::number(out.fileId).leftRef(4).toInt())
- ,QString::number(QString::number(out.fileId).rightRef(3).toInt())
- ,QUrl::toPercentEncoding(out.fileName)), QUrl::TolerantMode);
- }
- failed &= fail;
+ failed &= (!out.parseFromBytes(bytes));
} catch (const JSONValidationError& e) {
qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:";
qCritical() << e.cause();