zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-23 08:57:14 +03:00
Code Issues Projects Releases Wiki Activity

Refactor match session name (#1582)

Browse Source
This commit is contained in:
Matthias Beyer 2022-07-12 11:31:29 +02:00 committed by GitHub
parent f983651759
commit cf521aaf60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sessions.rs
View File

@ -151,24 +151,23 @@ pub enum SessionNameMatch {
}
pub(crate) fn match_session_name(prefix: &str) -> Result<SessionNameMatch, io::ErrorKind> {
return match get_sessions() {
Ok(sessions) => Ok({
let filtered_sessions: Vec<String> = sessions
.iter()
.filter(|s| s.starts_with(prefix))
.cloned()
.collect();
if filtered_sessions.iter().any(|s| s == prefix) {
return Ok(SessionNameMatch::Exact(prefix.to_string()));
}
match &filtered_sessions[..] {
[] => SessionNameMatch::None,
[s] => SessionNameMatch::UniquePrefix(s.to_string()),
_ => SessionNameMatch::AmbiguousPrefix(filtered_sessions),
}
}),
Err(e) => Err(e),
};
let sessions = get_sessions()?;
let filtered_sessions: Vec<_> = sessions.iter().filter(|s| s.starts_with(prefix)).collect();
if filtered_sessions.iter().any(|s| *s == prefix) {
return Ok(SessionNameMatch::Exact(prefix.to_string()));
}
Ok({
match &filtered_sessions[..] {
[] => SessionNameMatch::None,
[s] => SessionNameMatch::UniquePrefix(s.to_string()),
_ => {
SessionNameMatch::AmbiguousPrefix(filtered_sessions.into_iter().cloned().collect())
},
}
})
}
pub(crate) fn session_exists(name: &str) -> Result<bool, io::ErrorKind> {