diff --git a/src/filesystem.rs b/src/filesystem.rs index 947ec72..90424df 100644 --- a/src/filesystem.rs +++ b/src/filesystem.rs @@ -284,7 +284,7 @@ pub fn resolve_path>( Ok(result) } -pub async fn reimport_directory( +pub async fn rescan_vault( pool: DbPool, directory: PathBuf, job_container: Arc>, @@ -296,8 +296,7 @@ pub async fn reimport_directory( .unwrap(); let result = - actix_web::web::block(move || _reimport_directory(pool, directory, job_container, job_id)) - .await; + actix_web::web::block(move || _rescan_vault(pool, directory, job_container, job_id)).await; if result.is_err() { let err = result.err().unwrap(); error!("Update did not succeed! {:?}", err); @@ -312,7 +311,7 @@ enum UpdatePathOutcome { Removed(PathBuf), } -fn _reimport_directory>( +fn _rescan_vault>( pool: DbPool, directory: T, job_container: Arc>, diff --git a/src/main.rs b/src/main.rs index a548551..e0555be 100644 --- a/src/main.rs +++ b/src/main.rs @@ -110,11 +110,7 @@ fn main() -> Result<()> { if !matches.is_present("NO_INITIAL_UPDATE") { info!("Running initial update..."); - actix::spawn(filesystem::reimport_directory( - db_pool, - vault_path, - job_container, - )); + actix::spawn(filesystem::rescan_vault(db_pool, vault_path, job_container)); } if !matches.is_present("NO_BROWSER") { diff --git a/src/routes.rs b/src/routes.rs index 7842fa2..1b89da4 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -169,7 +169,7 @@ pub async fn list_hier( pub async fn api_refresh(state: web::Data) -> Result { let _pool = state.db_pool.clone(); let _directory = state.directory.clone(); - actix::spawn(crate::filesystem::reimport_directory( + actix::spawn(crate::filesystem::rescan_vault( _pool, _directory, state.job_container.clone(),