add back hot reloading for dynamic app reload

Author: unsecretised

src/app.rs

@@ -92,6 +92,7 @@ pub enum Message {
     HideTrayIcon,
     SwitchMode(String),
     ReloadConfig,
+    UpdateApps,
     SetSender(ExtSender),
     SwitchToPage(Page),
     ClipboardHistory(ClipBoardContentType),

src/app/tile.rs

@@ -7,6 +7,7 @@ use crate::app::{ArrowKey, Message, Move, Page};
 use crate::clipboard::ClipBoardContentType;
 use crate::config::Config;
 use crate::debounce::Debouncer;
+use crate::platform::default_app_paths;
 
 use arboard::Clipboard;
 use global_hotkey::hotkey::HotKey;
@@ -176,6 +177,7 @@ impl Tile {
         });
         Subscription::batch([
             Subscription::run(handle_hotkeys),
+            Subscription::run(handle_hot_reloading),
             keyboard,
             Subscription::run(handle_recipient),
             Subscription::run(check_version),
@@ -389,6 +391,45 @@ async fn read_mdfind_results(
     }
 }
 
+fn handle_hot_reloading() -> impl futures::Stream<Item = Message> {
+    stream::channel(100, async |mut output| {
+        let paths = default_app_paths();
+        let mut total_files: usize = paths
+            .par_iter()
+            .map(|dir| count_dirs_in_dir(std::path::Path::new(dir)))
+            .sum();
+
+        loop {
+            let current_total_files: usize = paths
+                .par_iter()
+                .map(|dir| count_dirs_in_dir(std::path::Path::new(dir)))
+                .sum();
+
+            if total_files != current_total_files {
+                total_files = current_total_files;
+                info!("App count was changed");
+                let _ = output.send(Message::UpdateApps).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<std::path::Path>) -> usize {
+    // Read the directory; if it fails, treat as empty
+    let entries = match std::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()
+}
+
 /// Async subscription that spawns `mdfind` for file search queries.
 ///
 /// Uses a `watch` channel so the Tile can push new (query, dirs) pairs.

src/app/tile/update.rs

@@ -276,15 +276,8 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                     .ok();
             }
 
-            let mut new_options = get_installed_apps(new_config.theme.show_icons);
-            new_options.extend(new_config.shells.iter().map(|x| x.to_app()));
-            new_options.extend(new_config.modes.to_apps());
-            new_options.extend(App::basic_apps());
-            new_options.par_sort_by_key(|x| x.display_name.len());
-
             tile.theme = new_config.theme.to_owned().into();
             tile.config = new_config;
-            tile.options = AppIndex::from_apps(new_options);
             Task::none()
         }
 
@@ -413,6 +406,17 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             ])
         }
 
+        Message::UpdateApps => {
+            let mut new_options = get_installed_apps(tile.config.theme.show_icons);
+            new_options.extend(tile.config.shells.iter().map(|x| x.to_app()));
+            new_options.extend(tile.config.modes.to_apps());
+            new_options.extend(App::basic_apps());
+            new_options.par_sort_by_key(|x| x.display_name.len());
+            tile.options = AppIndex::from_apps(new_options);
+
+            Task::none()
+        }
+
         Message::ClearSearchResults => {
             tile.results = Vec::new();
             Task::none()