aboutsummaryrefslogtreecommitdiff
path: root/logic/src/admin/mod.rs
diff options
context:
space:
mode:
Diffstat (limited to 'logic/src/admin/mod.rs')
-rw-r--r--logic/src/admin/mod.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/logic/src/admin/mod.rs b/logic/src/admin/mod.rs
index 2877299..fb1e59f 100644
--- a/logic/src/admin/mod.rs
+++ b/logic/src/admin/mod.rs
@@ -11,8 +11,7 @@ use crate::{DATABASE, session::Session};
use anyhow::{Result, anyhow};
use jellyimport::{import_wrap, reporting::IMPORT_ERRORS};
use rand::Rng;
-use std::time::{Duration, Instant};
-use tokio::task::spawn_blocking;
+use tokio::{spawn, task::spawn_blocking};
pub async fn get_import_errors(_session: &Session) -> Vec<String> {
IMPORT_ERRORS.read().await.to_owned()
@@ -39,12 +38,11 @@ pub async fn update_search_index(session: &Session) -> Result<()> {
session.assert_admin()?;
spawn_blocking(move || DATABASE.search_create_index()).await?
}
-pub async fn do_import(session: &Session, incremental: bool) -> Result<(Duration, Result<()>)> {
+pub async fn do_import(session: &Session, incremental: bool) -> Result<()> {
session.assert_admin()?;
- let t = Instant::now();
if !incremental {
DATABASE.clear_nodes()?;
}
- let r = import_wrap((*DATABASE).clone(), incremental).await;
- Ok((t.elapsed(), r))
+ spawn(import_wrap((*DATABASE).clone(), incremental));
+ Ok(())
}