From 969840a15709b1ede088fdfc54aa53f032993c45 Mon Sep 17 00:00:00 2001 From: Matan Kushner Date: Mon, 8 Apr 2019 23:35:14 -0400 Subject: [PATCH] Tidy up dir section --- .vscode/launch.json | 45 ---------------------- src/main.rs | 1 + src/modules/directory.rs | 80 ++++++++++++++++++++-------------------- 3 files changed, 40 insertions(+), 86 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index acec0046..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "lldb", - "request": "launch", - "name": "Debug executable 'starship'", - "cargo": { - "args": [ - "build", - "--bin=starship", - "--package=starship" - ], - "filter": { - "name": "starship", - "kind": "bin" - } - }, - "args": [], - "cwd": "${workspaceFolder}" - }, - { - "type": "lldb", - "request": "launch", - "name": "Debug unit tests in executable 'starship'", - "cargo": { - "args": [ - "test", - "--no-run", - "--bin=starship", - "--package=starship" - ], - "filter": { - "name": "starship", - "kind": "bin" - } - }, - "args": [], - "cwd": "${workspaceFolder}" - } - ] -} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 9eb01393..b8f11cfc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ #[macro_use] extern crate clap; + extern crate ansi_term; extern crate dirs; extern crate git2; diff --git a/src/modules/directory.rs b/src/modules/directory.rs index 9b5b8195..edbdc1f6 100644 --- a/src/modules/directory.rs +++ b/src/modules/directory.rs @@ -1,12 +1,20 @@ use super::Segment; +use std::env; +use std::path::PathBuf; use ansi_term::{Color, Style}; use clap::ArgMatches; use dirs; use git2::Repository; -use std::env; -use std::path::PathBuf; /// Creates a segment with the current directory +/// +/// Will perform path contraction and truncation. +/// **Contraction** +/// - Paths begining with the home directory will be contracted to `~` +/// - Paths containing a git repo will contract to begin at the repo root +/// +/// **Truncation** +/// Paths will be limited in length to `3` path components by default. pub fn segment(_: &ArgMatches) -> Segment { const COLOR_DIR: Color = Color::Cyan; const DIR_TRUNCATION_LENGTH: usize = 3; @@ -19,9 +27,9 @@ pub fn segment(_: &ArgMatches) -> Segment { let dir_string; if let Ok(repo) = git2::Repository::discover(¤t_path) { + // Contract the path to the git repo root let repo_root = get_repo_root(repo); - // The folder name is the last component to the repo path let repo_folder_name = repo_root .components() .last() @@ -30,25 +38,18 @@ pub fn segment(_: &ArgMatches) -> Segment { .to_str() .unwrap(); - dir_string = truncate_path( - &DIR_TRUNCATION_LENGTH, - ¤t_path, - &repo_root, - &repo_folder_name, - ); + dir_string = contract_path(¤t_path, &repo_root, &repo_folder_name); } else { + // Contract the path to the home directory let home_dir = dirs::home_dir().unwrap(); - - dir_string = truncate_path( - &DIR_TRUNCATION_LENGTH, - ¤t_path, - &home_dir, - HOME_SYMBOL, - ); + dir_string = contract_path(¤t_path, &home_dir, HOME_SYMBOL); } + // Truncate the dir string to the maximum number of path components + let truncated_dir_string = truncate(dir_string, DIR_TRUNCATION_LENGTH); + Segment { - value: dir_string, + value: truncated_dir_string, style: Style::from(COLOR_DIR).bold(), ..Default::default() } @@ -65,36 +66,18 @@ fn get_repo_root(repo: Repository) -> PathBuf { } } -/// Truncate a path to a predefined number of path components -/// -/// Trim the path in the prompt to only have the last few paths, set by `length`. -/// This function also serves to replace the top-level path of the prompt. -/// This can be used to replace the path to a git repo with only the repo -/// directory name. -fn truncate_path( - length: &usize, - full_path: &PathBuf, - top_level_path: &PathBuf, - top_level_replacement: &str, -) -> String { +/// Contract the root component of a path +fn contract_path(full_path: &PathBuf, top_level_path: &PathBuf, top_level_replacement: &str) -> String { + if !full_path.starts_with(top_level_path) { + return full_path.to_str().unwrap().to_string(); + } + if full_path == top_level_path { return top_level_replacement.to_string(); } - let full_path_depth = full_path.components().count(); let top_level_path_depth = top_level_path.components().count(); - // Don't bother with replacing top level path if length is long enough - if full_path_depth - top_level_path_depth >= *length { - return full_path - .iter() - .skip(full_path_depth - length) - .collect::() - .to_str() - .unwrap() - .to_string(); - } - format!( "{replacement}{separator}{path}", replacement = top_level_replacement, @@ -108,6 +91,21 @@ fn truncate_path( ) } +/// Truncate a path to only have a set number of path components +fn truncate(dir_string: String, length: usize) -> String { + if length == 0 { + return dir_string; + } + + let components = dir_string.split(std::path::MAIN_SEPARATOR).collect::>(); + if components.len() < length { + return dir_string; + } + + let truncated_components = &components[..length]; + truncated_components.join(&std::path::MAIN_SEPARATOR.to_string()) +} + #[cfg(test)] mod tests { // TODO: Look into stubbing `env` so that tests can be run in parallel