diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-03-02 12:21:18 +0200 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-09-14 14:25:18 +0300 |
commit | 50292e14683727e6da81799cedd4ee352c3e0497 (patch) | |
tree | aa4bce967dee16e69aafef653f3c3f9ba1849d6c /src/libs/installer/component.cpp | |
parent | 2076b1384754301ba409b6fe65551eaf55cce401 (diff) |
Add support for handling archive files with libarchive
libarchive is a multi-format archive and compression library
written in C and licensed under the new BSD license. Usage of
libarchive brings in support for additional archive formats
(in addition to 7z) with the installer framework, like zip and
tar, with several available compression methods like gzip, bzip2
and xz.
libarchive will coexist as a supported archive format handler
with the LZMA SDK currently used in the framework, which will
continue to be used for handling the 7-Zip file format.
This change introduces classes for handling archive operations
using both libraries, removes most calls to the old Lib7z facade
and migrates the code base to use the new handling methods.
Task-number: QTIFW-2255
Change-Id: I8d77110ded503060495a3d6fdfdbc26281df9453
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/component.cpp')
-rw-r--r-- | src/libs/installer/component.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index d50c36c61..22453833d 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -31,7 +31,7 @@ #include "errors.h" #include "fileutils.h" #include "globals.h" -#include "lib7z_facade.h" +#include "archivefactory.h" #include "messageboxhandler.h" #include "packagemanagercore.h" #include "remoteclient.h" @@ -864,7 +864,8 @@ void Component::createOperationsForArchive(const QString &archive) return; } - const bool isZip = Lib7z::isSupportedArchive(archive); + QScopedPointer<AbstractArchive> archiveFile(ArchiveFactory::instance().create(archive)); + const bool isZip = (archiveFile && archiveFile->open(QIODevice::ReadOnly) && archiveFile->isSupported()); if (isZip) { // component.xml can override this value |