Skip to content

Commit e2a7bdd

Browse files
committed
unify frame rate across plumbing (and later potentially porcelain)
1 parent 41e01a5 commit e2a7bdd

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

Diff for: Cargo.toml

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,16 @@ pretty-cli = ["structopt",
3636
"git-features/progress-log",
3737
"gitoxide-core/serde1",
3838
"prodash/log-renderer",
39-
"prodash/tui-renderer",
39+
"prodash-tui-renderer",
4040
"prodash/localtime",
4141
"env_logger",
4242
"smol"]
4343
lean-cli = ["argh", "git-features/progress-log", "env_logger"]
4444

45-
prodash-line-renderer-crossterm = ["prodash/line-renderer", "prodash/line-renderer-crossterm", "git-features/progress-prodash", "atty", "crosstermion"]
46-
prodash-line-renderer-termion = ["prodash/line-renderer", "prodash/line-renderer-termion", "git-features/progress-prodash", "atty", "crosstermion"]
45+
prodash-tui-renderer = ["prodash/tui-renderer"]
46+
prodash-line-renderer = ["prodash/line-renderer"]
47+
prodash-line-renderer-crossterm = ["prodash-line-renderer", "prodash/line-renderer-crossterm", "git-features/progress-prodash", "atty", "crosstermion"]
48+
prodash-line-renderer-termion = ["prodash-line-renderer", "prodash/line-renderer-termion", "git-features/progress-prodash", "atty", "crosstermion"]
4749

4850
[dependencies]
4951
anyhow = "1.0.31"

Diff for: src/plumbing-cli.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![forbid(unsafe_code)]
22

33
mod plumbing;
4-
#[cfg(feature = "lean-cli")]
54
mod shared;
65

76
use anyhow::Result;

Diff for: src/plumbing/lean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fn prepare(verbose: bool, name: &str) -> (Option<prodash::line::JoinHandle>, Opt
6565
progress,
6666
prodash::line::Options {
6767
level_filter: Some(std::ops::RangeInclusive::new(2, 2)),
68-
frames_per_second: 6.0,
68+
frames_per_second: crate::shared::DEFAULT_FRAME_RATE,
6969
initial_delay: Some(std::time::Duration::from_millis(1000)),
7070
output_is_terminal,
7171
colored: output_is_terminal && crosstermion::color::allowed(),

Diff for: src/plumbing/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fn init_progress(
7979
progress,
8080
prodash::tui::Options {
8181
title: "gitoxide".into(),
82-
frames_per_second: 6.0,
82+
frames_per_second: crate::shared::DEFAULT_FRAME_RATE,
8383
stop_if_empty_progress: !progress_keep_open,
8484
..Default::default()
8585
},

Diff for: src/porcelain-cli.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
mod porcelain;
44

5-
#[cfg(feature = "lean-cli")]
65
mod shared;
76

87
use anyhow::Result;

Diff for: src/shared.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
static VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " ", env!("CARGO_PKG_VERSION"));
1+
#[cfg(any(feature = "prodash-line-renderer", feature = "prodash-tui-renderer"))]
2+
pub const DEFAULT_FRAME_RATE: f32 = 6.0;
23

4+
#[cfg(all(feature = "lean-cli", not(feature = "pretty-cli")))]
35
pub fn from_env<T: argh::TopLevelCommand>() -> T {
6+
static VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " ", env!("CARGO_PKG_VERSION"));
47
let strings: Vec<String> = std::env::args().collect();
58
let strs: Vec<&str> = strings.iter().map(|s| s.as_str()).collect();
69
T::from_args(&[strs[0]], &strs[1..]).unwrap_or_else(|early_exit| {

0 commit comments

Comments
 (0)