feat: compatibility mode support debconf and verify.

Adapt compatibility mode: Support DebConf templates config; Support hierarchical verify. Log: Compatibility mode support DebConf and verify. Influence: compatible
linuxdeepin · Oct 30, 2024 · 4582719 · 4582719
1 parent 74843aa
commit 4582719
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 13 deletions.
diff --git a/src/deb-installer/compatible/compatible_process_controller.cpp b/src/deb-installer/compatible/compatible_process_controller.cpp
@@ -57,6 +57,9 @@ bool CompatibleProcessController::install(const Deb::DebPackage::Ptr &package)
     m_outputList.clear();
     m_currentPackage = package;
 
+    // reset state
+    m_currentPackage->setError(Pkg::NoError, {});
+
     // For historical reasons, the first argument in programArguments is the
     // name of the program to execute, so create a list consisting of all
     // but the first argument to pass to setProgram()
@@ -94,6 +97,9 @@ bool CompatibleProcessController::uninstall(const Deb::DebPackage::Ptr &package)
     m_outputList.clear();
     m_currentPackage = package;
 
+    // reset state
+    m_currentPackage->setError(Pkg::NoError, {});
+
     // For historical reasons, the first argument in programArguments is the
     // name of the program to execute, so create a list consisting of all
     // but the first argument to pass to setProgram()
@@ -115,6 +121,19 @@ bool CompatibleProcessController::uninstall(const Deb::DebPackage::Ptr &package)
     return true;
 }
 
