fix: reenable initial quick vault scan

feat/type-attributes
Tomáš Mládek 2022-09-15 20:20:23 +02:00
parent e17431bb3f
commit 0b0c6f2ec3
4 changed files with 6 additions and 4 deletions

View File

@ -657,12 +657,13 @@ impl UpStore for FsStore {
&self, &self,
db: &UpEndDatabase, db: &UpEndDatabase,
mut job_container: JobContainer, mut job_container: JobContainer,
initial: bool,
) -> Result<Vec<UpdatePathOutcome>, StoreError> { ) -> Result<Vec<UpdatePathOutcome>, StoreError> {
let job_result = job_container.add_job("REIMPORT", "Scaning vault directory..."); let job_result = job_container.add_job("REIMPORT", "Scaning vault directory...");
match job_result { match job_result {
Ok(job_handle) => { Ok(job_handle) => {
let result = self.rescan_vault(db, job_handle, true, false); let result = self.rescan_vault(db, job_handle, !initial, initial);
if let Err(err) = &result { if let Err(err) = &result {
error!("Update did not succeed! {:?}", err); error!("Update did not succeed! {:?}", err);
@ -720,7 +721,7 @@ mod test {
let job_container = JobContainer::new(); let job_container = JobContainer::new();
// Store scan // Store scan
let rescan_result = store.update(&open_result.db, job_container.clone()); let rescan_result = store.update(&open_result.db, job_container.clone(), false);
assert!(rescan_result.is_ok()); assert!(rescan_result.is_ok());
} }

View File

@ -62,5 +62,6 @@ pub trait UpStore {
&self, &self,
database: &UpEndDatabase, database: &UpEndDatabase,
job_container: JobContainer, job_container: JobContainer,
initial: bool,
) -> Result<Vec<UpdatePathOutcome>>; ) -> Result<Vec<UpdatePathOutcome>>;
} }

View File

@ -273,7 +273,7 @@ fn main() -> Result<()> {
info!("Running initial update..."); info!("Running initial update...");
// let new = open_result.new; // let new = open_result.new;
block_background::<_, _, anyhow::Error>(move || { block_background::<_, _, anyhow::Error>(move || {
let _ = state.store.update(&upend, job_container.clone()); let _ = state.store.update(&upend, job_container.clone(), true);
let _ = extractors::extract_all(upend, state.store, job_container); let _ = extractors::extract_all(upend, state.store, job_container);
Ok(()) Ok(())
}) })

View File

@ -707,7 +707,7 @@ pub async fn api_refresh(
block_background::<_, _, anyhow::Error>(move || { block_background::<_, _, anyhow::Error>(move || {
let _ = state let _ = state
.store .store
.update(&state.upend, state.job_container.clone()); .update(&state.upend, state.job_container.clone(), false);
let _ = crate::extractors::extract_all( let _ = crate::extractors::extract_all(
state.upend.clone(), state.upend.clone(),
state.store.clone(), state.store.clone(),