Merge pull request 'reformat custom fields table. will return to this topic later' (#18) from compressed-fields into master

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

Cargo.toml

@@ -1,41 +1,42 @@
 [package]
 name = "jap_learn"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2024"
 
 [dependencies]
-iced = { version = "0.14.0", features = ["tokio", "svg", "lazy"]}
+iced = { version = "0.14.0", features = ["tokio", "svg", "lazy", "crisp", "tiny-skia", "wayland", "wgpu"], default-features = false}
 iced_core = "0.14.0"
 rand = "0.10.2"
-dirs = "6.0.0"
+dirs = "7.0.0"
-serde = { version = "1.0.229", features = ["derive"] }
 serde_json = "1.0.151"
-rhai = "1.25.1"
+rhai = { version = "1.26.0", features = ["sync"] }
 chrono = "0.4.45"
 rusqlite = { version = "0.40.2", features = ["chrono", "bundled"] }
-reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] }
+reqwest = { version = "0.13.5", features = ["json", "stream", "multipart"] }
 rodio = "0.22.2"
 sha2 = "0.11.0"
 tokio = { version = "1.53.1", features = ["rt", "rt-multi-thread", "macros"] }
 hex = "0.4.3"
-zstd = "0.13.3"
+zstd = "0.14.0"
 zip = "8.6.0"
 rfd = "0.17.2"
 mimalloc = "0.1.52"
+hashbrown = "0.17.1"
+rayon = "1.12.0"
+parking_lot = "0.12.5"
+env_logger = "0.11.11"
+log = "0.4.34"
+fsrs = "6.6.2"
+litemap = { version = "0.8.3", features = ["serde"] }
 
 [profile.super-release]
 inherits = "release"
 codegen-units = 1
 lto = true
 opt-level = 3
-strip = true
+#strip = true
 panic = "abort"
 
 [dev-dependencies]
-criterion = "0.8.2"
+criterion = { version = "0.8.2", features = ["html_reports"] }
-
+rustc-hash = "2.1.3"
-[[bench]]
-name = "split_bench"  # Имя файла в benches/ без расширения
-harness = false       # Отключаем стандартный тестовый раннер
-
-

benches/split_bench.rs

@@ -1,43 +0,0 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-fn bench_split(c: &mut Criterion) {
-    let input = "data_1";
-
-    c.bench_function("split_with_comma", |b| {
-        b.iter(|| {
-            // black_box запрещает компилятору оптимизировать результат
-            black_box(split_with_coma(black_box(input)))
-        })
-    });
-}
-
-fn bench_split_new(c: &mut Criterion) {
-    let input = "data_1";
-
-    c.bench_function("split_with_comma gpt", |b| {
-        b.iter(|| {
-            // black_box запрещает компилятору оптимизировать результат
-            black_box(split_with_coma(black_box(input)))
-        })
-    });
-}
-
-
-pub fn split_with_coma(ts: &str) -> Vec<String> {
-    ts.split(',')
-        .map(|ts| ts.to_lowercase().trim().to_string())
-        .filter(|t| !t.is_empty())
-        .collect::<Vec<String>>()
-}
-
-pub fn new_split_with_coma(ts: &str) -> Vec<String> {
-    ts.split(',')
-        .map(|s| s.trim())               // 0 аллокаций, просто срез
-        .filter(|s| !s.is_empty())       // отбрасываем пустые до аллокации
-        .map(|s| s.to_lowercase())       // 1 аллокация на валидный токен
-        .collect()
-}
-
-// Можно добавить несколько бенчмарков в группу
-criterion_group!(benches, bench_split, bench_split_new);
-criterion_main!(benches);

sql/card_set.sql

@@ -1,9 +0,0 @@
-create table card_set
-(
-    id       INTEGER
-        primary key autoincrement,
-    name     TEXT not null,
-    forward  TEXT not null,
-    backward TEXT not null,
-    filter   TEXT not null
-);

sql/card_stats.sql

@@ -1,13 +0,0 @@
-create table card_stats
-(
-    id          INTEGER
-        primary key autoincrement,
-    word_id     INTEGER           not null
-        references words
-            on delete cascade,
-    set_id      TEXT              not null
-        references card_set
-            on delete cascade,
-    score       INTEGER default 1 not null,
-    last_opened integer           not null
-);

sql/custom_fields.sql

@@ -0,0 +1,6 @@
+create table custom_fields
+(
+    id            integer primary key,
+    name          text not null,
+    custom_fields text not null
+);

sql/decks.sql

@@ -0,0 +1,9 @@
+create table decks
+(
+    id       integer
+        primary key autoincrement,
+    name     text not null,
+    forward  text not null,
+    backward text not null,
+    filter   text not null
+);

sql/history.sql

@@ -0,0 +1,12 @@
+create table history
+(
+    id        integer
+        primary key autoincrement,
+    deck_id   integer not null references decks on delete cascade,
+    word_id   integer not null references words on delete cascade,
+    timestamp integer not null,
+    answer    integer not null,
+    before    integer not null,
+    after     integer not null,
+    fsrs      integer not null
+);

sql/states.sql

@@ -0,0 +1,16 @@
+create table states
+(
+    id            integer
+        primary key autoincrement,
+    word_id       integer           not null
+        references words
+            on delete cascade,
+    deck_id       integer           not null
+        references decks
+            on delete cascade,
+    score         integer default 1 not null,
+    last_opened   integer           not null,
+    fsrs_opened   integer           not null,
+    fsrs_memory   integer           not null,
+    fsrs_open_day integer           not null
+);

sql/word_group.sql

@@ -1,6 +0,0 @@
-create table word_group
-(
-    id   INTEGER
-        primary key autoincrement,
-    name TEXT not null
-);

sql/word_groups.sql

@@ -0,0 +1,6 @@
+create table word_groups
+(
+    id   integer
+        primary key autoincrement,
+    name text not null
+);

sql/words.sql

@@ -1,13 +1,13 @@
 create table words
 (
-    id       INTEGER
+    id       integer
         primary key autoincrement,
-    key      TEXT              not null,
+    key      text              not null,
-    value    TEXT              not null,
+    value    text              not null,
-    tags     TEXT              not null,
+    tags     text              not null,
-    more     TEXT,
+    more     text,
     group_id integer default 1 not null
-        constraint words_word_group_id_fk
+        constraint words_word_groups_id_fk
-            references word_group
+            references word_groups
             on update cascade on delete cascade
 );

src/app.rs

@@ -0,0 +1,121 @@
+use crate::data::repositories::Repository;
+use crate::data_provider::card_states::CardStateRepository;
+use crate::data_provider::decks::DeckRepository;
+use crate::data_provider::history::HistoryRepository;
+use crate::data_provider::settings::get_setting;
+use crate::data_provider::sqlite::SqliteConnection;
+use crate::data_provider::word_groups::WordGroupRepository;
+use crate::data_provider::words::WordRepository;
+use crate::navigation::RootMessage::Keyboard;
+use crate::navigation::{AppSettings, RootMessage, ScreenState};
+use iced::{Subscription, keyboard, window};
+use iced_core::window::Position;
+#[cfg(target_os = "linux")]
+use iced_core::window::settings::PlatformSpecific;
+use iced_core::{Font, Size, Theme};
+use log::info;
+use parking_lot::{Mutex, RwLock};
+use rusqlite::Connection;
+use std::sync::Arc;
+
+pub const USER_FONT: Font = Font::with_name("Noto Sans JP");
+
+pub fn start() -> iced::Result {
+    info!("Welcome to JapLearn");
+    iced::application(ScreenState::boot, ScreenState::update, ScreenState::view)
+        .window(window_settings())
+        .subscription(subscription)
+        .title("JapLearn")
+        .settings(iced::Settings {
+            default_text_size: iced::Pixels(18.0),
+            ..iced::Settings::default()
+        })
+        .font(include_bytes!("../noto.ttf"))
+        .default_font(USER_FONT)
+        .theme(Theme::GruvboxDark)
+        .run()
+}
+
+#[allow(unused_mut)]
+fn window_settings() -> window::Settings {
+    let mut settings = window::Settings {
+        position: Position::Centered,
+        min_size: Some(Size::new(700.0_f32, 700.0_f32)),
+        ..Default::default()
+    };
+
+    #[cfg(target_os = "linux")]
+    {
+        settings.platform_specific = PlatformSpecific {
+            application_id: "JapLearn".to_string(),
+            override_redirect: false,
+        };
+    }
+
+    settings
+}
+
+fn subscription(_state: &ScreenState) -> Subscription<RootMessage> {
+    keyboard::listen().map(Keyboard)
+}
+
+#[derive(Clone)]
+pub struct AppState {
+    pub dictionary: WordRepository,
+    pub decks: DeckRepository,
+    pub word_groups: WordGroupRepository,
+    pub card_states: CardStateRepository,
+    pub connection: Arc<Mutex<SqliteConnection>>,
+    pub sync_data: Arc<RwLock<AppSettings>>,
+    pub history: HistoryRepository,
+}
+
+impl Default for AppState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl AppState {
+    pub fn new() -> Self {
+        let connection = Arc::new(Mutex::new(SqliteConnection::default()));
+        Self {
+            dictionary: WordRepository::new(connection.clone()),
+            decks: DeckRepository::new(connection.clone()),
+            word_groups: WordGroupRepository::new(connection.clone()),
+            card_states: CardStateRepository::new(connection.clone()),
+            history: HistoryRepository::new(connection.clone()),
+            sync_data: Arc::new(RwLock::new(AppSettings {
+                key: None,
+                auto_web_fetch: false,
+            })),
+            connection,
+        }
+    }
+}
+
+pub fn fill_state(state: &mut AppState) {
+    let connection = state.connection.lock();
+
+    let setting = load_settings(&connection);
+    drop(connection);
+    state.word_groups.write().start().unwrap();
+    state.dictionary.write().start().unwrap();
+    state.decks.write().start().unwrap();
+    state.history.write().start().unwrap();
+    state.card_states.write().start().unwrap();
+
+    state.sync_data = Arc::new(RwLock::new(setting))
+}
+
+fn load_settings(connection: &Connection) -> AppSettings {
+    let key = get_setting("SYNC_KEY".to_string(), connection);
+    let fetch = get_setting("AUTO_WEB_FETCH".to_string(), connection)
+        .unwrap_or("false".to_string())
+        .parse::<bool>()
+        .unwrap();
+    AppSettings {
+        key,
+        auto_web_fetch: fetch,
+    }
+}

src/core.rs

@@ -0,0 +1,3 @@
+pub mod deck;
+pub mod kana_set;
+pub mod srs;

src/core/deck.rs

@@ -0,0 +1,191 @@
+use crate::app::AppState;
+use crate::core::srs::OrderModule::{Fsrs, RandomSRS, SemiRandomSRS, WorstWordsSRS};
+use crate::core::srs::{
+    FsrsModule, OrderMode, OrderModule, RandomSRSModule, SRSModule, SemiRandomSRSModule,
+    WordOpenMode, WorstWordsSRSModule,
+};
+use crate::data::entities::*;
+use crate::data::repositories::Repository;
+use crate::data_provider::card_states::CardStateRepositoryInner;
+use crate::notification::MaybeError;
+use chrono::Utc;
+use log::info;
+use rhai::{Engine, Scope};
+use std::sync::Arc;
+use std::time::Instant;
+
+#[derive(Clone)]
+pub struct DeckData {
+    pub(crate) words: Vec<EntityHandle<WordData>>,
+    pub(crate) states: Vec<EntityHandle<CardState>>,
+    current_word_index: Option<usize>,
+    state: AppState,
+    order_module: OrderModule,
+    open_mode: OrderMode,
+    settings: DeckSettings,
+}
+impl DeckData {
+    pub fn new(settings: &DeckSettings, open_mode: OrderMode, state: AppState) -> Self {
+        let states_repo = state.card_states.read();
+        let mut query = states_repo.deck_states(settings.id);
+        let words = query
+            .iter(&states_repo)
+            .map(|card_state| EntityHandle::from_id(card_state.word_id))
+            .collect();
+        let states = query.handles().collect::<Vec<EntityHandle<CardState>>>();
+        let fsrs = Fsrs(FsrsModule::new(
+            Self::set_links(states.as_slice(), &states_repo).as_slice(),
+        ));
+        drop(states_repo);
+        Self {
+            states,
+            words,
+            current_word_index: None,
+            state,
+            order_module: fsrs,
+            open_mode,
+            settings: settings.clone(),
+        }
+    }
+
+    pub fn next(&mut self) -> (EntityHandle<WordData>, EntityHandle<CardState>) {
+        if self.fsrs_finished() {
+            self.switch_order_engine()
+        }
+        let repo = self.state.card_states.read();
+        let links = Self::set_links(self.states.as_slice(), &repo);
+        let index = match self.order_module {
+            SemiRandomSRS(ref mut module) => module.next(links.as_slice()),
+
+            RandomSRS(ref mut module) => module.next(links.as_slice()),
+            WorstWordsSRS(ref mut module) => module.next(links.as_slice()),
+            Fsrs(ref mut module) => module.next(links.as_slice()),
+        };
+
+        self.current_word_index = Some(index);
+        (self.words[index], self.states[index])
+    }
+
+    fn set_links<'a>(
+        set: &[EntityHandle<CardState>],
+        repo: &'a CardStateRepositoryInner,
+    ) -> Vec<&'a CardState> {
+        set.iter()
+            .map(|h| repo.get_ref_static(*h).unwrap())
+            .collect::<Vec<_>>()
+    }
+
+    pub fn open(&mut self, status: WordOpenMode) -> MaybeError {
+        if let Some(index) = self.current_word_index {
+            let mut repo = self.state.card_states.write();
+            let card_state_handle = &mut self.states[index];
+            let card_state = repo.get_mut(card_state_handle).unwrap();
+            let old_score = card_state.score;
+            card_state.update(status);
+            let new_score = card_state.score;
+
+            let mut fsrs = false;
+            match self.order_module {
+                SemiRandomSRS(ref mut module) => {
+                    module.open(status, index, card_state);
+                }
+                RandomSRS(ref mut module) => {
+                    module.open(status, index, card_state);
+                }
+                WorstWordsSRS(ref mut module) => {
+                    module.open(status, index, card_state);
+                }
+                Fsrs(ref mut module) => {
+                    module.open(status, index, card_state);
+                    fsrs = true;
+                }
+            }
+
+            let word_id = card_state.word_id;
+            repo.save(card_state_handle)?;
+
+            let mut history = self.state.history.write();
+            history.create_now(HistoryNote {
+                id: Default::default(),
+                timestamp: Utc::now(),
+                deck_id: self.settings.id,
+                word_id,
+                answer: status,
+                before: old_score,
+                after: new_score,
+                fsrs,
+            })?;
+        }
+
+        Ok(())
+    }
+
+    fn switch_order_engine(&mut self) {
+        let repo = self.state.card_states.read();
+        let links = Self::set_links(self.states.as_slice(), &repo);
+        self.order_module = match self.open_mode {
+            OrderMode::Default => SemiRandomSRS(SemiRandomSRSModule::new(links.as_slice())),
+            OrderMode::TrainWorstFirst => WorstWordsSRS(WorstWordsSRSModule::new(links.as_slice())),
+            OrderMode::FullRandom => RandomSRS(RandomSRSModule::new(links.as_slice())),
+        }
+    }
+
+    fn fsrs_finished(&self) -> bool {
+        if let Fsrs(ref fsrs) = self.order_module
+            && fsrs.finished()
+        {
+            info!("Fsrs finished. Infinite mode enabled");
+            return true;
+        }
+
+        false
+    }
+
+    pub fn len(&self) -> usize {
+        self.states.len()
+    }
+
+    pub fn list(deck: &DeckSettings, state: &AppState) -> Vec<EntityHandle<WordData>> {
+        let time = Instant::now();
+        let list = vec![];
+        let engine = Engine::new();
+
+        let ast = engine.compile(&deck.filter);
+        if let Ok(ast) = ast {
+            let groups = state.word_groups.read().iter().cloned().collect::<Vec<_>>();
+            let dictionary = &state.dictionary.read();
+            let query = dictionary.query_par(Arc::new(move |word| {
+                let mut more = rhai::Map::new();
+                for iced in &word.additional {
+                    more.insert(iced.0.clone().into(), iced.1.clone().into());
+                }
+                let mut scope = Scope::new();
+                let group_name = groups[groups
+                    .binary_search_by_key(&word.group_id, |g| g.id)
+                    .unwrap()]
+                .name
+                .clone();
+                scope
+                    .push_constant("id", word.id.0 as i64)
+                    .push_constant("key", word.key.clone())
+                    .push_constant("value", word.value.clone())
+                    .push_constant("tags", word.tags.clone())
+                    .push_constant("more", more)
+                    .push_constant("group", group_name);
+
+                let result = engine.eval_ast_with_scope::<bool>(&mut scope, &ast);
+                if let Ok(result) = result {
+                    return result;
+                }
+                false
+            }));
+
+            info!("Collecting available words is {:?}", time.elapsed());
+            let handles = query.handles().collect();
+            drop(query);
+            handles
+        } else {
+            list
+        }
+    }
+}

src/core/kana_set.rs

@@ -0,0 +1,201 @@
+#[derive(Clone, Debug)]
+pub struct KanaSet {
+    name: String,
+    pub(crate) chars_type: KanaType,
+    pub(crate) dictionary: Vec<Vec<(String, String)>>,
+    pub(crate) include_map: [bool; 10],
+}
+#[derive(Clone, Debug)]
+pub enum KanaType {
+    Hiragana,
+    Katakana,
+}
+impl KanaSet {
+    pub fn hiragana() -> Self {
+        Self {
+            name: "Хирагана".to_string(),
+            chars_type: KanaType::Hiragana,
+            dictionary: vec![
+                vec![
+                    (String::from("ぁ"), String::from("a")),
+                    (String::from("ぃ"), String::from("i")),
+                    (String::from("ぅ"), String::from("u")),
+                    (String::from("ぇ"), String::from("e")),
+                    (String::from("ぉ"), String::from("o")),
+                ],
+                vec![
+                    (String::from("さ"), String::from("sa")),
+                    (String::from("し"), String::from("shi")),
+                    (String::from("す"), String::from("su")),
+                    (String::from("せ"), String::from("se")),
+                    (String::from("そ"), String::from("so")),
+                ],
+                vec![
+                    (String::from("か"), String::from("ka")),
+                    (String::from("き"), String::from("ki")),
+                    (String::from("く"), String::from("ku")),
+                    (String::from("け"), String::from("ke")),
+                    (String::from("こ"), String::from("ko")),
+                ],
+                // Ряд «та» (たちつてと)
+                vec![
+                    (String::from("た"), String::from("ta")),
+                    (String::from("ち"), String::from("chi")),
+                    (String::from("つ"), String::from("tsu")),
+                    (String::from("て"), String::from("te")),
+                    (String::from("と"), String::from("to")),
+                ],
+                // Ряд «на» (なにぬねの)
+                vec![
+                    (String::from("な"), String::from("na")),
+                    (String::from("に"), String::from("ni")),
+                    (String::from("ぬ"), String::from("nu")),
+                    (String::from("ね"), String::from("ne")),
+                    (String::from("の"), String::from("no")),
+                ],
+                // Ряд «ха» (はひふへほ)
+                vec![
+                    (String::from("は"), String::from("ha")),
+                    (String::from("ひ"), String::from("hi")),
+                    (String::from("ふ"), String::from("fu")),
+                    (String::from("へ"), String::from("he")),
+                    (String::from("ほ"), String::from("ho")),
+                ],
+                // Ряд «ма» (まみむめも)
+                vec![
+                    (String::from("ま"), String::from("ma")),
+                    (String::from("み"), String::from("mi")),
+                    (String::from("む"), String::from("mu")),
+                    (String::from("め"), String::from("me")),
+                    (String::from("も"), String::from("mo")),
+                ],
+                // Ряд «я» (やゆよ) — только 3 символа
+                vec![
+                    (String::from("や"), String::from("ya")),
+                    (String::from("ゆ"), String::from("yu")),
+                    (String::from("よ"), String::from("yo")),
+                ],
+                // Ряд «ра» (らりるれろ)
+                vec![
+                    (String::from("ら"), String::from("ra")),
+                    (String::from("り"), String::from("ri")),
+                    (String::from("る"), String::from("ru")),
+                    (String::from("れ"), String::from("re")),
+                    (String::from("ろ"), String::from("ro")),
+                ],
+                vec![
+                    (String::from("わ"), String::from("wa")),
+                    (String::from("を"), String::from("wo")),
+                    (String::from("ん"), String::from("n")),
+                ],
+            ],
+            include_map: [true; 10],
+        }
+    }
+
+    pub fn katakana() -> Self {
+        Self {
+            name: "Катакана".to_string(),
+            chars_type: KanaType::Katakana,
+            dictionary: vec![
+                vec![
+                    (String::from("ァ"), String::from("a")),
+                    (String::from("ィ"), String::from("i")),
+                    (String::from("ゥ"), String::from("u")),
+                    (String::from("ェ"), String::from("e")),
+                    (String::from("ォ"), String::from("o")),
+                ],
+                vec![
+                    (String::from("サ"), String::from("sa")),
+                    (String::from("シ"), String::from("shi")),
+                    (String::from("ス"), String::from("su")),
+                    (String::from("セ"), String::from("se")),
+                    (String::from("ソ"), String::from("so")),
+                ],
+                vec![
+                    (String::from("カ"), String::from("ka")),
+                    (String::from("キ"), String::from("ki")),
+                    (String::from("ク"), String::from("ku")),
+                    (String::from("ケ"), String::from("ke")),
+                    (String::from("コ"), String::from("ko")),
+                ],
+                // Ряд «та» (タチツテト)
+                vec![
+                    (String::from("タ"), String::from("ta")),
+                    (String::from("チ"), String::from("chi")),
+                    (String::from("ツ"), String::from("tsu")),
+                    (String::from("テ"), String::from("te")),
+                    (String::from("ト"), String::from("to")),
+                ],
+                // Ряд «на» (ナニヌネノ)
+                vec![
+                    (String::from("ナ"), String::from("na")),
+                    (String::from("ニ"), String::from("ni")),
+                    (String::from("ヌ"), String::from("nu")),
+                    (String::from("ネ"), String::from("ne")),
+                    (String::from("ノ"), String::from("no")),
+                ],
+                // Ряд «ха» (ハヒフヘホ)
+                vec![
+                    (String::from("ハ"), String::from("ha")),
+                    (String::from("ヒ"), String::from("hi")),
+                    (String::from("フ"), String::from("fu")),
+                    (String::from("ヘ"), String::from("he")),
+                    (String::from("ホ"), String::from("ho")),
+                ],
+                // Ряд «ма» (マミムメモ)
+                vec![
+                    (String::from("マ"), String::from("ma")),
+                    (String::from("ミ"), String::from("mi")),
+                    (String::from("ム"), String::from("mu")),
+                    (String::from("メ"), String::from("me")),
+                    (String::from("モ"), String::from("mo")),
+                ],
+                // Ряд «я» (ヤユヨ) — только 3 символа
+                vec![
+                    (String::from("ヤ"), String::from("ya")),
+                    (String::from("ユ"), String::from("yu")),
+                    (String::from("ヨ"), String::from("yo")),
+                ],
+                // Ряд «ра» (ラリルレロ)
+                vec![
+                    (String::from("ラ"), String::from("ra")),
+                    (String::from("リ"), String::from("ri")),
+                    (String::from("ル"), String::from("ru")),
+                    (String::from("レ"), String::from("re")),
+                    (String::from("ロ"), String::from("ro")),
+                ],
+                vec![
+                    (String::from("ワ"), String::from("wa")),
+                    (String::from("ヲ"), String::from("wo")),
+                    (String::from("ン"), String::from("n")),
+                ],
+            ],
+            include_map: [true; 10],
+        }
+    }
+
+    pub fn list(&self) -> Vec<(String, String)> {
+        let mut current_set: Vec<(String, String)> = Vec::new();
+
+        for i in 0..10 {
+            if self.include_map[i] {
+                self.dictionary[i].iter().for_each(|v| {
+                    current_set.push(v.clone());
+                });
+            }
+        }
+
+        current_set
+    }
+}
+impl Default for KanaSet {
+    fn default() -> Self {
+        KanaSet::hiragana()
+    }
+}
+impl PartialEq<Self> for KanaSet {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+    }
+}

src/core/srs.rs

@@ -0,0 +1,273 @@
+use crate::data::entities::CardState;
+use chrono::{Local, TimeDelta};
+use fsrs::FSRS;
+use log::{debug, info};
+use rand::distr::weighted::WeightedIndex;
+use rand::prelude::ThreadRng;
+use rand::prelude::{Distribution, SliceRandom};
+use rand::{RngExt, rng};
+
+const MAX_HISTORY_LEN: usize = 20;
+const MAX_HISTORY_LEN_PART: f32 = 0.33;
+pub const MAX_SCORE: u8 = 25;
+pub const FADE_PER_DAY: f32 = 0.95;
+const PARTIAL_POOL_SIZE: usize = 10;
+#[derive(Clone, PartialEq, Copy, Eq)]
+pub enum OrderMode {
+    Default,
+    TrainWorstFirst,
+    FullRandom,
+}
+#[derive(Clone, Copy, Eq, PartialEq, Default)]
+pub enum AppendMode {
+    Full,
+    #[default]
+    Manual,
+}
+#[derive(Clone)]
+pub enum OrderModule {
+    SemiRandomSRS(SemiRandomSRSModule),
+    RandomSRS(RandomSRSModule),
+    WorstWordsSRS(WorstWordsSRSModule),
+    Fsrs(FsrsModule),
+}
+pub trait SRSModule {
+    fn new(set: &[&CardState]) -> Self;
+    fn next(&mut self, set: &[&CardState]) -> usize;
+    fn open(&mut self, status: WordOpenMode, index: usize, updated_word: &mut CardState);
+}
+#[derive(Clone)]
+pub struct RandomSRSModule {
+    basket: Vec<usize>,
+}
+impl SRSModule for RandomSRSModule {
+    fn new(set: &[&CardState]) -> Self {
+        let mut basket = (0..set.len()).collect::<Vec<usize>>();
+        basket.shuffle(&mut rand::rng());
+        Self { basket }
+    }
+
+    fn next(&mut self, set: &[&CardState]) -> usize {
+        match self.basket.pop() {
+            Some(index) => index,
+            None => {
+                self.basket = (0..set.len()).collect::<Vec<usize>>();
+                self.basket.shuffle(&mut rand::rng());
+                self.basket.pop().expect("empty basket")
+            }
+        }
+    }
+
+    fn open(&mut self, _: WordOpenMode, _: usize, _: &mut CardState) {}
+}
+#[derive(Clone)]
+pub struct SemiRandomSRSModule {
+    history: Vec<usize>,
+    last_weights: WeightedIndex<f32>,
+    generator: ThreadRng,
+}
+impl SRSModule for SemiRandomSRSModule {
+    fn next(&mut self, set: &[&CardState]) -> usize {
+        let index = self.last_weights.sample(&mut self.generator);
+
+        if self.history.contains(&index) && self.history.len() != 1 {
+            return self.next(set);
+        }
+
+        if self.history.len() == self.history_len(set) {
+            self.history.remove(0);
+        }
+        self.history.push(index);
+
+        index
+    }
+    fn open(&mut self, _: WordOpenMode, index: usize, word: &mut CardState) {
+        let new_weight = (100.0 / word.calculated_score()).powf(2.0);
+        self.last_weights
+            .update_weights(&[(index, &new_weight)])
+            .expect("update weights error");
+    }
+    fn new(set: &[&CardState]) -> Self {
+        let weights = set
+            .iter()
+            .map(|s| (100.0 / s.calculated_score()).powf(2.0) * 2.0)
+            .collect::<Vec<f32>>();
+
+        Self {
+            generator: rng(),
+            last_weights: WeightedIndex::new(weights).expect("Incorrect weights update"),
+            history: vec![],
+        }
+    }
+}
+impl SemiRandomSRSModule {
+    fn history_len(&self, set: &[&CardState]) -> usize {
+        ((set.len() as f32 * MAX_HISTORY_LEN_PART) as usize).clamp(1, MAX_HISTORY_LEN)
+    }
+}
+#[derive(Clone)]
+pub struct WorstWordsSRSModule {
+    pool_size: usize,
+    rounds_remaining: u8,
+    pool: Vec<usize>,
+    queue: Vec<usize>,
+    rounds_count: u8,
+}
+impl SRSModule for WorstWordsSRSModule {
+    fn next(&mut self, set: &[&CardState]) -> usize {
+        if self.rounds_remaining == 0 {
+            self.fill_pool(set);
+            self.rounds_remaining = self.rounds_count;
+        }
+
+        match self.queue.pop() {
+            Some(index) => index,
+            None => {
+                self.queue.append(&mut self.pool.clone());
+                self.rounds_remaining -= 1;
+                self.queue.pop().expect("empty queue")
+            }
+        }
+    }
+
+    fn open(&mut self, _: WordOpenMode, _: usize, _: &mut CardState) {}
+
+    fn new(_: &[&CardState]) -> Self {
+        WorstWordsSRSModule {
+            pool_size: PARTIAL_POOL_SIZE,
+            rounds_count: 2,
+            rounds_remaining: 0,
+            pool: vec![],
+            queue: vec![],
+        }
+    }
+}
+impl WorstWordsSRSModule {
+    fn fill_pool(&mut self, set: &[&CardState]) {
+        let mut sorted = set.iter().enumerate().collect::<Vec<_>>();
+        sorted.sort_by_key(|c| c.1.score);
+        let mut worst = sorted[0..self.pool_size]
+            .iter()
+            .map(|(index, _)| *index)
+            .collect::<Vec<usize>>();
+        worst.shuffle(&mut rand::rng());
+        self.pool = worst;
+    }
+}
+
+#[derive(Clone)]
+pub struct FsrsModule {
+    today_set: Vec<usize>,
+    solved: Vec<usize>,
+    current_group: Vec<usize>,
+    queue: Vec<usize>,
+    rng: ThreadRng,
+    fsrs: FSRS,
+}
+
+impl SRSModule for FsrsModule {
+    fn new(set: &[&CardState]) -> Self {
+        let today = Local::now().date_naive();
+
+        let mut new = Self {
+            today_set: set
+                .iter()
+                .enumerate()
+                .filter(|(_, c)| c.fsrs_open_day <= today)
+                .map(|(index, _)| index)
+                .collect(),
+            current_group: vec![],
+            queue: vec![],
+            solved: vec![],
+            rng: rng(),
+            fsrs: FSRS::default(),
+        };
+        new.today_set.shuffle(&mut new.rng);
+        new.fill_partial_pool();
+
+        new
+    }
+
+    fn next(&mut self, _: &[&CardState]) -> usize {
+        if self.current_group.is_empty() {
+            self.fill_partial_pool();
+        }
+
+        if self.queue.is_empty() {
+            self.fill_queue();
+            self.queue.shuffle(&mut self.rng);
+        }
+
+        self.queue.pop().unwrap_or(0)
+    }
+
+    fn open(&mut self, status: WordOpenMode, index: usize, updated_word: &mut CardState) {
+        let today = Local::now().date_naive();
+        let delta = today - updated_word.fsrs_opened;
+        let delta_days = delta.num_days();
+
+        let memory = self
+            .fsrs
+            .next_states(updated_word.fsrs_memory, 0.9, delta_days as u32)
+            .expect("Wrong next stage calculation");
+
+        let next = match status {
+            WordOpenMode::Easy => memory.easy,
+            WordOpenMode::Ok => memory.good,
+            WordOpenMode::Hard => memory.hard,
+            WordOpenMode::None => memory.again,
+        };
+
+        let mut next_day = today + TimeDelta::days(next.interval.round() as i64);
+        if (next_day - today).num_days() >= 5 {
+            let offset = ((rng().random::<f32>() - 0.5) * 3.0).round() as i32;
+            next_day += TimeDelta::days(offset as i64);
+        }
+
+        let first_time = updated_word.fsrs_memory.is_none();
+
+        updated_word.fsrs_memory = Some(next.memory);
+        updated_word.fsrs_open_day = next_day;
+        updated_word.fsrs_opened = updated_word.last_open.date_naive();
+
+        if (updated_word.fsrs_open_day != today && !first_time)
+            || (first_time && status == WordOpenMode::Easy)
+        {
+            info!("For today word on index {} solved", index);
+            self.solved.push(index);
+            let index = self.current_group.iter().position(|x| *x == index).unwrap();
+            self.current_group.remove(index);
+        }
+    }
+}
+
+impl FsrsModule {
+    fn fill_partial_pool(&mut self) {
+        debug!("Filling partial pool");
+        self.current_group.extend(
+            self.today_set
+                .iter()
+                .filter(|x| !self.solved.contains(*x))
+                .take(PARTIAL_POOL_SIZE),
+        );
+
+        self.queue.clear();
+        self.queue.extend(self.current_group.clone());
+    }
+
+    fn fill_queue(&mut self) {
+        self.queue.extend(self.current_group.clone());
+    }
+
+    pub fn finished(&self) -> bool {
+        self.today_set.len() == self.solved.len()
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum WordOpenMode {
+    Easy,
+    Ok,
+    Hard,
+    None,
+}

src/data.rs

@@ -0,0 +1,82 @@
+pub mod entities;
+pub mod repositories;
+
+use rusqlite::ToSql;
+use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef};
+use std::fmt::{Display, Formatter};
+use std::num::ParseIntError;
+use std::str::FromStr;
+
+macro_rules! id_impl {
+    ($id_type:ty, $name:ident, $invalid:ident) => {
+        #[derive(Clone, PartialEq, Eq, Debug, Hash, Copy, Ord, PartialOrd, Default)]
+        pub struct $name(pub(crate) $id_type);
+        pub const $invalid: $name = $name(0);
+        impl FromStr for $name {
+            type Err = ParseIntError;
+
+            fn from_str(s: &str) -> Result<Self, Self::Err> {
+                Ok($name(s.parse::<$id_type>()?))
+            }
+        }
+
+        impl From<$id_type> for $name {
+            fn from(value: $id_type) -> Self {
+                $name(value)
+            }
+        }
+
+        impl From<$name> for $id_type {
+            fn from(value: $name) -> Self {
+                value.0
+            }
+        }
+        impl Display for $name {
+            fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+                write!(f, "{}", self.0)
+            }
+        }
+
+        impl FromSql for $name {
+            fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
+                match value {
+                    ValueRef::Integer(i) => Ok($name(i as $id_type)),
+                    _ => Err(FromSqlError::InvalidType),
+                }
+            }
+        }
+
+        impl ToSql for $name {
+            fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
+                Ok(ToSqlOutput::from(self.0 as i64))
+            }
+        }
+
+        impl From<$name> for String {
+            fn from(value: $name) -> Self {
+                value.0.to_string()
+            }
+        }
+
+        impl $name {
+            pub(crate) fn is_valid(self) -> bool {
+                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

@@ -0,0 +1,282 @@
+use crate::core::srs::{FADE_PER_DAY, MAX_SCORE, WordOpenMode};
+use crate::data::{INVALID_ID, Id};
+use crate::data_provider::history::HistoryRepositoryInner;
+use chrono::{DateTime, Local, NaiveDate, Utc};
+use fsrs::MemoryState;
+use litemap::LiteMap;
+use log::info;
+use rhai::Engine;
+use std::cmp::Ordering;
+use std::hash::{Hash, Hasher};
+use std::marker::PhantomData;
+use std::sync::Arc;
+use std::time::Instant;
+
+#[derive(Clone, Debug)]
+pub struct WordData {
+    pub id: Id,
+    pub group_id: Id,
+    pub key: String,
+    pub value: String,
+    pub tags: String,
+    pub additional: LiteMap<String, String>,
+}
+
+impl EntityData for WordData {
+    fn id(&self) -> Id {
+        self.id
+    }
+
+    fn set_id(&mut self, id: Id) {
+        self.id = id;
+    }
+}
+
+#[derive(Clone)]
+pub struct WordGroup {
+    pub id: Id,
+    pub name: String,
+}
+
+impl EntityData for WordGroup {
+    fn id(&self) -> Id {
+        self.id
+    }
+
+    fn set_id(&mut self, id: Id) {
+        self.id = id;
+    }
+}
+
+impl WordData {
+    pub fn new() -> Self {
+        Self {
+            id: INVALID_ID,
+            key: String::new(),
+            value: String::new(),
+            tags: String::new(),
+            additional: Default::default(),
+            group_id: 1.into(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct HistoryNote {
+    pub id: Id,
+    pub timestamp: DateTime<Utc>,
+    pub deck_id: Id,
+    pub word_id: Id,
+    pub answer: WordOpenMode,
+    pub before: u8,
+    pub after: u8,
+    pub fsrs: bool,
+}
+
+impl EntityData for HistoryNote {
+    fn id(&self) -> Id {
+        self.id
+    }
+
+    fn set_id(&mut self, id: Id) {
+        self.id = id;
+    }
+}
+
+impl HistoryRepositoryInner {
+    pub fn activity_of_deck(&self, id: Id) -> Vec<(NaiveDate, u32)> {
+        let mut query = self.query(Arc::new(move |note| note.deck_id == id));
+        let values = query.iter(self).collect::<Vec<_>>();
+        let mut counts = vec![];
+        if !values.is_empty() {
+            let mut date = values[0].timestamp.with_timezone(&Local).date_naive();
+            let mut count = 0;
+            for note in values {
+                let current_date = note.timestamp.with_timezone(&Local).date_naive();
+                if date == current_date {
+                    count += 1;
+                } else {
+                    counts.push((date, count));
+                    date = current_date;
+                    count = 0;
+                }
+            }
+        }
+        counts
+    }
+}
+
+#[derive(Clone)]
+pub struct DeckSettings {
+    pub id: Id,
+    pub name: String,
+    pub forward: String,
+    pub backward: String,
+    pub filter: String,
+}
+
+impl EntityData for DeckSettings {
+    fn id(&self) -> Id {
+        self.id
+    }
+
+    fn set_id(&mut self, id: Id) {
+        self.id = id;
+    }
+}
+
+impl DeckSettings {
+    pub(crate) fn with_name(name: String) -> DeckSettings {
+        DeckSettings {
+            id: 0.into(),
+            name,
+            forward: "".to_string(),
+            backward: "".to_string(),
+            filter: "true".to_string(),
+        }
+    }
+    pub fn check_filter(&self) -> bool {
+        let time = Instant::now();
+        let engine = Engine::new();
+        let ast = engine.compile(&self.filter);
+        info!("Compile time is {:?}", time.elapsed());
+        ast.is_ok()
+    }
+    pub fn require_speech(&self) -> bool {
+        self.forward == "speech" || self.backward == "speech"
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct CardState {
+    pub id: Id,
+    pub word_id: Id,
+    pub deck_id: Id,
+    pub last_open: DateTime<Utc>,
+    pub score: u8,
+    pub fsrs_opened: NaiveDate,
+    pub fsrs_memory: Option<MemoryState>,
+    pub fsrs_open_day: NaiveDate,
+}
+
+impl EntityData for CardState {
+    fn id(&self) -> Id {
+        self.id
+    }
+
+    fn set_id(&mut self, id: Id) {
+        self.id = id;
+    }
+}
+
+impl CardState {
+    pub fn update(&mut self, status: WordOpenMode) {
+        match status {
+            WordOpenMode::Easy => {
+                self.score = (self.calculated_score() + 5.0).round() as u8;
+            }
+            WordOpenMode::Ok => self.score = (self.calculated_score() + 2.0).round() as u8,
+            WordOpenMode::Hard => {
+                self.score = (self.calculated_score() * 0.75).round() as u8;
+            }
+            WordOpenMode::None => {
+                self.score = (self.calculated_score() * 0.4) as u8;
+            }
+        }
+
+        self.score = self.score.clamp(1, MAX_SCORE);
+        self.last_open = Utc::now();
+    }
+
+    pub fn calculated_score(&self) -> f32 {
+        let time = Utc::now() - self.last_open;
+        let days = time.num_days();
+        let multiplier = FADE_PER_DAY.powi(days as i32);
+        (self.score as f32 * multiplier).max(1.0)
+    }
+}
+
+pub struct CustomField {
+    pub id: Id,
+    pub name: String,
+    pub identifier: String,
+}
+
+pub struct EntityHandle<E> {
+    pub(crate) id: Id,
+    index: u32,
+    pub(crate) _phantom: PhantomData<E>,
+}
+
+impl<T> Clone for EntityHandle<T> {
+    fn clone(&self) -> Self { *self }
+}
+
+impl<T> Copy for EntityHandle<T> {}
+impl<T> EntityHandle<T> {
+    pub fn new(id: Id, index: usize, real: bool) -> Self {
+        Self {
+            id,
+            index: ((index as u32) << 1 >> 1) | (!real as u32) << 31,
+            _phantom: Default::default(),
+        }
+    }
+
+    pub fn from_id(id: Id) -> Self {
+        Self::new(id, id.0 as usize, true)
+    }
+
+    pub fn index(&self) -> usize {
+        (self.index << 1 >> 1) as usize
+    }
+
+    pub fn set_index(&mut self, index: usize) {
+        self.index = (self.index >> 31 << 31) | ((index as u32) << 1 >> 1);
+    }
+
+    pub fn real(&self) -> bool {
+        (self.index >> 31) == 0
+    }
+
+    pub fn set_real(&mut self, value: bool) {
+        self.index = self.index << 1 >> 1 | (!value as u32) << 31;
+    }
+}
+impl<T> Eq for EntityHandle<T> {}
+
+impl<T> PartialEq<Self> for EntityHandle<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.real() == other.real() && self.id == other.id
+    }
+}
+impl<T> PartialOrd<Self> for EntityHandle<T> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<T> Ord for EntityHandle<T> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.real() && !other.real() {
+            return Ordering::Less;
+        }
+
+        if !self.real() && other.real() {
+            return Ordering::Greater;
+        }
+
+        self.id.cmp(&other.id)
+    }
+}
+
+impl<T> Hash for EntityHandle<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+        self.real().hash(state);
+    }
+}
+
+pub trait EntityData {
+    fn id(&self) -> Id;
+    fn set_id(&mut self, id: Id);
+}

src/data/repositories.rs

@@ -0,0 +1,728 @@
+use crate::data::Id;
+use crate::data::entities::{EntityData, EntityHandle};
+use crate::data_provider::sqlite::SqliteConnection;
+use crate::helpers::into_result;
+use crate::notification::{MaybeError, NotificationData};
+use log::debug;
+use parking_lot::{Mutex, RwLock};
+use rayon::iter::IndexedParallelIterator;
+use rayon::iter::IntoParallelRefIterator;
+use rayon::iter::ParallelIterator;
+use rusqlite::Connection;
+use std::marker::PhantomData;
+use std::ops::{Deref, Index, IndexMut};
+use std::sync::Arc;
+use std::time::Instant;
+
+pub trait Repository<T, D>
+where
+    D: DbLayer<T>,
+{
+    fn get(&self, handle: &mut EntityHandle<T>) -> Option<T>;
+    fn get_ref(&self, handle: &mut EntityHandle<T>) -> Option<&T>;
+    fn get_mut(&mut self, handle: &mut EntityHandle<T>) -> Option<&mut T>;
+    fn get_static(&self, handle: EntityHandle<T>) -> Option<T>;
+    fn get_ref_static(&self, handle: EntityHandle<T>) -> Option<&T>;
+    fn get_mut_static(&mut self, handle: EntityHandle<T>) -> Option<&mut T>;
+    fn set(&mut self, handle: &mut EntityHandle<T>, value: T);
+    fn set_static(&mut self, handle: EntityHandle<T>, value: T);
+    fn handle_by_id(&self, id: Id) -> EntityHandle<T>;
+    fn create(&mut self, new: T) -> EntityHandle<T>;
+    fn create_now(&mut self, new: T) -> Result<EntityHandle<T>, NotificationData>;
+    fn save(&mut self, entity: &mut EntityHandle<T>) -> MaybeError;
+    fn delete(&mut self, handle: EntityHandle<T>) -> MaybeError;
+    fn find<F>(&self, predicate: F) -> Option<EntityHandle<T>>
+    where
+        F: Fn(&T) -> bool;
+    fn init(&mut self) -> MaybeError;
+    fn start(&mut self) -> MaybeError;
+    fn reload(&mut self) -> MaybeError;
+    fn shifts(&self) -> usize;
+    fn iter<'a>(&'a self) -> impl Iterator<Item = &'a T>
+    where
+        T: 'a;
+    fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = &'a mut T>
+    where
+        T: 'a;
+}
+
+struct QueryManger<T, R, D>
+where
+    R: Repository<T, D>,
+    D: DbLayer<T>,
+{
+    queries: Vec<Arc<Mutex<Query<T, R, D>>>>,
+}
+
+impl<T, R, D> QueryManger<T, R, D>
+where
+    R: Repository<T, D>,
+    D: DbLayer<T>,
+    T: EntityData,
+{
+    pub(crate) fn handle_save(&self, old: EntityHandle<T>, new: &mut EntityHandle<T>, data: &T) {
+        return;
+        if old.real() && new.real() {
+            return;
+        }
+
+        let affected = self.get_affected_queries(data);
+        for q in affected {
+            let mut query = self.queries[q].lock();
+            let index = query.cache.binary_search(&old).unwrap();
+            query.cache.remove(index);
+            let real_end = query.cache.iter().rposition(|r| r.real()).unwrap() + 1;
+            query.cache.insert(real_end, new.clone());
+        }
+    }
+    pub(crate) fn handle_delete(&self, handle: &EntityHandle<T>, data: &T) {
+        return;
+        let affected = self.get_affected_queries(data);
+        for q in affected {
+            let mut query = self.queries[q].lock();
+            let slice = query.cache.as_slice();
+            if let Ok(index) = slice.binary_search(&handle) {
+                query.cache.remove(index);
+            }
+        }
+    }
+
+    fn get_affected_queries(&self, data: &T) -> Vec<usize> {
+        self.queries
+            .iter()
+            .enumerate()
+            .filter(|(_, q)| {
+                let query = q.lock();
+                let rule = &query.rule;
+                rule(data)
+            })
+            .map(|(i, _)| i)
+            .collect()
+    }
+
+    fn reload_queries(&mut self, data_repository: impl Repository<T, D>) {
+        for q in &self.queries {
+            let mut query = q.lock();
+            query.cache.clear();
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct Query<T, R, D>
+where
+    R: Repository<T, D>,
+    D: DbLayer<T>,
+{
+    cache: Vec<EntityHandle<T>>,
+    rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
+    parallel: bool,
+    _marker: PhantomData<(R, D)>,
+    shift_stamp: usize,
+}
+
+impl<T: EntityData + Clone + Send + Sync, R: Repository<T, D>, D: DbLayer<T>> Query<T, R, D> {
+    pub fn iter<'a>(
+        &mut self,
+        data_repository_inner: &'a DataRepositoryInner<T, D>,
+    ) -> impl Iterator<Item = &'a T>
+    where
+        T: 'a,
+    {
+        if self.shift_stamp != data_repository_inner.shifts() {
+            self.load(data_repository_inner);
+        }
+        self.cache
+            .iter_mut()
+            .filter_map(move |e| data_repository_inner.get_ref(e))
+    }
+
+    pub fn iter_with_handles<'a>(
+        &mut self,
+        data_repository_inner: &'a DataRepositoryInner<T, D>,
+    ) -> impl Iterator<Item = (&'a T, EntityHandle<T>)>
+    where
+        T: 'a,
+    {
+        if self.shift_stamp != data_repository_inner.shifts() {
+            self.load(data_repository_inner);
+        }
+        self.cache
+            .iter_mut()
+            .filter_map(move |e| Some((data_repository_inner.get_ref(e)?, *e)))
+    }
+
+    pub fn for_each_mut<F>(&mut self, repo: &mut DataRepositoryInner<T, D>, mut f: F)
+    where
+        F: FnMut(&mut T),
+    {
+        if self.shift_stamp != repo.shifts() {
+            self.load(repo);
+        }
+        for handle in &mut self.cache {
+            if let Some(entity) = repo.get_mut(handle) {
+                f(entity);
+            }
+        }
+    }
+
+    pub fn load(&mut self, data_repository: &DataRepositoryInner<T, D>)
+    where
+        T: Send + Sync,
+    {
+        let time = Instant::now();
+        self.cache.clear();
+        if self.parallel {
+            self.cache = data_repository
+                .cache
+                .par_iter()
+                .enumerate()
+                .filter(|(_, entity)| self.rule.as_ref()(entity))
+                .map(|(i, entity)| EntityHandle::new(entity.id(), i, true))
+                .collect();
+        } else {
+            self.cache = data_repository
+                .cache
+                .iter()
+                .enumerate()
+                .filter(|(_, entity)| (self.rule)(entity))
+                .map(|(i, entity)| EntityHandle::new(entity.id(), i, true))
+                .collect();
+        }
+
+        self.cache.extend(
+            data_repository
+                .temporal
+                .iter()
+                .enumerate()
+                .filter(|(_, entity)| (self.rule)(entity))
+                .map(|(i, entity)| EntityHandle::new(entity.id(), i, false))
+                .collect::<Vec<_>>(),
+        );
+
+        debug!(
+            "Query for {} elements (filtered {}) takes {:?}",
+            data_repository.len(),
+            self.cache.len(),
+            time.elapsed()
+        );
+    }
+
+    pub fn handles(&self) -> impl Iterator<Item = EntityHandle<T>> {
+        self.cache.iter().cloned()
+    }
+
+    pub fn len(&self) -> usize {
+        self.cache.len()
+    }
+}
+
+impl<T: EntityData + Clone + Send + Sync, R: Repository<T, D>, D: DbLayer<T>> Index<usize>
+    for Query<T, R, D>
+{
+    type Output = EntityHandle<T>;
+
+    fn index(&self, index: usize) -> &Self::Output {
+        &self.cache[index]
+    }
+}
+
+impl<T: EntityData + Clone + Send + Sync, R: Repository<T, D>, D: DbLayer<T>> IndexMut<usize>
+    for Query<T, R, D>
+{
+    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
+        &mut self.cache[index]
+    }
+}
+
+pub trait BatchedRepository<T, D>
+where
+    D: BatchedDbLayer<T>,
+    T: EntityData,
+{
+    fn create_now_many(
+        &mut self,
+        entities: &mut [T],
+    ) -> Result<Vec<EntityHandle<T>>, NotificationData>;
+    fn save_many(&mut self, handles: &mut [EntityHandle<T>]) -> MaybeError;
+    fn delete_many(&mut self, handles: &mut [EntityHandle<T>]) -> MaybeError;
+}
+
+pub trait DbLayer<T> {
+    fn write_entity(&self, entity: &T, connection: &Connection) -> MaybeError;
+    fn add_entity(&mut self, entity: &mut T, connection: &Connection) -> MaybeError;
+    fn delete_entity(&mut self, id: Id, connection: &Connection) -> MaybeError;
+    fn load_all(&self, storage: &mut Vec<T>, connection: &Connection) -> MaybeError;
+}
+
+pub trait BatchedDbLayer<T>
+where
+    T: EntityData,
+{
+    fn delete_many_entities(&mut self, ids: &[Id], connection: &mut Connection) -> MaybeError;
+    fn add_many_entities(&mut self, entity: &mut [T], connection: &mut Connection) -> MaybeError;
+}
+
+#[derive(Clone)]
+pub struct DataRepository<T: Clone + EntityData, D: DbLayer<T>> {
+    inner: Arc<RwLock<DataRepositoryInner<T, D>>>,
+}
+
+pub struct DataRepositoryInner<T: Clone + EntityData, D: DbLayer<T>> {
+    cache: Vec<T>,
+    temporal: Vec<T>,
+    next_temporal: u32,
+    connection: Arc<Mutex<SqliteConnection>>,
+    data_layer: D,
+    query_manger: QueryManger<T, Self, D>,
+    version: u16,
+    shifts: usize,
+}
+
+impl<T: Clone + EntityData, D: DbLayer<T> + Default> DataRepository<T, D> {
+    pub fn new(connection: Arc<Mutex<SqliteConnection>>) -> DataRepository<T, D> {
+        Self {
+            inner: Arc::new(RwLock::new(DataRepositoryInner {
+                cache: vec![],
+                temporal: vec![],
+                next_temporal: 0,
+                connection,
+                data_layer: Default::default(),
+                query_manger: QueryManger { queries: vec![] },
+                version: 0,
+                shifts: 0,
+            })),
+        }
+    }
+}
+
+impl<T: Clone + EntityData, D: DbLayer<T>> Deref for DataRepository<T, D> {
+    type Target = Arc<RwLock<DataRepositoryInner<T, D>>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T: EntityData + Clone + std::marker::Send + std::marker::Sync, D: DbLayer<T>>
+    DataRepositoryInner<T, D>
+{
+    pub fn query_par(
+        &self,
+        rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
+    ) -> Query<T, DataRepositoryInner<T, D>, D>
+    where
+        T: Send + Sync,
+    {
+        let mut query = Query {
+            cache: vec![],
+            rule,
+            parallel: true,
+            _marker: PhantomData,
+            shift_stamp: self.shifts,
+        };
+
+        query.load(self);
+
+        query
+    }
+
+    pub fn query(
+        &self,
+        rule: Arc<dyn Fn(&T) -> bool + Send + Sync>,
+    ) -> Query<T, DataRepositoryInner<T, D>, D>
+    where
+        T: Send + Sync,
+    {
+        let mut query = Query {
+            cache: vec![],
+            rule,
+            parallel: false,
+            _marker: PhantomData,
+            shift_stamp: self.shifts,
+        };
+
+        query.load(self);
+
+        query
+    }
+
+    pub fn empty_query(&self) -> Query<T, DataRepositoryInner<T, D>, D> {
+        Query {
+            cache: vec![],
+            rule: Arc::new(|_| false),
+            parallel: false,
+            _marker: Default::default(),
+            shift_stamp: 0,
+        }
+    }
+
+    pub fn empty_query_par(&self) -> Query<T, DataRepositoryInner<T, D>, D> {
+        Query {
+            cache: vec![],
+            rule: Arc::new(|_| false),
+            parallel: true,
+            _marker: Default::default(),
+            shift_stamp: 0,
+        }
+    }
+
+    pub fn full_query(&self) -> Query<T, DataRepositoryInner<T, D>, D> {
+        self.query(Arc::new(|_| true))
+    }
+
+    pub fn len(&self) -> usize {
+        self.cache.len() + self.temporal.len()
+    }
+}
+
+impl<T: EntityData + Clone, D: DbLayer<T>> Repository<T, D> for DataRepositoryInner<T, D> {
+    fn get(&self, handle: &mut EntityHandle<T>) -> Option<T> {
+        let slice = if handle.real() {
+            self.cache.as_slice()
+        } else {
+            self.temporal.as_slice()
+        };
+        let index = fast_position_of(slice, handle)?;
+        Some(slice[index].clone())
+    }
+
+    fn get_ref(&self, handle: &mut EntityHandle<T>) -> Option<&T> {
+        let slice = if handle.real() {
+            self.cache.as_slice()
+        } else {
+            self.temporal.as_slice()
+        };
+        let index = fast_position_of(slice, handle)?;
+        Some(&slice[index])
+    }
+
+    fn get_mut(&mut self, handle: &mut EntityHandle<T>) -> Option<&mut T> {
+        let slice = if handle.real() {
+            self.cache.as_mut_slice()
+        } else {
+            self.temporal.as_mut_slice()
+        };
+        let index = fast_position_of(slice, handle)?;
+        Some(&mut slice[index])
+    }
+
+    fn get_static(&self, mut handle: EntityHandle<T>) -> Option<T> {
+        self.get(&mut handle)
+    }
+
+    fn get_ref_static(&self, mut handle: EntityHandle<T>) -> Option<&T> {
+        self.get_ref(&mut handle)
+    }
+
+    fn get_mut_static(&mut self, mut handle: EntityHandle<T>) -> Option<&mut T> {
+        self.get_mut(&mut handle)
+    }
+
+    fn set(&mut self, handle: &mut EntityHandle<T>, value: T) {
+        let slice = if handle.real() {
+            self.cache.as_mut_slice()
+        } else {
+            self.temporal.as_mut_slice()
+        };
+        let index = fast_position_of(slice, handle).unwrap();
+        slice[index] = value;
+    }
+
+    fn set_static(&mut self, mut handle: EntityHandle<T>, value: T) {
+        self.set(&mut handle, value)
+    }
+
+    fn handle_by_id(&self, id: Id) -> EntityHandle<T> {
+        EntityHandle::new(id, id.0 as usize, true)
+    }
+
+    fn create(&mut self, mut new: T) -> EntityHandle<T> {
+        let next_temporal = self.next_temporal;
+        self.next_temporal += 1;
+        let entity = EntityHandle::new(next_temporal.into(), self.temporal.len(), false);
+        new.set_id(entity.id);
+        self.temporal.push(new);
+        entity
+    }
+
+    fn create_now(&mut self, mut new: T) -> Result<EntityHandle<T>, NotificationData> {
+        self.data_layer
+            .add_entity(&mut new, &self.connection.lock())?;
+        let index = self.cache.len();
+        let handle = EntityHandle::new(new.id(), index, true);
+        self.cache.push(new);
+        Ok(handle)
+    }
+
+    fn save(&mut self, entity: &mut EntityHandle<T>) -> MaybeError {
+        let original_state = *entity;
+        if entity.real() {
+            let data = self.get_ref(entity).unwrap();
+            self.data_layer
+                .write_entity(data, &self.connection.lock())?;
+        } else {
+            let index = fast_position_of(self.temporal.as_slice(), entity).unwrap();
+            let data = &mut self.temporal[index];
+            self.data_layer.add_entity(data, &self.connection.lock())?;
+            entity.set_real(true);
+            entity.id = data.id();
+            entity.set_index(self.cache.len());
+            self.query_manger.handle_save(original_state, entity, data);
+
+            let data = self.temporal.remove(index);
+            self.cache.push(data);
+            self.shifts += 1;
+        }
+
+        Ok(())
+    }
+
+    fn delete(&mut self, mut handle: EntityHandle<T>) -> MaybeError {
+        let vec = if handle.real() {
+            self.data_layer
+                .delete_entity(handle.id, &self.connection.lock())?;
+            &mut self.cache
+        } else {
+            &mut self.temporal
+        };
+
+        let index = into_result(
+            fast_position_of(vec.as_slice(), &mut handle),
+            NotificationData::DbSaveError,
+        )?;
+        let value = vec.remove(index);
+        self.query_manger.handle_delete(&handle, &value);
+        self.shifts += 1;
+        Ok(())
+    }
+
+    fn find<F>(&self, predicate: F) -> Option<EntityHandle<T>>
+    where
+        F: Fn(&T) -> bool,
+    {
+        if let Some(index) = self.cache.iter().position(&predicate) {
+            let value = &self.cache[index];
+            return Some(EntityHandle::new(value.id(), index, true));
+        }
+
+        if let Some(index) = self.temporal.iter().position(predicate) {
+            let value = &self.temporal[index];
+            return Some(EntityHandle::new(value.id(), index, false));
+        }
+        None
+    }
+
+    fn init(&mut self) -> MaybeError {
+        self.data_layer
+            .load_all(&mut self.cache, &self.connection.lock())?;
+        self.version += 1;
+        Ok(())
+    }
+
+    fn start(&mut self) -> MaybeError {
+        if self.version != 0 {
+            return Ok(());
+        }
+
+        self.init()?;
+        Ok(())
+    }
+
+    fn reload(&mut self) -> MaybeError {
+        self.cache.clear();
+        self.temporal.clear();
+        self.init()?;
+        Ok(())
+    }
+
+    fn shifts(&self) -> usize {
+        self.shifts
+    }
+
+    fn iter<'a>(&'a self) -> impl Iterator<Item = &'a T>
+    where
+        T: 'a,
+    {
+        self.cache.iter().chain(self.temporal.iter())
+    }
+
+    fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = &'a mut T>
+    where
+        T: 'a,
+    {
+        self.cache.iter_mut().chain(self.temporal.iter_mut())
+    }
+}
+impl<T: EntityData + Clone, D: BatchedDbLayer<T> + DbLayer<T>> BatchedRepository<T, D>
+    for DataRepositoryInner<T, D>
+{
+    fn create_now_many(
+        &mut self,
+        entities: &mut [T],
+    ) -> Result<Vec<EntityHandle<T>>, NotificationData> {
+        self.data_layer
+            .add_many_entities(entities, &mut self.connection.lock())?;
+        let len = self.cache.len();
+        let handles = entities
+            .iter()
+            .enumerate()
+            .map(|(index, entity)| EntityHandle::new(entity.id(), index + len, true))
+            .collect();
+        self.cache.extend(entities.to_vec());
+        Ok(handles)
+    }
+
+    fn save_many(&mut self, handles: &mut [EntityHandle<T>]) -> MaybeError {
+        let mut temp = Vec::with_capacity(handles.len() / 2);
+        let mut cached = Vec::with_capacity(handles.len() / 2);
+        handles.sort_by_key(|a| a.id);
+        handles.iter_mut().for_each(|handle| {
+            if handle.real() {
+                cached.push(handle)
+            } else {
+                temp.push(handle)
+            }
+        });
+
+        let mut temp_values = Vec::with_capacity(temp.len());
+        let mut cell = 0;
+        let len = temp.len();
+        self.temporal.retain(|x| {
+            if cell == len {
+                return true;
+            }
+            let find = temp[cell].id;
+            let remove = x.id() == find;
+            if remove {
+                cell += 1;
+                temp_values.push(x.clone());
+            }
+            !remove
+        });
+
+        self.data_layer
+            .add_many_entities(&mut temp_values, &mut self.connection.lock())?;
+
+        let start = self.cache.len();
+
+        for (i, (handle, data)) in temp.into_iter().zip(&mut temp_values).enumerate() {
+            let old = *handle;
+            handle.id = data.id();
+            handle.set_index(start + i);
+            handle.set_real(true);
+            self.query_manger.handle_save(old, handle, data);
+        }
+
+        self.cache.extend(temp_values);
+
+        for handle in cached.into_iter() {
+            let h = handle;
+            let idx = fast_position_of(self.cache.as_slice(), h).unwrap();
+            self.data_layer
+                .write_entity(&self.cache[idx], &self.connection.lock())?;
+        }
+        self.shifts += 1;
+
+        Ok(())
+    }
+
+    fn delete_many(&mut self, handles: &mut [EntityHandle<T>]) -> MaybeError {
+        let (cached, temp) = split_temp_real(handles, |e| e.id);
+
+        let mut cell = 0;
+        let len = temp.len();
+        self.temporal.retain(|x| {
+            if cell == len {
+                return true;
+            }
+            let find = temp[cell];
+            let remove = x.id() == find;
+            if remove {
+                cell += 1;
+            }
+            !remove
+        });
+        self.data_layer
+            .delete_many_entities(cached.as_slice(), &mut self.connection.lock())?;
+        let len = cached.len();
+        cell = 0;
+        self.cache.retain(|x| {
+            if cell == len {
+                return true;
+            }
+            let find = cached[cell];
+            let remove = x.id() == find;
+            if remove {
+                cell += 1;
+            }
+
+            !remove
+        });
+        self.shifts += 1;
+
+        Ok(())
+    }
+}
+
+fn split_temp_real<T, F, V>(handles: &mut [EntityHandle<T>], getter: F) -> (Vec<V>, Vec<V>)
+where
+    F: Fn(&EntityHandle<T>) -> V,
+{
+    let mut temp = Vec::with_capacity(handles.len() / 2);
+    let mut cached = Vec::with_capacity(handles.len() / 2);
+    handles.sort_by_key(|a| a.id);
+    handles.iter().for_each(|handle| {
+        if handle.real() {
+            cached.push(getter(handle))
+        } else {
+            temp.push(getter(handle))
+        }
+    });
+    (cached, temp)
+}
+
+pub fn fast_position_of<E: EntityData>(
+    storage: &[E],
+    handle: &mut EntityHandle<E>,
+) -> Option<usize> {
+    if storage.is_empty() {
+        return None;
+    }
+
+    let max_idx = storage.len() - 1;
+    let upper = (handle.index()).min(max_idx);
+    let peek = storage[upper].id();
+
+    if peek == handle.id {
+        handle.set_index(upper);
+        return Some(upper);
+    }
+
+    if peek.0 < handle.id.0 {
+        return None;
+    }
+
+    let target_id_val = handle.id.0 as i64;
+    let peek_val = peek.0 as i64;
+    let delta = peek_val - target_id_val;
+
+    let new_index = (upper as i64 - delta).max(0) as usize;
+
+    if storage[new_index].id() == handle.id {
+        handle.set_index(new_index);
+        return Some(new_index);
+    }
+
+    if new_index == upper {
+        return None;
+    }
+
+    let index = storage[new_index..upper]
+        .binary_search_by(|e| e.id().cmp(&handle.id))
+        .ok()?
+        + new_index;
+
+    handle.set_index(index);
+    Some(index)
+}

src/data_provider/card_sets.rs

@@ -1,78 +0,0 @@
-use crate::lang::SetOrderMode;
-use crate::repetitions::CardSetSettings;
-use rusqlite::Connection;
-
-pub fn load_sets(connection: &Connection) -> Vec<CardSetSettings> {
-    let mut stmt = connection
-        .prepare("SELECT id, name, forward, backward, filter FROM card_set")
-        .unwrap();
-    let iter = stmt
-        .query_map([], |row| {
-            Ok(CardSetSettings {
-                id: row.get(0)?,
-                name: row.get(1)?,
-                forward: row.get(2)?,
-                backward: row.get(3)?,
-                filter: row.get(4)?,
-                count: None,
-                worst_words_list: None,
-                open_mode: SetOrderMode::Default,
-            })
-        })
-        .unwrap();
-
-    let mut buffer = vec![];
-    for word in iter {
-        buffer.push(word.unwrap());
-    }
-
-    buffer
-}
-
-pub fn add_set(set: &mut CardSetSettings, connection: &Connection) {
-    let index = connection
-        .query_row(
-            "INSERT INTO card_set (name, forward, backward, filter) VALUES (?1, ?2, ?3, ?4) RETURNING id",
-            (
-                &set.name,
-                &set.forward,
-                &set.backward,
-                &set.filter,
-            ),
-            |row| row.get(0)
-        )
-        .unwrap_or_else(|e| {println!("{}", e); 0});
-
-    set.id = index;
-}
-
-pub fn update_card_set(set: &mut CardSetSettings, connection: &Connection) {
-    if set.id == 0 {
-        add_set(set, &connection);
-    } else {
-        connection
-            .execute(
-                "UPDATE card_set SET name = ?1, forward = ?2, backward = ?3, filter = ?4 WHERE id = ?5",
-                (
-                    &set.name,
-                    &set.forward,
-                    &set.backward,
-                    &set.filter,
-                    &set.id
-                ),
-            )
-            .unwrap_or_else(|e| {println!("{}", e); 0});
-    }
-}
-
-pub fn delete_set(set: &CardSetSettings, connection: &Connection) {
-    if set.id == 0 {
-        return;
-    }
-    connection
-        .execute("DELETE FROM card_set WHERE id = ?1", (&set.id,))
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-}

src/data_provider/card_states.rs

@@ -0,0 +1,96 @@
+use crate::data::entities::CardState;
+use crate::data::repositories::{DataRepository, DataRepositoryInner, Query};
+use crate::data::Id;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
+use chrono::NaiveDate;
+use fsrs::MemoryState;
+use rusqlite::{Error, Params, Row};
+use std::sync::Arc;
+
+pub type CardStateRepository = DataRepository<CardState, CardStateDbLayer>;
+pub type CardStateRepositoryInner = DataRepositoryInner<CardState, CardStateDbLayer>;
+pub type CardStateDbLayer = SqliteDbLayer<CardState, CardStatesQuerySet>;
+#[derive(Clone)]
+pub struct CardStatesQuerySet;
+impl TableAccessQuerySet<CardState> for CardStatesQuerySet {
+    fn load() -> &'static str {
+        "SELECT id, word_id, deck_id, score, last_opened, fsrs_opened, fsrs_memory, fsrs_open_day FROM states"
+    }
+
+    fn save() -> &'static str {
+        "UPDATE states SET score = ?1, last_opened = ?2, fsrs_opened = ?3, fsrs_memory = ?4, fsrs_open_day = ?5 WHERE id = ?6"
+    }
+
+    fn add() -> &'static str {
+        "INSERT INTO states (word_id, deck_id, score, last_opened, fsrs_opened, fsrs_memory, fsrs_open_day) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)"
+    }
+
+    fn name() -> &'static str {
+        "states"
+    }
+
+    fn from_sql(row: &Row) -> Result<CardState, Error> {
+        Ok(CardState {
+            id: row.get(0)?,
+            word_id: row.get(1)?,
+            deck_id: row.get(2)?,
+            score: row.get(3)?,
+            fsrs_opened: NaiveDate::from_epoch_days(row.get::<usize, i32>(5)?)
+                .expect("Incorrect date encoding"),
+            fsrs_memory: get_memory(row.get(6)?),
+            last_open: row.get(4)?,
+            fsrs_open_day: NaiveDate::from_epoch_days(row.get::<usize, i32>(7)?)
+                .expect("Incorrect date encoding"),
+        })
+    }
+
+    fn insert_params(entity: &CardState) -> impl Params {
+        (
+            entity.word_id,
+            entity.deck_id,
+            entity.score,
+            entity.last_open.timestamp(),
+            entity.fsrs_opened.to_epoch_days(),
+            memory_to_i64(&entity.fsrs_memory),
+            entity.fsrs_open_day.to_epoch_days(),
+        )
+    }
+
+    fn update_params(entity: &CardState) -> impl Params {
+        (
+            entity.score,
+            entity.last_open.timestamp(),
+            entity.fsrs_opened.to_epoch_days(),
+            memory_to_i64(&entity.fsrs_memory),
+            entity.fsrs_open_day.to_epoch_days(),
+            entity.id,
+        )
+    }
+}
+
+fn get_memory(value: i64) -> Option<MemoryState> {
+    if value == 0 {
+        return None;
+    }
+    Some(MemoryState {
+        stability: f32::from_bits(value as u32),
+        difficulty: f32::from_bits((value >> 32) as u32),
+    })
+}
+
+fn memory_to_i64(value: &Option<MemoryState>) -> i64 {
+    let Some(value) = &value else {
+        return 0;
+    };
+
+    value.stability.to_bits() as i64 | ((value.difficulty.to_bits() as i64) << 32)
+}
+
+impl CardStateRepositoryInner {
+    pub fn deck_states(
+        &self,
+        deck_id: Id,
+    ) -> Query<CardState, CardStateRepositoryInner, CardStateDbLayer> {
+        self.query(Arc::new(move |state| state.deck_id == deck_id))
+    }
+}

src/data_provider/card_stats.rs

@@ -1,116 +0,0 @@
-use crate::lang::CardStatistics;
-use crate::repetitions::CardSetSettings;
-use rusqlite::Connection;
-use std::time::Instant;
-
-pub fn load_stats_of_set(set: &CardSetSettings, connection: &Connection) -> Vec<CardStatistics> {
-    let mut stmt = connection
-        .prepare("SELECT id, word_id, score, last_opened FROM card_stats WHERE set_id = ?1")
-        .unwrap();
-    let iter = stmt
-        .query_map((set.id,), |row| {
-            Ok(CardStatistics {
-                id: row.get(0)?,
-                word_id: row.get(1)?,
-                set_id: set.id,
-                score: row.get(2)?,
-                last_open: row.get(3)?,
-            })
-        })
-        .unwrap();
-
-    let mut buffer = vec![];
-    for word in iter {
-        buffer.push(word.unwrap());
-    }
-
-    buffer
-}
-
-pub fn add_stat_list(stat: &mut Vec<CardStatistics>, connection: &Connection) {
-    let inserting = stat
-        .iter()
-        .map(|stat| {
-            format!(
-                "({}, {}, {}, {})",
-                stat.word_id.to_string(),
-                stat.set_id.to_string(),
-                stat.score.to_string(),
-                stat.last_open.timestamp().to_string()
-            )
-        })
-        .collect::<Vec<_>>()
-        .join(", ");
-    let query = format!(
-        "INSERT INTO card_stats (word_id, set_id, score, last_opened) VALUES {}",
-        inserting
-    );
-    let count = connection.execute(query.as_str(), ());
-
-    if count.is_err() {
-        println!("{}", count.unwrap_err());
-        return;
-    }
-
-    let last_index: u32 = connection
-        .query_one(
-            "SELECT seq from sqlite_sequence WHERE name == ?1",
-            ("card_stats".to_string(),),
-            |row| row.get(0),
-        )
-        .unwrap();
-
-    let start_index = last_index - (count.unwrap() as u32) + 1;
-
-    let mut index = 0;
-    for id in start_index..=last_index {
-        stat[index].id = id;
-        index += 1;
-    }
-}
-
-// pub fn add_stat(stat: &mut CardStatistics, connection: &Connection) {
-//     let time = Instant::now();
-//     let index = connection
-//         .query_row(
-//             "INSERT INTO card_stats (word_id, set_id, score, last_opened) VALUES (?1, ?2, ?3, ?4) RETURNING id",
-//             (
-//                 &stat.word_id,
-//                 &stat.set_id,
-//                 &stat.score,
-//                 &stat.last_open.timestamp(),
-//             ),
-//             |row| row.get(0)
-//         )
-//         .unwrap_or_else(|e| {println!("{}", e); 0});
-//
-//     stat.id = index;
-//     println!("Added stat: {}", time.elapsed().as_millis());
-// }
-
-pub fn update_stat_score(stat: &CardStatistics, connection: &Connection) {
-    let time = Instant::now();
-
-    connection
-        .execute(
-            "UPDATE card_stats SET score = ?1, last_opened = ?2 WHERE id = ?3",
-            (&stat.score, &stat.last_open.timestamp(), &stat.id),
-        )
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-    println!("Updated stat: {}", time.elapsed().as_millis());
-}
-
-pub fn delete_stat(stat: &CardStatistics, connection: &Connection) {
-    if stat.id == 0 {
-        return;
-    }
-    connection
-        .execute("DELETE FROM card_stats WHERE id = ?1", (&stat.id,))
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-}

src/data_provider/custom_fields.rs

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

src/data_provider/decks.rs

@@ -0,0 +1,55 @@
+use crate::data::entities::DeckSettings;
+use crate::data::repositories::DataRepository;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
+use rusqlite::{Error, Params, Row};
+
+pub type DeckRepository = DataRepository<DeckSettings, SqliteDbLayer<DeckSettings, DeckQuerySet>>;
+
+#[derive(Clone)]
+pub struct DeckQuerySet;
+impl TableAccessQuerySet<DeckSettings> for DeckQuerySet {
+    fn load() -> &'static str {
+        "SELECT id, name, forward, backward, filter FROM decks"
+    }
+
+    fn save() -> &'static str {
+        "UPDATE decks SET name = ?1, forward = ?2, backward = ?3, filter = ?4 WHERE id = ?5"
+    }
+
+    fn add() -> &'static str {
+        "INSERT INTO decks (name, forward, backward, filter) VALUES (?1, ?2, ?3, ?4)"
+    }
+
+    fn name() -> &'static str {
+        "decks"
+    }
+
+    fn from_sql(row: &Row) -> Result<DeckSettings, Error> {
+        Ok(DeckSettings {
+            id: row.get(0)?,
+            name: row.get(1)?,
+            forward: row.get(2)?,
+            backward: row.get(3)?,
+            filter: row.get(4)?,
+        })
+    }
+
+    fn insert_params(entity: &DeckSettings) -> impl Params {
+        (
+            &entity.name,
+            &entity.forward,
+            &entity.backward,
+            &entity.filter,
+        )
+    }
+
+    fn update_params(entity: &DeckSettings) -> impl Params {
+        (
+            &entity.name,
+            &entity.forward,
+            &entity.backward,
+            &entity.filter,
+            entity.id,
+        )
+    }
+}

src/data_provider/history.rs

@@ -1,91 +1,95 @@
-use std::fs;
+use crate::core::srs::WordOpenMode;
-use crate::dictionary::app_data_dir;
+use crate::data::entities::HistoryNote;
-use crate::lang::WordOpenMode;
+use crate::data::repositories::{DataRepository, DataRepositoryInner};
-use chrono::{DateTime, Utc};
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
-use std::fs::{File, OpenOptions};
+use rusqlite::types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef};
-use std::io::Write;
+use rusqlite::{Error, Params, Row, ToSql};
-use std::io::{BufRead, BufReader};
-use std::path::PathBuf;
 
-pub fn get_history_of_set(id: u32) -> Vec<HistoryItem> {
+pub type HistoryRepository = DataRepository<HistoryNote, HistoryDataLayer>;
-    let app_dir = history_dir();
+pub type HistoryRepositoryInner = DataRepositoryInner<HistoryNote, HistoryDataLayer>;
-    let head = app_dir.clone().join(format!("set_{}_history.csv", id));
+pub type HistoryDataLayer = SqliteDbLayer<HistoryNote, HistoryQuerySet>;
-    let mut lines = Vec::new();
-
-    append_lines_if_exists(head, &mut lines);
-    lines.reverse();
-    parse_history_items(lines)
-}
-
-fn append_lines_if_exists(path: PathBuf, lines: &mut Vec<String>) {
-    if path.exists() {
-        let reader = BufReader::new(File::open(path).unwrap());
-        for line in reader.lines() {
-            lines.push(line.unwrap());
-        }
-    }
-}
-
-fn parse_history_items(strings: Vec<String>) -> Vec<HistoryItem> {
-    let mut items = Vec::with_capacity(strings.len());
-    for string in strings {
-        if let [time, word, mode, before, after] = string.split(';').collect::<Vec<&str>>()[..] {
-            items.push(HistoryItem {
-                timestamp: DateTime::from_timestamp(time.parse().unwrap(), 0).unwrap(),
-                word_id: word.parse::<u32>().unwrap(),
-                mode: match mode.parse::<u8>().unwrap() {
-                    2 => WordOpenMode::Hard,
-                    3 => WordOpenMode::Ok,
-                    4 => WordOpenMode::Easy,
-                    _ => WordOpenMode::None,
-                },
-                before: before.parse().unwrap(),
-                after: after.parse().unwrap(),
-            });
-        }
-    }
-
-    items
-}
-
-pub fn push_note(set_id: u32, item: HistoryItem) {
-    let app_dir = history_dir();
-    let path = app_dir.clone().join(format!("set_{}_history.csv", set_id));
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(path)
-        .unwrap();
-    let line_str = format!(
-        "{};{};{};{};{}",
-        item.timestamp.timestamp(),
-        item.word_id,
-        match item.mode {
-            WordOpenMode::Easy => 4,
-            WordOpenMode::Ok => 3,
-            WordOpenMode::Hard => 2,
-            WordOpenMode::None => 1,
-        },
-        item.before,
-        item.after
-    );
-    writeln!(&mut file, "{}", line_str.to_string()).unwrap();
-}
-
-pub fn history_dir() -> PathBuf {
-    let directory = app_data_dir().join("history");
-    if !directory.exists() {
-        fs::create_dir(directory.clone()).unwrap();
-    }
-    directory
-}
 
 #[derive(Clone)]
-pub struct HistoryItem {
+pub struct HistoryQuerySet;
-    pub timestamp: DateTime<Utc>,
+impl TableAccessQuerySet<HistoryNote> for HistoryQuerySet {
-    pub word_id: u32,
+    fn load() -> &'static str {
-    pub mode: WordOpenMode,
+        "SELECT rowid, deck_id, word_id, timestamp, answer, before, after, fsrs FROM history"
-    pub before: u8,
+    }
-    pub after: u8,
+
+    fn save() -> &'static str {
+        todo!("History is readonly")
+    }
+
+    fn add() -> &'static str {
+        "INSERT INTO history (deck_id, word_id, timestamp, answer, before, after, fsrs) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)"
+    }
+
+    fn name() -> &'static str {
+        "history"
+    }
+
+    fn id_field() -> &'static str {
+        "rowid"
+    }
+    fn from_sql(row: &Row) -> Result<HistoryNote, Error> {
+        Ok(HistoryNote {
+            id: row.get(0)?,
+            timestamp: row.get(3)?,
+            deck_id: row.get(1)?,
+            word_id: row.get(2)?,
+            answer: row.get(4)?,
+            before: row.get(5)?,
+            after: row.get(6)?,
+            fsrs: row.get(7)?,
+        })
+    }
+
+    fn insert_params(entity: &HistoryNote) -> impl Params {
+        (
+            entity.deck_id,
+            entity.word_id,
+            entity.timestamp,
+            entity.answer,
+            entity.before,
+            entity.after,
+            entity.fsrs,
+        )
+    }
+
+    fn update_params(entity: &HistoryNote) -> impl Params {
+        (
+            entity.deck_id,
+            entity.word_id,
+            entity.timestamp,
+            entity.answer,
+            entity.before,
+            entity.after,
+            entity.fsrs,
+        )
+    }
+}
+
+impl FromSql for WordOpenMode {
+    fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
+        if let ValueRef::Integer(s) = value {
+            return match s {
+                1 => Ok(WordOpenMode::Hard),
+                2 => Ok(WordOpenMode::Ok),
+                3 => Ok(WordOpenMode::Easy),
+                _ => Ok(WordOpenMode::None),
+            };
+        }
+        Ok(WordOpenMode::None)
+    }
+}
+
+impl ToSql for WordOpenMode {
+    fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
+        Ok(ToSqlOutput::from(match self {
+            WordOpenMode::Easy => 3,
+            WordOpenMode::Ok => 2,
+            WordOpenMode::Hard => 1,
+            WordOpenMode::None => 0,
+        }))
+    }
 }

src/data_provider/import.rs

@@ -1,6 +1,10 @@
+use crate::helpers::into_result;
+use crate::notification::NotificationData;
+use crate::notification::NotificationData::IncorrectAnkiFile;
+use log::info;
 use rusqlite::Connection;
 use serde_json::Value;
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 #[derive(Clone)]
 pub struct ImportData(pub(crate) Vec<ImportGroup>);
@@ -11,8 +15,8 @@ pub struct ImportGroup {
     pub name: String,
     pub fields: Vec<String>,
     pub length: u64,
-    pub mapping: HashMap<String, String>,
+    pub mapping: BTreeMap<String, String>,
-    pub imported: bool
+    pub imported: bool,
 }
 
 #[derive(Clone)]
@@ -21,60 +25,84 @@ pub struct ImportNote {
     pub fields: Vec<String>,
 }
 
-pub fn load_groups(connection: &Connection) -> ImportData {
+pub fn load_groups(connection: &Connection) -> Result<ImportData, NotificationData> {
     let json_models: String = connection
         .query_one("select models from col", (), |row| row.get(0))
-        .unwrap();
+        .map_err(|_| IncorrectAnkiFile)?;
-    let raw: Value = serde_json::from_str(json_models.as_str()).unwrap();
+    let raw: Value = serde_json::from_str(json_models.as_str()).map_err(|_| IncorrectAnkiFile)?;
-    let sets = raw.as_object().unwrap();
+    let sets = raw.as_object();
-    let mut total_data = ImportData(vec![]);
+    if let Some(sets) = sets {
+        let mut total_data = ImportData(vec![]);
 
-    let mut count_stmt = connection
+        let mut count_stmt = connection
-        .prepare("select mid, count(id) from notes group by mid")
+            .prepare("select mid, count(id) from notes group by mid")
-        .unwrap();
+            .map_err(|_| IncorrectAnkiFile)?;
 
-    let counts = count_stmt
+        let counts = count_stmt
-        .query_map([], |row| Ok((row.get(0)?, row.get(1)?)))
+            .query_map([], |row| Ok((row.get(0)?, row.get(1)?)))
-        .unwrap()
+            .map_err(|_| IncorrectAnkiFile)?
-        .map(|x| x.unwrap())
+            .filter_map(|x| x.ok())
-        .collect::<Vec<(i64, i64)>>();
+            .collect::<Vec<(i64, i64)>>();
 
-    for (_, collection) in sets {
+        for (_, collection) in sets {
-        let fields = collection["flds"]
+            let fields_property = collection.get("flds");
-            .as_array()
+            if let Some(fields_property) = fields_property {
-            .unwrap()
+                let fields = into_result(fields_property.as_array(), IncorrectAnkiFile)?
-            .iter()
+                    .iter()
-            .map(|x| x["name"].as_str().unwrap().to_string())
+                    .filter_map(|x| x.get("name"))
-            .collect();
+                    .map(|x| x.as_str().unwrap().to_string())
-        let mut group = ImportGroup {
+                    .collect();
-            id: collection["id"].as_u64().unwrap(),
+                let id = collection.get("id");
-            name: collection["name"].as_str().unwrap().to_string(),
+                if id.is_none() || id.unwrap().as_u64().is_none() {
-            fields,
+                    return Err(IncorrectAnkiFile);
-            mapping: Default::default(),
+                }
-            length: 0,
+                let id = id.unwrap().as_u64().unwrap();
-            imported: false,
+                let name = collection.get("name");
-        };
+                if name.is_none() || name.unwrap().as_str().is_none() {
-        if let Some((_, count)) = counts.iter().find(|(id, _)| *id == group.id as i64) {
+                    return Err(IncorrectAnkiFile);
-            group.length = *count as u64
+                }
+                let name = name.unwrap().as_str().unwrap().to_string();
+
+                let mut group = ImportGroup {
+                    id,
+                    name,
+                    fields,
+                    mapping: Default::default(),
+                    length: 0,
+                    imported: false,
+                };
+                if let Some((_, count)) = counts.iter().find(|(id, _)| *id == group.id as i64) {
+                    group.length = *count as u64
+                }
+                info!("{:?}", group);
+                total_data.0.push(group);
+            }
         }
-        println!("{:?}", group);
+        return Ok(total_data);
-        total_data.0.push(group);
     }
-    total_data
+    Err(IncorrectAnkiFile)
 }
 
-pub fn get_words_of_group(connection: &Connection, group_id: u64) -> Vec<ImportNote> {
+pub fn get_words_of_group(
+    connection: &Connection,
+    group_id: u64,
+) -> Result<Vec<ImportNote>, NotificationData> {
     let mut count_stmt = connection
         .prepare("select tags, flds from notes where mid == ?1;")
-        .unwrap();
+        .map_err(|_| IncorrectAnkiFile)?;
 
-    count_stmt.query_map((group_id as i64, ), |row| {
+    Ok(count_stmt
-        Ok(ImportNote {
+        .query_map((group_id as i64,), |row| {
-            tags: row.get(0)?,
+            Ok(ImportNote {
-            fields: row.get::<usize, String>(1)?
+                tags: row.get(0)?,
-                .split('')
+                fields: row
-                .map(|x| x.to_string())
+                    .get::<usize, String>(1)?
-                .collect()
+                    .split('')
+                    .map(|x| x.to_string())
+                    .collect(),
+            })
         })
-    }).unwrap().map(|x| x.unwrap()).collect::<Vec<ImportNote>>()
+        .map_err(|_| IncorrectAnkiFile)?
+        .filter_map(|x| x.ok())
+        .collect::<Vec<ImportNote>>())
 }

src/data_provider/mod.rs

@@ -1,9 +1,194 @@
-pub(crate) mod card_sets;
+use crate::data::Id;
-pub(crate) mod card_stats;
+use crate::data::entities::EntityData;
+use crate::data::repositories::{BatchedDbLayer, DbLayer};
+use crate::notification::MaybeError;
+use crate::notification::NotificationData::DbSaveError;
+use log::{debug, error};
+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;
 pub(crate) mod settings;
 pub(crate) mod sqlite;
 pub(crate) mod voice;
-pub(crate) mod words;
 pub(crate) mod web_api;
-pub(crate) mod import;
+pub mod word_groups;
+pub(crate) mod words;
+
+pub trait TableAccessQuerySet<T> {
+    fn load() -> &'static str;
+    fn save() -> &'static str;
+    fn add() -> &'static str;
+    fn name() -> &'static str;
+    fn id_field() -> &'static str {
+        "id"
+    }
+    fn from_sql(row: &Row) -> Result<T, Error>;
+    fn insert_params(entity: &T) -> impl Params;
+    fn update_params(entity: &T) -> impl Params;
+}
+
+#[derive(Clone)]
+pub struct SqliteDbLayer<T, Q>
+where
+    Q: TableAccessQuerySet<T>,
+{
+    _phantom: PhantomData<(T, Q)>,
+}
+
+impl<T, Q: TableAccessQuerySet<T>> Default for SqliteDbLayer<T, Q> {
+    fn default() -> Self {
+        Self {
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q> {
+    fn write_entity(&self, entity: &T, connection: &Connection) -> MaybeError {
+        let time = Instant::now();
+
+        connection
+            .execute(Q::save(), Q::update_params(entity))
+            .map_err(|e| {
+                error!("{}", e);
+                DbSaveError
+            })?;
+        debug!("Updated in {} for {:?}", Q::name(), time.elapsed());
+        Ok(())
+    }
+
+    fn add_entity(&mut self, entity: &mut T, connection: &Connection) -> MaybeError {
+        let time = Instant::now();
+
+        let index: u32 = connection
+            .query_row(
+                format!("{} RETURNING {}", Q::add(), Q::id_field()).as_str(),
+                Q::insert_params(entity),
+                |row| row.get(0),
+            )
+            .map_err(|e| {
+                error!("{}", e);
+                DbSaveError
+            })?;
+
+        entity.set_id(index.into());
+        debug!("Added into {} for {:?}", Q::name(), time.elapsed());
+        Ok(())
+    }
+
+    fn delete_entity(&mut self, id: Id, connection: &Connection) -> MaybeError {
+        let time = Instant::now();
+
+        if !id.is_valid() {
+            return Err(DbSaveError);
+        }
+        connection
+            .execute(
+                format!("DELETE FROM {} WHERE id = ?1", Q::name()).as_str(),
+                (&id,),
+            )
+            .map_err(|e| {
+                error!("{}", e);
+                DbSaveError
+            })?;
+        debug!("Deleted from {} for {:?}", Q::name(), time.elapsed());
+        Ok(())
+    }
+
+    fn load_all(&self, storage: &mut Vec<T>, connection: &Connection) -> MaybeError {
+        let time = Instant::now();
+
+        let mut stmt = connection
+            .prepare(Q::load())
+            .expect("Failed to prepare state query");
+        let iter = stmt
+            .query_map([], |row| Q::from_sql(row))
+            .map_err(|e| {
+                error!("{}", e);
+                DbSaveError
+            })?;
+
+        iter.filter_map(|res| res.ok())
+            .for_each(|i| storage.push(i));
+        debug!(
+            "Loaded {} from {} for {:?}",
+            storage.len(),
+            Q::name(),
+            time.elapsed()
+        );
+
+        Ok(())
+    }
+}
+
+impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLayer<T, Q> {
+    fn delete_many_entities(&mut self, ids: &[Id], connection: &mut Connection) -> MaybeError {
+        let time = Instant::now();
+
+        for chunk in ids.chunks(1000) {
+            let stringed = chunk
+                .iter()
+                .map(|i| i.to_string())
+                .collect::<Vec<_>>()
+                .join(",");
+            connection
+                .execute(
+                    format!("DELETE FROM {} WHERE id in ({})", Q::name(), stringed).as_str(),
+                    (),
+                )
+                .map_err(|e| {
+                    error!("{}", e);
+                    DbSaveError
+                })?;
+        }
+        debug!(
+            "Deleted {} from {} for {:?}",
+            ids.len(),
+            Q::name(),
+            time.elapsed()
+        );
+
+        Ok(())
+    }
+
+    fn add_many_entities(&mut self, entities: &mut [T], connection: &mut Connection) -> MaybeError {
+        let time = Instant::now();
+        let tx = connection
+            .transaction()
+            .expect("Failed to create transaction");
+        let count = entities.len();
+
+        {
+            let mut stmt = tx.prepare(Q::add()).expect("Failed to prepare state query");
+            for entity in entities.iter() {
+                stmt.execute(Q::insert_params(entity)).map_err(|e| {
+                    error!("{}", e);
+                    DbSaveError
+                })?;
+            }
+        }
+
+        let last_index: u32 = tx.last_insert_rowid() as u32;
+        tx.commit().expect("Failed to commit");
+
+        let start_index = last_index - (count as u32) + 1;
+
+        for (index, id) in (start_index..=last_index).enumerate() {
+            entities[index].set_id(id.into());
+        }
+
+        debug!(
+            "Added {} into {} for {:?}",
+            entities.len(),
+            Q::name(),
+            time.elapsed()
+        );
+        Ok(())
+    }
+}

src/data_provider/settings.rs

@@ -1,51 +1,51 @@
+use crate::notification::NotificationData::{DbLoadError, DbSaveError};
+use crate::notification::{MaybeError, NotificationData};
 use rusqlite::Connection;
 
 pub fn get_setting(key: String, connection: &Connection) -> Option<String> {
     let mut stmt = connection
         .prepare("SELECT value FROM settings WHERE id = ?1")
-        .unwrap();
+        .expect("Failed to prepare statement.");
-    let iter = stmt.query_map((key,), |row| row.get(0)).unwrap();
+    let mut iter = stmt.query_map((key,), |row| row.get(0)).ok()?;
 
-    for row in iter {
+    if let Some(row) = iter.next()
-        if let Ok(value) = row {
+        && let Ok(value) = row
-            return Some(value);
+    {
-        }
+        return Some(value);
-        return None;
     }
+
     None
 }
 
-pub fn set_setting(key: String, value: String, connection: &Connection) {
+pub fn set_setting(key: String, value: String, connection: &Connection) -> MaybeError {
-    let current = get_settings_list(connection);
+    let current = get_settings_list(connection)?;
     if current.contains(&key) {
-        update_settings(key, value, connection);
+        update_settings(key, value, connection)?;
     } else {
-        create_settings(key, value, connection);
+        create_settings(key, value, connection)?;
     }
+
+    Ok(())
 }
 
-pub fn delete_settings(key: String, connection: &Connection) {
+pub fn delete_settings(key: String, connection: &Connection) -> MaybeError {
     connection
         .execute("DELETE FROM settings WHERE id = ?1", (&key,))
-        .unwrap_or_else(|e| {
+        .map_err(|_| DbSaveError)?;
-            println!("{}", e);
+    Ok(())
-            0
-        });
 }
 
-fn create_settings(key: String, value: String, connection: &Connection) {
+fn create_settings(key: String, value: String, connection: &Connection) -> MaybeError {
     connection
         .execute(
             "INSERT into settings (id, value) VALUES (?1, ?2)",
             (key, value),
         )
-        .unwrap_or_else(|e| {
+        .map_err(|_| DbSaveError)?;
-            println!("{}", e);
+    Ok(())
-            0
-        });
 }
 
-fn update_settings(key: String, value: String, connection: &Connection) {
+fn update_settings(key: String, value: String, connection: &Connection) -> MaybeError {
     connection
         .execute(
             "update settings
@@ -53,14 +53,16 @@ set value = ?2
 where id = ?1",
             (key, value),
         )
-        .unwrap_or_else(|e| {
+        .map_err(|_| DbSaveError)?;
-            println!("{}", e);
+    Ok(())
-            0
-        });
 }
 
-fn get_settings_list(connection: &Connection) -> Vec<String> {
+fn get_settings_list(connection: &Connection) -> Result<Vec<String>, NotificationData> {
-    let mut stmt = connection.prepare("SELECT id FROM settings").unwrap();
+    let mut stmt = connection
-    let iter = stmt.query_map((), |row| row.get(0)).unwrap();
+        .prepare("SELECT id FROM settings")
-    iter.map(|row| row.unwrap()).collect()
+        .expect("prepare stmt failed");
+    let iter = stmt
+        .query_map((), |row| row.get(0))
+        .map_err(|_| DbLoadError)?;
+    Ok(iter.filter_map(|i| i.ok()).collect())
 }

src/data_provider/sqlite.rs

@@ -1,30 +1,29 @@
-use crate::dictionary::app_data_dir;
+use crate::fs::*;
+use log::error;
 use rusqlite::Connection;
+use std::ops::{Deref, DerefMut};
 
 pub fn create_db() {
-    let path = app_data_dir();
+    let db_file = db_path();
-    let db_file = path.join("data.db");
     if !db_file.exists() {
-        std::fs::File::create(&db_file).unwrap();
+        std::fs::File::create(&db_file).expect("Database file creation failed");
-        let connection = Connection::open(&db_file).unwrap();
+        let connection = Connection::open(&db_file).expect("Connection open failed");
-        connection.execute("PRAGMA foreign_keys = ON;", []).unwrap();
+        connection
+            .execute("PRAGMA foreign_keys = ON;", [])
+            .expect("Failed to set PRAGMA");
 
         create_tables(&connection);
-    } else {
-        let connection = Connection::open(&db_file).unwrap();
-
-        ensure_db_schema(&connection);
     }
 }
 
-fn ensure_db_schema(_: &Connection) {}
-
 fn create_tables(conn: &Connection) {
-    make_card_set(conn).unwrap();
+    make_card_set(conn).expect("Failed to init table");
-    make_settings(conn).unwrap();
+    make_settings(conn).expect("Failed to init table");
-    make_word_group(conn).unwrap();
+    make_word_group(conn).expect("Failed to init table");
-    make_words(conn).unwrap();
+    make_words(conn).expect("Failed to init table");
-    make_card_stats(conn).unwrap();
+    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> {
@@ -34,15 +33,15 @@ fn make_settings(conn: &Connection) -> Result<(), rusqlite::Error> {
 }
 
 fn make_card_set(conn: &Connection) -> Result<(), rusqlite::Error> {
-    let query = include_str!("../../sql/card_set.sql");
+    let query = include_str!("../../sql/decks.sql");
     conn.execute(query, ())?;
     Ok(())
 }
 
 fn make_word_group(conn: &Connection) -> Result<(), rusqlite::Error> {
-    let query = include_str!("../../sql/word_group.sql");
+    let query = include_str!("../../sql/word_groups.sql");
     conn.execute(query, ())?;
-    conn.execute("insert into word_group (name) values (\"Слова\");", ())?;
+    conn.execute("insert into word_groups (name) values (\"Слова\");", ())?;
     Ok(())
 }
 fn make_words(conn: &Connection) -> Result<(), rusqlite::Error> {
@@ -51,15 +50,87 @@ fn make_words(conn: &Connection) -> Result<(), rusqlite::Error> {
     Ok(())
 }
 fn make_card_stats(conn: &Connection) -> Result<(), rusqlite::Error> {
-    let query = include_str!("../../sql/card_stats.sql");
+    let query = include_str!("../../sql/states.sql");
+    conn.execute(query, ())?;
+    Ok(())
+}
+
+fn make_history(conn: &Connection) -> Result<(), rusqlite::Error> {
+    let query = include_str!("../../sql/history.sql");
+    conn.execute(query, ())?;
+    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 path = app_data_dir();
+    let db_file = db_path();
-    let db_file = path.join("data.db");
+    let connection = Connection::open(db_file).expect("Failed to open database");
-    let connection = Connection::open(db_file).unwrap();
-    connection.execute("PRAGMA foreign_keys = ON;", []).unwrap();
     connection
-}
+        .execute("PRAGMA foreign_keys = ON;", [])
+        .expect("Failed to set PRAGMA");
+    connection
+        .query_one("PRAGMA journal_mode = WAL;", [], |row| {
+            println!("{:?}", row);
+            Ok(())
+        })
+        .unwrap_or_else(|e| {
+            println!("{}", e);
+        });
+    connection
+        .execute("PRAGMA synchronous = NORMAL;", [])
+        .expect("Failed to set PRAGMA");
+    connection
+}
+
+pub struct SqliteConnection(Option<Connection>);
+impl Deref for SqliteConnection {
+    type Target = Connection;
+    fn deref(&self) -> &Self::Target {
+        self.0.as_ref().unwrap()
+    }
+}
+
+impl DerefMut for SqliteConnection {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.0.as_mut().unwrap()
+    }
+}
+
+impl Default for SqliteConnection {
+    fn default() -> Self {
+        SqliteConnection(Some(default_connection()))
+    }
+}
+
+impl SqliteConnection {
+    pub fn finish(&mut self) {
+        let connection = self.0.take().unwrap();
+        connection
+            .query_row("PRAGMA wal_checkpoint(TRUNCATE)", [], |_| Ok(()))
+            .unwrap_or_else(|e| {
+                error!("Ошибка при checkpoint WAL: {e}");
+            });
+        connection
+            .execute("PRAGMA optimize", [])
+            .unwrap_or_else(|e| {
+                error!("Ошибка при  оптимизации БД: {e}");
+                0
+            });
+
+        self.0 = None;
+    }
+    pub fn restart(&mut self) {
+        self.0 = Some(default_connection());
+    }
+}
+
+impl Drop for SqliteConnection {
+    fn drop(&mut self) {
+        self.finish();
+    }
+}

src/data_provider/voice.rs

@@ -1,15 +1,14 @@
-use crate::dictionary::app_data_dir;
+use crate::fs::*;
+use crate::notification::NotificationData;
+use crate::notification::NotificationData::*;
 use reqwest::Client;
 use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::BufReader;
 
-pub async fn get_voice(text: &str) -> BufReader<File> {
+pub async fn get_voice(text: &str) -> Result<BufReader<File>, NotificationData> {
-    let mut path = app_data_dir();
+    let mut path = voice_dir()?;
-    path.push("voice");
+
-    if !path.exists() {
-        std::fs::create_dir(path.clone()).unwrap();
-    }
     let hash = format!("{}.wav", hex::encode(Sha256::digest(text.as_bytes())));
     path.push(hash);
     if !path.exists() {
@@ -20,7 +19,11 @@ pub async fn get_voice(text: &str) -> BufReader<File> {
             .send()
             .await;
 
-        let query = query.unwrap().text().await.unwrap();
+        let query = query
+            .map_err(|_| VoiceVoxUnavailable)?
+            .text()
+            .await
+            .map_err(|_| VoiceVoxUnavailable)?;
         // Synthesis
         let audio = client
             .post(format!("{engine_url}/synthesis?speaker=11"))
@@ -28,13 +31,17 @@ pub async fn get_voice(text: &str) -> BufReader<File> {
             .body(query)
             .send()
             .await
-            .unwrap()
+            .map_err(|_| VoiceVoxUnavailable)?
             .bytes()
             .await
-            .unwrap();
+            .map_err(|_| VoiceVoxUnavailable)?;
 
-        tokio::fs::write(&path, &audio).await.unwrap();
+        tokio::fs::write(&path, &audio)
+            .await
+            .map_err(|_| PermissionDenied)?;
     }
 
-    BufReader::new(File::open(path).unwrap())
+    Ok(BufReader::new(
+        File::open(path).map_err(|_| PermissionDenied)?,
+    ))
 }

src/data_provider/web_api.rs

@@ -1,34 +1,47 @@
-use crate::dictionary::app_data_dir;
+use crate::fs::*;
+use crate::notification::NotificationData::{CompressError, PermissionDenied, WebApiUnavailable};
+use crate::notification::{MaybeError, NotificationData};
+use log::info;
 use std::io;
 use tokio::fs::{File, OpenOptions};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use zstd::{Decoder, Encoder, DEFAULT_COMPRESSION_LEVEL};
+use zstd::{DEFAULT_COMPRESSION_LEVEL, Decoder, Encoder};
 
 // const API_URL: &str = "http://127.0.0.1:8089/";
 const API_URL: &str = "https://learning.micialware.ru/";
 
-pub async fn send_data(id: String) {
+pub async fn send_data(id: String) -> MaybeError {
-    let path = app_data_dir();
+    let db_file = db_path();
-    let db_file = path.join("data.db");
+    let data = tokio::fs::read(db_file)
-    let data = tokio::fs::read(db_file).await.unwrap();
+        .await
-    let data = compress(data);
+        .map_err(|_| WebApiUnavailable)?;
+    let data = compress(data)?;
 
     let api_url = API_URL.to_string();
     let id_url = format!("{api_url}upload/stream/{id}");
 
     let client = reqwest::Client::new();
-    let new_version = client.post(&id_url).body(data).send().await.unwrap().text().await.unwrap();
+    let new_version = client
-    set_local_version(new_version.parse::<u32>().unwrap()).await;
+        .post(&id_url)
+        .body(data)
+        .send()
+        .await
+        .map_err(|_| WebApiUnavailable)?
+        .text()
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    set_local_version(new_version.parse::<u32>().unwrap_or_default()).await?;
+    Ok(())
 }
 
-fn compress(data: Vec<u8>) -> Vec<u8> {
+fn compress(data: Vec<u8>) -> Result<Vec<u8>, NotificationData> {
-    let mut encoder = Encoder::new(Vec::new(), DEFAULT_COMPRESSION_LEVEL).unwrap();
+    let mut encoder =
-    io::copy(&mut &data[..], &mut encoder).unwrap();
+        Encoder::new(Vec::new(), DEFAULT_COMPRESSION_LEVEL).map_err(|_| CompressError)?;
-    let compressed = encoder.finish().unwrap();
+    io::copy(&mut &data[..], &mut encoder).map_err(|_| PermissionDenied)?;
-    compressed
+    encoder.finish().map_err(|_| CompressError)
 }
 
-pub async fn load_data(id: String, temp: bool) {
+pub async fn load_data(id: String, temp: bool) -> MaybeError {
     let api_url = API_URL.to_string();
     let id_url = format!("{api_url}download/{id}");
     let client = reqwest::Client::new();
@@ -36,35 +49,42 @@ pub async fn load_data(id: String, temp: bool) {
         .get(&id_url)
         .send()
         .await
-        .unwrap()
+        .map_err(|_| WebApiUnavailable)?
         .bytes()
         .await
-        .unwrap()
+        .map_err(|_| WebApiUnavailable)?
         .to_vec();
-    let data = decompress(data);
+    let data = decompress(data)?;
 
     let path = app_data_dir();
     let file_name = if temp { "data.db.tmp" } else { "data.db" };
     let db_file = path.join(file_name);
 
-    tokio::fs::write(db_file, data).await.unwrap();
+    tokio::fs::write(db_file, data)
+        .await
+        .map_err(|_| PermissionDenied)?;
 
     let version_url = format!("{API_URL}{id}/version");
-    let version = client.get(&version_url).send().await.unwrap().text().await.unwrap();
+    let version = client
-    set_local_version(version.parse::<u32>().unwrap()).await;
+        .get(&version_url)
+        .send()
+        .await
+        .map_err(|_| WebApiUnavailable)?
+        .text()
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    set_local_version(version.parse::<u32>().unwrap_or_default()).await?;
+    Ok(())
 }
 
-pub fn decompress(data: Vec<u8>) -> Vec<u8> {
+pub fn decompress(data: Vec<u8>) -> Result<Vec<u8>, NotificationData> {
-    let mut decoder = Decoder::new(&data[..]).unwrap();
+    let mut decoder = Decoder::new(&data[..]).map_err(|_| CompressError)?;
     let mut decompressed = Vec::new();
-    let res = io::copy(&mut decoder, &mut decompressed);
+    io::copy(&mut decoder, &mut decompressed).map_err(|_| PermissionDenied)?;
-    if let Err(e) = res {
+    Ok(decompressed)
-        println!("{}", e);
-    }
-    decompressed
 }
 
-pub async fn first_sync() -> String {
+pub async fn first_sync() -> Result<String, NotificationData> {
     let id_url = API_URL.to_string() + "generate";
 
     let client = reqwest::Client::new();
@@ -72,37 +92,66 @@ pub async fn first_sync() -> String {
         .get(&id_url)
         .send()
         .await
-        .unwrap()
+        .map_err(|_| WebApiUnavailable)?
         .text()
         .await
-        .unwrap();
+        .map_err(|_| WebApiUnavailable)?;
-    println!("id: {}", id);
+    info!("id: {}", id);
-    id
+    Ok(id)
 }
 
-pub async fn get_web_version(key: &str) -> Result<u32, reqwest::Error> {
+pub async fn get_web_version(key: &str) -> Result<u32, NotificationData> {
     let id_url = format!("{API_URL}{key}/version");
     let client = reqwest::Client::new();
-    let version = client.get(&id_url).send().await?.text().await?;
+    let version = client
-    return Ok(version.parse::<u32>().unwrap());
+        .get(&id_url)
+        .send()
+        .await
+        .map_err(|_| WebApiUnavailable)?
+        .text()
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    info!("version: {}", version);
+    Ok(version.parse::<u32>().unwrap_or_default())
 }
 
-pub async fn get_local_version() -> u32 {
+pub async fn get_local_version() -> Result<u32, NotificationData> {
-    let file = app_data_dir().join("data.meta");
+    let file = db_meta_path();
     if file.exists() {
         let mut data = String::new();
-        File::open(file.clone()).await.unwrap().read_to_string(&mut data).await.unwrap();
+        File::open(file.clone())
-        return data.parse::<u32>().unwrap();
+            .await
+            .map_err(|_| PermissionDenied)?
+            .read_to_string(&mut data)
+            .await
+            .map_err(|_| PermissionDenied)?;
+        return Ok(data.parse::<u32>().unwrap_or_default());
     }
 
-    let mut file = OpenOptions::new().write(true).create(true).open(file).await.unwrap();
+    let mut file = OpenOptions::new()
-    file.write_all("0".as_bytes()).await.unwrap();
+        .write(true)
-    0
+        .create(true)
+        .truncate(true)
+        .open(file)
+        .await
+        .map_err(|_| PermissionDenied)?;
+    file.write_all("0".as_bytes())
+        .await
+        .map_err(|_| PermissionDenied)?;
+    Ok(0)
 }
 
-pub async fn set_local_version(version: u32) {
+pub async fn set_local_version(version: u32) -> Result<(), NotificationData> {
-    let file_path = app_data_dir().join("data.meta");
+    let file_path = db_meta_path();
-    let mut file = OpenOptions::new().write(true).create(true).truncate(true).open(file_path).await.unwrap();
+    let mut file = OpenOptions::new()
-    file.write_all(version.to_string().as_bytes()).await.unwrap();
+        .write(true)
+        .create(true)
+        .truncate(true)
+        .open(file_path)
+        .await
+        .map_err(|_| PermissionDenied)?;
+    file.write_all(version.to_string().as_bytes())
+        .await
+        .map_err(|_| PermissionDenied)?;
+    Ok(())
 }
-

src/data_provider/word_groups.rs

@@ -0,0 +1,43 @@
+use crate::data::entities::WordGroup;
+use crate::data::repositories::{DataRepository, DataRepositoryInner};
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
+use rusqlite::{Error, Params, Row};
+
+pub type WordGroupRepository = DataRepository<WordGroup, WordGroupDataLayer>;
+pub type WordGroupRepositoryInner = DataRepositoryInner<WordGroup, WordGroupDataLayer>;
+pub type WordGroupDataLayer = SqliteDbLayer<WordGroup, WordGroupQuerySet>;
+
+#[derive(Clone)]
+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

@@ -1,182 +1,59 @@
-use crate::lang::{WordData, WordGroup};
+use crate::data::entities::WordData;
-use rusqlite::{params, Connection};
+use crate::data::repositories::{DataRepository, DataRepositoryInner};
-use std::collections::HashMap;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
+use rusqlite::{Error, Params, Row};
 
-pub fn add_word(word: &mut WordData, connection: &Connection) {
+pub type WordRepository = DataRepository<WordData, WordDataLayer>;
-    let index = connection
+pub type WordRepositoryInner = DataRepositoryInner<WordData, WordDataLayer>;
-        .query_row(
+pub type WordDataLayer = SqliteDbLayer<WordData, WordQuerySet>;
-            "INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5) RETURNING id",
+#[derive(Clone)]
-            (
+pub struct WordQuerySet;
-                &word.key,
+impl TableAccessQuerySet<WordData> for WordQuerySet {
-                &word.value,
+    fn load() -> &'static str {
-                &word.tags,
+        "SELECT id, key, value, tags, more, group_id FROM words"
-                serde_json::to_string(&word.additional).unwrap(),
-                &word.group_id,
-            ),
-            |row| row.get(0),
-        )
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-
-    word.id = index;
-}
-
-pub fn add_words(words: &mut[WordData], connection: &mut Connection) {
-    let tx = connection.transaction().unwrap();
-    let count = words.len();
-
-    {
-        let mut stmt = tx.prepare(
-            "INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5)",
-        ).unwrap();
-
-
-        for word in words.iter() {
-            stmt.execute(params![word.key, word.value, word.tags, serde_json::to_string(&word.additional).unwrap(), word.group_id]).unwrap();
-        }
     }
 
-    tx.commit().unwrap();
+    fn save() -> &'static str {
-
+        "UPDATE words SET key = ?1, value = ?2, tags = ?3, more = ?4 WHERE id = ?5"
-    let last_index: u32 = connection
-        .query_one(
-            "SELECT seq from sqlite_sequence WHERE name == ?1",
-            ("words".to_string(),),
-            |row| row.get(0),
-        )
-        .unwrap();
-
-    let start_index = last_index - (count as u32) + 1;
-
-    let mut index = 0;
-    for id in start_index..=last_index {
-        words[index].id = id;
-        index += 1;
     }
-}
 
-pub fn update_word(word: &mut WordData, connection: &Connection) {
+    fn add() -> &'static str {
-    if word.id == 0 {
+        "INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5)"
-        add_word(word, &connection);
-    } else {
-        connection
-            .execute(
-                "UPDATE words SET key = ?1, value = ?2, tags = ?3, more = ?4 WHERE id = ?5",
-                (
-                    &word.key,
-                    &word.value,
-                    &word.tags,
-                    serde_json::to_string(&word.additional).unwrap(),
-                    &word.id,
-                ),
-            )
-            .unwrap_or_else(|e| {
-                println!("{}", e);
-                0
-            });
     }
-}
 
-pub fn delete_word(word: &WordData, connection: &Connection) {
+    fn name() -> &'static str {
-    if word.id == 0 {
+        "words"
-        return;
     }
-    connection
-        .execute("DELETE FROM words WHERE id = ?1", (&word.id,))
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-}
 
-pub fn load_words(connection: &Connection) -> Vec<WordData> {
+    fn from_sql(row: &Row) -> Result<WordData, Error> {
-    let mut stmt = connection
+        let additional: String = row.get(4)?;
-        .prepare("SELECT id, key, value, tags, more, group_id FROM words")
+        Ok(WordData {
-        .unwrap();
+            id: row.get(0)?,
-    let word_iter = stmt
+            key: row.get(1)?,
-        .query_map([], |row| {
+            value: row.get(2)?,
-            let additional: String = row.get(4)?;
+            tags: row.get(3)?,
-            Ok(WordData {
+            additional: serde_json::from_str(&additional).unwrap_or_default(),
-                id: row.get(0)?,
+            group_id: row.get(5)?,
-                key: row.get(1)?,
-                value: row.get(2)?,
-                tags: row.get(3)?,
-                additional: serde_json::from_str::<HashMap<String, String>>(&additional).unwrap(),
-                group_id: row.get(5)?,
-            })
         })
-        .unwrap();
-
-    let mut buffer = vec![];
-    for word in word_iter {
-        buffer.push(word.unwrap());
     }
 
-    buffer
+    fn insert_params(entity: &WordData) -> impl Params {
-}
+        (
-
+            &entity.key,
-pub fn load_word_groups(connection: &Connection) -> Vec<WordGroup> {
+            &entity.value,
-    let mut stmt = connection
+            &entity.tags,
-        .prepare("SELECT id, name FROM word_group")
+            serde_json::to_string(&entity.additional).unwrap_or_default(),
-        .unwrap();
+            entity.group_id,
-    let group_iter = stmt
-        .query_map([], |row| {
-            Ok(WordGroup {
-                id: row.get(0)?,
-                name: row.get(1)?,
-            })
-        })
-        .unwrap();
-
-    let mut buffer = vec![];
-    for group in group_iter {
-        buffer.push(group.unwrap());
-    }
-
-    buffer
-}
-
-pub fn add_group(group: &mut WordGroup, connection: &Connection) {
-    let index = connection
-        .query_row(
-            "INSERT INTO word_group (name) VALUES (?1) RETURNING id",
-            (&group.name,),
-            |row| row.get(0),
         )
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-
-    group.id = index;
-}
-
-pub fn update_group(group: &mut WordGroup, connection: &Connection) {
-    if group.id == 0 {
-        add_group(group, &connection);
-    } else {
-        connection
-            .execute(
-                "UPDATE word_group SET name = ?1 WHERE id = ?2",
-                (&group.name, &group.id),
-            )
-            .unwrap_or_else(|e| {
-                println!("{}", e);
-                0
-            });
     }
-}
 
-pub fn delete_group(group: &WordGroup, connection: &Connection) {
+    fn update_params(entity: &WordData) -> impl Params {
-    if group.id == 0 {
+        (
-        return;
+            &entity.key,
+            &entity.value,
+            &entity.tags,
+            serde_json::to_string(&entity.additional).unwrap_or_default(),
+            entity.id,
+        )
     }
-    connection
+}
-        .execute("DELETE FROM word_group WHERE id = ?1", (&group.id,))
-        .unwrap_or_else(|e| {
-            println!("{}", e);
-            0
-        });
-}

src/dictionary.rs

@@ -1,632 +0,0 @@
-use crate::data_provider::words::{delete_group, delete_word, update_group, update_word};
-use crate::dictionary::DictionaryMessage::*;
-use crate::dictionary_test::DictionaryQuizState;
-use crate::import::ImportState;
-use crate::lang::{WordData, WordGroup};
-use crate::navigation::Page::{Import, Word};
-use crate::navigation::{NavigatedPage, Page};
-use crate::styling::*;
-use crate::word::WordState;
-use crate::{AppState, RootMessage};
-use chrono::{DateTime, TimeDelta, Utc};
-use iced::alignment::Vertical::Center;
-use iced::widget::button::Style;
-use iced::widget::button::{danger, text};
-use iced::widget::space::horizontal;
-use iced::widget::text_input::default;
-use iced::widget::*;
-use iced::{Border, Color, Shadow, Task};
-use iced_core::Length::Fill;
-use rand::random_range;
-use std::collections::{HashMap, HashSet};
-use std::fs;
-use std::ops::Add;
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
-use std::time::{Duration, Instant};
-
-#[derive(Clone)]
-pub struct DictionaryState {
-    state: Arc<Mutex<AppState>>,
-    include_map: Vec<bool>,
-    tag_map: HashMap<String, bool>,
-    reverse: bool,
-    search: String,
-    no_typing: bool,
-    selected_group_index: usize,
-    reverse_list: bool,
-    auto_save_queue: HashMap<usize, DateTime<Utc>>,
-}
-
-#[derive(Debug, Clone)]
-pub enum DictionaryMessage {
-    Back,
-    SetTags(usize, String),
-    SetKey(usize, String),
-    SetValue(usize, String),
-    SubmitWord(usize),
-    WordAction(usize),
-    NewWord,
-    Include(usize, bool),
-    IncludeTag(String, bool),
-    Test,
-    ResetTags,
-    SetReverse(bool),
-    Search(String),
-    SetTyping(bool),
-    CreateGroup,
-    EditGroup(String),
-    SaveGroup,
-    SelectGroup(usize),
-    DeleteGroup,
-    ChangeDirection,
-    TrySave(usize),
-    ToImport,
-}
-
-impl NavigatedPage<DictionaryMessage> for DictionaryState {
-    fn navigate(&self, message: &DictionaryMessage) -> Option<Page> {
-        if let Back = message {
-            return Some(Page::PreviousPage);
-        }
-        if let Test = message {
-            if self.include_map.iter().any(|x| *x) {
-                let mut words = vec![];
-                let dict = &self.state.lock().unwrap().dictionary;
-
-                words = self
-                    .include_map
-                    .iter()
-                    .zip(0..self.include_map.len())
-                    .filter(|(flag, _)| **flag)
-                    .map(|(_, index)| dict[index].clone())
-                    .collect();
-
-                return Some(Page::DictionaryQuiz(DictionaryQuizState::new(
-                    words,
-                    self.reverse,
-                    self.no_typing,
-                )));
-            }
-        }
-        if let WordAction(index) = message {
-            let word: WordData;
-            {
-                let state = self.state.lock().unwrap();
-                let dict = &state.dictionary;
-                word = dict[*index].clone();
-            }
-            if word.id != 0 {
-                return Some(Word(WordState::new(word, *index, self.state.clone())));
-            }
-        }
-        if let ToImport = message {
-            return Some(Import(ImportState::new(self.state.clone())));
-        }
-        None
-    }
-
-    fn navigated(&mut self) {
-        let len = self.state.lock().unwrap().dictionary.len();
-
-        self.include_map = vec![false; len];
-        self.tag_map = Default::default();
-        self.update_tags();
-    }
-
-    fn update(&mut self, message: DictionaryMessage) -> Task<RootMessage> {
-        match message {
-            NewWord => {
-                let mut state = self.state.lock().unwrap();
-                let mut word = WordData::new();
-                word.group_id = state.word_groups[self.selected_group_index].id.clone();
-
-                let dict = &mut state.dictionary;
-                dict.push(word);
-                self.include_map.push(false);
-            }
-
-            SetKey(i, v) => {
-                {
-                    let dict = &mut self.state.lock().unwrap().dictionary;
-                    dict[i].key = v;
-                }
-                return self.launch_auto_save_offset(i);
-            }
-            SetValue(i, v) => {
-                {
-                    let dict = &mut self.state.lock().unwrap().dictionary;
-                    dict[i].value = v
-                }
-                return self.launch_auto_save_offset(i);
-            }
-            SetTags(i, mut v) => {
-                {
-                    let dict = &mut self.state.lock().unwrap().dictionary;
-
-                    let current_tags_value = dict[i].tags.clone();
-
-                    if v.ends_with(", ") && v.len() < current_tags_value.len() {
-                        v = v[..v.len() - 2].to_string()
-                    }
-
-                    while v.contains(",,") {
-                        let index = v.find(",,").unwrap();
-                        v.remove(index);
-                    }
-
-                    dict.get_mut(i).unwrap().tags = v;
-                }
-
-                self.update_tags();
-                return self.launch_auto_save_offset(i);
-            }
-
-            WordAction(i) => {
-                let state = &mut self.state.lock().unwrap();
-                let dict = &mut state.dictionary;
-                let word = dict.remove(i);
-                self.include_map.remove(i);
-                self.auto_save_queue.remove(&i);
-                delete_word(&word, &state.connection)
-            }
-            Include(i, b) => self.include_map[i] = b,
-            IncludeTag(t, v) => {
-                let index: u32;
-                {
-                    let state = self.state.lock().unwrap();
-                    index = state.word_groups[self.selected_group_index].id;
-                }
-                self.tag_map.insert(t, v);
-                self.update_words_include(index)
-            }
-
-            ResetTags => {
-                self.tag_map.iter_mut().for_each(|(_, v)| *v = false);
-                self.include_map.iter_mut().for_each(|x| *x = false)
-            }
-            SetReverse(v) => self.reverse = v,
-            Search(s) => {
-                self.search = s;
-            }
-            SetTyping(b) => self.no_typing = b,
-            SubmitWord(i) => self.save_word(i),
-            Back => {}
-            Test => {}
-            CreateGroup => {
-                let state = &mut self.state.lock().unwrap();
-
-                state.word_groups.push(WordGroup {
-                    id: 0,
-                    name: format!("Группа слов {}", random_range(100..1000)),
-                });
-            }
-            EditGroup(new) => {
-                let state = &mut self.state.lock().unwrap();
-                let group = state.word_groups.get_mut(self.selected_group_index);
-                if let Some(group) = group {
-                    group.name = new.clone();
-                }
-            }
-            SaveGroup => {
-                let state = &mut self.state.lock().unwrap();
-                let connection = &state.connection;
-                let group = &mut state
-                    .word_groups
-                    .get(self.selected_group_index)
-                    .unwrap()
-                    .clone();
-
-                update_group(group, connection);
-                state.word_groups[self.selected_group_index] = group.clone();
-            }
-            SelectGroup(i) => {
-                self.selected_group_index = i;
-                let index: u32;
-                {
-                    let state = self.state.lock().unwrap();
-                    index = state.word_groups[i].id;
-                }
-                self.update_words_include(index)
-            }
-            DeleteGroup => {
-                if self.selected_group_index == 0 {
-                    return Task::none();
-                }
-                {
-                    let state = &mut self.state.lock().unwrap();
-
-                    if let Some(group) = state.word_groups.get(self.selected_group_index) {
-                        let remove_group_id = group.id;
-                        let connection = &state.connection;
-
-                        delete_group(group, connection);
-                        state.word_groups.remove(self.selected_group_index);
-                        state
-                            .dictionary
-                            .retain(|word| word.group_id != remove_group_id);
-                        self.selected_group_index = 0;
-                    }
-                }
-
-                self.update_tags()
-            }
-            ChangeDirection => {
-                self.reverse_list = !self.reverse_list;
-            }
-            TrySave(word_index) => {
-                let now = Utc::now();
-                if !self.auto_save_queue.contains_key(&word_index) {
-                    return Task::none();
-                }
-                if self.auto_save_queue[&word_index] <= now {
-                    self.auto_save_queue.remove(&word_index);
-                    self.save_word(word_index);
-                }
-            }
-            ToImport => {}
-        }
-
-        Task::none()
-    }
-
-    fn view(&self) -> iced::Element<'_, DictionaryMessage> {
-        back_overlay(
-            row![
-                iced::widget::column![
-                    self.groups_panel(),
-                    row![horizontal().width(8), self.words_list(),],
-                    row![
-                        button("Добавить слово").style(jl_button).on_press(NewWord),
-                        horizontal().width(Fill),
-                        button("Импорт").style(text).on_press(ToImport),
-                    ]
-                ]
-                .spacing(5),
-                self.filters(),
-            ]
-            .spacing(DEFAULT_SPACING)
-            .into(),
-            Back,
-        )
-    }
-}
-
-impl DictionaryState {
-    pub fn new(state: Arc<Mutex<AppState>>) -> Self {
-        let len = state.lock().unwrap().dictionary.len();
-
-        let mut result = DictionaryState {
-            include_map: vec![false; len],
-            selected_group_index: 0,
-            state,
-            tag_map: HashMap::new(),
-            reverse: false,
-            search: "".to_string(),
-            no_typing: true,
-            reverse_list: true,
-            auto_save_queue: HashMap::new(),
-        };
-
-        result.update_tags();
-
-        result
-    }
-
-    fn save_word(&mut self, i: usize) {
-        let state = &mut self.state.lock().unwrap();
-        let connection = &state.connection;
-        let word = &mut state.dictionary.get(i).unwrap().clone();
-
-        update_word(word, &connection);
-        state.dictionary[i] = word.clone();
-    }
-
-    fn launch_auto_save_offset(&mut self, index: usize) -> Task<RootMessage> {
-        let save_time = Utc::now().add(TimeDelta::milliseconds(900));
-        self.auto_save_queue.insert(index, save_time);
-        let message = RootMessage::Dictionary(TrySave(index));
-        Task::perform(
-            async { tokio::time::sleep(Duration::from_secs(1)).await },
-            |_| message,
-        )
-    }
-
-    fn words_list(&self) -> iced::Element<'_, DictionaryMessage> {
-        let time = Instant::now();
-        let mut col = Column::new().width(Fill);
-
-        let state = self.state.lock().unwrap();
-        let group_id = state.word_groups[self.selected_group_index].id;
-
-        let dict = &state.dictionary;
-
-        let mut index = 0;
-
-        for access_index in 0..dict.len() {
-            let mut i = access_index;
-            if self.reverse_list {
-                i = dict.len() - access_index - 1;
-            }
-            let word = &dict[i];
-            if word.group_id != group_id {
-                continue;
-            }
-
-            if !self.search.is_empty() {
-                if word.key.contains(&self.search) == false
-                    && word.value.contains(&self.search) == false
-                    && word.tags.contains(&self.search) == false
-                {
-                    continue;
-                }
-            }
-
-            let word_line_data = WordLineState {
-                is_included: self.include_map[i],
-                key: word.key.clone(),
-                value: word.value.clone(),
-                tags: word.tags.clone(),
-                id: word.id,
-                index: i,
-            };
-
-            index += 1;
-
-            let lazy_line = lazy(word_line_data, move |data| {
-                let index = data.index;
-                let mut line = Row::new().width(Fill).align_y(Center);
-                line = line.push(
-                    checkbox(data.is_included)
-                        .label("")
-                        .spacing(15)
-                        .on_toggle(move |b| Include(index, b)),
-                );
-
-                line = line.push(
-                    text_input("Слово", &data.key)
-                        .size(ACCENT_FONT_SIZE)
-                        .width(Fill)
-                        .on_input(move |string| SetKey(index, string))
-                        .on_submit(SubmitWord(index))
-                        .style(|x, status| {
-                            let mut default_style = default(x, status);
-                            default_style.border.radius = 0.0.into();
-                            default_style
-                        }),
-                );
-                line = line.push(
-                    text_input("Перевод", &data.value)
-                        .size(ACCENT_FONT_SIZE)
-                        .width(Fill)
-                        .on_input(move |string| SetValue(index, string))
-                        .on_submit(SubmitWord(index))
-                        .style(|x, status| {
-                            let mut default_style = default(x, status);
-                            default_style.border.radius = 0.0.into();
-                            default_style
-                        }),
-                );
-
-                line = line.push(
-                    text_input("Теги", &data.tags)
-                        .size(ACCENT_FONT_SIZE)
-                        .width(Fill)
-                        .on_input(move |string| SetTags(index, string))
-                        .on_submit(SubmitWord(index))
-                        .style(|x, status| {
-                            let mut default_style = default(x, status);
-                            default_style.border.radius = 0.0.into();
-                            default_style
-                        }),
-                );
-
-                let line_button = || {
-                    let action = WordAction(index);
-
-                    if data.id == 0 {
-                        return button("-").on_press(action).style(|_x, _status| Style {
-                            background: None,
-                            text_color: Color::BLACK,
-                            border: Border::default(),
-                            shadow: Shadow::default(),
-                            snap: false,
-                        });
-                    }
-
-                    button("").on_press(WordAction(index)).width(15)
-                };
-                line = line.push(line_button()).push(space().width(10));
-                line
-            });
-
-            col = col.push(lazy_line);
-        }
-
-        println!("Drawing {index} lines");
-        println!("Words rendering time: {:?}", time.elapsed());
-        scrollable(col).height(Fill).into()
-    }
-
-    fn filters(&self) -> iced::Element<'_, DictionaryMessage> {
-        let dict = &self.state.lock().unwrap().dictionary;
-
-        iced::widget::column![
-            text_input("Поиск", &self.search)
-                .on_input(Search)
-                .width(Fill),
-            text!("Всего слов: {}", dict.len()),
-            text!(
-                "Выбрано слов: {}",
-                self.include_map.iter().filter(|i| **i).count()
-            ),
-            self.tags_selector(),
-            toggler(self.no_typing)
-                .label("Без набора")
-                .on_toggle(SetTyping),
-            toggler(self.reverse)
-                .label("Обратный тест")
-                .on_toggle(SetReverse),
-            button(text!("Тест").center().width(Fill))
-                .style(cta_button)
-                .on_press(Test)
-                .width(Fill),
-        ]
-        .width(250)
-        .spacing(DEFAULT_SPACING)
-        .into()
-    }
-
-    fn tags_selector(&self) -> iced::Element<'_, DictionaryMessage> {
-        let mut col = Column::new().width(Fill);
-        col = col.push(
-            button("Сбросить")
-                .on_press(ResetTags)
-                .style(|x: &Theme, _status| Style {
-                    background: None,
-                    text_color: x.palette().primary,
-                    border: Border::default(),
-                    shadow: Shadow::default(),
-                    snap: false,
-                }),
-        );
-        let mut sorted_tags = self.tag_map.iter().collect::<Vec<_>>();
-        sorted_tags.sort();
-        for tag in sorted_tags {
-            col = col.push(
-                checkbox(*tag.1)
-                    .label(tag.0)
-                    .on_toggle(|x1| IncludeTag(tag.0.clone(), x1)),
-            )
-        }
-
-        container(scrollable(col)).height(Fill).into()
-    }
-
-    fn update_tags(&mut self) {
-        let mut tags_list: HashSet<String> = HashSet::new();
-        let dict = &self.state.lock().unwrap().dictionary;
-
-        dict.iter().for_each(|element| {
-            split_with_coma(element.tags.as_str())
-                .iter()
-                .for_each(|tag| {
-                    tags_list.insert(tag.clone());
-                });
-        });
-
-        let current_tags = self
-            .tag_map
-            .keys()
-            .map(|k| k.clone().to_string())
-            .collect::<Vec<String>>();
-
-        current_tags
-            .iter()
-            .filter(|tag| !tags_list.contains(*tag))
-            .for_each(|tag| {
-                self.tag_map.remove(tag);
-            });
-
-        tags_list.iter().for_each(|tag| {
-            self.tag_map.insert(tag.clone(), false);
-        });
-    }
-
-    fn update_words_include(&mut self, group_id: u32) {
-        let include_tags = self
-            .tag_map
-            .iter()
-            .filter(|(_, value)| **value)
-            .map(|(t, _)| t.clone())
-            .collect::<Vec<String>>();
-
-        if include_tags.is_empty() {
-            self.include_map.iter_mut().for_each(|x| *x = false);
-            return;
-        }
-
-        let dict = &self.state.lock().unwrap().dictionary;
-        let time = Instant::now();
-
-        self.include_map = dict
-            .iter()
-            .map(|word| (split_with_coma(word.tags.as_str()), word.group_id))
-            .map(|(tags, word_group_id)| {
-                tags.iter().all(|t| include_tags.contains(t)) && tags.len() != 0 && word_group_id == group_id
-            })
-            .collect();
-
-        println!("Time {}", time.elapsed().as_micros());
-    }
-
-    fn groups_panel(&self) -> iced::Element<'_, DictionaryMessage> {
-        let mut row = Row::new();
-        row = row.push(button("+").style(text).on_press(CreateGroup));
-
-        let state = &self.state.lock().unwrap();
-        let groups = &state.word_groups;
-
-        let mut index = 0;
-        for group in groups {
-            row = row.push(
-                button(text!("{}", group.name.clone()))
-                    .style(text)
-                    .on_press(SelectGroup(index)),
-            );
-            index = index + 1;
-        }
-
-        let group = state.word_groups[self.selected_group_index].clone();
-
-        iced::widget::column![
-            scrollable(row).width(Fill).horizontal(),
-            row![
-                button("⇳").on_press(ChangeDirection).style(jl_button),
-                text_input("Название группы слов", &group.name)
-                    .on_input(EditGroup)
-                    .width(250)
-                    .on_submit(SaveGroup),
-                horizontal(),
-                self.group_delete_button(),
-            ]
-            .spacing(DEFAULT_SPACING / 2.0)
-        ]
-        .into()
-    }
-
-    fn group_delete_button(&self) -> iced::Element<'_, DictionaryMessage> {
-        if self.selected_group_index != 0 {
-            button("Удалить").style(danger).on_press(DeleteGroup).into()
-        } else {
-            space().into()
-        }
-    }
-}
-
-pub fn split_with_coma(ts: &str) -> Vec<String> {
-    ts.split(',')
-        .map(|ts| ts.to_lowercase().trim().to_string())
-        .filter(|t| !t.is_empty())
-        .collect::<Vec<String>>()
-}
-
-pub fn app_data_dir() -> PathBuf {
-    let mut dir = dirs::data_dir().unwrap();
-    dir.push("jap_learn");
-    if !dir.exists() {
-        fs::create_dir(dir.clone()).unwrap();
-    }
-
-    dir
-}
-
-#[derive(Hash, PartialEq, Eq)]
-struct WordLineState {
-    is_included: bool,
-    key: String,
-    value: String,
-    tags: String,
-    id: u32,
-    index: usize,
-}

src/fs.rs

@@ -0,0 +1,37 @@
+use crate::notification::NotificationData;
+use crate::notification::NotificationData::PermissionDenied;
+use std::fs;
+use std::path::PathBuf;
+
+pub fn app_data_dir() -> PathBuf {
+    let mut dir = dirs::data_dir().expect("Unsupported OS");
+    dir.push("jap_learn");
+    if !dir.exists() {
+        fs::create_dir_all(dir.clone()).expect("Unable to create directory");
+    }
+
+    dir
+}
+
+pub fn db_path() -> PathBuf {
+    app_data_dir().join("data.db")
+}
+pub fn temp_db_path() -> PathBuf {
+    app_data_dir().join("data.db.tmp")
+}
+
+pub fn temp_import_path() -> PathBuf {
+    app_data_dir().join("import")
+}
+
+pub fn db_meta_path() -> PathBuf {
+    app_data_dir().join("data.meta")
+}
+
+pub fn voice_dir() -> Result<PathBuf, NotificationData> {
+    let directory = app_data_dir().join("voice");
+    if !directory.exists() {
+        fs::create_dir_all(directory.clone()).map_err(|_| PermissionDenied)?;
+    }
+    Ok(directory)
+}

src/helpers.rs

@@ -0,0 +1,24 @@
+#[macro_export]
+macro_rules! push_error_task {
+    ($e:expr) => {
+        iced::Task::done(push_error!($e))
+    };
+}
+
+#[macro_export]
+macro_rules! push_error {
+    ($e:expr) => {
+        $crate::navigation::RootMessage::PushNotification(
+            $crate::notification::NotificationRequest::Error($e),
+        )
+    };
+}
+
+#[inline(always)]
+pub fn into_result<R, E>(option: Option<R>, error: E) -> Result<R, E> {
+    if let Some(r) = option {
+        Ok(r)
+    } else {
+        Err(error)
+    }
+}

src/history.rs

@@ -1,106 +0,0 @@
-use crate::data_provider::history::{HistoryItem, get_history_of_set};
-use crate::lang::WordData;
-use crate::navigation::{NavigatedPage, Page};
-use crate::styling::*;
-use crate::{AppState, RootMessage};
-use HistoryMessage::Back;
-use chrono::Local;
-use iced::alignment::Horizontal::Center;
-use iced::widget::space::horizontal;
-use iced::widget::*;
-use iced::{Element, Fill, FillPortion, Task};
-use std::sync::{Arc, Mutex};
-
-#[derive(Clone)]
-pub struct HistoryState {
-    list: Vec<HistoryItem>,
-    words: Vec<WordData>,
-}
-
-impl NavigatedPage<HistoryMessage> for HistoryState {
-    fn navigate(&self, message: &HistoryMessage) -> Option<Page> {
-        match message {
-            Back => Some(Page::PreviousPage),
-        }
-    }
-    fn navigated(&mut self) {
-    }
-    fn update(&mut self, _: HistoryMessage) -> Task<RootMessage> {
-        Task::none()
-    }
-
-    fn view(&self) -> Element<'_, HistoryMessage> {
-        back_overlay(
-            iced::widget::row![
-                horizontal().width(FillPortion(1)),
-                scrollable(self.history_lines().padding(DEFAULT_SPACING))
-                    .height(Fill)
-                    .width(FillPortion(5)),
-                horizontal().width(FillPortion(1))
-            ]
-                .height(Fill)
-                .width(Fill)
-                .into(),
-            Back,
-        )
-    }
-}
-
-impl HistoryState {
-    pub fn new(id: u32, state: Arc<Mutex<AppState>>) -> Self {
-        let state = state.lock().unwrap();
-        let history = get_history_of_set(id);
-        let words = history
-            .iter()
-            .map(|item| {
-                state
-                    .dictionary
-                    .iter()
-                    .find(|w| w.id == item.word_id)
-                    .unwrap()
-                    .clone()
-            })
-            .collect();
-
-        Self {
-            list: history,
-            words,
-        }
-    }
-
-
-
-    fn history_lines(&self) -> Column<'_, HistoryMessage> {
-        let mut column = Column::new();
-        for (item, index) in self.list.iter().zip(0..self.list.len()) {
-            column = column.push(
-                row![
-                    iced::widget::column![
-                        text!("{}", self.words[index].key)
-                            .width(Fill)
-                            .align_x(Center),
-                        text!("{}", self.words[index].value)
-                            .width(Fill)
-                            .align_x(Center),
-                    ]
-                    .align_x(Center),
-                    iced::widget::column![
-                        text!("{} ➞ {}", item.before, item.after),
-                        text!("{}",  item.timestamp.with_timezone(&Local).format("%d.%m %H:%M"))
-                    ]
-                    .spacing(5)
-                    .align_x(Center)
-
-                ]
-                .spacing(5),
-            );
-            column = column.push(rule::horizontal(1));
-        }
-        column.spacing(5)
-    }
-}
-
-#[derive(Clone)]
-pub enum HistoryMessage {
-    Back,
-}

src/lang.rs

@@ -1,633 +0,0 @@
-use crate::data_provider::card_stats::{
-    add_stat_list, delete_stat, load_stats_of_set, update_stat_score,
-};
-use crate::data_provider::history::{push_note, HistoryItem};
-use crate::repetitions::CardSetSettings;
-use crate::AppState;
-use chrono::{DateTime, Utc};
-use rand::distr::weighted::WeightedIndex;
-use rand::distr::Distribution;
-use rand::prelude::SliceRandom;
-use rand::rng;
-use rand::rngs::ThreadRng;
-use serde::{Deserialize, Serialize};
-use std::cmp::min;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-use std::time::Instant;
-
-const MAX_HISTORY_LEN: usize = 20;
-const MAX_HISTORY_LEN_PART: f32 = 0.33;
-const MAX_SCORE: u8 = 25;
-const FADE_PER_DAY: f32 = 0.95;
-#[derive(Clone, Debug)]
-pub struct KanaSet {
-    name: String,
-    pub(crate) chars_type: KanaType,
-    pub(crate) dictionary: Vec<Vec<(String, String)>>,
-    pub(crate) include_map: [bool; 10],
-}
-
-#[derive(Clone, Debug)]
-pub enum KanaType {
-    Hiragana,
-    Katakana,
-}
-
-impl KanaSet {
-    pub fn hiragana() -> Self {
-        Self {
-            name: "Хирагана".to_string(),
-            chars_type: KanaType::Hiragana,
-            dictionary: vec![
-                vec![
-                    (String::from("ぁ"), String::from("a")),
-                    (String::from("ぃ"), String::from("i")),
-                    (String::from("ぅ"), String::from("u")),
-                    (String::from("ぇ"), String::from("e")),
-                    (String::from("ぉ"), String::from("o")),
-                ],
-                vec![
-                    (String::from("さ"), String::from("sa")),
-                    (String::from("し"), String::from("shi")),
-                    (String::from("す"), String::from("su")),
-                    (String::from("せ"), String::from("se")),
-                    (String::from("そ"), String::from("so")),
-                ],
-                vec![
-                    (String::from("か"), String::from("ka")),
-                    (String::from("き"), String::from("ki")),
-                    (String::from("く"), String::from("ku")),
-                    (String::from("け"), String::from("ke")),
-                    (String::from("こ"), String::from("ko")),
-                ],
-                // Ряд «та» (たちつてと)
-                vec![
-                    (String::from("た"), String::from("ta")),
-                    (String::from("ち"), String::from("chi")),
-                    (String::from("つ"), String::from("tsu")),
-                    (String::from("て"), String::from("te")),
-                    (String::from("と"), String::from("to")),
-                ],
-                // Ряд «на» (なにぬねの)
-                vec![
-                    (String::from("な"), String::from("na")),
-                    (String::from("に"), String::from("ni")),
-                    (String::from("ぬ"), String::from("nu")),
-                    (String::from("ね"), String::from("ne")),
-                    (String::from("の"), String::from("no")),
-                ],
-                // Ряд «ха» (はひふへほ)
-                vec![
-                    (String::from("は"), String::from("ha")),
-                    (String::from("ひ"), String::from("hi")),
-                    (String::from("ふ"), String::from("fu")),
-                    (String::from("へ"), String::from("he")),
-                    (String::from("ほ"), String::from("ho")),
-                ],
-                // Ряд «ма» (まみむめも)
-                vec![
-                    (String::from("ま"), String::from("ma")),
-                    (String::from("み"), String::from("mi")),
-                    (String::from("む"), String::from("mu")),
-                    (String::from("め"), String::from("me")),
-                    (String::from("も"), String::from("mo")),
-                ],
-                // Ряд «я» (やゆよ) — только 3 символа
-                vec![
-                    (String::from("や"), String::from("ya")),
-                    (String::from("ゆ"), String::from("yu")),
-                    (String::from("よ"), String::from("yo")),
-                ],
-                // Ряд «ра» (らりるれろ)
-                vec![
-                    (String::from("ら"), String::from("ra")),
-                    (String::from("り"), String::from("ri")),
-                    (String::from("る"), String::from("ru")),
-                    (String::from("れ"), String::from("re")),
-                    (String::from("ろ"), String::from("ro")),
-                ],
-                vec![
-                    (String::from("わ"), String::from("wa")),
-                    (String::from("を"), String::from("wo")),
-                    (String::from("ん"), String::from("n")),
-                ],
-            ],
-            include_map: [true; 10],
-        }
-    }
-
-    pub fn katakana() -> Self {
-        Self {
-            name: "Катакана".to_string(),
-            chars_type: KanaType::Katakana,
-            dictionary: vec![
-                vec![
-                    (String::from("ァ"), String::from("a")),
-                    (String::from("ィ"), String::from("i")),
-                    (String::from("ゥ"), String::from("u")),
-                    (String::from("ェ"), String::from("e")),
-                    (String::from("ォ"), String::from("o")),
-                ],
-                vec![
-                    (String::from("サ"), String::from("sa")),
-                    (String::from("シ"), String::from("shi")),
-                    (String::from("ス"), String::from("su")),
-                    (String::from("セ"), String::from("se")),
-                    (String::from("ソ"), String::from("so")),
-                ],
-                vec![
-                    (String::from("カ"), String::from("ka")),
-                    (String::from("キ"), String::from("ki")),
-                    (String::from("ク"), String::from("ku")),
-                    (String::from("ケ"), String::from("ke")),
-                    (String::from("コ"), String::from("ko")),
-                ],
-                // Ряд «та» (タチツテト)
-                vec![
-                    (String::from("タ"), String::from("ta")),
-                    (String::from("チ"), String::from("chi")),
-                    (String::from("ツ"), String::from("tsu")),
-                    (String::from("テ"), String::from("te")),
-                    (String::from("ト"), String::from("to")),
-                ],
-                // Ряд «на» (ナニヌネノ)
-                vec![
-                    (String::from("ナ"), String::from("na")),
-                    (String::from("ニ"), String::from("ni")),
-                    (String::from("ヌ"), String::from("nu")),
-                    (String::from("ネ"), String::from("ne")),
-                    (String::from("ノ"), String::from("no")),
-                ],
-                // Ряд «ха» (ハヒフヘホ)
-                vec![
-                    (String::from("ハ"), String::from("ha")),
-                    (String::from("ヒ"), String::from("hi")),
-                    (String::from("フ"), String::from("fu")),
-                    (String::from("ヘ"), String::from("he")),
-                    (String::from("ホ"), String::from("ho")),
-                ],
-                // Ряд «ма» (マミムメモ)
-                vec![
-                    (String::from("マ"), String::from("ma")),
-                    (String::from("ミ"), String::from("mi")),
-                    (String::from("ム"), String::from("mu")),
-                    (String::from("メ"), String::from("me")),
-                    (String::from("モ"), String::from("mo")),
-                ],
-                // Ряд «я» (ヤユヨ) — только 3 символа
-                vec![
-                    (String::from("ヤ"), String::from("ya")),
-                    (String::from("ユ"), String::from("yu")),
-                    (String::from("ヨ"), String::from("yo")),
-                ],
-                // Ряд «ра» (ラリルレロ)
-                vec![
-                    (String::from("ラ"), String::from("ra")),
-                    (String::from("リ"), String::from("ri")),
-                    (String::from("ル"), String::from("ru")),
-                    (String::from("レ"), String::from("re")),
-                    (String::from("ロ"), String::from("ro")),
-                ],
-                vec![
-                    (String::from("ワ"), String::from("wa")),
-                    (String::from("ヲ"), String::from("wo")),
-                    (String::from("ン"), String::from("n")),
-                ],
-            ],
-            include_map: [true; 10],
-        }
-    }
-
-    /*    pub fn next(&mut self) -> (String, String) {
-        let current_set = self.list();
-
-        let mut rand = rand::rng();
-        let index: u32 = rand.random();
-        current_set[index as usize % current_set.len()].clone()
-    }*/
-
-    pub fn list(&self) -> Vec<(String, String)> {
-        let mut current_set: Vec<(String, String)> = Vec::new();
-
-        for i in 0..10 {
-            if self.include_map[i] {
-                self.dictionary[i].iter().for_each(|v| {
-                    current_set.push(v.clone());
-                });
-            }
-        }
-
-        current_set
-    }
-}
-
-impl Default for KanaSet {
-    fn default() -> Self {
-        KanaSet::hiragana()
-    }
-}
-impl PartialEq<Self> for KanaSet {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WordData {
-    pub id: u32,
-    pub key: String,
-    pub value: String,
-    pub tags: String,
-    pub additional: HashMap<String, String>,
-    pub group_id: u32,
-}
-
-impl WordData {
-    pub fn new() -> Self {
-        Self {
-            id: 0,
-            key: String::new(),
-            value: String::new(),
-            tags: String::new(),
-            additional: Default::default(),
-            group_id: 1,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct WordGroup {
-    pub id: u32,
-    pub name: String,
-}
-
-#[derive(Clone, PartialEq)]
-pub struct CardStatistics {
-    pub id: u32,
-    pub word_id: u32,
-    pub set_id: u32,
-    pub last_open: DateTime<Utc>,
-    pub score: u8,
-}
-
-impl CardStatistics {
-    pub fn update(&mut self, status: WordOpenMode) {
-        match status {
-            WordOpenMode::Easy => {
-                self.score = (self.calculated_score() + 5.0).round() as u8;
-            }
-            WordOpenMode::Ok => self.score = (self.calculated_score() + 2.0).round() as u8,
-            WordOpenMode::Hard => {
-                self.score = (self.calculated_score() * 0.75).round() as u8;
-            }
-            WordOpenMode::None => {
-                self.score = (self.calculated_score() * 0.4) as u8;
-            }
-        }
-
-        if self.score < 1 {
-            self.score = 1
-        } else if self.score > MAX_SCORE {
-            self.score = MAX_SCORE
-        }
-        self.last_open = Utc::now();
-    }
-
-    pub fn calculated_score(&self) -> f32 {
-        let time = Utc::now() - self.last_open;
-        let days = time.num_days();
-        let multiplier = FADE_PER_DAY.powi(days as i32);
-        (self.score as f32 * multiplier).max(1.0)
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum WordOpenMode {
-    Easy,
-    Ok,
-    Hard,
-    None,
-}
-
-#[derive(Clone)]
-pub struct CardSet {
-    words: Vec<WordData>,
-    set: Vec<CardStatistics>,
-    current_word_index: Option<usize>,
-    state: Arc<Mutex<AppState>>,
-    order_module: OrderModule,
-    settings: CardSetSettings,
-}
-
-impl CardSet {
-    pub fn new(settings: &CardSetSettings, state: Arc<Mutex<AppState>>) -> Self {
-        let state_for = state.clone();
-        let state_locked = state.lock().unwrap();
-
-        let mut current_set = load_stats_of_set(&settings, &state_locked.connection);
-        let last_list = settings.get_word_list(&state_locked);
-        let saved_ids = current_set.iter().map(|l| l.word_id).collect::<Vec<u32>>();
-        let word_ids = last_list.iter().map(|l| l.id).collect::<Vec<u32>>();
-
-        let new_stats: &mut Vec<CardStatistics> = &mut last_list
-            .iter()
-            .filter(|word| !saved_ids.contains(&word.id))
-            .map(|word| CardStatistics {
-                id: 0,
-                word_id: word.id.clone(),
-                last_open: Utc::now(),
-                score: 1,
-                set_id: settings.id.clone(),
-            })
-            .collect();
-
-        let time = Instant::now();
-
-        if !new_stats.is_empty() {
-            add_stat_list(new_stats, &state_locked.connection);
-            current_set.append(new_stats);
-        }
-
-        println!(
-            "Added {} stats: {}",
-            new_stats.len(),
-            time.elapsed().as_millis()
-        );
-        let mut index = 0;
-        for stat in current_set.clone() {
-            if !word_ids.contains(&stat.word_id) {
-                delete_stat(&stat, &state_locked.connection);
-                current_set.remove(index);
-            } else {
-                index += 1;
-            }
-        }
-
-        Self {
-            set: current_set,
-            words: last_list,
-            current_word_index: None,
-            state: state_for,
-            order_module: match settings.open_mode {
-                SetOrderMode::Default => OrderModule::SemiRandomSRS(SemiRandomSRSModule::new()),
-                SetOrderMode::TrainWorstFirst => {
-                    OrderModule::WorstWordsSRS(WorstWordsSRSModule::new())
-                }
-                SetOrderMode::FullRandom => OrderModule::RandomSRS(RandomSRSModule::new()),
-            },
-            settings: settings.clone(),
-        }
-    }
-
-    pub fn next(&mut self) -> (WordData, CardStatistics) {
-        let index = match self.order_module.clone() {
-            OrderModule::SemiRandomSRS(mut module) => {
-                if module.initialized == false {
-                    module.init(self)
-                }
-                let index = module.next(self);
-                self.order_module = OrderModule::SemiRandomSRS(module);
-                index
-            }
-            OrderModule::RandomSRS(mut module) => {
-                if module.initialized == false {
-                    module.init(self)
-                }
-                let index = module.next(self);
-                self.order_module = OrderModule::RandomSRS(module);
-                index
-            }
-            OrderModule::WorstWordsSRS(mut module) => {
-                if module.initialized == false {
-                    module.init(self)
-                }
-                let index = module.next(self);
-                self.order_module = OrderModule::WorstWordsSRS(module);
-                index
-            }
-        };
-
-        self.current_word_index = Some(index);
-        (self.words[index].clone(), self.set[index].clone())
-    }
-
-    pub fn open(&mut self, status: WordOpenMode) {
-        if let None = self.current_word_index {
-            return;
-        }
-        let index = self.current_word_index.unwrap();
-
-        let word = &mut self.set[index];
-        let old_score = word.score;
-        word.update(status);
-        let new_score = word.score;
-
-        match self.order_module.clone() {
-            OrderModule::SemiRandomSRS(mut module) => {
-                module.open(status, index, word.clone());
-                self.order_module = OrderModule::SemiRandomSRS(module);
-            }
-            OrderModule::RandomSRS(mut module) => {
-                module.open(status, index, word.clone());
-                self.order_module = OrderModule::RandomSRS(module);
-            }
-            OrderModule::WorstWordsSRS(mut module) => {
-                module.open(status, index, word.clone());
-                self.order_module = OrderModule::WorstWordsSRS(module);
-            }
-        }
-        update_stat_score(word, &self.state.lock().unwrap().connection);
-        push_note(
-            self.settings.id,
-            HistoryItem {
-                timestamp: Utc::now(),
-                word_id: word.word_id,
-                mode: WordOpenMode::Easy,
-                before: old_score,
-                after: new_score,
-            },
-        )
-    }
-
-    pub fn len(&self) -> usize {
-        self.set.len()
-    }
-}
-
-#[derive(Clone, PartialEq, Copy, Eq)]
-pub enum SetOrderMode {
-    Default,
-    TrainWorstFirst,
-    FullRandom,
-}
-
-#[derive(Clone)]
-enum OrderModule {
-    SemiRandomSRS(SemiRandomSRSModule),
-    RandomSRS(RandomSRSModule),
-    WorstWordsSRS(WorstWordsSRSModule),
-}
-
-trait SRSModule {
-    fn next(&mut self, set: &mut CardSet) -> usize;
-    fn open(&mut self, status: WordOpenMode, index: usize, updated_word: CardStatistics);
-    fn init(&mut self, set: &mut CardSet);
-}
-
-#[derive(Clone)]
-struct RandomSRSModule {
-    basket: Vec<usize>,
-    initialized: bool,
-}
-
-impl RandomSRSModule {
-    fn new() -> RandomSRSModule {
-        Self {
-            basket: vec![],
-            initialized: false,
-        }
-    }
-}
-
-impl SRSModule for RandomSRSModule {
-    fn next(&mut self, set: &mut CardSet) -> usize {
-        if self.basket.is_empty() {
-            self.basket = (0..set.words.len()).collect::<Vec<usize>>();
-            self.basket.shuffle(&mut rand::rng())
-        }
-
-        self.basket.pop().unwrap()
-    }
-
-    fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}
-
-    fn init(&mut self, set: &mut CardSet) {
-        self.initialized = true;
-        self.basket = (0..set.words.len()).collect::<Vec<usize>>();
-        self.basket.shuffle(&mut rand::rng())
-    }
-}
-
-#[derive(Clone)]
-struct SemiRandomSRSModule {
-    history: Vec<usize>,
-    last_weights: WeightedIndex<f32>,
-    generator: ThreadRng,
-    initialized: bool,
-}
-
-impl SemiRandomSRSModule {
-    fn new() -> SemiRandomSRSModule {
-        SemiRandomSRSModule {
-            history: vec![],
-            last_weights: WeightedIndex::new([1.0]).unwrap(),
-            generator: rng(),
-            initialized: false,
-        }
-    }
-}
-
-impl SRSModule for SemiRandomSRSModule {
-    fn next(&mut self, set: &mut CardSet) -> usize {
-        let index = self.last_weights.sample(&mut self.generator);
-
-        if self.history.contains(&index) {
-            return self.next(set);
-        }
-
-        if self.history.len() == self.history_len(set) {
-            self.history.remove(0);
-        }
-        self.history.push(index);
-
-        index
-    }
-
-    fn open(&mut self, _: WordOpenMode, index: usize, word: CardStatistics) {
-        let new_weight = (100.0 / word.calculated_score()).powf(2.0);
-        self.last_weights
-            .update_weights(&[(index, &new_weight)])
-            .unwrap();
-    }
-
-    fn init(&mut self, set: &mut CardSet) {
-        self.initialized = true;
-        let weights = set
-            .set
-            .iter()
-            .map(|s| (100.0 / s.calculated_score()).powf(2.0) * 2.0)
-            .collect::<Vec<f32>>();
-        self.last_weights = WeightedIndex::new(weights).unwrap();
-    }
-}
-
-impl SemiRandomSRSModule {
-    fn history_len(&self, set: &CardSet) -> usize {
-        min(
-            MAX_HISTORY_LEN,
-            (set.len() as f32 * MAX_HISTORY_LEN_PART) as usize,
-        )
-    }
-}
-
-#[derive(Clone)]
-struct WorstWordsSRSModule {
-    initialized: bool,
-    pool_size: usize,
-    rounds_remaining: u8,
-    pool: Vec<usize>,
-    queue: Vec<usize>,
-    rounds_count: u8,
-}
-
-impl SRSModule for WorstWordsSRSModule {
-    fn next(&mut self, set: &mut CardSet) -> usize {
-        if self.rounds_remaining == 0 {
-            self.fill_pool(set);
-            self.rounds_remaining = self.rounds_count;
-        }
-
-        if self.queue.is_empty() {
-            self.queue.append(&mut self.pool.clone());
-            self.rounds_remaining -= 1;
-        }
-
-        self.queue.pop().unwrap()
-    }
-
-    fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}
-
-    fn init(&mut self, _: &mut CardSet) {
-        self.initialized = true;
-    }
-}
-
-impl WorstWordsSRSModule {
-    fn new() -> WorstWordsSRSModule {
-        WorstWordsSRSModule {
-            initialized: false,
-            pool_size: 15,
-            rounds_count: 2,
-            rounds_remaining: 0,
-            pool: vec![],
-            queue: vec![],
-        }
-    }
-
-    fn fill_pool(&mut self, set: &CardSet) {
-        let mut sorted = set
-            .set
-            .clone()
-            .into_iter()
-            .zip(0..set.set.len())
-            .collect::<Vec<_>>();
-        sorted.sort_by_key(|c| c.0.score);
-        let mut worst = sorted[0..self.pool_size]
-            .iter()
-            .map(|(_, index)| *index)
-            .collect::<Vec<usize>>();
-        worst.shuffle(&mut rand::rng());
-        self.pool = worst;
-    }
-}

src/main.rs

@@ -1,121 +1,23 @@
 #![windows_subsystem = "windows"]
+pub mod app;
+mod core;
+mod data;
 mod data_provider;
-mod dictionary;
+mod fs;
-mod dictionary_test;
+pub mod helpers;
-mod history;
+mod navigation;
-mod lang;
+pub mod notification;
-pub mod navigation;
+mod pages;
-mod quiz;
+mod styling;
-mod randomizer;
+pub mod tests;
-mod repetition;
-mod repetitions;
-mod selector;
-pub mod styling;
-mod sync;
-mod word;
-mod writing;
-mod repetition_settings;
-pub mod import;
 
-use crate::data_provider::card_sets::load_sets;
+use crate::app::start;
-use crate::data_provider::settings::get_setting;
-use crate::data_provider::sqlite::default_connection;
-use crate::data_provider::words::{load_word_groups, load_words};
-use crate::lang::{WordData, WordGroup};
-use crate::navigation::{AppSettings, RootMessage, ScreenState};
-use crate::quiz::*;
-use crate::repetitions::CardSetSettings;
-use crate::RootMessage::Keyboard;
-use chrono::NaiveDate;
-use iced::{keyboard, Subscription, Theme};
-use iced::{window, Font};
-use iced_core::window::Position;
-use iced_core::Size;
-use rusqlite::Connection;
-use std::collections::HashMap;
-use iced_core::window::settings::PlatformSpecific;
 use mimalloc::MiMalloc;
 
 #[global_allocator]
 static GLOBAL: MiMalloc = MiMalloc;
 
-const USER_FONT: Font = Font::with_name("Noto Sans JP");
-
 fn main() -> iced::Result {
-    println!("Welcome to JapLearn");
+    env_logger::init();
-    iced::application(ScreenState::boot, ScreenState::update, ScreenState::view).window(window_settings())
+    start()
-        .subscription(subscription)
-        .title("JapLearn")
-        .settings(iced::Settings {
-            default_text_size: iced::Pixels(18.0),
-            ..iced::Settings::default()
-        })
-        .font(include_bytes!("../noto.ttf"))
-        .default_font(USER_FONT)
-        .theme(Theme::GruvboxDark).run()
-}
-
-fn window_settings() -> window::Settings {
-    let mut settings = window::Settings{
-        position: Position::Centered,
-        min_size: Some(Size::new(700.0_f32.into(), 700.0_f32.into())),
-        .. Default::default()
-    };
-
-    #[cfg(target_os = "linux")]
-    {
-        settings.platform_specific =
-            PlatformSpecific {
-                application_id: "JapLearn".to_string(),
-                override_redirect: false
-            };
-    }
-
-    settings
-}
-
-fn subscription(_state: &ScreenState) -> Subscription<RootMessage> {
-    keyboard::listen().map(|e| Keyboard(e))
-}
-
-pub struct AppState {
-    pub dictionary: Vec<WordData>,
-    pub card_sets: Vec<CardSetSettings>,
-    pub word_groups: Vec<WordGroup>,
-    pub connection: Connection,
-    pub sync_data: AppSettings,
-    pub activity: HashMap<u32, Vec<(NaiveDate, u32)>>
-}
-
-impl AppState {
-    pub fn new() -> Self {
-
-
-        Self {
-            dictionary: vec![],
-            card_sets: vec![],
-            word_groups: vec![],
-            connection: default_connection(),
-            sync_data: AppSettings { key: None, auto_web_fetch: false },
-            activity: Default::default(),
-        }
-    }
-}
-
-fn fill_state(state: &mut AppState) {
-    let list = load_words(&state.connection);
-    let sets = load_sets(&state.connection);
-    let groups = load_word_groups(&state.connection);
-    let setting = load_settings(&state.connection);
-
-    state.dictionary = list;
-    state.card_sets = sets;
-    state.word_groups = groups;
-    state.sync_data = setting
-}
-
-fn load_settings(connection: &Connection) -> AppSettings {
-    let key = get_setting("SYNC_KEY".to_string(), connection);
-    let fetch =  get_setting("AUTO_WEB_FETCH".to_string(), connection).unwrap_or("false".to_string()).parse::<bool>().unwrap();
-    AppSettings { key, auto_web_fetch: fetch }
 }

src/navigation.rs

@@ -1,42 +1,47 @@
-use crate::data_provider::history::{get_history_of_set, history_dir};
+use crate::app::{AppState, fill_state};
-use crate::data_provider::sqlite::{create_db, default_connection};
+use crate::data_provider::sqlite::create_db;
-use crate::data_provider::web_api::{get_local_version, get_web_version, load_data, set_local_version};
+use crate::data_provider::web_api::{
-use crate::dictionary::{app_data_dir, DictionaryMessage, DictionaryState};
+    get_local_version, get_web_version, load_data, set_local_version,
-use crate::dictionary_test::{DictionaryQuizMessage, DictionaryQuizState};
+};
-use crate::history::{HistoryMessage, HistoryState};
+use crate::fs::*;
-use crate::message_navigation;
 use crate::navigation::Page::*;
-use crate::navigation::RootMessage::{DataLoaded, Keyboard, UpdateData};
+use crate::navigation::RootMessage::{Keyboard, Notification, PushNotification, UpdateData};
-use crate::quiz::{QuizMessage, QuizState};
+use crate::notification::NotificationData::PermissionDenied;
-use crate::randomizer::{RandomizerMessage, RandomizerState};
+use crate::notification::{
-use crate::repetition::{RepetitionMessage, RepetitionState};
+    NotificationData, NotificationManager, NotificationMessage, NotificationRequest,
-use crate::repetition_settings::{RepetitionSettingsMessage, RepetitionSettingsState};
+};
-use crate::repetitions::{RepetitionsMessage, RepetitionsState};
+use crate::pages::dictionary::{DictionaryMessage, DictionaryState};
-use crate::selector::{SelectorMessage, SelectorState};
+use crate::pages::dictionary_quiz::{DictionaryQuizMessage, DictionaryQuizState};
+use crate::pages::history::{HistoryMessage, HistoryState};
+use crate::pages::import::{ImportMessage, ImportState};
+use crate::pages::quiz::{QuizMessage, QuizState};
+use crate::pages::randomizer::{RandomizerMessage, RandomizerState};
+use crate::pages::repetition::{RepetitionMessage, RepetitionState};
+use crate::pages::repetition_settings::{RepetitionSettingsMessage, RepetitionSettingsState};
+use crate::pages::repetitions::{RepetitionsMessage, RepetitionsState};
+use crate::pages::selector::{SelectorMessage, SelectorState};
+use crate::pages::sync::{SyncMessage, SyncState};
+use crate::pages::word::{WordMessage, WordState};
+use crate::pages::writing::{WritingMessage, WritingState};
 use crate::state_navigate_handle;
 use crate::state_update;
-use crate::sync::{SyncMessage, SyncState};
 use crate::view_navigation;
-use crate::word::{WordMessage, WordState};
+use crate::{message_navigation, push_error, push_error_task};
-use crate::writing::{WritingMessage, WritingState};
-use crate::{AppState, fill_state};
-use chrono::NaiveDate;
 use iced::keyboard::Event;
+use iced::widget::stack;
 use iced::{Element, Task};
-use reqwest::Error;
+use iced_core::Length::Fill;
-use std::collections::HashMap;
+use log::{debug, info};
-use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use crate::import::{ImportMessage, ImportState};
 
 impl Default for ScreenState {
     fn default() -> Self {
         let mut state = AppState::new();
         fill_state(&mut state);
-        let state = Arc::new(Mutex::new(state));
         ScreenState {
             stack: vec![Selector(SelectorState::new(state.clone()))],
             app_state: state.clone(),
+            notification_manager: NotificationManager::new(),
         }
     }
 }
@@ -57,11 +62,13 @@ pub enum RootMessage {
     RepetitionSettings(RepetitionSettingsMessage),
     Import(ImportMessage),
     Keyboard(Event),
-    DataLoaded(HashMap<u32, Vec<(NaiveDate, u32)>>),
+    PushNotification(NotificationRequest),
+    Notification(NotificationMessage),
     None,
     UpdateData,
 }
-
+#[allow(clippy::enum_variant_names)]
+#[allow(clippy::large_enum_variant)]
 pub enum Page {
     Selector(SelectorState),
     Quiz(QuizState),
@@ -81,101 +88,87 @@ pub enum Page {
 
 pub struct ScreenState {
     stack: Vec<Page>,
-    app_state: Arc<Mutex<AppState>>,
+    app_state: AppState,
+    notification_manager: NotificationManager,
 }
 
 impl ScreenState {
     pub fn boot() -> (ScreenState, Task<RootMessage>) {
-        println!("Booting");
+        info!("Booting");
         create_db();
-        println!("Db created");
+        info!("Db created");
         let state = ScreenState::default();
-        let reading_additional_task = Task::perform(Self::load_additional_data(), |data| data);
 
-        let final_task;
+        let mut final_task = Task::none();
-        let state_guard = state.app_state.lock().unwrap();
+        let state_guard = &state.app_state;
-        if state_guard.sync_data.auto_web_fetch {
+        if state_guard.sync_data.read().auto_web_fetch
-            let key = state_guard.sync_data.key.clone().unwrap();
+            && let Some(key) = state_guard.sync_data.read().key.clone()
+        {
             final_task = Task::batch([
-                reading_additional_task,
+                final_task,
-                Task::perform(Self::load_web_backup(key), |result| {
+                Task::perform(Self::load_web_backup(key), |result| match result {
-                    if let Ok(update) = result && update {
+                    Ok(update) => {
-                        UpdateData
+                        if update {
-                    } else {
+                            UpdateData
-                        RootMessage::None
+                        } else {
+                            RootMessage::None
+                        }
                     }
+                    Err(err) => push_error!(err),
                 }),
             ]);
-        } else {
-            final_task = reading_additional_task;
         }
 
-        drop(state_guard);
+        info!("Boot finished");
-        println!("Boot finished");
         (state, final_task)
     }
 
-    async fn load_additional_data() -> RootMessage {
+    async fn load_web_backup(string: String) -> Result<bool, NotificationData> {
-        let directory = history_dir();
+        let local = get_local_version().await?;
-        let mut map = HashMap::new();
-        for file in directory.read_dir().unwrap() {
-            if let Ok(file) = file {
-                let mut vec = vec![];
-                let history_file_name = file.file_name().into_string().unwrap();
-                let id = history_file_name[4..history_file_name.len() - 12]
-                    .parse::<u32>()
-                    .unwrap();
-
-                let history = get_history_of_set(id);
-                let by_date = history.chunk_by(|x, x1| {
-                    x.timestamp.naive_local().date() == x1.timestamp.naive_local().date()
-                });
-                for group in by_date {
-                    vec.push((group[0].timestamp.naive_local().date(), group.len() as u32));
-                }
-                map.insert(id, vec);
-            }
-        }
-        DataLoaded(map)
-    }
-
-    async fn load_web_backup(string: String) -> Result<bool, Error> {
-        let local = get_local_version().await;
         let web = get_web_version(string.as_str()).await?;
+        info!("{} {}", local, web);
         if web > local {
-            println!("Web version is newer than local version");
+            info!("Web version is newer than local version");
-            load_data(string, true).await;
+            load_data(string, true).await?;
-            set_local_version(web).await;
+            set_local_version(web).await?;
-        }else {
+        } else {
             return Ok(false);
         }
         Ok(true)
     }
 
     pub fn update(&mut self, message: RootMessage) -> Task<RootMessage> {
-        println!("Updating");
+        info!("Updating");
         let time = Instant::now();
         if let Keyboard(e) = message {
             return self.handle_keyboard(e);
         }
 
-        if let DataLoaded(data) = message {
+        if let UpdateData = message {
-            self.app_state.lock().unwrap().activity = data;
+            info!("Loading data");
+            let state = &mut self.app_state;
+            if cfg!(windows) {
+                state.connection.lock().finish();
+            }
+            let db_file = db_path();
+            let temp_db_file = temp_db_path();
+            if std::fs::rename(temp_db_file, &db_file).is_err() {
+                return push_error_task!(PermissionDenied);
+            }
+
+            state.connection = Default::default();
+            fill_state(state);
             return Task::none();
         }
 
-        if let UpdateData = message{
+        if let Notification(message) = message {
-            println!("Loading data");
+            return self.notification_manager.update(message);
-            let mut state = self.app_state.lock().unwrap();
-            let path = app_data_dir();
-            let db_file = path.join("data.db");
-            let temp_db_file = path.join("data.db.tmp");
-            std::fs::rename(temp_db_file, &db_file).unwrap();
-
-            state.connection = default_connection();
-            fill_state(&mut state);
-            return Task::none();
         }
+
+        if let PushNotification(notification) = &message {
+            return self.notification_manager.push(notification.clone());
+        }
+
         let task: (Task<RootMessage>, bool) = self.navigate_or_update(message);
 
         if task.1 {
@@ -196,7 +189,7 @@ impl ScreenState {
                 Import
             );
         }
-        println!("Update took {:?}", time.elapsed());
+        debug!("Update took {:?}", time.elapsed());
 
         task.0
     }
@@ -222,7 +215,7 @@ impl ScreenState {
     }
 
     pub fn view(&self) -> Element<'_, RootMessage> {
-        println!("View update");
+        info!("View update");
         let time = Instant::now();
         let view = view_navigation!(
             self.stack,
@@ -241,16 +234,20 @@ impl ScreenState {
             Import
         );
 
-        println!("View took {:?}", time.elapsed());
+        let notifications = self.notification_manager.draw().map(Notification);
-        view
+
+        debug!("View took {:?}", time.elapsed());
+        stack![view, notifications].width(Fill).height(Fill).into()
     }
 
     fn handle_keyboard(&mut self, message: Event) -> Task<RootMessage> {
-        let page = self.stack.last_mut().unwrap();
+        if let Some(page) = self.stack.last_mut() {
-        match page {
+            return match page {
-            Repetition(page) => page.press(&message),
+                Repetition(page) => page.press(&message),
-            _ => Task::none(),
+                _ => Task::none(),
+            };
         }
+        Task::none()
     }
 }
 
@@ -262,7 +259,7 @@ pub struct AppSettings {
 #[macro_export]
 macro_rules! view_navigation {
     ($stack:expr, $($e:ident), *) => {
-        match &$stack.last().unwrap() {
+        match &$stack.last().expect("Unexpected stack state") {
             $(
             $e(s) => s.view().map(RootMessage::$e),
             )*
@@ -270,14 +267,13 @@ macro_rules! view_navigation {
         }
     }
 }
-
 #[macro_export]
 macro_rules! state_update {
     ($message:expr, $stack:expr, $($e:ident), *) => {
         match $message {
             $(
             RootMessage::$e(msg) => {
-                if let $e(s) = $stack.last_mut().unwrap() {
+                if let $e(s) = $stack.last_mut().expect("Unexpected stack state") {
                     message_navigation!(msg, $stack, s)
                 }
                 else {
@@ -289,13 +285,15 @@ macro_rules! state_update {
         }
     }
 }
-
 #[macro_export]
 macro_rules! message_navigation {
     ($msg:expr, $stack:expr, $state:expr) => {
         if let Some(new_page) = $state.navigate(&$msg) {
             if let Page::PreviousPage = new_page {
-                $stack.pop();
+                if $stack.len() > 1 {
+                    $stack.pop();
+                }
+
                 return (Task::<RootMessage>::none(), true);
             } else {
                 $stack.push(new_page);
@@ -307,11 +305,10 @@ macro_rules! message_navigation {
         }
     };
 }
-
 #[macro_export]
 macro_rules! state_navigate_handle {
     ($stack:expr, $($e:ident), *) => {
-        match $stack.last_mut().unwrap() {
+        match $stack.last_mut().expect("Unexpected stack state") {
             $(
             Page::$e(page) => {
                 page.navigated();
@@ -321,14 +318,12 @@ macro_rules! state_navigate_handle {
         }
     }
 }
-
 pub trait NavigatedPage<T> {
-    fn navigate(&self, message: &T) -> Option<Page>;
+    fn navigate(&mut self, message: &T) -> Option<Page>;
     fn navigated(&mut self);
     fn update(&mut self, message: T) -> Task<RootMessage>;
     fn view(&self) -> Element<'_, T>;
 }
-
 pub trait KeyPressedPage {
     fn press(&mut self, message: &Event) -> Task<RootMessage>;
 }

src/notification.rs

@@ -0,0 +1,198 @@
+use crate::navigation::RootMessage;
+use crate::styling::{BUTTON_RADIUS, HALF_SPACING};
+use chrono::Utc;
+use iced::widget::container::Style;
+use iced::widget::{Column, container, row, scrollable, text};
+use iced::{Element, Task};
+use iced_core::Alignment::Center;
+use iced_core::Background::Color;
+use iced_core::Border;
+use iced_core::Length::Fill;
+use iced_core::alignment::Horizontal::Right;
+use iced_core::alignment::Vertical;
+
+pub struct NotificationManager {
+    list: Vec<(u32, NotificationRequest, u32)>,
+    notification_lifetime: u32,
+    next_id: u32,
+}
+
+#[derive(Clone)]
+pub enum NotificationMessage {
+    Remove(u32),
+}
+
+impl Default for NotificationManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl NotificationManager {
+    pub fn new() -> Self {
+        Self {
+            list: Vec::new(),
+            notification_lifetime: 10,
+            next_id: 1,
+        }
+    }
+
+    pub fn draw(&self) -> Element<'_, NotificationMessage> {
+        let mut column = Column::new().spacing(HALF_SPACING);
+
+        for (id, notif, time) in &self.list {
+            column = column.push(Self::draw_notif(id, notif, time));
+        }
+
+        container(scrollable(column))
+            .width(Fill)
+            .height(Fill)
+            .align_x(Right)
+            .align_y(Vertical::Top)
+            .padding(HALF_SPACING)
+            .into()
+    }
+
+    pub fn push(&mut self, notification: NotificationRequest) -> Task<RootMessage> {
+        let id = self.next_id;
+        self.list.push((
+            id,
+            notification,
+            Utc::now().timestamp() as u32 + self.notification_lifetime,
+        ));
+        self.next_id += 1;
+        let message = NotificationMessage::Remove(id);
+        let time = self.notification_lifetime;
+        Task::perform(
+            async move {
+                tokio::time::sleep(core::time::Duration::from_secs(time as u64)).await;
+            },
+            |_| RootMessage::Notification(message),
+        )
+    }
+
+    pub fn update(&mut self, message: NotificationMessage) -> Task<RootMessage> {
+        match message {
+            NotificationMessage::Remove(id) => {
+                if let Some(index) = self.list.iter().position(|item| item.0 == id) {
+                    self.list.remove(index);
+                }
+            }
+        }
+        Task::none()
+    }
+
+    fn draw_notif<'a>(
+        id: &u32,
+        notif: &NotificationRequest,
+        _time: &u32,
+    ) -> Element<'a, NotificationMessage> {
+        let color_id;
+        let content = match notif {
+            NotificationRequest::Info(data) => {
+                color_id = 1;
+                Self::draw_data(data)
+            }
+            NotificationRequest::Warning(data) => {
+                color_id = 2;
+                Self::draw_data(data)
+            }
+            NotificationRequest::Error(data) => {
+                color_id = 3;
+                Self::draw_data(data)
+            }
+        };
+
+        let container = container(
+            row![
+                content,
+                iced::widget::button("✕")
+                    .on_press(NotificationMessage::Remove(*id))
+                    .style(iced::widget::button::text)
+            ]
+            .align_y(Center)
+            .width(300)
+            .padding(HALF_SPACING),
+        );
+        container
+            .style(move |theme| {
+                let color = match color_id {
+                    1 => theme.palette().success,
+                    2 => theme.palette().warning,
+                    3 => theme.palette().danger,
+                    _ => theme.palette().warning,
+                };
+                Style {
+                    text_color: None,
+                    background: Some(Color(color.scale_alpha(0.3))),
+                    border: Border::default()
+                        .width(1)
+                        .color(color)
+                        .rounded(BUTTON_RADIUS),
+                    shadow: Default::default(),
+                    snap: false,
+                }
+            })
+            .into()
+    }
+
+    fn draw_data<'a>(data: &NotificationData) -> Element<'a, NotificationMessage> {
+        match data {
+            NotificationData::DataLoaded => {
+                text!("Данные успешно загружены на сервер")
+            }
+            NotificationData::ImportError => {
+                text!("Ошибка при импорте данных из Anki")
+            }
+            NotificationData::IncorrectAnkiFile => {
+                text!("Неподдерживаемый формат файла .apkg")
+            }
+            NotificationData::OpenFileError => {
+                text!("Ошибка открытия файла пакета")
+            }
+            NotificationData::VoiceVoxUnavailable => {
+                text!("Не получается подключиться к VoiceVox")
+            }
+            NotificationData::PermissionDenied => {
+                text!("У приложение недостаточно прав для доступа в файлам")
+            }
+            NotificationData::WebApiUnavailable => {
+                text!("Не получается подключиться к Api")
+            }
+            NotificationData::DbSaveError => {
+                text!("Не получается сохранить данные")
+            }
+            NotificationData::DbLoadError => {
+                text!("Не получается загрузить данные")
+            }
+            NotificationData::CompressError => {
+                text!("Ошибка сжатия или распаковки данных")
+            }
+        }
+        .width(Fill)
+        .into()
+    }
+}
+
+#[derive(Clone)]
+pub enum NotificationRequest {
+    Info(NotificationData),
+    Warning(NotificationData),
+    Error(NotificationData),
+}
+
+#[derive(Clone, Debug)]
+pub enum NotificationData {
+    PermissionDenied,
+    DataLoaded,
+    ImportError,
+    IncorrectAnkiFile,
+    OpenFileError,
+    VoiceVoxUnavailable,
+    WebApiUnavailable,
+    DbSaveError,
+    DbLoadError,
+    CompressError,
+}
+
+pub type MaybeError = Result<(), NotificationData>;

src/pages.rs

@@ -0,0 +1,13 @@
+pub mod dictionary;
+pub mod dictionary_quiz;
+pub mod history;
+pub mod import;
+pub mod quiz;
+pub mod randomizer;
+pub mod repetition;
+pub mod repetition_settings;
+pub mod repetitions;
+pub mod selector;
+pub mod sync;
+pub mod word;
+pub mod writing;

src/pages/dictionary.rs

@@ -0,0 +1,643 @@
+use crate::app::AppState;
+use crate::data::Id;
+use crate::data::entities::{EntityHandle, WordData, WordGroup};
+use crate::data::repositories::{Query, Repository};
+use crate::data_provider::word_groups::{WordGroupDataLayer, WordGroupRepositoryInner};
+use crate::data_provider::words::WordDataLayer;
+use crate::data_provider::words::WordRepositoryInner;
+use crate::navigation::Page::{Import, Word};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::pages::dictionary::DictionaryMessage::*;
+use crate::pages::dictionary_quiz::DictionaryQuizState;
+use crate::pages::import::ImportState;
+use crate::pages::word::WordState;
+use crate::push_error_task;
+use crate::styling::*;
+use crate::{jl_button, push_error};
+use chrono::{DateTime, TimeDelta, Utc};
+use hashbrown::{HashMap, HashSet};
+use iced::alignment::Vertical::Center;
+use iced::widget::button::Style;
+use iced::widget::button::{danger, text};
+use iced::widget::space::horizontal;
+use iced::widget::text_input::default;
+use iced::widget::*;
+use iced::{Border, Color, Shadow, Task};
+use iced_core::Length::Fill;
+use log::info;
+use rand::random_range;
+use std::ops::Add;
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+
+pub struct DictionaryState {
+    state: AppState,
+    included: HashSet<EntityHandle<WordData>>,
+    tag_map: HashMap<String, bool>,
+    words_tags: Vec<(EntityHandle<WordData>, Vec<String>)>,
+    reverse: bool,
+    search: String,
+    no_typing: bool,
+    selected_group: EntityHandle<WordGroup>,
+    reverse_list: bool,
+    auto_save_queue: HashMap<EntityHandle<WordData>, DateTime<Utc>>,
+    displayed_words_query: Query<WordData, WordRepositoryInner, WordDataLayer>,
+    groups_query: Query<WordGroup, WordGroupRepositoryInner, WordGroupDataLayer>,
+}
+
+#[derive(Clone)]
+pub enum DictionaryMessage {
+    Back,
+    SetTags(EntityHandle<WordData>, String),
+    SetKey(EntityHandle<WordData>, String),
+    SetValue(EntityHandle<WordData>, String),
+    WordAction(EntityHandle<WordData>),
+    NewWord,
+    Include(EntityHandle<WordData>, bool),
+    IncludeTag(String, bool),
+    GotoTest,
+    ResetTags,
+    SetReverse(bool),
+    Search(String),
+    SetTyping(bool),
+    CreateGroup,
+    EditGroup(String),
+    SaveGroup,
+    SelectGroup(EntityHandle<WordGroup>),
+    DeleteGroup,
+    ChangeDirection,
+    TrySave(EntityHandle<WordData>),
+    GotoImport,
+}
+
+impl NavigatedPage<DictionaryMessage> for DictionaryState {
+    fn navigate(&mut self, message: &DictionaryMessage) -> Option<Page> {
+        if let Back = message {
+            return Some(Page::PreviousPage);
+        }
+        if let GotoTest = message
+            && !self.included.is_empty()
+        {
+            let mut words = vec![];
+            let dict = &self.state.dictionary.read();
+
+            let query = dict.query(Arc::new(|_| true));
+            let handles = query.handles();
+            words = handles.filter(|h| self.included.contains(h)).collect();
+
+            return Some(Page::DictionaryQuiz(DictionaryQuizState::new(
+                words,
+                self.reverse,
+                self.no_typing,
+                self.state.clone(),
+            )));
+        }
+        if let WordAction(handle) = message
+            && handle.real()
+        {
+            return Some(Word(WordState::new(*handle, self.state.clone())));
+        }
+        if let GotoImport = message {
+            return Some(Import(ImportState::new(self.state.clone())));
+        }
+        None
+    }
+
+    fn navigated(&mut self) {
+        self.included = Default::default();
+        self.tag_map = Default::default();
+        let groups = self.state.word_groups.read();
+        self.groups_query.load(&groups);
+        drop(groups);
+        self.update_tags();
+    }
+
+    fn update(&mut self, message: DictionaryMessage) -> Task<RootMessage> {
+        match message {
+            NewWord => {
+                let mut dictionary = self.state.dictionary.write();
+                let mut word = WordData::new();
+                word.group_id = self.selected_group.id;
+                dictionary.create(word);
+                self.displayed_words_query.load(&dictionary);
+            }
+
+            SetKey(handle, v) => {
+                let mut dictionary = self.state.dictionary.write();
+                dictionary.get_mut_static(handle).unwrap().key = v;
+                drop(dictionary);
+                return self.launch_auto_save_offset(handle);
+            }
+            SetValue(handle, v) => {
+                let mut dictionary = self.state.dictionary.write();
+                dictionary.get_mut_static(handle).unwrap().value = v;
+                drop(dictionary);
+                return self.launch_auto_save_offset(handle);
+            }
+            SetTags(i, mut v) => {
+                {
+                    let mut dictionary = self.state.dictionary.write();
+
+                    let word = dictionary.get_mut_static(i).unwrap();
+                    let current_tags_value = word.tags.clone();
+
+                    if v.ends_with(", ") && v.len() < current_tags_value.len() {
+                        v = v[..v.len() - 2].to_string()
+                    }
+
+                    while let Some(index) = v.find(",,") {
+                        v.remove(index);
+                    }
+
+                    word.tags = v;
+                }
+
+                self.update_tags();
+                return self.launch_auto_save_offset(i);
+            }
+
+            WordAction(i) => {
+                let mut dictionary = self.state.dictionary.write();
+
+                if let Err(err) = dictionary.delete(i) {
+                    return push_error_task!(err);
+                }
+
+                self.displayed_words_query.load(&dictionary);
+            }
+            Include(i, b) => {
+                if b {
+                    self.included.insert(i);
+                } else {
+                    self.included.remove(&i);
+                }
+            }
+            IncludeTag(t, v) => {
+                self.tag_map.insert(t, v);
+                self.update_words_include(self.selected_group.id)
+            }
+
+            ResetTags => {
+                self.tag_map.iter_mut().for_each(|(_, v)| *v = false);
+                self.included.clear();
+            }
+            SetReverse(v) => self.reverse = v,
+            Search(s) => {
+                self.search = s;
+            }
+            SetTyping(b) => self.no_typing = b,
+            Back => {}
+            GotoTest => {}
+            CreateGroup => {
+                let mut groups = self.state.word_groups.write();
+                groups.create(WordGroup {
+                    id: 0.into(),
+                    name: format!("Группа слов {}", random_range(100..1000)),
+                });
+                self.groups_query.load(&groups);
+            }
+            EditGroup(new) => {
+                let mut groups = self.state.word_groups.write();
+
+                let group = groups.get_mut(&mut self.selected_group);
+                if let Some(group) = group {
+                    group.name = new;
+                }
+            }
+            SaveGroup => {
+                {
+                    let mut groups = self.state.word_groups.write();
+
+                    if let Err(err) = groups.save(&mut self.selected_group) {
+                        return push_error_task!(err);
+                    }
+
+                    self.groups_query.load(&groups);
+                }
+
+                self.setup_words_query();
+            }
+            SelectGroup(i) => {
+                self.selected_group = i;
+                self.setup_words_query();
+                self.update_words_include(i.id)
+            }
+            DeleteGroup => {
+                if self.selected_group.id.0 == 1 {
+                    return Task::none();
+                }
+                {
+                    let delete_group = self.selected_group;
+                    self.selected_group = EntityHandle::from_id(1.into());
+                    self.setup_words_query();
+                    let mut groups = self.state.word_groups.write();
+
+                    if let Err(err) = groups.delete(delete_group) {
+                        return push_error_task!(err);
+                    }
+
+                    if let Err(err) = self.state.dictionary.write().reload() {
+                        return push_error_task!(err);
+                    }
+                    self.groups_query.load(&groups);
+                }
+
+                self.update_tags()
+            }
+            ChangeDirection => {
+                self.reverse_list = !self.reverse_list;
+            }
+            TrySave(mut handle) => {
+                let now = Utc::now();
+                if !self.auto_save_queue.contains_key(&handle) {
+                    return Task::none();
+                }
+                if self.auto_save_queue[&handle] <= now {
+                    self.auto_save_queue.remove(&handle);
+
+                    let mut dictionary = self.state.dictionary.write();
+
+                    let reload_query = !handle.real();
+                    let _ = dictionary.save(&mut handle);
+                    if reload_query {
+                        self.displayed_words_query.load(&dictionary);
+                    }
+                    return Task::none();
+                }
+            }
+            GotoImport => {}
+        }
+
+        Task::none()
+    }
+
+    fn view(&self) -> iced::Element<'_, DictionaryMessage> {
+        back_overlay(
+            row![
+                iced::widget::column![
+                    self.groups_panel(),
+                    row![horizontal().width(8), self.words_list(),],
+                    row![
+                        self.add_word_button(),
+                        horizontal().width(Fill),
+                        button("Импорт").style(text).on_press(GotoImport),
+                    ]
+                ]
+                .spacing(5),
+                self.filters(),
+            ]
+            .spacing(DEFAULT_SPACING)
+            .into(),
+            Back,
+        )
+    }
+}
+
+impl DictionaryState {
+    pub fn new(state: AppState) -> Self {
+        let words_query = state.dictionary.read().empty_query_par();
+        let groups_query = state.word_groups.read().query(Arc::new(|_| true));
+        let mut result = DictionaryState {
+            included: Default::default(),
+            selected_group: EntityHandle::new(Id(1), 0, true),
+            state,
+            tag_map: HashMap::new(),
+            words_tags: vec![],
+            reverse: false,
+            search: "".to_string(),
+            no_typing: true,
+            reverse_list: true,
+            auto_save_queue: HashMap::new(),
+            displayed_words_query: words_query,
+            groups_query,
+        };
+
+        result.init();
+        result.update_tags();
+
+        result
+    }
+
+    fn init(&mut self) {
+        self.displayed_words_query = self
+            .state
+            .dictionary
+            .read()
+            .query(Arc::new(|word| word.group_id == Id(1)));
+    }
+
+    fn setup_words_query(&mut self) {
+        let id = self.selected_group.id;
+        self.displayed_words_query = self
+            .state
+            .dictionary
+            .read()
+            .query(Arc::new(move |word| word.group_id == id));
+    }
+
+    fn launch_auto_save_offset(&mut self, handle: EntityHandle<WordData>) -> Task<RootMessage> {
+        let save_time = Utc::now().add(TimeDelta::milliseconds(900));
+        self.auto_save_queue.insert(handle, save_time);
+        let message = RootMessage::Dictionary(TrySave(handle));
+        Task::perform(
+            async { tokio::time::sleep(Duration::from_secs(1)).await },
+            |_| message,
+        )
+    }
+
+    fn words_list(&self) -> iced::Element<'_, DictionaryMessage> {
+        let time = Instant::now();
+        let mut col = Column::new().width(Fill);
+
+        let query = &self.displayed_words_query;
+        let dictionary = self.state.dictionary.read();
+
+        for access_index in 0..query.len() {
+            let mut i = access_index;
+            if self.reverse_list {
+                i = query.len() - access_index - 1;
+            }
+            let word_handle = &query[i];
+            let word = dictionary.get_ref_static(*word_handle).unwrap();
+
+            if !self.search.is_empty()
+                && !word.key.contains(&self.search)
+                && !word.value.contains(&self.search)
+                && !word.tags.contains(&self.search)
+            {
+                continue;
+            }
+
+            let word_line_data = WordLineState {
+                is_included: self.included.contains(word_handle),
+                key: word.key.clone().into(),
+                value: word.value.clone().into(),
+                tags: word.tags.clone().into(),
+                handle: *word_handle,
+            };
+
+            let lazy_line = lazy(word_line_data, Self::word_line);
+
+            col = col.push(lazy_line);
+        }
+
+        info!("Words rendering time: {:?}", time.elapsed());
+        scrollable(col).height(Fill).into()
+    }
+
+    fn word_line<'a>(data: &WordLineState) -> Row<'a, DictionaryMessage> {
+        let mut line = Row::new().width(Fill).align_y(Center);
+        let handle = data.handle;
+        line = line.push(
+            checkbox(data.is_included)
+                .label("")
+                .spacing(15)
+                .on_toggle(move |b| Include(handle, b)),
+        );
+
+        line = line.push(
+            text_input("Слово", &data.key)
+                .size(ACCENT_FONT_SIZE)
+                .width(Fill)
+                .on_input(move |string| SetKey(handle, string))
+                .style(|x, status| {
+                    let mut default_style = default(x, status);
+                    default_style.border.radius = 0.0.into();
+                    default_style
+                }),
+        );
+        line = line.push(
+            text_input("Перевод", &data.value)
+                .size(ACCENT_FONT_SIZE)
+                .width(Fill)
+                .on_input(move |string| SetValue(handle, string))
+                .style(|x, status| {
+                    let mut default_style = default(x, status);
+                    default_style.border.radius = 0.0.into();
+                    default_style
+                }),
+        );
+
+        line = line.push(
+            text_input("Теги", data.tags.as_ref())
+                .size(ACCENT_FONT_SIZE)
+                .width(Fill)
+                .on_input(move |string| SetTags(handle, string))
+                .style(|x, status| {
+                    let mut default_style = default(x, status);
+                    default_style.border.radius = 0.0.into();
+                    default_style
+                }),
+        );
+
+        let line_button = || {
+            if !data.handle.real() {
+                return button("-")
+                    .on_press(WordAction(data.handle))
+                    .style(|_x: &Theme, _status: button::Status| Style {
+                        background: None,
+                        text_color: Color::BLACK,
+                        border: Border::default(),
+                        shadow: Shadow::default(),
+                        snap: false,
+                    })
+                    .width(15);
+            }
+
+            button("")
+                .on_press(WordAction(data.handle))
+                .style(button::primary)
+                .width(15)
+        };
+        line.push(line_button()).push(space().width(10))
+    }
+
+    fn filters(&self) -> iced::Element<'_, DictionaryMessage> {
+        let dict = &self.state.dictionary.read();
+
+        iced::widget::column![
+            text_input("Поиск", &self.search)
+                .on_input(Search)
+                .width(Fill),
+            text!("Всего слов: {}", dict.len()),
+            text!("Выбрано слов: {}", self.included.iter().count()),
+            self.tags_selector(),
+            toggler(self.no_typing)
+                .label("Без набора")
+                .on_toggle(SetTyping),
+            toggler(self.reverse)
+                .label("Обратный тест")
+                .on_toggle(SetReverse),
+            button(text!("Тест").center().width(Fill))
+                .style(cta_button)
+                .on_press(GotoTest)
+                .width(Fill),
+        ]
+        .width(250)
+        .spacing(DEFAULT_SPACING)
+        .into()
+    }
+
+    fn tags_selector(&self) -> iced::Element<'_, DictionaryMessage> {
+        let mut col = Column::new().width(Fill);
+        col = col.push(
+            button("Сбросить")
+                .on_press(ResetTags)
+                .style(|x: &Theme, _status| Style {
+                    background: None,
+                    text_color: x.palette().primary,
+                    border: Border::default(),
+                    shadow: Shadow::default(),
+                    snap: false,
+                }),
+        );
+        let mut sorted_tags = self.tag_map.iter().collect::<Vec<_>>();
+        sorted_tags.sort();
+        for tag in sorted_tags {
+            col = col.push(
+                checkbox(*tag.1)
+                    .label(tag.0)
+                    .on_toggle(|x1| IncludeTag(tag.0.clone(), x1)),
+            )
+        }
+
+        container(scrollable(col)).height(Fill).into()
+    }
+
+    fn update_tags(&mut self) {
+        self.words_tags.clear();
+        let mut tags_list: HashSet<String> = HashSet::new();
+        let dict = &self.state.dictionary.write();
+        let mut words_query = dict.full_query();
+        let handles = words_query.handles().collect::<Vec<_>>();
+        words_query
+            .iter(dict)
+            .zip(handles)
+            .for_each(|(element, handle)| {
+                let tags = split_with_coma(element.tags.as_str());
+                tags.iter().for_each(|tag| {
+                    tags_list.insert(tag.clone());
+                });
+                self.words_tags.push((handle, tags))
+            });
+
+        let current_tags = self
+            .tag_map
+            .keys()
+            .map(|k| k.clone().to_string())
+            .collect::<Vec<String>>();
+
+        current_tags
+            .iter()
+            .filter(|tag| !tags_list.contains(*tag))
+            .for_each(|tag| {
+                self.tag_map.remove(tag);
+            });
+
+        tags_list.iter().for_each(|tag| {
+            self.tag_map.insert(tag.clone(), false);
+        });
+    }
+
+    fn update_words_include(&mut self, group_id: Id) {
+        let include_tags = self
+            .tag_map
+            .iter()
+            .filter(|(_, value)| **value)
+            .map(|(t, _)| t.clone())
+            .collect::<Vec<String>>();
+
+        if include_tags.is_empty() {
+            self.included.clear();
+            return;
+        }
+
+        let dict = &self.state.dictionary.read();
+        let time = Instant::now();
+
+        self.included.clear();
+        for (handle, tags) in &mut self.words_tags {
+            if let Some(word) = dict.get_ref(handle) {
+                if word.group_id != group_id {
+                    continue;
+                }
+
+                if !tags.is_empty() && tags.iter().all(|t| include_tags.contains(t)) {
+                    self.included.insert(*handle);
+                }
+            } else {
+                continue;
+            }
+        }
+
+        info!("Time {}", time.elapsed().as_micros());
+    }
+
+    fn groups_panel(&self) -> iced::Element<'_, DictionaryMessage> {
+        let mut row = Row::new();
+        row = row.push(button("+").style(text).on_press(CreateGroup));
+
+        let groups = &self.state.word_groups.read();
+
+        for mut group in self.groups_query.handles() {
+            let group_name = groups.get(&mut group).unwrap().name.clone();
+            row = row.push(
+                button(text!("{}", group_name))
+                    .style(text)
+                    .on_press(SelectGroup(group)),
+            );
+        }
+
+        let groups = self.state.word_groups.read();
+        let group = groups.get_static(self.selected_group).unwrap();
+
+        iced::widget::column![
+            scrollable(row).width(Fill).horizontal(),
+            row![
+                jl_button!("⇳").on_press(ChangeDirection),
+                text_input("Название группы слов", &group.name)
+                    .on_input(EditGroup)
+                    .width(250)
+                    .on_submit(SaveGroup),
+                horizontal(),
+                self.group_delete_button(),
+            ]
+            .spacing(DEFAULT_SPACING / 2.0)
+        ]
+        .into()
+    }
+
+    fn group_delete_button(&self) -> iced::Element<'_, DictionaryMessage> {
+        if self.selected_group.real() && self.selected_group.id != 1.into() {
+            button("Удалить").style(danger).on_press(DeleteGroup).into()
+        } else {
+            space().into()
+        }
+    }
+
+    fn add_word_button(&self) -> iced::Element<'_, DictionaryMessage> {
+        let button = jl_button!("Добавить слово");
+
+        if self.selected_group.real() {
+            return button.on_press(NewWord).into();
+        }
+
+        button.into()
+    }
+}
+
+pub fn split_with_coma(ts: &str) -> Vec<String> {
+    ts.split(',')
+        .map(|ts| ts.to_lowercase().trim().to_string())
+        .filter(|t| !t.is_empty())
+        .collect::<Vec<String>>()
+}
+
+#[derive(Clone, Hash, PartialEq, Eq)]
+struct WordLineState {
+    is_included: bool,
+    key: Box<str>,
+    value: Box<str>,
+    tags: Box<str>,
+    handle: EntityHandle<WordData>,
+}

src/pages/dictionary_quiz.rs

@@ -1,22 +1,25 @@
-use crate::dictionary::split_with_coma;
+use crate::app::AppState;
-use crate::dictionary_test::DictionaryQuizMessage::*;
+use crate::data::entities::{EntityHandle, WordData};
-use crate::lang::WordData;
+use crate::data::repositories::Repository;
+use crate::jl_button;
 use crate::navigation::Page::PreviousPage;
+use crate::navigation::RootMessage;
 use crate::navigation::*;
-use crate::quiz::Score;
+use crate::pages::dictionary::split_with_coma;
+use crate::pages::dictionary_quiz::DictionaryQuizMessage::*;
+use crate::pages::quiz::Score;
 use crate::styling::*;
-use crate::RootMessage;
 use iced::border::Radius;
 use iced::widget::container::Style;
-use iced::widget::{button, container, row, space, text, text_input, Row};
+use iced::widget::{container, row, space, text, text_input, Row};
 use iced::Background::Color;
 use iced::{alignment, Border, Element, Fill, Task, Theme};
 use rand::prelude::SliceRandom;
 
-#[derive(Debug, Clone)]
 pub struct DictionaryQuizState {
-    words: Vec<WordData>,
+    state: AppState,
-    current_set: Vec<WordData>,
+    words: Vec<EntityHandle<WordData>>,
+    current_set: Vec<EntityHandle<WordData>>,
     answer: String,
     view: String,
     correct: String,
@@ -35,15 +38,14 @@ pub enum DictionaryQuizMessage {
 }
 
 impl NavigatedPage<DictionaryQuizMessage> for DictionaryQuizState {
-    fn navigate(&self, message: &DictionaryQuizMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &DictionaryQuizMessage) -> Option<Page> {
         match message {
             Back => Some(PreviousPage),
             _ => None,
         }
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
 
     fn update(&mut self, message: DictionaryQuizMessage) -> Task<RootMessage> {
         match message {
@@ -89,24 +91,27 @@ impl NavigatedPage<DictionaryQuizMessage> for DictionaryQuizState {
                         .size(25),
                 ]
                 .spacing(DEFAULT_SPACING),
-                row![
+                row![jl_button!("Закончить").on_press(Back), self.appeal_button()]
-                    button("Закончить").style(jl_button).on_press(Back),
+                    .spacing(DEFAULT_SPACING),
-                    self.appeal_button()
-                ]
-                .spacing(DEFAULT_SPACING),
             ]
-                .spacing(DEFAULT_SPACING)
+            .spacing(DEFAULT_SPACING)
-                .align_x(alignment::Horizontal::Center),
+            .align_x(alignment::Horizontal::Center),
         )
-            .center_y(Fill)
+        .center_y(Fill)
-            .center_x(Fill)
+        .center_x(Fill)
-            .into()
+        .into()
     }
 }
 
 impl DictionaryQuizState {
-    pub fn new(words: Vec<WordData>, reverse: bool, no_typing: bool) -> DictionaryQuizState {
+    pub fn new(
-        DictionaryQuizState {
+        words: Vec<EntityHandle<WordData>>,
+        reverse: bool,
+        no_typing: bool,
+        state: AppState,
+    ) -> DictionaryQuizState {
+        Self {
+            state,
             words,
             current_set: Vec::new(),
             answer: "".to_string(),
@@ -120,7 +125,6 @@ impl DictionaryQuizState {
         }
     }
 
-    
     fn submit(&mut self) {
         if self.view == "---" {
             self.show_next();
@@ -148,10 +152,11 @@ impl DictionaryQuizState {
         if !self.is_help {
             self.score.total += 1;
         }
-        if self.answer == self.correct
+        if self.answer.to_lowercase() == self.correct.to_lowercase()
-            || split_with_coma(self.correct.as_str()).contains(&self.answer)
+            || split_with_coma(self.correct.to_lowercase().as_str())
+                .contains(&self.answer.to_lowercase())
         {
-            if self.is_help == false {
+            if !self.is_help {
                 self.score.correct += 1;
             }
             self.show_next()
@@ -173,17 +178,22 @@ impl DictionaryQuizState {
         self.is_help = false;
         self.answer = String::new();
 
-        if self.current_set.is_empty() {
+        let next: EntityHandle<WordData> = match self.current_set.pop() {
-            self.update_set();
+            Some(word) => word,
-        }
+            None => {
+                self.update_set();
+                self.current_set.pop().expect("Empty set")
+            }
+        };
 
-        let next = self.current_set.pop().unwrap();
+        let repo = self.state.dictionary.read();
+        let next = repo.get_static(next).unwrap();
         if self.reverse {
-            self.view = next.value.clone();
+            self.view = next.value;
-            self.correct = next.key.clone();
+            self.correct = next.key;
         } else {
-            self.view = next.key.clone();
+            self.view = next.key;
-            self.correct = next.value.clone();
+            self.correct = next.value;
         }
     }
 
@@ -208,8 +218,8 @@ impl DictionaryQuizState {
     }
 
     fn appeal_button(&self) -> Element<'_, DictionaryQuizMessage> {
-        if self.is_help && self.no_typing == false {
+        if self.is_help && !self.no_typing {
-            return button("Апелляция").style(jl_button).on_press(Appeal).into();
+            return jl_button!("Апелляция").on_press(Appeal).into();
         }
         space().into()
     }

src/pages/history.rs

@@ -0,0 +1,107 @@
+use crate::app::AppState;
+use crate::data::entities::{HistoryNote, WordData};
+use crate::data::repositories::Repository;
+use crate::navigation::*;
+use crate::styling::*;
+use HistoryMessage::Back;
+use chrono::Local;
+use iced::alignment::Horizontal::Center;
+use iced::widget::space::horizontal;
+use iced::widget::*;
+use iced::{Element, Fill, FillPortion, Task};
+use std::sync::Arc;
+
+pub struct HistoryState {
+    list: Vec<(WordData, HistoryNote)>,
+}
+
+impl NavigatedPage<HistoryMessage> for HistoryState {
+    fn navigate(&mut self, message: &HistoryMessage) -> Option<Page> {
+        match message {
+            Back => Some(Page::PreviousPage),
+        }
+    }
+    fn navigated(&mut self) {}
+    fn update(&mut self, _: HistoryMessage) -> Task<RootMessage> {
+        Task::none()
+    }
+
+    fn view(&self) -> Element<'_, HistoryMessage> {
+        back_overlay(
+            iced::widget::row![
+                horizontal().width(FillPortion(1)),
+                scrollable(self.history_lines().padding(DEFAULT_SPACING))
+                    .height(Fill)
+                    .width(FillPortion(5)),
+                horizontal().width(FillPortion(1))
+            ]
+            .height(Fill)
+            .width(Fill)
+            .into(),
+            Back,
+        )
+    }
+}
+
+impl HistoryState {
+    pub fn new(id: crate::data::Id, state: AppState) -> Self {
+        let dict = &state.dictionary.read();
+        let history_repo = &mut state.history.write();
+        history_repo.init().expect("TODO: panic message");
+        let mut history = history_repo.query(Arc::new(move |h| h.deck_id == id));
+        let words = history
+            .iter(history_repo)
+            .map(|item| {
+                let handle = dict.handle_by_id(item.word_id);
+                let word = dict.get_static(handle).unwrap_or(WordData {
+                    id: Default::default(),
+                    group_id: Default::default(),
+                    key: "Удаленное слово".to_string(),
+                    value: "".to_string(),
+                    tags: "".to_string(),
+                    additional: Default::default(),
+                });
+                (word, item.clone())
+            })
+            .collect();
+        Self {
+            list: words,
+        }
+    }
+
+    fn history_lines(&self) -> Column<'_, HistoryMessage> {
+        let mut column = Column::new();
+        for (index, item) in &self.list {
+            let activity = item;
+            column = column.push(
+                row![
+                    iced::widget::column![
+                        text!("{}", index.key).width(Fill).align_x(Center),
+                        text!("{}", index.value).width(Fill).align_x(Center),
+                    ]
+                    .align_x(Center),
+                    iced::widget::column![
+                        text!("{} ➞ {}", activity.before, activity.after),
+                        text!(
+                            "{}",
+                            activity
+                                .timestamp
+                                .with_timezone(&Local)
+                                .format("%d.%m %H:%M")
+                        )
+                    ]
+                    .spacing(5)
+                    .align_x(Center)
+                ]
+                .spacing(5),
+            );
+            column = column.push(rule::horizontal(1));
+        }
+        column.spacing(5)
+    }
+}
+
+#[derive(Clone)]
+pub enum HistoryMessage {
+    Back,
+}

src/pages/import.rs

@@ -1,10 +1,15 @@
-use crate::AppState;
+use crate::app::AppState;
+use crate::data::entities::WordData;
+use crate::data::entities::WordGroup;
+use crate::data::repositories::{BatchedRepository, Repository};
 use crate::data_provider::import::{ImportData, ImportGroup, get_words_of_group, load_groups};
-use crate::data_provider::words::{add_group, add_words};
+use crate::fs::*;
-use crate::dictionary::app_data_dir;
+use crate::jl_button;
-use crate::import::ImportMessage::*;
-use crate::lang::{WordData, WordGroup};
 use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::notification::NotificationData::OpenFileError;
+use crate::notification::{MaybeError, NotificationData};
+use crate::pages::import::ImportMessage::*;
+use crate::push_error;
 use crate::styling::*;
 use iced::widget::button::danger;
 use iced::widget::container::success;
@@ -16,20 +21,21 @@ use iced::{Element, Task};
 use iced_core::Alignment::Center;
 use iced_core::Length::Fill;
 use iced_core::Padding;
+use log::info;
+use parking_lot::Mutex;
 use rfd::AsyncFileDialog;
 use rusqlite::Connection;
 use std::fs::{File, OpenOptions};
 use std::io::BufReader;
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use tokio::task::spawn_blocking;
 use zip::ZipArchive;
 
 const DEFAULT_FIELDS: [&str; 6] = ["key", "value", "tags", "reading", "context", "description"];
 
-#[derive(Clone)]
 pub struct ImportState {
-    state: Arc<Mutex<AppState>>,
+    state: AppState,
     path: Option<PathBuf>,
     import_data: Option<ImportData>,
     selected_index: usize,
@@ -62,8 +68,8 @@ pub enum ImportMessage {
 }
 
 impl NavigatedPage<ImportMessage> for ImportState {
-    fn navigate(&self, message: &ImportMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &ImportMessage) -> Option<Page> {
-        if let Some(_) = self.progress {
+        if self.progress.is_some() {
             return None;
         }
 
@@ -80,10 +86,12 @@ impl NavigatedPage<ImportMessage> for ImportState {
             Back => {}
             UpdateFile(path) => {
                 self.path = Some(path);
+                self.import_data = None;
                 return self.load_package();
             }
             SelectFile => return Self::select_import_file(),
             UpdateImport(import) => {
+                self.selected_index = 0;
                 self.import_data = Some(import);
             }
             NextGroup => {
@@ -128,12 +136,7 @@ impl NavigatedPage<ImportMessage> for ImportState {
             }
             ImportFinished => {
                 self.progress = None;
-                let group = self
+                let group = &mut self.import_data.as_mut().unwrap().0[self.selected_index];
-                    .import_data.as_mut()
-                    .unwrap()
-                    .0
-                    .get_mut(self.selected_index)
-                    .unwrap();
                 group.imported = true;
             }
         }
@@ -144,14 +147,14 @@ impl NavigatedPage<ImportMessage> for ImportState {
         back_overlay(
             {
                 if let Some(value) = &self.progress {
-                    column![progress_bar(0f32..=1f32, *value.lock().unwrap()),]
+                    column![progress_bar(0f32..=1f32, *value.lock()),]
                         .spacing(QUARTER_SPACING)
                         .into()
                 } else {
                     scrollable(
                         column![
                             row![
-                                button("Выбрать файл").style(jl_button).on_press(SelectFile),
+                                jl_button!("Выбрать файл").on_press(SelectFile),
                                 text!("{}", {
                                     if let Some(path) = &self.path {
                                         path.to_string_lossy().to_string()
@@ -200,7 +203,9 @@ impl ImportState {
 
     fn import_button(&self, group: &ImportGroup) -> Element<'_, ImportMessage> {
         if group.imported {
-            return container(text!("Группа слов успешно импортирована")).padding(HALF_SPACING).align_x(Center)
+            return container(text!("Группа слов успешно импортирована"))
+                .padding(HALF_SPACING)
+                .align_x(Center)
                 .style(success)
                 .width(Fill)
                 .into();
@@ -254,7 +259,7 @@ impl ImportState {
     }
 
     fn property_selector(&self) -> Element<'_, ImportMessage> {
-        if self.selected_property == None {
+        if self.selected_property.is_none() {
             return space().into();
         }
         column![
@@ -275,9 +280,6 @@ impl ImportState {
         let mut row = Row::new();
 
         for default in DEFAULT_FIELDS {
-            // if group.mapping.values().any(|name| name == default) {
-            //     continue;
-            // }
             row = row.push(
                 button(text!("{default}")).on_press(SetupDefaultProperty(default.to_string())),
             );
@@ -317,7 +319,7 @@ impl ImportState {
 }
 
 impl ImportState {
-    pub fn new(state: Arc<Mutex<AppState>>) -> ImportState {
+    pub fn new(state: AppState) -> ImportState {
         ImportState {
             state,
             path: None,
@@ -360,49 +362,48 @@ impl ImportState {
                 spawn_blocking(move || {
                     Self::extract_import_file(path)?;
                     let data = Self::read_import_file()?;
-                    return Ok(data);
+                    Ok(data)
                 })
                 .await
                 .unwrap()
             },
-            |result: Result<ImportData, ()>| {
+            |result: Result<ImportData, NotificationData>| match result {
-                if let Ok(import) = result {
+                Ok(import) => RootMessage::Import(UpdateImport(import)),
-                    RootMessage::Import(UpdateImport(import))
+                Err(err) => push_error!(err),
-                } else {
-                    RootMessage::None
-                }
             },
         )
     }
 
-    fn extract_import_file(path: PathBuf) -> Result<(), ()> {
+    fn extract_import_file(path: PathBuf) -> MaybeError {
-        let file = File::open(path).map_err(|_| ())?;
+        let file = File::open(path).map_err(|_| OpenFileError)?;
         let reader = BufReader::new(file);
-        let mut archive = ZipArchive::new(reader).map_err(|_| ())?;
+        let mut archive = ZipArchive::new(reader).map_err(|_| OpenFileError)?;
-        let db_file = archive.by_name("collection.anki2");
+        let temp_file_path = temp_import_path();
-        if let Ok(mut file) = db_file {
+        let mut temp_file = OpenOptions::new()
-            let temp_file_path = app_data_dir().join("import");
+            .write(true)
-            let mut temp_file = OpenOptions::new()
+            .create(true)
-                .write(true)
+            .truncate(true)
-                .create(true)
+            .open(&temp_file_path)
-                .truncate(true)
+            .map_err(|_| OpenFileError)?;
-                .open(&temp_file_path)
+        if let Ok(mut file) = archive.by_name("collection.anki21") {
-                .map_err(|_| ())?;
+            std::io::copy(&mut file, &mut temp_file).map_err(|_| OpenFileError)?;
-            std::io::copy(&mut file, &mut temp_file).map_err(|_| ())?;
+            Ok(())
+        } else if let Ok(mut file) = archive.by_name("collection.anki2") {
+            std::io::copy(&mut file, &mut temp_file).map_err(|_| OpenFileError)?;
             Ok(())
         } else {
-            Err(())
+            Err(OpenFileError)
         }
     }
-    fn read_import_file() -> Result<ImportData, ()> {
+    fn read_import_file() -> Result<ImportData, NotificationData> {
-        let temp_file_path = app_data_dir().join("import");
+        let temp_file_path = temp_import_path();
-        let connection = Connection::open(&temp_file_path).map_err(|_| ())?;
+        let connection = Connection::open(&temp_file_path).map_err(|_| OpenFileError)?;
-        let data = load_groups(&connection);
+        let data = load_groups(&connection)?;
         Ok(data)
     }
     fn setup_mapping(&mut self, property_name: String) {
         let group = self.import_data.as_mut().unwrap();
-        let group = group.0.get_mut(self.selected_index).unwrap();
+        let group = &mut group.0[self.selected_index];
         group
             .mapping
             .insert(self.selected_property.clone().unwrap(), property_name);
@@ -411,7 +412,7 @@ impl ImportState {
     }
     fn remove_mapping(&mut self, property_name: String) {
         let group = self.import_data.as_mut().unwrap();
-        let group = group.0.get_mut(self.selected_index).unwrap();
+        let group = &mut group.0[self.selected_index];
         let remove_key = group
             .mapping
             .keys()
@@ -428,35 +429,37 @@ impl ImportState {
         let skip_empty = self.skip_empty;
         let group = self.import_data.as_ref().unwrap().0[self.selected_index].clone();
         let progress = self.progress.clone().unwrap();
-        println!("{}", group.name);
+        info!("{}", group.name);
         Task::perform(
             async move {
                 spawn_blocking(move || {
-                    let temp_file_path = app_data_dir().join("import");
+                    let temp_file_path = temp_import_path();
-                    let connection = Connection::open(&temp_file_path).map_err(|_| ())?;
+                    let connection =
-                    let import_list = get_words_of_group(&connection, group.id);
+                        Connection::open(&temp_file_path).map_err(|_| OpenFileError)?;
+                    let import_list = get_words_of_group(&connection, group.id)?;
                     let mut words_list = Vec::with_capacity(import_list.len());
 
                     let map_indices = Self::get_mapping_indices(&group);
-                    let mut group_entity = WordGroup {
+                    let group_handle;
-                        id: 0,
-                        name: group.name.clone(),
-                    };
                     {
-                        let state = state.lock().unwrap();
+                        let group_entity = WordGroup {
-                        add_group(&mut group_entity, &state.connection);
+                            id: 0.into(),
+                            name: group.name.clone(),
+                        };
+                        let mut groups_repo = state.word_groups.write();
+                        group_handle = groups_repo.create_now(group_entity)?;
                     }
 
-                    let group_id = group_entity.id;
+                    let group_id = group_handle.id;
                     for import in import_list {
                         let mut word = WordData::new();
 
                         word.tags = import.tags.trim().replace(" ", ", ");
-                        word.group_id = group_id.clone();
+                        word.group_id = group_id;
                         for (dest, indices) in &map_indices {
                             let collected_string = Self::collect_strings(
                                 &import.fields,
-                                &indices,
+                                indices,
                                 &separator,
                                 skip_empty,
                             );
@@ -476,30 +479,28 @@ impl ImportState {
                             }
                         }
 
-                        println!("{word:?}");
                         words_list.push(word);
                     }
 
-                    let mut state = state.lock().unwrap();
+                    let mut words_repo = state.dictionary.write();
-                    let connection = &mut state.connection;
                     let mut index = 0;
-                    let total_len = words_list.len() as f32 / 256.0;
+                    let total_len = words_list.len() as f32 / 1024.0;
-                    for word in &mut words_list.chunks_mut(256) {
+                    for words in &mut words_list.chunks_mut(1024) {
-                        add_words(word, connection);
+                        words_repo.create_now_many(words)?;
                         index += 1;
-                        let mut progress = progress.lock().unwrap();
+                        let mut progress = progress.lock();
-                        *progress = index as f32 / total_len;
+                        *progress = (index as f32 / total_len).min(1.0);
                     }
 
-                    state.dictionary.append(&mut words_list);
-                    state.word_groups.push(group_entity);
-
                     Ok(())
                 })
                 .await
                 .unwrap()
             },
-            |_: Result<(), ()>| RootMessage::Import(ImportFinished),
+            |r: Result<(), NotificationData>| match r {
+                Ok(_) => RootMessage::Import(ImportFinished),
+                Err(err) => push_error!(err),
+            },
         )
     }
 
@@ -511,29 +512,31 @@ impl ImportState {
             .iter()
             .map(|name| (name.clone(), Vec::<usize>::with_capacity(1)))
             .collect::<Vec<_>>();
-        for key in group.mapping.keys() {
+        for (key, endpoint) in &group.mapping {
-            let endpoint = group.mapping.get(key).unwrap();
+            let property_index = group
-            let property_index = group.fields.iter().position(|f| f == key).unwrap();
+                .fields
+                .iter()
+                .position(|f| f == key)
+                .expect("Unknown property");
             let group_index = result
                 .iter()
                 .position(|(name, _)| name == endpoint)
                 .unwrap();
-            result.get_mut(group_index).unwrap().1.push(property_index);
+            result[group_index].1.push(property_index);
         }
 
         result
     }
 
     fn collect_strings(
-        properties: &Vec<String>,
+        properties: &[String],
-        indices: &Vec<usize>,
+        indices: &[usize],
         separator: &str,
         skip_empty: bool,
     ) -> String {
         let mut working_words = Vec::with_capacity(indices.len());
-        for i in 0..indices.len() {
+        for index in indices {
-            let index = indices[i];
+            let str = &properties[*index];
-            let str = properties.get(index).unwrap();
             if skip_empty && str.is_empty() {
                 continue;
             }

src/pages/quiz.rs

@@ -1,14 +1,14 @@
-use crate::lang::KanaSet;
+use crate::app::USER_FONT;
+use crate::core::kana_set::KanaSet;
+use crate::jl_button;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
-use crate::quiz::QuizMessage::*;
+use crate::pages::quiz::QuizMessage::*;
 use crate::styling::*;
-use crate::{RootMessage, USER_FONT};
 use iced::widget::*;
-use iced::{alignment, Element, Fill, Task};
+use iced::{Element, Fill, Task, alignment};
 use rand::seq::SliceRandom;
 
-#[derive(Clone, Debug)]
 pub struct QuizState {
     kana: String,
     current_roman: String,
@@ -20,7 +20,7 @@ pub struct QuizState {
 }
 
 impl NavigatedPage<QuizMessage> for QuizState {
-    fn navigate(&self, message: &QuizMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &QuizMessage) -> Option<Page> {
         if let Back = message {
             Some(PreviousPage)
         } else {
@@ -28,8 +28,7 @@ impl NavigatedPage<QuizMessage> for QuizState {
         }
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
 
     fn update(&mut self, message: QuizMessage) -> Task<RootMessage> {
         match message {
@@ -42,7 +41,7 @@ impl NavigatedPage<QuizMessage> for QuizState {
                 }
                 self.current_roman = content;
                 if self.correct_roman == self.current_roman {
-                    if self.is_help == false {
+                    if !self.is_help {
                         self.score.correct += 1;
                     }
 
@@ -55,13 +54,11 @@ impl NavigatedPage<QuizMessage> for QuizState {
                     self.update_showed()
                 }
             }
-            Back => todo!(),
+            Back => {}
         }
         Task::none()
     }
 
-
-
     fn view(&self) -> Element<'_, QuizMessage> {
         container(
             iced::widget::column![
@@ -84,27 +81,32 @@ impl NavigatedPage<QuizMessage> for QuizState {
                     .size(28)
                     .width(150)
                     .on_input(ContentChanged),
-                row![
+                score_display(&self.score),
-                    text!("{}", self.score.total.to_string()).size(25),
+                jl_button!("Закончить").on_press(Back),
-                    text!("{}", self.score.correct.to_string())
-                        .size(25)
-                        .color(iced::Color::from_rgb8(60, 170, 60)),
-                    text!("{}", self.score.fail.to_string())
-                        .color(iced::Color::from_rgb8(255, 79, 0))
-                        .size(25),
-                ]
-                .spacing(DEFAULT_SPACING),
-                button("Закончить").style(jl_button).on_press(Back),
             ]
-                .spacing(DEFAULT_SPACING)
+            .spacing(DEFAULT_SPACING)
-                .align_x(alignment::Horizontal::Center),
+            .align_x(alignment::Horizontal::Center),
         )
-            .center_y(Fill)
+        .center_y(Fill)
-            .center_x(Fill)
+        .center_x(Fill)
-            .into()
+        .into()
     }
 }
 
+fn score_display<'a, T: 'a>(score: &Score) -> Element<'a, T> {
+    row![
+        text!("{}", score.total.to_string()).size(25),
+        text!("{}", score.correct.to_string())
+            .size(25)
+            .color(iced::Color::from_rgb8(60, 170, 60)),
+        text!("{}", score.fail.to_string())
+            .color(iced::Color::from_rgb8(255, 79, 0))
+            .size(25),
+    ]
+    .spacing(DEFAULT_SPACING)
+    .into()
+}
+
 impl QuizState {
     pub(crate) fn new() -> QuizState {
         QuizState {

src/pages/randomizer.rs

@@ -1,12 +1,12 @@
+use crate::jl_button;
+use crate::navigation::RootMessage;
 use crate::navigation::{NavigatedPage, Page};
-use crate::randomizer::RandomizerMessage::{Back, Edit, Start};
+use crate::pages::randomizer::RandomizerMessage::{Back, Edit, Start};
-use crate::styling::{back_overlay, jl_button, HALF_SPACING};
+use crate::styling::{HALF_SPACING, back_overlay};
-use crate::RootMessage;
-use iced::widget::{button, text_editor};
 use iced::Task;
+use iced::widget::text_editor;
 use rand::prelude::SliceRandom;
 
-#[derive(Clone, Debug)]
 pub struct RandomizerState {
     text: text_editor::Content,
     list: Vec<String>,
@@ -20,15 +20,14 @@ pub enum RandomizerMessage {
 }
 
 impl NavigatedPage<RandomizerMessage> for RandomizerState {
-    fn navigate(&self, message: &RandomizerMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &RandomizerMessage) -> Option<Page> {
         if let Back = message {
             return Some(Page::PreviousPage);
         }
         None
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
     fn update(&mut self, message: RandomizerMessage) -> Task<RootMessage> {
         match message {
             Edit(action) => {
@@ -57,13 +56,14 @@ impl NavigatedPage<RandomizerMessage> for RandomizerState {
                     .width(400)
                     .height(400)
                     .placeholder("Каждый элемент с новой строки"),
-                button("Перемешать").style(jl_button).on_press(Start),
+                jl_button!("Перемешать").on_press(Start),
             ]
-                .spacing(HALF_SPACING)
+            .spacing(HALF_SPACING)
-                .into(),
+            .into(),
             Back,
         )
-    }}
+    }
+}
 
 impl Default for RandomizerState {
     fn default() -> Self {
@@ -78,6 +78,4 @@ impl RandomizerState {
             list: vec![],
         }
     }
-
-
 }

src/pages/repetition.rs

@@ -1,11 +1,17 @@
+use crate::app::AppState;
+use crate::core::deck::DeckData;
+use crate::core::srs::WordOpenMode;
+use crate::data::Id;
+use crate::data::entities::{CardState, WordData};
+use crate::data::repositories::Repository;
 use crate::data_provider::voice::get_voice;
-use crate::lang::{CardSet, CardStatistics, WordData, WordOpenMode};
+use crate::jl_button;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{KeyPressedPage, NavigatedPage, Page};
+use crate::navigation::{KeyPressedPage, NavigatedPage, Page, RootMessage};
-use crate::repetitions::CardSetSettings;
+use crate::notification::{MaybeError, NotificationData};
+use crate::pages::repetitions::DeckRunData;
 use crate::styling::*;
-use crate::{AppState, RootMessage};
+use crate::{push_error, push_error_task};
-use chrono::Local;
 use iced::alignment::Horizontal::Center;
 use iced::keyboard::key::Physical::Code;
 use iced::widget::text::Style;
@@ -13,23 +19,23 @@ use iced::widget::{Column, button, column, container, row, rule, space, text, to
 use iced::{Element, Fill, Task, Theme, alignment, keyboard};
 use rodio::MixerDeviceSink;
 use std::collections::HashSet;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use tokio::task::spawn_blocking;
 
 pub struct RepetitionState {
-    state: Arc<Mutex<AppState>>,
+    state: AppState,
-    pub settings: CardSetSettings,
+    pub settings: DeckRunData,
-    pub set: CardSet,
+    pub set: DeckData,
     current_word: WordData,
-    current_statistic: CardStatistics,
+    current_statistic: CardState,
     open: bool,
     can_play: bool,
-    sink: Arc<MixerDeviceSink>,
+    sink: Arc<Option<MixerDeviceSink>>,
-    opened: HashSet<u32>,
+    opened: HashSet<Id>,
 }
 
 impl NavigatedPage<RepetitionMessage> for RepetitionState {
-    fn navigate(&self, message: &RepetitionMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &RepetitionMessage) -> Option<Page> {
         if let RepetitionMessage::Back = message {
             Some(PreviousPage)
         } else {
@@ -37,8 +43,7 @@ impl NavigatedPage<RepetitionMessage> for RepetitionState {
         }
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
     fn update(&mut self, message: RepetitionMessage) -> Task<RootMessage> {
         match message {
             RepetitionMessage::Back => {}
@@ -52,8 +57,9 @@ impl NavigatedPage<RepetitionMessage> for RepetitionState {
                 self.can_play = false;
                 let value = self.current_word.key.clone();
                 if self.settings.require_speech() {
-                    return Task::perform(play_sound(self.sink.clone(), value), |_| {
+                    return Task::perform(play_sound(self.sink.clone(), value), |r| match r {
-                        RootMessage::Repetition(RepetitionMessage::PlayFinished)
+                        Ok(_) => RootMessage::Repetition(RepetitionMessage::PlayFinished),
+                        Err(err) => push_error!(err),
                     });
                 }
             }
@@ -88,21 +94,30 @@ impl NavigatedPage<RepetitionMessage> for RepetitionState {
                     (self.opened.len() as f32 / self.set.len() as f32 * 10000.0).round() / 100.0
                 )
             ]
-                .height(Fill)
+            .height(Fill)
-                .width(Fill)
+            .width(Fill)
-                .into(),
+            .into(),
             RepetitionMessage::Back,
         )
     }
 }
 
 impl RepetitionState {
-    pub(crate) fn new(set: CardSetSettings, state: Arc<Mutex<AppState>>) -> RepetitionState {
+    pub(crate) fn new(
-        let mut card_set = CardSet::new(&set, state.clone());
+        set: DeckRunData,
+        state: AppState,
+    ) -> Result<RepetitionState, NotificationData> {
+        let mut card_set = DeckData::new(&set, set.open_mode, state.clone());
         let (word, stat) = card_set.next();
-        let sink_handle = rodio::DeviceSinkBuilder::open_default_sink().unwrap();
+        let word = state.dictionary.read().get_static(word).unwrap();
+        let stat = state.card_states.read().get_static(stat).unwrap();
+        let sink_handle = if set.forward.contains("speech") || set.backward.contains("speech") {
+            rodio::DeviceSinkBuilder::open_default_sink().ok()
+        } else {
+            None
+        };
 
-        RepetitionState {
+        Ok(RepetitionState {
             state,
             settings: set,
             set: card_set,
@@ -112,13 +127,11 @@ impl RepetitionState {
             can_play: true,
             sink: Arc::new(sink_handle),
             opened: HashSet::new(),
-        }
+        })
     }
 }
 
 impl RepetitionState {
-
-
     fn next(&mut self) -> Task<RootMessage> {
         if self.open {
             self.answer(WordOpenMode::None)
@@ -133,43 +146,29 @@ impl RepetitionState {
             return Task::none();
         }
 
-        self.set.open(mode);
+        if let Err(err) = self.set.open(mode) {
+            return push_error_task!(err);
+        }
+
         self.open = false;
         self.opened.insert(self.current_word.id);
-        let next = self.set.next();
+        let (word, state) = self.set.next();
-        self.current_word = next.0;
+        let word = self.state.dictionary.read().get_static(word).unwrap();
-        self.current_statistic = next.1;
+        let stat = self.state.card_states.read().get_static(state).unwrap();
+        self.current_word = word;
+        self.current_statistic = stat;
 
-        if self.settings.require_speech() {
+        if self.settings.require_speech() && self.sink.is_some() {
-            return Task::perform(
+            let sink = self.sink.clone();
-                play_sound(self.sink.clone(), self.current_word.key.clone()),
+            let task = play_sound(sink, self.current_word.key.clone());
-                |_| RootMessage::Repetition(RepetitionMessage::PlayFinished),
+            return Task::perform(task, |r| match r {
-            );
+                Ok(_) => RootMessage::Repetition(RepetitionMessage::PlayFinished),
+                Err(err) => push_error!(err),
+            });
         }
-        self.increment_counter();
         Task::none()
     }
 
-    fn increment_counter(&mut self) {
-        let mut state = self.state.lock().unwrap();
-        let id = self.settings.id;
-        let activity = state.activity.get_mut(&id);
-
-        let now = Local::now().date_naive();
-
-        if let Some(activity) = activity {
-            let (last_day, counter) = activity.last_mut().unwrap();
-            if *last_day == now {
-                *counter += 1;
-            } else {
-                activity.push((now, 1));
-            }
-        } else {
-            state.activity.insert(id, vec![(now, 1)]);
-        }
-    }
-
-
     fn draw_forward(&self) -> Element<'_, RepetitionMessage> {
         self.draw_card_view(self.settings.forward.as_str())
     }
@@ -257,8 +256,7 @@ impl RepetitionState {
     }
 
     fn draw_voice(&self) -> Element<'_, RepetitionMessage> {
-        button("Воспроизвести")
+        jl_button!("Воспроизвести")
-            .style(jl_button)
             .on_press(RepetitionMessage::Play)
             .into()
     }
@@ -276,7 +274,7 @@ impl RepetitionState {
         }
     }
     fn draw_description(&self, word: &WordData) -> Element<'_, RepetitionMessage> {
-        match word.additional.get("context") {
+        match word.additional.get("description") {
             None => space().into(),
             Some(context) => text!("{}", context).size(24).into(),
         }
@@ -294,18 +292,18 @@ impl KeyPressedPage for RepetitionState {
             text: _,
             repeat: _,
         } = message
+            && let Code(code) = pk
         {
-            if let Code(code) = pk {
+            return match code {
-                return match code {
+                keyboard::key::Code::Space => self.next(),
-                    keyboard::key::Code::Space => self.next(),
+                keyboard::key::Code::Digit1 => self.answer(WordOpenMode::None),
-                    keyboard::key::Code::Digit1 => self.answer(WordOpenMode::None),
+                keyboard::key::Code::Digit2 => self.answer(WordOpenMode::Hard),
-                    keyboard::key::Code::Digit2 => self.answer(WordOpenMode::Hard),
+                keyboard::key::Code::Digit3 => self.answer(WordOpenMode::Ok),
-                    keyboard::key::Code::Digit3 => self.answer(WordOpenMode::Ok),
+                keyboard::key::Code::Digit4 => self.answer(WordOpenMode::Easy),
-                    keyboard::key::Code::Digit4 => self.answer(WordOpenMode::Easy),
+                _ => Task::none(),
-                    _ => Task::none(),
+            };
-                };
-            }
         }
+
         Task::none()
     }
 }
@@ -319,11 +317,16 @@ pub enum RepetitionMessage {
     PlayFinished,
 }
 
-async fn play_sound(sink: Arc<MixerDeviceSink>, text: String) {
+async fn play_sound(sink: Arc<Option<MixerDeviceSink>>, text: String) -> MaybeError {
-    let data = get_voice(text.as_str()).await;
+    let data = get_voice(text.as_str()).await?;
     spawn_blocking(move || {
-        rodio::play(&sink.mixer(), data).unwrap().sleep_until_end();
+        if let Some(sink) = sink.as_ref()
+            && let Ok(play) = rodio::play(sink.mixer(), data)
+        {
+            play.sleep_until_end()
+        }
     })
     .await
-    .unwrap();
+    .expect("Playing sound failed");
+    Ok(())
 }

src/pages/repetition_settings.rs

@@ -0,0 +1,258 @@
+use crate::app::AppState;
+use crate::core::deck::DeckData;
+use crate::data::entities::{DeckSettings, EntityHandle};
+use crate::data::repositories::{BatchedRepository, Repository};
+use crate::jl_button;
+use crate::navigation::Page::PreviousPage;
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::notification::MaybeError;
+use crate::pages::repetition_settings::RepetitionSettingsMessage::*;
+use crate::styling::*;
+use crate::{push_error, push_error_task};
+use iced::widget::button::danger;
+use iced::widget::space::horizontal;
+use iced::widget::text_input::Catalog;
+use iced::widget::{button, column, row, scrollable, space, text, text_input};
+use iced::{Element, Task};
+use iced_core::Length::Fill;
+use iced_core::{Padding, Theme, color};
+use std::sync::Arc;
+use std::time::Duration;
+
+pub struct RepetitionSettingsState {
+    settings_handle: EntityHandle<DeckSettings>,
+    settings_data: DeckSettings,
+    state: AppState,
+    real_delete: bool,
+    real_delete_states: bool,
+    correct_filter: bool,
+    filter_changed: bool,
+    filtered_words: Option<u32>,
+}
+
+impl RepetitionSettingsState {
+    pub(crate) fn new(
+        settings: EntityHandle<DeckSettings>,
+        state: AppState,
+    ) -> RepetitionSettingsState {
+        let data = state.decks.read().get_static(settings).unwrap();
+        RepetitionSettingsState {
+            settings_data: data,
+            settings_handle: settings,
+            state,
+            real_delete: false,
+            real_delete_states: false,
+            correct_filter: true,
+            filter_changed: false,
+            filtered_words: None,
+        }
+    }
+}
+
+impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
+    fn navigate(&mut self, message: &RepetitionSettingsMessage) -> Option<Page> {
+        if let Back = message {
+            Some(PreviousPage)
+        } else {
+            None
+        }
+    }
+
+    fn navigated(&mut self) {}
+    fn update(&mut self, message: RepetitionSettingsMessage) -> Task<RootMessage> {
+        match message {
+            Back => {}
+            Save => {
+                let mut decks = self.state.decks.write();
+                decks.set(&mut self.settings_handle, self.settings_data.clone());
+
+                if let Err(e) = decks.save(&mut self.settings_handle) {
+                    return push_error_task!(e);
+                }
+                drop(decks);
+                if self.filter_changed
+                    && let Err(e) = update_deck_stats(&self.settings_data, &self.state)
+                {
+                    return push_error_task!(e);
+                }
+            }
+            SetName(new) => {
+                self.settings_data.name = new;
+            }
+            SetForward(new) => {
+                self.settings_data.forward = new;
+            }
+            SetBackward(backward) => {
+                self.settings_data.backward = backward;
+            }
+            SetFilter(new) => {
+                self.settings_data.filter = new;
+                self.correct_filter = self.settings_data.check_filter();
+                self.filter_changed = true;
+            }
+            TryFilter => {
+                let list = DeckData::list(&self.settings_data, &self.state);
+                self.filtered_words = Some(list.len() as u32);
+            }
+            DeleteSet => {
+                if !self.real_delete {
+                    self.real_delete = true;
+                    return Task::future(async {
+                        tokio::time::sleep(Duration::from_millis(3000)).await;
+                        RootMessage::RepetitionSettings(RevertDeleteSet)
+                    });
+                }
+                let mut decks = self.state.decks.write();
+                if let Err(e) = decks.delete(self.settings_handle) {
+                    return push_error_task!(e);
+                }
+
+                return Task::done(RootMessage::RepetitionSettings(Back));
+            }
+            RevertDeleteSet => {
+                self.real_delete = false;
+                self.real_delete_states = true;
+            }
+            DeleteStates => {
+                if !self.real_delete_states {
+                    self.real_delete_states = true;
+                    return Task::future(async {
+                        tokio::time::sleep(Duration::from_millis(3000)).await;
+                        RootMessage::RepetitionSettings(RevertDeleteSet)
+                    });
+                }
+                let mut states = self.state.card_states.write();
+                let deck_id = self.settings_handle.id;
+                let mut query = states
+                    .query(Arc::new(move |state| state.deck_id == deck_id))
+                    .handles()
+                    .collect::<Vec<_>>();
+                if let Err(e) = states.delete_many(query.as_mut_slice()) {
+                    return push_error_task!(e);
+                }
+                self.real_delete_states = false;
+            }
+        }
+        Task::none()
+    }
+
+    fn view(&self) -> Element<'_, RepetitionSettingsMessage> {
+        back_overlay(
+            iced::widget::column![
+                scrollable(
+                    column![
+                        column![
+                            text!("Название набора"),
+                            text_input("", &self.settings_data.name).on_input(SetName),
+                        ]
+                        .spacing(QUARTER_SPACING),
+                        column![
+                            text!("Передняя сторона"),
+                            text_input("", &self.settings_data.forward).on_input(SetForward),
+                        ]
+                        .spacing(QUARTER_SPACING),
+                        column![
+                            text!("Задняя сторона"),
+                            text_input("", &self.settings_data.backward).on_input(SetBackward),
+                        ]
+                        .spacing(QUARTER_SPACING),
+                        column![
+                            text!("Фильтр"),
+                            text_input("", &self.settings_data.filter)
+                                .style(|x, status| {
+                                    let mut primary = Theme::default()(x, status);
+                                    if !self.correct_filter {
+                                        primary.border.color = color!(255, 255, 0);
+                                    }
+                                    primary
+                                })
+                                .on_input(SetFilter),
+                            jl_button!("Проверить фильтр").on_press(TryFilter),
+                            self.count_view(),
+                        ]
+                        .spacing(QUARTER_SPACING),
+                    ]
+                    .spacing(DEFAULT_SPACING)
+                    .padding(Padding {
+                        top: 0.0,
+                        right: DEFAULT_SPACING,
+                        bottom: 0.0,
+                        left: 0.0,
+                    })
+                )
+                .height(Fill),
+                row![
+                    jl_button!("Сохранить").on_press(Save),
+                    horizontal(),
+                    button(if self.real_delete_states {
+                        "Вы уверены?"
+                    } else {
+                        "Удалить прогресс?"
+                    })
+                    .style(danger)
+                    .on_press(DeleteStates),
+                    button(if self.real_delete {
+                        "Вы уверены?"
+                    } else {
+                        "Удалить"
+                    })
+                    .style(danger)
+                    .on_press(DeleteSet),
+                ]
+                .spacing(DEFAULT_SPACING),
+            ]
+            .spacing(DEFAULT_SPACING)
+            .into(),
+            Back,
+        )
+    }
+}
+
+fn update_deck_stats(deck: &DeckSettings, state: &AppState) -> MaybeError {
+    let states_repo = &mut state.card_states.write();
+    let deck_id = deck.id;
+    let mut db_stats = states_repo
+        .query_par(Arc::new(move |s| s.deck_id == deck_id))
+        .iter(states_repo)
+        .collect::<Vec<_>>();
+    let filtered_words = DeckData::list(deck, state)
+        .iter()
+        .map(|w| w.id)
+        .collect::<Vec<_>>();
+    filtered_words.iter().for_each(|word_id| {
+        if let Some(index) = db_stats.iter().position(|stat_id| stat_id.id == *word_id) {
+            db_stats.remove(index);
+        }
+    });
+
+    let mut delete_operation = db_stats
+        .iter()
+        .map(|state| EntityHandle::new(state.id, state.id.0 as usize, true))
+        .collect::<Vec<_>>();
+    states_repo.delete_many(delete_operation.as_mut_slice())?;
+
+    Ok(())
+}
+
+impl RepetitionSettingsState {
+    fn count_view(&self) -> Element<'_, RepetitionSettingsMessage> {
+        if let Some(count) = self.filtered_words {
+            return text!("Количество слов: {}", count).into();
+        }
+        space().into()
+    }
+}
+
+#[derive(Clone)]
+pub enum RepetitionSettingsMessage {
+    Back,
+    Save,
+    SetName(String),
+    SetForward(String),
+    SetBackward(String),
+    SetFilter(String),
+    TryFilter,
+    DeleteSet,
+    DeleteStates,
+    RevertDeleteSet,
+}

src/pages/repetitions.rs

@@ -0,0 +1,654 @@
+use crate::app::AppState;
+use crate::core::deck::DeckData;
+use crate::core::srs::{AppendMode, OrderMode};
+use crate::data::entities::{CardState, DeckSettings, EntityHandle, WordData};
+use crate::data::repositories::{BatchedRepository, Repository};
+use crate::jl_button;
+use crate::navigation::Page::{History, PreviousPage, Repetition, RepetitionSettings};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::notification::MaybeError;
+use crate::pages::history::HistoryState;
+use crate::pages::repetition::RepetitionState;
+use crate::pages::repetition_settings::RepetitionSettingsState;
+use crate::pages::repetitions::RepetitionsMessage::*;
+use crate::push_error;
+use crate::push_error_task;
+use crate::styling::*;
+use chrono::{Days, Local, Utc};
+use hashbrown::HashSet;
+use iced::widget::button::{danger, Status};
+pub use iced::widget::button::{Catalog, Style};
+use iced::widget::tooltip::Position::Top;
+use iced::widget::{
+    button, column, container, lazy, radio, row, scrollable, space, svg, text, text_input, tooltip,
+    Column, Row,
+};
+use iced::{Background, Border, Center, Color, Element, Fill, Length, Shadow, Task, Theme};
+use iced_core::border::Radius;
+use iced_core::svg::Handle;
+use iced_core::Padding;
+use std::collections::BTreeMap;
+use std::ops::Deref;
+use std::sync::Arc;
+
+pub struct RepetitionsState {
+    selected_deck_handle: Option<EntityHandle<DeckSettings>>,
+    decks: BTreeMap<EntityHandle<DeckSettings>, DeckRunData>,
+    state: AppState,
+}
+
+impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
+    fn navigate(&mut self, message: &RepetitionsMessage) -> Option<Page> {
+        if let Back = message {
+            Some(PreviousPage)
+        } else if let GoToHistory = message {
+            Some(History(HistoryState::new(
+                self.selected_deck().unwrap().id,
+                self.state.clone(),
+            )))
+        } else if let GoToRepetition = message {
+            let mut state_clone = self.state.clone();
+            let selected_set = self.selected_deck_mut().unwrap();
+            if selected_set.append_mode == AppendMode::Full {
+                if let Err(_err) = Self::append_all_words(&mut state_clone, selected_set) {
+                    return None;
+                }
+                selected_set.existing_words_indices = selected_set.available_words_indices.clone();
+            } else {
+                if selected_set.available_words_indices.is_empty()
+                    || selected_set.existing_words_indices.is_empty()
+                {
+                    return None;
+                }
+            }
+
+            if let Ok(repetition_state) =
+                RepetitionState::new(selected_set.clone(), self.state.clone())
+            {
+                return Some(Repetition(repetition_state));
+            }
+
+            None
+        } else if let GoToSettings = message {
+            Some(RepetitionSettings(RepetitionSettingsState::new(
+                self.selected_deck_handle.unwrap(),
+                self.state.clone(),
+            )))
+        } else {
+            None
+        }
+    }
+    fn navigated(&mut self) {
+        if let Some(index) = self.selected_deck_handle {
+            let decks = self.state.decks.read();
+            if let Some(deck) = decks.get_static(index) {
+                {
+                    let stored = self.decks.get_mut(&index).unwrap();
+                    stored.general_settings = deck;
+                }
+                drop(decks);
+                self.fill_deck_word_indices();
+            } else {
+                self.decks.remove(&index);
+                drop(decks);
+                self.clear_selection();
+            }
+        } else {
+            self.fill_deck_word_indices();
+        }
+    }
+    fn update(&mut self, message: RepetitionsMessage) -> Task<RootMessage> {
+        match message {
+            Next => {}
+            Back => {}
+            GoToRepetition => {}
+            GoToHistory => {}
+            GoToSettings => {}
+
+            CreateSet => {
+                let index = self.decks.len() + 1;
+                let general = DeckSettings::with_name(format!("Колода #{}", index));
+                let handle = self.state.decks.write().create(general.clone());
+                self.decks.insert(
+                    handle,
+                    DeckRunData {
+                        settings_handle: handle,
+                        general_settings: general,
+                        existing_words_indices: Default::default(),
+                        available_words_indices: Default::default(),
+                        indices_ready: false,
+                        append_mode: Default::default(),
+                        count: None,
+                        open_mode: OrderMode::Default,
+                    },
+                );
+            }
+            DeleteSet => {
+                let index = self.selected_deck_handle.unwrap();
+                self.clear_selection();
+                self.decks.remove(&index);
+
+                if index.real() {
+                    let mut repo = self.state.decks.write();
+                    if let Err(err) = repo.delete(index) {
+                        return push_error_task!(err);
+                    }
+                }
+            }
+            SetName(value) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.general_settings.name = value;
+            }
+            SelectSet(index) => {
+                self.select_deck(index);
+                let deck = self.selected_deck().unwrap();
+                if !deck.indices_ready {
+                    self.fill_deck_word_indices()
+                }
+            }
+            Save => {
+                let deck = self.selected_deck().unwrap().clone();
+                let handle = self.selected_deck_handle.as_mut().unwrap();
+                let mut repo = self.state.decks.write();
+
+                repo.set(handle, deck.general_settings.clone());
+                let old = *handle;
+                if let Err(err) = repo.save(handle) {
+                    return push_error_task!(err);
+                }
+
+                let mut deck = self.decks.remove(&old).unwrap();
+                deck.settings_handle = *handle;
+                self.decks.insert(*handle, deck);
+            }
+            SetForward(value) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.general_settings.forward = value;
+            }
+            SetBackward(value) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.general_settings.backward = value;
+            }
+            SetFilter(value) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.general_settings.filter = value;
+            }
+            TryFilter => {
+                let deck = self.selected_deck().unwrap();
+                let count = DeckData::list(deck, &self.state).len();
+                let deck = self.selected_deck_mut().unwrap();
+                deck.count = Some(count);
+            }
+            SetOpenMode(mode) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.open_mode = mode;
+            }
+            SetAppendMode(mode) => {
+                let deck = self.selected_deck_mut().unwrap();
+                deck.append_mode = mode;
+            }
+            AppendWords(count) => {
+                let adding: Vec<EntityHandle<WordData>>;
+                {
+                    {
+                        let deck = self.selected_deck().unwrap();
+                        let existing_words_indices = &deck.existing_words_indices;
+                        let mut created_set = HashSet::with_capacity(existing_words_indices.len());
+                        existing_words_indices.iter().for_each(|c| {
+                            created_set.insert(c);
+                        });
+                        adding = deck
+                            .available_words_indices
+                            .iter()
+                            .filter(|c| !created_set.contains(c))
+                            .take(count)
+                            .cloned()
+                            .collect();
+                    }
+
+                    let deck = self.selected_deck_mut().unwrap();
+                    deck.existing_words_indices.append(&mut adding.clone());
+                }
+
+                let deck = self.selected_deck().unwrap().clone();
+                let state = &mut self.state;
+                if let Err(err) =
+                    Self::append_words(state, &deck.general_settings, adding.into_iter())
+                {
+                    return push_error_task!(err);
+                }
+            }
+        }
+        Task::none()
+    }
+
+    fn view(&self) -> Element<'_, RepetitionsMessage> {
+        back_overlay(
+            row![
+                column![
+                    scrollable(self.decks_list()).height(Fill),
+                    jl_button!("Добавить").width(Fill).on_press(CreateSet),
+                ]
+                .spacing(DEFAULT_SPACING)
+                .width(Length::FillPortion(1)),
+                self.selected_deck_view(),
+            ]
+            .align_y(Center)
+            .spacing(DEFAULT_SPACING)
+            .width(Fill)
+            .height(Fill)
+            .into(),
+            Back,
+        )
+    }
+}
+
+impl RepetitionsState {
+    pub(crate) fn new(state: AppState) -> RepetitionsState {
+        let decks = Self::get_decks_from_state(&state);
+        RepetitionsState {
+            selected_deck_handle: None,
+            decks,
+            state,
+        }
+    }
+
+    fn get_decks_from_state(state: &AppState) -> BTreeMap<EntityHandle<DeckSettings>, DeckRunData> {
+        state
+            .decks
+            .read()
+            .iter()
+            .enumerate()
+            .map(|(index, deck)| {
+                (
+                    EntityHandle::new(deck.id, index, true),
+                    DeckRunData {
+                        settings_handle: EntityHandle::new(deck.id, index, true),
+                        general_settings: deck.clone(),
+                        existing_words_indices: Default::default(),
+                        available_words_indices: Default::default(),
+                        indices_ready: false,
+                        append_mode: Default::default(),
+                        count: None,
+                        open_mode: OrderMode::Default,
+                    },
+                )
+            })
+            .collect::<BTreeMap<_, _>>()
+    }
+}
+
+impl RepetitionsState {
+    fn launch_delete_button(&self, deck: &DeckRunData) -> Element<'_, RepetitionsMessage> {
+        if deck.id.is_valid() {
+            if deck.append_mode == AppendMode::Manual && deck.existing_words_indices.is_empty() {
+                return text!("Добавьте карточки или измените фильтр").into();
+            }
+            return row![
+                space().width(Fill),
+                button(text!("Начать повторение").width(200).center())
+                    .style(cta_button)
+                    .on_press(GoToRepetition)
+            ]
+            .into();
+        }
+        button("Удалить").style(danger).on_press(DeleteSet).into()
+    }
+    fn selected_deck_view(&self) -> Element<'_, RepetitionsMessage> {
+        if let Some(deck) = &self.selected_deck() {
+            return column![
+                scrollable(
+                    column![
+                        column![
+                            text!("Название набора"),
+                            row![
+                                text_input("", &deck.name).on_input(SetName),
+                                button(svg(Handle::from_memory(SETTINGS_ICON)))
+                                    .width(43)
+                                    .on_press(GoToSettings),
+                            ]
+                            .spacing(HALF_SPACING)
+                        ]
+                        .spacing(QUARTER_SPACING),
+                        {
+                            if !deck.settings_handle.real() {
+                                column![
+                                    column![
+                                        text!("Передняя сторона"),
+                                        text_input("", &deck.forward).on_input(SetForward),
+                                    ]
+                                    .spacing(QUARTER_SPACING),
+                                    column![
+                                        text!("Задняя сторона"),
+                                        text_input("", &deck.backward).on_input(SetBackward),
+                                    ]
+                                    .spacing(QUARTER_SPACING),
+                                    column![
+                                        text!("Фильтр"),
+                                        text_input("", &deck.filter).on_input(SetFilter),
+                                        jl_button!("Проверить фильтр").on_press(TryFilter),
+                                        self.count_view(deck),
+                                    ]
+                                    .spacing(QUARTER_SPACING),
+                                ]
+                                .spacing(DEFAULT_SPACING)
+                            } else {
+                                column![
+                                    self.filled_deck_data_view(deck),
+                                    self.word_append_panel(deck),
+                                    radio(
+                                        "Обычный режим",
+                                        OrderMode::Default,
+                                        Some(deck.open_mode),
+                                        SetOpenMode
+                                    ),
+                                    radio(
+                                        "Начать с плохих слов",
+                                        OrderMode::TrainWorstFirst,
+                                        Some(deck.open_mode),
+                                        SetOpenMode
+                                    ),
+                                    radio(
+                                        "Полностью случайно",
+                                        OrderMode::FullRandom,
+                                        Some(deck.open_mode),
+                                        SetOpenMode
+                                    ),
+                                    jl_button!("История").on_press(GoToHistory),
+                                ]
+                                .spacing(HALF_SPACING)
+                            }
+                        },
+                        // self.words_words_view(&set),
+                    ]
+                    .spacing(DEFAULT_SPACING)
+                    .padding(Padding {
+                        top: 0.0,
+                        right: DEFAULT_SPACING,
+                        bottom: 0.0,
+                        left: 0.0,
+                    })
+                )
+                .height(Fill),
+                row![
+                    jl_button!("Сохранить").on_press(Save),
+                    self.launch_delete_button(deck)
+                ]
+                .spacing(DEFAULT_SPACING)
+                .align_y(Center),
+            ]
+            .spacing(DEFAULT_SPACING)
+            .width(Length::FillPortion(2))
+            .into();
+        }
+        space().width(Length::FillPortion(2)).into()
+    }
+    fn filled_deck_data_view(&self, deck: &DeckSettings) -> Column<'_, RepetitionsMessage> {
+        column![self.activity_bar(deck), self.count_comparator_view()]
+            .align_x(Center)
+            .width(Fill)
+            .spacing(DEFAULT_SPACING)
+    }
+    fn activity_bar(&self, deck: &DeckSettings) -> Element<'_, RepetitionsMessage> {
+        const MAX_DAY_COUNT: f32 = 128.0;
+
+        let history = self.state.history.read();
+        let history = history.activity_of_deck(deck.id);
+        let mut counts: Vec<u32> = vec![0; 30 * 7];
+        let now = Local::now().date_naive();
+
+        for (date, activity) in history {
+            let distance = now - date;
+            let index = counts.len() as i64 - distance.num_days() - 1;
+
+            if index < 0 {
+                continue;
+            }
+
+            counts[index as usize] = activity;
+        }
+
+        lazy((counts, now), |(counts, now)| {
+            let mut row = Row::new()
+                .padding(Padding {
+                    top: 0.0,
+                    right: 0.0,
+                    bottom: 0.0,
+                    left: DEFAULT_SPACING,
+                })
+                .spacing(QUARTER_SPACING);
+
+            let mut iter = counts.iter();
+            for i in 0..30 {
+                let mut column = Column::new().spacing(QUARTER_SPACING);
+
+                for j in 0..7 {
+                    let value = *iter.next().unwrap() as f32;
+                    let k = (value / MAX_DAY_COUNT).min(1.0) * 0.9 + 0.1;
+
+                    let date = (*now)
+                        .checked_sub_days(Days::new(30 * 7 - i * 7 - j - 1))
+                        .unwrap_or_default();
+
+                    column = column.push(tooltip(
+                        iced::widget::container(space().height(15).width(15)).style(
+                            move |x: &Theme| container::Style {
+                                text_color: None,
+                                background: Some(Background::Color(
+                                    x.palette().primary.scale_alpha(k),
+                                )),
+                                border: Border {
+                                    color: Default::default(),
+                                    width: 0.0,
+                                    radius: Radius::new(5),
+                                },
+                                shadow: Default::default(),
+                                snap: false,
+                            },
+                        ),
+                        text!("{} {} карточки", date.format("%Y.%m.%d"), value),
+                        Top,
+                    ));
+                }
+
+                row = row.push(column);
+            }
+            scrollable(
+                column!["Карта активности", row]
+                    .spacing(QUARTER_SPACING)
+                    .align_x(Center),
+            )
+        })
+        .into()
+    }
+    fn word_append_panel(&self, deck: &DeckRunData) -> Element<'_, RepetitionsMessage> {
+        column![
+            text!("Режим добавления карточек"),
+            row![
+                radio(
+                    "Добавлять все доступные",
+                    AppendMode::Full,
+                    Some(deck.append_mode),
+                    SetAppendMode
+                ),
+                radio(
+                    "Добавлять вручную",
+                    AppendMode::Manual,
+                    Some(deck.append_mode),
+                    SetAppendMode
+                )
+            ]
+            .spacing(HALF_SPACING),
+            self.adder_panel(deck),
+        ]
+        .spacing(HALF_SPACING)
+        .into()
+    }
+    fn adder_panel(&self, deck: &DeckRunData) -> Element<'_, RepetitionsMessage> {
+        match deck.append_mode {
+            AppendMode::Full => space().into(),
+            AppendMode::Manual => row![
+                button("+5").on_press(AppendWords(5)),
+                button("+10").on_press(AppendWords(10)),
+                button("+15").on_press(AppendWords(15)),
+                button("+20").on_press(AppendWords(20))
+            ]
+            .spacing(HALF_SPACING)
+            .into(),
+        }
+    }
+
+    fn count_comparator_view(&self) -> Element<'_, RepetitionsMessage> {
+        let selected_deck = self.selected_deck().unwrap();
+        let now = selected_deck.existing_words_indices.len();
+        let available = selected_deck.available_words_indices.len();
+        text!("{} слова добавлено из {}", now, available).into()
+    }
+    fn count_view(&self, deck: &DeckRunData) -> Element<'_, RepetitionsMessage> {
+        if let Some(count) = deck.count {
+            return text!("Количество слов: {}", count).into();
+        }
+        space().into()
+    }
+    fn decks_list(&self) -> Column<'_, RepetitionsMessage> {
+        let mut column = Column::new();
+
+        for (handle, deck) in self.decks.iter() {
+            column = column.push(
+                button(text!("{}", &deck.name))
+                    .on_press_with(move || SelectSet(*handle))
+                    .style(move |_x: &Theme, status: Status| Style {
+                        background: if status == Status::Hovered {
+                            Some(Background::Color(Color::WHITE.scale_alpha(0.2)))
+                        } else {
+                            None
+                        },
+                        text_color: _x.palette().primary,
+                        border: Border {
+                            color: Default::default(),
+                            width: 0.0,
+                            radius: BUTTON_RADIUS.into(),
+                        },
+                        shadow: Shadow::default(),
+                        snap: false,
+                    }),
+            );
+        }
+
+        column
+    }
+}
+
+impl RepetitionsState {
+    fn append_all_words(state: &mut AppState, deck: &DeckRunData) -> MaybeError {
+        let existing = &deck.existing_words_indices;
+        let mut created_set = HashSet::with_capacity(existing.len());
+        existing.iter().for_each(|c| {
+            created_set.insert(c);
+        });
+        let required = deck
+            .available_words_indices
+            .iter()
+            .filter(|i| !created_set.contains(i))
+            .cloned();
+        Self::append_words(state, deck, required)?;
+        Ok(())
+    }
+    fn append_words(
+        state: &mut AppState,
+        deck: &DeckSettings,
+        indices: impl Iterator<Item = EntityHandle<WordData>>,
+    ) -> MaybeError {
+        let stats = &mut indices
+            .map(|i| CardState {
+                id: 0.into(),
+                word_id: i.id,
+                last_open: Utc::now(),
+                score: 1,
+                fsrs_opened: Utc::now().date_naive(),
+                fsrs_memory: None,
+                deck_id: deck.id,
+                fsrs_open_day: Utc::now().date_naive(),
+            })
+            .collect::<Vec<_>>();
+
+        if !stats.is_empty() {
+            let mut repo = state.card_states.write();
+            repo.create_now_many(stats.as_mut_slice())?;
+        }
+        Ok(())
+    }
+
+    fn select_deck(&mut self, index: EntityHandle<DeckSettings>) {
+        if self.decks.contains_key(&index) {
+            self.selected_deck_handle = Some(index);
+        }
+    }
+
+    fn selected_deck(&self) -> Option<&DeckRunData> {
+        self.decks.get(&self.selected_deck_handle?)
+    }
+    fn selected_deck_mut(&mut self) -> Option<&mut DeckRunData> {
+        self.decks.get_mut(&self.selected_deck_handle?)
+    }
+
+    fn clear_selection(&mut self) {
+        self.selected_deck_handle = None;
+    }
+
+    fn fill_deck_word_indices(&mut self) {
+        let card_states = self.state.card_states.read();
+        let deck_id = self.selected_deck().unwrap().id;
+        let added = card_states
+            .query_par(Arc::new(move |state| state.deck_id == deck_id))
+            .iter(&card_states)
+            .map(|state| EntityHandle::from_id(state.word_id))
+            .collect::<Vec<_>>();
+        let mut deck = self.selected_deck().unwrap().clone();
+        let total = DeckData::list(&deck, &self.state);
+        deck.existing_words_indices = added;
+        deck.available_words_indices = total;
+        deck.indices_ready = true;
+        self.decks.insert(self.selected_deck_handle.unwrap(), deck);
+    }
+}
+#[derive(Clone)]
+pub enum RepetitionsMessage {
+    Next,
+    Back,
+    GoToRepetition,
+    CreateSet,
+    DeleteSet,
+    SetName(String),
+    SelectSet(EntityHandle<DeckSettings>),
+    Save,
+    SetForward(String),
+    SetBackward(String),
+    SetFilter(String),
+    TryFilter,
+    SetOpenMode(OrderMode),
+    SetAppendMode(AppendMode),
+    GoToHistory,
+    GoToSettings,
+    AppendWords(usize),
+}
+
+#[derive(Clone)]
+pub struct DeckRunData {
+    pub settings_handle: EntityHandle<DeckSettings>,
+    pub general_settings: DeckSettings,
+    existing_words_indices: Vec<EntityHandle<WordData>>,
+    available_words_indices: Vec<EntityHandle<WordData>>,
+    indices_ready: bool,
+    pub append_mode: AppendMode,
+    count: Option<usize>,
+    pub open_mode: OrderMode,
+}
+
+impl Deref for DeckRunData {
+    type Target = DeckSettings;
+
+    fn deref(&self) -> &Self::Target {
+        &self.general_settings
+    }
+}

src/pages/selector.rs

@@ -1,26 +1,27 @@
-use crate::dictionary::DictionaryState;
+use crate::app::AppState;
-use crate::lang::{KanaSet, KanaType};
+use crate::core::kana_set::{KanaSet, KanaType};
+use crate::jl_button;
 use crate::navigation::Page::*;
-use crate::navigation::{NavigatedPage, Page};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
-use crate::randomizer::RandomizerState;
+use crate::pages::dictionary::DictionaryState;
-use crate::repetitions::RepetitionsState;
+use crate::pages::quiz::QuizState;
-use crate::selector::SelectorMessage::ChangeMode;
+use crate::pages::randomizer::RandomizerState;
+use crate::pages::repetitions::RepetitionsState;
+use crate::pages::selector::SelectorMessage::ChangeMode;
+use crate::pages::sync::SyncState;
+use crate::pages::writing::WritingState;
 use crate::styling::*;
-use crate::sync::SyncState;
-use crate::writing::WritingState;
-use crate::{AppState, QuizState, RootMessage};
 use iced::widget::button::{Status, Style};
 use iced::widget::*;
-use iced::{Element, Task, alignment};
+use iced::{alignment, Element, Task};
 use iced_core::Alignment::Center;
 use iced_core::Background;
 use iced_core::Color;
-use std::sync::{Arc, Mutex};
 
 pub struct SelectorState {
     pub set: KanaSet,
     is_writing: bool,
-    state: Arc<Mutex<AppState>>,
+    state: AppState,
 }
 
 #[derive(Debug, Clone)]
@@ -36,7 +37,7 @@ pub enum SelectorMessage {
 }
 
 impl NavigatedPage<SelectorMessage> for SelectorState {
-    fn navigate(&self, message: &SelectorMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &SelectorMessage) -> Option<Page> {
         if let SelectorMessage::Goto = message {
             return if self.is_writing {
                 let writing = WritingState::new(&self.set);
@@ -62,8 +63,7 @@ impl NavigatedPage<SelectorMessage> for SelectorState {
         None
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
     fn update(&mut self, message: SelectorMessage) -> Task<RootMessage> {
         match message {
             SelectorMessage::Change => match self.set.chars_type {
@@ -80,9 +80,7 @@ impl NavigatedPage<SelectorMessage> for SelectorState {
         container(
             iced::widget::column![
                 row![
-                    button("あ ↔ ア")
+                    jl_button!("あ ↔ ア").on_press(SelectorMessage::Change),
-                        .on_press(SelectorMessage::Change)
-                        .style(jl_button),
                     button("Словарь")
                         .on_press(SelectorMessage::ToDictionary)
                         .style(Self::nav_style),
@@ -105,15 +103,15 @@ impl NavigatedPage<SelectorMessage> for SelectorState {
                     .on_press(SelectorMessage::Goto)
                     .style(cta_button),
             ]
-                .spacing(DEFAULT_SPACING),
+            .spacing(DEFAULT_SPACING),
         )
-            .padding(10)
+        .padding(10)
-            .into()
+        .into()
     }
 }
 
 impl SelectorState {
-    pub fn new(state: Arc<Mutex<AppState>>) -> Self {
+    pub fn new(state: AppState) -> Self {
         Self {
             set: Default::default(),
             is_writing: false,
@@ -121,7 +119,6 @@ impl SelectorState {
         }
     }
 
-
     fn nav_style(theme: &Theme, status: Status) -> Style {
         let mut basic = button::text(theme, status);
         basic.background = if status == Status::Hovered {
@@ -133,8 +130,6 @@ impl SelectorState {
         basic
     }
 
-
-
     fn rows_selector(&self) -> Element<'_, SelectorMessage> {
         let mut row = Row::new();
 

src/pages/sync.rs

@@ -1,18 +1,21 @@
+use crate::app::AppState;
+use crate::data::repositories::Repository;
 use crate::data_provider::settings::{delete_settings, set_setting};
 use crate::data_provider::web_api::*;
+use crate::jl_button;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::notification::{NotificationData, NotificationRequest};
+use crate::pages::sync::SyncMessage::*;
 use crate::styling::*;
-use crate::sync::SyncMessage::*;
+use crate::{push_error, push_error_task};
-use crate::{fill_state, AppState, RootMessage};
 use iced::widget::button::danger;
 use iced::widget::container::rounded_box;
 use iced::widget::{button, column, container, progress_bar, row, space, text, toggler};
 use iced::{Center, Element, Fill, Font, Length, Task};
-use std::sync::{Arc, Mutex};
+use log::error;
 use std::time::Duration;
 
-
 #[derive(Clone)]
 pub enum SyncMessage {
     Back,
@@ -29,16 +32,15 @@ pub enum SyncMessage {
     DisableSync,
     SwitchAutoSync,
 }
-#[derive(Clone)]
 pub struct SyncState {
-    state: Arc<Mutex<AppState>>,
+    state: AppState,
     auto_fetch: bool,
     frozen: bool,
     progress: f32,
 }
 
 impl NavigatedPage<SyncMessage> for SyncState {
-    fn navigate(&self, message: &SyncMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &SyncMessage) -> Option<Page> {
         if let Back = message
             && !self.frozen
         {
@@ -53,13 +55,15 @@ impl NavigatedPage<SyncMessage> for SyncState {
         match message {
             Back => {}
             CopyKey => {
-                let state = self.state.lock().unwrap();
+                let key = self.state.sync_data.read().key.clone().unwrap();
-                let key = state.sync_data.key.clone().unwrap();
                 return iced::clipboard::write(key)
                     .map(|_val: String| RootMessage::Sync(KeyCopied));
             }
             InitSync => {
-                return Task::perform(first_sync(), |id| RootMessage::Sync(IdReceived(id)));
+                return Task::perform(first_sync(), |id| match id {
+                    Ok(id) => RootMessage::Sync(IdReceived(id)),
+                    Err(err) => push_error!(err),
+                });
             }
             GetKey => {
                 return iced::clipboard::read()
@@ -67,17 +71,23 @@ impl NavigatedPage<SyncMessage> for SyncState {
             }
             KeyCopied => {}
             IdReceived(new_id) => {
-                if validate_id(&new_id) == false {
+                if !validate_id(&new_id) {
                     return Task::none();
                 }
-                let mut state = self.state.lock().unwrap();
+                let mut settings = self.state.sync_data.write();
-                state.sync_data.key = Some(new_id.clone());
+                settings.key = Some(new_id.clone());
-                set_setting("SYNC_KEY".to_string(), new_id, &state.connection);
+                if let Err(err) = set_setting(
+                    "SYNC_KEY".to_string(),
+                    new_id,
+                    &self.state.connection.lock(),
+                ) {
+                    return push_error_task!(err);
+                }
             }
             Send => {
                 self.prepare_to_db_interaction();
 
-                let id = self.state.lock().unwrap().sync_data.key.clone().unwrap();
+                let id = self.state.sync_data.read().key.clone().unwrap();
                 let tasks = Task::batch([
                     Task::perform(
                         async { tokio::time::sleep(Duration::from_millis(200)).await },
@@ -89,7 +99,7 @@ impl NavigatedPage<SyncMessage> for SyncState {
                 return tasks;
             }
             GetLast => {
-                let id = self.state.lock().unwrap().sync_data.key.clone().unwrap();
+                let id = self.state.sync_data.read().key.clone().unwrap();
                 let tasks = Task::batch([
                     Task::perform(
                         async { tokio::time::sleep(Duration::from_millis(200)).await },
@@ -114,29 +124,47 @@ impl NavigatedPage<SyncMessage> for SyncState {
             }
             NetworkFinished => {
                 self.frozen = false;
-                let mut updated_state = AppState::new();
+                {
-                fill_state(&mut updated_state);
+                    let mut connection = self.state.connection.lock();
+                    connection.restart();
+                }
 
-                let mut state = self.state.lock().unwrap();
+                if let Err(err) = self.reload_data() {
-                state.sync_data = updated_state.sync_data;
+                    return push_error_task!(err);
-                state.connection = updated_state.connection;
+                }
-                state.card_sets = updated_state.card_sets;
+
-                state.dictionary = updated_state.dictionary;
+                return Task::done(RootMessage::PushNotification(NotificationRequest::Info(
-                state.word_groups = updated_state.word_groups;
+                    NotificationData::DataLoaded,
+                )));
             }
             Disable => {}
             DisableSync => {
-                let mut state = self.state.lock().unwrap();
+                let mut sync_data = self.state.sync_data.write();
-                state.sync_data.key = None;
+                let connection = self.state.connection.lock();
-                delete_settings("SYNC_KEY".to_string(), &state.connection);
+                sync_data.key = None;
-                delete_settings("AUTO_WEB_FETCH".to_string(), &state.connection);
+                let save_result = || {
+                    delete_settings("SYNC_KEY".to_string(), &connection)?;
+                    delete_settings("AUTO_WEB_FETCH".to_string(), &connection)?;
+                    Ok::<(), NotificationData>(())
+                };
 
+                if let Err(error) = save_result() {
+                    return push_error_task!(error);
+                }
             }
             SwitchAutoSync => {
                 self.auto_fetch = !self.auto_fetch;
-                let mut state = self.state.lock().unwrap();
+                let mut sync_data = self.state.sync_data.write();
-                state.sync_data.auto_web_fetch = self.auto_fetch;
+                let connection = self.state.connection.lock();
-                set_setting("AUTO_WEB_FETCH".to_string(), self.auto_fetch.to_string(), &state.connection);
+
+                sync_data.auto_web_fetch = self.auto_fetch;
+                if let Err(err) = set_setting(
+                    "AUTO_WEB_FETCH".to_string(),
+                    self.auto_fetch.to_string(),
+                    &connection,
+                ) {
+                    return push_error_task!(err);
+                }
             }
         }
         Task::none()
@@ -154,11 +182,9 @@ impl NavigatedPage<SyncMessage> for SyncState {
 }
 
 impl SyncState {
-    pub fn new(state: Arc<Mutex<AppState>>) -> SyncState {
+    pub fn new(state: AppState) -> SyncState {
-        let auto_fetch;
+        let auto_fetch = state.sync_data.read().auto_web_fetch;
-        {
+
-            auto_fetch = state.lock().unwrap().sync_data.auto_web_fetch;
-        }
         Self {
             auto_fetch,
             state,
@@ -167,7 +193,14 @@ impl SyncState {
         }
     }
 
-
+    fn reload_data(&mut self) -> Result<(), NotificationData> {
+        self.state.card_states.write().reload()?;
+        self.state.word_groups.write().reload()?;
+        self.state.decks.write().reload()?;
+        self.state.dictionary.write().reload()?;
+        self.state.history.write().reload()?;
+        Ok(())
+    }
 
     fn sync_column(&self) -> Element<'_, SyncMessage> {
         let network_view: Element<'_, SyncMessage> = if self.frozen {
@@ -176,7 +209,7 @@ impl SyncState {
             space().into()
         };
         {
-            if let Some(key) = self.state.lock().unwrap().sync_data.key.clone() {
+            if let Some(key) = self.state.sync_data.read().key.as_ref() {
                 column![
                     text!("Ваш ключ синхронизации"),
                     container(
@@ -188,17 +221,18 @@ impl SyncState {
                         .padding(3)
                     )
                     .style(rounded_box),
-                    button("Скопировать в буфер обмена")
+                    jl_button!("Скопировать в буфер обмена")
-                        .style(jl_button)
                         .on_press(CopyKey)
                         .width(Fill),
                     row![
-                        button("↑ Отправить").style(jl_button).on_press(Send),
+                        jl_button!("↑ Отправить").on_press(Send),
                         space().width(Fill),
-                        button("↓ Скачать").style(jl_button).on_press(GetLast)
+                        jl_button!("↓ Скачать").on_press(GetLast)
                     ]
                     .spacing(DEFAULT_SPACING),
-                    toggler(self.auto_fetch).label("Автоматическая синхронизация").on_toggle(|_| SwitchAutoSync),
+                    toggler(self.auto_fetch)
+                        .label("Автоматическая синхронизация")
+                        .on_toggle(|_| SwitchAutoSync),
                     container(network_view).width(Fill),
                     button("Отключить синхронизацию")
                         .style(danger)
@@ -206,12 +240,8 @@ impl SyncState {
                 ]
             } else {
                 column![
-                    button("Создать сохранение")
+                    jl_button!("Создать сохранение").on_press(InitSync),
-                        .style(jl_button)
+                    jl_button!("Вставить ключ из буфера").on_press(GetKey),
-                        .on_press(InitSync),
-                    button("Вставить ключ из буфера")
-                        .style(jl_button)
-                        .on_press(GetKey),
                 ]
             }
         }
@@ -231,13 +261,24 @@ impl SyncState {
         }
         self.frozen = true;
         self.progress = 0.0;
-        let state = self.state.lock().unwrap();
+        let mut connection = self.state.connection.lock();
-        state
+
-            .connection
+        connection
             .query_row("PRAGMA wal_checkpoint(TRUNCATE)", [], |_| Ok(()))
             .unwrap_or_else(|e| {
-                eprintln!("Ошибка при checkpoint WAL: {e}");
+                error!("Ошибка при checkpoint WAL: {e}");
             });
+        connection.execute("VACUUM;", []).unwrap_or_else(|e| {
+            error!("Ошибка при checkpoint WAL: {e}");
+            0
+        });
+        connection
+            .execute("PRAGMA optimize;", [])
+            .unwrap_or_else(|e| {
+                error!("Ошибка при checkpoint WAL: {e}");
+                0
+            });
+        connection.finish();
     }
 }
 

src/pages/word.rs

@@ -0,0 +1,191 @@
+use crate::app::AppState;
+use crate::data::entities::{EntityHandle, WordData};
+use crate::navigation::Page::PreviousPage;
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::pages::word::WordMessage::*;
+use crate::styling::*;
+use iced::widget::button::danger;
+use iced::widget::{button, column, row, space, text, text_input};
+use iced::{Element, Fill, Task};
+
+pub struct WordState {
+    state: AppState,
+    handle: EntityHandle<WordData>,
+}
+
+impl NavigatedPage<WordMessage> for WordState {
+    fn navigate(&mut self, message: &WordMessage) -> Option<Page> {
+        if let Back = message {
+            Some(PreviousPage)
+        } else {
+            None
+        }
+    }
+
+    fn navigated(&mut self) {}
+    fn update(&mut self, message: WordMessage) -> Task<RootMessage> {
+        // match message {
+        //     Back => {}
+        //     Save => {
+        //         let mut state = self.state.lock();
+        //         state.dictionary[self.index] = self.word.clone();
+        //
+        //         if let Err(err) = update_word(&mut self.word, &state.connection) {
+        //             return push_error_task!(err);
+        //         }
+        //         return Task::done(RootMessage::Word(Back));
+        //     }
+        //     Delete => {
+        //         let mut state = self.state.lock();
+        //         state.dictionary.remove(self.index);
+        //         if let Err(err) = delete_word(&self.word, &state.connection) {
+        //             return push_error_task!(err);
+        //         }
+        //         return Task::done(RootMessage::Word(Back));
+        //     }
+        //     SetTags(n) => self.word.tags = n,
+        //     SetKey(n) => {
+        //         self.word.key = n;
+        //     }
+        //     SetValue(n) => {
+        //         self.word.value = n;
+        //     }
+        //     SetAdditional(key, value) => {
+        //         self.word.additional.insert(key, value.clone());
+        //     }
+        //     AddAdditional(key) => {
+        //         self.word.additional.insert(key, "".to_string());
+        //     }
+        //     RemoveAdditional(key) => {
+        //         self.word.additional.remove(key.as_str());
+        //     }
+        // }
+        Task::none()
+    }
+
+    fn view(&self) -> Element<'_, WordMessage> {
+        // let mut fast_add = row![];
+        // if !self.word.additional.contains_key("reading") {
+        //     fast_add = fast_add.push(
+        //         button("Чтение")
+        //             .style(button::text)
+        //             .on_press(AddAdditional("reading".to_string())),
+        //     );
+        // }
+        // if !self.word.additional.contains_key("description") {
+        //     fast_add = fast_add.push(
+        //         button("Описание")
+        //             .style(button::text)
+        //             .on_press(AddAdditional("description".to_string())),
+        //     );
+        // }
+        //
+        // if !self.word.additional.contains_key("context") {
+        //     fast_add = fast_add.push(
+        //         button("В контексте")
+        //             .style(button::text)
+        //             .on_press(AddAdditional("context".to_string())),
+        //     );
+        // }
+        //
+        // let mut col = iced::widget::column![
+        //     column![
+        //         text!("Ключ"),
+        //         text_input("key", &self.word.key).on_input(SetKey),
+        //     ]
+        //     .spacing(QUARTER_SPACING),
+        //     column![
+        //         text!("Значение"),
+        //         text_input("value", &self.word.value).on_input(SetValue),
+        //     ]
+        //     .spacing(QUARTER_SPACING),
+        //     column![
+        //         text!("Теги"),
+        //         text_input("tags", &self.word.tags).on_input(SetTags),
+        //     ]
+        //     .spacing(QUARTER_SPACING),
+        //     rule::horizontal(2),
+        //     scrollable(fast_add),
+        // ];
+        //
+        // for more in &self.word.additional {
+        //     col = col.push(self.get_view_for_more(more));
+        // }
+        //
+        // back_overlay(
+        //     column![
+        //         col.spacing(DEFAULT_SPACING / 2.0).width(Fill).height(Fill),
+        //         row![
+        //             button("Сохранить").style(jl_button).on_press(Save),
+        //             button("Удалить").style(danger).on_press(Delete),
+        //         ]
+        //         .spacing(DEFAULT_SPACING)
+        //     ]
+        //     .spacing(DEFAULT_SPACING)
+        //     .into(),
+        //     Back,
+        // )
+        space().into()
+    }
+}
+
+impl WordState {
+    pub fn new(handle: EntityHandle<WordData>, state: AppState) -> Self {
+        Self { state, handle }
+    }
+}
+
+impl WordState {
+    fn get_view_for_more(&self, value: (&String, &String)) -> Element<'_, WordMessage> {
+        match value.0.as_str() {
+            "reading" => self.reading_field(value.1),
+            "description" => self.description_field(value.1),
+            "context" => self.context_field(value.1),
+            _ => self.additional_field(value.1, value.0.clone(), value.0.clone()),
+        }
+    }
+
+    fn reading_field(&self, value: &str) -> Element<'_, WordMessage> {
+        self.additional_field(value, "Чтение слова".to_string(), "reading".to_string())
+    }
+
+    fn description_field(&self, value: &str) -> Element<'_, WordMessage> {
+        self.additional_field(value, "Описание".to_string(), "description".to_string())
+    }
+
+    fn context_field(&self, value: &str) -> Element<'_, WordMessage> {
+        self.additional_field(value, "В контексте".to_string(), "context".to_string())
+    }
+    fn additional_field(&self, value: &str, name: String, id: String) -> Element<'_, WordMessage> {
+        column![
+            text!("{}", name),
+            row![
+                text_input(id.clone().as_str(), value)
+                    .on_input({
+                        let value = id.clone();
+                        move |string| SetAdditional(value.clone(), string)
+                    })
+                    .width(Fill),
+                button("-")
+                    .on_press(RemoveAdditional(id.clone()))
+                    .style(danger),
+            ]
+            .spacing(QUARTER_SPACING),
+        ]
+        .spacing(QUARTER_SPACING)
+        .into()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum WordMessage {
+    Save,
+    Back,
+    Delete,
+    SetTags(String),
+    SetKey(String),
+    SetValue(String),
+    AddAdditional(String),
+    RemoveAdditional(String),
+    SetAdditional(String, String),
+}

src/pages/writing.rs

@@ -1,13 +1,12 @@
-use crate::lang::KanaSet;
+use crate::core::kana_set::KanaSet;
+use crate::jl_button;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::styling::*;
-use crate::RootMessage;
 use iced::widget::*;
-use iced::{alignment, Element, Fill, Task};
+use iced::{Element, Fill, Task, alignment};
 use rand::seq::SliceRandom;
 
-#[derive(Clone, Debug)]
 pub struct WritingState {
     kana: String,
     set: Vec<(String, String)>,
@@ -19,7 +18,7 @@ pub struct WritingState {
 }
 
 impl NavigatedPage<WritingMessage> for WritingState {
-    fn navigate(&self, message: &WritingMessage) -> Option<Page> {
+    fn navigate(&mut self, message: &WritingMessage) -> Option<Page> {
         if let WritingMessage::Back = message {
             Some(PreviousPage)
         } else {
@@ -27,11 +26,10 @@ impl NavigatedPage<WritingMessage> for WritingState {
         }
     }
 
-    fn navigated(&mut self) {
+    fn navigated(&mut self) {}
-    }
     fn update(&mut self, message: WritingMessage) -> Task<RootMessage> {
         match message {
-            WritingMessage::Back => todo!(),
+            WritingMessage::Back => {}
             WritingMessage::Next => self.next(),
             WritingMessage::SwitchShowMode(b) => self.show_all = b,
         }
@@ -47,22 +45,18 @@ impl NavigatedPage<WritingMessage> for WritingState {
                 text!("{}", self.kana).size(48),
                 self.answers(),
                 row![
-                    button(text!("{}", self.next_text))
+                    jl_button!(text!("{}", self.next_text)).on_press(WritingMessage::Next),
-                        .style(jl_button)
+                    jl_button!("Закончить").on_press(WritingMessage::Back),
-                        .on_press(WritingMessage::Next),
-                    button("Закончить")
-                        .style(jl_button)
-                        .on_press(WritingMessage::Back),
                 ]
                 .spacing(DEFAULT_SPACING)
             ]
-                .spacing(DEFAULT_SPACING)
+            .spacing(DEFAULT_SPACING)
-                .align_x(alignment::Horizontal::Center),
+            .align_x(alignment::Horizontal::Center),
         )
-            .center_x(Fill)
+        .center_x(Fill)
-            .center_y(Fill)
+        .center_y(Fill)
-            .padding(10)
+        .padding(10)
-            .into()
+        .into()
     }
 }
 
@@ -83,8 +77,6 @@ impl WritingState {
 }
 
 impl WritingState {
-
-
     fn next(&mut self) {
         if self.set.is_empty() {
             self.kana = "".to_string();
@@ -97,24 +89,22 @@ impl WritingState {
         }
 
         if self.show_all {
-            if self.set.is_empty() == false && self.kana_total.is_empty() == false {
+            if !self.set.is_empty() && !self.kana_total.is_empty() {
                 self.set.clear();
             }
             for pair in &self.set {
                 self.kana = "---".to_string();
-                self.roman_total += &*format!("{} ", &pair.1.clone()).to_string();
+                self.roman_total += &*format!("{} ", pair.1.clone()).to_string();
-                self.kana_total += &*format!("{} ", &pair.0).to_string();
+                self.kana_total += &*format!("{} ", pair.0).to_string();
             }
         } else {
             let current = self.set.pop().unwrap();
-            self.kana_total += &*format!("{} ", &current.0).to_string();
+            self.kana_total += &*format!("{} ", current.0).to_string();
-            self.roman_total += &*format!("{} ", &current.1.clone()).to_string();
+            self.roman_total += &*format!("{} ", current.1.clone()).to_string();
             self.kana = current.1;
         }
     }
 
-
-
     fn answers(&self) -> Element<'_, WritingMessage> {
         if self.set.is_empty() {
             text!("{}", self.kana_total).size(36).into()

src/repetition_settings.rs

@@ -1,174 +0,0 @@
-use crate::data_provider::card_sets::{delete_set, update_card_set};
-use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page, RootMessage};
-use crate::repetition_settings::RepetitionSettingsMessage::*;
-use crate::repetitions::CardSetSettings;
-use crate::styling::*;
-use crate::AppState;
-use iced::widget::button::danger;
-use iced::widget::{button, column, row, scrollable, space, text, text_input};
-use iced::{Element, Task};
-use iced_core::Length::Fill;
-use iced_core::Padding;
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
-
-pub struct RepetitionSettingsState {
-    set: CardSetSettings,
-    index: usize,
-    state: Arc<Mutex<AppState>>,
-    real_delete: bool,
-}
-
-impl RepetitionSettingsState {
-    pub(crate) fn new(index: usize, p1: Arc<Mutex<AppState>>) -> RepetitionSettingsState {
-        let set;
-        {
-            let local_state = p1.lock().unwrap();
-            set = local_state.card_sets[index].clone();
-        }
-        RepetitionSettingsState {
-            index,
-            set,
-            state: p1,
-            real_delete: false,
-        }
-    }
-}
-
-impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
-    fn navigate(&self, message: &RepetitionSettingsMessage) -> Option<Page> {
-        if let Back = message {
-            Some(PreviousPage)
-        } else {
-            None
-        }
-    }
-
-    fn navigated(&mut self) {
-    }
-    fn update(&mut self, message: RepetitionSettingsMessage) -> Task<RootMessage> {
-        match message {
-            Back => {}
-            Save => {
-                let mut state = self.state.lock().unwrap();
-                update_card_set(&mut self.set, &state.connection);
-                state.card_sets[self.index] = self.set.clone();
-            }
-            SetName(new) => {
-                self.set.name = new;
-            }
-            SetForward(new) => {
-                self.set.forward = new;
-            }
-            SetBackward(backward) => {
-                self.set.backward = backward;
-            }
-            SetFilter(new) => {
-                self.set.filter = new;
-            }
-            TryFilter => {
-                let state = self.state.lock().unwrap();
-                let count = self.set.get_word_list(&state).len();
-                self.set.count = Some(count);
-            }
-            DeleteSet => {
-                if self.real_delete == false {
-                    self.real_delete = true;
-                    return Task::future(async {
-                        tokio::time::sleep(Duration::from_millis(3000)).await;
-                        return RootMessage::RepetitionSettings(RevertDeleteSet);
-                    });
-                }
-                let mut state = self.state.lock().unwrap();
-                delete_set(&self.set, &state.connection);
-                state.card_sets.remove(self.index);
-                return Task::done(RootMessage::RepetitionSettings(Back));
-            },
-            RevertDeleteSet => self.real_delete = false,
-        }
-        Task::none()
-    }
-
-    fn view(&self) -> Element<'_, RepetitionSettingsMessage> {
-        back_overlay(
-            iced::widget::column![
-                scrollable(
-                    column![
-                        column![
-                            text!("Название набора"),
-                            text_input("", &self.set.name).on_input(SetName),
-                        ]
-                        .spacing(QUARTER_SPACING),
-                        column![
-                            text!("Передняя сторона"),
-                            text_input("", &self.set.forward).on_input(SetForward),
-                        ]
-                        .spacing(QUARTER_SPACING),
-                        column![
-                            text!("Задняя сторона"),
-                            text_input("", &self.set.backward).on_input(SetBackward),
-                        ]
-                        .spacing(QUARTER_SPACING),
-                        column![
-                            text!("Фильтр"),
-                            text_input("", &self.set.filter).on_input(SetFilter),
-                            button("Проверить фильтр")
-                                .style(jl_button)
-                                .on_press(TryFilter),
-                            self.count_view(&self.set),
-                        ]
-                        .spacing(QUARTER_SPACING),
-                    ]
-                    .spacing(DEFAULT_SPACING)
-                    .padding(Padding {
-                        top: 0.0,
-                        right: DEFAULT_SPACING,
-                        bottom: 0.0,
-                        left: 0.0,
-                    })
-                )
-                .height(Fill),
-                row![
-                    button("Сохранить").style(jl_button).on_press(Save),
-                    button(if self.real_delete {
-                        "Вы уверены?"
-                    } else {
-                        "Удалить"
-                    })
-                    .style(danger)
-                    .on_press(DeleteSet),
-                    space().width(Fill),
-                ]
-                .spacing(DEFAULT_SPACING),
-            ]
-                .spacing(DEFAULT_SPACING)
-                .into(),
-            Back,
-        )
-    }
-}
-
-impl RepetitionSettingsState {
-
-
-    fn count_view(&self, set: &CardSetSettings) -> Element<'_, RepetitionSettingsMessage> {
-        if let Some(count) = set.count {
-            return text!("Количество слов: {}", count).into();
-        }
-        space().into()
-    }
-}
-
-#[derive(Clone)]
-pub enum RepetitionSettingsMessage {
-    Back,
-    Save,
-    SetName(String),
-    SetForward(String),
-    SetBackward(String),
-    SetFilter(String),
-    TryFilter,
-    DeleteSet,
-    RevertDeleteSet,
-}

src/repetitions.rs

@@ -1,533 +0,0 @@
-use crate::data_provider::card_sets::{delete_set, update_card_set};
-use crate::data_provider::card_stats::load_stats_of_set;
-use crate::history::HistoryState;
-use crate::lang::{SetOrderMode, WordData};
-use crate::navigation::Page::{History, PreviousPage, Repetition, RepetitionSettings};
-use crate::navigation::{NavigatedPage, Page};
-use crate::repetition::RepetitionState;
-use crate::repetition_settings::RepetitionSettingsState;
-use crate::repetitions::RepetitionsMessage::*;
-use crate::styling::*;
-use crate::{AppState, RootMessage};
-use chrono::{Days, Local};
-use iced::widget::button::{danger, Status};
-pub use iced::widget::button::{Catalog, Style};
-use iced::widget::container::bordered_box;
-use iced::widget::tooltip::Position::Top;
-use iced::widget::{button, column, container, lazy, radio, row, scrollable, space, svg, text, text_input, tooltip, Column, Row};
-use iced::{Background, Border, Center, Color, Element, Fill, Length, Shadow, Task, Theme};
-use iced_core::border::Radius;
-use iced_core::svg::Handle;
-use iced_core::Padding;
-use rhai::{Engine, Scope};
-use std::sync::{Arc, Mutex};
-
-#[derive(Clone)]
-pub struct RepetitionsState {
-    selected_set: Option<usize>,
-    correct_filters: Vec<bool>,
-    pub state: Arc<Mutex<AppState>>,
-}
-
-impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
-    fn navigate(&self, message: &RepetitionsMessage) -> Option<Page> {
-        if let Back = message {
-            Some(PreviousPage)
-        } else if let GoToHistory = message {
-            let card_set;
-            {
-                card_set = self.state.lock().unwrap().card_sets[self.selected_set.unwrap()].id;
-            }
-            Some(History(HistoryState::new(card_set, self.state.clone())))
-        } else if let GoToRepetition = message {
-            let clone = self.state.clone();
-            let card_set;
-            {
-                card_set = self.state.lock().unwrap().card_sets[self.selected_set.unwrap()].clone();
-            }
-            Some(Repetition(RepetitionState::new(card_set, clone)))
-        } else if let GoToSettings = message {
-            Some(RepetitionSettings(RepetitionSettingsState::new(
-                self.selected_set.unwrap(),
-                self.state.clone(),
-            )))
-        } else {
-            None
-        }
-    }
-
-    fn navigated(&mut self) {
-        self.selected_set = None;
-    }
-    fn update(&mut self, message: RepetitionsMessage) -> Task<RootMessage> {
-        let mut state = self.state.lock().unwrap();
-        match message {
-            Next => {}
-            Back => {}
-            GoToRepetition => {}
-            GoToHistory => {}
-            GoToSettings => {}
-            CreateSet => {
-                let index = state.card_sets.len() + 1;
-                state
-                    .card_sets
-                    .push(CardSetSettings::with_name(format!("Card set #{}", index)));
-                self.correct_filters.push(true);
-            }
-            DeleteSet => {
-                let set = state.card_sets.remove(self.selected_set.unwrap());
-                self.correct_filters.remove(self.selected_set.unwrap());
-                self.selected_set = None;
-                delete_set(&set, &state.connection);
-            }
-            SelectSet(index) => {
-                self.selected_set = Some(index);
-                let mut set = state.card_sets.get(index).unwrap().clone();
-                set.update_worst_words(&state);
-                state.card_sets[index] = set;
-            }
-            SetName(new) => {
-                state.card_sets[self.selected_set.unwrap()].name = new;
-            }
-            Save => {
-                for i in 0..state.card_sets.len() {
-                    self.correct_filters[i] = state.card_sets[i].check_filter();
-                }
-
-                let set = &mut state.card_sets[self.selected_set.unwrap()].clone();
-
-                update_card_set(set, &state.connection);
-
-                state.card_sets[self.selected_set.unwrap()] = set.clone();
-            }
-            SetForward(new) => {
-                state.card_sets[self.selected_set.unwrap()].forward = new;
-            }
-            SetBackward(new) => {
-                state.card_sets[self.selected_set.unwrap()].backward = new;
-            }
-            SetFilter(new) => {
-                state.card_sets[self.selected_set.unwrap()].filter = new;
-            }
-            TryFilter => {
-                let set = state.card_sets.get(self.selected_set.unwrap()).unwrap();
-                let count = set.get_word_list(&state).len();
-                state.card_sets[self.selected_set.unwrap()].count = Some(count);
-            }
-            SetOpenMode(mode) => {
-                state
-                    .card_sets
-                    .get_mut(self.selected_set.unwrap())
-                    .unwrap()
-                    .open_mode = mode;
-            }
-        }
-        Task::none()
-    }
-
-    fn view(&self) -> Element<'_, RepetitionsMessage> {
-        back_overlay(
-            row![
-                column![
-                    scrollable(self.sets_list()).height(Fill),
-                    button("Добавить")
-                        .style(jl_button)
-                        .width(Fill)
-                        .on_press(CreateSet),
-                ]
-                .spacing(DEFAULT_SPACING)
-                .width(Length::FillPortion(1)),
-                self.selected_set_view(),
-            ]
-                .align_y(Center)
-                .spacing(DEFAULT_SPACING)
-                .width(Fill)
-                .height(Fill)
-                .into(),
-            Back,
-        )
-    }
-
-}
-
-impl RepetitionsState {
-    pub(crate) fn new(state: Arc<Mutex<AppState>>) -> RepetitionsState {
-        let count = state.lock().unwrap().card_sets.len();
-        RepetitionsState {
-            selected_set: None,
-            correct_filters: vec![true; count],
-            state,
-        }
-    }
-}
-
-impl RepetitionsState {
-
-    fn launch_delete_button(&self, set: &CardSetSettings) -> Element<'_, RepetitionsMessage> {
-        if set.id != 0 {
-            return row![
-                space().width(Fill),
-                button(text!("Начать повторение").width(200).center())
-                    .style(cta_button)
-                    .on_press(GoToRepetition)
-            ]
-            .into();
-        }
-        button("Удалить").style(danger).on_press(DeleteSet).into()
-    }
-
-    fn selected_set_view(&self) -> Element<'_, RepetitionsMessage> {
-        if let Some(index) = self.selected_set {
-            let set;
-            {
-                let state = self.state.lock().unwrap();
-                if state.card_sets.len() <= index {
-                    return space().width(Length::FillPortion(3)).into();
-                }
-                set = state.card_sets[index].clone();
-            }
-            return column![
-                scrollable(
-                    column![
-                        column![
-                            text!("Название набора"),
-                            row![
-                                text_input("", &set.name).on_input(SetName),
-                                button(svg(Handle::from_memory(SETTINGS_ICON)))
-                                    .width(43)
-                                    .on_press(GoToSettings),
-                            ]
-                            .spacing(HALF_SPACING)
-                        ]
-                        .spacing(QUARTER_SPACING),
-                        {
-                            if set.id == 0 {
-                                column![
-                                    column![
-                                        text!("Передняя сторона"),
-                                        text_input("", &set.forward).on_input(SetForward),
-                                    ]
-                                    .spacing(QUARTER_SPACING),
-                                    column![
-                                        text!("Задняя сторона"),
-                                        text_input("", &set.backward).on_input(SetBackward),
-                                    ]
-                                    .spacing(QUARTER_SPACING),
-                                    column![
-                                        text!("Фильтр"),
-                                        text_input("", &set.filter).on_input(SetFilter),
-                                        button("Проверить фильтр")
-                                            .style(jl_button)
-                                            .on_press(TryFilter),
-                                        self.count_view(&set),
-                                    ]
-                                    .spacing(QUARTER_SPACING),
-                                ]
-                                .spacing(DEFAULT_SPACING)
-                            } else {
-                                self.filled_set_data_view(&set)
-                            }
-                        },
-                        radio(
-                            "Обычный режим",
-                            SetOrderMode::Default,
-                            Some(set.open_mode),
-                            SetOpenMode
-                        ),
-                        self.words_words_view(&set),
-                        button("История").style(jl_button).on_press(GoToHistory),
-                    ]
-                    .spacing(DEFAULT_SPACING)
-                    .padding(Padding {
-                        top: 0.0,
-                        right: DEFAULT_SPACING,
-                        bottom: 0.0,
-                        left: 0.0,
-                    })
-                )
-                .height(Fill),
-                row![
-                    button("Сохранить").style(jl_button).on_press(Save),
-                    self.launch_delete_button(&set)
-                ]
-                .spacing(DEFAULT_SPACING),
-            ]
-            .spacing(DEFAULT_SPACING)
-            .width(Length::FillPortion(3))
-            .into();
-        }
-        space().width(Length::FillPortion(3)).into()
-    }
-
-    fn filled_set_data_view(&self, set: &CardSetSettings) -> Column<'_, RepetitionsMessage> {
-        column![self.activity_bar(set)].align_x(Center)
-            .width(Fill)
-            .spacing(DEFAULT_SPACING)
-            .into()
-    }
-    fn activity_bar(&self, set: &CardSetSettings) -> Element<'_, RepetitionsMessage> {
-        const MAX_DAY_COUNT: f32 = 128.0;
-
-        let state = self.state.lock().unwrap();
-        let history = state.activity.get(&set.id);
-        let mut counts: Vec<u32> = vec![0; 30 * 7];
-        let now = Local::now().date_naive();
-
-
-        if let Some(history) = history {
-            for (date, activity) in history {
-                let distance = now - *date;
-                let index = counts.len() as i64 - distance.num_days() - 1;
-
-                if index == 210 {
-                    println!("invalid index")
-                }
-                if index < 0 {
-                    continue;
-                }
-
-                counts[index as usize] = *activity;
-            }
-        }
-
-        lazy((counts, now), |(counts, now)| {
-            let mut row = Row::new()
-                .padding(Padding {
-                    top: 0.0,
-                    right: 0.0,
-                    bottom: 0.0,
-                    left: DEFAULT_SPACING,
-                })
-                .spacing(QUARTER_SPACING);
-
-
-            let mut iter = counts.into_iter();
-            for i in 0..30 {
-                let mut column = Column::new().spacing(QUARTER_SPACING);
-
-                for j in 0..7 {
-                    let value = *iter.next().unwrap() as f32;
-                    let k = (value / MAX_DAY_COUNT).min(1.0) * 0.9 + 0.1;
-
-                    let date = now.clone().checked_sub_days(Days::new(30 * 7 - i * 7 - j - 1)).unwrap();
-
-                    column = column.push(tooltip(
-                        iced::widget::container(space().height(15).width(15)).style(
-                            move |x: &Theme| container::Style {
-                                text_color: None,
-                                background: Some(Background::Color(x.palette().primary.scale_alpha(k))),
-                                border: Border {
-                                    color: Default::default(),
-                                    width: 0.0,
-                                    radius: Radius::new(5),
-                                },
-                                shadow: Default::default(),
-                                snap: false,
-                            },
-                        ),
-                        text!("{} {} карточки", date.format("%Y.%m.%d"), value),
-                        Top,
-                    ));
-                }
-
-                row = row.push(column);
-            }
-            scrollable(column!["Карта активности", row].spacing(QUARTER_SPACING).align_x(Center))
-        }).into()
-
-    }
-
-    fn words_words_view(&self, set: &CardSetSettings) -> Element<'_, RepetitionsMessage> {
-        column![
-            text!("Худшие слова"),
-            container(scrollable(self.worst_words_list(&set)).height(200)).style(bordered_box),
-            radio(
-                "Начать с плохих слов",
-                SetOrderMode::TrainWorstFirst,
-                Some(set.open_mode),
-                SetOpenMode
-            ),
-            radio(
-                "Полностью случайно",
-                SetOrderMode::FullRandom,
-                Some(set.open_mode),
-                SetOpenMode
-            )
-        ]
-        .spacing(DEFAULT_SPACING)
-        .into()
-    }
-
-    fn worst_words_list(&self, set: &CardSetSettings) -> Element<'_, RepetitionsMessage> {
-        let mut column = Column::new();
-
-        for word in set.worst_words_list.clone().unwrap() {
-            column = column.push(text!("{} | {}", &word.key, &word.value));
-        }
-        column.into()
-    }
-
-    fn count_view(&self, set: &CardSetSettings) -> Element<'_, RepetitionsMessage> {
-        if let Some(count) = set.count {
-            return text!("Количество слов: {}", count).into();
-        }
-        space().into()
-    }
-
-    fn sets_list(&self) -> Column<'_, RepetitionsMessage> {
-        let mut column = Column::new();
-        let mut i = 0;
-        let sets = &self.state.lock().unwrap().card_sets;
-        for set in sets {
-            column = column.push(
-                button(text!("{}", set.name.clone()))
-                    .on_press_with(move || SelectSet(i.clone()))
-                    .style(move |_x: &Theme, status: Status| Style {
-                        background: if status == Status::Hovered {
-                            Some(Background::Color(Color::WHITE.scale_alpha(0.2)))
-                        } else {
-                            None
-                        },
-                        text_color: if self.correct_filters[i.clone()] {
-                            _x.palette().primary
-                        } else {
-                            _x.palette().warning
-                        },
-                        border: Border {
-                            color: Default::default(),
-                            width: 0.0,
-                            radius: BUTTON_RADIUS.into(),
-                        },
-                        shadow: Shadow::default(),
-                        snap: false,
-                    }),
-            );
-            i += 1;
-        }
-
-        column
-    }
-}
-
-#[derive(Clone)]
-pub enum RepetitionsMessage {
-    Next,
-    Back,
-    GoToRepetition,
-    CreateSet,
-    DeleteSet,
-    SetName(String),
-    SelectSet(usize),
-    Save,
-    SetForward(String),
-    SetBackward(String),
-    SetFilter(String),
-    TryFilter,
-    SetOpenMode(SetOrderMode),
-    GoToHistory,
-    GoToSettings,
-}
-
-#[derive(Clone)]
-pub struct CardSetSettings {
-    pub id: u32,
-    pub name: String,
-    pub forward: String,
-    pub backward: String,
-    pub filter: String,
-    pub count: Option<usize>,
-    pub worst_words_list: Option<Vec<WordData>>,
-    pub open_mode: SetOrderMode,
-}
-
-impl CardSetSettings {
-    fn with_name(name: String) -> CardSetSettings {
-        CardSetSettings {
-            id: 0,
-            name,
-            forward: "".to_string(),
-            backward: "".to_string(),
-            filter: "true".to_string(),
-            count: None,
-            worst_words_list: None,
-            open_mode: SetOrderMode::Default,
-        }
-    }
-
-    fn check_filter(&self) -> bool {
-        let engine = Engine::new();
-        let ast = engine.compile(&self.filter);
-        ast.is_ok()
-    }
-
-    pub fn get_word_list(&self, state: &AppState) -> Vec<WordData> {
-        let mut list = vec![];
-        let engine = Engine::new();
-        let ast = engine.compile(&self.filter);
-        if ast.is_err() {
-            return list;
-        }
-
-        let ast = ast.unwrap();
-
-        let groups = &state.word_groups;
-
-        for word in &state.dictionary {
-            let mut more = rhai::Map::new();
-            for iced in &word.additional {
-                more.insert(iced.0.clone().into(), iced.1.clone().into());
-            }
-            let mut scope = Scope::new();
-            scope
-                .push_constant("key", word.key.clone())
-                .push_constant("value", word.value.clone())
-                .push_constant("tags", word.tags.clone())
-                .push_constant("more", more)
-                .push_constant(
-                    "group",
-                    groups
-                        .iter()
-                        .find(|g| g.id == word.group_id)
-                        .cloned()
-                        .unwrap()
-                        .name,
-                );
-
-            let result = engine.eval_ast_with_scope::<bool>(&mut scope, &ast);
-            if result.is_ok() && result.unwrap() {
-                list.push(word.clone());
-            }
-        }
-
-        list
-    }
-
-    pub fn require_speech(&self) -> bool {
-        self.forward == "speech" || self.backward == "speech"
-    }
-
-    fn update_worst_words(&mut self, state: &AppState) {
-        if let Some(_) = self.worst_words_list {
-            return;
-        }
-
-        let connection = &state.connection;
-        let mut stats = load_stats_of_set(self, connection);
-        stats.sort_by_key(|s| s.calculated_score() as i32);
-        let avg = stats.iter().map(|s| s.calculated_score()).sum::<f32>() / stats.len() as f32;
-        let avg = avg * 0.7;
-        let bad: Vec<WordData> = stats
-            .iter()
-            .take_while(|word| word.calculated_score() < avg)
-            .map(|stat| {
-                state.dictionary[state
-                    .dictionary
-                    .binary_search_by_key(&stat.word_id, |x| x.id)
-                    .unwrap()]
-                .clone()
-            })
-            .collect();
-
-        self.worst_words_list = Some(bad.clone());
-    }
-}

src/styling.rs

@@ -1,10 +1,9 @@
-use crate::repetitions::Style;
+use iced::Element;
 use iced::border::Radius;
 use iced::widget::button::*;
-use iced::widget::{button, container};
+use iced::widget::container;
-use iced::Element;
-use iced_core::alignment::Horizontal::Left;
 use iced_core::Length::Fill;
+use iced_core::alignment::Horizontal::Left;
 use iced_core::{Border, Theme};
 
 pub const HALF_SPACING: f32 = DEFAULT_SPACING / 2.0;
@@ -15,7 +14,7 @@ pub const BUTTON_RADIUS: f32 = 8.0;
 
 pub const SETTINGS_ICON: &[u8] = include_bytes!("../settings_icon.svg");
 
-pub fn jl_button(theme: &Theme, status: Status) -> Style {
+pub fn jl_button_style(theme: &Theme, status: Status) -> Style {
     let mut style = primary(theme, status);
     style.border = Border {
         color: Default::default(),
@@ -31,15 +30,19 @@ pub fn cta_button(theme: &Theme, status: Status) -> Style {
     style
 }
 
+#[macro_export]
+macro_rules! jl_button {
+    ($content:expr) => {
+        iced::widget::button($content).style($crate::styling::jl_button_style)
+    };
+}
+
 pub fn back_overlay<'a, T: Clone + 'a>(content: Element<'a, T>, back_message: T) -> Element<'a, T> {
     container(
-        iced::widget::column![
+        iced::widget::column![jl_button!("Назад").on_press(back_message), content]
-            button("Назад").style(jl_button).on_press(back_message),
+            .spacing(DEFAULT_SPACING)
-            content
+            .align_x(Left)
-        ]
+            .width(Fill),
-        .spacing(DEFAULT_SPACING)
-        .align_x(Left)
-        .width(Fill),
     )
     .center_x(Fill)
     .padding(10)

src/tests.rs

@@ -0,0 +1,123 @@
+#[cfg(test)]
+mod mod_tests {
+    use crate::data::Id;
+    use crate::data::entities::{EntityData, EntityHandle};
+    use crate::data::repositories::fast_position_of;
+
+    struct ProtoEntity {
+        id: Id,
+        _data: i128,
+    }
+    impl EntityData for ProtoEntity {
+        fn id(&self) -> Id {
+            self.id
+        }
+
+        fn set_id(&mut self, id: Id) {
+            self.id = id;
+        }
+    }
+
+    impl ProtoEntity {
+        fn new(n: i128) -> Self {
+            Self {
+                id: (n as u32).into(),
+                _data: n,
+            }
+        }
+    }
+
+    #[test]
+    fn search_direct() {
+        let mut entity = EntityHandle::new(8.into(), 3, true);
+        assert_eq!(
+            fast_position_of(&[1, 2, 3, 8, 9, 12].map(ProtoEntity::new), &mut entity),
+            Some(3)
+        );
+    }
+
+    #[test]
+    fn search_0() {
+        let mut entity = EntityHandle::new(8.into(), 4, true);
+        assert_eq!(
+            fast_position_of(&[1, 2, 3, 8, 9, 12].map(ProtoEntity::new), &mut entity),
+            Some(3)
+        );
+    }
+
+    #[test]
+    fn search_1() {
+        let mut entity = EntityHandle::new(9.into(), 5, true);
+        assert_eq!(
+            fast_position_of(&[1, 2, 3, 8, 9, 12].map(ProtoEntity::new), &mut entity),
+            Some(4)
+        );
+    }
+
+    #[test]
+    fn search_2() {
+        let mut entity = EntityHandle::new(106.into(), 25, true);
+        assert_eq!(
+            fast_position_of(
+                &[
+                    1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 20, 21, 22, 23, 105, 106, 107,
+                    108, 109, 110
+                ]
+                .map(ProtoEntity::new),
+                &mut entity
+            ),
+            Some(18)
+        );
+    }
+
+    #[test]
+    fn id_0() {
+        let entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, true);
+        assert!(entity.real())
+    }
+
+    #[test]
+    fn id_1() {
+        let entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        assert!(!entity.real())
+    }
+
+    #[test]
+    fn id_3() {
+        let entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, true);
+        assert_eq!(entity.index(), 25)
+    }
+
+    #[test]
+    fn id_4() {
+        let entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        assert_eq!(entity.index(), 25)
+    }
+    #[test]
+    fn id_5() {
+        let mut entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, true);
+        entity.set_real(true);
+        assert!(entity.real())
+    }
+
+    #[test]
+    fn id_6() {
+        let mut entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        entity.set_real(true);
+        assert!(entity.real())
+    }
+
+    #[test]
+    fn id_7() {
+        let mut entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, true);
+        entity.set_index(0);
+        assert_eq!(entity.index(), 0)
+    }
+
+    #[test]
+    fn id_8() {
+        let mut entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        entity.set_index(0);
+        assert_eq!(entity.index(), 0)
+    }
+}

src/word.rs

@@ -1,196 +0,0 @@
-use crate::data_provider::words::{delete_word, update_word};
-use crate::lang::WordData;
-use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
-use crate::styling::*;
-use crate::word::WordMessage::*;
-use crate::{AppState, RootMessage};
-use iced::widget::button::danger;
-use iced::widget::{button, column, row, rule, scrollable, text, text_input};
-use iced::{Element, Fill, Task};
-use std::sync::{Arc, Mutex};
-
-#[derive(Clone)]
-pub struct WordState {
-    state: Arc<Mutex<AppState>>,
-    index: usize,
-    word: WordData,
-}
-
-impl NavigatedPage<WordMessage> for WordState {
-    fn navigate(&self, message: &WordMessage) -> Option<Page> {
-        if let Back = message {
-            Some(PreviousPage)
-        } else {
-            None
-        }
-    }
-
-    fn navigated(&mut self) {}
-    fn update(&mut self, message: WordMessage) -> Task<RootMessage> {
-        match message {
-            Back => {}
-            Save => {
-                let mut state = self.state.lock().unwrap();
-                state.dictionary[self.index] = self.word.clone();
-                update_word(&mut self.word, &state.connection);
-                return Task::done(RootMessage::Word(Back));
-            }
-            Delete => {
-                let mut state = self.state.lock().unwrap();
-                state.dictionary.remove(self.index);
-                delete_word(&self.word, &state.connection);
-                return Task::done(RootMessage::Word(Back));
-            }
-            SetTags(n) => self.word.tags = n,
-            SetKey(n) => {
-                self.word.key = n;
-            }
-            SetValue(n) => {
-                self.word.value = n;
-            }
-            SetAdditional(key, value) => match key.as_str() {
-                _ => {
-                    self.word.additional.insert(key, value.clone());
-                }
-            },
-            AddAdditional(key) => {
-                self.word.additional.insert(key, "".to_string());
-            }
-            RemoveAdditional(key) => {
-                self.word.additional.remove(key.as_str());
-            }
-        }
-        Task::none()
-    }
-
-    fn view(&self) -> Element<'_, WordMessage> {
-        let mut fast_add = row![];
-        if !self.word.additional.contains_key("reading") {
-            fast_add = fast_add.push(
-                button("Чтение")
-                    .style(button::text)
-                    .on_press(AddAdditional("reading".to_string())),
-            );
-        }
-        if !self.word.additional.contains_key("description") {
-            fast_add = fast_add.push(
-                button("Описание")
-                    .style(button::text)
-                    .on_press(AddAdditional("description".to_string())),
-            );
-        }
-
-        if !self.word.additional.contains_key("context") {
-            fast_add = fast_add.push(
-                button("В контексте")
-                    .style(button::text)
-                    .on_press(AddAdditional("context".to_string())),
-            );
-        }
-
-        let mut col = iced::widget::column![
-            column![
-                text!("Ключ"),
-                text_input("key", &self.word.key).on_input(SetKey),
-            ]
-            .spacing(QUARTER_SPACING),
-            column![
-                text!("Значение"),
-                text_input("value", &self.word.value).on_input(SetValue),
-            ]
-            .spacing(QUARTER_SPACING),
-            column![
-                text!("Теги"),
-                text_input("tags", &self.word.tags).on_input(SetTags),
-            ]
-            .spacing(QUARTER_SPACING),
-            rule::horizontal(2),
-            scrollable(fast_add),
-        ];
-
-        for more in &self.word.additional {
-            col = col.push(self.get_view_for_more(more));
-        }
-
-        back_overlay(
-            column![
-                col.spacing(DEFAULT_SPACING / 2.0).width(Fill).height(Fill),
-                row![
-                    button("Сохранить").style(jl_button).on_press(Save),
-                    button("Удалить").style(danger).on_press(Delete),
-                ]
-                .spacing(DEFAULT_SPACING)
-            ]
-            .spacing(DEFAULT_SPACING)
-            .into(),
-            Back,
-        )
-    }
-}
-
-impl WordState {
-    pub(crate) fn new(word: WordData, index: usize, state: Arc<Mutex<AppState>>) -> WordState {
-        WordState { state, index, word }
-    }
-}
-
-impl WordState {
-    fn get_view_for_more(&self, value: (&String, &String)) -> Element<'_, WordMessage> {
-        match value.0.as_str() {
-            "reading" => self.reading_field(value.1),
-            "description" => self.description_field(value.1),
-            "context" => self.context_field(value.1),
-            _ => self.additional_field(value.1, value.0.clone(), value.0.clone()),
-        }
-    }
-
-    fn reading_field(&self, value:  &String) -> Element<'_, WordMessage> {
-        self.additional_field(value, "Чтение слова".to_string(), "reading".to_string())
-    }
-
-    fn description_field(&self, value: &String) -> Element<'_, WordMessage> {
-        self.additional_field(value, "Описание".to_string(), "description".to_string())
-    }
-
-    fn context_field(&self, value: &String) -> Element<'_, WordMessage> {
-        self.additional_field(value, "В контексте".to_string(), "context".to_string())
-    }
-    fn additional_field(
-        &self,
-        value: &String,
-        name: String,
-        id: String,
-    ) -> Element<'_, WordMessage> {
-        column![
-            text!("{}", name),
-            row![
-                text_input(id.clone().as_str(), value)
-                    .on_input({
-                        let value = id.clone();
-                        move |string| SetAdditional(value.clone(), string)
-                    })
-                    .width(Fill),
-                button("-")
-                    .on_press(RemoveAdditional(id.clone()))
-                    .style(danger),
-            ]
-            .spacing(QUARTER_SPACING),
-        ]
-        .spacing(QUARTER_SPACING)
-        .into()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum WordMessage {
-    Save,
-    Back,
-    Delete,
-    SetTags(String),
-    SetKey(String),
-    SetValue(String),
-    AddAdditional(String),
-    RemoveAdditional(String),
-    SetAdditional(String, String),
-}