From c33b4e252f8bf37bc716adc7789926185c3e384c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 21 Jan 2018 03:49:54 +0100 Subject: NOISSUE fix bad redirect URLs provided by the curse CDN MultiMC now parses the HTTP Location header in a (more) tolerant mode. --- api/logic/minecraft/flame/FileResolvingTask.cpp | 8 +++++++- api/logic/minecraft/flame/PackManifest.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'api/logic/minecraft/flame') diff --git a/api/logic/minecraft/flame/FileResolvingTask.cpp b/api/logic/minecraft/flame/FileResolvingTask.cpp index af8ef7aa..980b8c3a 100644 --- a/api/logic/minecraft/flame/FileResolvingTask.cpp +++ b/api/logic/minecraft/flame/FileResolvingTask.cpp @@ -48,7 +48,13 @@ void Flame::FileResolvingTask::netJobFinished() continue; } out.fileName = Json::requireString(obj, "FileNameOnDisk"); - out.url = Json::requireString(obj, "DownloadURL"); + auto urlString = Json::requireString(obj, "DownloadURL"); + urlString.replace(' ', "%20"); + out.url = QUrl(urlString, QUrl::StrictMode); + if(!out.url.isValid()) + { + throw "Perkele!"; + } // This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience // It is also optional QJsonObject projObj = Json::ensureObject(obj, "_Project", {}); diff --git a/api/logic/minecraft/flame/PackManifest.h b/api/logic/minecraft/flame/PackManifest.h index 07bf92b6..1a5254a8 100644 --- a/api/logic/minecraft/flame/PackManifest.h +++ b/api/logic/minecraft/flame/PackManifest.h @@ -2,6 +2,7 @@ #include #include +#include namespace Flame { @@ -15,7 +16,7 @@ struct File // our bool resolved = false; QString fileName; - QString url; + QUrl url; QString targetFolder = QLatin1Literal("mods"); enum class Type { -- cgit v1.2.3