ark: add missing MIME types and filters depending on their availability

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/ark/plugins/libarchive/CMakeLists.txt b/ark/plugins/libarchive/CMakeLists.txt
index d57f629..1210804 100644 (file)
--- a/ark/plugins/libarchive/CMakeLists.txt
+++ b/ark/plugins/libarchive/CMakeLists.txt
@@ -1,16 +1,16 @@
 include_directories(${LibArchive_INCLUDE_DIRS})
 
 ########### next target ###############
-set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-archive;application/x-xar;application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;application/x-rpm;application/x-source-rpm;application/vnd.ms-cab-compressed;application/x-servicepack;")
-set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-xar;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-gzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/x-java-archive;application/zip;application/x-7z-compressed;")
+set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-archive;application/x-xar;application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;application/x-rpm;application/x-source-rpm;application/vnd.ms-cab-compressed;application/x-servicepack;application/x-compress;application/x-lzip;")
+set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-xar;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-gzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/x-java-archive;application/zip;application/x-7z-compressed;application/x-compress;application/x-lzip;")
 
 if("${LibArchive_VERSION}" VERSION_GREATER "3.0.4")
-    set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lzop;")
-    set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lzop;")
+    set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lzop;application/x-lrzip;")
+    set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lzop;application/x-lrzip;")
 endif()
 if("${LibArchive_VERSION}" VERSION_GREATER "3.1.2")
-    set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lz4;")
-    set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lz4;")
+    set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lz4;application/x-lz4-compressed-tar;")
+    set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lz4;application/x-lz4-compressed-tar;")
 endif()
 if("${LibArchive_VERSION}" VERSION_GREATER "3.3.2")
     set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/zstd;application/x-zstd;application/x-zstd-compressed-tar;")

diff --git a/ark/plugins/libarchive/libarchivehandler.cpp b/ark/plugins/libarchive/libarchivehandler.cpp
index e779f4a..d1e474d 100644 (file)
--- a/ark/plugins/libarchive/libarchivehandler.cpp
+++ b/ark/plugins/libarchive/libarchivehandler.cpp
@@ -43,6 +43,10 @@
 #include <QList>
 #include <QStringList>
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#  warning TODO: check for missing ARCHIVE_FILTER_* alternatives
+#endif
+
 struct LibArchiveInterface::ArchiveReadCustomDeleter
 {
     static inline void cleanup(struct archive *a)
@@ -397,6 +401,36 @@ bool LibArchiveInterface::addFiles(const QStringList& files, const CompressionOp
         } else if (filename().right(2).toUpper() == QLatin1String( "7Z" )) {
             kDebug() << "Detected 7z compression for new file";
             ret = archive_write_set_format_7zip(arch_writer.data());
+#ifdef ARCHIVE_FILTER_LZOP
+        } else if (filename().right(3).toUpper() == QLatin1String( "LZO" )) {
+            kDebug() << "Detected LZO compression for new file";
+            ret = archive_write_add_filter_lzop(arch_writer.data());
+#endif
+#ifdef ARCHIVE_FILTER_LRZIP
+        } else if (filename().right(3).toUpper() == QLatin1String( "LRZ" )) {
+            kDebug() << "Detected lrzip compression for new file";
+            ret = archive_write_add_filter_lrzip(arch_writer.data());
+#endif
+#ifdef ARCHIVE_FILTER_LZ4
+        } else if (filename().right(3).toUpper() == QLatin1String( "LZ4" )) {
+            kDebug() << "Detected LZ4 compression for new file";
+            ret = archive_write_add_filter_lz4(arch_writer.data());
+#endif
+#ifdef ARCHIVE_FILTER_ZSTD
+        } else if (filename().right(3).toUpper() == QLatin1String( "ZST" )) {
+            kDebug() << "Detected ZSTD compression for new file";
+            ret = archive_write_add_filter_zstd(arch_writer.data());
+#endif
+#ifdef ARCHIVE_FILTER_LZIP
+        } else if (filename().right(2).toUpper() == QLatin1String( "LZ" )) {
+            kDebug() << "Detected Lzip compression for new file";
+            ret = archive_write_add_filter_lzip(arch_writer.data());
+#endif
+#ifdef ARCHIVE_FILTER_COMPRESS
+        } else if (filename().right(1).toUpper() == QLatin1String( "Z" )) {
+            kDebug() << "Detected Z compression for new file";
+            ret = archive_write_add_filter_compress(arch_writer.data());
+#endif
         } else {
             kDebug() << "Falling back to gzip";
             ret = archive_write_add_filter_gzip(arch_writer.data());
@@ -422,6 +456,36 @@ bool LibArchiveInterface::addFiles(const QStringList& files, const CompressionOp
         case ARCHIVE_FILTER_LZMA:
             ret = archive_write_add_filter_lzma(arch_writer.data());
             break;
+#ifdef ARCHIVE_FILTER_LZOP
+        case ARCHIVE_FILTER_LZOP:
+            ret = archive_write_add_filter_lzop(arch_writer.data());
+            break;
+#endif
+#ifdef ARCHIVE_FILTER_LRZIP
+        case ARCHIVE_FILTER_LRZIP:
+            ret = archive_write_add_filter_lrzip(arch_writer.data());
+            break;
+#endif
+#ifdef ARCHIVE_FILTER_LZ4
+        case ARCHIVE_FILTER_LZ4:
+            ret = archive_write_add_filter_lz4(arch_writer.data());
+            break;
+#endif
+#ifdef ARCHIVE_FILTER_ZSTD
+        case ARCHIVE_FILTER_ZSTD:
+            ret = archive_write_add_filter_zstd(arch_writer.data());
+            break;
+#endif
+#ifdef ARCHIVE_FILTER_LZIP
+        case ARCHIVE_FILTER_LZIP:
+            ret = archive_write_add_filter_lzip(arch_writer.data());
+            break;
+#endif
+#ifdef ARCHIVE_FILTER_COMPRESS
+        case ARCHIVE_FILTER_COMPRESS:
+            ret = archive_write_add_filter_compress(arch_writer.data());
+            break;
+#endif
         case ARCHIVE_FILTER_NONE:
             if (filename().right(3).toUpper() == QLatin1String( "ZIP" )) {
                 ret = archive_write_set_format_zip(arch_writer.data());
@@ -569,6 +633,36 @@ bool LibArchiveInterface::deleteFiles(const QVariantList& files)
     case ARCHIVE_FILTER_LZMA:
         ret = archive_write_add_filter_lzma(arch_writer.data());
         break;
+#ifdef ARCHIVE_FILTER_LZOP
+    case ARCHIVE_FILTER_LZOP:
+        ret = archive_write_add_filter_lzop(arch_writer.data());
+        break;
+#endif
+#ifdef ARCHIVE_FILTER_LRZIP
+    case ARCHIVE_FILTER_LRZIP:
+        ret = archive_write_add_filter_lrzip(arch_writer.data());
+        break;
+#endif
+#ifdef ARCHIVE_FILTER_LZ4
+    case ARCHIVE_FILTER_LZ4:
+        ret = archive_write_add_filter_lz4(arch_writer.data());
+        break;
+#endif
+#ifdef ARCHIVE_FILTER_ZSTD
+    case ARCHIVE_FILTER_ZSTD:
+        ret = archive_write_add_filter_zstd(arch_writer.data());
+        break;
+#endif
+#ifdef ARCHIVE_FILTER_LZIP
+    case ARCHIVE_FILTER_LZIP:
+        ret = archive_write_add_filter_lzip(arch_writer.data());
+        break;
+#endif
+#ifdef ARCHIVE_FILTER_COMPRESS
+    case ARCHIVE_FILTER_COMPRESS:
+        ret = archive_write_add_filter_compress(arch_writer.data());
+        break;
+#endif
     case ARCHIVE_FILTER_NONE:
         if (filename().right(3).toUpper() == QLatin1String( "ZIP" )) {
             ret = archive_write_set_format_zip(arch_writer.data());