feat: Enhance clipzipplugin support for ARM + Qt6

- Updated CMake configuration to conditionally enable pzip and clipzipplugin for ARM architecture with Qt6.
- Improved signal-slot connections in clipzipplugin for compatibility with different Qt versions.
- Added compression level options and refined process completion handling.

Log: Enhance ARM + Qt6 support for clipzipplugin

Author: dengzhongyuan365-dev

3rdparty/CMakeLists.txt

@@ -16,11 +16,15 @@ add_subdirectory(libzipplugin)
 
 add_subdirectory(libminizipplugin)
 
-# pzip 高性能并行压缩工具
-add_subdirectory(pzip)
-
-# clipzipplugin 调用 pzip 的插件
-add_subdirectory(clipzipplugin)
+# pzip 高性能并行压缩工具（仅 ARM + Qt6 环境启用）
+# 检查是否为 ARM 架构且 Qt6
+if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm") AND (QT_VERSION_MAJOR EQUAL 6))
+    message(STATUS "ARM + Qt6 环境，启用 pzip 高性能压缩插件")
+    add_subdirectory(pzip)
+    add_subdirectory(clipzipplugin)
+else()
+    message(STATUS "非 ARM + Qt6 环境，使用默认 libzip 插件")
+endif()
 
 ##add_subdirectory(cliunarchiverplugin) #不可用
 

3rdparty/clipzipplugin/clipzipplugin.cpp

@@ -149,8 +149,12 @@ PluginFinishType CliPzipPlugin::extractFiles(const QList<FileEntry> &files, cons
         readStdout();
     });
 
-    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), 
-            this, SLOT(processFinished(int, QProcess::ExitStatus)));
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+            this, &CliPzipPlugin::processFinished);
+#else
+    connect(m_process, &QProcess::finished, this, &CliPzipPlugin::processFinished);
+#endif
 
     m_process->start();
 
@@ -186,9 +190,14 @@ PluginFinishType CliPzipPlugin::addFiles(const QList<FileEntry> &files, const Co
     // 静默模式
     arguments << "-q";
 
+    // 压缩级别（如果指定）
+    if (options.iCompressionLevel >= 1 && options.iCompressionLevel <= 9) {
+        arguments << "-l" << QString::number(options.iCompressionLevel);
+    }
+
     // 线程数（如果指定）
     if (options.iCPUTheadNum > 0) {
-        arguments << "-j" << QString::number(options.iCPUTheadNum);
+        arguments << "-c" << QString::number(options.iCPUTheadNum);
     }
 
     // 输出文件
@@ -217,8 +226,12 @@ PluginFinishType CliPzipPlugin::addFiles(const QList<FileEntry> &files, const Co
         qDebug() << "pzip stderr:" << QString::fromLocal8Bit(errorOutput);
     });
 
-    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), 
-            this, SLOT(processFinished(int, QProcess::ExitStatus)));
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+            this, &CliPzipPlugin::processFinished);
+#else
+    connect(m_process, &QProcess::finished, this, &CliPzipPlugin::processFinished);
+#endif
 
     m_process->start();
 
@@ -435,16 +448,23 @@ void CliPzipPlugin::readStdout(bool handleAll)
     }
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 void CliPzipPlugin::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     qInfo() << "pzip process finished, exitcode:" << exitCode << "exitstatus:" << exitStatus;
+#else
+void CliPzipPlugin::processFinished(int exitCode)
+{
+    QProcess::ExitStatus exitStatus = m_process ? m_process->exitStatus() : QProcess::NormalExit;
+    qInfo() << "pzip process finished, exitcode:" << exitCode << "exitstatus:" << exitStatus;
+#endif
 
     deleteProcess();
     m_timer->stop();
 
     PluginFinishType eFinishType;
 
-    if (0 == exitCode) {
+    if (0 == exitCode && exitStatus == QProcess::NormalExit) {
         eFinishType = PFT_Nomral;
     } else {
         eFinishType = PFT_Error;

3rdparty/clipzipplugin/clipzipplugin.h

@@ -12,6 +12,7 @@
 
 #include <QProcess>
 #include <QTimer>
+#include <QtGlobal>  // for QT_VERSION_CHECK
 
 class CliPzipPluginFactory : public KPluginFactory
 {
@@ -89,7 +90,11 @@ class CliPzipPlugin : public ReadWriteArchiveInterface
 
 private slots:
     void readStdout(bool handleAll = false);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+#else
+    void processFinished(int exitCode);
+#endif
 
 private:
     KPtyProcess *m_process = nullptr;

3rdparty/clipzipplugin/kerfuffle_clipzip.json

@@ -1,5 +1,7 @@
 {
     "KPlugin": {
+        "Description": "High-performance parallel ZIP compression using pzip",
+        "Description[zh_CN]": "使用 pzip 进行高性能并行 ZIP 压缩",
         "Id": "kerfuffle_clipzip",
         "MimeTypes": [
             "application/zip"
@@ -12,6 +14,17 @@
         "Version": "1.0"
     },
     "X-KDE-Priority": 200,
-    "X-KDE-Kerfuffle-ReadWrite": true
+    "X-KDE-Kerfuffle-ReadWrite": true,
+    "application/zip": {
+        "CompressionLevelDefault": 6,
+        "CompressionLevelMax": 9,
+        "CompressionLevelMin": 1,
+        "CompressionMethodDefault": "Deflate",
+        "CompressionMethods": {
+            "Deflate": "Deflate",
+            "Store": "Store"
+        },
+        "SupportsTesting": false,
+        "SupportsWriteComment": false
+    }
 }
-

CMakeLists.txt

@@ -129,6 +129,9 @@ install(TARGETS compressor-interface DESTINATION ${COMPRESSOR_PLUGIN_PATH})
 install(TARGETS bz2plugin DESTINATION ${COMPRESSOR_PLUGIN_PATH})
 install(TARGETS gzplugin DESTINATION ${COMPRESSOR_PLUGIN_PATH})
 install(TARGETS xzplugin DESTINATION ${COMPRESSOR_PLUGIN_PATH})
-# pzip 高性能压缩插件
-install(TARGETS clipzipplugin DESTINATION ${COMPRESSOR_PLUGIN_PATH})
+
+# pzip 高性能压缩插件（仅 ARM + Qt6 环境）
+if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm") AND (QT_VERSION_MAJOR EQUAL 6))
+    install(TARGETS clipzipplugin DESTINATION ${COMPRESSOR_PLUGIN_PATH})
+endif()