Reformat code

Reviewed-on: https://gitea.micialware.ru/micialware/jap_learn/pulls/14

sql/custom_fields.sql

@@ -0,0 +1,4 @@
+create table custom_fields(
+    id INTEGER PRIMARY KEY,
+    name TEXT not null
+);

src/data.rs

@@ -3,7 +3,7 @@ pub mod repositories;
 
 use rusqlite::ToSql;
 use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef};
-use std::fmt::{write, Display, Formatter};
+use std::fmt::{Display, Formatter, write};
 use std::num::ParseIntError;
 use std::str::FromStr;
 
@@ -63,8 +63,20 @@ macro_rules! id_impl {
                 self.0 != 0
             }
         }
-    }
+    };
 }
 
 id_impl!(u32, Id, INVALID_ID);
 id_impl!(u16, SmallId, INVALID_SMALL_ID);
+
+impl From<SmallId> for Id {
+    fn from(value: SmallId) -> Self {
+        Self(value.0 as u32)
+    }
+}
+
+impl From<Id> for SmallId {
+    fn from(value: Id) -> Self {
+        Self(value.0 as u16)
+    }
+}

src/data/entities.rs

@@ -3,13 +3,13 @@ use crate::core::srs::{FADE_PER_DAY, MAX_SCORE, OrderMode, WordOpenMode};
 use crate::data::{INVALID_ID, Id};
 use chrono::{DateTime, NaiveDate, Utc};
 use fsrs::MemoryState;
+use litemap::LiteMap;
 use log::info;
 use rayon::prelude::*;
 use rhai::{Engine, Scope};
 use std::cmp::Ordering;
 use std::marker::PhantomData;
 use std::time::Instant;
-use litemap::LiteMap;
 
 #[derive(Clone, Debug)]
 pub struct WordData {

src/data/repositories.rs

@@ -320,7 +320,8 @@ impl<T: EntityData + Clone, D: DbLayer<T>> Repository<T, D> for DataRepositoryIn
     }
 
     fn create_now(&mut self, mut new: T) -> Result<EntityHandle<T>, NotificationData> {
-        self.data_layer.add_entity(&mut new, &self.connection.read())?;
+        self.data_layer
+            .add_entity(&mut new, &self.connection.read())?;
         let index = self.cache.len();
         let handle = EntityHandle::new(new.id(), index, true);
         self.cache.push(new);
@@ -378,7 +379,7 @@ impl<T: EntityData + Clone, D: DbLayer<T>> Repository<T, D> for DataRepositoryIn
 
     fn start(&mut self) -> MaybeError {
         if self.version != 0 {
-            return Ok(())
+            return Ok(());
         }
 
         self.init()?;

src/data_provider/custom_fields.rs

@@ -0,0 +1,37 @@
+use crate::data::entities::WordGroup;
+use crate::data_provider::TableAccessQuerySet;
+use rusqlite::{Error, Params, Row};
+
+pub struct CustomFieldsQuerySet;
+impl TableAccessQuerySet<WordGroup> for CustomFieldsQuerySet {
+    fn load() -> &'static str {
+        "SELECT id, name FROM custom_fields"
+    }
+
+    fn save() -> &'static str {
+        "UPDATE custom_fields SET name = ?1 WHERE id = ?2"
+    }
+
+    fn add() -> &'static str {
+        "INSERT INTO word_groups (name) VALUES (?1)"
+    }
+
+    fn name() -> &'static str {
+        "custom_fields"
+    }
+
+    fn from_sql(row: &Row) -> Result<WordGroup, Error> {
+        Ok(WordGroup {
+            id: row.get(0)?,
+            name: row.get(1)?,
+        })
+    }
+
+    fn insert_params(entity: &WordGroup) -> impl Params {
+        (&entity.name,)
+    }
+
+    fn update_params(entity: &WordGroup) -> impl Params {
+        (&entity.name, entity.id)
+    }
+}

src/data_provider/decks.rs

@@ -46,7 +46,13 @@ impl TableAccessQuerySet<DeckSettings> for DeckQuerySet {
     }
 
     fn update_params(entity: &DeckSettings) -> impl Params {
-        (&entity.name, &entity.forward, &entity.backward, &entity.filter, entity.id)
+        (
+            &entity.name,
+            &entity.forward,
+            &entity.backward,
+            &entity.filter,
+            entity.id,
+        )
     }
 }
 

src/data_provider/mod.rs

@@ -3,12 +3,13 @@ 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;
 
 pub(crate) mod card_states;
+pub mod custom_fields;
 pub(crate) mod decks;
 pub(crate) mod history;
 pub(crate) mod import;
@@ -16,6 +17,7 @@ pub(crate) mod settings;
 pub(crate) mod sqlite;
 pub(crate) mod voice;
 pub(crate) mod web_api;
