Implement file name colouring in {exa,ls}_colors

This commit adds to the parsing of the LS_COLORS and EXA_COLORS variables so that non-two-letter codes (keys other than things like ‘di’ or ‘ln’ or ‘ex’) will be treated as file name globs, and get used to colour files accordingly. Fixes #116 for good.
ogham · Sep 13, 2017 · dc45332 · dc45332
1 parent b86074d
commit dc45332
Show file tree

Hide file tree

Showing 9 changed files with 348 additions and 57 deletions.
diff --git a/src/options/style.rs b/src/options/style.rs
diff --git a/src/output/file_name.rs b/src/output/file_name.rs
@@ -285,3 +285,13 @@ impl FileColours for NoFileColours {
     fn colour_file(&self, _file: &File) -> Option<Style> { None }
 }
 
+// When getting the colour of a file from a *pair* of colourisers, try the
+// first one then try the second one. This lets the user provide their own
+// file type associations, while falling back to the default set if not set
+// explicitly.
+impl<A, B> FileColours for (A, B)
+where A: FileColours, B: FileColours {
+    fn colour_file(&self, file: &File) -> Option<Style> {
+        self.0.colour_file(file).or_else(|| self.1.colour_file(file))
+    }
+}
diff --git a/xtests/run.sh b/xtests/run.sh
@@ -158,17 +158,17 @@ env LANG=ja_JP.UTF-8  $exa $testcases/dates -l | diff -q - $results/dates_jp  ||
 # These directories are created in the VM user’s home directory (the default
 # location) when a Cargo build is done.
 (cd; mkdir -p target/debug/build
-     $exa -1d target target/debug target/debug/build | diff -q - $results/dir_paths) || exit 1
-     $exa -1d . .. /                                 | diff -q - $results/dirs       || exit 1
+     $exa -1d target target/debug target/debug/build | diff -q - $results/dir_paths)  || exit 1
+     $exa -1d . .. /                                 | diff -q - $results/dirs        || exit 1
 
 
 # Links
-COLUMNS=80 $exa $testcases/links     2>&1 | diff -q - $results/links         || exit 1
-           $exa $testcases/links -1  2>&1 | diff -q - $results/links_1       || exit 1
-           $exa $testcases/links -T  2>&1 | diff -q - $results/links_T       || exit 1
-           $exa $testcases/links -T@ 2>&1 | diff -q - $results/links_T@      || exit 1
-           $exa /proc/1/root     -T  2>&1 | diff -q - $results/proc_1_root   || exit 1
-           $exa /proc/1/root     -T@ 2>&1 | diff -q - $results/proc_1_root_@ || exit 1
+COLUMNS=80 $exa $testcases/links     2>&1 | diff -q - $results/links          || exit 1
+           $exa $testcases/links -1  2>&1 | diff -q - $results/links_1        || exit 1
+           $exa $testcases/links -T  2>&1 | diff -q - $results/links_T        || exit 1
+           $exa $testcases/links -T@ 2>&1 | diff -q - $results/links_T@       || exit 1
+           $exa /proc/1/root     -T  2>&1 | diff -q - $results/proc_1_root    || exit 1
+           $exa /proc/1/root     -T@ 2>&1 | diff -q - $results/proc_1_root_@  || exit 1
 
 # There’ve been bugs where the target file wasn’t printed properly when the
 # symlink file was specified on the command-line directly.
@@ -230,14 +230,35 @@ $exa $testcases/hiddens -l -a  2>&1 | diff -q - $results/hiddens_la   || exit 1
 $exa $testcases/hiddens -l -aa 2>&1 | diff -q - $results/hiddens_laa  || exit 1
 
 
