mirror of
https://github.com/NotAShelf/stash.git
synced 2026-04-17 00:03:46 +00:00
stash: make watch loop async
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: I6a6a69641a4f39f0368de1bcf5780afbe8e5c0b1
This commit is contained in:
parent
d6e4f47bdd
commit
6c5408abd1
GPG key ID:
29D95B64378DB4BF
1 changed files with 105 additions and 98 deletions
199
src/main.rs
199
src/main.rs
|
|
@ -15,6 +15,7 @@ mod import;
|
||||||
|
|
||||||
use crate::db::ClipboardDb;
|
use crate::db::ClipboardDb;
|
||||||
|
|
||||||
|
use smol::Timer;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use wl_clipboard_rs::paste::{ClipboardType, Seat, get_contents};
|
use wl_clipboard_rs::paste::{ClipboardType, Seat, get_contents};
|
||||||
|
|
@ -97,8 +98,8 @@ fn report_error<T>(result: Result<T, impl std::fmt::Display>, context: &str) ->
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Watch clipboard and store changes
|
/// Watch clipboard and store changes
|
||||||
fn run_daemon(db: &db::SqliteClipboardDb, max_dedupe_search: u64, max_items: u64) {
|
async fn run_daemon(db: &db::SqliteClipboardDb, max_dedupe_search: u64, max_items: u64) {
|
||||||
log::info!("Starting clipboard watch daemon (Wayland)");
|
log::info!("Starting clipboard watch daemon");
|
||||||
|
|
||||||
let mut last_contents: Option<Vec<u8>> = None;
|
let mut last_contents: Option<Vec<u8>> = None;
|
||||||
|
|
||||||
|
|
@ -112,7 +113,7 @@ fn run_daemon(db: &db::SqliteClipboardDb, max_dedupe_search: u64, max_items: u64
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
if let Err(e) = reader.read_to_end(&mut buf) {
|
if let Err(e) = reader.read_to_end(&mut buf) {
|
||||||
log::error!("Failed to read clipboard contents: {e}");
|
log::error!("Failed to read clipboard contents: {e}");
|
||||||
std::thread::sleep(Duration::from_millis(500));
|
Timer::after(Duration::from_millis(500)).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Only store if changed and not empty
|
// Only store if changed and not empty
|
||||||
|
|
@ -131,116 +132,122 @@ fn run_daemon(db: &db::SqliteClipboardDb, max_dedupe_search: u64, max_items: u64
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to get clipboard contents: {e}");
|
// Only log actual errors, not empty clipboard
|
||||||
|
let error_msg = e.to_string();
|
||||||
|
if !error_msg.contains("empty") {
|
||||||
|
log::error!("Failed to get clipboard contents: {e}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::thread::sleep(Duration::from_millis(500));
|
Timer::after(Duration::from_millis(500)).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let cli = Cli::parse();
|
smol::block_on(async {
|
||||||
env_logger::Builder::new()
|
let cli = Cli::parse();
|
||||||
.filter_level(cli.verbosity.into())
|
env_logger::Builder::new()
|
||||||
.init();
|
.filter_level(cli.verbosity.into())
|
||||||
|
.init();
|
||||||
|
|
||||||
let db_path = cli.db_path.unwrap_or_else(|| {
|
let db_path = cli.db_path.unwrap_or_else(|| {
|
||||||
dirs::cache_dir()
|
dirs::cache_dir()
|
||||||
.unwrap_or_else(|| PathBuf::from("/tmp"))
|
.unwrap_or_else(|| PathBuf::from("/tmp"))
|
||||||
.join("stash")
|
.join("stash")
|
||||||
.join("db")
|
.join("db")
|
||||||
});
|
});
|
||||||
|
|
||||||
let conn = rusqlite::Connection::open(&db_path).unwrap_or_else(|e| {
|
let conn = rusqlite::Connection::open(&db_path).unwrap_or_else(|e| {
|
||||||
log::error!("Failed to open SQLite database: {e}");
|
log::error!("Failed to open SQLite database: {e}");
|
||||||
process::exit(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
let db = match db::SqliteClipboardDb::new(conn) {
|
|
||||||
Ok(db) => db,
|
|
||||||
Err(e) => {
|
|
||||||
log::error!("Failed to initialize SQLite database: {e}");
|
|
||||||
process::exit(1);
|
process::exit(1);
|
||||||
}
|
});
|
||||||
};
|
|
||||||
|
|
||||||
match cli.command {
|
let db = match db::SqliteClipboardDb::new(conn) {
|
||||||
Some(Command::Store) => {
|
Ok(db) => db,
|
||||||
let state = env::var("STASH_CLIPBOARD_STATE").ok();
|
Err(e) => {
|
||||||
report_error(
|
log::error!("Failed to initialize SQLite database: {e}");
|
||||||
db.store(io::stdin(), cli.max_dedupe_search, cli.max_items, state),
|
process::exit(1);
|
||||||
"Failed to store entry",
|
}
|
||||||
);
|
};
|
||||||
}
|
|
||||||
Some(Command::List) => {
|
match cli.command {
|
||||||
report_error(
|
Some(Command::Store) => {
|
||||||
db.list(io::stdout(), cli.preview_width),
|
let state = env::var("STASH_CLIPBOARD_STATE").ok();
|
||||||
"Failed to list entries",
|
report_error(
|
||||||
);
|
db.store(io::stdin(), cli.max_dedupe_search, cli.max_items, state),
|
||||||
}
|
"Failed to store entry",
|
||||||
Some(Command::Decode { input }) => {
|
);
|
||||||
report_error(
|
}
|
||||||
db.decode(io::stdin(), io::stdout(), input),
|
Some(Command::List) => {
|
||||||
"Failed to decode entry",
|
report_error(
|
||||||
);
|
db.list(io::stdout(), cli.preview_width),
|
||||||
}
|
"Failed to list entries",
|
||||||
Some(Command::Delete { arg, r#type }) => match (arg, r#type.as_deref()) {
|
);
|
||||||
(Some(s), Some("id")) => {
|
}
|
||||||
if let Ok(id) = s.parse::<u64>() {
|
Some(Command::Decode { input }) => {
|
||||||
use std::io::Cursor;
|
report_error(
|
||||||
report_error(
|
db.decode(io::stdin(), io::stdout(), input),
|
||||||
db.delete(Cursor::new(format!("{id}\n"))),
|
"Failed to decode entry",
|
||||||
"Failed to delete entry by id",
|
);
|
||||||
);
|
}
|
||||||
} else {
|
Some(Command::Delete { arg, r#type }) => match (arg, r#type.as_deref()) {
|
||||||
log::error!("Argument is not a valid id");
|
(Some(s), Some("id")) => {
|
||||||
|
if let Ok(id) = s.parse::<u64>() {
|
||||||
|
use std::io::Cursor;
|
||||||
|
report_error(
|
||||||
|
db.delete(Cursor::new(format!("{id}\n"))),
|
||||||
|
"Failed to delete entry by id",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
log::error!("Argument is not a valid id");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
(Some(s), Some("query")) => {
|
||||||
(Some(s), Some("query")) => {
|
|
||||||
report_error(db.query_delete(&s), "Failed to delete entry by query");
|
|
||||||
}
|
|
||||||
(Some(s), None) => {
|
|
||||||
if let Ok(id) = s.parse::<u64>() {
|
|
||||||
use std::io::Cursor;
|
|
||||||
report_error(
|
|
||||||
db.delete(Cursor::new(format!("{id}\n"))),
|
|
||||||
"Failed to delete entry by id",
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
report_error(db.query_delete(&s), "Failed to delete entry by query");
|
report_error(db.query_delete(&s), "Failed to delete entry by query");
|
||||||
}
|
}
|
||||||
|
(Some(s), None) => {
|
||||||
|
if let Ok(id) = s.parse::<u64>() {
|
||||||
|
use std::io::Cursor;
|
||||||
|
report_error(
|
||||||
|
db.delete(Cursor::new(format!("{id}\n"))),
|
||||||
|
"Failed to delete entry by id",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
report_error(db.query_delete(&s), "Failed to delete entry by query");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(None, _) => {
|
||||||
|
report_error(db.delete(io::stdin()), "Failed to delete entry from stdin");
|
||||||
|
}
|
||||||
|
(_, Some(_)) => {
|
||||||
|
log::error!("Unknown type for --type. Use \"id\" or \"query\".");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Some(Command::Wipe) => {
|
||||||
|
report_error(db.wipe(), "Failed to wipe database");
|
||||||
}
|
}
|
||||||
(None, _) => {
|
|
||||||
report_error(db.delete(io::stdin()), "Failed to delete entry from stdin");
|
|
||||||
}
|
|
||||||
(_, Some(_)) => {
|
|
||||||
log::error!("Unknown type for --type. Use \"id\" or \"query\".");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Some(Command::Wipe) => {
|
|
||||||
report_error(db.wipe(), "Failed to wipe database");
|
|
||||||
}
|
|
||||||
|
|
||||||
Some(Command::Import { r#type }) => {
|
Some(Command::Import { r#type }) => {
|
||||||
// Default format is TSV (Cliphist compatible)
|
// Default format is TSV (Cliphist compatible)
|
||||||
let format = r#type.as_deref().unwrap_or("tsv");
|
let format = r#type.as_deref().unwrap_or("tsv");
|
||||||
match format {
|
match format {
|
||||||
"tsv" => {
|
"tsv" => {
|
||||||
db.import_tsv(io::stdin());
|
db.import_tsv(io::stdin());
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
log::error!("Unsupported import format: {format}");
|
log::error!("Unsupported import format: {format}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
Some(Command::Watch) => {
|
||||||
Some(Command::Watch) => {
|
run_daemon(&db, cli.max_dedupe_search, cli.max_items).await;
|
||||||
run_daemon(&db, cli.max_dedupe_search, cli.max_items);
|
}
|
||||||
}
|
None => {
|
||||||
None => {
|
if let Err(e) = Cli::command().print_help() {
|
||||||
if let Err(e) = Cli::command().print_help() {
|
eprintln!("Failed to print help: {e}");
|
||||||
eprintln!("Failed to print help: {e}");
|
}
|
||||||
|
println!();
|
||||||
}
|
}
|
||||||
println!();
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue