summaryrefslogtreecommitdiff
path: root/src/files.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/files.rs')
-rw-r--r--src/files.rs132
1 files changed, 74 insertions, 58 deletions
diff --git a/src/files.rs b/src/files.rs
index 63c87fa..e3a31ca 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -3,19 +3,19 @@ use crate::flac::handle_encode;
use anyhow::{Result, anyhow};
#[cfg(not(test))]
use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
-use rusqlite::Connection;
use std::{
error::Error,
fmt::Display,
path::{Path, PathBuf},
sync::{
- Arc, Mutex,
+ Arc,
atomic::{AtomicBool, AtomicUsize, Ordering},
mpsc,
},
thread::{self, sleep},
time::{Duration, UNIX_EPOCH},
};
+use turso::Connection;
use walkdir::WalkDir;
#[cfg(not(test))]
@@ -51,26 +51,26 @@ impl Display for FileError {
impl Error for FileError {}
-fn handle_file(file: &Path, conn: &Connection) -> Result<()> {
- if db::check_file(conn, file)? {
+async fn handle_file(file: &Path, conn: &Connection) -> Result<()> {
+ if db::check_file(conn, file).await? {
let modtime = file
.metadata()?
.modified()?
.duration_since(UNIX_EPOCH)?
.as_secs();
- let db_modtime = db::get_modtime(conn, file)?;
+ let db_modtime = db::get_modtime(conn, file).await?;
if modtime != db_modtime {
- db::update_file(conn, file)?;
+ db::update_file(conn, file).await?;
}
return Ok(());
}
- db::insert_file(conn, file)?;
+ db::insert_file(conn, file).await?;
Ok(())
}
-pub(crate) fn index_files_recursively(
+pub(crate) async fn index_files_recursively(
path: &Path,
conn: &Connection,
handler: Arc<AtomicBool>,
@@ -92,6 +92,8 @@ pub(crate) fn index_files_recursively(
let newhandler = handler.clone();
+ let newhandler = handler.clone();
+
#[allow(unused_variables)]
s.spawn(move || {
for entry in WalkDir::new(&abspath) {
@@ -108,8 +110,6 @@ pub(crate) fn index_files_recursively(
let _ = filesend.send(path.to_owned());
#[cfg(not(test))]
newbar.inc_length(1);
- }
- }
} else {
break;
}
@@ -120,7 +120,7 @@ pub(crate) fn index_files_recursively(
&& handler.load(Ordering::SeqCst)
{
#[allow(unused_variables)]
- if let Err(error) = handle_file(&path, conn) {
+ if let Err(error) = smol::block_on( async {handle_file(&path, conn)}).await {
#[cfg(not(test))]
bar.println(format!("{}", FileError::new(&path, error)));
} else {
@@ -141,22 +141,20 @@ pub(crate) fn index_files_recursively(
Ok(())
}
-pub(crate) fn reencode_files(
- conn: Connection,
+pub async fn reencode_files(
+ conn: &Connection,
handler: Arc<AtomicBool>,
threads: usize,
) -> Result<()> {
#[cfg(not(test))]
let bar = ProgressBar::with_draw_target(
- Some(db::get_toencode_number(&conn)?),
+ Some(db::get_toencode_number(conn).await?),
ProgressDrawTarget::stdout_with_hz(60),
)
.with_style(ProgressStyle::with_template(BAR_TEMPLATE)?.progress_chars("#>-"))
.with_message("Reencoding");
- let mut files = db::get_toencode_files(&conn)?.into_iter();
-
- let lock = Arc::new(Mutex::new(conn));
+ let mut files = db::get_toencode_files(conn).await?.into_iter();
let thread_counter = Arc::new(AtomicUsize::new(0));
@@ -177,17 +175,19 @@ pub(crate) fn reencode_files(
thread_counter.fetch_add(1, Ordering::Relaxed);
let handler = handler.clone();
- let lock = lock.clone();
#[cfg(not(test))]
let bar = bar.clone();
let thread_counter = thread_counter.clone();
+ let conn = conn.clone();
s.spawn(move || {
match handle_encode(&file, handler) {
Err(error) => eprintln!("{}", FileError::new(&file, error)),
Ok(false) => {
- if let Err(error) = db::update_file(&lock.lock().unwrap(), &file) {
- eprintln!("{}", FileError::new(&file, error));
+ if let Err(error) =
+ smol::block_on(async { db::update_file(&conn, &file).await })
+ {
+ eprintln!("{}", FileError::new(&file, error))
}
#[cfg(not(test))]
bar.inc(1)
@@ -210,8 +210,8 @@ pub(crate) fn reencode_files(
Ok(())
}
-pub(crate) fn clean_files(conn: &Connection, handler: Arc<AtomicBool>) -> Result<()> {
- let files = db::init_clean_files(conn)?;
+pub async fn clean_files(conn: &Connection, handler: Arc<AtomicBool>) -> Result<()> {
+ let files = db::init_clean_files(conn).await?;
#[cfg(not(test))]
let spinner = ProgressBar::with_draw_target(None, ProgressDrawTarget::stdout_with_hz(60))
@@ -222,17 +222,20 @@ pub(crate) fn clean_files(conn: &Connection, handler: Arc<AtomicBool>) -> Result
files.iter().for_each(|file| {
#[allow(clippy::collapsible_if)]
if handler.load(Ordering::SeqCst) && !file.exists() {
- if let Err(error) = db::remove_file(conn, file) {
+ #[cfg(not(test))]
+ let spinner = spinner.clone();
+ if let Err(error) = smol::block_on(async { db::remove_file(conn, file).await }) {
eprintln!("{}", FileError::new(file, error))
};
#[cfg(not(test))]
spinner.inc(1);
}
});
+
#[cfg(not(test))]
spinner.finish();
- db::vacuum(conn)?;
+ db::vacuum(conn).await?;
Ok(())
}
@@ -240,52 +243,65 @@ pub(crate) fn clean_files(conn: &Connection, handler: Arc<AtomicBool>) -> Result
#[cfg(test)]
mod tests {
use super::*;
+ use macro_rules_attribute::apply;
+ use smol_macros::{Executor, test};
- #[test]
- fn test_index_lots_of_files() {
+ #[apply(test!)]
+ async fn test_index_lots_of_files(ex: &Executor<'_>) {
let dbname = PathBuf::from("temp3.db");
let handler = Arc::new(AtomicBool::new(true));
- let conn = db::init_connection(Some(&dbname)).unwrap();
- index_files_recursively(Path::new("./testfiles"), &conn, handler).unwrap();
- std::fs::remove_file(dbname).unwrap();
+ ex.spawn(async {
+ let db = db::init_db(Some(&dbname)).await.unwrap();
+ let conn = db.connect().unwrap();
+ index_files_recursively(Path::new("./testfiles"), &conn, handler).unwrap();
+ std::fs::remove_file(dbname).unwrap();
+ })
+ .await
}
- #[test]
- fn test_clean_files() {
+ #[apply(test!)]
+ async fn test_clean_files(ex: &Executor<'_>) {
let dbname = PathBuf::from("temp4.db");
let handler = Arc::new(AtomicBool::new(true));
- let conn = db::init_connection(Some(&dbname)).unwrap();
- let filenames = [
- "./samples/16bit.flac",
- "./samples/24bit.flac",
- "./samples/32bit.flac",
- "./samples/nonexisting.flac",
- ];
- std::fs::copy("./samples/32bit.flac", "./samples/nonexisting.flac").unwrap();
- for file in filenames {
- let filename = PathBuf::from(file);
- db::insert_file(&conn, &filename).unwrap();
- }
+ ex.spawn(async {
+ let db = db::init_db(Some(&dbname)).await.unwrap();
+ let conn = db.connect().unwrap();
+ let filenames = [
+ "./samples/16bit.flac",
+ "./samples/24bit.flac",
+ "./samples/32bit.flac",
+ "./samples/nonexisting.flac",
+ ];
+ std::fs::copy("./samples/32bit.flac", "./samples/nonexisting.flac").unwrap();
+ for file in filenames {
+ let filename = PathBuf::from(file);
+ db::insert_file(&conn, &filename).await.unwrap();
+ }
- std::fs::remove_file("./samples/nonexisting.flac").unwrap();
+ std::fs::remove_file("./samples/nonexisting.flac").unwrap();
- clean_files(&conn, handler).unwrap();
- let counter = db::init_clean_files(&conn).unwrap().len();
- std::fs::remove_file(dbname).unwrap();
- assert!(counter == 3)
+ clean_files(&conn, handler).await.unwrap();
+ let counter = db::init_clean_files(&conn).await.unwrap().len();
+ std::fs::remove_file(dbname).unwrap();
+ assert!(counter == 3)
+ })
+ .await;
}
- #[test]
- fn test_reencode_lots_of_files() {
+ #[apply(test!)]
+ async fn test_reencode_lots_of_files(ex: &Executor<'_>) {
let dbname = PathBuf::from("temp5.db");
let handler = Arc::new(AtomicBool::new(true));
- let conn = db::init_connection(Some(&dbname)).unwrap();
- let temp = handler.clone();
- index_files_recursively(Path::new("./testfiles"), &conn, temp).unwrap();
- println!("\n{}", db::get_toencode_number(&conn).unwrap());
- reencode_files(conn, handler, 4).unwrap();
- let conn = db::init_connection(Some(&dbname)).unwrap();
- println!("\n{}", db::get_toencode_number(&conn).unwrap());
- std::fs::remove_file(dbname).unwrap();
+ ex.spawn(async {
+ let db = db::init_db(Some(&dbname)).await.unwrap();
+ let conn = db.connect().unwrap();
+ let temp = handler.clone();
+ index_files_recursively(Path::new("./testfiles"), &conn, temp).unwrap();
+ println!("\n{}", db::get_toencode_number(&conn).await.unwrap());
+ reencode_files(&conn, handler, 4).await.unwrap();
+ println!("\n{}", db::get_toencode_number(&conn).await.unwrap());
+ std::fs::remove_file(dbname).unwrap();
+ })
+ .await;
}
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-07 18:23:39 +0000