File 0014-Fix-drag-and-drop-extraction-of-parentless... of Package ark

Overview Repositories Revisions Requests Users Attributes Meta

File 0014-Fix-drag-and-drop-extraction-of-parentless-files.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Currently displaying revision ad2d69f4140343ee747a64729f7331a0 , Show latest

From bb9ede753623f7d3958f7a78985bb4142fbc0bb0 Mon Sep 17 00:00:00 2001
From: Ragnar Thomsen <rthomsen6@gmail.com>
Date: Sat, 1 Oct 2016 21:24:20 +0200
Subject: [PATCH 14/14] Fix drag-and-drop extraction of parentless files

In some archives parent folders of some files might not be part of the
archive themselves, i.e. the archive does not contain separate entries
for them. In this case ArchiveModel creates ArchiveDirNodes for the
folders. However, the FileName and InternalID properties of these
folders do not get a trailing slash. This results in faulty root nodes
leading to e.g. broken drag-n-drop extraction of files within these
folders.

This diff simply appends a traling slash to the properties in
ArchiveModel::parentFor().

BUG: 367549
FIXED-IN: 16.08.2
Differential Revision: D2909
---
 part/archivemodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/part/archivemodel.cpp b/part/archivemodel.cpp
index 8b297b5..1569a36 100644
--- a/part/archivemodel.cpp
+++ b/part/archivemodel.cpp
@@ -679,7 +679,7 @@ ArchiveDirNode* ArchiveModel::parentFor(const ArchiveEntry& entry)
         if (!node) {
             ArchiveEntry e;
             e[ FileName ] = (parent == m_rootNode) ?
-                            piece : parent->entry()[ FileName ].toString() + QLatin1Char( '/' ) + piece;
+                            piece + QLatin1Char('/') : parent->entry()[FileName].toString() + piece + QLatin1Char('/');
             e[ InternalID ] = e.value(FileName);
             e[ IsDirectory ] = true;
             node = new ArchiveDirNode(parent, e);
-- 
2.10.0

Places

File 0014-Fix-drag-and-drop-extraction-of-parentless-files.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Places