fix: Fix Chinese password compression failure

Fix Chinese password compression failure

Log: Fix Chinese password compression failure

Author: pengfeixx

3rdparty/libzipplugin/libzipplugin.cpp

@@ -216,7 +216,8 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
                         return PFT_Cancel;
                     } else {
                         setPassword(query.password());
-                        zip_set_default_password(archive, m_strPassword.toUtf8().constData());
+                        QByteArray passwordBytes = passwordUnicode(m_strPassword, 0);
+                        zip_set_default_password(archive, passwordBytes.constData());
                         lastNeedPasswordIndex = i;
                         i--;
                     }
@@ -269,7 +270,8 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
                         return PFT_Cancel;
                     } else {
                         setPassword(query.password());
-                        zip_set_default_password(archive, m_strPassword.toUtf8().constData());
+                        QByteArray passwordBytes = passwordUnicode(m_strPassword, 0);
+                        zip_set_default_password(archive, passwordBytes.constData());
                         i--;
                     }
                 } else {
@@ -668,12 +670,16 @@ bool LibzipPlugin::writeEntry(zip_t *archive, const QString &entry, const Compre
     // 设置压缩的加密算法
     if (options.bEncryption && !options.strEncryptionMethod.isEmpty()) { //ReadOnlyArchiveInterface::password()
         int ret = 0;
+        QByteArray passwordBytes = passwordUnicode(options.strPassword, 0);
+        qInfo() << "Setting encryption for file, method:" << options.strEncryptionMethod 
+                << "password length:" << options.strPassword.length()
+                << "encoded bytes length:" << passwordBytes.length();
         if (QLatin1String("AES128") == options.strEncryptionMethod) {
-            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_128, options.strPassword.toUtf8().constData());
+            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_128, passwordBytes.constData());
         } else if (QLatin1String("AES192") == options.strEncryptionMethod) {
-            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_192, options.strPassword.toUtf8().constData());
+            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_192, passwordBytes.constData());
         } else if (QLatin1String("AES256") == options.strEncryptionMethod) {
-            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_256, options.strPassword.toUtf8().constData());
+            ret = zip_file_set_encryption(archive, uindex, ZIP_EM_AES_256, passwordBytes.constData());
         }
         if (ret != 0) {
             emit error(("Failed to set compression options for entry: %1"));
@@ -1216,6 +1222,7 @@ QByteArray LibzipPlugin::passwordUnicode(const QString &strPassword, int iIndex)
 
         // chinese
         if (b) {
+            qInfo() << "Password contains Chinese characters, using codec:" << m_listCodecs[iIndex];
             QTextCodec *utf8 = QTextCodec::codecForName("UTF-8");
             QTextCodec *gbk = QTextCodec::codecForName(m_listCodecs[iIndex].toUtf8().data());
             // QTextCodec *gbk = QTextCodec::codecForName("UTF-8");
@@ -1227,6 +1234,7 @@ QByteArray LibzipPlugin::passwordUnicode(const QString &strPassword, int iIndex)
             QByteArray gb_bytes = gbk->fromUnicode(strUnicode);
             return gb_bytes; //获取其char *115645 【专业版】【1060】【归档管理器】【5.12.0.2】无法解压中文密码的zip压缩包（含有长名称）
         } else {
+            qInfo() << "Password is non-Chinese, using UTF-8 encoding";
             return strPassword.toUtf8();
         }
     } else {

3rdparty/libzipplugin/libzipplugin.h

@@ -198,6 +198,7 @@ class LibzipPlugin : public ReadWriteArchiveInterface
     QMap<QString, int> m_mapRealDirValue;   // 长文件真实文件统计
     QSet<QString> m_setLongName;            // 存储被截取之后的文件名称（包含001之类的）
     bool m_bLnfs = false;                        //文件系统是否支持长文件
+    QByteArray m_passwordData;              // 存储编码后的密码数据，确保在压缩过程中保持有效
 };
 
 #endif // LIBZIPPLUGIN_H

src/source/mainwindow.cpp

@@ -1269,8 +1269,11 @@ void MainWindow::slotCompress(const QVariant &val)
     // 判断zip格式是否使用了中文加密
     bool zipPasswordIsChinese = false;
     if ("application/zip" == m_stCompressParameter.strMimeType) {
-        if (m_stCompressParameter.strPassword.contains(REG_EXP("[\\x4e00-\\x9fa5]+"))) {
-            zipPasswordIsChinese = true;
+        for (const QChar &ch : m_stCompressParameter.strPassword) {
+            if (ch.unicode() >= 0x4E00 && ch.unicode() <= 0x9FA5) {
+                zipPasswordIsChinese = true;
+                break;
+            }
         }
     }