Add extra types to compressed filetype filter.

This adds a few more common compressed filetypes to the is_compressed fuction. Notably, xz, and two common package file formats, deb and rpm.
2017-08-06 23:04:24 -04:00 · 2017-08-06 23:04:24 -04:00 · 1bce51c9c8
parent 115315a03c
commit 1bce51c9c8
6 changed files with 18 additions and 2 deletions
--- a/3
+++ b/3
@ -168,6 +168,9 @@ Vagrant.configure(2) do |config|
        touch "#{test_dir}/file-names-exts/COMPRESSED.ZIP"
        touch "#{test_dir}/file-names-exts/compressed.tar.gz"
        touch "#{test_dir}/file-names-exts/compressed.tgz"
+        touch "#{test_dir}/file-names-exts/compressed.tar.xz"
+        touch "#{test_dir}/file-names-exts/compressed.txz"
+        touch "#{test_dir}/file-names-exts/compressed.deb"

        touch "#{test_dir}/file-names-exts/backup~"
        touch "#{test_dir}/file-names-exts/#SAVEFILE#"
--- a/src/info/filetype.rs
+++ b/src/info/filetype.rs
@ -69,8 +69,9 @@ impl FileExtensions {

    pub fn is_compressed(&self, file: &File) -> bool {
        file.extension_is_one_of( &[
-            "zip", "tar", "Z", "gz", "bz2", "a", "ar", "7z",
-            "iso", "dmg", "tc", "rar", "par", "tgz",
+            "zip", "tar", "Z", "z", "gz", "bz2", "a", "ar", "7z",
+            "iso", "dmg", "tc", "rar", "par", "tgz", "xz", "txz",
+            "lzma", "deb", "rpm"
        ])
    }

--- a/xtests/file-names-exts
+++ b/xtests/file-names-exts
@ -4,8 +4,11 @@
 compiled.coffee
 [38;5;137mcompiled.js[0m
 [38;5;137mcompiled.o[0m
+[31mcompressed.deb[0m
 [31mcompressed.tar.gz[0m
+[31mcompressed.tar.xz[0m
 [31mcompressed.tgz[0m
+[31mcompressed.txz[0m
 [31mCOMPRESSED.ZIP[0m
 [38;5;109mcrypto.asc[0m
 [38;5;109mcrypto.signature[0m
--- a/xtests/file-names-exts-case
+++ b/xtests/file-names-exts-case
@ -10,8 +10,11 @@
 compiled.coffee
 [38;5;137mcompiled.js[0m
 [38;5;137mcompiled.o[0m
+[31mcompressed.deb[0m
 [31mcompressed.tar.gz[0m
+[31mcompressed.tar.xz[0m
 [31mcompressed.tgz[0m
+[31mcompressed.txz[0m
 [38;5;109mcrypto.asc[0m
 [38;5;109mcrypto.signature[0m
 [38;5;105mdocument.pdf[0m
--- a/xtests/file-names-exts-ext
+++ b/xtests/file-names-exts-ext
@ -5,6 +5,7 @@
 [38;5;135mVIDEO.AVI[0m
 [38;5;137mcompiled.class[0m
 compiled.coffee
+[31mcompressed.deb[0m
 [38;5;93mlossless.flac[0m
 [31mcompressed.tar.gz[0m
 [38;5;137mcompiled.js[0m
@ -17,7 +18,9 @@ compiled.coffee
 [38;5;133mimage.svg[0m
 [31mcompressed.tgz[0m
 [38;5;244mfile.tmp[0m
+[31mcompressed.txz[0m
 [38;5;93mlossless.wav[0m
 [38;5;135mvideo.wmv[0m
 [38;5;105mDOCUMENT.XLSX[0m
+[31mcompressed.tar.xz[0m
 [31mCOMPRESSED.ZIP[0m
--- a/xtests/file-names-exts-ext-case
+++ b/xtests/file-names-exts-ext-case
@ -5,6 +5,7 @@
 [38;5;135mVIDEO.AVI[0m
 [38;5;137mcompiled.class[0m
 compiled.coffee
+[31mcompressed.deb[0m
 [38;5;93mlossless.flac[0m
 [31mcompressed.tar.gz[0m
 [38;5;137mcompiled.js[0m
@ -17,7 +18,9 @@ compiled.coffee
 [38;5;133mimage.svg[0m
 [31mcompressed.tgz[0m
 [38;5;244mfile.tmp[0m
+[31mcompressed.txz[0m
 [38;5;93mlossless.wav[0m
 [38;5;135mvideo.wmv[0m
 [38;5;105mDOCUMENT.XLSX[0m
+[31mcompressed.tar.xz[0m
 [31mCOMPRESSED.ZIP[0m