Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "remux"
-version = "0.3.6"
+version = "0.3.5"
 edition = "2021"
 authors = [ "Valerie Wolfe <sleeplessval@gmail.com>" ]
 description = "A friendly command shortener for tmux"

README.md

@@ -92,16 +92,10 @@ using an AUR package manager such as <a href="https://github.com/Morganamilo/par
 Install the package using Cargo with the command <code>cargo install tmux-remux</code>.
 </details>
 
-### Supplemental
+### Man Page
 
 <details>
-<summary>Bash Completions</summary>
+<summary>Section 1</summary>
-Copy <code>bash-completion/remux</code> to the appropriate directory, typically
-<code>/usr/share/bash-completion</code>.
-</details>
-
-<details>
-<summary>Man Page: Section 1</summary>
 Copy <code>man/remux.1</code> into <code>/usr/share/man/man1/</code>.
 </details>
 

bash-completion/remux

@@ -1,19 +0,0 @@
-_remux() {
-	local word
-	COMPREPLY=()
-	word="${COMP_WORDS[COMP_CWORD]}"
-
-	case $COMP_CWORD in
-	1)
-		COMPREPLY=( `compgen -W 'attach detach has help list new path switch title' -- "$word"` )
-		;;
-	2)
-		COMPREPLY=( `compgen -W "$(remux l -q $word)"` )
-		;;
-	esac
-
-	return 0
-}
-
-complete -F _remux remux
-

man/remux.1

@@ -101,8 +101,8 @@ aliases: p
 Prints the session path.
 .Ed
 .It Xo Ic switch
-.Op Fl rd
+.Op Fl r , Fl -read-only
-.Op Ar title
+.Ar title
 .Xc
 .Bd -literal -compact
 aliases: s
@@ -110,12 +110,10 @@ Switches from the current session to the target.
 .Ed
 .Pp
 .Bl -tag -width Ds -compact
-.It Fl d , Fl -detach
-Detaches other clients from the target session.
 .It Fl r , Fl -read-only
 Switch to the target session in read-only mode.
 .It Ar title
-The title of the session to switch to. If blank, the previous session will be used.
+The title of the session to switch to.
 .El
 .It Ic title
 .Bd -literal -compact
@@ -137,11 +135,6 @@ Default: '>'
 .It Ev REMUX_NEW_WINDOW
 Provides a default windows name when creating a new session. Unused if empty.
 Default: (unset)
-.It Ev REMUX_PREVIOUS_SYMBOL
-Changes the symbol displayed for the previous session in the
-.Ic list
-command.
-Default: '-'
 .It Ev REMUX_REPO_FILE
 The filename to match on when trying to find the root of a repository.
 Default: '.git'

src/command/session.rs

