fix: tip for installation process

Add the wine pre-depends flag function; Add monitoring and tips for UAB file changes; Adjust the hierarchical signature verification dialog. Log: Fix tips for installation process.
linuxdeepin · Sep 26, 2024 · 9308cf6 · 9308cf6
1 parent 50608f9
commit 9308cf6
Show file tree

Hide file tree

Showing 22 changed files with 303 additions and 124 deletions.
diff --git a/src/deb-installer/manager/packagesmanager.cpp b/src/deb-installer/manager/packagesmanager.cpp
@@ -213,10 +213,10 @@ PackageDependsStatus PackagesManager::checkDependsStatus(const QString &package_
                     }
                 }
             }
-            installWineDepends = false;  // 标记wine依赖下载线程开启
-            isDependsExists = false;     // 标记多架构依赖冲突
-            m_pair.first.clear();        // 清空available依赖
-            m_pair.second.clear();       // 清空broken依赖
+            GlobalStatus::setWinePreDependsInstalling(false);  // mark wine dependent download thread start
+            isDependsExists = false;                           // mark multi-schema dependency conflicts
+            m_pair.first.clear();                              // clear available dependencies
+            m_pair.second.clear();                             // clear the broken dependency
             if (m_dependsPackages.contains(m_currentPkgMd5))
                 m_dependsPackages.remove(m_currentPkgMd5);
 
@@ -687,13 +687,16 @@ void PackagesManager::slotDealDependResult(int iAuthRes, int iIndex, const QStri
             if (!m_errorIndex.contains(m_dependInstallMark[num]))
                 m_errorIndex.insert(m_dependInstallMark[num], iAuthRes);
         }
-        if (installWineDepends) {  // 下载wine依赖失败时，考虑出现依赖缺失的情况
+
+        // If the download of a wine dependency fails, might be the dependency is missing
+        if (GlobalStatus::winePreDependsInstalling()) {
             qInfo() << "check wine depends again !" << iIndex;
             getPackageDependsStatus(iIndex);
             if (!m_dependsPackages.isEmpty()) {
                 qInfo() << m_dependsPackages.size() << m_dependsPackages.value(m_currentPkgMd5).second.size();
-                if (m_preparedPackages.size() > 1)
-                    installWineDepends = false;
+                if (m_preparedPackages.size() > 1) {
+                    GlobalStatus::setWinePreDependsInstalling(false);
+                }
             }
         }
         emit signalEnableCloseButton(true);
@@ -808,10 +811,11 @@ PackageDependsStatus PackagesManager::getPackageDependsStatus(const int index)
                     }
                 }
             }
-            installWineDepends = false;  // 标记wine依赖下载线程开启
-            isDependsExists = false;     // 标记多架构依赖冲突
-            m_pair.first.clear();        // 清空available依赖
-            m_pair.second.clear();       // 清空broken依赖
+
+            GlobalStatus::setWinePreDependsInstalling(false);  // mark wine dependent download thread start
+            isDependsExists = false;                           // mark multi-schema dependency conflicts
+            m_pair.first.clear();                              // clear available dependencies
+            m_pair.second.clear();                             // clear the broken dependency
             if (m_dependsPackages.contains(m_currentPkgMd5))
                 m_dependsPackages.remove(m_currentPkgMd5);
 
@@ -828,8 +832,10 @@ PackageDependsStatus PackagesManager::getPackageDependsStatus(const int index)
                         break;
                     }
 
