Windows updates

Author: Leinnan

Cargo.toml

@@ -25,7 +25,7 @@ profiling = { version = "1.0.17", default-features = false }
 puffin = {optional = true, version = "0.19.1"}
 puffin_http = {optional = true, version = "0.16.1"}
 icu = {git = "https://github.com/unicode-org/icu4x", rev = "4d2b015"}
-notify = "6.1"
+notify = "8"
 smallvec = "1.15"
 bevy_device_lang = "0.6"
 fuzzy-matcher = "0.3"
@@ -41,24 +41,24 @@ egui = "0.33"
 egui_extras = { version = "0.33", features = ["all_loaders"] }
 open = "5.3"
 walkdir = "2"
-sysinfo = "0.33"
+sysinfo = "0.37"
 directories = "6"
 image = { version = "0.25", features = ["jpeg", "png"] }
 rand = "0.8"
 anyhow = "1"
 egui-notify = "0.21"
 once_cell = "1"
 crossbeam = "0.8"
-egui_dock = "0.17"
+egui_dock = "0.18"
 trash = "5.2"
 arboard = "3.4.1"
 embed_plist = "1.2"
-rayon = "1.10"
+rayon = "1.11"
 rmp-serde = "1.3.0"
 bincode = "=2.0.1"
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.59", features = [
+windows = { version = "0.62", features = [
     "Win32_UI_Shell",
     "Win32_Storage_FileSystem",
     "Win32_System_Registry",
@@ -68,7 +68,7 @@ windows = { version = "0.59", features = [
 
 [build-dependencies]
 anyhow = "1.0"
-winresource = "0.1.19"
+winresource = "0.1"
 
 [lints.rust]
 unsafe_code = "deny"
@@ -95,5 +95,3 @@ osx_url_schemes = ["io.github.leinnan.dirfleet"]
 short_description = "File Manager"
 long_description = "File Manager built with egui in Rust"
 
-[patch.crates-io]
-egui_dock = {git = "https://github.com/Avarel/egui_dock.git", branch = "egui_0.33"}

src/app/database.rs

@@ -1,10 +1,10 @@
 use crate::data::files::{DirContent, DirEntry};
 use bincode::config;
 use directories::ProjectDirs;
-use std::{os::unix::ffi::OsStrExt, path::Path, sync::LazyLock, thread};
+use std::{path::Path, sync::LazyLock, thread};
 
 pub static SLED_DIRS: LazyLock<sled::Db> = LazyLock::new(|| {
-    let path = ProjectDirs::from("com", "Crayen", "Files").expect("");
+    let path = ProjectDirs::from("com", "Crayen", "Files2").expect("");
     if !path.data_dir().exists() {
         std::fs::create_dir_all(path.data_dir()).expect("Failed to create data directory");
     }
@@ -16,10 +16,12 @@ pub fn read_dir(dir: &Path, entries: &mut Vec<DirEntry>) {
     #[cfg(feature = "profiling")]
     puffin::profile_scope!("lwa_fm::dir_handling::db_read");
     let config = config::standard();
-    let path = dir.as_os_str().as_bytes().to_vec();
+    let path = dir.as_os_str().as_encoded_bytes().to_vec();
     if let Ok(Some(data)) = SLED_DIRS.get(&path) {
+        #[cfg(feature = "profiling")]
         puffin::profile_scope!("lwa_fm::dir_handling::db_read::deserialize");
         if let Ok((meta, _)) = bincode::decode_from_slice::<DirContent, _>(&data[..], config) {
+            #[cfg(feature = "profiling")]
             puffin::profile_scope!("lwa_fm::dir_handling::db_read::deserialize::extend");
             meta.populate(entries);
             return;

src/app/dir_handling.rs

@@ -7,7 +7,7 @@ use std::{
 
 use icu::collator::CollatorBorrowed;
 use rayon::{
-    iter::{IntoParallelRefMutIterator, ParallelBridge, ParallelExtend, ParallelIterator},
+    iter::{ParallelBridge, ParallelExtend, ParallelIterator},
     slice::ParallelSliceMut,
 };
 
@@ -125,63 +125,6 @@ impl TabData {
         // }
     }
 
-    #[allow(dead_code)]
-    fn read_dir_filter(&mut self) {
-        let case_sensitive = self
-            .search
-            .as_ref()
-            .is_some_and(|search| search.case_sensitive);
-        let search = self
-            .search
-            .as_ref()
-            .map(|search| search.value.as_str())
-            .unwrap_or_default();
-        let search_len = search.len();
-        let collator = build_collator(case_sensitive);
-        let directories: &[PathBuf] = match &self.current_path {
-            CurrentPath::None => &[],
-            CurrentPath::One(path_buf) => std::slice::from_ref(path_buf),
-            CurrentPath::Multiple(path_bufs) => path_bufs.as_slice(),
-        };
-
-        let depth = self.search.as_ref().map_or(1, |search| search.depth);
-        self.list = directories
-            .iter()
-            .flat_map(|d| {
-                walkdir::WalkDir::new(d)
-                    .follow_links(true)
-                    .max_depth(depth)
-                    .into_iter()
-                    .flatten()
-                    .skip(1)
-                    .filter_map(|e| {
-                        let s = e.file_name().to_string_lossy();
-                        if !self.show_hidden && (s.starts_with('.') || s.starts_with('$')) {
-                            return None;
-                        }
-                        if search_len > s.len() {
-                            return None;
-                        }
-                        let chars = s.as_bytes();
-                        let mut found = false;
-                        for i in 0..=(s.len() - search_len) {
-                            if collator.compare_utf8(search.as_bytes(), &chars[i..i + search_len])
-                                == Ordering::Equal
-                            {
-                                found = true;
-                                break;
-                            }
-                        }
-                        if !found {
-                            return None;
-                        }
-                        e.try_into().ok()
-                    })
-                    .collect::<Vec<crate::data::files::DirEntry>>()
-            })
-            .collect();
-    }
-
     // pub fn get_visible_entries(&self) -> impl Iterator<Item = &DirEntry> {
     //     self.visible_entries.iter().map(|&idx| &self.list[idx])
     // }
@@ -205,34 +148,40 @@ impl TabData {
         let search_len = search.len();
         let collator = build_collator(case_sensitive);
         for (i, entry) in self.list.iter().enumerate() {
-            let mut visible = true;
             if !self.show_hidden {
                 let name = entry.get_splitted_path().1;
                 if name.starts_with(".") || name.starts_with("$") {
-                    visible = false;
+                    continue;
                 }
             }
             if is_searching {
                 let name = entry.get_splitted_path().1;
                 if search_len > name.len() {
-                    visible = false;
-                } else {
-                    let chars = name.as_bytes();
-                    let mut found = false;
-                    for i in 0..=(name.len() - search_len) {
-                        if collator.compare_utf8(search.as_bytes(), &chars[i..i + search_len])
-                            == Ordering::Equal
-                        {
-                            found = true;
-                            break;
-                        }
+                    continue;
+                }
+                let chars = name.as_bytes();
+                let mut found = false;
+                for i in 0..=(name.len() - search_len) {
+                    if collator.compare_utf8(search.as_bytes(), &chars[i..i + search_len])
+                        == Ordering::Equal
+                    {
+                        found = true;
+                        log::error!(
+                            "MATCH: {}",
+                            name[i..i + search_len].escape_debug().to_string()
+                        );
+                        break;
+                    }
+                }
+                if !found {
+                    if name.contains(search) {
+                        log::error!("WTF: {}", name);
+                    } else {
+                        continue;
                     }
-                    visible &= found;
                 }
             }
-            if visible {
-                self.visible_entries.push(i);
-            }
+            self.visible_entries.push(i);
         }
     }
 
@@ -267,8 +216,18 @@ impl TabData {
             }
             CurrentPath::Multiple(path_bufs) => path_bufs.as_slice(),
         };
-
+        let depth = self.search.as_ref().map_or(1, |search| search.depth);
+        eprintln!("DEPTH: {}", depth);
         for d in directories {
+            self.list.extend(
+                walkdir::WalkDir::new(d)
+                    .follow_links(true)
+                    .max_depth(depth)
+                    .into_iter()
+                    .flatten()
+                    .skip(1)
+                    .filter_map(|e| e.try_into().ok()),
+            );
             let paths = {
                 #[cfg(feature = "profiling")]
                 puffin::profile_scope!("lwa_fm::dir_handling::read_dir::with_hidden::dir");
@@ -285,8 +244,6 @@ impl TabData {
                 e.try_into().ok()
             }));
         }
-
-        self.list.par_iter_mut().for_each(|e| e.read_metadata());
     }
 
     pub fn sort_entries(&mut self, sort_settings: &DirectoryViewSettings) {

src/app/top_bottom.rs

@@ -263,6 +263,7 @@ impl App {
                                     ui.toggle_value(&mut search_visible, "🔍")
                                         .on_hover_text("Search");
                                     let mut search_changed = is_searching != search_visible;
+                                    let mut search_target_changed = false;
                                     if let Some(search) = &mut current_tab.search {
                                         search_changed |= ui
                                             .toggle_value(&mut search.case_sensitive, "🇨")
@@ -273,7 +274,7 @@ impl App {
                                                 .hint_text("Search"),
                                         );
                                         search_changed |= search_input.changed();
-                                        search_changed |= ui
+                                        search_target_changed |= ui
                                             .add(
                                                 egui::Slider::new(&mut search.depth, 1..=7)
                                                     .trailing_fill(true)
@@ -313,7 +314,9 @@ impl App {
                                     if search_visible != is_searching {
                                         current_tab.toggle_search(ui.ctx());
                                     }
-                                    if search_changed {
+                                    if search_target_changed {
+                                        TabAction::RequestFilesRefresh.schedule_tab(current_tab.id);
+                                    } else if search_changed {
                                         TabAction::FilterChanged.schedule_tab(current_tab.id);
                                     }
                                     ui.spacing_mut().item_spacing = spacing;

src/data/files.rs

@@ -1,15 +1,12 @@
 use crate::{
     app::dir_handling::COLLATER,
     data::time::{ElapsedTime, TimestampSeconds},
+    helper::PathHelper,
 };
 use bincode::{Decode, Encode};
 use rayon::iter::{IntoParallelRefIterator, ParallelBridge, ParallelExtend, ParallelIterator};
 use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Ordering,
-    fs::FileType,
-    path::{Path, PathBuf},
-};
+use std::{cmp::Ordering, fs::FileType, path::Path};
 
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, Decode, Encode,
@@ -77,7 +74,7 @@ impl SortKey {
 
 #[derive(Debug, Clone, Serialize, Deserialize, Decode, Encode)]
 pub struct DirContent {
-    pub path: PathBuf,
+    pub path: String,
     pub entries: Vec<DirEntryData>,
 }
 
@@ -94,23 +91,24 @@ impl DirContent {
         let entries: Vec<DirEntryData> = paths
             .par_bridge()
             .filter_map(|e| {
+                #[cfg(feature = "profiling")]
                 puffin::profile_scope!("lwa_fm::dir_handling::db_read::db_mapping::entry");
                 let e = e.ok()?;
                 e.try_into().ok()
             })
             .collect();
         Some(Self {
-            path: dir.into(),
+            path: dir.to_full_path_string(),
             entries,
         })
     }
 
     #[inline]
     pub fn populate(&self, entries: &mut Vec<DirEntry>) {
-        let file_name_index = self.path.as_os_str().len() + 1;
+        let file_name_index = self.path.len() + 1;
         entries.par_extend(self.entries.par_iter().map(|e| DirEntry {
             meta: e.meta,
-            path: format!("{}/{}", self.path.display(), &e.file_name),
+            path: format!("{}{}{}", self.path, std::path::MAIN_SEPARATOR, &e.file_name),
             file_name_index,
             sort_key: e.sort_key,
         }));
@@ -265,7 +263,7 @@ impl TryFrom<std::fs::DirEntry> for DirEntry {
         let path: String = {
             #[cfg(feature = "profiling")]
             puffin::profile_scope!("lwa_fm::dir_handling::conversion::from_std::string");
-            value.path().to_string_lossy().to_string()
+            value.path().to_full_path_string()
         };
         let file_name_index = path.len() - value.file_name().len();
         let sort_key = SortKey::new_path(
@@ -292,7 +290,7 @@ impl TryFrom<walkdir::DirEntry> for DirEntry {
             return Err(());
         };
         let meta: DirEntryMetaData = meta.into();
-        let path = value.path().to_string_lossy().to_string();
+        let path = value.path().to_full_path_string();
         let file_name_index = path.len() - value.file_name().len();
         // let mut sort_key = SmallVec::<[u8; 40]>::new();
         // let _ =

src/watcher.rs

@@ -69,7 +69,7 @@ impl DirectoryWatchers {
         if let Some(receiver) = &self.receivers {
             if let Ok(watcher) = receiver.try_recv() {
                 if let Some(path) = watcher.current_path.as_ref() {
-                    self.watchers.insert(path.to_path_buf(), watcher);
+                    self.watchers.insert(path.clone(), watcher);
                 }
                 remove = true;
             }

src/windows_tools.rs

@@ -44,6 +44,7 @@ pub fn open_properties(path: impl AsRef<OsStr>) {
     // Open the properties window
     #[allow(unsafe_code)]
     unsafe {
+        #[allow(clippy::borrow_as_ptr)]
         match ShellExecuteExW(&mut sei) {
             Ok(()) => {}
             Err(e) => eprintln!("Failed to open properties window: {e:?}"),