[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ark/Applications/15.12] plugins/clirarplugin: Fix ark cannout open rar file with space in archive f
From:       Weng Xuetian <wengxt () gmail ! com>
Date:       2015-12-17 6:21:15
Message-ID: E1a9RwB-0008JK-4i () scm ! kde ! org
[Download RAW message or body]

Git commit 24b0afbec552f56b30d91fc041fc727add5b6e58 by Weng Xuetian.
Committed on 17/12/2015 at 06:20.
Pushed by xuetianweng into branch 'Applications/15.12'.

Fix ark cannout open rar file with space in archive file path

REVIEW: 126360

M  +4    -2    plugins/clirarplugin/cliplugin.cpp

http://commits.kde.org/ark/24b0afbec552f56b30d91fc041fc727add5b6e58

diff --git a/plugins/clirarplugin/cliplugin.cpp b/plugins/clirarplugin/cliplugin.cpp
index 23eb6cc..9b3e086 100644
--- a/plugins/clirarplugin/cliplugin.cpp
+++ b/plugins/clirarplugin/cliplugin.cpp
@@ -172,7 +172,8 @@ void CliPlugin::handleUnrar5Line(const QString &line) {
     if (m_parseState == ParseStateComment) {
 
         // RegExp matching end of comment field.
-        QRegularExpression rxCommentEnd(QStringLiteral("^Archive: \\S+$"));
+        // FIXME: Comment itself could also contain the Archive path string here.
+        QRegularExpression rxCommentEnd(QStringLiteral("^Archive: .+$"));
 
         if (rxCommentEnd.match(line).hasMatch()) {
             m_parseState = ParseStateHeader;
@@ -293,7 +294,8 @@ void CliPlugin::handleUnrar4Line(const QString &line) {
     if (m_parseState == ParseStateComment) {
 
         // RegExp matching end of comment field.
-        QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) \\S+$"));
+        // FIXME: Comment itself could also contain the Archive path string here.
+        QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) .+$"));
 
         if (rxCommentEnd.match(line).hasMatch()) {
 
[prev in list] [next in list] [prev in thread] [next in thread]