valerie/remux
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

moved repo fallback into a helper function

Browse source
This commit is contained in:
Valerie Wolfe 2024-02-28 17:55:33 -05:00
parent 2ede502884
commit e0ea051bf4
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/command.rs
View file

@ -24,10 +24,7 @@ pub fn attach(pargs: &mut Arguments) {
let window: Option<&OsString>; let window: Option<&OsString>;
if args.len() < 1 { if args.len() < 1 {
// missing name will attempt to fall back to repository // missing name will attempt to fall back to repository
let repo = util::repo_root(current_dir().unwrap()); target = util::repo_fallback();
if repo.is_none() { error::missing_target(); }
target = repo.unwrap().file_name().unwrap().to_string_lossy().to_string();
if !util::session_exists(target.clone()) { error::missing_target(); } if !util::session_exists(target.clone()) { error::missing_target(); }
window = None; window = None;
} else { } else {
@ -87,10 +84,7 @@ pub fn has(pargs: &mut Arguments) {
let target: String; let target: String;
if args.len() < 1 { if args.len() < 1 {
// missing name will attempt to fall back to repository // missing name will attempt to fall back to repository
let repo = util::repo_root(current_dir().unwrap()); target = util::repo_fallback();
if repo.is_none() { error::missing_target(); }
target = repo.unwrap().file_name().unwrap().to_string_lossy().to_string();
} else { } else {
target = args.get(0).unwrap().to_string_lossy().to_string(); target = args.get(0).unwrap().to_string_lossy().to_string();
} }
@ -153,10 +147,7 @@ pub fn new(pargs: &mut Arguments) {
let command: Option<&OsString>; let command: Option<&OsString>;
if args.len() < 1 { if args.len() < 1 {
// missing name will attempt to fall back to repository // missing name will attempt to fall back to repository
let repo = util::repo_root(current_dir().unwrap()); title = util::repo_fallback();
if repo.is_none() { error::missing_target(); }
title = repo.unwrap().file_name().unwrap().to_string_lossy().to_string();
command = None; command = None;
} else { } else {
title = args.get(0).unwrap().to_string_lossy().to_string(); title = args.get(0).unwrap().to_string_lossy().to_string();

13
src/util.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
env::var, env::{ current_dir, var },
path::PathBuf, path::PathBuf,
process::exit process::exit
}; };
@ -9,6 +9,8 @@ use tmux_interface::{
variables::session::session::SESSION_ALL variables::session::session::SESSION_ALL
}; };
use crate::error;
/// return a Vec of all sessions or None /// return a Vec of all sessions or None
pub fn get_sessions() -> Option<Vec<Session>> { pub fn get_sessions() -> Option<Vec<Session>> {
let i_sessions = Sessions::get(SESSION_ALL); let i_sessions = Sessions::get(SESSION_ALL);
@ -37,6 +39,15 @@ pub fn session_exists<S: Into<String>>(target: S) -> bool {
.success() .success()
} }
/// attempt to return the repo name or exit
pub fn repo_fallback() -> String {
let repo = repo_root(current_dir().unwrap());
if repo.is_none() { error::missing_target(); }
let target = repo.unwrap().file_name().unwrap().to_string_lossy().to_string();
target
}
/// recursively attempt to find a git root directory /// recursively attempt to find a git root directory
pub 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