Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #608 from timoreo22/feature/curseforge-fix

Browse Source 
Very Temporary Fix for curseforge
This commit is contained in:
timoreo22 2022-05-21 06:34:43 +02:00 committed by GitHub
commit 92e8aaf36f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 144 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
launcher/modplatform/flame/FileResolvingTask.cpp
View File

@ -31,7 +31,21 @@ void Flame::FileResolvingTask::netJobFinished()
for (auto& bytes : results) { for (auto& bytes : results) {
auto& out = m_toProcess.files[index]; auto& out = m_toProcess.files[index];
try { try {
failed &= (!out.parseFromBytes(bytes)); 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;
} catch (const JSONValidationError& e) { } catch (const JSONValidationError& e) {
qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:"; qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:";
qCritical() << e.cause(); qCritical() << e.cause();

9
launcher/modplatform/flame/FlameModIndex.cpp
View File

@ -56,8 +56,15 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
file.fileId = Json::requireInteger(obj, "id"); file.fileId = Json::requireInteger(obj, "id");
file.date = Json::requireString(obj, "fileDate"); file.date = Json::requireString(obj, "fileDate");
file.version = Json::requireString(obj, "displayName"); file.version = Json::requireString(obj, "displayName");
file.downloadUrl = Json::requireString(obj, "downloadUrl");
file.fileName = Json::requireString(obj, "fileName"); file.fileName = Json::requireString(obj, "fileName");
file.downloadUrl = Json::ensureString(obj, "downloadUrl", "");
if(file.downloadUrl.isEmpty()){
//FIXME : HACK, MAY NOT WORK FOR LONG
file.downloadUrl = QString("https://media.forgecdn.net/files/%1/%2/%3")
.arg(QString::number(QString::number(file.fileId.toInt()).leftRef(4).toInt())
,QString::number(QString::number(file.fileId.toInt()).rightRef(3).toInt())
,QUrl::toPercentEncoding(file.fileName));
}
unsortedVersions.append(file); unsortedVersions.append(file);
} }

15
launcher/modplatform/flame/PackManifest.cpp
View File

@ -71,11 +71,6 @@ bool Flame::File::parseFromBytes(const QByteArray& bytes)
fileName = Json::requireString(obj, "fileName"); fileName = Json::requireString(obj, "fileName");
QString rawUrl = Json::requireString(obj, "downloadUrl");
url = QUrl(rawUrl, QUrl::TolerantMode);
if (!url.isValid()) {
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
type = File::Type::SingleFile; type = File::Type::SingleFile;
@ -87,7 +82,17 @@ bool Flame::File::parseFromBytes(const QByteArray& bytes)
// this is probably a mod, dunno what else could modpacks download // this is probably a mod, dunno what else could modpacks download
targetFolder = "mods"; targetFolder = "mods";
} }
QString rawUrl = Json::ensureString(obj, "downloadUrl");
if(rawUrl.isEmpty()){
//either there somehow is an emtpy string as a link, or it's null either way it's invalid
//soft failing
return false;
}
url = QUrl(rawUrl, QUrl::TolerantMode);
if (!url.isValid()) {
throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
}
resolved = true; resolved = true;
return true; return true;
} }

192
launcher/ui/pages/modplatform/flame/FlamePage.ui
View File

@ -1,90 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>FlamePage</class> <class>FlamePage</class>
<widget class="QWidget" name="FlamePage"> <widget class="QWidget" name="FlamePage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>837</width> <width>800</width>
<height>685</height> <height>600</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <widget class="QLabel" name="label_2">
<item row="1" column="0"> <property name="font">
<widget class="QListView" name="packView"> <font>
<property name="iconSize"> <italic>true</italic>
<size> </font>
<width>48</width> </property>
<height>48</height> <property name="text">
</size> <string>Note: CurseForge's API is very unreliable. CurseForge and some mod authors have disallowed downloading mods in third-party applications like PolyMC. As such, you may need to manually download some mods to be able to install a modpack.</string>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="alignment">
<enum>Qt::ScrollBarAlwaysOff</enum> <set>Qt::AlignCenter</set>
</property> </property>
<property name="alternatingRowColors"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="0">
<widget class="QTextBrowser" name="packDescription"> <layout class="QHBoxLayout">
<property name="openExternalLinks"> <item>
<bool>true</bool> <widget class="QLineEdit" name="searchEdit">
</property> <property name="placeholderText">
<property name="openLinks"> <string>Search and filter...</string>
<bool>true</bool> </property>
</property> </widget>
</widget> </item>
</item> <item>
</layout> <widget class="QPushButton" name="searchButton">
</item> <property name="text">
<item row="2" column="0" colspan="2"> <string>Search</string>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0"> </property>
<item row="0" column="2"> </widget>
<widget class="QComboBox" name="versionSelectionBox"/> </item>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Version selected:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="sortByBox"/>
</item>
</layout>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="searchButton">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLineEdit" name="searchEdit">
<property name="placeholderText">
<string>Search and filter...</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </item>
<tabstops> <item row="2" column="0">
<tabstop>searchEdit</tabstop> <layout class="QHBoxLayout">
<tabstop>searchButton</tabstop> <item>
<tabstop>packView</tabstop> <widget class="QListView" name="packView">
<tabstop>packDescription</tabstop> <property name="horizontalScrollBarPolicy">
<tabstop>sortByBox</tabstop> <enum>Qt::ScrollBarAlwaysOff</enum>
<tabstop>versionSelectionBox</tabstop> </property>
</tabstops> <property name="alternatingRowColors">
<resources/> <bool>true</bool>
<connections/> </property>
<property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="packDescription">
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="openLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout">
<item>
<widget class="QComboBox" name="sortByBox"/>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Version selected:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="versionSelectionBox"/>
</item>
</layout>
</item>
</layout>
</widget>
<tabstops>
<tabstop>packView</tabstop>
<tabstop>packDescription</tabstop>
<tabstop>sortByBox</tabstop>
<tabstop>versionSelectionBox</tabstop>
</tabstops>
<resources/>
<connections/>
</ui> </ui>

7
launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>837</width> <width>800</width>
<height>685</height> <height>600</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
@ -24,6 +24,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>