Search in current tab

src/app.rs

@@ -37,7 +37,7 @@ use std::{
     num::NonZeroU16,
     path::PathBuf,
     process,
-    sync::{Arc, Mutex},
+    sync::Arc,
     time::{self, Instant},
 };
 
@@ -237,7 +237,7 @@ pub enum Message {
     TabConfig(TabConfig),
     TabMessage(Option<Entity>, tab::Message),
     TabNew,
-    TabRescan(Entity, Vec<tab::Item>),
+    TabRescan(Entity, Location, Vec<tab::Item>),
     ToggleContextPage(ContextPage),
     WindowClose,
     WindowNew,
@@ -376,8 +376,9 @@ impl App {
         let icon_sizes = self.config.tab.icon_sizes;
         Command::perform(
             async move {
-                match tokio::task::spawn_blocking(move || location.scan(icon_sizes)).await {
+                let location2 = location.clone();
-                    Ok(items) => message::app(Message::TabRescan(entity, items)),
+                match tokio::task::spawn_blocking(move || location2.scan(icon_sizes)).await {
+                    Ok(items) => message::app(Message::TabRescan(entity, location, items)),
                     Err(err) => {
                         log::warn!("failed to rescan: {}", err);
                         message::none()
@@ -406,7 +407,29 @@ impl App {
     }
 
     fn search(&mut self) -> Command<Message> {
-        self.open_tab(Location::Search(home_dir(), self.search_input.clone()))
+        let entity = self.tab_model.active();
+        let mut title_location_opt = None;
+        if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
+            match &tab.location {
+                Location::Path(path) | Location::Search(path, ..) => {
+                    tab.change_location(
+                        &Location::Search(path.clone(), self.search_input.clone()),
+                        None,
+                    );
+                    title_location_opt = Some((tab.title(), tab.location.clone()));
+                }
+                _ => {}
+            }
+        }
+        if let Some((title, location)) = title_location_opt {
+            self.tab_model.text_set(entity, title);
+            return Command::batch([
+                self.update_title(),
+                self.update_watcher(),
+                self.rescan_tab(entity, location),
+            ]);
+        }
+        Command::none()
     }
 
     fn selected_paths(&self, entity_opt: Option<Entity>) -> Vec<PathBuf> {
@@ -977,8 +1000,8 @@ impl Application for App {
                     NavMenuAction::Properties(id),
                 ),
                 cosmic::widget::menu::Item::Divider,
-                if is_context_trash  {
+                if is_context_trash {
-                    cosmic ::widget::menu::Item::Button(
+                    cosmic::widget::menu::Item::Button(
                         fl!("empty-trash"),
                         NavMenuAction::EmptyTrash(id),
                     )
@@ -1717,12 +1740,16 @@ impl Application for App {
                 };
                 return self.open_tab(location);
             }
-            Message::TabRescan(entity, items) => match self.tab_model.data_mut::<Tab>(entity) {
+            Message::TabRescan(entity, location, items) => {
-                Some(tab) => {
+                match self.tab_model.data_mut::<Tab>(entity) {
-                    tab.set_items(items);
+                    Some(tab) => {
+                        if location == tab.location {
+                            tab.set_items(items);
+                        }
+                    }
+                    _ => (),
                 }
-                _ => (),
+            }
-            },
             //TODO: TABRELOAD
             Message::ToggleContextPage(context_page) => {
                 //TODO: ensure context menus are closed

src/tab.rs

@@ -376,10 +376,11 @@ pub fn scan_search(tab_path: &PathBuf, term: &str, sizes: IconSizes) -> Vec<Item
     let mut items = Arc::into_inner(items_arc).unwrap().into_inner().unwrap();
     let duration = start.elapsed();
     log::info!(
-        "searched for {:?} in {:?}, found {} items",
+        "searched for {:?} inside {:?} in {:?}, found {} items",
         term,
+        tab_path,
         duration,
-        items.len()
+        items.len(),
     );
 
     let start = Instant::now();
@@ -1417,7 +1418,7 @@ impl Tab {
                             commands.push(Command::OpenFile(path.clone()));
                         }
                     }
-                    Location::Search(path, term) => {
+                    Location::Search(_path, _term) => {
                         cd = Some(location);
                     }
                     Location::Trash => {
@@ -1701,7 +1702,7 @@ impl Tab {
         Some(items)
     }
 
-    pub fn location_view(&self) -> Option<Element<Message>> {
+    pub fn location_view(&self) -> Element<Message> {
         let cosmic_theme::Spacing {
             space_xxxs,
             space_xxs,
@@ -1747,7 +1748,7 @@ impl Tab {
                             })
                             .on_submit(Message::Location(location.clone())),
                     );
-                    return Some(row.into());
+                    return row.into();
                 }
                 _ => {
                     //TODO: allow editing other locations
@@ -1760,11 +1761,25 @@ impl Tab {
                     .padding(space_xxs)
                     .style(theme::Button::Icon),
             );
+        } else if let Location::Search(_, term) = &self.location {
+            row = row.push(
+                widget::button(
+                    widget::row::with_children(vec![
+                        widget::icon::from_name("system-search-symbolic")
+                            .size(16)
+                            .into(),
+                        widget::text(term).into(),
+                    ])
+                    .spacing(space_xxs),
+                )
+                .padding(space_xxs)
+                .style(theme::Button::Icon),
+            );
         }
 
         let mut children: Vec<Element<_>> = Vec::new();
         match &self.location {
-            Location::Path(path) => {
+            Location::Path(path) | Location::Search(path, ..) => {
                 let home_dir = crate::home_dir();
                 for ancestor in path.ancestors() {
                     let ancestor = ancestor.to_path_buf();
@@ -1811,7 +1826,13 @@ impl Tab {
                     children.push(
                         widget::button(row)
                             .padding(space_xxxs)
-                            .on_press(Message::Location(Location::Path(ancestor)))
+                            .on_press(Message::Location(match &self.location {
+                                Location::Path(_) => Location::Path(ancestor),
+                                Location::Search(_, term) => {
+                                    Location::Search(ancestor, term.clone())
+                                }
+                                other => other.clone(),
+                            }))
                             .style(theme::Button::Link)
                             .into(),
                     );
@@ -1822,9 +1843,6 @@ impl Tab {
                 }
                 children.reverse();
             }
-            Location::Search(path, term) => {
-                return None;
-            }
             Location::Trash => {
                 let mut row = widget::row::with_capacity(2)
                     .align_items(Alignment::Center)
@@ -1845,7 +1863,7 @@ impl Tab {
         for child in children {
             row = row.push(child);
         }
-        Some(row.into())
+        row.into()
     }
 
     pub fn empty_view(&self, has_hidden: bool) -> Element<Message> {
@@ -2485,7 +2503,7 @@ impl Tab {
         // Update cached size
         self.size_opt.set(Some(size));
 
-        let location_view_opt = self.location_view();
+        let location_view = self.location_view();
         let (drag_list, mut item_view, can_scroll) = match self.config.view {
             View::Grid => self.grid_view(),
             View::List => self.list_view(),
@@ -2545,9 +2563,7 @@ impl Tab {
                 .position(widget::popover::Position::Point(point));
         }
         let mut tab_column = widget::column::with_capacity(3);
-        if let Some(location_view) = location_view_opt {
+        tab_column = tab_column.push(location_view);
-            tab_column = tab_column.push(location_view);
-        }
         if can_scroll {
             tab_column = tab_column.push(
                 widget::scrollable(popover)