Skip to content

fix: handle wrong password when processing longname-extract #414

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
May 19, 2026
Merged

fix: handle wrong password when processing longname-extract #414

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
25 changes: 22 additions & 3 deletions 3rdparty/interface/archiveinterface/cliinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
}
if (bHandleLongName) {
if (!handleLongNameExtract(m_files)) {
m_eErrorType = ET_FileWriteError;
if (m_eErrorType == ET_NoError) {
m_eErrorType = ET_FileWriteError;
}
emit signalFinished(PFT_Error);
return PFT_Error;
}
}
Expand Down Expand Up @@ -263,7 +266,10 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const

if (bHandleLongName) {
if (!handleLongNameExtract(arcData.mapFileEntry.values())) {
m_eErrorType = ET_FileWriteError;
if (m_eErrorType == ET_NoError) {
m_eErrorType = ET_FileWriteError;
}
emit signalFinished(PFT_Error);
return PFT_Error;
}
}
Expand Down Expand Up @@ -772,9 +778,14 @@ bool CliInterface::runProcess(const QString &programName, const QStringList &arg
if (exitCode != 0) {
emit signalprogress(100);
emit signalFinished(PFT_Error);
return;
}
deleteProcess();
extractFiles(m_files, m_extractOptions, property("lnfs").toBool());
PluginFinishType ret = extractFiles(m_files, m_extractOptions, property("lnfs").toBool());
if (ret == PFT_Error) {
emit signalprogress(100);
emit signalFinished(PFT_Error);
}
}
});
}
Expand Down Expand Up @@ -1357,6 +1368,14 @@ bool CliInterface::handleLongNameExtract(const QList<FileEntry> &files)
pProcess->start();
pProcess->waitForFinished(-1);

if (pProcess->exitCode() != 0) {
QByteArray output = pProcess->readAllStandardOutput();
if (output.contains("Wrong password")) {
m_eErrorType = ET_WrongPassword;
return false;
}
}

bPasswordEntered = true;
break;
}
Expand Down
Loading