+# Themes
+LS_COLORS="bd=31:cd=32:pi=34"  $exa -1 $testcases/specials 2>&1 | diff -q - $results/themed_specials  || exit 1
+EXA_COLORS="bd=31:cd=32:pi=34" $exa -1 $testcases/specials 2>&1 | diff -q - $results/themed_specials  || exit 1
+
+             LS_COLORS="*.deb=1;37:*.tar.*=1;37" $exa -1 $testcases/file-names-exts/compressed.* 2>&1 | diff -q - $results/themed_compresseds  || exit 1
+EXA_COLORS="*.deb=1;37:*.tar.*=1;37"             $exa -1 $testcases/file-names-exts/compressed.* 2>&1 | diff -q - $results/themed_compresseds  || exit 1
+EXA_COLORS="*.deb=1;37" LS_COLORS="*.tar.*=1;37" $exa -1 $testcases/file-names-exts/compressed.* 2>&1 | diff -q - $results/themed_compresseds  || exit 1
+
+ LS_COLORS="reset:*.deb=1;37:*.tar.*=1;37"       $exa -1 $testcases/file-names-exts/compressed.* 2>&1 | diff -q - $results/themed_compresseds    || exit 1
+EXA_COLORS="reset:*.deb=1;37:*.tar.*=1;37"       $exa -1 $testcases/file-names-exts/compressed.* 2>&1 | diff -q - $results/themed_compresseds_r  || exit 1
+
+EXA_COLORS="or=32:mi=32;1;4:cc=34;1:ln=34:lp=36;4:xx=32" $exa -1 $testcases/file-names/links 2>&1     | diff -q - $results/themed_links  || exit 1
+
+# EXA_COLORS overrides LS_COLORS
+LS_COLORS="bd=32:cd=34:pi=31" EXA_COLORS="bd=31:cd=32:pi=34" $exa -1 $testcases/specials 2>&1 | diff -q - $results/themed_specials  || exit 1
+
+EXA_COLORS="di=38;5;195:fi=38;5;250:xx=38;5;237:ur=38;5;194:uw=38;5;193:ux=38;5;192:gr=38;5;191:gw=38;5;190:gx=38;5;118:tr=38;5;119:tw=38;5;120:tx=38;5;121:su=38;5;51:sf=38;5;50:sn=38;5;49:un=38;5;46:da=38;5;47:ex=38;5;48" \
+    $exa --long $testcases/permissions 2>&1 | diff -q - $results/themed_long  || exit 1
+
+EXA_COLORS="reset" $exa $testcases/file-names-exts -1  2>&1 | diff -q - $results/themed_un  || exit 1
+
 # Errors
-$exa --binary     2>&1 | diff -q - $results/error_useless    || exit 1
-$exa --ternary    2>&1 | diff -q - $results/error_long       || exit 1
-$exa -4           2>&1 | diff -q - $results/error_short      || exit 1
-$exa --time       2>&1 | diff -q - $results/error_value      || exit 1
-$exa --long=time  2>&1 | diff -q - $results/error_overvalued || exit 1
-$exa -l --long    2>&1 | diff -q - $results/error_duplicate  || exit 1
-$exa -ll          2>&1 | diff -q - $results/error_twice      || exit 1
+$exa --binary     2>&1 | diff -q - $results/error_useless     || exit 1
+$exa --ternary    2>&1 | diff -q - $results/error_long        || exit 1
+$exa -4           2>&1 | diff -q - $results/error_short       || exit 1
+$exa --time       2>&1 | diff -q - $results/error_value       || exit 1
+$exa --long=time  2>&1 | diff -q - $results/error_overvalued  || exit 1
+$exa -l --long    2>&1 | diff -q - $results/error_duplicate   || exit 1
+$exa -ll          2>&1 | diff -q - $results/error_twice       || exit 1
 
 
 # Debug mode
@@ -246,8 +267,8 @@ EXA_DEBUG="1" $exa $testcases/attributes/dirs/no-xattrs_empty -lh 2>&1 | tail -n
 
 
 # And finally...
-$exa --help        | diff -q - $results/help      || exit 1
-$exa --help --long | diff -q - $results/help_long || exit 1
+$exa --help        | diff -q - $results/help       || exit 1
+$exa --help --long | diff -q - $results/help_long  || exit 1
 
 
 echo "All the tests passed!"
