diff --git a/src/sheet_validation.rs b/src/sheet_validation.rs index 1f19d7e..fd47c4d 100644 --- a/src/sheet_validation.rs +++ b/src/sheet_validation.rs @@ -13,13 +13,13 @@ pub async fn load_and_validate_sheets( database: &Database, directory: impl AsRef, ) -> Vec { - let sheets = sheet_dao::fetch_all_sheets(&database).await.unwrap(); + let sheets = sheet_dao::fetch_all_sheets(database).await.unwrap(); debug!("Validating sheets from database..."); let mut validation_result = validate_sheet_files(sheets, directory); debug!("{}", validation_result.get_stats()); // TODO: handle invalidated files for updated in validation_result.updated_sheets.iter() { - sheet_dao::update_sheet_path(&database, updated) + sheet_dao::update_sheet_path(database, updated) .await .unwrap(); } @@ -29,7 +29,7 @@ pub async fn load_and_validate_sheets( debug!("Inserting unassigned files into orphan table..."); for unassigned in validation_result.unassigned_files { - let orphan = sheet_dao::insert_file_as_orphan(&database, unassigned) + let orphan = sheet_dao::insert_file_as_orphan(database, unassigned) .await .unwrap(); sheets.push(orphan); diff --git a/src/ui/app.rs b/src/ui/app.rs index b00cb09..1a3ebc1 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -1,7 +1,4 @@ -use std::{ - path::{Path, PathBuf}, - sync::Arc, -}; +use std::{path::PathBuf, sync::Arc}; use chrono::Utc; use gtk::prelude::*; @@ -13,7 +10,7 @@ use relm4::{ }; use crate::{ - database::{self, Database}, + database::Database, sheet::{I64DateTime, Sheet}, sheet_dao, sheet_validation, ui::mcdu::McduOutput, @@ -168,9 +165,7 @@ impl AsyncComponent for AppModel { let db = Arc::clone(&self.database); let dir = Arc::clone(&self.directory); sender.oneshot_command(async move { - let sheets = - sheet_validation::load_and_validate_sheets(&db, dir.as_ref()).await; - return sheets; + sheet_validation::load_and_validate_sheets(&db, dir.as_ref()).await }) } AppInput::Sort => self.sheets_listing.emit(SheetListingInput::Sort), diff --git a/src/ui/sheet_listing.rs b/src/ui/sheet_listing.rs index 35beb86..0a7815e 100644 --- a/src/ui/sheet_listing.rs +++ b/src/ui/sheet_listing.rs @@ -8,7 +8,7 @@ use crate::sheet::Sheet; use super::sheet_model::{OnQueryUpdate, SheetModel}; -use rand::{seq::SliceRandom, thread_rng}; +use rand::seq::SliceRandom; pub struct SheetListingModel { sheets: FactoryVecDeque,