Make exec command find first session with address

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- `exec` command now looks for the first session with address instead of failing
+
 ## [2.0.5] - 2024-05-06
 
 ### Fixed

src/cli/exec.rs

@@ -46,7 +46,14 @@ impl Exec {
 			// TODO: Implement standalone mode
 			argon_error!("Standalone mode is not implemented yet!");
 		} else if let Some(session) = sessions::get(self.session, self.host, self.port)? {
-			if let Some(address) = session.get_address() {
+			let address = session.get_address().or_else(|| {
+				sessions::get_all()
+					.unwrap_or_default()
+					.into_iter()
+					.find_map(|(_, session)| session.get_address())
+			});
+
+			if let Some(address) = address {
 				let url = format!("{}/exec", address);
 
 				let body = rmp_serde::to_vec(&Request {

src/cli/stop.rs

@@ -34,15 +34,15 @@ impl Stop {
 		if self.list {
 			let sessions = sessions::get_all()?;
 
-			if sessions.is_none() {
+			if sessions.is_empty() {
 				argon_warn!("There are no running sessions");
 				return Ok(());
 			}
 
 			let mut table = Table::new();
 			table.set_header(vec!["ID", "Host", "Port", "PID"]);
 
-			for (id, session) in sessions.unwrap() {
+			for (id, session) in sessions {
 				let port = if let Some(port) = session.port {
 					port.to_string()
 				} else {
@@ -65,12 +65,12 @@ impl Stop {
 		if self.all {
 			let sessions = sessions::get_all()?;
 
-			if sessions.is_none() {
+			if sessions.is_empty() {
 				argon_warn!("There are no running sessions");
 				return Ok(());
 			}
 
-			for (_, session) in sessions.unwrap() {
+			for (_, session) in sessions {
 				if let Some(address) = session.get_address() {
 					Self::make_request(&address, session.pid);
 				} else {

src/installer.rs

@@ -157,7 +157,9 @@ pub fn install_plugin(path: &Path, show_progress: bool) -> Result<()> {
 
 fn install_template(template: &Dir, path: &Path) -> Result<()> {
 	for file in template.files() {
-		fs::write(path.join(file.path()), file.contents())?;
+		if file.path().get_name() != ".gitkeep" {
+			fs::write(path.join(file.path()), file.contents())?;
+		}
 	}
 
 	for dir in template.dirs() {

src/sessions.rs

@@ -123,14 +123,8 @@ pub fn get_multiple(ids: &Vec<String>) -> Result<HashMap<String, Session>> {
 	Ok(result)
 }
 
-pub fn get_all() -> Result<Option<HashMap<String, Session>>> {
-	let sessions = get_sessions()?;
-
-	if !sessions.active_sessions.is_empty() {
-		return Ok(Some(sessions.active_sessions));
-	}
-
-	Ok(None)
+pub fn get_all() -> Result<HashMap<String, Session>> {
+	Ok(get_sessions()?.active_sessions)
 }
 
 pub fn remove(session: &Session) -> Result<()> {