Rename methods

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

Cargo.lock

@@ -152,12 +152,56 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.101"
@@ -728,6 +772,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1016,7 +1066,7 @@ dependencies = [
  "cosmic-text",
  "etagere",
  "lru",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "wgpu",
 ]
 
@@ -1068,6 +1118,37 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
 
+[[package]]
+name = "defmt"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+dependencies = [
+ "bitflags 1.3.2",
+ "defmt-macros",
+]
+
+[[package]]
+name = "defmt-macros"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
+dependencies = [
+ "defmt-parser",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
+[[package]]
+name = "defmt-parser"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+dependencies = [
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -1215,6 +1296,29 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "env_filter"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1970,7 +2074,7 @@ dependencies = [
  "lilt",
  "log",
  "num-traits",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "smol_str",
  "thiserror 2.0.18",
  "web-time",
@@ -1996,7 +2100,7 @@ dependencies = [
  "futures",
  "iced_core",
  "log",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "tokio",
  "wasm-bindgen-futures",
  "wasmtimer",
@@ -2016,7 +2120,7 @@ dependencies = [
  "iced_futures",
  "log",
  "raw-window-handle",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "thiserror 2.0.18",
  "unicode-segmentation",
 ]
@@ -2070,7 +2174,7 @@ dependencies = [
  "kurbo 0.10.4",
  "log",
  "resvg",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "softbuffer",
  "tiny-skia",
 ]
@@ -2091,7 +2195,7 @@ dependencies = [
  "iced_graphics",
  "log",
  "resvg",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "thiserror 2.0.18",
  "wgpu",
 ]
@@ -2106,7 +2210,7 @@ dependencies = [
  "log",
  "num-traits",
  "ouroboros",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "thiserror 2.0.18",
  "unicode-segmentation",
 ]
@@ -2121,7 +2225,7 @@ dependencies = [
  "iced_program",
  "log",
  "mundy",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "thiserror 2.0.18",
  "tracing",
  "wasm-bindgen-futures",
@@ -2292,6 +2396,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -2314,10 +2424,12 @@ dependencies = [
  "chrono",
  "criterion",
  "dirs",
+ "env_logger",
  "hashbrown 0.17.1",
  "hex",
  "iced",
  "iced_core",
+ "log",
  "mimalloc",
  "parking_lot",
  "rand",
@@ -2327,6 +2439,7 @@ dependencies = [
  "rhai",
  "rodio",
  "rusqlite",
+ "rustc-hash 2.1.3",
  "serde_json",
  "sha2",
  "tokio",
@@ -2334,6 +2447,42 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "jiff"
+version = "0.2.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "668b7183bd07af9a4885f5c35b0cc5c83c4607a913c16b7e17291832910d2dcc"
+dependencies = [
+ "defmt",
+ "jiff-core",
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+]
+
+[[package]]
+name = "jiff-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7feca88439efe53da3754500c1851dedf3cb36c524dd5cf8225cc0794de95d09"
+dependencies = [
+ "defmt",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a69dcb3a21cfb32ce1cd056169337ca284af0766dd766e7878819b251a49204"
+dependencies = [
+ "jiff-core",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -2584,9 +2733,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "lru"
@@ -3309,6 +3458,12 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "oorandom"
 version = "11.1.5"
@@ -3681,7 +3836,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustls",
  "socket2",
  "thiserror 2.0.18",
@@ -3703,7 +3858,7 @@ dependencies = [
  "rand",
  "rand_pcg",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustls",
  "rustls-pki-types",
  "slab",
@@ -4102,9 +4257,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
 [[package]]
 name = "rustc_version"
@@ -5390,6 +5545,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.20.0"

Cargo.toml

@@ -24,6 +24,8 @@ 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"
 
 [profile.super-release]
 inherits = "release"
@@ -35,9 +37,12 @@ panic = "abort"
 
 [dev-dependencies]
 criterion = { version = "0.8.2", features = ["html_reports"] }
+rustc-hash = "2.1.3"
 
 [[bench]]
 name = "map_bench"
 harness = false
 
-
+[[bench]]
+name = "repo_cache_bench"
+harness = false

benches/repo_cache_bench.rs

@@ -0,0 +1,325 @@
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
+use hashbrown::HashMap as HashbrownMap;
+use rustc_hash::FxHashMap;
+use std::collections::{BTreeMap, HashMap};
+use std::hint::black_box;
+
+// Тестовая структура (аналог вашей сущности)
+#[derive(Debug, Clone)]
+struct Entity {
+    id: i64,
+    data: [u8; 64], // 64 байта данных для реалистичности
+}
+
+impl Entity {
+    fn new(id: i64) -> Self {
+        Self {
+            id,
+            data: [id as u8; 64],
+        }
+    }
+}
+
+// ========== ТЕСТОВЫЕ ФУНКЦИИ ==========
+
+fn bench_vec_insert_sorted(vec: &mut Vec<Entity>, entities: &[Entity]) {
+    vec.clear();
+    for entity in entities {
+        vec.push(entity.clone());
+    }
+    // Vec уже отсортирован, так как ID монотонно возрастают
+}
+
+fn bench_vec_search_separated<'a>(ids: &[i64], vec: &'a [Entity], id: i64) -> Option<&'a Entity> {
+    match ids.binary_search(&id) {
+        Ok(index) => Some(&vec[index]),
+        Err(_) => None,
+    }
+}
+
+fn bench_vec_search(vec: &Vec<Entity>, id: i64) -> Option<&Entity> {
+    match vec.binary_search_by(|probe| probe.id.cmp(&id)) {
+        Ok(index) => Some(&vec[index]),
+        Err(_) => None,
+    }
+}
+
+fn bench_btreemap_insert(map: &mut BTreeMap<i64, Entity>, entities: &[Entity]) {
+    map.clear();
+    for entity in entities {
+        map.insert(entity.id, entity.clone());
+    }
+}
+
+fn bench_btreemap_search(map: &BTreeMap<i64, Entity>, id: i64) -> Option<&Entity> {
+    map.get(&id)
+}
+
+fn bench_hashmap_insert(map: &mut HashMap<i64, Entity>, entities: &[Entity]) {
+    map.clear();
+    for entity in entities {
+        map.insert(entity.id, entity.clone());
+    }
+}
+
+fn bench_hashmap_search(map: &HashMap<i64, Entity>, id: i64) -> Option<&Entity> {
+    map.get(&id)
+}
+
+fn bench_hashbrown_insert(map: &mut HashbrownMap<i64, Entity>, entities: &[Entity]) {
+    map.clear();
+    for entity in entities {
+        map.insert(entity.id, entity.clone());
+    }
+}
+
+fn bench_hashbrown_search(map: &HashbrownMap<i64, Entity>, id: i64) -> Option<&Entity> {
+    map.get(&id)
+}
+
+fn bench_fxhashmap_insert(map: &mut FxHashMap<i64, Entity>, entities: &[Entity]) {
+    map.clear();
+    for entity in entities {
+        map.insert(entity.id, entity.clone());
+    }
+}
+
+fn bench_fxhashmap_search(map: &FxHashMap<i64, Entity>, id: i64) -> Option<&Entity> {
+    map.get(&id)
+}
+
+// ========== ГЕНЕРАЦИЯ ДАННЫХ ==========
+
+fn generate_entities(count: usize) -> Vec<Entity> {
+    (0..count).map(|i| Entity::new(i as i64)).collect()
+}
+
+fn generate_search_ids(count: usize, max_id: i64) -> Vec<i64> {
+    // 70% попаданий, 30% промахов (реалистичный сценарий)
+    let mut ids = Vec::with_capacity(count);
+    for i in 0..count {
+        if i % 10 < 7 {
+            // Попадание
+            ids.push((i as i64 * 13) % max_id);
+        } else {
+            // Промах (несуществующий ID)
+            ids.push(max_id + i as i64);
+        }
+    }
+    ids
+}
+
+// ========== БЕНЧМАРКИ ==========
+
+fn bench_insert(c: &mut Criterion) {
+    let mut group = c.benchmark_group("insert");
+
+    for size in [10_000, 100_000, 500_000] {
+        let entities = generate_entities(size);
+
+        group.bench_with_input(
+            BenchmarkId::new("Vec (sorted)", size),
+            &entities,
+            |b, entities| {
+                let mut vec = Vec::with_capacity(size);
+                b.iter(|| {
+                    bench_vec_insert_sorted(&mut vec, black_box(entities));
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("BTreeMap", size),
+            &entities,
+            |b, entities| {
+                let mut map = BTreeMap::new();
+                b.iter(|| {
+                    bench_btreemap_insert(&mut map, black_box(entities));
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("HashMap (std)", size),
+            &entities,
+            |b, entities| {
+                let mut map = HashMap::new();
+                b.iter(|| {
+                    bench_hashmap_insert(&mut map, black_box(entities));
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("HashMap (hashbrown)", size),
+            &entities,
+            |b, entities| {
+                let mut map = HashbrownMap::new();
+                b.iter(|| {
+                    bench_hashbrown_insert(&mut map, black_box(entities));
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("FxHashMap", size),
+            &entities,
+            |b, entities| {
+                let mut map = FxHashMap::default();
+                b.iter(|| {
+                    bench_fxhashmap_insert(&mut map, black_box(entities));
+                });
+            },
+        );
+    }
+
+    group.finish();
+}
+
+fn bench_search(c: &mut Criterion) {
+    let mut group = c.benchmark_group("search");
+
+    for size in [10_000, 100_000, 500_000] {
+        let entities = generate_entities(size);
+        let entity_ids = entities.iter().map(|entity| entity.id).collect::<Vec<_>>();
+        let search_ids = generate_search_ids(1000, size as i64);
+
+        // Подготовка коллекций
+        let mut vec = Vec::with_capacity(size);
+        bench_vec_insert_sorted(&mut vec, &entities);
+
+        let mut btreemap = BTreeMap::new();
+        bench_btreemap_insert(&mut btreemap, &entities);
+
+        let mut hashmap = HashMap::new();
+        bench_hashmap_insert(&mut hashmap, &entities);
+
+        let mut hashbrown = HashbrownMap::new();
+        bench_hashbrown_insert(&mut hashbrown, &entities);
+
+        let mut fxhashmap = FxHashMap::default();
+        bench_fxhashmap_insert(&mut fxhashmap, &entities);
+
+        group.bench_with_input(
+            BenchmarkId::new("Vec (binary search)", size),
+            &search_ids,
+            |b, ids| {
+                b.iter(|| {
+                    for &id in ids {
+                        black_box(bench_vec_search_separated(&entity_ids, &vec, black_box(id)));
+                    }
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("Vec (binary search) separated", size),
+            &search_ids,
+            |b, ids| {
+                b.iter(|| {
+                    for &id in ids {
+                        black_box(bench_vec_search(&vec, black_box(id)));
+                    }
+                });
+            },
+        );
+
+        group.bench_with_input(BenchmarkId::new("BTreeMap", size), &search_ids, |b, ids| {
+            b.iter(|| {
+                for &id in ids {
+                    black_box(bench_btreemap_search(&btreemap, black_box(id)));
+                }
+            });
+        });
+
+        group.bench_with_input(
+            BenchmarkId::new("HashMap (std)", size),
+            &search_ids,
+            |b, ids| {
+                b.iter(|| {
+                    for &id in ids {
+                        black_box(bench_hashmap_search(&hashmap, black_box(id)));
+                    }
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("HashMap (hashbrown)", size),
+            &search_ids,
+            |b, ids| {
+                b.iter(|| {
+                    for &id in ids {
+                        black_box(bench_hashbrown_search(&hashbrown, black_box(id)));
+                    }
+                });
+            },
+        );
+
+        group.bench_with_input(
+            BenchmarkId::new("FxHashMap", size),
+            &search_ids,
+            |b, ids| {
+                b.iter(|| {
+                    for &id in ids {
+                        black_box(bench_fxhashmap_search(&fxhashmap, black_box(id)));
+                    }
+                });
+            },
+        );
+    }
+
+    group.finish();
+}
+
+fn bench_memory_efficiency(c: &mut Criterion) {
+    let mut group = c.benchmark_group("memory_efficiency");
+
+    let size = 100_000;
+    let entities = generate_entities(size);
+
+    group.bench_function("Vec memory", |b| {
+        b.iter(|| {
+            let mut vec = Vec::with_capacity(size);
+            bench_vec_insert_sorted(&mut vec, black_box(&entities));
+            black_box(vec);
+        });
+    });
+
+    group.bench_function("BTreeMap memory", |b| {
+        b.iter(|| {
+            let mut map = BTreeMap::new();
+            bench_btreemap_insert(&mut map, black_box(&entities));
+            black_box(map);
+        });
+    });
+
+    group.bench_function("HashMap (std) memory", |b| {
+        b.iter(|| {
+            let mut map = HashMap::new();
+            bench_hashmap_insert(&mut map, black_box(&entities));
+            black_box(map);
+        });
+    });
+
+    group.bench_function("HashMap (hashbrown) memory", |b| {
+        b.iter(|| {
+            let mut map = HashbrownMap::new();
+            bench_hashbrown_insert(&mut map, black_box(&entities));
+            black_box(map);
+        });
+    });
+
+    group.bench_function("FxHashMap memory", |b| {
+        b.iter(|| {
+            let mut map = FxHashMap::default();
+            bench_fxhashmap_insert(&mut map, black_box(&entities));
+            black_box(map);
+        });
+    });
+
+    group.finish();
+}
+
+criterion_group!(benches, bench_insert, bench_search, bench_memory_efficiency);
+criterion_main!(benches);

src/app.rs

@@ -0,0 +1,113 @@
+use crate::data::Id;
+use crate::data::entities::DeckSettings;
+use crate::data::entities::{WordData, WordGroup};
+use crate::data_provider::card_sets::load_sets;
+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::navigation::RootMessage::Keyboard;
+use crate::navigation::{AppSettings, RootMessage, ScreenState};
+use chrono::NaiveDate;
+use hashbrown::HashMap;
+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 rusqlite::Connection;
+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)
+}
+
+pub struct AppState {
+    pub dictionary: Vec<WordData>,
+    pub decks: Vec<DeckSettings>,
+    pub word_groups: Vec<WordGroup>,
+    pub connection: Connection,
+    pub sync_data: AppSettings,
+    pub activity: HashMap<Id, Vec<(NaiveDate, u32)>>,
+}
+
+impl Default for AppState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl AppState {
+    pub fn new() -> Self {
+        Self {
+            dictionary: vec![],
+            decks: vec![],
+            word_groups: vec![],
+            connection: default_connection(),
+            sync_data: AppSettings {
+                key: None,
+                auto_web_fetch: false,
+            },
+            activity: Default::default(),
+        }
+    }
+}
+
+pub 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.unwrap_or_default();
+    state.decks = sets.unwrap_or_default();
+    state.word_groups = groups.unwrap_or_default();
+    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/core.rs

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

src/core/deck.rs

@@ -0,0 +1,121 @@
+use crate::app::AppState;
+use crate::core::srs::{
+    OrderMode, OrderModule, RandomSRSModule, SRSModule, SemiRandomSRSModule, WordOpenMode,
+    WorstWordsSRSModule,
+};
+use crate::data::entities::*;
+use crate::data_provider::card_stats::{load_stats_of_deck, update_stat_score};
+use crate::data_provider::history::push_note;
+use crate::notification::{MaybeError, NotificationData};
+use chrono::Utc;
+use parking_lot::Mutex;
+use std::sync::Arc;
+
+#[derive(Clone)]
+pub struct DeckData {
+    pub(crate) words: Vec<WordData>,
+    pub(crate) set: Vec<CardStatistics>,
+    current_word_index: Option<usize>,
+    state: Arc<Mutex<AppState>>,
+    order_module: OrderModule,
+    settings: DeckSettings,
+}
+impl DeckData {
+    pub fn new(
+        settings: &DeckSettings,
+        state: Arc<Mutex<AppState>>,
+    ) -> Result<Self, NotificationData> {
+        let state_for = state.clone();
+        let state_locked = state.lock();
+
+        let stats = load_stats_of_deck(settings, &state_locked.connection)?;
+        let words = stats
+            .iter()
+            .map(|stat| {
+                state_locked
+                    .dictionary
+                    .binary_search_by_key(&stat.word_id, |w| w.id)
+                    .expect("No word found in dictionary")
+            })
+            .map(|index| &state_locked.dictionary[index])
+            .cloned()
+            .collect();
+
+        Ok(Self {
+            set: stats,
+            words,
+            current_word_index: None,
+            state: state_for,
+            order_module: match settings.open_mode {
+                OrderMode::Default => OrderModule::SemiRandomSRS(SemiRandomSRSModule::new()),
+                OrderMode::TrainWorstFirst => {
+                    OrderModule::WorstWordsSRS(WorstWordsSRSModule::new())
+                }
+                OrderMode::FullRandom => OrderModule::RandomSRS(RandomSRSModule::new()),
+            },
+            settings: settings.clone(),
+        })
+    }
+
+    pub fn next(&mut self) -> (WordData, CardStatistics) {
+        let index = match self.order_module {
+            OrderModule::SemiRandomSRS(ref mut module) => {
+                if !module.initialized {
+                    module.init(self.set.as_slice())
+                }
+                module.next(self.set.as_slice())
+            }
+            OrderModule::RandomSRS(ref mut module) => {
+                if !module.initialized {
+                    module.init(self.set.as_slice())
+                }
+                module.next(self.set.as_slice())
+            }
+            OrderModule::WorstWordsSRS(ref mut module) => {
+                if !module.initialized {
+                    module.init(self.set.as_slice())
+                }
+                module.next(self.set.as_slice())
+            }
+        };
+
+        self.current_word_index = Some(index);
+        (self.words[index].clone(), self.set[index].clone())
+    }
+    pub fn open(&mut self, status: WordOpenMode) -> MaybeError {
+        if let Some(index) = self.current_word_index {
+            let word: &mut CardStatistics = &mut self.set[index];
+            let old_score = word.score;
+            word.update(status);
+            let new_score = word.score;
+
+            match self.order_module {
+                OrderModule::SemiRandomSRS(ref mut module) => {
+                    module.open(status, index, word);
+                }
+                OrderModule::RandomSRS(ref mut module) => {
+                    module.open(status, index, word);
+                }
+                OrderModule::WorstWordsSRS(ref mut module) => {
+                    module.open(status, index, word);
+                }
+            }
+            update_stat_score(word, &self.state.lock().connection)?;
+            let _ = push_note(
+                self.settings.id,
+                HistoryItem {
+                    timestamp: Utc::now(),
+                    word_id: word.word_id,
+                    mode: status,
+                    before: old_score,
+                    after: new_score,
+                },
+            );
+        }
+
+        Ok(())
+    }
+    pub fn len(&self) -> usize {
+        self.set.len()
+    }
+}

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,181 @@
+use crate::data::entities::CardStatistics;
+use rand::distr::weighted::WeightedIndex;
+use rand::prelude::ThreadRng;
+use rand::prelude::{Distribution, SliceRandom};
+use rand::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;
+
+#[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),
+}
+pub trait SRSModule {
+    fn next(&mut self, set: &[CardStatistics]) -> usize;
+    fn open(&mut self, status: WordOpenMode, index: usize, updated_word: &CardStatistics);
+    fn init(&mut self, set: &[CardStatistics]);
+}
+#[derive(Clone)]
+pub struct RandomSRSModule {
+    basket: Vec<usize>,
+    pub(crate) initialized: bool,
+}
+impl RandomSRSModule {
+    pub(crate) fn new() -> RandomSRSModule {
+        Self {
+            basket: vec![],
+            initialized: false,
+        }
+    }
+}
+impl SRSModule for RandomSRSModule {
+    fn next(&mut self, set: &[CardStatistics]) -> 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, _: &CardStatistics) {}
+
+    fn init(&mut self, set: &[CardStatistics]) {
+        self.initialized = true;
+        self.basket = (0..set.len()).collect::<Vec<usize>>();
+        self.basket.shuffle(&mut rand::rng())
+    }
+}
+#[derive(Clone)]
+pub struct SemiRandomSRSModule {
+    history: Vec<usize>,
+    last_weights: WeightedIndex<f32>,
+    generator: ThreadRng,
+    pub(crate) initialized: bool,
+}
+impl SemiRandomSRSModule {
+    pub(crate) 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: &[CardStatistics]) -> 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: &CardStatistics) {
+        let new_weight = (100.0 / word.calculated_score()).powf(2.0);
+        self.last_weights
+            .update_weights(&[(index, &new_weight)])
+            .expect("update weights error");
+    }
+    fn init(&mut self, set: &[CardStatistics]) {
+        self.initialized = true;
+        let weights = set
+            .iter()
+            .map(|s| (100.0 / s.calculated_score()).powf(2.0) * 2.0)
+            .collect::<Vec<f32>>();
+        self.last_weights = WeightedIndex::new(weights).expect("Incorrect weights update");
+    }
+}
+impl SemiRandomSRSModule {
+    fn history_len(&self, set: &[CardStatistics]) -> usize {
+        ((set.len() as f32 * MAX_HISTORY_LEN_PART) as usize).clamp(1, MAX_HISTORY_LEN)
+    }
+}
+#[derive(Clone)]
+pub struct WorstWordsSRSModule {
+    pub(crate) 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: &[CardStatistics]) -> 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, _: &CardStatistics) {}
+
+    fn init(&mut self, _: &[CardStatistics]) {
+        self.initialized = true;
+    }
+}
+impl WorstWordsSRSModule {
+    pub(crate) 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: &[CardStatistics]) {
+        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, Copy)]
+pub enum WordOpenMode {
+    Easy,
+    Ok,
+    Hard,
+    None,
+}

src/data.rs

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

src/data/entities.rs

@@ -0,0 +1,252 @@
+use crate::app::AppState;
+use crate::core::srs::{FADE_PER_DAY, MAX_SCORE, OrderMode, WordOpenMode};
+use crate::data::{INVALID_ID, Id};
+use crate::notification::MaybeError;
+use chrono::{DateTime, Utc};
+use log::info;
+use rayon::prelude::*;
+use rhai::{Engine, Scope};
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::time::Instant;
+
+#[derive(Clone, Debug)]
+pub struct WordData {
+    pub id: Id,
+    pub key: String,
+    pub value: String,
+    pub tags: String,
+    pub additional: HashMap<String, String>,
+    pub group_id: Id,
+}
+
+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 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 HistoryItem {
+    pub timestamp: DateTime<Utc>,
+    pub word_id: Id,
+    pub mode: WordOpenMode,
+    pub before: u8,
+    pub after: u8,
+}
+
+#[derive(Clone)]
+pub struct DeckSettings {
+    pub id: Id,
+    pub name: String,
+    pub forward: String,
+    pub backward: String,
+    pub filter: String,
+    pub count: Option<usize>,
+    pub open_mode: OrderMode,
+}
+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(),
+            count: None,
+            open_mode: OrderMode::Default,
+        }
+    }
+    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 get_word_list(&self, state: &AppState) -> Vec<usize> {
+        let time = Instant::now();
+        let mut list = vec![];
+        let engine = Engine::new();
+
+        let ast = engine.compile(&self.filter);
+        if let Ok(ast) = ast {
+            let groups = &state.word_groups;
+
+            list = state
+                .dictionary
+                .par_iter()
+                .enumerate()
+                .filter(|(_, 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();
+                    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",
+                            groups
+                                .iter()
+                                .find(|g| g.id == word.group_id)
+                                .cloned()
+                                .expect("No group id")
+                                .name,
+                        );
+
+                    let result = engine.eval_ast_with_scope::<bool>(&mut scope, &ast);
+                    if let Ok(result) = result {
+                        return result;
+                    }
+                    false
+                })
+                .map(|(index, _)| index)
+                .collect();
+
+            info!("Collecting available words is {:?}", time.elapsed());
+
+            list
+        } else {
+            list
+        }
+    }
+    pub fn require_speech(&self) -> bool {
+        self.forward == "speech" || self.backward == "speech"
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub struct CardStatistics {
+    pub id: Id,
+    pub word_id: Id,
+    pub set_id: Id,
+    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;
+            }
+        }
+
+        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)
+    }
+}
+
+#[derive(Copy)]
+pub struct EntityHandle<E> {
+    pub(crate) id: Id,
+    index: i32,
+    pub(crate) _phantom: PhantomData<E>,
+}
+
+impl<T> Clone for EntityHandle<T> {
+    fn clone(&self) -> Self {
+        EntityHandle {
+            id: self.id,
+            index: self.index,
+            _phantom: Default::default(),
+        }
+    }
+}
+impl<T> EntityHandle<T> {
+    pub fn new(id: Id, index: usize, real: bool) -> Self {
+        Self {
+            id,
+            index: index as i32 | (!real as i32) << 31,
+            _phantom: Default::default(),
+        }
+    }
+    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 i32;
+    }
+
+    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 i32) << 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)
+    }
+}
+
+pub trait EntityData {
+    fn id(&self) -> Id;
+    fn set_id(&mut self, id: Id);
+}

src/data/repositories.rs

@@ -0,0 +1,531 @@
+use crate::data::Id;
+use crate::data::entities::{EntityData, EntityHandle};
+use crate::helpers::into_result;
+use crate::notification::{MaybeError, NotificationData};
+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;
+use std::sync::Arc;
+
+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 handle_by_id(&self, id: Id) -> EntityHandle<T>;
+    fn create(&mut self, new: T) -> EntityHandle<T>;
+    fn save(&mut self, entity: &mut EntityHandle<T>) -> MaybeError;
+    fn delete(&mut self, handle: EntityHandle<T>) -> MaybeError;
+    fn init(&mut self) -> MaybeError;
+    fn reload(&mut self) -> MaybeError;
+}
+
+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;
+                return rule(data);
+
+                false
+            })
+            .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();
+        }
+    }
+}
+pub struct Query<T, R, D>
+where
+    R: Repository<T, D>,
+    D: DbLayer<T>,
+{
+    cache: Vec<EntityHandle<T>>,
+    rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+    parallel: bool,
+    _marker: PhantomData<(R, D)>,
+    shift_stamp: u16,
+}
+
+impl<T: EntityData + Clone, R: Repository<T, D>, D: DbLayer<T>> Query<T, R, D> {
+    pub fn iter<'a>(&mut self, data_repository_inner: &'a R) -> impl Iterator<Item = &'a T>
+    where
+        T: 'a,
+    {
+        self.cache
+            .iter_mut()
+            .filter_map(move |e| data_repository_inner.get_ref(e))
+    }
+
+    pub fn for_each_mut<F>(&mut self, repo: &mut R, mut f: F)
+    where
+        F: FnMut(&mut T),
+    {
+        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,
+    {
+        self.cache.clear();
+        if self.parallel {
+            self.cache = data_repository
+                .cache
+                .par_iter()
+                .enumerate()
+                .filter(|(_, entity)| (self.rule)(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<_>>(),
+        );
+    }
+}
+
+pub trait BatchedRepository<T, D>
+where
+    D: BatchedDbLayer<T>,
+    T: EntityData,
+{
+    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: &Connection) -> MaybeError;
+    fn add_many_entities(&mut self, entity: &mut [T], connection: &Connection) -> MaybeError;
+}
+
+#[derive(Clone)]
+pub struct DataRepository<T: std::clone::Clone + EntityData, D: DbLayer<T>> {
+    inner: Arc<RwLock<DataRepositoryInner<T, D>>>,
+}
+
+pub struct DataRepositoryInner<T: std::clone::Clone + EntityData, D: DbLayer<T>> {
+    cache: Vec<T>,
+    temporal: Vec<T>,
+    next_temporal: u32,
+    connection: Arc<RwLock<Connection>>,
+    data_layer: D,
+    query_manger: QueryManger<T, Self, D>,
+    version: u16,
+    shifts: u16,
+}
+
+impl<T: std::clone::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, D: DbLayer<T>> DataRepositoryInner<T, D> {
+    pub fn query_par(
+        &self,
+        rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+    ) -> Query<T, DataRepositoryInner<T, D>, D>
+    where
+        T: Send + Sync,
+    {
+        let mut cache: Vec<EntityHandle<T>> = self
+            .cache
+            .par_iter()
+            .enumerate()
+            .filter(|(_, entity)| rule(entity))
+            .map(|(i, entity)| EntityHandle::new(entity.id(), i, true))
+            .collect();
+
+        cache.extend(
+            self.temporal
+                .iter()
+                .enumerate()
+                .filter(|(_, entity)| rule(entity))
+                .map(|(i, entity)| EntityHandle::new(entity.id(), i, false))
+                .collect::<Vec<_>>(),
+        );
+
+        Query {
+            cache,
+            rule,
+            parallel: true,
+            _marker: PhantomData,
+            shift_stamp: self.shifts,
+        }
+    }
+
+    pub fn query(
+        &self,
+        rule: Box<dyn Fn(&T) -> bool + Send + Sync>,
+    ) -> Query<T, DataRepositoryInner<T, D>, D>
+    where
+        T: Send + Sync,
+    {
+        let mut cache: Vec<EntityHandle<T>> = self
+            .cache
+            .iter()
+            .enumerate()
+            .filter(|(_, entity)| rule(entity))
+            .map(|(i, entity)| EntityHandle::new(entity.id(), i, true))
+            .collect();
+
+        cache.extend(
+            self.temporal
+                .iter()
+                .enumerate()
+                .filter(|(_, entity)| rule(entity))
+                .map(|(i, entity)| EntityHandle::new(entity.id(), i, false))
+                .collect::<Vec<_>>(),
+        );
+
+        Query {
+            cache,
+            rule,
+            parallel: false,
+            _marker: PhantomData,
+            shift_stamp: self.shifts,
+        }
+    }
+}
+
+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 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 save(&mut self, entity: &mut EntityHandle<T>) -> MaybeError {
+        let original_state = entity.clone();
+        if entity.real() {
+            let data = self.get_ref(entity).unwrap();
+            self.data_layer
+                .write_entity(data, &self.connection.read())?;
+        } else {
+            let index = fast_position_of(self.temporal.as_slice(), entity).unwrap();
+            let mut data = self.temporal.remove(index);
+            self.data_layer
+                .add_entity(&mut data, &self.connection.read())?;
+            entity.set_real(true);
+            entity.id = data.id();
+            entity.set_index(self.cache.len());
+            self.query_manger.handle_save(original_state, entity, &data);
+
+            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.read())?;
+            &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 init(&mut self) -> MaybeError {
+        self.data_layer
+            .load_all(&mut self.cache, &self.connection.read())?;
+        self.version += 1;
+        Ok(())
+    }
+
+    fn reload(&mut self) -> MaybeError {
+        self.cache.clear();
+        self.temporal.clear();
+        self.init()?;
+        Ok(())
+    }
+}
+impl<T: EntityData + Clone, D: BatchedDbLayer<T> + DbLayer<T>> BatchedRepository<T, D>
+    for DataRepositoryInner<T, D>
+{
+    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, &self.connection.read())?;
+
+        let start = self.cache.len();
+
+        for (i, (handle, data)) in temp.into_iter().zip(&mut temp_values).enumerate() {
+            let old = handle.clone();
+            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.read())?;
+        }
+        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(), &self.connection.read())?;
+        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(|a, b| a.id.cmp(&b.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,11 +1,14 @@
-use crate::lang::{DeckSettings, OrderMode};
+use crate::core::srs::OrderMode;
 
+use crate::data::entities::DeckSettings;
+use crate::notification::NotificationData::{DbLoadError, DbSaveError};
+use crate::notification::{MaybeError, NotificationData};
 use rusqlite::Connection;
 
-pub fn load_sets(connection: &Connection) -> Vec<DeckSettings> {
+pub fn load_sets(connection: &Connection) -> Result<Vec<DeckSettings>, NotificationData> {
     let mut stmt = connection
         .prepare("SELECT id, name, forward, backward, filter FROM card_set")
-        .unwrap();
+        .expect("Failed to prepare state query");
     let iter = stmt
         .query_map([], |row| {
             Ok(DeckSettings {
@@ -15,21 +18,17 @@ pub fn load_sets(connection: &Connection) -> Vec<DeckSettings> {
                 backward: row.get(3)?,
                 filter: row.get(4)?,
                 count: None,
-                worst_words_list: None,
                 open_mode: OrderMode::Default,
             })
         })
-        .unwrap();
+        .map_err(|_| DbLoadError)?;
 
-    let mut buffer = vec![];
-    for word in iter {
-        buffer.push(word.unwrap());
+    let mut buffer = Vec::with_capacity(16);
+    iter.filter_map(|res| res.ok()).for_each(|i| buffer.push(i));
+    Ok(buffer)
 }
 
-    buffer
-}
-
-pub fn add_set(set: &mut DeckSettings, connection: &Connection) {
+pub fn add_set(set: &mut DeckSettings, connection: &Connection) -> MaybeError {
     let index : u32 = connection
         .query_row(
             "INSERT INTO card_set (name, forward, backward, filter) VALUES (?1, ?2, ?3, ?4) RETURNING id",
@@ -41,14 +40,15 @@ pub fn add_set(set: &mut DeckSettings, connection: &Connection) {
             ),
             |row| row.get(0)
         )
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
 
     set.id = index.into();
+    Ok(())
 }
 
-pub fn update_deck(set: &mut DeckSettings, connection: &Connection) {
+pub fn update_deck(set: &mut DeckSettings, connection: &Connection) -> MaybeError {
     if !set.id.is_valid() {
-        add_set(set, connection);
+        add_set(set, connection)?;
     } else {
         connection
             .execute(
@@ -61,15 +61,17 @@ pub fn update_deck(set: &mut DeckSettings, connection: &Connection) {
                     &set.id
                 ),
             )
-            .unwrap();
+            .map_err(|_| DbSaveError)?;
     }
+    Ok(())
 }
 
-pub fn delete_set(set: &DeckSettings, connection: &Connection) {
+pub fn delete_set(set: &DeckSettings, connection: &Connection) -> MaybeError {
     if !set.id.is_valid() {
-        return;
+        return Err(DbSaveError);
     }
     connection
         .execute("DELETE FROM card_set WHERE id = ?1", (&set.id,))
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }

src/data_provider/card_stats.rs

@@ -1,11 +1,17 @@
-use crate::lang::{CardStatistics, DeckSettings};
+use crate::data::entities::{CardStatistics, DeckSettings};
+use crate::notification::NotificationData::{DbLoadError, DbSaveError};
+use crate::notification::{MaybeError, NotificationData};
+use log::info;
 use rusqlite::{Connection, params};
 use std::time::Instant;
 
-pub fn load_stats_of_deck(set: &DeckSettings, connection: &Connection) -> Vec<CardStatistics> {
+pub fn load_stats_of_deck(
+    set: &DeckSettings,
+    connection: &Connection,
+) -> Result<Vec<CardStatistics>, NotificationData> {
     let mut stmt = connection
         .prepare("SELECT id, word_id, score, last_opened FROM card_stats WHERE set_id = ?1")
-        .unwrap();
+        .expect("Failed to prepare state query");
     let iter = stmt
         .query_map((set.id,), |row| {
             Ok(CardStatistics {
@@ -16,19 +22,19 @@ pub fn load_stats_of_deck(set: &DeckSettings, connection: &Connection) -> Vec<Ca
                 last_open: row.get(3)?,
             })
         })
-        .unwrap();
+        .map_err(|_| DbLoadError)?;
 
-    let mut buffer = vec![];
-    for word in iter {
-        buffer.push(word.unwrap());
+    let mut buffer = Vec::with_capacity(512);
+    iter.filter_map(|res| res.ok()).for_each(|i| buffer.push(i));
+
+    Ok(buffer)
 }
 
-    buffer
-}
-
-pub fn add_stat_list(stats: &mut [CardStatistics], connection: &mut Connection) {
+pub fn add_stat_list(stats: &mut [CardStatistics], connection: &mut Connection) -> MaybeError {
     let time = Instant::now();
-    let tx = connection.transaction().unwrap();
+    let tx = connection
+        .transaction()
+        .expect("Failed to create transaction");
     let count = stats.len();
 
     {
@@ -36,7 +42,7 @@ pub fn add_stat_list(stats: &mut [CardStatistics], connection: &mut Connection)
             .prepare(
                 "INSERT INTO card_stats (word_id, set_id, score, last_opened) VALUES (?1, ?2, ?3, ?4)",
             )
-            .unwrap();
+            .expect("Failed to prepare state query");
 
         for stat in stats.iter() {
             stmt.execute(params![
@@ -45,12 +51,12 @@ pub fn add_stat_list(stats: &mut [CardStatistics], connection: &mut Connection)
                 stat.score,
                 stat.last_open.timestamp()
             ])
-            .unwrap();
+            .map_err(|_| DbSaveError)?;
         }
     }
 
     let last_index: u32 = tx.last_insert_rowid() as u32;
-    tx.commit().unwrap();
+    tx.commit().expect("Failed to commit");
 
     let start_index = last_index - (count as u32) + 1;
 
@@ -58,10 +64,11 @@ pub fn add_stat_list(stats: &mut [CardStatistics], connection: &mut Connection)
         stats[index].id = id.into();
     }
 
-    println!("Added {} cards for {:?}", stats.len(), time.elapsed());
+    info!("Added {} cards for {:?}", stats.len(), time.elapsed());
+    Ok(())
 }
 
-pub fn update_stat_score(stat: &CardStatistics, connection: &Connection) {
+pub fn update_stat_score(stat: &CardStatistics, connection: &Connection) -> MaybeError {
     let time = Instant::now();
 
     connection
@@ -69,13 +76,14 @@ pub fn update_stat_score(stat: &CardStatistics, connection: &Connection) {
             "UPDATE card_stats SET score = ?1, last_opened = ?2 WHERE id = ?3",
             (&stat.score, &stat.last_open.timestamp(), &stat.id),
         )
-        .unwrap();
-    println!("Updated stat: {}", time.elapsed().as_millis());
+        .map_err(|_| DbSaveError)?;
+    info!("Updated stat: {}", time.elapsed().as_millis());
+    Ok(())
 }
 
-pub fn delete_stats(stat: &[CardStatistics], connection: &Connection) {
+pub fn delete_stats(stat: &[CardStatistics], connection: &Connection) -> MaybeError {
     if stat.is_empty() {
-        return;
+        return Ok(());
     }
     let ids = stat
         .iter()
@@ -87,5 +95,6 @@ pub fn delete_stats(stat: &[CardStatistics], connection: &Connection) {
             format!("DELETE FROM card_stats WHERE id in ({ids})").as_str(),
             (),
         )
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }

src/data_provider/history.rs

@@ -1,29 +1,34 @@
-use crate::dictionary::app_data_dir;
-use crate::lang::{Id, WordOpenMode};
-use chrono::{DateTime, Utc};
-use std::fs;
+use crate::core::srs::WordOpenMode;
+use crate::data::Id;
+use crate::data::entities::HistoryItem;
+use crate::fs::*;
+use crate::notification::NotificationData::PermissionDenied;
+use crate::notification::{MaybeError, NotificationData};
+use chrono::DateTime;
 use std::fs::{File, OpenOptions};
 use std::io::Write;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
 
-pub fn get_history_of_set(id: Id) -> Vec<HistoryItem> {
-    let app_dir = history_dir();
+pub fn get_history_of_set(id: Id) -> Result<Vec<HistoryItem>, NotificationData> {
+    let app_dir = history_dir()?;
     let head = app_dir.clone().join(format!("set_{}_history.csv", id));
     let mut lines = Vec::new();
 
-    append_lines_if_exists(head, &mut lines);
+    append_lines_if_exists(head, &mut lines)?;
     lines.reverse();
-    parse_history_items(lines)
+    Ok(parse_history_items(lines))
 }
 
-fn append_lines_if_exists(path: PathBuf, lines: &mut Vec<String>) {
+fn append_lines_if_exists(path: PathBuf, lines: &mut Vec<String>) -> MaybeError {
     if path.exists() {
-        let reader = BufReader::new(File::open(path).unwrap());
-        for line in reader.lines() {
-            lines.push(line.unwrap());
-        }
+        let reader = BufReader::new(File::open(path).map_err(|_| PermissionDenied)?);
+        reader
+            .lines()
+            .map_while(Result::ok)
+            .for_each(|i| lines.push(i));
     }
+    Ok(())
 }
 
 fn parse_history_items(strings: Vec<String>) -> Vec<HistoryItem> {
@@ -34,12 +39,13 @@ fn parse_history_items(strings: Vec<String>) -> Vec<HistoryItem> {
             if id.is_err() {
                 continue;
             }
-            let id = id.unwrap();
+            let id = id.unwrap_or_default();
             if !id.is_valid() {
                 continue;
             }
             items.push(HistoryItem {
-                timestamp: DateTime::from_timestamp(time.parse().unwrap_or_default(), 0).unwrap_or_default(),
+                timestamp: DateTime::from_timestamp(time.parse().unwrap_or_default(), 0)
+                    .unwrap_or_default(),
                 word_id: id,
                 mode: match mode.parse::<u8>().unwrap_or_default() {
                     2 => WordOpenMode::Hard,
@@ -56,15 +62,15 @@ fn parse_history_items(strings: Vec<String>) -> Vec<HistoryItem> {
     items
 }
 
-pub fn push_note(set_id: Id, item: HistoryItem) {
-    let app_dir = history_dir();
+pub fn push_note(set_id: Id, item: HistoryItem) -> MaybeError {
+    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();
+        .map_err(|_| PermissionDenied)?;
     let line_str = format!(
         "{};{};{};{};{}",
         item.timestamp.timestamp(),
@@ -78,22 +84,6 @@ pub fn push_note(set_id: Id, item: HistoryItem) {
         item.before,
         item.after
     );
-    writeln!(&mut file, "{}", line_str).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 timestamp: DateTime<Utc>,
-    pub word_id: Id,
-    pub mode: WordOpenMode,
-    pub before: u8,
-    pub after: u8,
+    writeln!(&mut file, "{}", line_str).map_err(|_| PermissionDenied)?;
+    Ok(())
 }

src/data_provider/import.rs

@@ -1,4 +1,8 @@
+use crate::helpers::into_result;
+use crate::notification::NotificationData;
+use crate::notification::NotificationData::IncorrectAnkiFile;
 use hashbrown::HashMap;
+use log::info;
 use rusqlite::Connection;
 use serde_json::Value;
 
@@ -21,36 +25,47 @@ 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();
-    let raw: Value = serde_json::from_str(json_models.as_str()).unwrap();
-    let sets = raw.as_object().unwrap();
+        .map_err(|_| IncorrectAnkiFile)?;
+    let raw: Value = serde_json::from_str(json_models.as_str()).map_err(|_| IncorrectAnkiFile)?;
+    let sets = raw.as_object();
+    if let Some(sets) = sets {
         let mut total_data = ImportData(vec![]);
 
         let mut count_stmt = connection
             .prepare("select mid, count(id) from notes group by mid")
-        .unwrap();
+            .map_err(|_| IncorrectAnkiFile)?;
 
         let counts = count_stmt
             .query_map([], |row| Ok((row.get(0)?, row.get(1)?)))
-        .unwrap()
-        .map(|x| x.unwrap())
+            .map_err(|_| IncorrectAnkiFile)?
+            .filter_map(|x| x.ok())
             .collect::<Vec<(i64, i64)>>();
 
         for (_, collection) in sets {
             let fields_property = collection.get("fields");
             if let Some(fields_property) = fields_property {
-            let fields = fields_property
-                .as_array()
-                .unwrap()
+                let fields = into_result(fields_property.as_array(), IncorrectAnkiFile)?
                     .iter()
-                .map(|x| x["name"].as_str().unwrap().to_string())
+                    .filter_map(|x| x.get("name"))
+                    .map(|x| x.as_str().unwrap().to_string())
                     .collect();
+                let id = collection.get("id");
+                if id.is_none() || id.unwrap().as_u64().is_none() {
+                    return Err(IncorrectAnkiFile);
+                }
+                let id = id.unwrap().as_u64().unwrap();
+                let name = collection.get("name");
+                if name.is_none() || name.unwrap().as_str().is_none() {
+                    return Err(IncorrectAnkiFile);
+                }
+                let name = name.unwrap().as_str().unwrap().to_string();
+
                 let mut group = ImportGroup {
-                id: collection["id"].as_u64().unwrap(),
-                name: collection["name"].as_str().unwrap().to_string(),
+                    id,
+                    name,
                     fields,
                     mapping: Default::default(),
                     length: 0,
@@ -59,20 +74,24 @@ pub fn load_groups(connection: &Connection) -> ImportData {
                 if let Some((_, count)) = counts.iter().find(|(id, _)| *id == group.id as i64) {
                     group.length = *count as u64
                 }
-            println!("{:?}", group);
+                info!("{:?}", group);
                 total_data.0.push(group);
             }
-
         }
-    total_data
+        return Ok(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
+    Ok(count_stmt
         .query_map((group_id as i64,), |row| {
             Ok(ImportNote {
                 tags: row.get(0)?,
@@ -83,7 +102,7 @@ pub fn get_words_of_group(connection: &Connection, group_id: u64) -> Vec<ImportN
                     .collect(),
             })
         })
-        .unwrap()
-        .map(|x| x.unwrap())
-        .collect::<Vec<ImportNote>>()
+        .map_err(|_| IncorrectAnkiFile)?
+        .filter_map(|x| x.ok())
+        .collect::<Vec<ImportNote>>())
 }

src/data_provider/settings.rs

@@ -1,10 +1,12 @@
+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();
-    let mut iter = stmt.query_map((key,), |row| row.get(0)).unwrap();
+        .expect("Failed to prepare statement.");
+    let mut iter = stmt.query_map((key,), |row| row.get(0)).ok()?;
 
     if let Some(row) = iter.next()
         && let Ok(value) = row
@@ -15,31 +17,35 @@ pub fn get_setting(key: String, connection: &Connection) -> Option<String> {
     None
 }
 
-pub fn set_setting(key: String, value: String, connection: &Connection) {
-    let current = get_settings_list(connection);
+pub fn set_setting(key: String, value: String, connection: &Connection) -> MaybeError {
+    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)?;
     }
 
-pub fn delete_settings(key: String, connection: &Connection) {
+    Ok(())
+}
+
+pub fn delete_settings(key: String, connection: &Connection) -> MaybeError {
     connection
         .execute("DELETE FROM settings WHERE id = ?1", (&key,))
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }
 
-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();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }
 
-fn update_settings(key: String, value: String, connection: &Connection) {
+fn update_settings(key: String, value: String, connection: &Connection) -> MaybeError {
     connection
         .execute(
             "update settings
@@ -47,11 +53,16 @@ set value = ?2
 where id = ?1",
             (key, value),
         )
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }
 
-fn get_settings_list(connection: &Connection) -> Vec<String> {
-    let mut stmt = connection.prepare("SELECT id FROM settings").unwrap();
-    let iter = stmt.query_map((), |row| row.get(0)).unwrap();
-    iter.map(|row| row.unwrap()).collect()
+fn get_settings_list(connection: &Connection) -> Result<Vec<String>, NotificationData> {
+    let mut stmt = connection
+        .prepare("SELECT id FROM settings")
+        .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,25 @@
-use crate::dictionary::app_data_dir;
+use crate::fs::*;
 use rusqlite::Connection;
 
 pub fn create_db() {
-    let path = app_data_dir();
-    let db_file = path.join("data.db");
+    let db_file = db_path();
     if !db_file.exists() {
-        std::fs::File::create(&db_file).unwrap();
-        let connection = Connection::open(&db_file).unwrap();
-        connection.execute("PRAGMA foreign_keys = ON;", []).unwrap();
+        std::fs::File::create(&db_file).expect("Database file creation failed");
+        let connection = Connection::open(&db_file).expect("Connection open failed");
+        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_settings(conn).unwrap();
-    make_word_group(conn).unwrap();
-    make_words(conn).unwrap();
-    make_card_stats(conn).unwrap();
+    make_card_set(conn).expect("Failed to init table");
+    make_settings(conn).expect("Failed to init table");
+    make_word_group(conn).expect("Failed to init table");
+    make_words(conn).expect("Failed to init table");
+    make_card_stats(conn).expect("Failed to init table");
 }
 
 fn make_settings(conn: &Connection) -> Result<(), rusqlite::Error> {
@@ -57,9 +52,10 @@ fn make_card_stats(conn: &Connection) -> Result<(), rusqlite::Error> {
 }
 
 pub fn default_connection() -> Connection {
-    let path = app_data_dir();
-    let db_file = path.join("data.db");
-    let connection = Connection::open(db_file).unwrap();
-    connection.execute("PRAGMA foreign_keys = ON;", []).unwrap();
+    let db_file = db_path();
+    let connection = Connection::open(db_file).expect("Failed to open database");
+    connection
+        .execute("PRAGMA foreign_keys = ON;", [])
+        .expect("Failed to set PRAGMA");
     connection
 }

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) -> Result<BufReader<File>, ()> {
-    let mut path = app_data_dir();
-    path.push("voice");
-    if !path.exists() {
-        std::fs::create_dir(path.clone()).map_err(|_| ())?;
-    }
+pub async fn get_voice(text: &str) -> Result<BufReader<File>, NotificationData> {
+    let mut path = voice_dir()?;
+
     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) -> Result<BufReader<File>, ()> {
             .send()
             .await;
 
-        let query = query.map_err(|_| ())?.text().await.map_err(|_| ())?;
+        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) -> Result<BufReader<File>, ()> {
             .body(query)
             .send()
             .await
-            .map_err(|_| ())?
+            .map_err(|_| VoiceVoxUnavailable)?
             .bytes()
             .await
-            .map_err(|_| ())?;
+            .map_err(|_| VoiceVoxUnavailable)?;
 
-        tokio::fs::write(&path, &audio).await.map_err(|_| ())?;
+        tokio::fs::write(&path, &audio)
+            .await
+            .map_err(|_| PermissionDenied)?;
     }
 
-    Ok(BufReader::new(File::open(path).map_err(|_| ())?))
+    Ok(BufReader::new(
+        File::open(path).map_err(|_| PermissionDenied)?,
+    ))
 }

src/data_provider/web_api.rs

@@ -1,6 +1,8 @@
-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 reqwest::Error;
 use tokio::fs::{File, OpenOptions};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use zstd::{DEFAULT_COMPRESSION_LEVEL, Decoder, Encoder};
@@ -8,11 +10,12 @@ 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) -> Result<(), ()> {
-    let path = app_data_dir();
-    let db_file = path.join("data.db");
-    let data = tokio::fs::read(db_file).await.map_err(|_| ())?;
-    let data = compress(data);
+pub async fn send_data(id: String) -> MaybeError {
+    let db_file = db_path();
+    let data = tokio::fs::read(db_file)
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    let data = compress(data)?;
 
     let api_url = API_URL.to_string();
     let id_url = format!("{api_url}upload/stream/{id}");
@@ -22,60 +25,66 @@ pub async fn send_data(id: String) -> Result<(), ()> {
         .post(&id_url)
         .body(data)
         .send()
-        .await.map_err(|_| ())?
+        .await
+        .map_err(|_| WebApiUnavailable)?
         .text()
-        .await.map_err(|_| ())?;
-    set_local_version(new_version.parse::<u32>().unwrap()).await;
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    set_local_version(new_version.parse::<u32>().unwrap_or_default()).await?;
     Ok(())
 }
 
-fn compress(data: Vec<u8>) -> Vec<u8> {
-    let mut encoder = Encoder::new(Vec::new(), DEFAULT_COMPRESSION_LEVEL).unwrap();
-    io::copy(&mut &data[..], &mut encoder).unwrap();
-    encoder.finish().unwrap()
+fn compress(data: Vec<u8>) -> Result<Vec<u8>, NotificationData> {
+    let mut encoder =
+        Encoder::new(Vec::new(), DEFAULT_COMPRESSION_LEVEL).map_err(|_| CompressError)?;
+    io::copy(&mut &data[..], &mut encoder).map_err(|_| PermissionDenied)?;
+    encoder.finish().map_err(|_| CompressError)
 }
 
-pub async fn load_data(id: String, temp: bool) -> Result<(), Error> {
+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();
     let data = client
         .get(&id_url)
         .send()
-        .await?
+        .await
+        .map_err(|_| WebApiUnavailable)?
         .bytes()
-        .await?
+        .await
+        .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?
+        .await
+        .map_err(|_| WebApiUnavailable)?
         .text()
-        .await?;
-    set_local_version(version.parse::<u32>().unwrap_or_default()).await;
+        .await
+        .map_err(|_| WebApiUnavailable)?;
+    set_local_version(version.parse::<u32>().unwrap_or_default()).await?;
     Ok(())
 }
 
-pub fn decompress(data: Vec<u8>) -> Vec<u8> {
-    let mut decoder = Decoder::new(&data[..]).unwrap();
+pub fn decompress(data: Vec<u8>) -> Result<Vec<u8>, NotificationData> {
+    let mut decoder = Decoder::new(&data[..]).map_err(|_| CompressError)?;
     let mut decompressed = Vec::new();
-    let res = io::copy(&mut decoder, &mut decompressed);
-    if let Err(e) = res {
-        println!("{}", e);
-    }
-    decompressed
+    io::copy(&mut decoder, &mut decompressed).map_err(|_| PermissionDenied)?;
+    Ok(decompressed)
 }
 
-pub async fn first_sync() -> Result<String, ()> {
+pub async fn first_sync() -> Result<String, NotificationData> {
     let id_url = API_URL.to_string() + "generate";
 
     let client = reqwest::Client::new();
@@ -83,33 +92,40 @@ pub async fn first_sync() -> Result<String, ()> {
         .get(&id_url)
         .send()
         .await
-        .map_err(|_| ())?
+        .map_err(|_| WebApiUnavailable)?
         .text()
         .await
-        .map_err(|_| ())?;
-    println!("id: {}", id);
+        .map_err(|_| WebApiUnavailable)?;
+    info!("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?;
-    println!("version: {}", version);
+    let version = client
+        .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 {
-    let file = app_data_dir().join("data.meta");
+pub async fn get_local_version() -> Result<u32, NotificationData> {
+    let file = db_meta_path();
     if file.exists() {
         let mut data = String::new();
         File::open(file.clone())
             .await
-            .unwrap()
+            .map_err(|_| PermissionDenied)?
             .read_to_string(&mut data)
             .await
-            .unwrap();
-        return data.parse::<u32>().unwrap_or_default();
+            .map_err(|_| PermissionDenied)?;
+        return Ok(data.parse::<u32>().unwrap_or_default());
     }
 
     let mut file = OpenOptions::new()
@@ -118,21 +134,24 @@ pub async fn get_local_version() -> u32 {
         .truncate(true)
         .open(file)
         .await
-        .unwrap();
-    file.write_all("0".as_bytes()).await.unwrap();
-    0
+        .map_err(|_| PermissionDenied)?;
+    file.write_all("0".as_bytes())
+        .await
+        .map_err(|_| PermissionDenied)?;
+    Ok(0)
 }
 
-pub async fn set_local_version(version: u32) {
-    let file_path = app_data_dir().join("data.meta");
+pub async fn set_local_version(version: u32) -> Result<(), NotificationData> {
+    let file_path = db_meta_path();
     let mut file = OpenOptions::new()
         .write(true)
         .create(true)
         .truncate(true)
         .open(file_path)
         .await
-        .unwrap();
+        .map_err(|_| PermissionDenied)?;
     file.write_all(version.to_string().as_bytes())
         .await
-        .unwrap();
+        .map_err(|_| PermissionDenied)?;
+    Ok(())
 }

src/data_provider/words.rs

@@ -1,8 +1,10 @@
-use crate::lang::{WordData, WordGroup};
+use crate::data::entities::{WordData, WordGroup};
+use crate::notification::NotificationData::{DbLoadError, DbSaveError};
+use crate::notification::{MaybeError, NotificationData};
 use rusqlite::{Connection, params};
 use std::collections::HashMap;
 
-pub fn add_word(word: &mut WordData, connection: &Connection) {
+pub fn add_word(word: &mut WordData, connection: &Connection) -> MaybeError {
     let index : u32 = connection
         .query_row(
             "INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5) RETURNING id",
@@ -10,17 +12,18 @@ pub fn add_word(word: &mut WordData, connection: &Connection) {
                 &word.key,
                 &word.value,
                 &word.tags,
-                serde_json::to_string(&word.additional).unwrap(),
+                serde_json::to_string(&word.additional).unwrap_or_default(),
                 &word.group_id,
             ),
             |row| row.get(0),
-        ).unwrap();
+        ).map_err(|_| DbSaveError)?;
 
     word.id = index.into();
+    Ok(())
 }
 
-pub fn add_words(words: &mut [WordData], connection: &mut Connection) {
-    let tx = connection.transaction().unwrap();
+pub fn add_words(words: &mut [WordData], connection: &mut Connection) -> MaybeError {
+    let tx = connection.transaction().map_err(|_| DbLoadError)?;
     let count = words.len();
 
     {
@@ -28,33 +31,35 @@ pub fn add_words(words: &mut [WordData], connection: &mut Connection) {
             .prepare(
                 "INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5)",
             )
-            .unwrap();
+            .expect("Failed to prepare statement");
 
         for word in words.iter() {
             stmt.execute(params![
                 word.key,
                 word.value,
                 word.tags,
-                serde_json::to_string(&word.additional).unwrap(),
+                serde_json::to_string(&word.additional).unwrap_or_default(),
                 word.group_id
             ])
-            .unwrap();
+            .map_err(|_| DbSaveError)?;
         }
     }
 
     let last_index: u32 = tx.last_insert_rowid() as u32;
-    tx.commit().unwrap();
+    tx.commit().map_err(|_| DbSaveError)?;
 
     let start_index = last_index - (count as u32) + 1;
 
     for (index, id) in (start_index..=last_index).enumerate() {
         words[index].id = id.into();
     }
+
+    Ok(())
 }
 
-pub fn update_word(word: &mut WordData, connection: &Connection) {
+pub fn update_word(word: &mut WordData, connection: &Connection) -> MaybeError {
     if !word.id.is_valid() {
-        add_word(word, connection);
+        Ok(add_word(word, connection)?)
     } else {
         connection
             .execute(
@@ -63,27 +68,29 @@ pub fn update_word(word: &mut WordData, connection: &Connection) {
                     &word.key,
                     &word.value,
                     &word.tags,
-                    serde_json::to_string(&word.additional).unwrap(),
+                    serde_json::to_string(&word.additional).map_err(|_| DbSaveError)?,
                     &word.id,
                 ),
             )
-            .unwrap();
+            .map_err(|_| DbSaveError)?;
+        Ok(())
     }
 }
 
-pub fn delete_word(word: &WordData, connection: &Connection) {
+pub fn delete_word(word: &WordData, connection: &Connection) -> MaybeError {
     if !word.id.is_valid() {
-        return;
+        return Err(DbSaveError);
     }
     connection
         .execute("DELETE FROM words WHERE id = ?1", (&word.id,))
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }
 
-pub fn load_words(connection: &Connection) -> Vec<WordData> {
+pub fn load_words(connection: &Connection) -> Result<Vec<WordData>, NotificationData> {
     let mut stmt = connection
         .prepare("SELECT id, key, value, tags, more, group_id FROM words")
-        .unwrap();
+        .expect("Failed to prepare statement");
     let word_iter = stmt
         .query_map([], |row| {
             let additional: String = row.get(4)?;
@@ -92,24 +99,25 @@ pub fn load_words(connection: &Connection) -> Vec<WordData> {
                 key: row.get(1)?,
                 value: row.get(2)?,
                 tags: row.get(3)?,
-                additional: serde_json::from_str::<HashMap<String, String>>(&additional).unwrap(),
+                additional: serde_json::from_str::<HashMap<String, String>>(&additional)
+                    .unwrap_or_default(),
                 group_id: row.get(5)?,
             })
         })
-        .unwrap();
+        .map_err(|_| DbLoadError)?;
 
-    let mut buffer = vec![];
-    for word in word_iter {
-        buffer.push(word.unwrap());
+    let mut buffer = Vec::with_capacity(1024);
+    word_iter
+        .filter_map(|res| res.ok())
+        .for_each(|i| buffer.push(i));
+
+    Ok(buffer)
 }
 
-    buffer
-}
-
-pub fn load_word_groups(connection: &Connection) -> Vec<WordGroup> {
+pub fn load_word_groups(connection: &Connection) -> Result<Vec<WordGroup>, NotificationData> {
     let mut stmt = connection
         .prepare("SELECT id, name FROM word_group")
-        .unwrap();
+        .expect("Failed to prepare statement");
     let group_iter = stmt
         .query_map([], |row| {
             Ok(WordGroup {
@@ -117,46 +125,49 @@ pub fn load_word_groups(connection: &Connection) -> Vec<WordGroup> {
                 name: row.get(1)?,
             })
         })
-        .unwrap();
+        .map_err(|_| DbLoadError)?;
 
-    let mut buffer = vec![];
-    for group in group_iter {
-        buffer.push(group.unwrap());
+    let mut buffer = Vec::with_capacity(8);
+    group_iter
+        .filter_map(|res| res.ok())
+        .for_each(|i| buffer.push(i));
+
+    Ok(buffer)
 }
 
-    buffer
-}
-
-pub fn add_group(group: &mut WordGroup, connection: &Connection) {
+pub fn add_group(group: &mut WordGroup, connection: &Connection) -> MaybeError {
     let index: u32 = connection
         .query_row(
             "INSERT INTO word_group (name) VALUES (?1) RETURNING id",
             (&group.name,),
             |row| row.get(0),
         )
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
 
     group.id = index.into();
+    Ok(())
 }
 
-pub fn update_group(group: &mut WordGroup, connection: &Connection) {
+pub fn update_group(group: &mut WordGroup, connection: &Connection) -> MaybeError {
     if !group.id.is_valid() {
-        add_group(group, connection);
+        Ok(add_group(group, connection)?)
     } else {
         connection
             .execute(
                 "UPDATE word_group SET name = ?1 WHERE id = ?2",
                 (&group.name, &group.id),
             )
-            .unwrap();
+            .map_err(|_| DbSaveError)?;
+        Ok(())
     }
 }
 
-pub fn delete_group(group: &WordGroup, connection: &Connection) {
+pub fn delete_group(group: &WordGroup, connection: &Connection) -> MaybeError {
     if !group.id.is_valid() {
-        return;
+        return Err(DbSaveError);
     }
     connection
         .execute("DELETE FROM word_group WHERE id = ?1", (&group.id,))
-        .unwrap();
+        .map_err(|_| DbSaveError)?;
+    Ok(())
 }

src/fs.rs

@@ -0,0 +1,45 @@
+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 history_dir() -> Result<PathBuf, NotificationData> {
+    let directory = app_data_dir().join("history");
+    if !directory.exists() {
+        fs::create_dir_all(directory.clone()).map_err(|_| PermissionDenied)?;
+    }
+    Ok(directory)
+}
+
+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/lang.rs

@@ -1,718 +0,0 @@
-use crate::data_provider::card_stats::load_stats_of_deck;
-use crate::data_provider::card_stats::update_stat_score;
-use crate::data_provider::history::{push_note, HistoryItem};
-use crate::AppState;
-use chrono::{DateTime, Utc};
-use parking_lot::Mutex;
-use rand::distr::weighted::WeightedIndex;
-use rand::distr::Distribution;
-use rand::prelude::SliceRandom;
-use rand::rng;
-use rand::rngs::ThreadRng;
-use rayon::iter::IndexedParallelIterator;
-use rayon::iter::IntoParallelRefIterator;
-use rayon::iter::ParallelIterator;
-use rhai::{Engine, Scope};
-use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef};
-use rusqlite::ToSql;
-use std::cmp::PartialEq;
-use std::collections::HashMap;
-use std::fmt::{Display, Formatter};
-use std::num::ParseIntError;
-use std::str::FromStr;
-use std::sync::Arc;
-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, PartialEq, Eq, Debug, Hash, Copy, Ord, PartialOrd)]
-pub struct Id(u32);
-pub const INVALID_ID: Id = Id(0);
-impl FromStr for Id {
-    type Err = ParseIntError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Id(s.parse::<u32>()?))
-    }
-}
-
-impl From<u32> for Id {
-    fn from(value: u32) -> Self {
-        Id(value)
-    }
-}
-
-impl From<Id> for u32 {
-    fn from(value: Id) -> Self {
-        value.0
-    }
-}
-impl Display for Id {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl FromSql for Id {
-    fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
-        match value {
-            ValueRef::Integer(i) => Ok(Id(i as u32)),
-            _ => Err(FromSqlError::InvalidType),
-        }
-    }
-}
-
-impl ToSql for Id {
-    fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
-        Ok(ToSqlOutput::from(self.0 as i64))
-    }
-}
-
-impl From<Id> for String {
-    fn from(value: Id) -> Self {
-        value.0.to_string()
-    }
-}
-
-impl Id {
-    pub(crate) fn is_valid(self) -> bool {
-        self.0 != 0
-    }
-}
-
-#[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
-    }
-}
-#[derive(Clone, Debug)]
-pub struct WordData {
-    pub id: Id,
-    pub key: String,
-    pub value: String,
-    pub tags: String,
-    pub additional: HashMap<String, String>,
-    pub group_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 WordGroup {
-    pub id: Id,
-    pub name: String,
-}
-#[derive(Clone, PartialEq)]
-pub struct CardStatistics {
-    pub id: Id,
-    pub word_id: Id,
-    pub set_id: Id,
-    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;
-            }
-        }
-
-        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)
-    }
-}
-#[derive(Clone, Copy)]
-pub enum WordOpenMode {
-    Easy,
-    Ok,
-    Hard,
-    None,
-}
-#[derive(Clone)]
-pub struct DeckData {
-    words: Vec<WordData>,
-    set: Vec<CardStatistics>,
-    current_word_index: Option<usize>,
-    state: Arc<Mutex<AppState>>,
-    order_module: OrderModule,
-    settings: DeckSettings,
-}
-impl DeckData {
-    pub fn new(settings: &DeckSettings, state: Arc<Mutex<AppState>>) -> Self {
-        let state_for = state.clone();
-        let state_locked = state.lock();
-
-        let stats = load_stats_of_deck(settings, &state_locked.connection);
-        let words = stats
-            .iter()
-            .map(|stat| {
-                state_locked
-                    .dictionary
-                    .binary_search_by_key(&stat.word_id, |w| w.id)
-                    .unwrap()
-            })
-            .map(|index| &state_locked.dictionary[index])
-            .cloned()
-            .collect();
-
-        Self {
-            set: stats,
-            words,
-            current_word_index: None,
-            state: state_for,
-            order_module: match settings.open_mode {
-                OrderMode::Default => OrderModule::SemiRandomSRS(SemiRandomSRSModule::new()),
-                OrderMode::TrainWorstFirst => {
-                    OrderModule::WorstWordsSRS(WorstWordsSRSModule::new())
-                }
-                OrderMode::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 {
-                    module.init(self)
-                }
-                let index = module.next(self);
-                self.order_module = OrderModule::SemiRandomSRS(module);
-                index
-            }
-            OrderModule::RandomSRS(mut module) => {
-                if !module.initialized {
-                    module.init(self)
-                }
-                let index = module.next(self);
-                self.order_module = OrderModule::RandomSRS(module);
-                index
-            }
-            OrderModule::WorstWordsSRS(mut module) => {
-                if !module.initialized {
-                    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 self.current_word_index.is_none() {
-            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().connection);
-        push_note(
-            self.settings.id,
-            HistoryItem {
-                timestamp: Utc::now(),
-                word_id: word.word_id,
-                mode: status,
-                before: old_score,
-                after: new_score,
-            },
-        )
-    }
-    pub fn len(&self) -> usize {
-        self.set.len()
-    }
-}
-#[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)]
-enum OrderModule {
-    SemiRandomSRS(SemiRandomSRSModule),
-    RandomSRS(RandomSRSModule),
-    WorstWordsSRS(WorstWordsSRSModule),
-}
-trait SRSModule {
-    fn next(&mut self, set: &mut DeckData) -> usize;
-    fn open(&mut self, status: WordOpenMode, index: usize, updated_word: CardStatistics);
-    fn init(&mut self, set: &mut DeckData);
-}
-#[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 DeckData) -> usize {
-        match self.basket.pop() {
-            Some(index) => index,
-            None => {
-                self.basket = (0..set.words.len()).collect::<Vec<usize>>();
-                self.basket.shuffle(&mut rand::rng());
-                self.basket.pop().expect("empty basket")
-            }
-        }
-    }
-
-    fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}
-
-    fn init(&mut self, set: &mut DeckData) {
-        self.initialized = true;
-        self.basket = (0..set.set.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 DeckData) -> 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: CardStatistics) {
-        let new_weight = (100.0 / word.calculated_score()).powf(2.0);
-        self.last_weights
-            .update_weights(&[(index, &new_weight)])
-            .expect("update weights error");
-    }
-    fn init(&mut self, set: &mut DeckData) {
-        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: &DeckData) -> usize {
-        ((set.len() as f32 * MAX_HISTORY_LEN_PART) as usize).clamp(1, MAX_HISTORY_LEN)
-    }
-}
-#[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 DeckData) -> 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, _: CardStatistics) {}
-
-    fn init(&mut self, _: &mut DeckData) {
-        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: &DeckData) {
-        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;
-    }
-}
-#[derive(Clone)]
-pub struct DeckSettings {
-    pub id: Id,
-    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: OrderMode,
-}
-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(),
-            count: None,
-            worst_words_list: None,
-            open_mode: OrderMode::Default,
-        }
-    }
-    pub fn check_filter(&self) -> bool {
-        let time = Instant::now();
-        let engine = Engine::new();
-        let ast = engine.compile(&self.filter);
-        println!("Compile time is {:?}", time.elapsed());
-        ast.is_ok()
-    }
-    pub fn get_word_list(&self, state: &AppState) -> Vec<usize> {
-        let time = Instant::now();
-        let mut list = vec![];
-        let engine = Engine::new();
-
-        let ast = engine.compile(&self.filter);
-        if let Ok(ast) = ast {
-            let groups = &state.word_groups;
-
-            list = state
-                .dictionary
-                .par_iter()
-                .enumerate()
-                .filter(|(_, 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();
-                    scope
-                        .push_constant("id", word.id.0)
-                        .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);
-                    result.is_ok() && result.unwrap()
-                })
-                .map(|(index, _)| index)
-                .collect();
-
-            println!("Collecting available words is {:?}", time.elapsed());
-
-            list
-        } else {
-            list
-        }
-    }
-    pub fn require_speech(&self) -> bool {
-        self.forward == "speech" || self.backward == "speech"
-    }
-}

src/main.rs

@@ -1,135 +1,23 @@
 #![windows_subsystem = "windows"]
+pub mod app;
+mod core;
+mod data;
 mod data_provider;
-mod dictionary;
-mod dictionary_quiz;
-mod history;
-pub mod import;
-mod lang;
-pub mod navigation;
-mod quiz;
-mod randomizer;
-mod repetition;
-mod repetition_settings;
-mod repetitions;
-mod selector;
-pub mod styling;
-mod sync;
-mod word;
-mod writing;
+mod fs;
+pub mod helpers;
+mod navigation;
+pub mod notification;
+mod pages;
+mod styling;
+pub mod tests;
 
-use crate::RootMessage::Keyboard;
-use crate::data_provider::card_sets::load_sets;
-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::{DeckSettings, Id, WordData, WordGroup};
-use crate::navigation::{AppSettings, RootMessage, ScreenState};
-use crate::quiz::*;
-use chrono::NaiveDate;
-use hashbrown::HashMap;
-use iced::{Font, window};
-use iced::{Subscription, Theme, keyboard};
-use iced_core::Size;
-use iced_core::window::Position;
-#[cfg(target_os = "linux")]
-use iced_core::window::settings::PlatformSpecific;
+use crate::app::start;
 use mimalloc::MiMalloc;
-use rusqlite::Connection;
+
 #[global_allocator]
 static GLOBAL: MiMalloc = MiMalloc;
 
-const USER_FONT: Font = Font::with_name("Noto Sans JP");
-
 fn main() -> iced::Result {
-    println!("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)
-}
-
-pub struct AppState {
-    pub dictionary: Vec<WordData>,
-    pub decks: Vec<DeckSettings>,
-    pub word_groups: Vec<WordGroup>,
-    pub connection: Connection,
-    pub sync_data: AppSettings,
-    pub activity: HashMap<Id, Vec<(NaiveDate, u32)>>,
-}
-
-impl Default for AppState {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AppState {
-    pub fn new() -> Self {
-        Self {
-            dictionary: vec![],
-            decks: 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.decks = 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,
-    }
+    env_logger::init();
+    start()
 }

src/navigation.rs

@@ -1,33 +1,44 @@
-use crate::data_provider::history::{get_history_of_set, history_dir};
+use crate::app::{AppState, fill_state};
+use crate::data::Id;
+use crate::data_provider::history::get_history_of_set;
 use crate::data_provider::sqlite::{create_db, default_connection};
-use crate::data_provider::web_api::{get_local_version, get_web_version, load_data, set_local_version};
-use crate::dictionary::{DictionaryMessage, DictionaryState, app_data_dir};
-use crate::dictionary_quiz::{DictionaryQuizMessage, DictionaryQuizState};
-use crate::history::{HistoryMessage, HistoryState};
-use crate::import::{ImportMessage, ImportState};
-use crate::lang::Id;
-use crate::message_navigation;
+use crate::data_provider::web_api::{
+    get_local_version, get_web_version, load_data, set_local_version,
+};
+use crate::fs::*;
 use crate::navigation::Page::*;
-use crate::navigation::RootMessage::{DataLoaded, Keyboard, UpdateData};
-use crate::quiz::{QuizMessage, QuizState};
-use crate::randomizer::{RandomizerMessage, RandomizerState};
-use crate::repetition::{RepetitionMessage, RepetitionState};
-use crate::repetition_settings::{RepetitionSettingsMessage, RepetitionSettingsState};
-use crate::repetitions::{RepetitionsMessage, RepetitionsState};
-use crate::selector::{SelectorMessage, SelectorState};
+use crate::navigation::RootMessage::{
+    DataLoaded, Keyboard, Notification, PushNotification, UpdateData,
+};
+use crate::notification::NotificationData::PermissionDenied;
+use crate::notification::{
+    NotificationData, NotificationManager, NotificationMessage, NotificationRequest,
+};
+use crate::pages::dictionary::{DictionaryMessage, DictionaryState};
+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::writing::{WritingMessage, WritingState};
-use crate::{AppState, fill_state};
+use crate::{message_navigation, push_error, push_error_task};
 use chrono::NaiveDate;
 use hashbrown::HashMap;
 use iced::keyboard::Event;
+use iced::widget::stack;
 use iced::{Element, Task};
+use iced_core::Length::Fill;
+use log::info;
 use parking_lot::Mutex;
-use reqwest::Error;
 use rusqlite::Connection;
 use std::sync::Arc;
 use std::time::Instant;
@@ -40,6 +51,7 @@ impl Default for ScreenState {
         ScreenState {
             stack: vec![Selector(SelectorState::new(state.clone()))],
             app_state: state.clone(),
+            notification_manager: NotificationManager::new(),
         }
     }
 }
@@ -61,10 +73,13 @@ pub enum RootMessage {
     Import(ImportMessage),
     Keyboard(Event),
     DataLoaded(HashMap<Id, 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),
@@ -85,56 +100,62 @@ pub enum Page {
 pub struct ScreenState {
     stack: Vec<Page>,
     app_state: Arc<Mutex<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 reading_additional_task = Task::perform(Self::load_additional_data(), |data| {
+            data.unwrap_or_else(|err| push_error!(err))
+        });
 
-        let final_task;
+        let mut final_task = reading_additional_task;
         let state_guard = state.app_state.lock();
-        if state_guard.sync_data.auto_web_fetch {
-            let key = state_guard.sync_data.key.clone().unwrap();
-            final_task = Task::batch([
-                reading_additional_task,
-                Task::perform(Self::load_web_backup(key), |result| {
-                    if let Ok(update) = result
-                        && update
+        if state_guard.sync_data.auto_web_fetch
+            && let Some(key) = state_guard.sync_data.key.clone()
         {
+            final_task = Task::batch([
+                final_task,
+                Task::perform(Self::load_web_backup(key), |result| match result {
+                    Ok(update) => {
+                        if update {
                             UpdateData
                         } else {
                             RootMessage::None
                         }
+                    }
+                    Err(err) => push_error!(err),
                 }),
             ]);
-        } else {
-            final_task = reading_additional_task;
         }
 
         drop(state_guard);
-        println!("Boot finished");
+        info!("Boot finished");
         (state, final_task)
     }
 
-    async fn load_additional_data() -> RootMessage {
-        let directory = history_dir();
+    async fn load_additional_data() -> Result<RootMessage, NotificationData> {
+        let directory = history_dir()?;
+
         let mut map = HashMap::new();
-        for file in directory.read_dir().unwrap().flatten() {
+        for file in directory
+            .read_dir()
+            .map_err(|_| PermissionDenied)?
+            .filter_map(Result::ok)
+        {
             let mut vec = vec![];
             let history_file_name = match file.file_name().into_string() {
                 Err(_) => continue,
                 Ok(v) => v,
             };
 
-            let id = history_file_name[4..history_file_name.len() - 12]
-                .parse::<Id>()
-                .unwrap();
-
-            let history = get_history_of_set(id);
+            if let Ok(id) = history_file_name.split('_').collect::<Vec<_>>()[1].parse::<Id>()
+                && let Ok(history) = get_history_of_set(id)
+            {
                 let by_date = history.chunk_by(|x, x1| {
                     x.timestamp.naive_local().date() == x1.timestamp.naive_local().date()
                 });
@@ -142,18 +163,21 @@ impl ScreenState {
                     vec.push((group[0].timestamp.naive_local().date(), group.len() as u32));
                 }
                 map.insert(id, vec);
+            } else {
+                continue;
             }
-        DataLoaded(map)
+        }
+        Ok(DataLoaded(map))
     }
 
-    async fn load_web_backup(string: String) -> Result<bool, Error> {
-        let local = get_local_version().await;
+    async fn load_web_backup(string: String) -> Result<bool, NotificationData> {
+        let local = get_local_version().await?;
         let web = get_web_version(string.as_str()).await?;
-        println!("{} {}", local, web);
+        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?;
-            set_local_version(web).await;
+            set_local_version(web).await?;
         } else {
             return Ok(false);
         }
@@ -161,7 +185,7 @@ impl ScreenState {
     }
 
     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);
@@ -173,20 +197,30 @@ impl ScreenState {
         }
 
         if let UpdateData = message {
-            println!("Loading data");
+            info!("Loading data");
             let mut state = self.app_state.lock();
             if cfg!(windows) {
                 state.connection = Connection::open_in_memory().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();
+            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_connection();
             fill_state(&mut state);
             return Task::none();
         }
+
+        if let Notification(message) = message {
+            return self.notification_manager.update(message);
+        }
+
+        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 {
@@ -207,7 +241,7 @@ impl ScreenState {
                 Import
             );
         }
-        println!("Update took {:?}", time.elapsed());
+        info!("Update took {:?}", time.elapsed());
 
         task.0
     }
@@ -233,7 +267,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,
@@ -252,16 +286,20 @@ impl ScreenState {
             Import
         );
 
-        println!("View took {:?}", time.elapsed());
-        view
+        let notifications = self.notification_manager.draw().map(Notification);
+
+        info!("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();
-        match page {
+        if let Some(page) = self.stack.last_mut() {
+            return match page {
                 Repetition(page) => page.press(&message),
                 _ => Task::none(),
+            };
         }
+        Task::none()
     }
 }
 
@@ -273,7 +311,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),
             )*
@@ -281,14 +319,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 {
@@ -300,7 +337,6 @@ macro_rules! state_update {
         }
     }
 }
-
 #[macro_export]
 macro_rules! message_navigation {
     ($msg:expr, $stack:expr, $state:expr) => {
@@ -321,11 +357,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();
@@ -335,14 +370,12 @@ macro_rules! state_navigate_handle {
         }
     }
 }
-
 pub trait NavigatedPage<T> {
     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

@@ -1,13 +1,16 @@
+use crate::app::AppState;
+use crate::data::Id;
+use crate::data::entities::{WordData, WordGroup};
 use crate::data_provider::words::{delete_group, delete_word, update_group, update_word};
-use crate::dictionary::DictionaryMessage::*;
-use crate::dictionary_quiz::DictionaryQuizState;
-use crate::import::ImportState;
-use crate::lang::{WordData, WordGroup};
 use crate::navigation::Page::{Import, Word};
-use crate::navigation::{NavigatedPage, Page};
+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;
+use crate::push_error_task;
 use crate::styling::*;
-use crate::word::WordState;
-use crate::{AppState, RootMessage};
 use chrono::{DateTime, TimeDelta, Utc};
 use hashbrown::{HashMap, HashSet};
 use iced::alignment::Vertical::Center;
@@ -18,11 +21,10 @@ use iced::widget::text_input::default;
 use iced::widget::*;
 use iced::{Border, Color, Shadow, Task};
 use iced_core::Length::Fill;
+use log::info;
 use parking_lot::Mutex;
 use rand::random_range;
-use std::fs;
 use std::ops::Add;
-use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
@@ -168,7 +170,9 @@ impl NavigatedPage<DictionaryMessage> for DictionaryState {
                 let word = dict.remove(i);
                 self.include_map.remove(i);
                 self.auto_save_queue.remove(&i);
-                delete_word(&word, &state.connection)
+                if let Err(err) = delete_word(&word, &state.connection) {
+                    return push_error_task!(err);
+                }
             }
             Include(i, b) => self.include_map[i] = b,
             IncludeTag(t, v) => {
@@ -190,7 +194,7 @@ impl NavigatedPage<DictionaryMessage> for DictionaryState {
                 self.search = s;
             }
             SetTyping(b) => self.no_typing = b,
-            SubmitWord(i) => self.save_word(i),
+            SubmitWord(i) => return self.save_word(i),
             Back => {}
             Test => {}
             CreateGroup => {
@@ -213,7 +217,10 @@ impl NavigatedPage<DictionaryMessage> for DictionaryState {
                 let connection = &state.connection;
                 let mut group = state.word_groups[self.selected_group_index].clone();
 
-                update_group(&mut group, connection);
+                if let Err(err) = update_group(&mut group, connection) {
+                    return push_error_task!(err);
+                }
+
                 state.word_groups[self.selected_group_index] = group;
             }
             SelectGroup(i) => {
@@ -236,7 +243,10 @@ impl NavigatedPage<DictionaryMessage> for DictionaryState {
                         let remove_group_id = group.id;
                         let connection = &state.connection;
 
-                        delete_group(group, connection);
+                        if let Err(err) = delete_group(group, connection) {
+                            return push_error_task!(err);
+                        }
+
                         state.word_groups.remove(self.selected_group_index);
                         state
                             .dictionary
@@ -257,7 +267,8 @@ impl NavigatedPage<DictionaryMessage> for DictionaryState {
                 }
                 if self.auto_save_queue[&word_index] <= now {
                     self.auto_save_queue.remove(&word_index);
-                    self.save_word(word_index);
+
+                    return self.save_word(word_index);
                 }
             }
             ToImport => {}
@@ -309,13 +320,17 @@ impl DictionaryState {
         result
     }
 
-    fn save_word(&mut self, i: usize) {
+    fn save_word(&mut self, i: usize) -> Task<RootMessage> {
         let state = &mut self.state.lock();
         let connection = &state.connection;
         let word = &mut state.dictionary[i].clone();
 
-        update_word(word, connection);
+        if let Err(err) = update_word(word, connection) {
+            return push_error_task!(err);
+        }
+
         state.dictionary[i] = word.clone();
+        Task::none()
     }
 
     fn launch_auto_save_offset(&mut self, index: usize) -> Task<RootMessage> {
@@ -438,8 +453,8 @@ impl DictionaryState {
             col = col.push(lazy_line);
         }
 
-        println!("Drawing {index} lines");
-        println!("Words rendering time: {:?}", time.elapsed());
+        info!("Drawing {index} lines");
+        info!("Words rendering time: {:?}", time.elapsed());
         scrollable(col).height(Fill).into()
     }
 
@@ -528,7 +543,7 @@ impl DictionaryState {
         });
     }
 
-    fn update_words_include(&mut self, group_id: crate::lang::Id) {
+    fn update_words_include(&mut self, group_id: Id) {
         let include_tags = self
             .tag_map
             .iter()
@@ -554,7 +569,7 @@ impl DictionaryState {
             })
             .collect();
 
-        println!("Time {}", time.elapsed().as_micros());
+        info!("Time {}", time.elapsed().as_micros());
     }
 
     fn groups_panel(&self) -> iced::Element<'_, DictionaryMessage> {
@@ -618,22 +633,12 @@ pub fn split_with_coma(ts: &str) -> Vec<String> {
         .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_all(dir.clone()).unwrap();
-    }
-
-    dir
-}
-
 #[derive(Hash, PartialEq, Eq)]
 struct WordLineState {
     is_included: bool,
     key: String,
     value: String,
     tags: String,
-    id: crate::lang::Id,
+    id: Id,
     index: usize,
 }

src/pages/dictionary_quiz.rs

@@ -1,10 +1,10 @@
-use crate::RootMessage;
-use crate::dictionary::split_with_coma;
-use crate::dictionary_quiz::DictionaryQuizMessage::*;
-use crate::lang::WordData;
+use crate::data::entities::WordData;
 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 iced::Background::Color;
 use iced::border::Radius;
@@ -146,8 +146,9 @@ impl DictionaryQuizState {
         if !self.is_help {
             self.score.total += 1;
         }
-        if self.answer == self.correct
-            || split_with_coma(self.correct.as_str()).contains(&self.answer)
+        if self.answer.to_lowercase() == self.correct.to_lowercase()
+            || split_with_coma(self.correct.to_lowercase().as_str())
+                .contains(&self.answer.to_lowercase())
         {
             if !self.is_help {
                 self.score.correct += 1;

src/pages/history.rs

@@ -1,8 +1,10 @@
-use crate::data_provider::history::{get_history_of_set, HistoryItem};
-use crate::lang::{WordData, INVALID_ID};
-use crate::navigation::{NavigatedPage, Page};
+use crate::app::AppState;
+use crate::data::INVALID_ID;
+use crate::data::entities::{HistoryItem, WordData};
+use crate::data_provider::history::get_history_of_set;
+use crate::navigation::*;
 use crate::styling::*;
-use crate::{AppState, RootMessage};
+use HistoryMessage::Back;
 use chrono::Local;
 use iced::alignment::Horizontal::Center;
 use iced::widget::space::horizontal;
@@ -10,7 +12,6 @@ use iced::widget::*;
 use iced::{Element, Fill, FillPortion, Task};
 use parking_lot::Mutex;
 use std::sync::Arc;
-use HistoryMessage::Back;
 
 #[derive(Clone)]
 pub struct HistoryState {
@@ -47,9 +48,9 @@ impl NavigatedPage<HistoryMessage> for HistoryState {
 }
 
 impl HistoryState {
-    pub fn new(id: crate::lang::Id, state: Arc<Mutex<AppState>>) -> Self {
+    pub fn new(id: crate::data::Id, state: Arc<Mutex<AppState>>) -> Self {
         let state = state.lock();
-        let history = get_history_of_set(id);
+        let history = get_history_of_set(id).unwrap_or_default();
         let words = history
             .iter()
             .map(

src/pages/import.rs

@@ -1,10 +1,13 @@
-use crate::AppState;
+use crate::app::AppState;
+use crate::data::entities::{WordData, WordGroup};
 use crate::data_provider::import::{ImportData, ImportGroup, get_words_of_group, load_groups};
 use crate::data_provider::words::{add_group, add_words};
-use crate::dictionary::app_data_dir;
-use crate::import::ImportMessage::*;
-use crate::lang::{WordData, WordGroup};
+use crate::fs::*;
 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,6 +19,7 @@ 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;
@@ -275,9 +279,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())),
             );
@@ -365,41 +366,38 @@ impl ImportState {
                 .await
                 .unwrap()
             },
-            |result: Result<ImportData, ()>| {
-                if let Ok(import) = result {
-                    RootMessage::Import(UpdateImport(import))
-                } else {
-                    RootMessage::None
-                }
+            |result: Result<ImportData, NotificationData>| match result {
+                Ok(import) => RootMessage::Import(UpdateImport(import)),
+                Err(err) => push_error!(err),
             },
         )
     }
 
-    fn extract_import_file(path: PathBuf) -> Result<(), ()> {
-        let file = File::open(path).map_err(|_| ())?;
+    fn extract_import_file(path: PathBuf) -> MaybeError {
+        let file = File::open(path).map_err(|_| OpenFileError)?;
         let reader = BufReader::new(file);
-        let mut archive = ZipArchive::new(reader).map_err(|_| ())?;
-        let temp_file_path = app_data_dir().join("import");
+        let mut archive = ZipArchive::new(reader).map_err(|_| OpenFileError)?;
+        let temp_file_path = temp_import_path();
         let mut temp_file = OpenOptions::new()
             .write(true)
             .create(true)
             .truncate(true)
             .open(&temp_file_path)
-            .map_err(|_| ())?;
+            .map_err(|_| OpenFileError)?;
         if let Ok(mut file) = archive.by_name("collection.anki21") {
-            std::io::copy(&mut file, &mut temp_file).map_err(|_| ())?;
+            std::io::copy(&mut file, &mut temp_file).map_err(|_| OpenFileError)?;
             Ok(())
         } else if let Ok(mut file) = archive.by_name("collection.anki2") {
-            std::io::copy(&mut file, &mut temp_file).map_err(|_| ())?;
+            std::io::copy(&mut file, &mut temp_file).map_err(|_| OpenFileError)?;
             Ok(())
         } else {
-            Err(())
+            Err(OpenFileError)
         }
     }
-    fn read_import_file() -> Result<ImportData, ()> {
-        let temp_file_path = app_data_dir().join("import");
-        let connection = Connection::open(&temp_file_path).map_err(|_| ())?;
-        let data = load_groups(&connection);
+    fn read_import_file() -> Result<ImportData, NotificationData> {
+        let temp_file_path = temp_import_path();
+        let connection = Connection::open(&temp_file_path).map_err(|_| OpenFileError)?;
+        let data = load_groups(&connection)?;
         Ok(data)
     }
     fn setup_mapping(&mut self, property_name: String) {
@@ -430,13 +428,14 @@ 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 connection = Connection::open(&temp_file_path).map_err(|_| ())?;
-                    let import_list = get_words_of_group(&connection, group.id);
+                    let temp_file_path = temp_import_path();
+                    let connection =
+                        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);
@@ -446,7 +445,7 @@ impl ImportState {
                     };
                     {
                         let state = state.lock();
-                        add_group(&mut group_entity, &state.connection);
+                        add_group(&mut group_entity, &state.connection)?;
                     }
 
                     let group_id = group_entity.id;
@@ -486,7 +485,7 @@ impl ImportState {
                     let mut index = 0;
                     let total_len = words_list.len() as f32 / 1024.0;
                     for word in &mut words_list.chunks_mut(1024) {
-                        add_words(word, connection);
+                        add_words(word, connection)?;
                         index += 1;
                         let mut progress = progress.lock();
                         *progress = (index as f32 / total_len).min(1.0);
@@ -500,7 +499,10 @@ impl ImportState {
                 .await
                 .unwrap()
             },
-            |_: Result<(), ()>| RootMessage::Import(ImportFinished),
+            |r: Result<(), NotificationData>| match r {
+                Ok(_) => RootMessage::Import(ImportFinished),
+                Err(err) => push_error!(err),
+            },
         )
     }
 

src/pages/quiz.rs

@@ -1,9 +1,9 @@
-use crate::lang::KanaSet;
+use crate::app::USER_FONT;
+use crate::core::kana_set::KanaSet;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
-use crate::quiz::QuizMessage::*;
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::pages::quiz::QuizMessage::*;
 use crate::styling::*;
-use crate::{RootMessage, USER_FONT};
 use iced::widget::*;
 use iced::{Element, Fill, Task, alignment};
 use rand::seq::SliceRandom;

src/pages/randomizer.rs

@@ -1,6 +1,6 @@
-use crate::RootMessage;
+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::{HALF_SPACING, back_overlay, jl_button};
 use iced::Task;
 use iced::widget::{button, text_editor};

src/pages/repetition.rs

@@ -1,16 +1,20 @@
+use crate::app::AppState;
+use crate::core::deck::DeckData;
+use crate::core::srs::WordOpenMode;
+use crate::data::Id;
+use crate::data::entities::{CardStatistics, DeckSettings, WordData};
 use crate::data_provider::voice::get_voice;
-use crate::lang::Id;
-use crate::lang::{CardStatistics, DeckData, DeckSettings, WordData, WordOpenMode};
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{KeyPressedPage, NavigatedPage, Page};
+use crate::navigation::{KeyPressedPage, NavigatedPage, Page, RootMessage};
+use crate::notification::{MaybeError, NotificationData};
 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;
-use iced::widget::{button, column, container, row, rule, space, text, tooltip, Column};
-use iced::{alignment, keyboard, Element, Fill, Task, Theme};
+use iced::widget::{Column, button, column, container, row, rule, space, text, tooltip};
+use iced::{Element, Fill, Task, Theme, alignment, keyboard};
 use parking_lot::Mutex;
 use rodio::MixerDeviceSink;
 use std::collections::HashSet;
@@ -52,8 +56,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), |_| {
-                        RootMessage::Repetition(RepetitionMessage::PlayFinished)
+                    return Task::perform(play_sound(self.sink.clone(), value), |r| match r {
+                        Ok(_) => RootMessage::Repetition(RepetitionMessage::PlayFinished),
+                        Err(err) => push_error!(err),
                     });
                 }
             }
@@ -97,8 +102,11 @@ impl NavigatedPage<RepetitionMessage> for RepetitionState {
 }
 
 impl RepetitionState {
-    pub(crate) fn new(set: DeckSettings, state: Arc<Mutex<AppState>>) -> RepetitionState {
-        let mut card_set = DeckData::new(&set, state.clone());
+    pub(crate) fn new(
+        set: DeckSettings,
+        state: Arc<Mutex<AppState>>,
+    ) -> Result<RepetitionState, NotificationData> {
+        let mut card_set = DeckData::new(&set, state.clone())?;
         let (word, stat) = card_set.next();
 
         let sink_handle = if set.forward.contains("speech") || set.backward.contains("speech") {
@@ -107,7 +115,7 @@ impl RepetitionState {
             None
         };
 
-        RepetitionState {
+        Ok(RepetitionState {
             state,
             settings: set,
             set: card_set,
@@ -117,7 +125,7 @@ impl RepetitionState {
             can_play: true,
             sink: Arc::new(sink_handle),
             opened: HashSet::new(),
-        }
+        })
     }
 }
 
@@ -136,7 +144,10 @@ 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();
@@ -146,8 +157,9 @@ impl RepetitionState {
         if self.settings.require_speech() && self.sink.is_some() {
             let sink = self.sink.clone();
             let task = play_sound(sink, self.current_word.key.clone());
-            return Task::perform(task, |_| {
-                RootMessage::Repetition(RepetitionMessage::PlayFinished)
+            return Task::perform(task, |r| match r {
+                Ok(_) => RootMessage::Repetition(RepetitionMessage::PlayFinished),
+                Err(err) => push_error!(err),
             });
         }
         self.increment_counter();
@@ -322,8 +334,8 @@ pub enum RepetitionMessage {
     PlayFinished,
 }
 
-async fn play_sound(sink: Arc<Option<MixerDeviceSink>>, text: String) {
-    if let Ok(data) = get_voice(text.as_str()).await {
+async fn play_sound(sink: Arc<Option<MixerDeviceSink>>, text: String) -> MaybeError {
+    let data = get_voice(text.as_str()).await?;
     spawn_blocking(move || {
         if let Some(sink) = sink.as_ref()
             && let Ok(play) = rodio::play(sink.mixer(), data)
@@ -332,6 +344,6 @@ async fn play_sound(sink: Arc<Option<MixerDeviceSink>>, text: String) {
         }
     })
     .await
-        .unwrap();
-    }
+    .expect("Playing sound failed");
+    Ok(())
 }

src/pages/repetition_settings.rs

@@ -1,11 +1,13 @@
-use crate::AppState;
+use crate::app::AppState;
+use crate::data::entities::DeckSettings;
 use crate::data_provider::card_sets::{delete_set, update_deck};
 use crate::data_provider::card_stats::{delete_stats, load_stats_of_deck};
-use crate::lang::DeckSettings;
 use crate::navigation::Page::PreviousPage;
 use crate::navigation::{NavigatedPage, Page, RootMessage};
-use crate::repetition_settings::RepetitionSettingsMessage::*;
+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::text_input::Catalog;
 use iced::widget::{button, column, row, scrollable, space, text, text_input};
@@ -60,9 +62,13 @@ impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
             Back => {}
             Save => {
                 let mut state = self.state.lock();
-                update_deck(&mut self.set, &state.connection);
-                if self.filter_changed {
-                    update_deck_stats(&self.set, &state);
+                if let Err(e) = update_deck(&mut self.set, &state.connection) {
+                    return push_error_task!(e);
+                }
+                if self.filter_changed
+                    && let Err(e) = update_deck_stats(&self.set, &state)
+                {
+                    return push_error_task!(e);
                 }
                 state.decks[self.index] = self.set.clone();
             }
@@ -94,7 +100,10 @@ impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
                     });
                 }
                 let mut state = self.state.lock();
-                delete_set(&self.set, &state.connection);
+                if let Err(e) = delete_set(&self.set, &state.connection) {
+                    return push_error_task!(e);
+                }
+
                 state.decks.remove(self.index);
                 return Task::done(RootMessage::RepetitionSettings(Back));
             }
@@ -170,8 +179,8 @@ impl NavigatedPage<RepetitionSettingsMessage> for RepetitionSettingsState {
     }
 }
 
-fn update_deck_stats(deck: &DeckSettings, state: &AppState) {
-    let mut db_stats = load_stats_of_deck(deck, &state.connection);
+fn update_deck_stats(deck: &DeckSettings, state: &AppState) -> MaybeError {
+    let mut db_stats = load_stats_of_deck(deck, &state.connection).expect("Wrong db operation");
     let filtered_words = deck.get_word_list(state);
     filtered_words.iter().for_each(|word| {
         let word_id = state.dictionary[*word].id;
@@ -180,7 +189,8 @@ fn update_deck_stats(deck: &DeckSettings, state: &AppState) {
         }
     });
 
-    delete_stats(db_stats.as_slice(), &state.connection);
+    delete_stats(db_stats.as_slice(), &state.connection)?;
+    Ok(())
 }
 
 impl RepetitionSettingsState {

src/pages/repetitions.rs

@@ -1,14 +1,19 @@
+use crate::app::AppState;
+use crate::core::srs::{AppendMode, OrderMode};
+use crate::data::Id;
+use crate::data::entities::{CardStatistics, DeckSettings};
 use crate::data_provider::card_sets::update_deck;
 use crate::data_provider::card_stats::{add_stat_list, load_stats_of_deck};
-use crate::history::HistoryState;
-use crate::lang::{AppendMode, CardStatistics, DeckSettings, Id, OrderMode};
 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::navigation::{NavigatedPage, Page, RootMessage};
+use crate::notification::{MaybeError, NotificationRequest};
+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 crate::{AppState, RootMessage};
 use chrono::{Days, Local, Utc};
 use hashbrown::{HashMap, HashSet};
 pub use iced::widget::button::{Catalog, Style};
@@ -48,28 +53,25 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
 
             let selected_set = self.selected_deck_mut().unwrap();
             if selected_set.append_mode == AppendMode::Full {
-                Self::append_all_words(&mut clone.lock(), selected_set);
+                if let Err(_err) = Self::append_all_words(&mut clone.lock(), selected_set) {
+                    return None;
+                }
                 selected_set.existing_words_indices = selected_set.available_words_indices.clone();
             } else {
-                if selected_set
-                    .available_words_indices
-                    .as_ref()
-                    .unwrap()
-                    .is_empty()
-                    || selected_set
-                        .existing_words_indices
-                        .as_ref()
-                        .unwrap()
-                        .is_empty()
+                if selected_set.available_words_indices.is_empty()
+                    || selected_set.existing_words_indices.is_empty()
                 {
                     return None;
                 }
             }
 
-            Some(Repetition(RepetitionState::new(
-                selected_set.general_settings.clone(),
-                clone,
-            )))
+            if let Ok(repetition_state) =
+                RepetitionState::new(selected_set.general_settings.clone(), clone)
+            {
+                return Some(Repetition(repetition_state));
+            }
+
+            None
         } else if let GoToSettings = message {
             Some(RepetitionSettings(RepetitionSettingsState::new(
                 self.selected_deck().unwrap().index.unwrap(),
@@ -80,7 +82,7 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
         }
     }
     fn navigated(&mut self) {
-        let index = self.selected_deck_index.unwrap();
+        if let Some(index) = self.selected_deck_index {
             let state = self.state.lock();
             if let Some(global_deck) = state.decks.get(index) {
                 if global_deck.id != self.selected_deck().unwrap().id {
@@ -88,10 +90,9 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
                     self.decks.remove(index);
                     self.clear_selection();
                 } else {
-                self.decks[self.selected_deck_index.unwrap()].general_settings =
-                    state.decks[index].clone();
+                    self.decks[index].general_settings = state.decks[index].clone();
                     drop(state);
-                self.fill_deck_word_indices();
+                    let _ = self.fill_deck_word_indices();
                 }
             } else {
                 drop(state);
@@ -99,6 +100,7 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
                 self.clear_selection()
             }
         }
+    }
     fn update(&mut self, message: RepetitionsMessage) -> Task<RootMessage> {
         match message {
             Next => {}
@@ -111,8 +113,9 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
                 let index = self.decks.len() + 1;
                 self.decks.push(DeckViewData {
                     general_settings: DeckSettings::with_name(format!("Колода #{}", index)),
-                    existing_words_indices: None,
-                    available_words_indices: None,
+                    existing_words_indices: Default::default(),
+                    available_words_indices: Default::default(),
+                    indices_ready: false,
                     append_mode: Default::default(),
                     index: None,
                 });
@@ -142,15 +145,21 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
             SelectSet(index) => {
                 self.select_deck(index);
                 let deck = self.selected_deck().unwrap();
-                if deck.existing_words_indices.is_none() {
-                    self.fill_deck_word_indices();
+                if !deck.indices_ready
+                    && let Err(err) = self.fill_deck_word_indices()
+                {
+                    return push_error_task!(err);
                 }
             }
             Save => {
                 let mut deck = self.selected_deck().unwrap().clone();
                 let mut state = self.state.lock();
                 {
-                    update_deck(&mut deck.general_settings, &state.connection);
+                    if let Err(e) = update_deck(&mut deck.general_settings, &state.connection) {
+                        return Task::done(RootMessage::PushNotification(
+                            NotificationRequest::Error(e),
+                        ));
+                    }
                     if let Some(index) = deck.index {
                         state.decks[index] = deck.general_settings.clone();
                     } else {
@@ -193,15 +202,13 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
                 {
                     {
                         let deck = self.selected_deck().unwrap();
-                        let existing_words_indices = deck.existing_words_indices.as_ref().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
-                            .as_ref()
-                            .unwrap()
                             .iter()
                             .filter(|c| !created_set.contains(c))
                             .take(count)
@@ -210,15 +217,16 @@ impl NavigatedPage<RepetitionsMessage> for RepetitionsState {
                     }
 
                     let deck = self.selected_deck_mut().unwrap();
-                    deck.existing_words_indices
-                        .as_mut()
-                        .unwrap()
-                        .append(&mut adding.clone());
+                    deck.existing_words_indices.append(&mut adding.clone());
                 }
 
                 let deck = self.selected_deck().unwrap();
                 let mut state = self.state.lock();
-                Self::append_words(&mut state, &deck.general_settings, adding.into_iter());
+                if let Err(err) =
+                    Self::append_words(&mut state, &deck.general_settings, adding.into_iter())
+                {
+                    return push_error_task!(err);
+                }
             }
         }
         Task::none()
@@ -278,8 +286,9 @@ impl RepetitionsState {
             .enumerate()
             .map(|(index, deck)| DeckViewData {
                 general_settings: deck.clone(),
-                existing_words_indices: None,
-                available_words_indices: None,
+                existing_words_indices: Default::default(),
+                available_words_indices: Default::default(),
+                indices_ready: false,
                 append_mode: Default::default(),
                 index: Some(index),
             })
@@ -290,9 +299,7 @@ impl RepetitionsState {
 impl RepetitionsState {
     fn launch_delete_button(&self, deck: &DeckViewData) -> Element<'_, RepetitionsMessage> {
         if deck.id.is_valid() {
-            if deck.append_mode == AppendMode::Manual
-                && deck.existing_words_indices.as_ref().unwrap().is_empty()
-            {
+            if deck.append_mode == AppendMode::Manual && deck.existing_words_indices.is_empty() {
                 return text!("Добавьте карточки или измените фильтр").into();
             }
             return row![
@@ -443,7 +450,7 @@ impl RepetitionsState {
 
                     let date = (*now)
                         .checked_sub_days(Days::new(30 * 7 - i * 7 - j - 1))
-                        .unwrap();
+                        .unwrap_or_default();
 
                     column = column.push(tooltip(
                         iced::widget::container(space().height(15).width(15)).style(
@@ -515,12 +522,8 @@ impl RepetitionsState {
 
     fn count_comparator_view(&self) -> Element<'_, RepetitionsMessage> {
         let selected_deck = self.selected_deck().unwrap();
-        let now = selected_deck.existing_words_indices.as_ref().unwrap().len();
-        let available = selected_deck
-            .available_words_indices
-            .as_ref()
-            .unwrap()
-            .len();
+        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: &DeckSettings) -> Element<'_, RepetitionsMessage> {
@@ -559,26 +562,25 @@ impl RepetitionsState {
 }
 
 impl RepetitionsState {
-    fn append_all_words(state: &mut AppState, deck: &DeckViewData) {
-        let existing = deck.existing_words_indices.as_ref().unwrap();
+    fn append_all_words(state: &mut AppState, deck: &DeckViewData) -> 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
-            .as_ref()
-            .unwrap()
             .iter()
             .filter(|i| !created_set.contains(i))
             .cloned();
-        Self::append_words(state, deck, required);
+        Self::append_words(state, deck, required)?;
+        Ok(())
     }
     fn append_words(
         state: &mut AppState,
         deck: &DeckSettings,
         indices: impl Iterator<Item = usize>,
-    ) {
+    ) -> MaybeError {
         let words = &state.dictionary;
         let stats = &mut indices
             .map(|i| {
@@ -594,8 +596,9 @@ impl RepetitionsState {
             .collect::<Vec<_>>();
 
         if !stats.is_empty() {
-            add_stat_list(stats, &mut state.connection);
+            add_stat_list(stats, &mut state.connection)?;
         }
+        Ok(())
     }
 
     fn select_deck(&mut self, index: usize) {
@@ -615,17 +618,18 @@ impl RepetitionsState {
         self.selected_deck_index = None;
     }
 
-    fn fill_deck_word_indices(&mut self) {
+    fn fill_deck_word_indices(&mut self) -> MaybeError {
         let state = &self.state.lock();
         let mut deck = self.selected_deck().unwrap().clone();
-        let added: Vec<_> = load_stats_of_deck(&deck, &state.connection)
+        let added: Vec<_> = load_stats_of_deck(&deck, &state.connection)?
             .iter()
             .map(|c| self.word_id_index_map[&c.word_id])
             .collect();
         let total = deck.get_word_list(state);
-        deck.existing_words_indices = Some(added);
-        deck.available_words_indices = Some(total);
+        deck.existing_words_indices = added;
+        deck.available_words_indices = total;
         self.decks[self.selected_deck_index.unwrap()] = deck;
+        Ok(())
     }
 }
 #[derive(Clone)]
@@ -652,8 +656,9 @@ pub enum RepetitionsMessage {
 #[derive(Clone)]
 struct DeckViewData {
     general_settings: DeckSettings,
-    existing_words_indices: Option<Vec<usize>>,
-    available_words_indices: Option<Vec<usize>>,
+    existing_words_indices: Vec<usize>,
+    available_words_indices: Vec<usize>,
+    indices_ready: bool,
     append_mode: AppendMode,
     index: Option<usize>,
 }

src/pages/selector.rs

@@ -1,14 +1,15 @@
-use crate::dictionary::DictionaryState;
-use crate::lang::{KanaSet, KanaType};
+use crate::app::AppState;
+use crate::core::kana_set::{KanaSet, KanaType};
 use crate::navigation::Page::*;
-use crate::navigation::{NavigatedPage, Page};
-use crate::randomizer::RandomizerState;
-use crate::repetitions::RepetitionsState;
-use crate::selector::SelectorMessage::ChangeMode;
+use crate::navigation::{NavigatedPage, Page, RootMessage};
+use crate::pages::dictionary::DictionaryState;
+use crate::pages::quiz::QuizState;
+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};

src/pages/sync.rs

@@ -1,14 +1,17 @@
+use crate::app::{AppState, fill_state};
 use crate::data_provider::settings::{delete_settings, set_setting};
 use crate::data_provider::web_api::*;
 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::{fill_state, AppState, RootMessage};
+use crate::{push_error, push_error_task};
 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 log::error;
 use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::Duration;
@@ -59,11 +62,9 @@ impl NavigatedPage<SyncMessage> for SyncState {
                     .map(|_val: String| RootMessage::Sync(KeyCopied));
             }
             InitSync => {
-                return Task::perform(first_sync(), |id| {
-                    match id {
+                return Task::perform(first_sync(), |id| match id {
                     Ok(id) => RootMessage::Sync(IdReceived(id)),
-                        Err(_) => RootMessage::None
-                    }
+                    Err(err) => push_error!(err),
                 });
             }
             GetKey => {
@@ -77,7 +78,9 @@ impl NavigatedPage<SyncMessage> for SyncState {
                 }
                 let mut state = self.state.lock();
                 state.sync_data.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, &state.connection) {
+                    return push_error_task!(err);
+                }
             }
             Send => {
                 self.prepare_to_db_interaction();
@@ -128,23 +131,35 @@ impl NavigatedPage<SyncMessage> for SyncState {
                 state.decks = updated_state.decks;
                 state.dictionary = updated_state.dictionary;
                 state.word_groups = updated_state.word_groups;
+                return Task::done(RootMessage::PushNotification(NotificationRequest::Info(
+                    NotificationData::DataLoaded,
+                )));
             }
             Disable => {}
             DisableSync => {
                 let mut state = self.state.lock();
                 state.sync_data.key = None;
-                delete_settings("SYNC_KEY".to_string(), &state.connection);
-                delete_settings("AUTO_WEB_FETCH".to_string(), &state.connection);
+                let save_result = || {
+                    delete_settings("SYNC_KEY".to_string(), &state.connection)?;
+                    delete_settings("AUTO_WEB_FETCH".to_string(), &state.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();
                 state.sync_data.auto_web_fetch = self.auto_fetch;
-                set_setting(
+                if let Err(err) = set_setting(
                     "AUTO_WEB_FETCH".to_string(),
                     self.auto_fetch.to_string(),
                     &state.connection,
-                );
+                ) {
+                    return push_error_task!(err);
+                }
             }
         }
         Task::none()
@@ -244,7 +259,7 @@ impl SyncState {
             .connection
             .query_row("PRAGMA wal_checkpoint(TRUNCATE)", [], |_| Ok(()))
             .unwrap_or_else(|e| {
-                eprintln!("Ошибка при checkpoint WAL: {e}");
+                error!("Ошибка при checkpoint WAL: {e}");
             });
     }
 }

src/pages/word.rs

@@ -1,10 +1,12 @@
+use crate::app::AppState;
+use crate::data::entities::WordData;
 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::navigation::{NavigatedPage, Page, RootMessage};
+use crate::pages::word::WordMessage::*;
+use crate::push_error;
+use crate::push_error_task;
 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};
@@ -34,13 +36,18 @@ impl NavigatedPage<WordMessage> for WordState {
             Save => {
                 let mut state = self.state.lock();
                 state.dictionary[self.index] = self.word.clone();
-                update_word(&mut self.word, &state.connection);
+
+                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);
-                delete_word(&self.word, &state.connection);
+                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,

src/pages/writing.rs

@@ -1,7 +1,6 @@
-use crate::RootMessage;
-use crate::lang::KanaSet;
+use crate::core::kana_set::KanaSet;
 use crate::navigation::Page::PreviousPage;
-use crate::navigation::{NavigatedPage, Page};
+use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::styling::*;
 use iced::widget::*;
 use iced::{Element, Fill, Task, alignment};

src/styling.rs

@@ -1,4 +1,3 @@
-use crate::repetitions::Style;
 use iced::Element;
 use iced::border::Radius;
 use iced::widget::button::*;

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_eq!(entity.real(), true)
+    }
+
+    #[test]
+    fn id_1() {
+        let entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        assert_eq!(entity.real(), false)
+    }
+
+    #[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_eq!(entity.real(), true)
+    }
+
+    #[test]
+    fn id_6() {
+        let mut entity: EntityHandle<ProtoEntity> = EntityHandle::new(8.into(), 25, false);
+        entity.set_real(true);
+        assert_eq!(entity.real(), true)
+    }
+
+    #[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)
+    }
+}