diff options
| -rw-r--r-- | src/files.rs | 6 | ||||
| -rw-r--r-- | src/main.rs | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/files.rs b/src/files.rs index 601ea7c..797cad7 100644 --- a/src/files.rs +++ b/src/files.rs @@ -61,17 +61,17 @@ async fn handle_file(file: impl AsRef<Path>, conn: Database) -> Result<()> { let db_time = conn.get_modtime(&file).await?; if modtime != db_time { if let Err(error) = conn.update_file(&file).await { - return Err(anyhow!(FileError::new(file, error))); + return Err(FileError::new(file, error).into()); }; } return Ok(()); } - Err(error) => return Err(anyhow!(FileError::new(file, error))), + Err(error) => return Err(FileError::new(file, error).into()), _ => {} } if let Err(error) = conn.insert_file(&file).await { - return Err(anyhow!(FileError::new(file, error))); + return Err(FileError::new(file, error).into()); } Ok(()) diff --git a/src/main.rs b/src/main.rs index 6bec85b..7ff8725 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,13 +74,6 @@ fn print_completions<G: Generator>(generator: G, cmd: &mut Command) { } fn main() -> Result<()> { - let running = Arc::new(AtomicBool::new(true)); - let r = running.clone(); - - ctrlc::set_handler(move || { - r.store(false, Ordering::SeqCst); - })?; - let args = build_cli().get_matches(); if let Some(generator) = args.get_one::<Shell>("shell").copied() { @@ -90,6 +83,13 @@ fn main() -> Result<()> { return Ok(()); } + let running = Arc::new(AtomicBool::new(true)); + let r = running.clone(); + + ctrlc::set_handler(move || { + r.store(false, Ordering::SeqCst); + })?; + let conn = if let Some(path) = args.get_one::<PathBuf>("db") { smol::block_on(async { db::Database::new(path).await })? } else { |