Review Request 124111: Support overwrite prompt of unrar v5

[Ragnar Thomsen]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124111/
-----------------------------------------------------------

(Updated July 12, 2015, 10:32 p.m.)


Review request for KDE Utils, Elvis Angelaccio and Raphael Kubo da Costa.


Changes
-------

The code in checkForFileName() was moved to beginning of handleFileExistsMessage().

m_storedFileName has to be a member variable due to multi-line overwrite prompts. A local variable in handleFileExistsMessage() would be out of scope when the last line of the overwrite prompt is reached.


Bugs: 349131
    http://bugs.kde.org/show_bug.cgi?id=349131


Repository: ark


Description
-------

The overwrite prompt of unrar v5 changed compared to v3 and v4. This causes Ark to hang when extracting a rar archive with unrar v5 when a destination file exists. In unrar v5 the overwrite prompt looks like:

    Would you like to replace the existing file file1.txt
        32 bytes, modified on 15-05-2015 14:26
    with a new one
        32 bytes, modified on 15-05-2015 14:26
        
and in unrar v3 and v4:

    file1.txt already exists. Overwrite it ?

Ark currently only supports the v3/v4 prompt. This patch adds support for the v5 prompt by defining a QStringList containing regexps for both prompts and iterating through the QStringList in CliInterface::checkForFileExistsMessage().


Diffs (updated)
-----

  kerfuffle/cliinterface.h e93d443 
  kerfuffle/cliinterface.cpp 2718c11 
  plugins/cli7zplugin/cliplugin.cpp 1c1389f 
  plugins/clilhaplugin/cliplugin.cpp 3e2b338 
  plugins/clirarplugin/cliplugin.cpp 489abd6 
  plugins/clizipplugin/cliplugin.cpp c927581 

Diff: https://git.reviewboard.kde.org/r/124111/diff/


Testing
-------

Extracting rar archives using both v4 and v5 unrar works as expected, also when destination exists. Extraction using clizip and cli7z also works as expected.


Thanks,

Ragnar Thomsen

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-utils-devel/attachments/20150712/c665984e/attachment.html>