optimize folder close logic

Author: zsqw123

asm/src/impls/mod.rs

@@ -5,4 +5,4 @@ pub(crate) mod node;
 pub(crate) mod smali;
 pub(crate) mod dex;
 
-mod util;
+pub(crate) mod util;

asm/src/impls/util/mod.rs

@@ -8,4 +8,4 @@ mod ex;
 mod mutf8;
 mod once_vec;
 mod computable;
-mod refs;
+pub(crate) mod refs;

asm/src/pub_refs.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 pub type ConstStr = &'static str;
 
+/// for impl, check [crate::impls::util::refs::ToStringRef]
 pub type StrRef = Arc<str>;
 
 /// e.g.: java/lang/Class

asm_egui/src/file_tree.rs

@@ -10,20 +10,21 @@ pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
     let server = app.server.lock();
     if server.is_none() { return; }
     let row_height = ui.spacing().interact_size.y;
-    ScrollArea::vertical().auto_shrink(false)
-        .show_rows(ui, row_height, entries.len(), |ui, range| {
-            for i in range {
-                let entry = &mut entries[i];
-                match entry {
-                    FileEntry::Dir(raw_dir) => {
-                        render_dir_raw(ui, raw_dir);
-                    }
-                    FileEntry::File(file_info) => {
-                        render_file(ui, file_info, server_app);
-                    }
+    let scroll_area = ScrollArea::vertical().auto_shrink(false);
+    // scroll_area.vertical_scroll_offset();
+    scroll_area.show_rows(ui, row_height, entries.len(), |ui, range| {
+        for i in range {
+            let entry = &mut entries[i];
+            match entry {
+                FileEntry::Dir(raw_dir) => {
+                    render_dir_raw(ui, raw_dir, server_app);
+                }
+                FileEntry::File(file_info) => {
+                    render_file(ui, file_info, server_app);
                 }
             }
-        });
+        }
+    });
 }
 
 fn render_file(
@@ -46,9 +47,9 @@ fn render_file(
 }
 
 fn render_dir_raw(
-    ui: &mut egui::Ui, dir_info: &mut RawDirInfo,
+    ui: &mut egui::Ui, dir_info: &mut RawDirInfo, app_container: &AppContainer,
 ) {
-    let RawDirInfo { opened, level, title } = dir_info;
+    let RawDirInfo { opened, level, title, dir_key } = dir_info;
     ui.horizontal(|ui| {
         ui.add_space((*level as f32) * 12.0);
         let font = TextStyle::Body.resolve(ui.style());
@@ -61,7 +62,13 @@ fn render_dir_raw(
         let layout_job = LayoutJob::simple_singleline(title, font.clone(), color);
         let label = ui.selectable_label(false, layout_job);
         if label.clicked() {
-            *opened = !*opened;
+            let new_opened = !*opened;
+            if new_opened {
+                *opened = true;
+            } else {
+                // closed, close all child dir
+                app_container.send_message(UIMessage::CloseDir(dir_info.dir_key.clone()))
+            }
         }
     });
 }

asm_egui/src/smali.rs

@@ -194,9 +194,6 @@ impl<'a> RenderContext<'a> {
     fn descriptor_menu_for_fn(
         &mut self, ui: &mut Ui, descriptor: &str,
     ) -> Option<()> {
-        let RenderContext {
-            server, content, ..
-        } = self;
         let descriptor = descriptor.strip_prefix('(')?;
         let mut split = descriptor.split(')');
 

asm_server/src/impls/server.rs

@@ -87,7 +87,7 @@ impl AsmServer {
     fn render_to_app(&self, app: AppContainer) {
         let classes = self.read_classes();
         let start = Instant::now();
-        let dir_info = DirInfo::from_classes(Arc::from("Root"), &classes);
+        let dir_info = DirInfo::from_classes(&classes);
         info!("resolve dir info cost: {:?}", start.elapsed());
         app.set_left(Left { root_node: dir_info });
     }

asm_server/src/server.rs

@@ -95,6 +95,30 @@ impl AsmServer {
         self.switch_or_open_lock_free(file_key, accessor, &mut left, &mut content, &mut top);
     }
 
+    pub fn close_dir(&self, file_key: &str, render_target: &AppContainer) {
+        let mut left = render_target.left().lock();
+        let mut current_node = &mut left.root_node;
+        let path_parts: Vec<&str> = file_key.split('/').collect();
+        for part in path_parts {
+            let Some(dir) = current_node.dirs.get_mut(part) else {
+                return;
+            };
+            if !dir.raw.opened {
+                return;
+            }
+            current_node = dir;
+        }
+        current_node.raw.opened = false;
+        let mut child_nodes: Vec<&mut DirInfo> = vec![current_node];
+        while let Some(child_node) = child_nodes.pop() {
+            for child in child_node.dirs.values_mut() {
+                if !child.raw.opened { continue; }
+                child.raw.opened = false;
+                child_nodes.push(child);
+            }
+        }
+    }
+
     pub fn switch_or_open_lock_free(
         &self, file_key: &str, accessor: &AccessorEnum,
         left: &mut Left, content: &mut Content, top: &mut Top,
@@ -124,6 +148,7 @@ impl AsmServer {
         top.file_path = Some(file_key.to_string());
     }
 
+    // switch left side file tree to correct place.
     fn switch_file_tree(&self, left: &mut Left, file_key: &str) {
         let root_node = &mut left.root_node;
         let parts: Vec<&str> = file_key.split('/').collect();

asm_server/src/ui/mod.rs

@@ -16,8 +16,8 @@ use std::str::Split;
 use std::sync::Arc;
 
 /// contains all states of the app.
-/// It's not like the [crate::AsmServer] which only contains the information of a file.
-/// App will exists even no file opened. (no [crate::AsmServer] exists)
+/// It's not like the [AsmServer] which only contains the information of a file.
+/// App will exists even no file opened. (no [AsmServer] exists)
 #[derive(Default, Clone, Debug)]
 pub struct App {
     pub top: Arc<Mutex<Top>>,
@@ -29,6 +29,7 @@ pub struct App {
 #[derive(Clone, Debug)]
 pub enum UIMessage {
     OpenFile(OpenFileMessage),
+    CloseDir(StrRef),
 }
 
 #[derive(Clone, Debug)]
@@ -61,6 +62,9 @@ impl AppContainer {
                 UIMessage::OpenFile(message) => {
                     server.switch_or_open(&message.path, self);
                 }
+                UIMessage::CloseDir(path) => {
+                    server.close_dir(&path, self);
+                }
             }
         }
     }
@@ -99,6 +103,7 @@ pub struct RawDirInfo {
     pub opened: bool,
     pub level: u16,
     pub title: StrRef,
+    pub dir_key: StrRef,
 }
 
 pub type DirMap = BTreeMap<StrRef, DirInfo>;
@@ -124,8 +129,14 @@ fn visible_items<'a, 'b>(dir_info: &'b mut DirInfo, container: &'a mut Vec<FileE
 }
 
 impl DirInfo {
-    pub fn from_classes(title: StrRef, class_names: &[StrRef]) -> Self {
-        let mut root_node = DirInfo { raw: RawDirInfo { title, ..Default::default() }, ..Default::default() };
+    pub fn from_classes(class_names: &[StrRef]) -> Self {
+        let root_raw_dir = RawDirInfo {
+            title: Arc::from("Root"),
+            dir_key: Arc::from(""),
+            level: 0,
+            opened: true,
+        };
+        let mut root_node = DirInfo { raw: root_raw_dir, ..Default::default() };
         for class_name in class_names {
             root_node.put_entry_if_absent(class_name.clone());
         }
@@ -170,7 +181,7 @@ impl DirInfo {
     }
 
     fn entry_parts(path: &str) -> Peekable<Enumerate<Split<char>>> {
-        path[1..(path.len() - 1)].split('/').enumerate().peekable()
+        path.split('/').enumerate().peekable()
     }
 
     fn put_file_if_absent(&mut self, level: u16, file_key: StrRef, file_name: StrRef) -> &mut FileInfo {
@@ -182,8 +193,16 @@ impl DirInfo {
 
     fn put_dir_if_absent(&mut self, level: u16, folder_name: StrRef) -> &mut DirInfo {
         let title = folder_name.clone();
-        self.dirs.entry(folder_name).or_insert_with(|| {
-            let raw = RawDirInfo { title, level, ..Default::default() };
+        let parent_dir_key = &self.raw.dir_key;
+        let dir_key: StrRef;
+        if parent_dir_key.is_empty() {
+            // direct n
+            dir_key = folder_name.into();
+        } else {
+            dir_key = format!("{}/{}", parent_dir_key, folder_name).into();
+        }
+        self.dirs.entry(title.clone()).or_insert_with(|| {
+            let raw = RawDirInfo { title, level, dir_key, ..Default::default() };
             DirInfo { raw, ..Default::default() }
         })
     }