Merge pull request #52 from CardboardTurkey/feat/words

Improve installation process

Author: Pazl27

Cargo.lock

@@ -16,3 +16,4 @@ lazy_static = "1.5.0"
 anyhow = "1.0.95"
 chrono = { version = "0.4", features = ["serde"] }
 comfy-table = "7.1.4"
+reqwest = { version = "0.12.12", features = ["blocking"] }

Cargo.toml

@@ -27,14 +27,14 @@ word and asks you to type it as fast as possible. The game tracks your typing sp
 different game modes, such as uppercase and punctuation, to help you improve your typing skills in different areas.
 
 ## Installation
-To install Typy on Linux, you can use the following command:
+To install Typy, you can use the [Cargo] package manager:
+
+[Cargo]: https://doc.rust-lang.org/cargo/
 
 ```bash
-curl -sSL https://raw.githubusercontent.com/Pazl27/typy-cli/master/scripts/install.sh | bash
+cargo install --git "https://github.com/Pazl27/typy-cli.git" --tag "v0.8.0"
 ```
 
-This command downloads and runs the installation script from the Typy GitHub repository. The script will handle the installation process for you, ensuring that Typy is set up correctly on your system.
-
 If you prefer to get the newest version and compile it yourself, follow these steps:
 
 1. Clone the Typy repository:
@@ -156,5 +156,5 @@ If you want to provide a new language to the Typy repository, feel free to creat
 
 ## Uninstall
 ```bash
-curl -sSL https://raw.githubusercontent.com/Pazl27/typy-cli/master/scripts/uninstall.sh | bash
+cargo uninstall typy-cli
 ```

README.md

