Compare commits
5 Commits
5f691c2e2f
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 20f33f5694 | |||
| 989e0aef91 | |||
| 54ddc9851c | |||
| dcc863c451 | |||
| 9e56322705 |
3
Cargo.lock
generated
3
Cargo.lock
generated
@ -2229,6 +2229,7 @@ dependencies = [
|
|||||||
"ratatui-image",
|
"ratatui-image",
|
||||||
"rklipd",
|
"rklipd",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_json",
|
||||||
"uuid",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -2241,6 +2242,8 @@ dependencies = [
|
|||||||
"directories",
|
"directories",
|
||||||
"image",
|
"image",
|
||||||
"rusqlite",
|
"rusqlite",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
"uuid",
|
"uuid",
|
||||||
"wayland-clipboard-listener",
|
"wayland-clipboard-listener",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -11,5 +11,6 @@ image = "0.25.9"
|
|||||||
ratatui = "0.30.0"
|
ratatui = "0.30.0"
|
||||||
ratatui-image = { version = "10.0.6", features = ["crossterm"] }
|
ratatui-image = { version = "10.0.6", features = ["crossterm"] }
|
||||||
rklipd = {path = "rklipd"}
|
rklipd = {path = "rklipd"}
|
||||||
serde = "1.0.228"
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
|
serde_json = "1.0.149"
|
||||||
uuid = "1.22.0"
|
uuid = "1.22.0"
|
||||||
|
|||||||
3
rklipd/Cargo.lock
generated
3
rklipd/Cargo.lock
generated
@ -1303,6 +1303,8 @@ dependencies = [
|
|||||||
"directories",
|
"directories",
|
||||||
"image",
|
"image",
|
||||||
"rusqlite",
|
"rusqlite",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
"uuid",
|
"uuid",
|
||||||
"wayland-clipboard-listener",
|
"wayland-clipboard-listener",
|
||||||
]
|
]
|
||||||
@ -1370,6 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
|
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_core",
|
"serde_core",
|
||||||
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@ -11,6 +11,8 @@ uuid = {version = "1.22.0", features = ["v4", "serde"]}
|
|||||||
rusqlite = "0.38.0"
|
rusqlite = "0.38.0"
|
||||||
wayland-clipboard-listener = "0.6.0"
|
wayland-clipboard-listener = "0.6.0"
|
||||||
directories = "6.0.0"
|
directories = "6.0.0"
|
||||||
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
|
serde_json = "1.0.149"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
x11 = []
|
x11 = []
|
||||||
|
|||||||
@ -112,4 +112,10 @@ impl Database {
|
|||||||
|
|
||||||
Ok(entries)
|
Ok(entries)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn delete_entry_by_content(&self, content: &str) -> Result<(), Box<dyn Error>> {
|
||||||
|
self.conn
|
||||||
|
.execute("DELETE FROM history WHERE content = ?1", [content])?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
125
rklipd/src/ipc.rs
Normal file
125
rklipd/src/ipc.rs
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
use crate::database::Database;
|
||||||
|
use crate::models::ClipboardData;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::fs;
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::os::unix::net::UnixListener;
|
||||||
|
use std::path::Path;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub enum IpcRequest {
|
||||||
|
GetHistory { limit: usize },
|
||||||
|
SetClipboard { content: String },
|
||||||
|
DeleteEntry { content: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub enum IpcResponse {
|
||||||
|
History(Vec<String>),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn start_server(db: Arc<Mutex<Database>>, socket_path: &Path) {
|
||||||
|
if socket_path.exists() {
|
||||||
|
let _ = fs::remove_file(socket_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
let listener = match UnixListener::bind(socket_path) {
|
||||||
|
Ok(l) => l,
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("Error while creating socket {}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
println!("ipc server listening {:?}", socket_path);
|
||||||
|
|
||||||
|
for stream in listener.incoming() {
|
||||||
|
match stream {
|
||||||
|
Ok(mut stream) => {
|
||||||
|
let db_clone = Arc::clone(&db);
|
||||||
|
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let mut buffer = String::new();
|
||||||
|
|
||||||
|
if stream.read_to_string(&mut buffer).is_ok() {
|
||||||
|
if let Ok(request) = serde_json::from_str::<IpcRequest>(&buffer) {
|
||||||
|
match request {
|
||||||
|
IpcRequest::GetHistory { limit } => {
|
||||||
|
let db_lock = db_clone.lock().unwrap();
|
||||||
|
|
||||||
|
// TODO Implem read_history(limit)
|
||||||
|
let history = db_lock.read_history().unwrap_or_default();
|
||||||
|
|
||||||
|
let items: Vec<String> = history
|
||||||
|
.into_iter()
|
||||||
|
.rev()
|
||||||
|
.take(limit)
|
||||||
|
.map(|entry| match entry.content {
|
||||||
|
ClipboardData::Text(t) => t,
|
||||||
|
ClipboardData::Image(img) => format!("{}.jpg", img.id),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let response = IpcResponse::History(items);
|
||||||
|
let response_json = serde_json::to_string(&response).unwrap();
|
||||||
|
let _ = stream.write_all(response_json.as_bytes());
|
||||||
|
}
|
||||||
|
IpcRequest::SetClipboard { content } => {
|
||||||
|
if let Ok(mut clipboard) = arboard::Clipboard::new() {
|
||||||
|
if content.ends_with(".jpg") || content.ends_with(".png") {
|
||||||
|
if let Some(proj_dirs) = directories::ProjectDirs::from(
|
||||||
|
"com", "zefad", "rklipd",
|
||||||
|
) {
|
||||||
|
let img_path = proj_dirs
|
||||||
|
.data_dir()
|
||||||
|
.join("images")
|
||||||
|
.join(&content);
|
||||||
|
if let Ok(img) = image::open(&img_path) {
|
||||||
|
let rgba = img.into_rgba8();
|
||||||
|
let img_data = arboard::ImageData {
|
||||||
|
width: rgba.width() as usize,
|
||||||
|
height: rgba.height() as usize,
|
||||||
|
bytes: std::borrow::Cow::Borrowed(
|
||||||
|
rgba.as_raw(),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
let _ = clipboard.set_image(img_data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let _ = clipboard.set_text(content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
IpcRequest::DeleteEntry { content } => {
|
||||||
|
{
|
||||||
|
let db_lock = db_clone.lock().unwrap();
|
||||||
|
let _ = db_lock.delete_entry_by_content(&content);
|
||||||
|
}
|
||||||
|
|
||||||
|
if content.ends_with(".jpg") || content.ends_with(".png") {
|
||||||
|
if let Some(proj_dirs) =
|
||||||
|
directories::ProjectDirs::from("com", "zefad", "rklipd")
|
||||||
|
{
|
||||||
|
let img_path =
|
||||||
|
proj_dirs.data_dir().join("images").join(&content);
|
||||||
|
if img_path.exists() {
|
||||||
|
if let Err(e) = std::fs::remove_file(&img_path) {
|
||||||
|
eprintln!("Error while deleting image: {}", e);
|
||||||
|
} else {
|
||||||
|
println!("Image deleted : {}", content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => eprintln!("Erreur de connexion IPC: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -5,6 +5,7 @@ use std::sync::{Arc, Mutex};
|
|||||||
|
|
||||||
mod clipboard;
|
mod clipboard;
|
||||||
mod database;
|
mod database;
|
||||||
|
mod ipc;
|
||||||
mod models;
|
mod models;
|
||||||
mod monitor;
|
mod monitor;
|
||||||
mod ws;
|
mod ws;
|
||||||
@ -18,8 +19,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
|
|
||||||
let db = Arc::new(Mutex::new(Database::init(&dir_path_str)?));
|
let db = Arc::new(Mutex::new(Database::init(&dir_path_str)?));
|
||||||
|
|
||||||
// println!("{:#?}", db.lock().unwrap().read_history());
|
let socket_path = dir_path.join("rklip.sock");
|
||||||
|
let db_for_ipc = Arc::clone(&db);
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
crate::ipc::start_server(db_for_ipc, &socket_path);
|
||||||
|
});
|
||||||
|
|
||||||
|
println!("rklipd starting...");
|
||||||
monitor::start(db, clipboard)?;
|
monitor::start(db, clipboard)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
32
src/app.rs
32
src/app.rs
@ -1,13 +1,14 @@
|
|||||||
|
use crate::ipc;
|
||||||
use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2};
|
use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2};
|
||||||
use ratatui::widgets::ListState;
|
use ratatui::widgets::ListState;
|
||||||
use ratatui_image::{picker::Picker, protocol};
|
use ratatui_image::{picker::Picker, protocol};
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
#[derive(PartialEq)]
|
#[derive(PartialEq)]
|
||||||
pub enum Mode {
|
pub enum Mode {
|
||||||
Normal,
|
Normal,
|
||||||
Command,
|
Command,
|
||||||
Search,
|
Search,
|
||||||
|
ConfirmDelete,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct App {
|
pub struct App {
|
||||||
@ -27,13 +28,15 @@ impl App {
|
|||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
let mut list_state = ListState::default();
|
let mut list_state = ListState::default();
|
||||||
list_state.select(Some(0));
|
list_state.select(Some(0));
|
||||||
let items = vec![
|
|
||||||
"Ceci est un texte copié.".to_string(),
|
let items = ipc::fetch_history(100).unwrap_or_default();
|
||||||
"https://github.com/ratatui-org/ratatui".to_string(),
|
|
||||||
"30426b4d-26e0-45af-9fa4-25f4476387a8.jpg".to_string(),
|
let mut list_state = ListState::default();
|
||||||
"35789d6a-dea4-46de-90da-aee693a16031.jpg".to_string(),
|
if items.is_empty() {
|
||||||
"fn main() {\n println!(\"Hello\");\n}".to_string(),
|
list_state.select(None);
|
||||||
];
|
} else {
|
||||||
|
list_state.select(Some(0));
|
||||||
|
}
|
||||||
|
|
||||||
let picker = Picker::from_query_stdio().unwrap_or_else(|_| Picker::halfblocks());
|
let picker = Picker::from_query_stdio().unwrap_or_else(|_| Picker::halfblocks());
|
||||||
|
|
||||||
@ -179,6 +182,17 @@ impl App {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_selected_item(&self) -> Option<&String> {
|
pub fn get_selected_item(&self) -> Option<&String> {
|
||||||
self.list_state.selected().map(|i| &self.filtered_items[i])
|
self.list_state
|
||||||
|
.selected()
|
||||||
|
.and_then(|i| self.filtered_items.get(i))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sync_with_daemon(&mut self) {
|
||||||
|
if let Some(new_history) = crate::ipc::fetch_history(100) {
|
||||||
|
if self.all_items != new_history {
|
||||||
|
self.all_items = new_history;
|
||||||
|
self.update_search();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
65
src/ipc.rs
65
src/ipc.rs
@ -0,0 +1,65 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::os::unix::net::UnixStream;
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub enum IpcRequest {
|
||||||
|
GetHistory { limit: usize },
|
||||||
|
SetClipboard { content: String },
|
||||||
|
DeleteEntry { content: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
pub enum IpcResponse {
|
||||||
|
History(Vec<String>),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn fetch_history(limit: usize) -> Option<Vec<String>> {
|
||||||
|
let base_dir = directories::ProjectDirs::from("com", "zefad", "rklipd")?
|
||||||
|
.data_dir()
|
||||||
|
.to_path_buf();
|
||||||
|
let socket_path = base_dir.join("rklip.sock");
|
||||||
|
|
||||||
|
if let Ok(mut stream) = UnixStream::connect(&socket_path) {
|
||||||
|
let req = IpcRequest::GetHistory { limit };
|
||||||
|
let req_json = serde_json::to_string(&req).unwrap();
|
||||||
|
|
||||||
|
let _ = stream.write_all(req_json.as_bytes());
|
||||||
|
let _ = stream.shutdown(std::net::Shutdown::Write);
|
||||||
|
|
||||||
|
let mut response_buffer = String::new();
|
||||||
|
if stream.read_to_string(&mut response_buffer).is_ok() {
|
||||||
|
if let Ok(IpcResponse::History(items)) = serde_json::from_str(&response_buffer) {
|
||||||
|
return Some(items);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_clipboard(content: String) {
|
||||||
|
if let Some(base_dir) = directories::ProjectDirs::from("com", "zefad", "rklipd") {
|
||||||
|
let socket_path = base_dir.data_dir().join("rklip.sock");
|
||||||
|
if let Ok(mut stream) = UnixStream::connect(&socket_path) {
|
||||||
|
let req = IpcRequest::SetClipboard { content };
|
||||||
|
if let Ok(req_json) = serde_json::to_string(&req) {
|
||||||
|
let _ = stream.write_all(req_json.as_bytes());
|
||||||
|
let _ = stream.shutdown(std::net::Shutdown::Write);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn delete_entry(content: String) {
|
||||||
|
if let Some(base_dir) = directories::ProjectDirs::from("com", "zefad", "rklipd") {
|
||||||
|
let socket_path = base_dir.data_dir().join("rklip.sock");
|
||||||
|
if let Ok(mut stream) = UnixStream::connect(&socket_path) {
|
||||||
|
let req = IpcRequest::DeleteEntry { content };
|
||||||
|
if let Ok(req_json) = serde_json::to_string(&req) {
|
||||||
|
let _ = stream.write_all(req_json.as_bytes());
|
||||||
|
let _ = stream.shutdown(std::net::Shutdown::Write);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
209
src/main.rs
209
src/main.rs
@ -11,6 +11,7 @@ use crossterm::{
|
|||||||
};
|
};
|
||||||
use ratatui::{Terminal, backend::CrosstermBackend};
|
use ratatui::{Terminal, backend::CrosstermBackend};
|
||||||
use std::io;
|
use std::io;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
enable_raw_mode()?;
|
enable_raw_mode()?;
|
||||||
@ -39,105 +40,133 @@ fn run_app(terminal: &mut Terminal<CrosstermBackend<io::Stdout>>, app: &mut App)
|
|||||||
loop {
|
loop {
|
||||||
terminal.draw(|f| ui::render(f, app))?;
|
terminal.draw(|f| ui::render(f, app))?;
|
||||||
|
|
||||||
if let Event::Key(key) = event::read()? {
|
if event::poll(Duration::from_millis(500))? {
|
||||||
match app.mode {
|
if let Event::Key(key) = event::read()? {
|
||||||
Mode::Normal => match key.code {
|
match app.mode {
|
||||||
KeyCode::Char('j') => {
|
Mode::Normal => match key.code {
|
||||||
app.next();
|
KeyCode::Enter => {
|
||||||
last_key_was_d = false;
|
if let Some(selected) = app.get_selected_item() {
|
||||||
}
|
crate::ipc::set_clipboard(selected.clone());
|
||||||
KeyCode::Char('k') => {
|
app.should_quit = true;
|
||||||
app.previous();
|
}
|
||||||
last_key_was_d = false;
|
|
||||||
}
|
|
||||||
KeyCode::Char('d') => {
|
|
||||||
if last_key_was_d {
|
|
||||||
app.delete_selected();
|
|
||||||
last_key_was_d = false;
|
|
||||||
} else {
|
|
||||||
last_key_was_d = true;
|
|
||||||
}
|
}
|
||||||
last_key_was_g = false;
|
KeyCode::Char('j') => {
|
||||||
}
|
app.next();
|
||||||
KeyCode::Char('u') => {
|
last_key_was_d = false;
|
||||||
app.undo_delete();
|
}
|
||||||
last_key_was_d = false;
|
KeyCode::Char('k') => {
|
||||||
}
|
app.previous();
|
||||||
KeyCode::Char('g') => {
|
last_key_was_d = false;
|
||||||
if last_key_was_g {
|
}
|
||||||
if !app.filtered_items.is_empty() {
|
KeyCode::Char('d') => {
|
||||||
app.list_state.select(Some(0));
|
if last_key_was_d {
|
||||||
|
app.mode = Mode::ConfirmDelete;
|
||||||
|
last_key_was_d = false;
|
||||||
|
} else {
|
||||||
|
last_key_was_d = true;
|
||||||
}
|
}
|
||||||
last_key_was_g = false;
|
last_key_was_g = false;
|
||||||
} else {
|
|
||||||
last_key_was_g = true;
|
|
||||||
}
|
}
|
||||||
last_key_was_d = false;
|
KeyCode::Char('u') => {
|
||||||
}
|
app.undo_delete();
|
||||||
KeyCode::Char('G') => {
|
last_key_was_d = false;
|
||||||
if !app.filtered_items.is_empty() {
|
|
||||||
app.list_state.select(Some(app.filtered_items.len() - 1));
|
|
||||||
}
|
}
|
||||||
last_key_was_d = false;
|
KeyCode::Char('g') => {
|
||||||
}
|
if last_key_was_g {
|
||||||
KeyCode::Char(':') => {
|
if !app.filtered_items.is_empty() {
|
||||||
app.mode = Mode::Command;
|
app.list_state.select(Some(0));
|
||||||
app.input_buffer.clear();
|
}
|
||||||
last_key_was_d = false;
|
last_key_was_g = false;
|
||||||
}
|
} else {
|
||||||
KeyCode::Char('/') => {
|
last_key_was_g = true;
|
||||||
app.mode = Mode::Search;
|
}
|
||||||
app.input_buffer.clear();
|
last_key_was_d = false;
|
||||||
app.update_search();
|
}
|
||||||
last_key_was_d = false;
|
KeyCode::Char('G') => {
|
||||||
}
|
if !app.filtered_items.is_empty() {
|
||||||
KeyCode::Char('q') => {
|
app.list_state.select(Some(app.filtered_items.len() - 1));
|
||||||
app.should_quit = true;
|
}
|
||||||
}
|
last_key_was_d = false;
|
||||||
_ => {
|
}
|
||||||
last_key_was_d = false;
|
KeyCode::Char(':') => {
|
||||||
}
|
app.mode = Mode::Command;
|
||||||
},
|
app.input_buffer.clear();
|
||||||
|
last_key_was_d = false;
|
||||||
Mode::Command => match key.code {
|
}
|
||||||
KeyCode::Esc => {
|
KeyCode::Char('/') => {
|
||||||
app.mode = Mode::Normal;
|
app.mode = Mode::Search;
|
||||||
app.input_buffer.clear();
|
app.input_buffer.clear();
|
||||||
app.update_search();
|
app.update_search();
|
||||||
}
|
last_key_was_d = false;
|
||||||
KeyCode::Char(c) => app.input_buffer.push(c),
|
}
|
||||||
KeyCode::Backspace => {
|
KeyCode::Char('q') => {
|
||||||
app.input_buffer.pop();
|
|
||||||
}
|
|
||||||
KeyCode::Enter => {
|
|
||||||
if app.input_buffer == "q" {
|
|
||||||
app.should_quit = true;
|
app.should_quit = true;
|
||||||
}
|
}
|
||||||
app.mode = Mode::Normal;
|
_ => {
|
||||||
app.input_buffer.clear();
|
last_key_was_d = false;
|
||||||
app.update_search();
|
}
|
||||||
}
|
},
|
||||||
_ => {}
|
|
||||||
},
|
|
||||||
|
|
||||||
Mode::Search => match key.code {
|
Mode::Command => match key.code {
|
||||||
// ... ton code de recherche ...
|
KeyCode::Esc => {
|
||||||
KeyCode::Esc | KeyCode::Enter => {
|
app.mode = Mode::Normal;
|
||||||
app.mode = Mode::Normal;
|
app.input_buffer.clear();
|
||||||
app.input_buffer.clear();
|
app.update_search();
|
||||||
app.update_search();
|
}
|
||||||
}
|
KeyCode::Char(c) => app.input_buffer.push(c),
|
||||||
KeyCode::Char(c) => {
|
KeyCode::Backspace => {
|
||||||
app.input_buffer.push(c);
|
app.input_buffer.pop();
|
||||||
app.update_search();
|
}
|
||||||
}
|
KeyCode::Enter => {
|
||||||
KeyCode::Backspace => {
|
if app.input_buffer == "q" {
|
||||||
app.input_buffer.pop();
|
app.should_quit = true;
|
||||||
app.update_search();
|
}
|
||||||
}
|
app.mode = Mode::Normal;
|
||||||
_ => {}
|
app.input_buffer.clear();
|
||||||
},
|
app.update_search();
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
},
|
||||||
|
|
||||||
|
Mode::Search => match key.code {
|
||||||
|
KeyCode::Esc => {
|
||||||
|
app.mode = Mode::Normal;
|
||||||
|
app.input_buffer.clear();
|
||||||
|
app.update_search();
|
||||||
|
}
|
||||||
|
KeyCode::Enter => {
|
||||||
|
if let Some(selected) = app.get_selected_item() {
|
||||||
|
crate::ipc::set_clipboard(selected.clone());
|
||||||
|
app.should_quit = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
KeyCode::Char(c) => {
|
||||||
|
app.input_buffer.push(c);
|
||||||
|
app.update_search();
|
||||||
|
}
|
||||||
|
KeyCode::Backspace => {
|
||||||
|
app.input_buffer.pop();
|
||||||
|
app.update_search();
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
},
|
||||||
|
Mode::ConfirmDelete => match key.code {
|
||||||
|
KeyCode::Char('y') | KeyCode::Char('Y') | KeyCode::Enter => {
|
||||||
|
if let Some(selected) = app.get_selected_item() {
|
||||||
|
crate::ipc::delete_entry(selected.clone());
|
||||||
|
app.delete_selected();
|
||||||
|
}
|
||||||
|
app.mode = Mode::Normal;
|
||||||
|
}
|
||||||
|
KeyCode::Char('n') | KeyCode::Char('N') | KeyCode::Esc => {
|
||||||
|
app.mode = Mode::Normal;
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
app.sync_with_daemon();
|
||||||
}
|
}
|
||||||
|
|
||||||
if app.should_quit {
|
if app.should_quit {
|
||||||
|
|||||||
127
src/ui.rs
127
src/ui.rs
@ -1,10 +1,10 @@
|
|||||||
use crate::app::{App, Mode};
|
use crate::app::{App, Mode};
|
||||||
use ratatui::{
|
use ratatui::{
|
||||||
Frame,
|
Frame,
|
||||||
layout::{Constraint, Direction, Layout},
|
layout::{Alignment, Constraint, Direction, Layout},
|
||||||
style::{Color, Modifier, Style},
|
style::{Color, Modifier, Style},
|
||||||
text::{Line, Span},
|
text::{Line, Span},
|
||||||
widgets::{Block, Borders, List, ListItem, Padding, Paragraph},
|
widgets::{Block, BorderType, Borders, List, ListItem, Padding, Paragraph},
|
||||||
};
|
};
|
||||||
use ratatui_image::StatefulImage;
|
use ratatui_image::StatefulImage;
|
||||||
|
|
||||||
@ -16,32 +16,64 @@ pub fn render(f: &mut Frame, app: &mut App) {
|
|||||||
|
|
||||||
let content_chunks = Layout::default()
|
let content_chunks = Layout::default()
|
||||||
.direction(Direction::Horizontal)
|
.direction(Direction::Horizontal)
|
||||||
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
|
.constraints([Constraint::Length(45), Constraint::Min(0)])
|
||||||
.split(main_chunks[0]);
|
.split(main_chunks[0]);
|
||||||
|
|
||||||
let items: Vec<ListItem> = app
|
let items: Vec<ListItem> = app
|
||||||
.filtered_items
|
.filtered_items
|
||||||
.iter()
|
.iter()
|
||||||
.map(|i| ListItem::new(i.as_str()))
|
.map(|i| {
|
||||||
|
if i.ends_with(".jpg") || i.ends_with(".png") {
|
||||||
|
ListItem::new(Line::from(Span::styled(
|
||||||
|
format!("🖼️ {}", i),
|
||||||
|
Style::default()
|
||||||
|
.fg(Color::Magenta)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
)))
|
||||||
|
} else {
|
||||||
|
ListItem::new(Line::from(format!(" {}", i)))
|
||||||
|
}
|
||||||
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let list = List::new(items)
|
let list = List::new(items)
|
||||||
.block(Block::default().borders(Borders::ALL).title(" History "))
|
.block(
|
||||||
|
Block::default()
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.border_type(BorderType::Rounded)
|
||||||
|
.border_style(Style::default().fg(Color::DarkGray))
|
||||||
|
.title(Span::styled(
|
||||||
|
" History ",
|
||||||
|
Style::default()
|
||||||
|
.fg(Color::White)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
))
|
||||||
|
.title_alignment(Alignment::Center),
|
||||||
|
)
|
||||||
.highlight_style(
|
.highlight_style(
|
||||||
Style::default()
|
Style::default()
|
||||||
.bg(Color::DarkGray)
|
.bg(Color::Rgb(40, 44, 52))
|
||||||
|
.fg(Color::White)
|
||||||
.add_modifier(Modifier::BOLD),
|
.add_modifier(Modifier::BOLD),
|
||||||
)
|
)
|
||||||
.highlight_symbol(">> ");
|
.highlight_symbol(">> ");
|
||||||
|
|
||||||
f.render_stateful_widget(list, content_chunks[0], &mut app.list_state);
|
f.render_stateful_widget(list, content_chunks[0], &mut app.list_state);
|
||||||
|
|
||||||
let right_panel_block = Block::default()
|
let right_panel_block = Block::default()
|
||||||
.borders(Borders::ALL)
|
.borders(Borders::ALL)
|
||||||
.title(" Prev ")
|
.border_type(BorderType::Rounded)
|
||||||
|
.border_style(Style::default().fg(Color::DarkGray))
|
||||||
|
.title(Span::styled(
|
||||||
|
" Previsualisation ",
|
||||||
|
Style::default()
|
||||||
|
.fg(Color::White)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
))
|
||||||
|
.title_alignment(Alignment::Center)
|
||||||
.padding(Padding::uniform(1));
|
.padding(Padding::uniform(1));
|
||||||
|
|
||||||
let inner_right_area = right_panel_block.inner(content_chunks[1]);
|
let inner_right_area = right_panel_block.inner(content_chunks[1]);
|
||||||
|
|
||||||
f.render_widget(right_panel_block, content_chunks[1]);
|
f.render_widget(right_panel_block, content_chunks[1]);
|
||||||
|
|
||||||
if let Some(state) = &mut app.current_image {
|
if let Some(state) = &mut app.current_image {
|
||||||
@ -54,21 +86,82 @@ pub fn render(f: &mut Frame, app: &mut App) {
|
|||||||
f.render_widget(preview_paragraph, inner_right_area);
|
f.render_widget(preview_paragraph, inner_right_area);
|
||||||
}
|
}
|
||||||
|
|
||||||
let bottom_text = match app.mode {
|
let current_color = match app.mode {
|
||||||
|
Mode::Normal => Color::Green,
|
||||||
|
Mode::ConfirmDelete => Color::Red,
|
||||||
|
Mode::Command => Color::Yellow,
|
||||||
|
Mode::Search => Color::Cyan,
|
||||||
|
};
|
||||||
|
|
||||||
|
let bottom_block = Block::default()
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.border_type(BorderType::Rounded)
|
||||||
|
.border_style(Style::default().fg(current_color));
|
||||||
|
|
||||||
|
let inner_bottom_area = bottom_block.inner(main_chunks[1]);
|
||||||
|
f.render_widget(bottom_block, main_chunks[1]);
|
||||||
|
|
||||||
|
let bottom_chunks = Layout::default()
|
||||||
|
.direction(Direction::Horizontal)
|
||||||
|
.constraints([Constraint::Min(0), Constraint::Length(15)])
|
||||||
|
.split(inner_bottom_area);
|
||||||
|
|
||||||
|
let mode_text = match app.mode {
|
||||||
Mode::Normal => Line::from(vec![Span::styled(
|
Mode::Normal => Line::from(vec![Span::styled(
|
||||||
"-- NORMAL --",
|
" NORMAL ",
|
||||||
Style::default().fg(Color::Green),
|
Style::default()
|
||||||
|
.bg(Color::Green)
|
||||||
|
.fg(Color::Black)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
)]),
|
||||||
|
Mode::ConfirmDelete => Line::from(vec![Span::styled(
|
||||||
|
" Delete ? (y/n) ",
|
||||||
|
Style::default()
|
||||||
|
.bg(Color::Red)
|
||||||
|
.fg(Color::White)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
)]),
|
)]),
|
||||||
Mode::Command => Line::from(vec![
|
Mode::Command => Line::from(vec![
|
||||||
Span::styled(":", Style::default().fg(Color::Yellow)),
|
Span::styled(
|
||||||
Span::raw(&app.input_buffer),
|
" COMMAND ",
|
||||||
|
Style::default()
|
||||||
|
.bg(Color::Yellow)
|
||||||
|
.fg(Color::Black)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
),
|
||||||
|
Span::raw(format!(" :{}", app.input_buffer)),
|
||||||
]),
|
]),
|
||||||
Mode::Search => Line::from(vec![
|
Mode::Search => Line::from(vec![
|
||||||
Span::styled("/", Style::default().fg(Color::Cyan)),
|
Span::styled(
|
||||||
Span::raw(&app.input_buffer),
|
" SEARCH ",
|
||||||
|
Style::default()
|
||||||
|
.bg(Color::Cyan)
|
||||||
|
.fg(Color::Black)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
),
|
||||||
|
Span::raw(format!(" /{}", app.input_buffer)),
|
||||||
]),
|
]),
|
||||||
};
|
};
|
||||||
|
|
||||||
let bottom_bar = Paragraph::new(bottom_text).block(Block::default().borders(Borders::ALL));
|
f.render_widget(
|
||||||
f.render_widget(bottom_bar, main_chunks[1]);
|
Paragraph::new(mode_text).block(Block::default().padding(Padding::horizontal(1))),
|
||||||
|
bottom_chunks[0],
|
||||||
|
);
|
||||||
|
|
||||||
|
let total = app.filtered_items.len();
|
||||||
|
let current = if total == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
app.list_state.selected().unwrap_or(0) + 1
|
||||||
|
};
|
||||||
|
|
||||||
|
let stats_text = Line::from(vec![Span::styled(
|
||||||
|
format!("{}/{} ", current, total),
|
||||||
|
Style::default()
|
||||||
|
.fg(Color::DarkGray)
|
||||||
|
.add_modifier(Modifier::BOLD),
|
||||||
|
)])
|
||||||
|
.alignment(Alignment::Right);
|
||||||
|
|
||||||
|
f.render_widget(Paragraph::new(stats_text), bottom_chunks[1]);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user