fix: Delay archive loading in Wayland to fix dialog positioning (#385)

* fix: Delay archive loading in Wayland to fix dialog positioning

Delay first archive loading by 200ms in Wayland to allow window
positioning to complete before showing password dialogs. Prevents
dialogs from appearing at (0,0) when opening encrypted archives.

Log: fix bug

Bug: https://pms.uniontech.com/bug-view-355681.html

* Revert "fix(archive): tar.7z use QProcess pipeline instead of shell script"

This reverts commit 4310822.

* fix(compress): show tar filename during tar.7z compression

Display tar filename in progress when compressing tar.7z archives,
improving user experience by showing meaningful progress information.

压缩tar.7z时显示tar文件名，提升用户体验。

Log: tar.7z压缩时提示tar文件名
PMS: BUG-356753
Influence: 压缩tar.7z格式时，进度提示显示tar文件名，用户可以看到正在处理的归档文件名称

Author: LiHua000

3rdparty/cli7zplugin/cli7zplugin.cpp

@@ -151,9 +151,6 @@ bool Cli7zPlugin::isOpenFileFailed(const QString &line)
 void Cli7zPlugin::killProcess(bool emitFinished)
 {
     Q_UNUSED(emitFinished);
-    if (killTar7zPipelineIfActive()) {
-        return;
-    }
     if (!m_process) {
         return;
     }

3rdparty/interface/archiveinterface/cliinterface.cpp

@@ -470,47 +470,23 @@ PluginFinishType CliInterface::addFiles(const QList<FileEntry> &files, const Com
                                                 QFileInfo(m_strArchiveName).path(),
                                                 sRenameList);
 
-    if (options.bTar_7z) {   // 压缩tar.7z：用两个 QProcess 管道，避免 shell 拼接与密码特殊字符问题
+    if (options.bTar_7z) {   // 压缩tar.7z文件
         m_isTar7z = true;
-        m_filesSize = options.qTotalSize;
-        const QString archivePath = temp_archiveName.isEmpty() ? m_strArchiveName : temp_archiveName;
-        QStringList tarArgs = m_cliProps->getTar7zTarArgs(fileList, sRenameList);
-        QStringList sevenZArgs = m_cliProps->getTar7z7zArgs(archivePath, password, options.bHeaderEncryption,
-                                                           options.iCompressionLevel, options.strCompressionMethod,
-                                                           options.strEncryptionMethod, options.iVolumeSize);
-        QString tarPath = QStandardPaths::findExecutable(QStringLiteral("tar"));
-        QString sevenZPath = QStandardPaths::findExecutable(m_cliProps->property("addProgram").toString());
-        if (tarPath.isEmpty() || sevenZPath.isEmpty()) {
-            ret = false;
-        } else {
-            m_tar7z_7z = new QProcess();
-            m_tarProcess = new QProcess();
-            m_tarProcess->setStandardOutputProcess(m_tar7z_7z);
-            m_tar7z_7z->setProcessChannelMode(QProcess::MergedChannels);
-            connect(m_tar7z_7z, &QProcess::readyReadStandardOutput, this, [this]() { readStdout(); });
-            connect(m_tar7z_7z, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &CliInterface::processFinished);
-            m_stdOutData.clear();
-            m_isProcessKilled = false;
-            m_tarProcess->start(tarPath, tarArgs);
-            if (m_tarProcess->waitForStarted(5000)) {
-                m_tar7z_7z->start(sevenZPath, sevenZArgs);
-                // 不在此处 waitForStarted(7z)，避免 7z 等 stdin 时阻塞主线程导致卡死
-                ret = m_tar7z_7z->state() == QProcess::Starting || m_tar7z_7z->state() == QProcess::Running;
-                if (ret) {
-                    m_processId = m_tar7z_7z->processId();
-                    m_childProcessId = QVector<qint64>() << m_tarProcess->processId();
-                }
-                connect(m_tar7z_7z, &QProcess::errorOccurred, this, [this](QProcess::ProcessError) {
-                    if (m_tar7z_7z && m_tar7z_7z->state() == QProcess::NotRunning) {
-                        processFinished(-1, QProcess::CrashExit);
-                    }
-                });
-            } else {
-                ret = false;
-            }
-            if (!ret) {
-                deleteProcess();
+        m_filesSize = options.qTotalSize;   // 待压缩文件总大小
+        m_scriptPath = QDir::tempPath() + "/tempScript_" + QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch()) + ".sh";
+        QFile scriptFile(m_scriptPath);
+        if (scriptFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            QTextStream out(&scriptFile);
+            out << "#!/bin/bash\n";
+            for (const QString &arg : arguments) {
+                out << arg << "\n";
             }
+            scriptFile.close();
+            QProcess::execute("chmod", { "+x", m_scriptPath });
+            ret = runProcess(m_scriptPath, QStringList());
+        } else {
+            qWarning() << "Failed to create temporary script file.";
+            ret = false;
         }
     } else {
         QString processName = m_cliProps->property("addProgram").toString();
@@ -531,11 +507,7 @@ PluginFinishType CliInterface::addFiles(const QList<FileEntry> &files, const Com
         qInfo() << "mtp 压缩完成,现在开始移动";
         QStringList args_list;
         args_list << temp_archiveName << m_strArchiveName;
-        if (m_tar7z_7z) {
-            m_tar7z_7z->waitForFinished(-1);
-        } else if (m_process) {
-            m_process->waitForFinished();
-        }
+        m_process->waitForFinished();
         QProcess mover;
         ret = 0 == mover.execute("mv", args_list);
         ret = mover.exitCode() == QProcess::NormalExit;
@@ -823,53 +795,22 @@ bool CliInterface::runProcess(const QString &programName, const QStringList &arg
     return true;
 }
 
-bool CliInterface::killTar7zPipelineIfActive()
-{
-    if (!m_tar7z_7z) {
-        return false;
-    }
-    if (m_tarProcess && m_tarProcess->state() != QProcess::NotRunning) {
-        m_tarProcess->kill();
-    }
-    if (m_tar7z_7z->state() != QProcess::NotRunning) {
-        m_tar7z_7z->kill();
-    }
-    m_isProcessKilled = true;
-    return true;
-}
-
 void CliInterface::deleteProcess()
 {
-    if (m_tar7z_7z) {
-        m_tar7z_7z->blockSignals(true);
-        if (m_tar7z_7z->state() != QProcess::NotRunning) {
-            m_tar7z_7z->kill();
-            m_tar7z_7z->waitForFinished(500);
-        }
-        delete m_tar7z_7z;
-        m_tar7z_7z = nullptr;
-        if (m_tarProcess) {
-            m_tarProcess->blockSignals(true);
-            if (m_tarProcess->state() != QProcess::NotRunning) {
-                m_tarProcess->kill();
-                m_tarProcess->waitForFinished(500);
-            }
-            delete m_tarProcess;
-            m_tarProcess = nullptr;
-        }
-        return;
-    }
     if (m_process) {
         readStdout(true);
         m_process->blockSignals(true);   // delete m_process之前需要断开所有m_process信号，防止重复处理
         delete m_process;
         m_process = nullptr;
+        if(!m_scriptPath.isEmpty()) {
+            QFile::remove(m_scriptPath);
+        }
     }
 }
 
 void CliInterface::handleProgress(const QString &line)
 {
-    if (m_tar7z_7z || (m_process && m_process->program().at(0).contains("7z"))) {   // 解析7z相关进度、文件名（含 tar.7z 管道）
+    if (m_process && m_process->program().at(0).contains("7z")) {   // 解析7z相关进度、文件名
         int pos = line.indexOf(QLatin1Char('%'));
         if (pos > 1) {
             int percentage = line.midRef(pos - 3, 3).toInt();
@@ -963,6 +904,29 @@ void CliInterface::handleProgress(const QString &line)
 
             emit signalCurFileName(fileName);
         }
+    } else if (m_process && m_process->program().at(0).contains("tempScript")) {
+        // 处理tar.7z进度
+        // "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b                \b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b  7M + [Content]"
+        // "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b                  \b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b274M 1 + [Content]"
+        int pos = line.lastIndexOf(" + [Content]");
+        if (pos > 1) {
+            int mPos = line.lastIndexOf("M ");
+            int bPos = line.lastIndexOf("\b", mPos);
+            QString tempLine = line.left(mPos);
+            // 已经压缩的文件大小
+            qint64 compressedSize = tempLine.right(tempLine.size() - bPos - 1).toLongLong();
+            // 计算文件大小计算百分比
+            qint64 percentage = compressedSize * 1024 * 1024 * 100 / m_filesSize;
+
+            emit signalprogress(percentage);
+            // tar.7z 无法获取正在压缩的单个文件名，但可以提示正在打包成 tar 文件
+            // 发送 tar 文件名提示（去掉 .7z 后缀，显示正在打包的 tar 文件名）
+            QString tarFileName = QFileInfo(m_strArchiveName).fileName();
+            if (tarFileName.endsWith(".7z", Qt::CaseInsensitive)) {
+                tarFileName = tarFileName.left(tarFileName.length() - 3);
+            }
+            emit signalCurFileName(tarFileName);
+        }
     }
 }
 
@@ -1072,14 +1036,9 @@ PluginFinishType CliInterface::handleCorrupt()
 
 void CliInterface::writeToProcess(const QByteArray &data)
 {
+    Q_ASSERT(m_process);
     Q_ASSERT(!data.isNull());
-    // tar.7z 管道下 stdin 为 tar 输出，不能写入，密码已通过命令行传入
-    if (m_tar7z_7z) {
-        return;
-    }
-    if (!m_process) {
-        return;
-    }
+
     //    m_process->write(data);
     m_process->pty()->write(data);
 }
@@ -1336,17 +1295,14 @@ void CliInterface::readStdout(bool handleAll)
         return;
     }
 
-    QProcess *outProcess = m_tar7z_7z ? m_tar7z_7z : m_process;
-    if (!outProcess) {
-        return;
-    }
+    Q_ASSERT(m_process);
 
-    if (!outProcess->bytesAvailable()) {   // 无数据
+    if (!m_process->bytesAvailable()) {   // 无数据
         return;
     }
 
     // 获取命令行输出
-    QByteArray dd = outProcess->readAllStandardOutput();
+    QByteArray dd = m_process->readAllStandardOutput();
     m_stdOutData += dd;
 
     // 换行分割
@@ -1358,10 +1314,12 @@ void CliInterface::readStdout(bool handleAll)
     //    }
     bool isWrongPwd = isWrongPasswordMsg(lines.last());
 
-    // 7z 或 tar.7z 管道：进度行结束无 \n
-    bool is7zAdd = m_tar7z_7z || (m_process && m_process->program().at(0).contains("7z") && m_process->program().at(1) != "l");
-    if (is7zAdd && !isWrongPwd) {
-        handleAll = true;
+    if ((m_process->program().at(0).contains("7z") && m_process->program().at(1) != "l") && !isWrongPwd) {
+        handleAll = true;   // 7z进度行结束无\n
+    }
+
+    if ((m_process->program().at(0).contains("tempScript")) && !isWrongPwd) {
+        handleAll = true;   // compress .tar.7z progressline has no \n
     }
 
     bool foundErrorMessage = (isWrongPwd || isDiskFullMsg(QLatin1String(lines.last()))
@@ -1378,7 +1336,7 @@ void CliInterface::readStdout(bool handleAll)
         // because the last line might be incomplete we leave it for now
         // note, this last line may be an empty string if the stdoutdata ends
         // with a newline
-        if (m_process && m_process->program().at(0).contains("unrar")) {   // 针对unrar的命令行截取
+        if (m_process->program().at(0).contains("unrar")) {   // 针对unrar的命令行截取
             m_stdOutData.clear();
             if (lines.count() > 0) {
                 if (!(lines[lines.count() - 1].endsWith("%") || lines[lines.count() - 1].endsWith("OK "))) {

3rdparty/interface/archiveinterface/cliinterface.h

@@ -143,12 +143,6 @@ class CliInterface : public ReadWriteArchiveInterface
      */
     virtual void killProcess(bool emitFinished = true) = 0;
 
-    /**
-     * @brief killTar7zPipelineIfActive  若当前为 tar.7z 管道则结束两个进程
-     * @return 若已结束管道返回 true，否则 false
-     */
-    bool killTar7zPipelineIfActive();
-
     /**
      * @brief handleProgress  解析进度并发送进度信号
      * @param line
@@ -242,8 +236,6 @@ private slots:
 protected:
     CliProperties *m_cliProps = nullptr;  // 命令属性
     /*KProcess*/KPtyProcess *m_process = nullptr;  // 工作进程
-    QProcess *m_tarProcess = nullptr;   // 仅 tar.7z 管道：tar 进程
-    QProcess *m_tar7z_7z = nullptr;     // 仅 tar.7z 管道：7z 进程（输出来自此进程）
     PluginFinishType m_finishType = PFT_Nomral; // 插件结束类型
     QString m_strEncryptedFileName = QString(); // 当前被解压的加密文件名
     QVector<qint64> m_childProcessId; // 压缩tar.7z文件的子进程Id
@@ -270,6 +262,7 @@ private slots:
     QMap<QString, int> m_mapLongName;       // 长文件名统计
     QMap<QString, int> m_mapLongDirName;    // 长文件夹统计
     QMap<QString, int> m_mapRealDirValue;    // 真实文件统计
+    QString m_scriptPath; // 脚本路径
 };
 
 #endif // CLIINTERFACE_H