Jelajahi Sumber

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.
Christopher Vittal 8 tahun lalu
induk
melakukan
1bce51c9c8

+ 3 - 0
Vagrantfile

@@ -168,6 +168,9 @@ Vagrant.configure(2) do |config|
         touch "#{test_dir}/file-names-exts/COMPRESSED.ZIP"
         touch "#{test_dir}/file-names-exts/COMPRESSED.ZIP"
         touch "#{test_dir}/file-names-exts/compressed.tar.gz"
         touch "#{test_dir}/file-names-exts/compressed.tar.gz"
         touch "#{test_dir}/file-names-exts/compressed.tgz"
         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/backup~"
         touch "#{test_dir}/file-names-exts/#SAVEFILE#"
         touch "#{test_dir}/file-names-exts/#SAVEFILE#"

+ 3 - 2
src/info/filetype.rs

@@ -69,8 +69,9 @@ impl FileExtensions {
 
 
     pub fn is_compressed(&self, file: &File) -> bool {
     pub fn is_compressed(&self, file: &File) -> bool {
         file.extension_is_one_of( &[
         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"
         ])
         ])
     }
     }
 
 

+ 3 - 0
xtests/file-names-exts

@@ -4,8 +4,11 @@
 compiled.coffee
 compiled.coffee
 compiled.js
 compiled.js
 compiled.o
 compiled.o
+compressed.deb
 compressed.tar.gz
 compressed.tar.gz
+compressed.tar.xz
 compressed.tgz
 compressed.tgz
+compressed.txz
 COMPRESSED.ZIP
 COMPRESSED.ZIP
 crypto.asc
 crypto.asc
 crypto.signature
 crypto.signature

+ 3 - 0
xtests/file-names-exts-case

@@ -10,8 +10,11 @@
 compiled.coffee
 compiled.coffee
 compiled.js
 compiled.js
 compiled.o
 compiled.o
+compressed.deb
 compressed.tar.gz
 compressed.tar.gz
+compressed.tar.xz
 compressed.tgz
 compressed.tgz
+compressed.txz
 crypto.asc
 crypto.asc
 crypto.signature
 crypto.signature
 document.pdf
 document.pdf

+ 3 - 0
xtests/file-names-exts-ext

@@ -5,6 +5,7 @@
 VIDEO.AVI
 VIDEO.AVI
 compiled.class
 compiled.class
 compiled.coffee
 compiled.coffee
+compressed.deb
 lossless.flac
 lossless.flac
 compressed.tar.gz
 compressed.tar.gz
 compiled.js
 compiled.js
@@ -17,7 +18,9 @@ compiled.coffee
 image.svg
 image.svg
 compressed.tgz
 compressed.tgz
 file.tmp
 file.tmp
+compressed.txz
 lossless.wav
 lossless.wav
 video.wmv
 video.wmv
 DOCUMENT.XLSX
 DOCUMENT.XLSX
+compressed.tar.xz
 COMPRESSED.ZIP
 COMPRESSED.ZIP

+ 3 - 0
xtests/file-names-exts-ext-case

@@ -5,6 +5,7 @@
 VIDEO.AVI
 VIDEO.AVI
 compiled.class
 compiled.class
 compiled.coffee
 compiled.coffee
+compressed.deb
 lossless.flac
 lossless.flac
 compressed.tar.gz
 compressed.tar.gz
 compiled.js
 compiled.js
@@ -17,7 +18,9 @@ compiled.coffee
 image.svg
 image.svg
 compressed.tgz
 compressed.tgz
 file.tmp
 file.tmp
+compressed.txz
 lossless.wav
 lossless.wav
 video.wmv
 video.wmv
 DOCUMENT.XLSX
 DOCUMENT.XLSX
+compressed.tar.xz
 COMPRESSED.ZIP
 COMPRESSED.ZIP