+pub mod word_groups;
 pub(crate) mod words;
 
 pub trait TableAccessQuerySet<T> {
@@ -42,11 +44,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
         connection
             .execute(Q::load(), Q::update_params(entity))
             .map_err(|_| DbSaveError)?;
-        info!(
+        debug!("Updated in {} for {:?}", Q::name(), time.elapsed());
-            "Updated in {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 
@@ -58,11 +56,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
             .map_err(|_| DbSaveError)?;
 
         entity.set_id(index.into());
-        info!(
+        debug!("Added into {} for {:?}", Q::name(), time.elapsed());
-            "Added into {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 
@@ -78,11 +72,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
                 (&id,),
             )
             .map_err(|_| DbSaveError)?;
-        info!(
+        debug!("Deleted from {} for {:?}", Q::name(), time.elapsed());
-            "Deleted from {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 
@@ -98,7 +88,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
 
         iter.filter_map(|res| res.ok())
             .for_each(|i| storage.push(i));
-        info!(
+        debug!(
             "Loaded {} from {} for {:?}",
             storage.len(),
             Q::name(),
@@ -126,7 +116,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLay
                 )
                 .map_err(|_| DbSaveError)?;
         }
-        info!(
+        debug!(
             "Deleted {} from {} for {:?}",
             ids.len(),
             Q::name(),
@@ -160,7 +150,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLay
             entities[index].set_id(id.into());
         }
 
-        info!(
+        debug!(
             "Added {} into {} for {:?}",
             entities.len(),
             Q::name(),

src/data_provider/sqlite.rs

@@ -21,6 +21,7 @@ fn create_tables(conn: &Connection) {
     make_words(conn).expect("Failed to init table");
     make_card_stats(conn).expect("Failed to init table");
     make_history(conn).expect("Failed to init table");
+    make_custom_fields(conn).expect("Failed to init table");
 }
 
 fn make_settings(conn: &Connection) -> Result<(), rusqlite::Error> {
@@ -58,6 +59,12 @@ fn make_history(conn: &Connection) -> Result<(), rusqlite::Error> {
     Ok(())
 }
 
+fn make_custom_fields(conn: &Connection) -> Result<(), rusqlite::Error> {
+    let query = include_str!("../../sql/custom_fields.sql");
+    conn.execute(query, ())?;
+    Ok(())
+}
+
 pub fn default_connection() -> Connection {
     let db_file = db_path();
     let connection = Connection::open(db_file).expect("Failed to open database");

src/data_provider/word_groups.rs

@@ -0,0 +1,37 @@
+use crate::data::entities::WordGroup;
+use crate::data_provider::TableAccessQuerySet;
+use rusqlite::{Error, Params, Row};
+
+pub struct WordGroupQuerySet;
+impl TableAccessQuerySet<WordGroup> for WordGroupQuerySet {
+    fn load() -> &'static str {
+        "SELECT id, name FROM word_groups"
+    }
+
+    fn save() -> &'static str {
+        "UPDATE word_groups SET name = ?1 WHERE id = ?2"
+    }
+
+    fn add() -> &'static str {
+        "INSERT INTO word_groups (name) VALUES (?1)"
+    }
+
+    fn name() -> &'static str {
+        "word_groups"
+    }
+
+    fn from_sql(row: &Row) -> Result<WordGroup, Error> {
+        Ok(WordGroup {
+            id: row.get(0)?,
+            name: row.get(1)?,
+        })
+    }
+
+    fn insert_params(entity: &WordGroup) -> impl Params {
+        (&entity.name,)
+    }
+
+    fn update_params(entity: &WordGroup) -> impl Params {
+        (&entity.name, entity.id)
+    }
+}

src/data_provider/words.rs

@@ -2,9 +2,9 @@ use crate::data::entities::{WordData, WordGroup};
 use crate::data_provider::TableAccessQuerySet;
 use crate::notification::NotificationData::{DbLoadError, DbSaveError};
 use crate::notification::{MaybeError, NotificationData};
+use litemap::LiteMap;
 use rusqlite::{Connection, Error, Params, Row, params};
 use std::collections::HashMap;
-use litemap::LiteMap;
 
 pub struct WordQuerySet;
 impl TableAccessQuerySet<WordData> for WordQuerySet {
@@ -31,8 +31,7 @@ impl TableAccessQuerySet<WordData> for WordQuerySet {
             key: row.get(1)?,
             value: row.get(2)?,
             tags: row.get(3)?,
-            additional: serde_json::from_str(&additional)
+            additional: serde_json::from_str(&additional).unwrap_or_default(),
-                .unwrap_or_default(),
             group_id: row.get(5)?,
         })
     }
@@ -58,40 +57,6 @@ impl TableAccessQuerySet<WordData> for WordQuerySet {
     }
 }
 
-pub struct WordGroupQuerySet;
-impl TableAccessQuerySet<WordGroup> for WordGroupQuerySet {
-    fn load() -> &'static str {
-        "SELECT id, name FROM word_groups"
-    }
-
-    fn save() -> &'static str {
-        "UPDATE word_groups SET name = ?1 WHERE id = ?2"
-    }
-
-    fn add() -> &'static str {
-        "INSERT INTO word_groups (name) VALUES (?1)"
-    }
-
-    fn name() -> &'static str {
-        "word_groups"
-    }
-
-    fn from_sql(row: &Row) -> Result<WordGroup, Error> {
-        Ok(WordGroup {
-            id: row.get(0)?,
-            name: row.get(1)?,
-        })
-    }
-
-    fn insert_params(entity: &WordGroup) -> impl Params {
-        (&entity.name,)
-    }
-
-    fn update_params(entity: &WordGroup) -> impl Params {
-        (&entity.name, entity.id)
-    }
-}
-
 pub fn add_word(word: &mut WordData, connection: &Connection) -> MaybeError {
     let index : u32 = connection
         .query_row(
@@ -187,8 +152,7 @@ pub fn load_words(connection: &Connection) -> Result<Vec<WordData>, Notification
                 key: row.get(1)?,
                 value: row.get(2)?,
                 tags: row.get(3)?,
-                additional: serde_json::from_str(&additional)
+                additional: serde_json::from_str(&additional).unwrap_or_default(),
-                    .unwrap_or_default(),
                 group_id: row.get(5)?,
             })
         })

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()
     }