CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed line

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-08-17 00:23:53 +03:00
parent c94ee67077
commit 5e2d1ffdfb
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/modplatform/flame/FlameAPI.cpp
View File

@ -204,7 +204,7 @@ Task::Ptr FlameAPI::getFiles(const QStringList& fileIds, std::shared_ptr<QByteAr
return netJob; return netJob;
} }
Task::Ptr FlameAPI::getFile(const QString& addonId, const QString& fileId, std::shared_ptr<QByteArray>response) const Task::Ptr FlameAPI::getFile(const QString& addonId, const QString& fileId, std::shared_ptr<QByteArray> response) const
{ {
auto netJob = makeShared<NetJob>(QString("Flame::GetFile"), APPLICATION->network()); auto netJob = makeShared<NetJob>(QString("Flame::GetFile"), APPLICATION->network());
netJob->addNetAction( netJob->addNetAction(

16
launcher/ui/MainWindow.cpp
View File

@ -984,7 +984,7 @@ void MainWindow::processURLs(QList<QUrl> urls)
QUrl local_url; QUrl local_url;
if (!url.isLocalFile()) { // download the remote resource and identify if (!url.isLocalFile()) { // download the remote resource and identify
QUrl dl_url; QUrl dl_url;
if(url.scheme() == "curseforge") { if (url.scheme() == "curseforge") {
// need to find the download link for the modpack / resource // need to find the download link for the modpack / resource
// format of url curseforge://install?addonId=IDHERE&fileId=IDHERE // format of url curseforge://install?addonId=IDHERE&fileId=IDHERE
QUrlQuery query(url); QUrlQuery query(url);
@ -1027,19 +1027,18 @@ void MainWindow::processURLs(QList<QUrl> urls)
resource_name = Json::ensureString(data, "displayName", dl_file.completeBaseName(), "displayName"); resource_name = Json::ensureString(data, "displayName", dl_file.completeBaseName(), "displayName");
}); });
{ // drop stack { // drop stack
ProgressDialog dlUrlDialod(this); ProgressDialog dlUrlDialod(this);
dlUrlDialod.setSkipButton(true, tr("Abort")); dlUrlDialod.setSkipButton(true, tr("Abort"));
dlUrlDialod.execWithTask(job.get()); dlUrlDialod.execWithTask(job.get());
} }
} else { } else {
dl_url = url; dl_url = url;
} }
if (!dl_url.isValid()) { if (!dl_url.isValid()) {
continue; // no valid url to download this resource continue; // no valid url to download this resource
} }
const QString path = dl_url.host() + '/' + dl_url.path(); const QString path = dl_url.host() + '/' + dl_url.path();
@ -1050,17 +1049,18 @@ void MainWindow::processURLs(QList<QUrl> urls)
auto archivePath = entry->getFullPath(); auto archivePath = entry->getFullPath();
bool dl_success = false; bool dl_success = false;
connect(dl_job.get(), &Task::failed, this, [this](QString reason){CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); }); connect(dl_job.get(), &Task::failed, this,
connect(dl_job.get(), &Task::succeeded, this, [&dl_success]{dl_success = true;}); [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
connect(dl_job.get(), &Task::succeeded, this, [&dl_success] { dl_success = true; });
{ // drop stack { // drop stack
ProgressDialog dlUrlDialod(this); ProgressDialog dlUrlDialod(this);
dlUrlDialod.setSkipButton(true, tr("Abort")); dlUrlDialod.setSkipButton(true, tr("Abort"));
dlUrlDialod.execWithTask(dl_job.get()); dlUrlDialod.execWithTask(dl_job.get());
} }
if (!dl_success) { if (!dl_success) {
continue; // no local file to identify continue; // no local file to identify
} }
local_url = QUrl::fromLocalFile(archivePath); local_url = QUrl::fromLocalFile(archivePath);

1
launcher/ui/pages/modplatform/ImportPage.cpp
View File

@ -114,7 +114,6 @@ void ImportPage::updateState()
bool isMRPack = fi.suffix() == "mrpack"; bool isMRPack = fi.suffix() == "mrpack";
if (fi.exists() && (isZip || isMRPack)) { if (fi.exists() && (isZip || isMRPack)) {
QFileInfo fi(url.fileName());
auto extra_info = QMap(m_extra_info); auto extra_info = QMap(m_extra_info);
qDebug() << "Pack Extra Info" << extra_info << m_extra_info; qDebug() << "Pack Extra Info" << extra_info << m_extra_info;
dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this, std::move(extra_info))); dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this, std::move(extra_info)));