diff --git a/xtests/themed_compresseds b/xtests/themed_compresseds
@@ -0,0 +1,5 @@
+[36m/testcases/file-names-exts/[1;37mcompressed.deb[0m
+[36m/testcases/file-names-exts/[1;37mcompressed.tar.gz[0m
+[36m/testcases/file-names-exts/[1;37mcompressed.tar.xz[0m
+[36m/testcases/file-names-exts/[31mcompressed.tgz[0m
+[36m/testcases/file-names-exts/[31mcompressed.txz[0m
diff --git a/xtests/themed_compresseds_r b/xtests/themed_compresseds_r
@@ -0,0 +1,5 @@
+[36m/testcases/file-names-exts/[1;37mcompressed.deb[0m
+[36m/testcases/file-names-exts/[1;37mcompressed.tar.gz[0m
+[36m/testcases/file-names-exts/[1;37mcompressed.tar.xz[0m
+[36m/testcases/file-names-exts/[0mcompressed.tgz
+[36m/testcases/file-names-exts/[0mcompressed.txz
diff --git a/xtests/themed_links b/xtests/themed_links
@@ -0,0 +1,3 @@
+[34manother: [[1m\n[0m[34m][0m [32m->[0m [4;36m/testcases/file-names/new-line-dir: [[0m[1;34m\n[0m[4;36m]/[0manother: [[1;34m\n[0m]
+[34mbroken[0m [32m->[0m [1;4;32m/testcases/file-names/new-line-dir: [[34m\n[32m]/broken[0m
+[34msubfile[0m [32m->[0m [4;36m/testcases/file-names/new-line-dir: [[0m[1;34m\n[0m[4;36m]/[0msubfile
diff --git a/xtests/themed_long b/xtests/themed_long
@@ -0,0 +1,22 @@
+[38;5;250m.[38;5;237m---------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m000[0m
+[38;5;250m.[38;5;237m--------[38;5;121mx[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m001[0m
+[38;5;250m.[38;5;237m-------[38;5;120mw[38;5;237m-[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m002[0m
+[38;5;250m.[38;5;237m------[38;5;119mr[38;5;237m--[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m004[0m
+[38;5;250m.[38;5;237m-----[38;5;118mx[38;5;237m---[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m010[0m
+[38;5;250m.[38;5;237m----[38;5;190mw[38;5;237m----[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m020[0m
+[38;5;250m.[38;5;237m---[38;5;191mr[38;5;237m-----[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m040[0m
+[38;5;250m.[38;5;237m--[38;5;192mx[38;5;237m------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;48m100[0m
+[38;5;250m.[38;5;237m-[38;5;193mw[38;5;237m-------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m200[0m
+[38;5;250m.[38;5;194mr[38;5;237m--------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m400[0m
+[38;5;250m.[38;5;194mr[38;5;193mw[38;5;237m-[38;5;191mr[38;5;237m--[38;5;119mr[38;5;237m--[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m644[0m
+[38;5;250m.[38;5;194mr[38;5;193mw[38;5;192mx[38;5;191mr[38;5;237m-[38;5;118mx[38;5;119mr[38;5;237m-[38;5;121mx[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;48m755[0m
+[38;5;250m.[38;5;194mr[38;5;193mw[38;5;192mx[38;5;191mr[38;5;190mw[38;5;118mx[38;5;119mr[38;5;120mw[38;5;121mx[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;48m777[0m
+[38;5;250m.[38;5;237m--------[38;5;50mT[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m1000[0m
+[38;5;250m.[38;5;237m--------[38;5;50mt[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m1001[0m
+[38;5;250m.[38;5;237m-----[38;5;50mS[38;5;237m---[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m2000[0m
+[38;5;250m.[38;5;237m-----[38;5;50ms[38;5;237m---[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m2010[0m
+[38;5;250m.[38;5;237m--[38;5;50mS[38;5;237m------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m4000[0m
+[38;5;250m.[38;5;237m--[38;5;51ms[38;5;237m------[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;48m4100[0m
+[38;5;250m.[38;5;194mr[38;5;193mw[38;5;50mS[38;5;191mr[38;5;190mw[38;5;50mS[38;5;119mr[38;5;120mw[38;5;50mT[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;250m7666[0m
+[38;5;250m.[38;5;194mr[38;5;193mw[38;5;51ms[38;5;191mr[38;5;190mw[38;5;50ms[38;5;119mr[38;5;120mw[38;5;50mt[0m [38;5;49m0[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;48m7777[0m
+[38;5;195md[38;5;237m---------[0m [38;5;237m-[0m [38;5;46mcassowary[0m [38;5;47m 1 Jan 12:34[0m [38;5;195mforbidden-directory[0m
diff --git a/xtests/themed_specials b/xtests/themed_specials
@@ -0,0 +1,3 @@
+[31mblock-device[0m
+[32mchar-device[0m
+[34mnamed-pipe[0m
diff --git a/xtests/themed_un b/xtests/themed_un
@@ -0,0 +1,26 @@
+#SAVEFILE#
+backup~
+compiled.class
+compiled.coffee
+compiled.js
+compiled.o
+compressed.deb
+compressed.tar.gz
+compressed.tar.xz
+compressed.tgz
+compressed.txz
+COMPRESSED.ZIP
+crypto.asc
+crypto.signature
+document.pdf
+DOCUMENT.XLSX
+file.tmp
+IMAGE.PNG
+image.svg
+lossless.flac
+lossless.wav
+Makefile
+music.mp3
+MUSIC.OGG
+VIDEO.AVI
+video.wmv