Skip to content

Fix: [zipplugin] Show password error. #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Nov 21, 2025
Merged

Fix: [zipplugin] Show password error. #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions 3rdparty/libzipplugin/libzipplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
if (options.bAllExtract) { // 全部解压
qlonglong qExtractSize = 0;
zip_int64_t nofEntries = zip_get_num_entries(archive, 0);
zip_int64_t lastNeedPasswordIndex = -1;
for (zip_int64_t i = 0; i < nofEntries; ++i) {
if (QThread::currentThread()->isInterruptionRequested()) {
m_bCancel = false; // 重置标志位
Expand All @@ -195,14 +196,16 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
zip_close(archive);
return PFT_Cancel;
} else { // 处理错误
// 密码错误, 给出错误提示
if(ET_WrongPassword == m_eErrorType && !m_strPassword.isEmpty()) {
zip_close(archive);
m_strPassword = "";
return PFT_Error;
}
// 判断是否需要密码，若需要密码，弹出密码输入对话框，用户输入密码之后，重新解压当前文件
if (ET_WrongPassword == m_eErrorType || ET_NeedPassword == m_eErrorType) {

// 询问输入密码后，仍然输入错误密码，则直接返回,给出错误提示
if (lastNeedPasswordIndex == i) {
zip_close(archive);
m_strPassword = "";
return PFT_Error;
}

PasswordNeededQuery query(strFileName);
emit signalQuery(&query);
query.waitForResponse();
Expand All @@ -214,6 +217,7 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
} else {
setPassword(query.password());
zip_set_default_password(archive, m_strPassword.toUtf8().constData());
lastNeedPasswordIndex = i;
i--;
}
} else {
Expand Down