refactor skim command line selections

1 files changed, 10 insertions, 13 deletions

diff --git a/src/skim.rs b/src/skim.rs
index 835812d..a1e99f7 100644
--- a/src/skim.rs
+++ b/src/skim.rs
@@ -21,22 +21,19 @@ impl Skimer {
     pub fn new(term: Arc<Term>) -> Self {
         Self {
             skim: Skim::new_from_term(term),
-            previewer: Self::select_previewer().to_owned(),
-            file_matcher: Self::select_file_matcher().to_owned(),
+            previewer: Self::select_installed_or_default(BAT_EXECUTABLE, CAT_EXECUTABLE).to_owned(),
+            file_matcher: Self::select_installed_or_default(RG_EXECUTABLE, GREP_EXECUTABLE)
+                .to_owned(),
         }
     }
 
-    fn select_previewer<'a>() -> &'a str {
-        match BAT_EXECUTABLE.split_whitespace().into_iter().next() {
-            Some(bat) if is_program_in_path(bat) => BAT_EXECUTABLE,
-            _ => CAT_EXECUTABLE,
-        }
-    }
-
-    fn select_file_matcher<'a>() -> &'a str {
-        match RG_EXECUTABLE.split_whitespace().into_iter().next() {
-            Some(rg) if is_program_in_path(rg) => RG_EXECUTABLE,
-            _ => GREP_EXECUTABLE,
+    fn select_installed_or_default<'a>(
+        candidate_program: &'a str,
+        default_program: &'a str,
+    ) -> &'a str {
+        match candidate_program.split_whitespace().into_iter().next() {
+            Some(program) if is_program_in_path(program) => candidate_program,
+            _ => default_program,
         }
     }