-                    if (!m_dependInstallMark.contains(currentPackageMd5)) {  // 更换判断依赖错误的标记
-                        installWineDepends = true;
+                    if (!m_dependInstallMark.contains(currentPackageMd5)) { 
+                        // replace the marker that the depends error
+                        GlobalStatus::setWinePreDependsInstalling(true);
+
                         if (!m_installWineThread->isRunning()) {
                             m_dependInstallMark.append(currentPackageMd5);  // 依赖错误的软件包的标记 更改为md5取代验证下标
                             qInfo() << "PackagesManager:"

diff --git a/src/deb-installer/manager/packagesmanager.h b/src/deb-installer/manager/packagesmanager.h
@@ -550,8 +550,6 @@ private slots:
 private:
     AddPackageThread *m_pAddPackageThread = nullptr;  // 添加包的线程
 
-    bool installWineDepends = false;
-
     bool isDependsExists = false;
 
     int m_validPackageCount = 0;

diff --git a/src/deb-installer/model/abstract_package_list_model.h b/src/deb-installer/model/abstract_package_list_model.h
@@ -75,6 +75,8 @@ class AbstractPackageListModel : public QAbstractListModel
 
     // raw output of install/uninstall failures
     virtual QString lastProcessError() = 0;
+    // a package signature verification fails
+    virtual bool containsSignatureFailed() const = 0;
 
     // trigger install / uninstall
     Q_SLOT virtual bool slotInstallPackages() = 0;

diff --git a/src/deb-installer/model/deblistmodel.cpp b/src/deb-installer/model/deblistmodel.cpp
@@ -11,6 +11,7 @@
 #include "utils/utils.h"
 #include "utils/hierarchicalverify.h"
 #include "singleInstallerApplication.h"
+#include "view/widgets/error_notify_dialog_helper.h"
 
 #include <DDialog>
 #include <DSysInfo>
@@ -211,7 +212,7 @@ void DebListModel::slotDealDependResult(int authType, int dependIndex, const QSt
         case DebListModel::AuthDependsErr:  // 安装失败后，状态的修改由debinstaller进行处理
             break;
         case DebListModel::VerifyDependsErr:  // 依赖包分级管控验证签名失败，弹出分级设置提示框
-            showHierarchicalVerifyWindow();
+            ErrorNotifyDialogHelper::showHierarchicalVerifyWindow();
             break;
         default:
             break;
@@ -322,6 +323,7 @@ bool DebListModel::slotInstallPackages()
     m_operatingIndex = 0;               // 初始化当前操作的index
     m_operatingStatusIndex = 0;
     m_operatingPackageMd5 = m_packageMd5[m_operatingIndex];
+    m_hierarchicalVerifyError = false;
 
     // start first
     initRowStatus();  // 初始化包的操作状态
@@ -342,6 +344,7 @@ bool DebListModel::slotUninstallPackage(int index)
     m_operatingPackageMd5 = m_packageMd5[m_operatingIndex];
     // fix bug : 卸载失败时不提示卸载失败。
     m_operatingStatusIndex = index;  // 刷新操作状态的index
+    m_hierarchicalVerifyError = false;
 
     DebFile debFile(m_packagesManager->package(m_operatingIndex));  // 获取到包
     if (!debFile.isValid())
@@ -455,6 +458,11 @@ QString DebListModel::lastProcessError()
     return "failed";
 }
 
+bool DebListModel::containsSignatureFailed() const
+{
+    return m_hierarchicalVerifyError;
+}
+
 QString DebListModel::checkPackageValid(const QString &package_path)
 {
     return m_packagesManager->checkPackageValid(QStringList(package_path));
@@ -528,12 +536,6 @@ void DebListModel::bumpInstallIndex()
         emit signalWorkerFinished();           // 发送安装完成信号
         emit signalWholeProgressChanged(100);  // 修改安装进度
         emit signalCurrentPacakgeProgressChanged(100);
-
-        // 安装结束，弹出分级管控信息提示框
-        if (m_hierarchicalVerifyError) {
-            showHierarchicalVerifyWindow();
-            m_hierarchicalVerifyError = false;
-        }
         return;
     }
     ++m_operatingStatusIndex;
@@ -1558,58 +1560,6 @@ void DebListModel::showProhibitWindow()
     connect(Ddialog, &DDialog::rejected, exitOperate);
 }
 
-/**
-   @brief 弹出分级管控安全等级设置引导提示窗口
- */
-void DebListModel::showHierarchicalVerifyWindow()
-{
-    if (!HierarchicalVerify::instance()->isValid()) {
-        return;
-    }
-
-    DDialog *dialog = new DDialog();
-    // 限制显示宽度
-    dialog->setFixedWidth(380);
-    dialog->setFocusPolicy(Qt::TabFocus);
-    dialog->setModal(true);
-    dialog->setWindowFlag(Qt::WindowStaysOnTopHint);
-
-    // 设置弹出窗口显示的信息
-    dialog->setTitle(tr("Unable to install"));
-    dialog->setMessage(tr("This package does not have a valid digital signature and has been blocked from installing/running. "
-                          "Go to Security Center > Tools > App Security to change the settings."));
-    dialog->setIcon(QIcon::fromTheme("di_popwarning"));
-    dialog->addButton(QString(tr("Cancel", "button")), false, DDialog::ButtonNormal);
-    dialog->addButton(QString(tr("Proceed", "button")), true, DDialog::ButtonRecommend);
-    dialog->show();
-
-    // 拷贝自 ddialog.cpp 用于设置默认对话框高度，避免在大字号/高缩放比下显示不全，在 show() 之后调用。
-    QLabel *msgLabel = dialog->findChild<QLabel *>("MessageLabel");
-    if (msgLabel) {
-        auto dialogStyle = dialog->style();
-        if (dialogStyle) {
-            QSize sz =
-                dialogStyle->itemTextRect(msgLabel->fontMetrics(), msgLabel->rect(), Qt::TextWordWrap, false, msgLabel->text())
-                    .size();
-            msgLabel->setMinimumHeight(qMax(sz.height(), msgLabel->sizeHint().height()));
-        }
-    }
-
-    QPushButton *btnPorceed = qobject_cast<QPushButton *>(dialog->getButton(1));
-    btnPorceed->setFocusPolicy(Qt::TabFocus);
-    btnPorceed->setFocus();
-
-    // 窗口退出操作，包括所有可以退出此窗口的操作
-    std::function<void(void)> exitOperate = [dialog]() { dialog->deleteLater(); };
-
-    connect(dialog, &DDialog::finished, [dialog](int result) {
-        if (QDialog::Accepted == result) {
-            HierarchicalVerify::instance()->proceedDefenderSafetyPage();
-        }
-        dialog->deleteLater();
-    });
-}
-
 bool DebListModel::checkBlackListApplication()
 {
     PackageDependsStatus dependsStat = m_packagesManager->getPackageDependsStatus(m_operatingIndex);

diff --git a/src/deb-installer/model/deblistmodel.h b/src/deb-installer/model/deblistmodel.h
@@ -167,6 +167,7 @@ class DebListModel : public AbstractPackageListModel
     QStringList getPackageInfo(const QString &package_path) override;
 
     QString lastProcessError() override;
+    bool containsSignatureFailed() const override;
 
     /**
      * @brief checkPackageValid 查找指定包信息
@@ -399,11 +400,6 @@ private slots:
      */
     void showProhibitWindow();
 
-    /**
-     * @brief showHierarchicalVerifyWindow 弹出分级管控安全等级设置引导提示窗口
-     */
-    void showHierarchicalVerifyWindow();
-
     /**
      * @brief 检查当前将要安装的包是否在黑名单中。
      *

diff --git a/src/deb-installer/model/proxy_package_list_model.cpp b/src/deb-installer/model/proxy_package_list_model.cpp
@@ -128,6 +128,14 @@ QString ProxyPackageListModel::lastProcessError()
     return errorMessage;
 }
 
+bool ProxyPackageListModel::containsSignatureFailed() const
+{
+    auto findItr = std::find_if(m_packageModels.begin(), m_packageModels.end(), [](const ModelInfo &info) {
+        return info.model->containsSignatureFailed();
+    });
+    return findItr != m_packageModels.end();
+}
+
 bool ProxyPackageListModel::slotInstallPackages()
 {
     if (!isWorkerPrepare()) {

diff --git a/src/deb-installer/model/proxy_package_list_model.h b/src/deb-installer/model/proxy_package_list_model.h
@@ -27,6 +27,7 @@ class ProxyPackageListModel : public AbstractPackageListModel
     Pkg::DependsStatus checkDependsStatus(const QString &packagePath) override;
     QStringList getPackageInfo(const QString &packagePath) override;
     QString lastProcessError() override;
+    bool containsSignatureFailed() const override;
 
     Q_SLOT bool slotInstallPackages() override;
     Q_SLOT bool slotUninstallPackage(int index) override;

diff --git a/src/deb-installer/uab/uab_package.cpp b/src/deb-installer/uab/uab_package.cpp
@@ -8,6 +8,11 @@
 
 namespace Uab {
 
+/**
+ * @class UabPackage
+ * @brief Uab package, contains package information and runtime status.
+ *        Store version, install status, operation status, error code, and error message.
+ */
 UabPackage::UabPackage(const UabPkgInfo::Ptr &metaPtr)
     : m_metaPtr(metaPtr)
 {
@@ -21,7 +26,7 @@ const UabPkgInfo::Ptr &UabPackage::info() const
 
 bool UabPackage::isValid() const
 {
-    if (!m_metaPtr) {
+    if (!m_metaPtr || !m_exists) {
         return false;
     }
 
@@ -50,6 +55,16 @@ void UabPackage::setProcessError(Pkg::ErrorCode err, QString errorString)
     m_processError = errorString;
 }
 
+bool UabPackage::fileExists() const
+{
+    return m_exists;
+}
+
+void UabPackage::markNotExists()
+{
+    m_exists = false;
+}
+
 Pkg::DependsStatus UabPackage::dependsStatus() const
 {
     return m_dependsStatus;
@@ -113,6 +128,9 @@ void UabPackage::reset()
     m_installedVersion.clear();
     m_installStatus = Pkg::NotInstalled;
 
+    m_errorCode = Pkg::NoError;
+    m_processError.clear();
+
     if (!Uab::UabBackend::instance()->linglongExists()) {
         setDependsStatus(Pkg::DependsBreak);
     } else {

diff --git a/src/deb-installer/uab/uab_package.h b/src/deb-installer/uab/uab_package.h
@@ -21,6 +21,8 @@ class UabPackage
     bool isValid() const;
     void setDependsStatus(Pkg::DependsStatus status);
     void setProcessError(Pkg::ErrorCode err, QString errorString);
+    bool fileExists() const;
+    void markNotExists();
 
     Pkg::DependsStatus dependsStatus() const;
     Pkg::PackageInstallStatus installStatus() const;
@@ -40,6 +42,8 @@ class UabPackage
 private:
     Uab::UabPkgInfo::Ptr m_metaPtr;
 
+    bool m_exists{true};
+
     Pkg::DependsStatus m_dependsStatus{Pkg::DependsOk};            // package's depends info
     Pkg::PackageInstallStatus m_installStatus{Pkg::NotInstalled};  // version check
     Pkg::PackageOperationStatus m_operationStatus{Pkg::Prepare};   // status for operation flow