Full split of lang.rs

src/data_provider/card_sets.rs

@@ -16,7 +16,6 @@ pub fn load_sets(connection: &Connection) -> Vec<DeckSettings> {
                 backward: row.get(3)?,
                 filter: row.get(4)?,
                 count: None,
-                worst_words_list: None,
                 open_mode: OrderMode::Default,
             })
         })

src/data_provider/history.rs

@@ -1,13 +1,14 @@
+use crate::core::srs::WordOpenMode;
+use crate::data::entities::HistoryItem;
+use crate::data::Id;
 use crate::fs::*;
-use crate::lang::{Id};
-use chrono::{DateTime, Utc};
+use crate::notification::NotificationData;
+use crate::notification::NotificationData::PermissionDenied;
+use chrono::DateTime;
 use std::fs::{File, OpenOptions};
 use std::io::Write;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
-use crate::core::srs::WordOpenMode;
-use crate::notification::NotificationData;
-use crate::notification::NotificationData::PermissionDenied;
 
 pub fn get_history_of_set(id: Id) -> Result<Vec<HistoryItem>, NotificationData> {
     let app_dir = history_dir()?;
@@ -84,11 +85,4 @@ pub fn push_note(set_id: Id, item: HistoryItem) -> Result<(), NotificationData>
     Ok(())
 }
 
-#[derive(Clone)]
-pub struct HistoryItem {
-    pub timestamp: DateTime<Utc>,
-    pub word_id: Id,
-    pub mode: WordOpenMode,
-    pub before: u8,
-    pub after: u8,
-}
+

src/data_provider/words.rs

@@ -1,6 +1,6 @@
-use crate::lang::{WordData, WordGroup};
 use rusqlite::{Connection, params};
 use std::collections::HashMap;
+use crate::data::entities::{WordData, WordGroup};
 
 pub fn add_word(word: &mut WordData, connection: &Connection) {
     let index : u32 = connection