File 0013-Fix-drag-and-drop-extraction-of-entries-fr... of Package ark

Overview Repositories Revisions Requests Users Attributes Meta

File 0013-Fix-drag-and-drop-extraction-of-entries-from-certain.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Currently displaying revision ad2d69f4140343ee747a64729f7331a0 , Show latest

From 593568d0c489a4ecffb5c53bc54cef64c33cca40 Mon Sep 17 00:00:00 2001
From: Ragnar Thomsen <rthomsen6@gmail.com>
Date: Sat, 1 Oct 2016 20:13:25 +0200
Subject: [PATCH 13/13] Fix drag-and-drop extraction of entries from certain
 archive formats

When listing certain archive formats e.g. AppImage and RPM,
libarchiveplugin outputs no trailing slash for folders. This diff adds a
trailing slash to folders that miss one. The code is added in
ArchiveModel::newEntry() so it's applied for all plugins.

Differential Revision: D2908
---
 part/archivemodel.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/part/archivemodel.cpp b/part/archivemodel.cpp
index 21ae068..8b297b5 100644
--- a/part/archivemodel.cpp
+++ b/part/archivemodel.cpp
@@ -805,6 +805,14 @@ void ArchiveModel::newEntry(const ArchiveEntry& receivedEntry, InsertBehaviour b
     }
     entry[FileName] = entryFileName;
 
+    // For some archive formats (e.g. AppImage and RPM) paths of folders do not
+    // contain a trailing slash, so we append it.
+    if (entry[IsDirectory].toBool() && !entry[FileName].toString().endsWith(QLatin1Char('/'))) {
+        entry[FileName] = entry[FileName].toString() + QLatin1Char('/');
+        entry[InternalID] = entry[FileName];
+        qCDebug(ARK) << "Trailing slash appended to entry:" << entry[FileName];
+    }
+
     /// 1. Skip already created nodes
     if (m_rootNode) {
         ArchiveNode *existing = m_rootNode->findByPath(entry[ FileName ].toString().split(QLatin1Char( '/' )));
-- 
2.10.0

Places

File 0013-Fix-drag-and-drop-extraction-of-entries-from-certain.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Places