fix: 修复安装不成功时,关闭主窗口会直接退出,且重启后没有记录的问题

由于安装操作在线程中异步执行,原始逻辑中仅判断下载完成后就检测是否还有后续任务,存在安装未结束就退出的情况

Log: 调整判断后续下载任务位置到槽函数中,每个任务安装完成结果信号触发后优先判断安装是否成功,再判断是否需要退出
This commit is contained in:
zty199 2023-03-04 22:42:08 +08:00
parent 1543d75339
commit b99225bd3c
4 changed files with 34 additions and 22 deletions

@ -64,9 +64,9 @@ QString DownloadItem::getName()
/***************************************************************
* @brief
* @param
* @param
* @note -1
* @Sample usage: DownloadItem::install(0);
* @Sample usage: DownloadItem::install(0);
**************************************************************/
int DownloadItem::readyInstall()
{
@ -110,9 +110,9 @@ void DownloadItem::setSpeed(QString s)
/***************************************************************
* @brief
* @param int t, t为安装方式 0,1,2
* @param int t, t为安装方式 0,1,2
* @note
* @Sample usage: DownloadItem::install(0);
* @Sample usage: DownloadItem::install(0);
**************************************************************/
void DownloadItem::install(int t)
{
@ -165,9 +165,9 @@ void DownloadItem::on_pushButton_3_clicked()
/***************************************************************
* @brief
* @param int t, t为安装方式 0,1,2
* @param int t, t为安装方式 0,1,2
* @note
* @Sample usage: slotAsyncInstall(0);
* @Sample usage: slotAsyncInstall(0);
**************************************************************/
void DownloadItem::slotAsyncInstall(int t)
{
@ -238,5 +238,5 @@ void DownloadItem::slotAsyncInstall(int t)
ui->widget_spinner->hide();
DownloadItem::isInstall = false;
emit finished();
emit finished(error == 0 && !haveError && !notRoot);
}

@ -62,7 +62,7 @@ private slots:
void slotAsyncInstall(int t);
signals:
void finished();
void finished(bool success);
};
#endif // DOWNLOADITEM_H

@ -91,10 +91,14 @@ DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QStrin
{
return nullptr;
}
urList.append(downloadurl);
allDownload += 1;
toDownload += 1;
DownloadItem *di = new DownloadItem;
connect(di, &DownloadItem::finished, this, &DownloadListWidget::slotInstallFinished, Qt::QueuedConnection);
dlist << downloadurl;
downloaditemlist << di;
di->setName(name);
@ -167,22 +171,9 @@ void DownloadListWidget::httpFinished() // 完成下载
{
continue;
}
toDownload -= 1; // 安装完以后减少待安装数目
qDebug() << "Download: 还没有下载的数目:" << toDownload;
if (toDownload == 0)
{
Application *app = qobject_cast<Application *>(qApp);
MainWindow *mainWindow = app->mainWindow();
if (mainWindow->isCloseWindowAnimation() == true)
{
qDebug() << "Download: 后台安装结束,退出程序";
qApp->quit();
}
}
downloaditemlist[nowDownload - 1]->free = true;
emit downloadFinished();
if (nowDownload < allDownload)
{
// 如果有排队则下载下一个
@ -241,3 +232,23 @@ void DownloadListWidget::on_pushButton_clicked()
{
QDesktopServices::openUrl(QUrl("file:///tmp/spark-store", QUrl::TolerantMode));
}
void DownloadListWidget::slotInstallFinished(bool success)
{
// NOTE: 仅在安装成功后判断是否需要退出后台
if (success) {
toDownload -= 1; // 安装完以后减少待安装数目
qDebug() << "Download: 还没有下载的数目:" << toDownload;
if (toDownload == 0)
{
Application *app = qobject_cast<Application *>(qApp);
MainWindow *mainWindow = app->mainWindow();
if (mainWindow->isCloseWindowAnimation() == true)
{
qDebug() << "Download: 后台安装结束,退出程序";
qApp->quit();
}
}
}
}

@ -60,6 +60,7 @@ signals:
private slots:
void on_pushButton_clicked();
void slotInstallFinished(bool success);
};
#endif // DOWNLOADLISTWIDGET_H