add a to default button

Author: unsecretised

src/app.rs

@@ -104,6 +104,7 @@ pub enum Message {
 
 #[derive(Debug, Clone)]
 pub enum SetConfigFields {
+    ToDefault,
     ToggleHotkey(String),
     ClipboardHotkey(String),
     PlaceHolder(String),

src/app/pages/settings.rs

@@ -292,7 +292,10 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
             font_family.into(),
             text_clr.into(),
             bg_clr.into(),
-            savebutton(theme.clone()),
+            Row::from_iter([savebutton(theme.clone()), default_button(theme.clone())])
+                .spacing(5)
+                .width(Length::Fill)
+                .into(),
         ])
         .spacing(10),
     ))
@@ -317,6 +320,19 @@ fn savebutton(theme: Theme) -> Element<'static, Message> {
     .into()
 }
 
+fn default_button(theme: Theme) -> Element<'static, Message> {
+    Button::new(
+        Text::new("To default")
+            .align_x(Alignment::Center)
+            .width(Length::Fill)
+            .font(theme.font()),
+    )
+    .style(move |_, _| settings_save_button_style(&theme))
+    .width(Length::Fill)
+    .on_press(Message::SetConfig(SetConfigFields::ToDefault))
+    .into()
+}
+
 fn settings_hint_text(theme: Theme, text: impl ToString) -> Element<'static, Message> {
     let text = text.to_string();
 

src/app/tile.rs

@@ -2,11 +2,11 @@
 pub mod elm;
 pub mod update;
 
+use crate::app::apps::App;
 use crate::app::{ArrowKey, Message, Move, Page};
 use crate::clipboard::ClipBoardContentType;
 use crate::config::Config;
 use crate::debounce::Debouncer;
-use crate::{app::apps::App, platform::default_app_paths};
 
 use arboard::Clipboard;
 use global_hotkey::hotkey::HotKey;
@@ -31,8 +31,6 @@ use tray_icon::TrayIcon;
 
 use std::collections::HashMap;
 use std::fmt::Debug;
-use std::fs;
-use std::path::Path;
 use std::str::FromStr;
 use std::time::Duration;
 
@@ -181,7 +179,6 @@ impl Tile {
             keyboard,
             Subscription::run(handle_recipient),
             Subscription::run(check_version),
-            //            Subscription::run(handle_hot_reloading),
             Subscription::run(handle_clipboard_history),
             Subscription::run(handle_file_search),
             window::close_events().map(Message::HideWindow),
@@ -281,57 +278,6 @@ impl Tile {
     }
 }
 
-#[allow(unused)]
-/// This is the subscription function that handles hot reloading of the config
-fn handle_hot_reloading() -> impl futures::Stream<Item = Message> {
-    stream::channel(100, async |mut output| {
-        let config_path =
-            &(std::env::var("HOME").unwrap_or("".to_owned()) + "/.config/rustcast/config.toml");
-        let mut last_modified = fs::metadata(config_path).unwrap().modified().unwrap();
-
-        let paths = default_app_paths();
-        let mut total_files: usize = paths
-            .par_iter()
-            .map(|dir| count_dirs_in_dir(Path::new(dir)))
-            .sum();
-
-        loop {
-            let last_modified_check = fs::metadata(config_path).unwrap().modified().unwrap();
-
-            let current_total_files: usize = paths
-                .par_iter()
-                .map(|dir| count_dirs_in_dir(Path::new(dir)))
-                .sum();
-
-            if last_modified_check != last_modified {
-                last_modified = last_modified_check;
-                info!("Config file was modified");
-                let _ = output.send(Message::ReloadConfig).await;
-            } else if total_files != current_total_files {
-                total_files = current_total_files;
-                info!("App count was changed");
-                let _ = output.send(Message::ReloadConfig).await;
-            }
-
-            tokio::time::sleep(Duration::from_millis(1000)).await;
-        }
-    })
-}
-
-/// Helper fn for counting directories (since macos `.app`'s are directories) inside a directory
-fn count_dirs_in_dir(dir: impl AsRef<Path>) -> usize {
-    // Read the directory; if it fails, treat as empty
-    let entries = match fs::read_dir(dir) {
-        Ok(e) => e,
-        Err(_) => return 0,
-    };
-
-    entries
-        .filter_map(|entry| entry.ok())
-        .filter(|entry| entry.file_type().map(|t| t.is_dir()).unwrap_or(false))
-        .count()
-}
-
 /// This is the subscription function that handles hotkeys, e.g. for hiding / showing the window
 fn handle_hotkeys() -> impl futures::Stream<Item = Message> {
     stream::channel(100, async |mut output| {

src/app/tile/elm.rs

@@ -155,16 +155,16 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
             .id("results")
             .height(height as u32);
 
-        let text = if !tile.query_lc.is_empty() {
+        let text = if tile.query_lc.is_empty() {
+            tile.page.to_string()
+        } else {
             match results_count {
                 1 => "1 result found".to_string(),
                 0 => "No results found".to_string(),
                 count => {
                     format!("{count} results found")
                 }
             }
-        } else {
-            tile.page.to_string()
         };
 
         let contents = container(

src/app/tile/update.rs

@@ -542,6 +542,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 SetConfigFields::SetBufferFields(SetConfigBufferFields::ClearOnEnter(clear)) => {
                     final_config.buffer_rules.clear_on_enter = clear
                 }
+                SetConfigFields::ToDefault => final_config = Config::default(),
             };
 
             tile.config = final_config;

src/config.rs

@@ -14,7 +14,7 @@ use crate::{
 };
 
 /// The main config struct (effectively the config file's "schema")
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(default)]
 pub struct Config {
     pub toggle_hotkey: String,
@@ -56,7 +56,7 @@ impl Default for Config {
 }
 
 /// The settings you can set for the theme
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(default)]
 pub struct Theme {
     pub text_color: (f32, f32, f32),
@@ -157,7 +157,7 @@ impl Theme {
 /// - clear_on_hide is whether the buffer should be cleared when the window is hidden
 /// - clear_on_enter is whether the buffer should be cleared when the user presses enter after
 ///   searching
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(default)]
 pub struct Buffer {
     pub clear_on_hide: bool,
@@ -176,7 +176,7 @@ impl Default for Buffer {
 /// Command is the command it will run when the button is clicked
 /// Icon_path is the path to an icon, but this is optional
 /// Alias is the text that is used to call this command / search for it
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 pub struct Shelly {
     command: String,
     icon_path: Option<String>,

src/platform/mod.rs

@@ -1,7 +1,6 @@
 //! This handles all of the platform specific stuff.
 use iced::wgpu::rwh::WindowHandle;
 
-pub use self::cross::default_app_paths;
 use crate::app::apps::App;
 
 mod cross;