spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-12-15 21:32:05 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: 现在安装到ACE的软件包不会再报错了

Browse Source
This commit is contained in:
shenmo
2025-06-11 15:10:09 +08:00
parent fb6446292c
commit 05a5b89464
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/pages/appintopage.cpp
View File

@@ -151,24 +151,25 @@ void AppIntoPage::openUrl(const QUrl &url)
{
isInstalled = true;
QProcess isUpdate;
isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
<< "--show" << info["Pkgname"].toString());
isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
QString localVersion = isUpdate.readAllStandardOutput();
localVersion.replace("'", "");
// QProcess isUpdate;
// isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
// << "--show" << info["Pkgname"].toString());
// isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
// QString localVersion = isUpdate.readAllStandardOutput();
// localVersion.replace("'", "");
isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
{
isUpdated = true;
}
else
{
isUpdated = false;
}
isUpdate.close();
// isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
// isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
// if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
// {
// isUpdated = true;
// }
// else
// {
// isUpdated = false;
// }
// isUpdate.close();
isUpdated = true; //去掉直接点击升级的功能
}
else
{
@@ -586,11 +587,11 @@ void AppIntoPage::on_pushButton_3_clicked()
uninstall.waitForFinished(-1);
uninstall.close();
QProcess check;
check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
check.waitForFinished(-1);
// QProcess check;
// check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
// check.waitForFinished(-1);
if (check.exitCode() != 0 || check.exitStatus() != QProcess::NormalExit)
if (uninstall.exitCode() != 0 || uninstall.exitStatus() != QProcess::NormalExit)
{
ui->downloadButton->setText(tr("Download and Install"));
ui->pushButton_3->hide();
@@ -601,7 +602,7 @@ void AppIntoPage::on_pushButton_3_clicked()
ui->downloadButton->setEnabled(true);
ui->pushButton_3->setEnabled(true);
check.close();
// check.close();
});
}
@@ -617,4 +618,4 @@ void AppIntoPage::on_updateButton_clicked()
{
QString feedbackURL = "https://bbs.spark-app.store/";
QProcess::startDetached("xdg-open", QStringList{feedbackURL});
}
}

12
src/widgets/common/downloaditem.cpp
View File

@@ -216,11 +216,11 @@ void DownloadItem::slotAsyncInstall(int t)
}
}
QProcess isInstall;
isInstall.start("dpkg", QStringList() << "-s" << pkgName);
isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
if (error == 0 && !haveError)
// QProcess isInstall;
// isInstall.start("dpkg", QStringList() << "-s" << pkgName);
// isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
// int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
if ( !haveError)
{
ui->pushButton_install->hide();
Utils::sendNotification("spark-store", tr("Spark Store"), ui->label->text() + " " + tr("Installation complete."));
@@ -252,5 +252,5 @@ void DownloadItem::slotAsyncInstall(int t)
ui->widget_spinner->hide();
DownloadItem::isInstall = false;
emit finished(error == 0 && !haveError && !notRoot);
emit finished(!haveError && !notRoot);
}