diff options
author | Sergey Ponomarev <[email protected]> | 2018-10-27 23:57:45 +0300 |
---|---|---|
committer | raveit65 <[email protected]> | 2018-12-28 10:08:05 +0100 |
commit | ab9e18f7411862f89e23d8aa451b26a4df9a3a72 (patch) | |
tree | e6a612efd287647344a944ea6212b5e030ba5e20 /src/fr-command-cfile.c | |
parent | a699fa2db6fea3e9621800b00416bdf9b7b99728 (diff) | |
download | engrampa-ab9e18f7411862f89e23d8aa451b26a4df9a3a72.tar.bz2 engrampa-ab9e18f7411862f89e23d8aa451b26a4df9a3a72.tar.xz |
Added test integrity for the cfile compressors: gzip, bzip2, etc. But since most of them shows the message with file status to STDERR instead of STDOUT whe should show both in Test result window.
Diffstat (limited to 'src/fr-command-cfile.c')
-rw-r--r-- | src/fr-command-cfile.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c index 0500df7..429c156 100644 --- a/src/fr-command-cfile.c +++ b/src/fr-command-cfile.c @@ -469,6 +469,39 @@ fr_command_cfile_extract (FrCommand *comm, g_free (temp_dir); } +static void +fr_command_cfile_test (FrCommand *comm) +{ + const char *compress_cmd; + if (is_mime_type (comm->mime_type, "application/x-gzip")) { + compress_cmd = "gzip"; + } + else if (is_mime_type (comm->mime_type, "application/x-bzip")) { + compress_cmd = "bzip2"; + } + else if (is_mime_type (comm->mime_type, "application/x-compress")) { + compress_cmd = is_program_in_path ("gzip") ? "gzip" : "uncompress"; + } + else if (is_mime_type (comm->mime_type, "application/x-lzip")) { + compress_cmd = "lzip"; + } + else if (is_mime_type (comm->mime_type, "application/x-lzma")) { + compress_cmd = "lzma"; + } + else if (is_mime_type (comm->mime_type, "application/x-xz")) { + compress_cmd = "xz"; + } + else if (is_mime_type (comm->mime_type, "application/x-lzop")) { + compress_cmd = "lzop"; + } else { // i.e. if (is_mime_type (comm->mime_type, "application/x-rzip")) + g_warning ("Test integrity in unsupported for %s\n", comm->mime_type); + return; + } + fr_process_begin_command (comm->process, compress_cmd); + fr_process_add_arg (comm->process, "-vt"); // verbose and test + fr_process_add_arg (comm->process, comm->filename); + fr_process_end_command (comm->process); +} const char *cfile_mime_type[] = { "application/x-gzip", "application/x-brotli", @@ -594,6 +627,7 @@ fr_command_cfile_class_init (FrCommandCFileClass *class) afc->add = fr_command_cfile_add; afc->delete = fr_command_cfile_delete; afc->extract = fr_command_cfile_extract; + afc->test = fr_command_cfile_test; afc->get_mime_types = fr_command_cfile_get_mime_types; afc->get_capabilities = fr_command_cfile_get_capabilities; afc->get_packages = fr_command_cfile_get_packages; @@ -609,7 +643,7 @@ fr_command_cfile_init (FrCommand *comm) comm->propExtractCanSkipOlder = FALSE; comm->propExtractCanJunkPaths = FALSE; comm->propPassword = FALSE; - comm->propTest = FALSE; + comm->propTest = TRUE; } |