Skip to content

Fix Unicode progress bar literals #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rdzehtsiar wants to merge 1 commit into from
Closed

Fix Unicode progress bar literals #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/pipeline/reporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const COUNT_VALUE_WIDTH: usize = 9;
const TOTAL_VALUE_WIDTH: usize = 10;
const SPEED_VALUE_WIDTH: usize = 10;
const MIN_RENDER_INTERVAL: Duration = Duration::from_millis(100);
const UNICODE_PROGRESS_BOUNDARY: &str = "│";
const UNICODE_PROGRESS_FILL: &str = "█";
#[cfg(windows)]
const UTF8_CODE_PAGE: u32 = 65001;

Expand Down Expand Up @@ -217,7 +219,11 @@ fn render_progress_bar_with_style(

match style {
ProgressBarStyle::Unicode => {
format!("│{}{}│", "█".repeat(filled), " ".repeat(width - filled))
format!(
"{UNICODE_PROGRESS_BOUNDARY}{}{spaces}{UNICODE_PROGRESS_BOUNDARY}",
UNICODE_PROGRESS_FILL.repeat(filled),
spaces = " ".repeat(width - filled)
)
}
ProgressBarStyle::Ascii => {
format!("[{}{}]", "#".repeat(filled), " ".repeat(width - filled))
Expand Down Expand Up @@ -296,9 +302,9 @@ mod tests {
use std::time::Duration;

use super::{
ascii_only_terminal_for, render_progress_bar, render_progress_row, render_report_lines,
render_report_lines_with_style, PipelineReporter, ProgressBarStyle, StdioReporter,
TerminalPlatform,
ascii_only_terminal_for, render_progress_bar, render_progress_bar_with_style,
render_progress_row, render_report_lines, render_report_lines_with_style, PipelineReporter,
ProgressBarStyle, StdioReporter, TerminalPlatform,
};
use crate::pipeline::events::{GitStatus, PipelineState};

Expand Down Expand Up @@ -415,10 +421,16 @@ mod tests {
assert_eq!(render_progress_bar(1, 2, 4), "│██ │");
assert_eq!(render_progress_bar(4, 4, 4), "│████│");
assert_eq!(render_progress_bar(5, 4, 4), "│████│");
assert_eq!(render_progress_bar(4, 8, 8), "│████ │");
}

#[test]
fn ascii_progress_bar_is_available_as_fallback() {
assert_eq!(
render_progress_bar_with_style(4, Some(8), 8, ProgressBarStyle::Ascii),
"[#### ]"
);

let state = PipelineState {
total_files: Some(2),
analyzed_files: 1,
Expand Down
Loading