preliminary support for line renderer in max version

Abort handling still needs to be improved for both tui and
ultimately line renderer, which shoudl be allowed to hide the cursor

Author: Byron

Diff for: Cargo.toml

@@ -33,7 +33,6 @@ small = ["lean-cli"]
 fast = ["git-features/parallel", "git-features/fast-sha1"]
 pretty-cli = ["structopt",
               "git-features/progress-prodash",
-              "git-features/progress-log",
               "gitoxide-core/serde1",
               "prodash/log-renderer",
               "prodash-tui-renderer",

Diff for: src/plumbing/lean.rs

@@ -59,20 +59,7 @@ fn prepare(verbose: bool, name: &str) -> (Option<prodash::line::JoinHandle>, Opt
     if verbose {
         let progress = prodash::Tree::new();
         let sub_progress = progress.add_child(name);
-        let output_is_terminal = atty::is(atty::Stream::Stderr);
-        let handle = prodash::line::render(
-            stderr(),
-            progress,
-            prodash::line::Options {
-                level_filter: Some(std::ops::RangeInclusive::new(2, 2)),
-                frames_per_second: crate::shared::DEFAULT_FRAME_RATE,
-                initial_delay: Some(std::time::Duration::from_millis(1000)),
-                output_is_terminal,
-                colored: output_is_terminal && crosstermion::color::allowed(),
-                timestamp: true,
-                ..prodash::line::Options::default()
-            },
-        );
+        let handle = crate::shared::setup_line_renderer(progress, 2);
         (Some(handle), Some(sub_progress))
     } else {
         (None, None)

Diff for: src/plumbing/pretty.rs

@@ -63,14 +63,16 @@ fn init_progress(
     verbose: bool,
     progress: bool,
     progress_keep_open: bool,
-) -> (
-    Option<JoinThreadOnDrop>,
-    Option<progress::Either<progress::Log, prodash::tree::Item>>,
-) {
-    super::init_env_logger(verbose);
+) -> (Option<JoinThreadOnDrop>, Option<prodash::tree::Item>) {
+    super::init_env_logger(false);
     match (verbose, progress) {
         (false, false) => (None, None),
-        (true, false) => (None, Some(progress::Either::Left(progress::Log::new(name, Some(1))))),
+        (true, false) => {
+            let progress = prodash::Tree::new();
+            let sub_progress = progress.add_child(name);
+            let handle = crate::shared::setup_line_renderer(progress, 2);
+            (Some(JoinThreadOnDrop(None, Some(handle))), Some(sub_progress))
+        }
         (true, true) | (false, true) => {
             let progress = prodash::Tree::new();
             let sub_progress = progress.add_child(name);
@@ -87,15 +89,12 @@ fn init_progress(
             .expect("tui to come up without io error");
             let handle = std::thread::spawn(move || smol::run(render_tui));
 
-            (
-                Some(JoinThreadOnDrop(Some(handle))),
-                Some(progress::Either::Right(sub_progress)),
-            )
+            (Some(JoinThreadOnDrop(Some(handle), None)), Some(sub_progress))
         }
     }
 }
 
-struct JoinThreadOnDrop(Option<std::thread::JoinHandle<()>>);
+struct JoinThreadOnDrop(Option<std::thread::JoinHandle<()>>, Option<prodash::line::JoinHandle>);
 impl Drop for JoinThreadOnDrop {
     fn drop(&mut self) {
         self.0.take().and_then(|handle| handle.join().ok());

Diff for: src/shared.rs

@@ -1,6 +1,24 @@
 #[cfg(any(feature = "prodash-line-renderer", feature = "prodash-tui-renderer"))]
 pub const DEFAULT_FRAME_RATE: f32 = 6.0;
 
+#[cfg(feature = "prodash-line-renderer")]
+pub fn setup_line_renderer(progress: prodash::Tree, level: prodash::tree::Level) -> prodash::line::JoinHandle {
+    let output_is_terminal = atty::is(atty::Stream::Stderr);
+    prodash::line::render(
+        std::io::stderr(),
+        progress,
+        prodash::line::Options {
+            level_filter: Some(std::ops::RangeInclusive::new(level, level)),
+            frames_per_second: DEFAULT_FRAME_RATE,
+            initial_delay: Some(std::time::Duration::from_millis(1000)),
+            output_is_terminal,
+            colored: output_is_terminal && crosstermion::color::allowed(),
+            timestamp: true,
+            ..prodash::line::Options::default()
+        },
+    )
+}
+
 #[cfg(all(feature = "lean-cli", not(feature = "pretty-cli")))]
 pub fn from_env<T: argh::TopLevelCommand>() -> T {
     static VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " ", env!("CARGO_PKG_VERSION"));