@@ -4,15 +4,19 @@ use crate::config::toml_parser::get_config;
 use crate::config::toml_parser::CursorTable;
 
 pub struct CursorKind {
-    pub style: SetCursorStyle
+    pub style: SetCursorStyle,
 }
 
 impl CursorKind {
     pub fn new() -> Self {
-
-        let cursor_table: CursorTable = get_config().lock().unwrap().get_cursor().unwrap_or(CursorTable {
-            style: Some("DefaultUserShape".to_owned())
-        });
+        let cursor_table: CursorTable =
+            get_config()
+                .lock()
+                .unwrap()
+                .get_cursor()
+                .unwrap_or(CursorTable {
+                    style: Some("DefaultUserShape".to_owned()),
+                });
 
         let cursor_kind = match cursor_table.style.as_deref() {
             Some("DefaultUserShape") => SetCursorStyle::DefaultUserShape,
@@ -25,17 +29,14 @@ impl CursorKind {
             _ => SetCursorStyle::DefaultUserShape,
         };
 
-        CursorKind {
-            style: cursor_kind,
-        }
+        CursorKind { style: cursor_kind }
     }
 }
 
 impl Default for CursorKind {
     fn default() -> Self {
         CursorKind {
-            style: SetCursorStyle::DefaultUserShape
+            style: SetCursorStyle::DefaultUserShape,
         }
     }
 }
-

scripts/install.sh

@@ -10,7 +10,6 @@ pub struct Graph {
 
 impl Graph {
     pub fn new() -> Self {
-
         let theme_colors: Graph = match get_config().lock().unwrap().get_graph() {
             Some(colors) => {
                 let data = colors

scripts/uninstall.sh

@@ -16,7 +16,8 @@ impl ModeSettings {
                 let default_modes = settings
                     .default_mode
                     .map(|m| {
-                        let modes: Vec<ModeType> = m.split(',')
+                        let modes: Vec<ModeType> = m
+                            .split(',')
                             .filter_map(|mode| ModeType::from_str(mode.trim()).ok())
                             .collect();
                         if modes.contains(&ModeType::Normal) {
@@ -37,7 +38,11 @@ impl ModeSettings {
                     .map(|c| c.clamp(0.0, 1.0))
                     .unwrap_or(0.2);
 
-                ModeSettings { default_modes, uppercase_chance, punctuation_chance }
+                ModeSettings {
+                    default_modes,
+                    uppercase_chance,
+                    punctuation_chance,
+                }
             }
             None => ModeSettings::default(),
         };

src/config/config_tables/cursor_style.rs

@@ -12,7 +12,6 @@ pub struct ThemeColors {
 
 impl ThemeColors {
     pub fn new() -> Self {
-
         let theme_colors: ThemeColors = match get_config().lock().unwrap().get_theme() {
             Some(colors) => {
                 let fg = colors
@@ -67,20 +66,49 @@ fn hex_to_rgb(hex: &str) -> Option<Color> {
     }
 }
 
-
 #[cfg(test)]
 mod theme_tests {
     use super::*;
 
     #[test]
     fn test_hex_to_rgb() {
-        assert_eq!(hex_to_rgb("#ffffff"), Some(Color::Rgb { r: 255, g: 255, b: 255 }));
+        assert_eq!(
+            hex_to_rgb("#ffffff"),
+            Some(Color::Rgb {
+                r: 255,
+                g: 255,
+                b: 255
+            })
+        );
         assert_eq!(hex_to_rgb("#000000"), Some(Color::Rgb { r: 0, g: 0, b: 0 }));
-        assert_eq!(hex_to_rgb("#ff0000"), Some(Color::Rgb { r: 255, g: 0, b: 0 }));
-        assert_eq!(hex_to_rgb("#00ff00"), Some(Color::Rgb { r: 0, g: 255, b: 0 }));
-        assert_eq!(hex_to_rgb("#0000ff"), Some(Color::Rgb { r: 0, g: 0, b: 255 }));
-        assert_eq!(hex_to_rgb("#123456"), Some(Color::Rgb { r: 18, g: 52, b: 86 }));
-        assert_eq!(hex_to_rgb("#abcdef"), Some(Color::Rgb { r: 171, g: 205, b: 239 }));
+        assert_eq!(
+            hex_to_rgb("#ff0000"),
+            Some(Color::Rgb { r: 255, g: 0, b: 0 })
+        );
+        assert_eq!(
+            hex_to_rgb("#00ff00"),
+            Some(Color::Rgb { r: 0, g: 255, b: 0 })
+        );
+        assert_eq!(
+            hex_to_rgb("#0000ff"),
+            Some(Color::Rgb { r: 0, g: 0, b: 255 })
+        );
+        assert_eq!(
+            hex_to_rgb("#123456"),
+            Some(Color::Rgb {
+                r: 18,
+                g: 52,
+                b: 86
+            })
+        );
+        assert_eq!(
+            hex_to_rgb("#abcdef"),
+            Some(Color::Rgb {
+                r: 171,
+                g: 205,
+                b: 239
+            })
+        );
         assert_eq!(hex_to_rgb("#12345"), None);
         assert_eq!(hex_to_rgb("#1234567"), None);
         assert_eq!(hex_to_rgb("123456"), None);

src/config/config_tables/graph_colors.rs

@@ -1,49 +1,44 @@
-use std::fs;
-use toml;
-use serde::{Deserialize, Serialize};
 use dirs::home_dir;
-use std::path::PathBuf;
 use lazy_static::lazy_static;
+use serde::{Deserialize, Serialize};
+use std::fs;
+use std::path::PathBuf;
 use std::sync::Mutex;
+use toml;
 
-#[derive(Serialize, Deserialize)]
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct ThemeTable {
     pub fg: Option<String>,
     pub missing: Option<String>,
     pub error: Option<String>,
     pub accent: Option<String>,
 }
 
-#[derive(Serialize, Deserialize)]
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct GraphTable {
     pub data: Option<String>,
     pub title: Option<String>,
     pub axis: Option<String>,
 }
 
-#[derive(Serialize, Deserialize)]
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct CursorTable {
     pub style: Option<String>,
 }
 
-#[derive(Serialize, Deserialize)]
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct ModesTable {
     pub default_mode: Option<String>,
     pub uppercase_chance: Option<String>,
     pub punctuation_chance: Option<String>,
 }
 
-#[derive(Serialize, Deserialize)]
-#[derive(Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct LanguageTable {
-    pub lang: Option<String>
+    pub lang: Option<String>,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Default)]
 pub struct ConfigToml {
     theme: Option<ThemeTable>,
     graph: Option<GraphTable>,
@@ -96,18 +91,6 @@ impl ConfigToml {
     }
 }
 
-impl Default for ConfigToml {
-    fn default() -> Self {
-        ConfigToml { 
-            theme: None,
-            graph: None,
-            cursor: None,
-            modes: None,
-            language: None,
-        }
-    }
-}
-
 // Declare the static instance of ConfigToml using lazy_static
 lazy_static! {
     static ref CONFIG: Mutex<ConfigToml> = Mutex::new(ConfigToml::new());
@@ -117,4 +100,3 @@ lazy_static! {
 pub fn get_config() -> &'static Mutex<ConfigToml> {
     &CONFIG
 }
-