mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-26 23:36:30 +00:00
Done documentation
This commit is contained in:
parent
96a44f3dcf
commit
c8481d35c1
5 changed files with 15 additions and 13 deletions
|
@ -12,6 +12,7 @@ const MIN_LINE_WIDTH: u16 = WRAPPER_WIDTH + 4;
|
||||||
const PROGRESS_EXCEEDS_MAX_ERR: &str =
|
const PROGRESS_EXCEEDS_MAX_ERR: &str =
|
||||||
"The progress of the progress bar is higher than the maximum";
|
"The progress of the progress bar is higher than the maximum";
|
||||||
|
|
||||||
|
/// Terminal progress bar to be used when not using Ratataui.
|
||||||
pub fn progress_bar(progress: u16, total: u16, line_width: u16) -> Result<String> {
|
pub fn progress_bar(progress: u16, total: u16, line_width: u16) -> Result<String> {
|
||||||
use crossterm::style::Stylize;
|
use crossterm::style::Stylize;
|
||||||
|
|
||||||
|
@ -54,6 +55,8 @@ pub fn progress_bar(progress: u16, total: u16, line_width: u16) -> Result<String
|
||||||
Ok(line)
|
Ok(line)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Progress bar to be used with Ratataui.
|
||||||
|
// Not using Ratatui's Gauge widget to keep the progress bar consistent.
|
||||||
pub fn progress_bar_ratatui(progress: u16, total: u16, line_width: u16) -> Result<Line<'static>> {
|
pub fn progress_bar_ratatui(progress: u16, total: u16, line_width: u16) -> Result<Line<'static>> {
|
||||||
use ratatui::style::Stylize;
|
use ratatui::style::Stylize;
|
||||||
|
|
||||||
|
|
|
@ -41,11 +41,7 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
|
||||||
|
|
||||||
match app_state.done_current_exercise(&mut stdout)? {
|
match app_state.done_current_exercise(&mut stdout)? {
|
||||||
ExercisesProgress::AllDone => (),
|
ExercisesProgress::AllDone => (),
|
||||||
ExercisesProgress::CurrentPending => println!(
|
ExercisesProgress::CurrentPending | ExercisesProgress::NewPending => println!(
|
||||||
"Current exercise: {}",
|
|
||||||
app_state.current_exercise().terminal_link(),
|
|
||||||
),
|
|
||||||
ExercisesProgress::NewPending => println!(
|
|
||||||
"Next exercise: {}",
|
"Next exercise: {}",
|
||||||
app_state.current_exercise().terminal_link(),
|
app_state.current_exercise().terminal_link(),
|
||||||
),
|
),
|
||||||
|
|
|
@ -14,7 +14,7 @@ use std::{
|
||||||
use crate::app_state::{AppState, ExercisesProgress};
|
use crate::app_state::{AppState, ExercisesProgress};
|
||||||
|
|
||||||
use self::{
|
use self::{
|
||||||
notify_event::DebounceEventHandler,
|
notify_event::NotifyEventHandler,
|
||||||
state::WatchState,
|
state::WatchState,
|
||||||
terminal_event::{terminal_event_handler, InputEvent},
|
terminal_event::{terminal_event_handler, InputEvent},
|
||||||
};
|
};
|
||||||
|
@ -40,6 +40,7 @@ pub enum WatchExit {
|
||||||
List,
|
List,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `notify_exercise_names` as None activates the manual run mode.
|
||||||
pub fn watch(
|
pub fn watch(
|
||||||
app_state: &mut AppState,
|
app_state: &mut AppState,
|
||||||
notify_exercise_names: Option<&'static [&'static [u8]]>,
|
notify_exercise_names: Option<&'static [&'static [u8]]>,
|
||||||
|
@ -52,7 +53,7 @@ pub fn watch(
|
||||||
let _debouncer_guard = if let Some(exercise_names) = notify_exercise_names {
|
let _debouncer_guard = if let Some(exercise_names) = notify_exercise_names {
|
||||||
let mut debouncer = new_debouncer(
|
let mut debouncer = new_debouncer(
|
||||||
Duration::from_millis(200),
|
Duration::from_millis(200),
|
||||||
DebounceEventHandler {
|
NotifyEventHandler {
|
||||||
tx: tx.clone(),
|
tx: tx.clone(),
|
||||||
exercise_names,
|
exercise_names,
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,12 +3,13 @@ use std::sync::mpsc::Sender;
|
||||||
|
|
||||||
use super::WatchEvent;
|
use super::WatchEvent;
|
||||||
|
|
||||||
pub struct DebounceEventHandler {
|
pub struct NotifyEventHandler {
|
||||||
pub tx: Sender<WatchEvent>,
|
pub tx: Sender<WatchEvent>,
|
||||||
|
/// Used to report which exercise was modified.
|
||||||
pub exercise_names: &'static [&'static [u8]],
|
pub exercise_names: &'static [&'static [u8]],
|
||||||
}
|
}
|
||||||
|
|
||||||
impl notify_debouncer_mini::DebounceEventHandler for DebounceEventHandler {
|
impl notify_debouncer_mini::DebounceEventHandler for NotifyEventHandler {
|
||||||
fn handle_event(&mut self, input_event: DebounceEventResult) {
|
fn handle_event(&mut self, input_event: DebounceEventResult) {
|
||||||
let output_event = match input_event {
|
let output_event = match input_event {
|
||||||
Ok(input_event) => {
|
Ok(input_event) => {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use crossterm::{
|
use crossterm::{
|
||||||
style::{style, Stylize},
|
style::{style, Stylize},
|
||||||
terminal::size,
|
terminal,
|
||||||
};
|
};
|
||||||
use std::io::{self, StdoutLock, Write};
|
use std::io::{self, StdoutLock, Write};
|
||||||
|
|
||||||
|
@ -84,6 +84,7 @@ impl<'a> WatchState<'a> {
|
||||||
self.run_current_exercise()
|
self.run_current_exercise()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Move on to the next exercise if the current one is done.
|
||||||
pub fn next_exercise(&mut self) -> Result<ExercisesProgress> {
|
pub fn next_exercise(&mut self) -> Result<ExercisesProgress> {
|
||||||
if self.done_status == DoneStatus::Pending {
|
if self.done_status == DoneStatus::Pending {
|
||||||
return Ok(ExercisesProgress::CurrentPending);
|
return Ok(ExercisesProgress::CurrentPending);
|
||||||
|
@ -113,7 +114,7 @@ impl<'a> WatchState<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn render(&mut self) -> Result<()> {
|
pub fn render(&mut self) -> Result<()> {
|
||||||
// Prevent having the first line shifted.
|
// Prevent having the first line shifted if clearing wasn't successful.
|
||||||
self.writer.write_all(b"\n")?;
|
self.writer.write_all(b"\n")?;
|
||||||
|
|
||||||
clear_terminal(&mut self.writer)?;
|
clear_terminal(&mut self.writer)?;
|
||||||
|
@ -145,11 +146,11 @@ When you are done experimenting, enter `n` to move on to the next exercise 🦀"
|
||||||
writeln!(
|
writeln!(
|
||||||
self.writer,
|
self.writer,
|
||||||
"A solution file can be found at {}\n",
|
"A solution file can be found at {}\n",
|
||||||
style(TerminalFileLink(solution_path)).underlined().green()
|
style(TerminalFileLink(solution_path)).underlined().green(),
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let line_width = size()?.0;
|
let line_width = terminal::size()?.0;
|
||||||
let progress_bar = progress_bar(
|
let progress_bar = progress_bar(
|
||||||
self.app_state.n_done(),
|
self.app_state.n_done(),
|
||||||
self.app_state.exercises().len() as u16,
|
self.app_state.exercises().len() as u16,
|
||||||
|
|
Loading…
Reference in a new issue