apognu/tuigreet
1
1
Fork 0
mirror of https://github.com/apognu/tuigreet.git synced 2024-11-29 00:22:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few inconsistencies with the session matcher.

Browse Source
This commit is contained in:
Antoine POPINEAU 2023-10-21 14:28:44 +02:00
parent 1812f1ef8c
commit 9aa63faa9f
No known key found for this signature in database
GPG Key ID: E8379674E92D25D2
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/greeter.rs
View File

@ -80,7 +80,7 @@ impl SessionType {
}
}
#[derive(SmartDefault)]
#[derive(SmartDefault, Clone)]
pub struct Session {
pub name: String,
pub command: String,

7
src/ipc.rs
View File

@ -145,7 +145,12 @@ impl Ipc {
let _ = command;
let _ = env;
crate::exit(greeter, AuthStatus::Success).await;
self
.send(Request::StartSession {
cmd: vec!["true".to_string()],
env: vec![],
})
.await;
}
}
}

33
src/keyboard.rs
View File

@ -40,10 +40,16 @@ pub async fn handle(greeter: Arc<RwLock<Greeter>>, events: &mut Events, ipc: Ipc
crate::exit(&mut greeter, AuthStatus::Cancel).await;
}
KeyEvent { code: KeyCode::Esc, .. } => {
Ipc::cancel(&mut greeter).await;
greeter.reset(false).await;
}
KeyEvent { code: KeyCode::Esc, .. } => match greeter.mode {
Mode::Users | Mode::Command | Mode::Sessions | Mode::Power => {
greeter.mode = greeter.previous_mode;
}
_ => {
Ipc::cancel(&mut greeter).await;
greeter.reset(false).await;
}
},
KeyEvent { code: KeyCode::Left, .. } => greeter.cursor_offset -= 1,
KeyEvent { code: KeyCode::Right, .. } => greeter.cursor_offset += 1,
@ -170,9 +176,7 @@ pub async fn handle(greeter: Arc<RwLock<Greeter>>, events: &mut Events, ipc: Ipc
}
Mode::Command => {
let cmd = &greeter.command;
greeter.selected_session = greeter.sessions.iter().position(|Session { command, .. }| Some(command) == cmd.as_ref()).unwrap_or(0);
greeter.selected_session = 0;
greeter.command = Some(greeter.new_command.clone());
if greeter.remember_session {
@ -195,22 +199,18 @@ pub async fn handle(greeter: Arc<RwLock<Greeter>>, events: &mut Events, ipc: Ipc
}
Mode::Sessions => {
let session = match greeter.sessions.get(greeter.selected_session) {
Some(Session { name, path, command, .. }) => Some((name.clone(), path.clone(), command.clone())),
_ => None,
};
if let Some((_, path, command)) = session {
greeter.session_path = path.clone();
let session = greeter.sessions.get(greeter.selected_session).cloned();
if let Some(Session { path, command, .. }) = session {
if greeter.remember_session {
if let Some(path) = path {
write_last_session_path(&path);
if let Some(ref path) = path {
write_last_session_path(path);
}
write_last_session(&command);
}
greeter.session_path = path.clone();
greeter.command = Some(command.clone());
}
@ -308,7 +308,6 @@ async fn validate_username(greeter: &mut Greeter, ipc: &Ipc) {
}
if let Ok(command) = get_last_user_session(&greeter.username) {
greeter.selected_session = greeter.sessions.iter().position(|session| session.command == command).unwrap_or(0);
greeter.command = Some(command);
}
}