Formatting

This commit is contained in:
micialware committed 2026-08-25 12:04:07 +03:00
1 parent dddac01bdf
commit 10cf7f0d2e
29 files changed
+138 -138

No files matched your search

+12 -13
View File
@@ -1,6 +1,6 @@
use crate::data::entities::{WordData, WordGroup};
use crate::notification::{MaybeError, NotificationData};
use crate::notification::NotificationData::{DbLoadError, DbSaveError};
use crate::notification::{MaybeError, NotificationData};
use rusqlite::{Connection, params};
use std::collections::HashMap;
@@ -22,10 +22,7 @@ pub fn add_word(word: &mut WordData, connection: &Connection) -> MaybeError {
Ok(())
}
pub fn add_words(
words: &mut [WordData],
connection: &mut Connection,
) -> MaybeError {
pub fn add_words(words: &mut [WordData], connection: &mut Connection) -> MaybeError {
let tx = connection.transaction().map_err(|_| DbLoadError)?;
let count = words.len();
@@ -44,7 +41,7 @@ pub fn add_words(
serde_json::to_string(&word.additional).unwrap_or_default(),
word.group_id
])
.map_err(|_| DbSaveError)?;
.map_err(|_| DbSaveError)?;
}
}
@@ -102,14 +99,17 @@ pub fn load_words(connection: &Connection) -> Result<Vec<WordData>, Notification
key: row.get(1)?,
value: row.get(2)?,
tags: row.get(3)?,
additional: serde_json::from_str::<HashMap<String, String>>(&additional).unwrap_or_default(),
additional: serde_json::from_str::<HashMap<String, String>>(&additional)
.unwrap_or_default(),
group_id: row.get(5)?,
})
})
.map_err(|_| DbLoadError)?;
let mut buffer = Vec::with_capacity(1024);
word_iter.filter_map(|res| res.ok()).for_each(|i| buffer.push(i));
word_iter
.filter_map(|res| res.ok())
.for_each(|i| buffer.push(i));
Ok(buffer)
}
@@ -128,7 +128,9 @@ pub fn load_word_groups(connection: &Connection) -> Result<Vec<WordGroup>, Notif
.map_err(|_| DbLoadError)?;
let mut buffer = Vec::with_capacity(8);
group_iter.filter_map(|res| res.ok()).for_each(|i| buffer.push(i));
group_iter
.filter_map(|res| res.ok())
.for_each(|i| buffer.push(i));
Ok(buffer)
}
@@ -146,10 +148,7 @@ pub fn add_group(group: &mut WordGroup, connection: &Connection) -> MaybeError {
Ok(())
}
pub fn update_group(
group: &mut WordGroup,
connection: &Connection,
) -> MaybeError {
pub fn update_group(group: &mut WordGroup, connection: &Connection) -> MaybeError {
if !group.id.is_valid() {
Ok(add_group(group, connection)?)
} else {