@@ -8,18 +8,21 @@ use tmux_interface::{
 use crate::{
 	error,
 	state::State,
-	util::{
+	util::{ self, NULL }
-		self,
-		message,
-		MSG_PREVIOUS, MSG_SESSION_PATH, NULL
-	}
 };
 
 pub fn path(state: &mut State) {
 	state.session_enforce("path");
 
-	if let Some(message) = message(MSG_SESSION_PATH) {
+	let message = commands::DisplayMessage::new().print().message("#{session_path}");
-		println!("{message}");
+
+	let result = Tmux::new().add_command(message).output().unwrap();
+	let text = String::from_utf8(result.0.stdout);
+
+	if let Ok(output) = text {
+		//	trim the trailing line break
+		let target = output.len() - 1;
+		println!("{}", &output[0..target]);
 	}
 }
 
@@ -30,33 +33,21 @@ pub fn switch(state: &mut State) {
 
 	//	consume optional flags
 	let read_only = state.flags.read_only;
-	let detach_other = state.flags.detached;
+	//TODO: -d flag handling needs to be done manually
 
 	let args = state.args.clone().finish();
-	let target: String = match if let Some(inner) = args.get(0) { inner.to_str() } else { None } {
+	if args.len() < 1 { error::missing_target(); }
-		None		|
+	let target = args.get(0).unwrap().to_string_lossy().to_string();
-		Some("-")	=>	if let Some(prev) = message(MSG_PREVIOUS) { prev }
-						else { error::missing_target() },
-
-		Some(inner)	=>	inner.to_owned()
-	};
 
 	let exists = util::session_exists(target.clone());
 	if !exists { error::no_target(target.clone()); }
 
-	let mut tmux = Tmux::new();
-
-	if detach_other {
-		let detach = commands::DetachClient::new()
-			.target_session(&target);
-		tmux = tmux.add_command(detach);
-	}
-
 	let mut switch = commands::SwitchClient::new();
-	switch = switch.target_session(&target);
+	switch = switch.target_session(target);
 	if read_only { switch.read_only = true; }
 
-	tmux.add_command(switch)
+	Tmux::new()
+		.add_command(switch)
 		.stderr(NULL).output().ok();
 }
 

src/command/share.rs

@@ -9,19 +9,11 @@ use tmux_interface::{
 };
 
 use crate::{
-	env::{
+	env::{ self, env_var },
-		self,
-		env_var,
-		SYMBOL_ATTACH, SYMBOL_CURRENT, SYMBOL_PREV
-	},
 	error,
 	flag,
 	state::State,
-	util::{
+	util::{ self, NULL }
-		self,
-		message,
-		MSG_PREVIOUS, NULL
-	}
 };
 
 pub fn attach(state: &mut State) {
@@ -64,7 +56,7 @@ pub fn attach(state: &mut State) {
 	state.nest_deinit();
 }
 
-pub fn context_action(state: &mut State) {
+pub fn context_action(state: &State) {
 	if !state.session {
 		if let Some(repository) = &state.repository {
 			let target = repository.name.clone();
@@ -80,7 +72,7 @@ pub fn context_action(state: &mut State) {
 		}
 	}
 	//	fallback behavior is list
-	list(state);
+	list(&state);
 }
 
 pub fn detach(state: &mut State) {
@@ -122,13 +114,10 @@ pub fn has(state: &mut State) {
 	exit( if success { 0 } else { 1 });
 }
 
-pub fn list(state: &mut State) {
+pub fn list(state: &State) {
 	//	get session list
 	let sessions = util::get_sessions().unwrap_or(Vec::new());
 
-	let search = state.target();
-	let previous = message(MSG_PREVIOUS);
-
 	//	handle empty case
 	if sessions.len() == 0 {
 		println!("no sessions");
@@ -136,41 +125,29 @@ pub fn list(state: &mut State) {
 	}
 
 	//	get attached session symbol
-	let attach_symbol	= env_var(SYMBOL_ATTACH);
+	let attach_symbol	= env_var(env::ATTACH_SYMBOL);
-	let current_symbol	= env_var(SYMBOL_CURRENT);
+	let current_symbol	= env_var(env::CURRENT_SYMBOL);
-	let prev_symbol		= env_var(SYMBOL_PREV);
 
 	//	pretty print session list
-	if !state.flags.quiet { println!("sessions:"); }
+	println!("sessions:");
-	for session in sessions {
+	for session in sessions.into_iter() {
 		let name = session.name.unwrap_or("[untitled]".to_string());
+		let id = session.id.unwrap();
 
-		if search.is_some() && !name.starts_with(search.as_ref().unwrap()) { continue; }
+		let attached = session.attached.unwrap_or(0) > 0;
+		let current = Some(name.clone()) == state.title;
 
-		if !state.flags.quiet {
+		println!(
-			let id = session.id.unwrap();
+			" {current} {name}{reset} ({bold}{blue}{id}{reset}) {bold}{green}{attach}{reset}",
-
+			//	values
-			let attached = session.attached.unwrap_or(0) > 0;
+			attach		= if attached { attach_symbol.clone() } else { "".to_string() },
-
+			current		= if current { current_symbol.clone() } else { " ".to_string() },
-			let compare = Some(name.clone());
+			//	formatting
-			let marker =
+			bold		= style::Bold,
-				if compare == state.title { current_symbol.clone() }
+			blue		= color::Fg(color::Blue),
-				else if state.session && compare == previous { prev_symbol.clone() }
+			green		= color::Fg(color::LightGreen),
-				else { " ".to_string() };
+			reset		= style::Reset,
-
+		);
-			println!(
-				" {marker} {name}{reset} ({bold}{blue}{id}{reset}) {bold}{green}{attach}{reset}",
-				//	values
-				attach		= if attached { attach_symbol.clone() } else { "".to_string() },
-				//	formatting
-				bold		= style::Bold,
-				blue		= color::Fg(color::Blue),
-				green		= color::Fg(color::LightGreen),
-				reset		= style::Reset,
-			);
-		} else {
-			print!("{name} ");
-		}
 	}
 }
 

src/env.rs

@@ -2,13 +2,12 @@ use std::env::var;
 
 pub type EnvVar = (&'static str, &'static str);
 
-pub const NEW_WINDOW_NAME:	EnvVar	= ("REMUX_NEW_WINDOW", "");
+pub static ATTACH_SYMBOL: EnvVar	= ("REMUX_ATTACH_SYMBOL", "*");
-pub const REPO_FILE:		EnvVar	= ("REMUX_REPO_FILE", ".git");
+pub static CURRENT_SYMBOL: EnvVar	= ("REMUX_CURRENT_SYMBOL", ">");
-pub const SYMBOL_ATTACH:	EnvVar	= ("REMUX_ATTACH_SYMBOL", "*");
+pub static NEW_WINDOW_NAME: EnvVar	= ("REMUX_NEW_WINDOW", "");
-pub const SYMBOL_CURRENT:	EnvVar	= ("REMUX_CURRENT_SYMBOL", ">");
+pub static REPO_FILE:		EnvVar	= ("REMUX_REPO_FILE", ".git");
-pub const SYMBOL_PREV:		EnvVar	= ("REMUX_PREVIOUS_SYMBOL", "-");
 
-pub const TMUX: &str				= "TMUX";
+pub static TMUX: &str				= "TMUX";
 
 ///	get or default an environment variable
 pub fn env_var(envvar: EnvVar) -> String {

src/error.rs

@@ -1,14 +1,14 @@
 use std::process::exit;
 
 ///	no subcommand that matches user input; code 1
-pub fn no_subcommand(subcommand: String) -> ! {
+pub fn no_subcommand(subcommand: String) {
 	eprintln!("remux: no command match for \"{subcommand}\"");
 	exit(1);
 }
 
 
 ///	target session not found; code 2
-pub fn no_target<S: Into<String>>(target: S) -> ! {
+pub fn no_target<S: Into<String>>(target: S) {
 	let target = target.into();
 	eprintln!("remux: no session \"{target}\" exists");
 	exit(2);
@@ -16,26 +16,26 @@ pub fn no_target<S: Into<String>>(target: S) -> ! {
 
 
 ///	help topic doesn't exist; code 3
-pub fn no_help(topic: String) -> ! {
+pub fn no_help(topic: String) {
 	eprintln!("remux: no help for \"{topic}\"");
 	exit(3);
 }
 
 
 ///	user provided no target; code 4
-pub fn missing_target() -> ! {
+pub fn missing_target() {
 	eprintln!("remux: no target provided");
 	exit(4);
 }
 
 ///	refuse to attach to current session; code 4
-pub fn same_session() -> ! {
+pub fn same_session() {
 	eprintln!("remux: cannot attach to same session");
 	exit(4);
 }
 
 ///	a session with the target name already exists; code 4
-pub fn target_exists<S: Into<String>>(target: S) -> ! {
+pub fn target_exists<S: Into<String>>(target: S) {
 	let target = target.into();
 	eprintln!("remux: session \"{target}\" already exists");
 	exit(4);
@@ -43,26 +43,26 @@ pub fn target_exists<S: Into<String>>(target: S) -> ! {
 
 
 ///	non-terminal environment prevention; code 5
-pub fn not_terminal() -> ! {
+pub fn not_terminal() {
 	eprintln!("remux: not running from a terminal");
 	exit(5);
 }
 
 
 ///	tried to nest while not in a session; code 6
-pub fn not_nesting() -> ! {
+pub fn not_nesting() {
 	eprintln!("remux: inappropriate nesting flag (-n); not in a session");
 	exit(6);
 }
 
 ///	operation requires nesting flag; code 6
-pub fn prevent_nest() -> ! {
+pub fn prevent_nest() {
 	eprintln!("remux: the nesting flag (-n) is required for nesting operation");
 	exit(6);
 }
 
 ///	operation conflicts with nesting flag; code 6
-pub fn conflict_nest(reason: Option<&'static str>) -> ! {
+pub fn conflict_nest(reason: Option<&'static str>) {
 	if let Some(reason) = reason { eprintln!("remux: inappropriate nesting flag (-n): {reason}"); }
 	else { eprintln!("remux: nesting flag (-n) is inappropriate for this operation."); }
 	exit(6);
@@ -70,7 +70,7 @@ pub fn conflict_nest(reason: Option<&'static str>) -> ! {
 
 
 ///	tried to run a session command outside a session; code 7
-pub fn not_in_session(cmd: &'static str) -> ! {
+pub fn not_in_session(cmd: &'static str) {
 	eprintln!("remux: '{cmd}' must be run from within a session");
 	exit(7);
 }

src/main.rs

@@ -38,7 +38,7 @@ fn main() {
 		Some("help")
 			=>	help(&mut args),
 		None
-			=>	command::share::context_action(&mut state),
+			=>	command::share::context_action(&state),
 
 		Some("a" | "attach")
 			=>	command::share::attach(&mut state),
@@ -50,7 +50,7 @@ fn main() {
 			=>	command::share::has(&mut state),
 
 		Some("l" | "ls" | "list")
-			=>	command::share::list(&mut state),
+			=>	command::share::list(&state),
 
 		Some("n" | "new")
 			=>	command::share::new(&mut state),

src/state.rs

@@ -9,7 +9,7 @@ use crate::{
 	env::{ env_var, REPO_FILE, TMUX },
 	error,
 	flag::Flags,
-	util::{ find, message, MSG_SESSION_NAME }
+	util::{ find, session_name }
 };
 
 pub struct State<'a> {
@@ -29,7 +29,7 @@ impl State<'_> {
 		let flags = Flags::from(args);
 		let tmux_var = env::var(TMUX).ok();
 		let session = tmux_var.is_some();
-		let title = if session { message(MSG_SESSION_NAME) } else { None };
+		let title = if session { session_name() } else { None };
 		let repository = Repository::find();
 
 		State {
@@ -67,7 +67,10 @@ impl State<'_> {
 		let from_args = self.target();
 		if from_args.is_some() { return from_args; }
 		else if let Some(repository) = &self.repository { Some(repository.name.clone()) }
-		else { error::missing_target() }
+		else {
+			error::missing_target();
+			None
+		}
 	}
 }
 

src/util.rs

@@ -14,20 +14,14 @@ use crate::error;
 
 pub const NULL: Option<StdIO> = Some(StdIO::Null);
 
-pub const MSG_PREVIOUS:		&str	= "#{client_last_session}";
+pub fn session_name() -> Option<String> {
-pub const MSG_SESSION_NAME:	&str	= "#S";
+	let message = commands::DisplayMessage::new().print().message("#{session_name}");
-pub const MSG_SESSION_PATH:	&str	= "#{session_path}";
-pub const MSG_WINDOW_NAME:	&str	= "#{window_name}";
-
-pub fn message(fstr: &str) -> Option<String> {
-	let message = commands::DisplayMessage::new().print().message(fstr);
 
 	let result = Tmux::new().add_command(message).output();
 	if let Ok(output) = result {
 		let text = String::from_utf8(output.0.stdout);
 		if let Ok(title) = text {
-			if title.len() > 0 { Some(title[0..title.len() - 1].to_owned()) }
+			Some(title[0..title.len() - 1].to_owned())
-			else { None }
 		} else { None }
 	} else { None }
 }