0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE remove unneeded URL fixing code and fix up the exception thrown by invalid Flame URLs

Browse Source
This commit is contained in:
Petr Mrázek 2018-01-29 00:47:18 +01:00
parent 418251bd86
commit 088e8e0eff
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/logic/minecraft/flame/FileResolvingTask.cpp
View File

@ -48,12 +48,11 @@ void Flame::FileResolvingTask::netJobFinished()
continue; continue;
} }
out.fileName = Json::requireString(obj, "FileNameOnDisk"); out.fileName = Json::requireString(obj, "FileNameOnDisk");
auto urlString = Json::requireString(obj, "DownloadURL"); QString rawUrl = Json::requireString(obj, "DownloadURL");
urlString.replace(' ', "%20"); out.url = QUrl(rawUrl, QUrl::TolerantMode);
out.url = QUrl(urlString, QUrl::StrictMode);
if(!out.url.isValid()) if(!out.url.isValid())
{ {
throw "Perkele!"; throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
} }
// This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience // This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience
// It is also optional // It is also optional