Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ bin/test.rs
# Local configuration files
*.local.conf
*.env


TODO.md
159 changes: 158 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hypr-mount"
version = "0.1.1"
version = "0.1.5"
edition = "2024"

[dependencies]
Expand All @@ -10,6 +10,8 @@ serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
thiserror = "2.0.18"
clap = { version = "4.6.1", features = ["derive"] }
dirs = "6.0.0"
chacha20poly1305 = "0.10"

[[bin]]
name = "hypr-mount"
Expand Down
74 changes: 73 additions & 1 deletion src/app/events.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use crate::app::{AppMode, MountApp, SelectedRow};
use crate::{
app::{AppMode, MountApp, SelectedRow},
core::drive_handle,
};
use crossterm::event::{KeyCode, KeyEventKind};
use ratatui::DefaultTerminal;
use std::io;
Expand All @@ -15,6 +18,7 @@ impl MountApp {
AppMode::ScriptPreview => self.script_view_key_event(key_event)?,
AppMode::ScriptPopup => self.script_popup_key_event(key_event)?,
AppMode::MessagePopup => self.message_popup_key_event(key_event)?,
AppMode::PasswordInput => self.password_input_key_event(key_event)?,
}
}
}
Expand Down Expand Up @@ -58,6 +62,27 @@ impl MountApp {
KeyCode::Char('g') => {
self.mode = AppMode::ScriptPreview;
}
KeyCode::Char('r') => match drive_handle::list_drives() {
Ok(new_drives) => {
// Preserve selection state: keep selected drive names, remap to new indices
let selected_names: Vec<String> = self
.selected_rows
.iter()
.filter_map(|idx| self.drives.get(*idx).map(|d| d.name.clone()))
.collect();

self.drives = new_drives;

// Remap selections by matching drive names
self.selected_rows.clear();
for (new_idx, drive) in self.drives.iter().enumerate() {
if selected_names.contains(&drive.name) {
self.selected_rows.insert(new_idx);
}
}
}
Err(err) => self.status_message = err.to_string(),
},
_ => {}
}

Expand Down Expand Up @@ -165,4 +190,51 @@ impl MountApp {
}
Ok(())
}

fn password_input_key_event(
&mut self,
key_event: crossterm::event::KeyEvent,
) -> io::Result<()> {
if key_event.kind != KeyEventKind::Press {
return Ok(());
}

match key_event.code {
KeyCode::Esc => {
self.password_input.clear();
self.password_error.clear();
self.luks_uuid = None;
self.mode = AppMode::MainTable;
}
KeyCode::Enter => {
if let Some(uuid) = self.luks_uuid.clone() {
if self.password_input.is_empty() {
self.password_error = "Password cannot be empty".to_string();
} else {
// TODO: implement crypto::unlock_and_mount(uuid, password)
self.status_message = format!(
"LUKS unlock attempted for UUID: {} (password: {} chars)",
uuid,
self.password_input.len()
);
self.password_input.clear();
self.password_error.clear();
self.luks_uuid = None;
self.mode = AppMode::MainTable;
}
} else {
self.password_error = "No drive selected".to_string();
}
}
KeyCode::Backspace => {
self.password_input.pop();
}
KeyCode::Char(c) => {
self.password_input.push(c);
}
_ => {}
}

Ok(())
}
}
Loading