add xml range

Author: Its-Just-Nans

Cargo.toml

@@ -21,7 +21,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
 # bladvak = { path = "../bladvak" }
 bladvak = "1.2.7"
 file-format = "0.28.0"
-roxmltree = "0.21.1"
+roxmltree = { version = "0.21.1", features = ["positions"] }
 serde = { version = "1", features = ["derive"] }
 
 [profile.release]

src/selection.rs

@@ -52,7 +52,15 @@ impl BladvakPanel for PanelSelection {
     fn ui(&self, app: &mut WombatApp, ui: &mut egui::Ui, error_manager: &mut ErrorManager) {
         if let Some((select1, select2)) = app.selection.range.as_mut() {
             let mut mark_stale = false;
-            ui.label("Selection");
+            ui.horizontal(|ui| {
+                ui.label("Selection");
+                let color_to_edit = if ui.ctx().theme() == Theme::Light {
+                    &mut app.selection.color.0
+                } else {
+                    &mut app.selection.color.1
+                };
+                ui.color_edit_button_srgba(color_to_edit);
+            });
             ui.horizontal(|ui| {
                 ui.add(egui::DragValue::new(select1).range(0..=*select2));
                 let max = app.binary_file.len() - 1;
@@ -70,13 +78,23 @@ impl BladvakPanel for PanelSelection {
                 ui.label(format!("{nb_selected} bytes selected"));
                 let range = *select1..=*select2;
 
+                if nb_selected == 4
+                    && let Some(slice) = app.binary_file.get(range.clone())
+                    && let Ok(bytes) = <[u8; 4]>::try_from(slice)
+                {
+                    let range_u32 = u32::from_le_bytes(bytes);
+
+                    if let Some(charac) = std::char::from_u32(range_u32) {
+                        ui.label(format!("Unicode le {charac}"));
+                    }
+                    let range_u32 = u32::from_be_bytes(bytes);
+
+                    if let Some(charac) = std::char::from_u32(range_u32) {
+                        ui.label(format!("Unicode be {charac}"));
+                    }
+                }
+
                 ui.collapsing("More", |ui| {
-                    let color_to_edit = if ui.ctx().theme() == Theme::Light {
-                        &mut app.selection.color.0
-                    } else {
-                        &mut app.selection.color.1
-                    };
-                    ui.color_edit_button_srgba(color_to_edit);
                     if ui.button("Delete selection").clicked() {
                         app.binary_file.drain(range.clone());
                         *select2 = select1.checked_sub(1).unwrap_or(0);

src/windows/detection/mod.rs

@@ -29,10 +29,7 @@ impl DetectionCache {
     fn show(&self, ui: &mut egui::Ui, file_info: &FileInfoData) -> Option<RangeInclusive<usize>> {
         match self {
             DetectionCache::Png(data) => show_png_chunks(ui, data.as_ref()),
-            DetectionCache::Xml(xml_str) => {
-                xml_tree_ui(ui, xml_str.as_ref());
-                None
-            }
+            DetectionCache::Xml(xml_str) => xml_tree_ui(ui, xml_str.as_ref()),
             DetectionCache::Empty => {
                 ui.label(format!("Kind: {:?}", file_info.kind));
                 ui.label("No data");

src/windows/detection/xml.rs

@@ -1,5 +1,7 @@
 //! XML
 
+use std::ops::RangeInclusive;
+
 use bladvak::eframe::egui::{self, CollapsingHeader};
 use roxmltree::{Document, Node};
 
@@ -21,25 +23,28 @@ impl XmlData {
 }
 
 /// Show XML tree
-pub fn xml_tree_ui(ui: &mut egui::Ui, xml: Option<&XmlData>) {
+pub fn xml_tree_ui(ui: &mut egui::Ui, xml: Option<&XmlData>) -> Option<RangeInclusive<usize>> {
     let Some(xml) = xml else {
         ui.label("Failed to parse xml");
-        return;
+        return None;
     };
+    let mut return_range = None;
     match Document::parse(&xml.inner) {
         Ok(doc) => {
             let root = doc.root_element();
-            draw_node(ui, root, 0);
+            return_range = draw_node(ui, root, 0);
         }
         Err(err) => {
             ui.colored_label(egui::Color32::RED, err.to_string());
         }
     }
+    return_range
 }
 
 /// Draw node
-fn draw_node(ui: &mut egui::Ui, node: Node<'_, '_>, idx: usize) {
+fn draw_node(ui: &mut egui::Ui, node: Node<'_, '_>, idx: usize) -> Option<RangeInclusive<usize>> {
     let mut count = idx;
+    let mut return_range = None;
     match node.node_type() {
         roxmltree::NodeType::Element => {
             let label = format_element_label(node);
@@ -48,6 +53,13 @@ fn draw_node(ui: &mut egui::Ui, node: Node<'_, '_>, idx: usize) {
                 .id_salt(format!("{label}-{idx}-{count}"))
                 .default_open(false)
                 .show(ui, |ui| {
+                    let range = node.range();
+                    if ui
+                        .button(format!("Position {}-{}", range.start, range.end - 1))
+                        .clicked()
+                    {
+                        return_range = Some(range.start..=range.end - 1);
+                    }
                     // Attributes
                     for attr in node.attributes() {
                         ui.label(format!("@{}=\"{}\"", attr.name(), attr.value()));
@@ -56,7 +68,9 @@ fn draw_node(ui: &mut egui::Ui, node: Node<'_, '_>, idx: usize) {
                     // Children
                     for child in node.children() {
                         count += 1;
-                        draw_node(ui, child, count);
+                        if let Some(range) = draw_node(ui, child, count) {
+                            return_range = Some(range);
+                        }
                     }
                 });
         }
@@ -74,6 +88,7 @@ fn draw_node(ui: &mut egui::Ui, node: Node<'_, '_>, idx: usize) {
 
         _ => {}
     }
+    return_range
 }
 
 /// Format element label