Skip to content

fix: recognise the unrar 7 "use current password?" prompt #546

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

Open
liuwenhuan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: recognise the unrar 7 "use current password?" prompt #546

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion 3rdparty/clirarplugin/clirarplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ bool CliRarPlugin::isFileExistsFileName(const QString &line)

bool CliRarPlugin::isMultiPasswordPrompt(const QString &line)
{
return line.contains("use current password ? [Y]es, [N]o, [A]ll");
// unrar 5/6 print "use current password ? [Y]es, [N]o, [A]ll"; unrar 7 dropped the space before '?'
return line.contains(QLatin1String("use current password ? [Y]es, [N]o, [A]ll"))
|| line.contains(QLatin1String("use current password? [Y]es, [N]o, [A]ll"));
}

bool CliRarPlugin::isOpenFileFailed(const QString &line)
Expand Down
4 changes: 4 additions & 0 deletions tests/UnitTest/3rdparty/clirarplugin/ut_clirarplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ TEST_F(UT_CliRarPlugin, test_isFileExistsFileName)
TEST_F(UT_CliRarPlugin, test_isMultiPasswordPrompt)
{
EXPECT_EQ(m_tester->isMultiPasswordPrompt("use current password ? [Y]es, [N]o, [A]ll"), true);
// unrar 7.x wording (no space before '?')
EXPECT_EQ(m_tester->isMultiPasswordPrompt("dir/b.dll - use current password? [Y]es, [N]o, [A]ll "), true);
EXPECT_EQ(m_tester->isMultiPasswordPrompt("Extracting dir/a.dll OK "), false);
}

TEST_F(UT_CliRarPlugin, test_isOpenFileFailed)
Expand Down Expand Up @@ -315,6 +318,7 @@ TEST_F(UT_CliRarPlugin, test_handleLine_006)
Stub stub;
stub.set(ADDR(CliInterface, writeToProcess), cliInterface_writeToProcess_stub);
EXPECT_EQ(m_tester->handleLine("use current password ? [Y]es, [N]o, [A]ll", WT_Extract), true);
EXPECT_EQ(m_tester->handleLine("dir/b.dll - use current password? [Y]es, [N]o, [A]ll ", WT_Extract), true);
}

TEST_F(UT_CliRarPlugin, test_handleLine_007)
Expand Down
Loading