Rename and clear bad code

src/data_provider/card_sets.rs

@@ -1,14 +1,14 @@
-use crate::lang::{AppendMode, CardSetSettings, OrderMode};
+use crate::lang::{DeckSettings, OrderMode};
 
 use rusqlite::Connection;
 
-pub fn load_sets(connection: &Connection) -> Vec<CardSetSettings> {
+pub fn load_sets(connection: &Connection) -> Vec<DeckSettings> {
     let mut stmt = connection
         .prepare("SELECT id, name, forward, backward, filter FROM card_set")
         .unwrap();
     let iter = stmt
         .query_map([], |row| {
-            Ok(CardSetSettings {
+            Ok(DeckSettings {
                 id: row.get(0)?,
                 name: row.get(1)?,
                 forward: row.get(2)?,
@@ -17,7 +17,6 @@ pub fn load_sets(connection: &Connection) -> Vec<CardSetSettings> {
                 count: None,
                 worst_words_list: None,
                 open_mode: OrderMode::Default,
-                append_mode: AppendMode::Manual,
             })
         })
         .unwrap();
@@ -30,7 +29,7 @@ pub fn load_sets(connection: &Connection) -> Vec<CardSetSettings> {
     buffer
 }
 
-pub fn add_set(set: &mut CardSetSettings, connection: &Connection) {
+pub fn add_set(set: &mut DeckSettings, connection: &Connection) {
     let index = connection
         .query_row(
             "INSERT INTO card_set (name, forward, backward, filter) VALUES (?1, ?2, ?3, ?4) RETURNING id",
@@ -47,7 +46,7 @@ pub fn add_set(set: &mut CardSetSettings, connection: &Connection) {
     set.id = index;
 }
 
-pub fn update_card_set(set: &mut CardSetSettings, connection: &Connection) {
+pub fn update_card_set(set: &mut DeckSettings, connection: &Connection) {
     if set.id == 0 {
         add_set(set, connection);
     } else {
@@ -66,7 +65,7 @@ pub fn update_card_set(set: &mut CardSetSettings, connection: &Connection) {
     }
 }
 
-pub fn delete_set(set: &CardSetSettings, connection: &Connection) {
+pub fn delete_set(set: &DeckSettings, connection: &Connection) {
     if set.id == 0 {
         return;
     }

src/data_provider/card_stats.rs

@@ -1,8 +1,8 @@
-use crate::lang::{CardSetSettings, CardStatistics};
+use crate::lang::{DeckSettings, CardStatistics};
 use rusqlite::Connection;
 use std::time::Instant;
 
-pub fn load_stats_of_set(set: &CardSetSettings, connection: &Connection) -> Vec<CardStatistics> {
+pub fn load_stats_of_set(set: &DeckSettings, connection: &Connection) -> Vec<CardStatistics> {
     let mut stmt = connection
         .prepare("SELECT id, word_id, score, last_opened FROM card_stats WHERE set_id = ?1")
         .unwrap();

src/data_provider/web_api.rs

@@ -98,7 +98,8 @@ pub async fn get_web_version(key: &str) -> Result<u32, reqwest::Error> {
     let id_url = format!("{API_URL}{key}/version");
     let client = reqwest::Client::new();
     let version = client.get(&id_url).send().await?.text().await?;
-    Ok(version.parse::<u32>().unwrap())
+    println!("version: {}", version);
+    Ok(version.parse::<u32>().unwrap_or_default())
 }
 
 pub async fn get_local_version() -> u32 {