diff --git a/src/data.rs b/src/data.rs index 60f1fd8..9128cac 100644 --- a/src/data.rs +++ b/src/data.rs @@ -68,3 +68,15 @@ macro_rules! id_impl { id_impl!(u32, Id, INVALID_ID); id_impl!(u16, SmallId, INVALID_SMALL_ID); + +impl From for Id { + fn from(value: SmallId) -> Self { + Self(value.0 as u32) + } +} + +impl From for SmallId { + fn from(value: Id) -> Self { + Self(value.0 as u16) + } +} \ No newline at end of file diff --git a/src/data_provider/mod.rs b/src/data_provider/mod.rs index 79e778a..203b334 100644 --- a/src/data_provider/mod.rs +++ b/src/data_provider/mod.rs @@ -3,7 +3,7 @@ use crate::data::entities::{CardState, EntityData}; use crate::data::repositories::{BatchedDbLayer, DbLayer}; use crate::notification::MaybeError; use crate::notification::NotificationData::{DbLoadError, DbSaveError}; -use log::info; +use log::debug; use rusqlite::{Connection, Error, Params, Row}; use std::marker::PhantomData; use std::time::Instant; @@ -42,7 +42,7 @@ impl> DbLayer for SqliteDbLayer> DbLayer for SqliteDbLayer> DbLayer for SqliteDbLayer> DbLayer for SqliteDbLayer> BatchedDbLayer for SqliteDbLay ) .map_err(|_| DbSaveError)?; } - info!( + debug!( "Deleted {} from {} for {:?}", ids.len(), Q::name(), @@ -160,7 +160,7 @@ impl> BatchedDbLayer for SqliteDbLay entities[index].set_id(id.into()); } - info!( + debug!( "Added {} into {} for {:?}", entities.len(), Q::name(), diff --git a/src/navigation.rs b/src/navigation.rs index 9506416..ecd87f8 100644 --- a/src/navigation.rs +++ b/src/navigation.rs @@ -37,7 +37,7 @@ use iced::keyboard::Event; use iced::widget::stack; use iced::{Element, Task}; use iced_core::Length::Fill; -use log::info; +use log::{debug, info}; use parking_lot::Mutex; use rusqlite::Connection; use std::sync::Arc; @@ -241,7 +241,7 @@ impl ScreenState { Import ); } - info!("Update took {:?}", time.elapsed()); + debug!("Update took {:?}", time.elapsed()); task.0 } @@ -288,7 +288,7 @@ impl ScreenState { let notifications = self.notification_manager.draw().map(Notification); - info!("View took {:?}", time.elapsed()); + debug!("View took {:?}", time.elapsed()); stack![view, notifications].width(Fill).height(Fill).into() }