From 878ff3f1e4ab5c4a6ca2d19ab8f596731a360e0a Mon Sep 17 00:00:00 2001 From: Mikhail Mitrofanov Date: Thu, 20 Aug 2026 16:23:22 +0300 Subject: [PATCH] Formatting --- src/data_provider/card_stats.rs | 13 ++++++++++--- src/data_provider/voice.rs | 14 ++++++++------ src/lang.rs | 13 ++++++++++++- src/repetition.rs | 4 ++-- src/repetition_settings.rs | 4 ++-- src/repetitions.rs | 4 ++-- 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/data_provider/card_stats.rs b/src/data_provider/card_stats.rs index 8249c5c..728eec3 100644 --- a/src/data_provider/card_stats.rs +++ b/src/data_provider/card_stats.rs @@ -86,8 +86,15 @@ pub fn delete_stats(stat: &[CardStatistics], connection: &Connection) { if stat.is_empty() { return; } - let ids = stat.iter().map(|s| s.id.into()).collect::>().join(", "); + let ids = stat + .iter() + .map(|s| s.id.into()) + .collect::>() + .join(", "); connection - .execute(format!("DELETE FROM card_stats WHERE id in {ids}").as_str(), ()) + .execute( + format!("DELETE FROM card_stats WHERE id in {ids}").as_str(), + (), + ) .unwrap(); -} \ No newline at end of file +} diff --git a/src/data_provider/voice.rs b/src/data_provider/voice.rs index 71c89b4..c24b8fd 100644 --- a/src/data_provider/voice.rs +++ b/src/data_provider/voice.rs @@ -8,7 +8,7 @@ pub async fn get_voice(text: &str) -> Result, ()> { let mut path = app_data_dir(); path.push("voice"); if !path.exists() { - std::fs::create_dir(path.clone()).map_err(|_|())?; + std::fs::create_dir(path.clone()).map_err(|_| ())?; } let hash = format!("{}.wav", hex::encode(Sha256::digest(text.as_bytes()))); path.push(hash); @@ -20,19 +20,21 @@ pub async fn get_voice(text: &str) -> Result, ()> { .send() .await; - let query = query.map_err(|_|())?.text().await.map_err(|_|())?; + let query = query.map_err(|_| ())?.text().await.map_err(|_| ())?; // Synthesis let audio = client .post(format!("{engine_url}/synthesis?speaker=11")) .header("Content-Type", "application/json") .body(query) .send() - .await.map_err(|_|())? + .await + .map_err(|_| ())? .bytes() - .await.map_err(|_|())?; + .await + .map_err(|_| ())?; - tokio::fs::write(&path, &audio).await.map_err(|_|())?; + tokio::fs::write(&path, &audio).await.map_err(|_| ())?; } - Ok(BufReader::new(File::open(path).map_err(|_|())?)) + Ok(BufReader::new(File::open(path).map_err(|_| ())?)) } diff --git a/src/lang.rs b/src/lang.rs index 6370164..4635267 100644 --- a/src/lang.rs +++ b/src/lang.rs @@ -364,7 +364,17 @@ impl DeckData { 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(); + 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, @@ -381,6 +391,7 @@ impl DeckData { settings: settings.clone(), } } + pub fn next(&mut self) -> (WordData, CardStatistics) { let index = match self.order_module.clone() { OrderModule::SemiRandomSRS(mut module) => { diff --git a/src/repetition.rs b/src/repetition.rs index f75ae84..e5ea97e 100644 --- a/src/repetition.rs +++ b/src/repetition.rs @@ -9,8 +9,8 @@ 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; diff --git a/src/repetition_settings.rs b/src/repetition_settings.rs index 5217486..48db074 100644 --- a/src/repetition_settings.rs +++ b/src/repetition_settings.rs @@ -1,3 +1,4 @@ +use crate::AppState; 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; @@ -5,13 +6,12 @@ use crate::navigation::Page::PreviousPage; use crate::navigation::{NavigatedPage, Page, RootMessage}; use crate::repetition_settings::RepetitionSettingsMessage::*; use crate::styling::*; -use crate::AppState; use iced::widget::button::danger; use iced::widget::text_input::Catalog; use iced::widget::{button, column, row, scrollable, space, text, text_input}; use iced::{Element, Task}; use iced_core::Length::Fill; -use iced_core::{color, Padding, Theme}; +use iced_core::{Padding, Theme, color}; use parking_lot::Mutex; use std::sync::Arc; use std::time::Duration; diff --git a/src/repetitions.rs b/src/repetitions.rs index 1742a5f..846ee5b 100644 --- a/src/repetitions.rs +++ b/src/repetitions.rs @@ -88,7 +88,8 @@ impl NavigatedPage 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[self.selected_deck_index.unwrap()].general_settings = + state.decks[index].clone(); drop(state); self.fill_deck_word_indices(); } @@ -625,7 +626,6 @@ impl RepetitionsState { deck.existing_words_indices = Some(added); deck.available_words_indices = Some(total); self.decks[self.selected_deck_index.unwrap()] = deck; - } } #[derive(Clone)]