diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-11 10:59:00 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-11 13:13:38 +0200 |
| commit | 5ec5af811a9a4146f32378bbd80acfbb5a46f621 (patch) | |
| tree | c4cb652d31af72b02f6287ad0b6101b695dc8aad /src/libs | |
| parent | 48a2499662fd1dc45f1dc87d5ff9e8956c7961b7 (diff) | |
ArchiveFactory: register handlers for .qbsp file extension
QBSP archives were missing a handler which caused UnzipArchiveTask
to fail when fetching metadata. Also fix the resulted segfault in
UnzipArchiveTask::doTask() when ArchiveFactory::create() returns nullptr
for unknown file extension - it now handles the exception properly.
Task-number: QTIFW-2475
Change-Id: I72624763a06d6e7495daebd69970a5f22a4fd6d3
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/archivefactory.cpp | 5 | ||||
| -rw-r--r-- | src/libs/installer/libarchivearchive.cpp | 8 | ||||
| -rw-r--r-- | src/libs/installer/metadatajob_p.h | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/libs/installer/archivefactory.cpp b/src/libs/installer/archivefactory.cpp index e6582cbcd..5bfabe943 100644 --- a/src/libs/installer/archivefactory.cpp +++ b/src/libs/installer/archivefactory.cpp @@ -142,9 +142,10 @@ ArchiveFactory::ArchiveFactory() #ifdef IFW_LIBARCHIVE registerArchive<LibArchiveWrapper>(QLatin1String("LibArchive"), QStringList() << QLatin1String("tar") << QLatin1String("tar.gz") << QLatin1String("tar.bz2") - << QLatin1String("tar.xz") << QLatin1String("zip") << QLatin1String("7z")); + << QLatin1String("tar.xz") << QLatin1String("zip") << QLatin1String("7z") + << QLatin1String("qbsp")); #else registerArchive<Lib7zArchive>(QLatin1String("Lib7z"), QStringList() - << QLatin1String("7z")); + << QLatin1String("7z") << QLatin1String("qbsp")); #endif } diff --git a/src/libs/installer/libarchivearchive.cpp b/src/libs/installer/libarchivearchive.cpp index 0f5b21a29..3ada73dd2 100644 --- a/src/libs/installer/libarchivearchive.cpp +++ b/src/libs/installer/libarchivearchive.cpp @@ -713,7 +713,13 @@ void LibArchiveArchive::configureReader(archive *archive) */ void LibArchiveArchive::configureWriter(archive *archive) { - archive_write_set_format_filter_by_ext(archive, m_data->file.fileName().toLatin1()); + const QString fileName = m_data->file.fileName(); + if (fileName.endsWith(QLatin1String(".qbsp"), Qt::CaseInsensitive)) { + // The Qt board support package file extension is really a 7z. + archive_write_set_format_7zip(archive); + } else { + archive_write_set_format_filter_by_ext(archive, fileName.toLatin1()); + } if (compressionLevel() == CompressionLevel::Normal) return; diff --git a/src/libs/installer/metadatajob_p.h b/src/libs/installer/metadatajob_p.h index d2922babd..2511f4b00 100644 --- a/src/libs/installer/metadatajob_p.h +++ b/src/libs/installer/metadatajob_p.h @@ -79,12 +79,10 @@ public: if (!archive) { fi.reportException(UnzipArchiveException(MetadataJob::tr("Unsupported archive \"%1\": no handler " "registered for file suffix \"%2\".").arg(m_archive, QFileInfo(m_archive).suffix()))); - } - if (!archive->open(QIODevice::ReadOnly)) { + } else if (!archive->open(QIODevice::ReadOnly)) { fi.reportException(UnzipArchiveException(MetadataJob::tr("Cannot open file \"%1\" for " "reading: %2").arg(QDir::toNativeSeparators(m_archive), archive->errorString()))); - } - if (!archive->extract(m_targetDir)) { + } else if (!archive->extract(m_targetDir)) { fi.reportException(UnzipArchiveException(MetadataJob::tr("Error while extracting " "archive \"%1\": %2").arg(QDir::toNativeSeparators(m_archive), archive->errorString()))); } |