mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: CF import and Modrinth export

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-10-04 22:37:56 +03:00
parent b119cc04df
commit 8acc52b1ab
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
launcher/InstanceImportTask.cpp
View file

@ -113,18 +113,26 @@ QString InstanceImportTask::getRootFromZip(QStringList files)
if (!isRunning()) {
return {};
}
auto cleanPath = [](QString path) {
if (path == ".")
return QString();
QString result = path;
if (result.startsWith("./"))
result = result.mid(2);
return result;
};
for (auto&& fileName : files) {
setDetails(fileName);
QFileInfo fileInfo(fileName);
if (fileInfo.fileName() == "instance.cfg") {
qDebug() << "MultiMC:" << true;
m_modpackType = ModpackType::MultiMC;
return fileInfo.path();
return cleanPath(fileInfo.path());
}
if (fileInfo.fileName() == "manifest.json") {
qDebug() << "Flame:" << true;
m_modpackType = ModpackType::Flame;
return fileInfo.path();
return cleanPath(fileInfo.path());
}
QCoreApplication::processEvents();
}

2
launcher/archive/ArchiveWriter.cpp
View file

@ -56,7 +56,7 @@ bool ArchiveWriter::open()
} else if (lowerName.endsWith(".tar.xz") || lowerName.endsWith(".txz")) {
archive_write_set_format_pax_restricted(m_archive);
archive_write_add_filter_xz(m_archive);
} else if (lowerName.endsWith(".zip") || lowerName.endsWith(".jar")) {
} else if (lowerName.endsWith(".zip") || lowerName.endsWith(".jar") || lowerName.endsWith(".mrpack")) {
archive_write_set_format_zip(m_archive);
} else if (lowerName.endsWith(".tar")) {
archive_write_set_format_pax_restricted(m_archive);