+bool CompatibleProcessController::containTemplates() const
+{
+    return m_currentPackage && m_currentPackage->containsTemplates();
+}
+
+void CompatibleProcessController::writeConfigData(const QString &configData)
+{
+    if (m_process) {
+        m_process->pty()->write(configData.toUtf8());
+        m_process->pty()->write("\n");
+    }
+}
+
 bool CompatibleProcessController::ensureProcess()
 {
     if (!m_process) {

diff --git a/src/deb-installer/compatible/compatible_process_controller.h b/src/deb-installer/compatible/compatible_process_controller.h
@@ -29,6 +29,9 @@ class CompatibleProcessController : public QObject
     [[nodiscard]] bool install(const Deb::DebPackage::Ptr &package);
     [[nodiscard]] bool uninstall(const Deb::DebPackage::Ptr &package);
 
+    [[nodiscard]] bool containTemplates() const;
+    void writeConfigData(const QString &configData);
+
     Q_SIGNAL void processStart();
     Q_SIGNAL void processFinished(bool success);
     Q_SIGNAL void processOutput(const QString &output);

diff --git a/src/deb-installer/model/deblistmodel.cpp b/src/deb-installer/model/deblistmodel.cpp
@@ -1519,6 +1519,11 @@ void DebListModel::slotConfigReadOutput(const char *buffer, int length, bool isC
 
 void DebListModel::slotConfigInputWrite(const QString &str)
 {
+    if (supportCompatible() && m_compProcessor && m_compProcessor->isRunning()) {
+        m_compProcessor->writeConfigData(str);
+        return;
+    }
+
     m_procInstallConfig->pty()->write(str.toUtf8());  // 将用户输入的配置项写入到配置安装进程中。
     m_procInstallConfig->pty()->write("\n");          // 写入换行，配置生效
 }
@@ -1686,18 +1691,29 @@ void DebListModel::ensureCompatibleProcessor()
     if (!m_compProcessor) {
         m_compProcessor.reset(new Compatible::CompatibleProcessController);
 
-        connect(m_compProcessor.data(),
-                &Compatible::CompatibleProcessController::processOutput,
-                this,
-                &DebListModel::signalAppendOutputInfo);
+        connect(
+            m_compProcessor.data(), &Compatible::CompatibleProcessController::processOutput, this, [this](const QString &output) {
+                Q_EMIT signalAppendOutputInfo(output);
+                if (m_compProcessor->containTemplates()) {
+                    configWindow->appendTextEdit(output);
+                    configWindow->show();
+                }
+            });
+
         connect(m_compProcessor.data(), &Compatible::CompatibleProcessController::progressChanged, this, [this](float progress) {
             const int progressValue =
                 static_cast<int>((100. / m_packagesManager->m_preparedPackages.size()) * (m_operatingIndex + progress / 100.));
             Q_EMIT signalWholeProgressChanged(progressValue);
 
-            Q_EMIT signalCurrentPacakgeProgressChanged(progress);
+            Q_EMIT signalCurrentPacakgeProgressChanged(static_cast<int>(progress));
         });
+
         connect(m_compProcessor.data(), &Compatible::CompatibleProcessController::processFinished, this, [this](bool success) {
+            if (configWindow->isVisible()) {
+                configWindow->hide();
+                configWindow->clearTexts();
+            }
+
             if (success) {
                 refreshOperatingPackageStatus(Pkg::Success);
             } else {
@@ -1712,7 +1728,7 @@ void DebListModel::ensureCompatibleProcessor()
 
                     if (Pkg::ConfigAuthCancel == pkgPtr->errorCode()) {
                         // notify UI reset, cancel current flow
-                        setWorkerStatus(WorkerPrepare);
+                        m_workerStatus = WorkerPrepare;
                         Q_EMIT signalAuthCancel();
                         refreshOperatingPackageStatus(Pkg::Failed);
                         return;

diff --git a/src/deb-installer/model/proxy_package_list_model.cpp b/src/deb-installer/model/proxy_package_list_model.cpp
@@ -211,7 +211,6 @@ bool ProxyPackageListModel::nextModelInstall()
     if (m_procModelIndex >= m_packageModels.count()) {
         setWorkerStatus(WorkerFinished);
         Q_EMIT signalWholeProgressChanged(100);
-        setWorkerStatus(WorkerFinished);
         return true;
     }
 

diff --git a/src/deb-installer/utils/deb_package.cpp b/src/deb-installer/utils/deb_package.cpp
@@ -70,7 +70,11 @@ PackageDependsStatus &DebPackage::dependsStatus()
 
 bool DebPackage::containsTemplates()
 {
-    return Utils::checkPackageContainsDebConf(m_debFilePtr->filePath());
+    if (UnknownTemplates == m_templatesState) {
+        m_templatesState = Utils::checkPackageContainsDebConf(m_debFilePtr->filePath()) ? ContainTemplates : NoTemplates;
+    }
+
+    return m_templatesState == ContainTemplates;
 }
 
 void DebPackage::setError(int code, const QString &string)

diff --git a/src/deb-installer/utils/deb_package.h b/src/deb-installer/utils/deb_package.h
@@ -68,6 +68,13 @@ class DebPackage
 
     QSharedPointer<Compatible::CompPkgInfo> m_compInfoPtr;
 
+    enum TemplatesState {
+        UnknownTemplates,
+        ContainTemplates,
+        NoTemplates,
+    };
+    TemplatesState m_templatesState{UnknownTemplates};
+
     Q_DISABLE_COPY(DebPackage)
 };
 

diff --git a/src/deb-installer/view/pages/singleinstallpage.cpp b/src/deb-installer/view/pages/singleinstallpage.cpp
@@ -556,7 +556,7 @@ void SingleInstallPage::initConnections()
     connect(m_confirmButton, &DPushButton::clicked, this, [this]() {
         QModelIndex index = m_packagesModel->index(0);
         const int dependsStat = index.data(DebListModel::PackageDependsStatusRole).toInt();
-        if (Pkg::CompatibleNotInstalled == dependsStat) {
+        if (Finished != m_operate && Pkg::CompatibleNotInstalled == dependsStat) {
             // requset install package to compatible.
             m_targetRootfsOsName = m_compatibleBox->currentText();
             const QString targetRootfs = m_compatibleBox->currentData().toString();
@@ -882,6 +882,9 @@ void SingleInstallPage::slotWorkerFinished()
     }
     if (!m_upDown)
         m_infoControlButton->setShrinkTips(tr("Collapse"));
+
+    // mark down
+    m_operate = Finished;
 }
 
 void SingleInstallPage::slotWorkerProgressChanged(const int progress)

diff --git a/src/deb-installer/view/pages/singleinstallpage.h b/src/deb-installer/view/pages/singleinstallpage.h
@@ -83,13 +83,14 @@ public slots:
 
 private:
     /**
-     * @brief The Operate enum 当前进行的操作
+     * @brief The current operate
      */
     enum Operate {
         Unknown,
-        Install,    // 安装
-        Uninstall,  // 卸载
-        Reinstall   // 重新安装
+        Install,
+        Uninstall,
+        Reinstall,
+        Finished,  // install/uninstall finished
     };
 
 private: