From 83b63b99caeea75d5ed06ea3b055aa0a6ff4c004 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 15 Sep 2019 22:35:42 +0200 Subject: Zstandard: Update MIME type MIME type is application/x-zstd: $ lorem-ipsum-generator -p 10000 -l -f plain > lorem.txt $ zstd lorem.txt $ file -b --mime-type lorem.txt.zst application/x-zstd Test: $ CFLAGS="-g -O0" ./autogen.sh --enable-magic --enable-packagekit --prefix=/usr && make && sudo make install --- caja/caja-engrampa.c | 2 +- data/engrampa.desktop.in.in | 2 +- src/fr-command-cfile.c | 10 +++++----- src/fr-init.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c index 3667b5a..eb7fb45 100644 --- a/caja/caja-engrampa.c +++ b/caja/caja-engrampa.c @@ -191,9 +191,9 @@ static struct { { "application/x-zip", TRUE }, { "application/x-zip-compressed", TRUE }, { "application/x-zoo", TRUE }, + { "application/x-zstd", TRUE }, { "application/zip", TRUE }, { "multipart/x-zip", TRUE }, - { "application/zstd", TRUE }, { NULL, FALSE } }; diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in index 7222ba6..2ead7e3 100644 --- a/data/engrampa.desktop.in.in +++ b/data/engrampa.desktop.in.in @@ -9,7 +9,7 @@ Terminal=false Type=Application Icon=engrampa Categories=GTK;Utility;Archiving;Compression; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed;application/zstd; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed; Keywords=MATE;archive;manager;compression; X-MATE-DocPath=engrampa/engrampa.xml X-MATE-Bugzilla-Bugzilla=MATE diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c index 2a83836..612c4c8 100644 --- a/src/fr-command-cfile.c +++ b/src/fr-command-cfile.c @@ -299,7 +299,7 @@ fr_command_cfile_add (FrCommand *comm, compressed_filename = g_strconcat (filename, ".rz", NULL); } - else if (is_mime_type (comm->mime_type, "application/zstd")) { + else if (is_mime_type (comm->mime_type, "application/x-zstd")) { fr_process_begin_command (comm->process, "zstd"); fr_process_set_working_dir (comm->process, temp_dir); fr_process_add_arg (comm->process, filename); @@ -444,7 +444,7 @@ fr_command_cfile_extract (FrCommand *comm, fr_process_end_command (comm->process); } - else if (is_mime_type (comm->mime_type, "application/zstd")) { + else if (is_mime_type (comm->mime_type, "application/x-zstd")) { fr_process_begin_command (comm->process, "zstd"); fr_process_add_arg (comm->process, "-f"); fr_process_add_arg (comm->process, "-d"); @@ -531,7 +531,7 @@ const char *cfile_mime_type[] = { "application/x-gzip", "application/x-lzop", "application/x-rzip", "application/x-xz", - "application/zstd", + "application/x-zstd", NULL }; @@ -588,7 +588,7 @@ fr_command_cfile_get_capabilities (FrCommand *comm, if (is_program_available ("rzip", check_command)) capabilities |= FR_COMMAND_CAN_READ_WRITE; } - else if (is_mime_type (mime_type, "application/zstd")) { + else if (is_mime_type (mime_type, "application/x-zstd")) { if (is_program_available ("zstd", check_command)) capabilities |= FR_COMMAND_CAN_READ_WRITE; } @@ -631,7 +631,7 @@ fr_command_cfile_get_packages (FrCommand *comm, return PACKAGES ("lzop"); else if (is_mime_type (mime_type, "application/x-rzip")) return PACKAGES ("rzip"); - else if (is_mime_type (mime_type, "application/zstd")) + else if (is_mime_type (mime_type, "application/x-zstd")) return PACKAGES ("zstd"); return NULL; diff --git a/src/fr-init.c b/src/fr-init.c index 33bdf53..34b1611 100644 --- a/src/fr-init.c +++ b/src/fr-init.c @@ -110,8 +110,8 @@ FrMimeTypeDescription mime_type_desc[] = { { "application/x-xz", ".xz", N_("Xz (.xz)"), 0 }, { "application/x-xz-compressed-tar", ".tar.xz", N_("Tar compressed with xz (.tar.xz)"), 0 }, { "application/x-zoo", ".zoo", N_("Zoo (.zoo)"), 0 }, + { "application/x-zstd", ".zst", N_("Zstandard (.zst)"), 0 }, { "application/zip", ".zip", N_("Zip (.zip)"), 0 }, - { "application/zstd", ".zst", N_("Zstandard (.zst)"), 0 }, { NULL, NULL, NULL, 0 } }; @@ -181,7 +181,7 @@ FrExtensionType file_ext_type[] = { { ".Z", "application/x-compress" }, { ".zip", "application/zip" }, { ".zoo", "application/x-zoo" }, - { ".zst", "application/zstd" }, + { ".zst", "application/x-zstd" }, { NULL, NULL } }; -- cgit v1.2.1