From 5fe9cba1dd639ad33afdb3c4a575d4a37eb9a71b Mon Sep 17 00:00:00 2001 From: olirwin <43677298+olirwin@users.noreply.github.com> Date: Mon, 6 Mar 2023 09:48:49 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20support=20for?= =?UTF-8?q?=20files=20with=20no=20extension?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/colorls/core.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/colorls/core.rb b/lib/colorls/core.rb index aa6a09b1..10329df8 100644 --- a/lib/colorls/core.rb +++ b/lib/colorls/core.rb @@ -381,7 +381,10 @@ def options(content) color = @colors[:dir] group = :folders else - key = File.extname(content.name).delete_prefix('.').downcase.to_sym + extension = File.extname(content.name).delete_prefix(".") + basename = File.basename(content.name, ".*").delete_prefix(".") + key = extension.empty? ? basename : extension + key = key.downcase.to_sym key = @file_aliases[key] unless @files.key? key color = file_color(content, key) group = @files.key?(key) ? :recognized_files : :unrecognized_files From fdcd93c02746d6a0c0da06f4bb9f7944ccfa7617 Mon Sep 17 00:00:00 2001 From: olirwin <43677298+olirwin@users.noreply.github.com> Date: Mon, 1 May 2023 15:32:41 +0200 Subject: [PATCH 2/2] =?UTF-8?q?linter:=20=F0=9F=9A=A8=20remove=20warning?= =?UTF-8?q?=20for=20double=20quote=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should remove warnings in tests due to double quoted strings --- lib/colorls/core.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/colorls/core.rb b/lib/colorls/core.rb index 10329df8..df0346f2 100644 --- a/lib/colorls/core.rb +++ b/lib/colorls/core.rb @@ -381,9 +381,8 @@ def options(content) color = @colors[:dir] group = :folders else - extension = File.extname(content.name).delete_prefix(".") - basename = File.basename(content.name, ".*").delete_prefix(".") - key = extension.empty? ? basename : extension + extension = File.extname(content.name).delete_prefix('.') + key = extension.empty? ? content.name.delete_prefix('.') : extension key = key.downcase.to_sym key = @file_aliases[key] unless @files.key? key color = file_color(content, key)