Rewrite t-extract implementation

oblivioncth · Nov 6, 2023 · f6e8c7a · f6e8c7a
1 parent ecc6258
commit f6e8c7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/src/task/t-extract.cpp b/app/src/task/t-extract.cpp
@@ -58,10 +58,7 @@ TExtractError TExtract::extractZipSubFolderContentToDir(QString zipFilePath, QSt
     QuaZip zipFile(zipFilePath);
 
     // Form subfolder string to match zip content scheme
-    if(subFolder.isEmpty())
-        subFolder = '/';
-
-    if(subFolder != '/')
+    if(!subFolder.isEmpty())
     {
         // Remove leading '/' if present
         if(subFolder.front() == '/')
@@ -81,13 +78,17 @@ TExtractError TExtract::extractZipSubFolderContentToDir(QString zipFilePath, QSt
     QuaZipFile currentArchiveFile(&zipFile);
     QDir currentDirOnDisk(dir);
 
+    // Ensure root destination folder is present
+    if(!currentDirOnDisk.mkpath(u"."_s))
+        return TExtractError(zipName, TExtractError::MakePath);
+
     // Extract all files in sub-folder
     for(bool atEnd = !zipFile.goToFirstFile(); !atEnd; atEnd = !zipFile.goToNextFile())
     {
         QString fileName = zipFile.getCurrentFileName();
 
         // Only consider files in specified sub-folder
-        if(fileName.startsWith(subFolder))
+        if(subFolder.isEmpty() || fileName.startsWith(subFolder))
         {
             // Determine path on disk
             QString pathWithinFolder = fileName.mid(subFolder.size());

diff --git a/app/src/task/t-extract.h b/app/src/task/t-extract.h
@@ -82,7 +82,7 @@ class TExtract : public Task
 private:
     // Data
     QString mPackPath;
-    QString mPathInPack; // NOTE: '/' for root, only supports directories currently.
+    QString mPathInPack; // NOTE: empty string for root, only supports directories currently.
     QString mDestinationPath;
 
 //-Constructor----------------------------------------------------------------------------------------------------------