extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-06-20 18:07:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

stats: Misc improvements (#1613)

Browse Source 
* fix(stats): Don't bail/error if no command is found

An empty history shouldn't be source of error when printing stats.

* fix(stats): Improve help message a bit.

It wasn't clear what the period format could be.
This commit is contained in:
Philippe Normand 2024-01-24 19:37:05 +00:00 committed by GitHub
parent bdc533d2bc
commit 079a078fdb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atuin/src/command/client/stats.rs
View File

@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
use atuin_common::utils::Escapable as _; use atuin_common::utils::Escapable as _;
use clap::Parser; use clap::Parser;
use crossterm::style::{Color, ResetColor, SetAttribute, SetForegroundColor}; use crossterm::style::{Color, ResetColor, SetAttribute, SetForegroundColor};
use eyre::{bail, Result}; use eyre::Result;
use interim::parse_date_string; use interim::parse_date_string;
use atuin_client::{ use atuin_client::{
@ -16,7 +16,7 @@ use time::{Duration, OffsetDateTime, Time};
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[command(infer_subcommands = true)] #[command(infer_subcommands = true)]
pub struct Cmd { pub struct Cmd {
/// compute statistics for the specified period, leave blank for statistics since the beginning /// Compute statistics for the specified period, leave blank for statistics since the beginning. See https://docs.atuin.sh/reference/stats/ for more details.
period: Vec<String>, period: Vec<String>,
/// How many top commands to list /// How many top commands to list
@ -24,7 +24,7 @@ pub struct Cmd {
count: usize, count: usize,
} }
fn compute_stats(settings: &Settings, history: &[History], count: usize) -> Result<()> { fn compute_stats(settings: &Settings, history: &[History], count: usize) {
let mut commands = HashSet::<&str>::with_capacity(history.len()); let mut commands = HashSet::<&str>::with_capacity(history.len());
let mut prefixes = HashMap::<&str, usize>::with_capacity(history.len()); let mut prefixes = HashMap::<&str, usize>::with_capacity(history.len());
for i in history { for i in history {
@ -41,7 +41,8 @@ fn compute_stats(settings: &Settings, history: &[History], count: usize) -> Resu
top.sort_unstable_by_key(|x| std::cmp::Reverse(x.1)); top.sort_unstable_by_key(|x| std::cmp::Reverse(x.1));
top.truncate(count); top.truncate(count);
if top.is_empty() { if top.is_empty() {
bail!("No commands found"); println!("No commands found");
return;
} }
let max = top.iter().map(|x| x.1).max().unwrap(); let max = top.iter().map(|x| x.1).max().unwrap();
@ -74,8 +75,6 @@ fn compute_stats(settings: &Settings, history: &[History], count: usize) -> Resu
} }
println!("Total commands: {}", history.len()); println!("Total commands: {}", history.len());
println!("Unique commands: {unique}"); println!("Unique commands: {unique}");
Ok(())
} }
impl Cmd { impl Cmd {
@ -114,7 +113,7 @@ impl Cmd {
let end = start + Duration::days(1); let end = start + Duration::days(1);
db.range(start, end).await? db.range(start, end).await?
}; };
compute_stats(settings, &history, self.count)?; compute_stats(settings, &history, self.count);
Ok(()) Ok(())
} }
} }