valerie/remux
1
0
Fork 0
Code Issues Pull requests Releases 6 Packages Activity

'new' now attempts to fall back to repository root name

Browse source
This commit is contained in:
Valerie Wolfe 2024-02-28 14:42:24 -05:00
parent 3dc0e82ad6
commit 90f3b9a999
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/command.rs
View file

@ -127,10 +127,18 @@ pub fn new(pargs: &mut Arguments) {
// get target and error out if not provided // get target and error out if not provided
let args = pargs.clone().finish(); let args = pargs.clone().finish();
if args.len() < 1 { error::missing_target(); }
// get target session and optional command // collect name and command arguments
let title = args.get(0).unwrap().to_string_lossy(); let title: String;
if args.len() < 1 {
// missing name will attempt to fall back to repository
let repo = util::repo_root(current_dir().unwrap());
if repo.is_none() { error::missing_target(); }
title = repo.unwrap().file_name().unwrap().to_string_lossy().to_string();
} else {
title = args.get(0).unwrap().to_string_lossy().to_string();
}
let command = args.get(1); let command = args.get(1);
// build command // build command

4
src/util.rs
View file

@ -38,13 +38,13 @@ pub fn session_exists(target: String) -> bool {
} }
/// recursively attempt to find a git root directory /// recursively attempt to find a git root directory
fn repo_root(path: PathBuf) -> Option<PathBuf> { pub fn repo_root(path: PathBuf) -> Option<PathBuf> {
// if .git dir is found, return // if .git dir is found, return
if path.join(".git").exists() { return Some(path); } if path.join(".git").exists() { return Some(path); }
// otherwise, attempt to traverse // otherwise, attempt to traverse
let parent = path.parent(); let parent = path.parent();
if let Some(parent) = parent { git_traverse(parent.to_path_buf()) } if let Some(parent) = parent { repo_root(parent.to_path_buf()) }
else { None } else { None }
} }