Add image-backend argument

o2sh · Nov 9, 2019 · c5a1e2c · c5a1e2c
1 parent cb8225f
commit c5a1e2c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/src/image_backends/mod.rs b/src/image_backends/mod.rs
@@ -1,9 +1,9 @@
 use image::DynamicImage;
 
 #[cfg(target_os = "linux")]
-mod kitty;
+pub mod kitty;
 #[cfg(target_os = "linux")]
-mod sixel;
+pub mod sixel;
 
 pub trait ImageBackend {
     fn add_image(&self, lines: Vec<String>, image: &DynamicImage) -> String;

diff --git a/src/info.rs b/src/info.rs
@@ -8,7 +8,7 @@ use git2::Repository;
 use image::DynamicImage;
 use license::Detector;
 
-use crate::image_backends;
+use crate::image_backends::ImageBackend;
 use crate::language::Language;
 use crate::{AsciiArt, CommitInfo, Configuration, Error, InfoFieldOn};
 
@@ -35,6 +35,7 @@ pub struct Info {
     disable_fields: InfoFieldOn,
     bold_enabled: bool,
     custom_image: Option<DynamicImage>,
+    image_backend: Option<Box<dyn ImageBackend>>
 }
 
 impl std::fmt::Display for Info {
@@ -238,11 +239,11 @@ impl std::fmt::Display for Info {
         let mut info_lines = buf.lines();
 
         if let Some(custom_image) = &self.custom_image {
-            if let Some(backend) = image_backends::get_best_backend() {
+            if let Some(image_backend) = &self.image_backend {
                 writeln!(
                     f,
                     "{}",
-                    backend.add_image(
+                    image_backend.add_image(
                         info_lines.map(|s| format!("{}{}", center_pad, s)).collect(),
                         custom_image
                     )
@@ -286,6 +287,7 @@ impl Info {
         disabled: InfoFieldOn,
         bold_flag: bool,
         custom_image: Option<DynamicImage>,
+        image_backend: Option<Box<dyn ImageBackend>>,
         no_merges: bool,
     ) -> Result<Info> {
         let repo = Repository::discover(&dir).map_err(|_| Error::NotGitRepo)?;
@@ -326,6 +328,7 @@ impl Info {
             disable_fields: disabled,
             bold_enabled: bold_flag,
             custom_image,
+            image_backend,
         })
     }
 

diff --git a/src/main.rs b/src/main.rs
@@ -38,6 +38,7 @@ mod license;
 use ascii_art::AsciiArt;
 use commit_info::CommitInfo;
 use error::Error;
+use image_backends::ImageBackend;
 use info::Info;
 use language::Language;
 
@@ -192,6 +193,13 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
                 .takes_value(true)
                 .help("Sets a custom image to use instead of the ascii logo"),
         )
+        .arg(
+            Arg::with_name("image-backend")
+                .long("image-backend")
+                .takes_value(true)
+                .possible_values(&["kitty", "sixel"])
+                .help("Overrides image backend detection"),
+        )
         .arg(
             Arg::with_name("no-merges")
                 .short("m")
@@ -258,6 +266,20 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
     } else {
         None
     };
+    let image_backend = if custom_image.is_some() {
+        if let Some(backend_name) = matches.value_of("image-backend") {
+            #[cfg(target_os = "linux")]
+            Some(match backend_name {
+                "kitty" => Box::new(image_backends::kitty::KittyBackend::new()) as Box<dyn ImageBackend>,
+                "sixel" => Box::new(image_backends::sixel::SixelBackend::new()) as Box<dyn ImageBackend>,
+                _ => unreachable!()
+            })
+        } else {
+            crate::image_backends::get_best_backend()
+        }
+    } else {
+        None
+    };
 
     let no_merges = matches.is_present("no-merges");
 
@@ -268,6 +290,7 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
         disable_fields,
         bold_flag,
         custom_image,
+        image_backend,
         no_merges,
     )?;