From 04112515f56227367713095c898f955cffdbe54f Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 15:22:45 +0800
Subject: [PATCH 1/9] refactor: split Diagram to DiagramView and Diagram

This is a preparation for drawing on top of the ListView in DiagramView.
---
 data/resources/resources.gresource.xml |   1 +
 data/resources/ui/diagram.ui           |  13 +-
 data/resources/ui/diagram_view.ui      |  18 +++
 src/diagram.rs                         |  43 ++----
 src/diagram_view.rs                    | 187 +++++++++++++++++++++++++
 src/main.rs                            |   1 +
 6 files changed, 218 insertions(+), 45 deletions(-)
 create mode 100644 data/resources/ui/diagram_view.ui
 create mode 100644 src/diagram_view.rs

diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
index 4c49d46..a5a84bd 100644
--- a/data/resources/resources.gresource.xml
+++ b/data/resources/resources.gresource.xml
@@ -10,6 +10,7 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/details_view.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/diagram.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/diagram_row.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/diagram_view.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/durations_page.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/frequencies_page.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/sizes_page.ui</file>
diff --git a/data/resources/ui/diagram.ui b/data/resources/ui/diagram.ui
index fa09068..978d09e 100644
--- a/data/resources/ui/diagram.ui
+++ b/data/resources/ui/diagram.ui
@@ -6,19 +6,8 @@
     </property>
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
-        <property name="hexpand">True</property>
         <property name="child">
-          <object class="GtkListView" id="list_view">
-            <property name="model">
-              <object class="GtkSingleSelection" id="selection_model">
-                <property name="can-unselect">True</property>
-                <property name="autoselect">False</property>
-              </object>
-            </property>
-            <style>
-              <class name="navigation-sidebar"/>
-            </style>
-          </object>
+          <object class="BustleDiagramView" id="view"/>
         </property>
       </object>
     </child>
diff --git a/data/resources/ui/diagram_view.ui b/data/resources/ui/diagram_view.ui
new file mode 100644
index 0000000..fbaf268
--- /dev/null
+++ b/data/resources/ui/diagram_view.ui
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="BustleDiagramView">
+    <child>
+      <object class="GtkListView" id="list_view">
+        <property name="model">
+          <object class="GtkSingleSelection" id="selection_model">
+            <property name="can-unselect">True</property>
+            <property name="autoselect">False</property>
+          </object>
+        </property>
+        <style>
+          <class name="navigation-sidebar"/>
+        </style>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/diagram.rs b/src/diagram.rs
index 496b7c9..5cb8790 100644
--- a/src/diagram.rs
+++ b/src/diagram.rs
@@ -5,13 +5,10 @@ use gtk::{
     subclass::prelude::*,
 };
 
-use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, diagram_row::DiagramRow};
+use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, diagram_view::DiagramView};
 
 mod imp {
-    use std::{
-        cell::{Cell, RefCell},
-        marker::PhantomData,
-    };
+    use std::{cell::Cell, marker::PhantomData};
 
     use super::*;
 
@@ -25,11 +22,7 @@ mod imp {
         #[template_child]
         pub(super) scrolled_window: TemplateChild<gtk::ScrolledWindow>,
         #[template_child]
-        pub(super) list_view: TemplateChild<gtk::ListView>,
-        #[template_child]
-        pub(super) selection_model: TemplateChild<gtk::SingleSelection>,
-
-        pub(super) model: RefCell<Option<DiagramModel>>,
+        pub(super) view: TemplateChild<DiagramView>,
 
         pub(super) is_sticky: Cell<bool>,
         pub(super) is_auto_scrolling: Cell<bool>,
@@ -48,9 +41,7 @@ mod imp {
                 gdk::Key::Escape,
                 gdk::ModifierType::empty(),
                 |obj, _| {
-                    obj.imp()
-                        .selection_model
-                        .set_selected(gtk::INVALID_LIST_POSITION);
+                    obj.imp().view.unselect();
                     true
                 },
                 None,
@@ -69,26 +60,14 @@ mod imp {
 
             let obj = self.obj();
 
-            let factory = gtk::SignalListItemFactory::new();
-            factory.connect_setup(clone!(@weak obj => move  |_, list_item| {
-                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
-
-                let row = DiagramRow::default();
-
-                list_item.property_expression("item").bind(&row, "item", glib::Object::NONE);
-
-                list_item.set_child(Some(&row));
-            }));
-            self.list_view.set_factory(Some(&factory));
-
-            self.selection_model
+            self.view
                 .connect_selected_item_notify(clone!(@weak obj => move |_| {
                     obj.notify_selected_item();
                 }));
 
             self.is_sticky.set(true);
 
-            let vadj = self.list_view.vadjustment().unwrap();
+            let vadj = self.view.vadjustment().unwrap();
             vadj.connect_value_changed(clone!(@weak obj => move |vadj| {
                 let imp = obj.imp();
 
@@ -125,26 +104,24 @@ mod imp {
 
     impl Diagram {
         fn selected_item(&self) -> Option<DiagramItem> {
-            self.selection_model.selected_item().and_downcast()
+            self.view.selected_item()
         }
     }
 }
 
 glib::wrapper! {
+    /// Wrapper to DiagramView
     pub struct Diagram(ObjectSubclass<imp::Diagram>)
         @extends gtk::Widget;
 }
 
 impl Diagram {
     pub fn set_model(&self, model: Option<&DiagramModel>) {
-        let imp = self.imp();
-
-        imp.model.replace(model.cloned());
-        imp.selection_model.set_model(model);
+        self.imp().view.set_model(model);
     }
 
     pub fn model(&self) -> Option<DiagramModel> {
-        self.imp().model.borrow().clone()
+        self.imp().view.model()
     }
 
     fn scroll_to_end(&self) {
diff --git a/src/diagram_view.rs b/src/diagram_view.rs
new file mode 100644
index 0000000..e6fedc6
--- /dev/null
+++ b/src/diagram_view.rs
@@ -0,0 +1,187 @@
+use gtk::{
+    glib::{self, clone},
+    prelude::*,
+    subclass::prelude::*,
+};
+
+use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, diagram_row::DiagramRow};
+
+mod imp {
+    use std::marker::PhantomData;
+
+    use super::*;
+
+    #[derive(Debug, Default, glib::Properties, gtk::CompositeTemplate)]
+    #[properties(wrapper_type = super::DiagramView)]
+    #[template(resource = "/org/freedesktop/Bustle/ui/diagram_view.ui")]
+    pub struct DiagramView {
+        #[property(get = Self::selected_item)]
+        pub(super) selected_item: PhantomData<Option<DiagramItem>>,
+        #[property(get = Self::hscroll_policy, set = Self::set_hscroll_policy, override_interface = gtk::Scrollable)]
+        pub(super) hscroll_policy: PhantomData<gtk::ScrollablePolicy>,
+        #[property(get = Self::hadjustment, set = Self::set_hadjustment, override_interface = gtk::Scrollable)]
+        pub(super) hadjustment: PhantomData<Option<gtk::Adjustment>>,
+        #[property(get = Self::vscroll_policy, set = Self::set_vscroll_policy, override_interface = gtk::Scrollable)]
+        pub(super) vscroll_policy: PhantomData<gtk::ScrollablePolicy>,
+        #[property(get = Self::vadjustment, set = Self::set_vadjustment, override_interface = gtk::Scrollable)]
+        pub(super) vadjustment: PhantomData<Option<gtk::Adjustment>>,
+
+        #[template_child]
+        pub(super) list_view: TemplateChild<gtk::ListView>,
+        #[template_child]
+        pub(super) selection_model: TemplateChild<gtk::SingleSelection>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for DiagramView {
+        const NAME: &'static str = "BustleDiagramView";
+        type Type = super::DiagramView;
+        type ParentType = gtk::Widget;
+        type Interfaces = (gtk::Scrollable,);
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.bind_template();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    #[glib::derived_properties]
+    impl ObjectImpl for DiagramView {
+        fn constructed(&self) {
+            self.parent_constructed();
+
+            let obj = self.obj();
+
+            let factory = gtk::SignalListItemFactory::new();
+            factory.connect_setup(clone!(@weak obj => move  |_, list_item| {
+                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+
+                let row = DiagramRow::default();
+
+                list_item.property_expression("item").bind(&row, "item", glib::Object::NONE);
+
+                list_item.set_child(Some(&row));
+            }));
+            self.list_view.set_factory(Some(&factory));
+
+            self.selection_model
+                .connect_selected_item_notify(clone!(@weak obj => move |_| {
+                    obj.notify_selected_item();
+                }));
+        }
+
+        fn dispose(&self) {
+            self.dispose_template();
+        }
+    }
+
+    impl WidgetImpl for DiagramView {
+        fn measure(&self, orientation: gtk::Orientation, for_size: i32) -> (i32, i32, i32, i32) {
+            self.list_view.measure(orientation, for_size)
+        }
+
+        fn size_allocate(&self, width: i32, height: i32, baseline: i32) {
+            self.list_view
+                .size_allocate(&gtk::Allocation::new(0, 0, width, height), baseline)
+        }
+    }
+
+    impl ScrollableImpl for DiagramView {
+        fn border(&self) -> Option<gtk::Border> {
+            self.list_view.border()
+        }
+    }
+
+    impl DiagramView {
+        fn selected_item(&self) -> Option<DiagramItem> {
+            self.selection_model.selected_item().and_downcast()
+        }
+
+        fn hscroll_policy(&self) -> gtk::ScrollablePolicy {
+            self.list_view.hscroll_policy()
+        }
+
+        fn set_hscroll_policy(&self, policy: gtk::ScrollablePolicy) {
+            self.list_view.set_hscroll_policy(policy);
+        }
+
+        fn hadjustment(&self) -> Option<gtk::Adjustment> {
+            self.list_view.hadjustment()
+        }
+
+        fn set_hadjustment(&self, adj: Option<&gtk::Adjustment>) {
+            self.list_view.set_hadjustment(adj);
+
+            if let Some(adj) = adj {
+                let obj = self.obj();
+
+                adj.connect_value_changed(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+                adj.connect_upper_notify(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+                adj.connect_page_size_notify(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+            }
+        }
+
+        fn vscroll_policy(&self) -> gtk::ScrollablePolicy {
+            self.list_view.vscroll_policy()
+        }
+
+        fn set_vscroll_policy(&self, policy: gtk::ScrollablePolicy) {
+            self.list_view.set_vscroll_policy(policy);
+        }
+
+        fn vadjustment(&self) -> Option<gtk::Adjustment> {
+            self.list_view.vadjustment()
+        }
+
+        fn set_vadjustment(&self, adj: Option<&gtk::Adjustment>) {
+            self.list_view.set_vadjustment(adj);
+
+            if let Some(adj) = adj {
+                let obj = self.obj();
+
+                adj.connect_value_changed(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+                adj.connect_upper_notify(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+                adj.connect_page_size_notify(clone!(@weak obj => move |_| {
+                    obj.queue_draw();
+                }));
+            }
+        }
+    }
+}
+
+glib::wrapper! {
+    pub struct DiagramView(ObjectSubclass<imp::DiagramView>)
+        @extends gtk::Widget;
+}
+
+impl DiagramView {
+    pub fn set_model(&self, model: Option<&DiagramModel>) {
+        self.imp().selection_model.set_model(model);
+    }
+
+    pub fn model(&self) -> Option<DiagramModel> {
+        self.imp()
+            .selection_model
+            .model()
+            .map(|selection_model| selection_model.downcast().unwrap())
+    }
+
+    pub fn unselect(&self) {
+        self.imp()
+            .selection_model
+            .set_selected(gtk::INVALID_LIST_POSITION);
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index a8617e7..e8e67e0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,6 +7,7 @@ mod diagram;
 mod diagram_item;
 mod diagram_model;
 mod diagram_row;
+mod diagram_view;
 mod i18n;
 mod message_type;
 mod monitor;
-- 
GitLab


From ed8a8e34462d255faffc7d0b5519eb50c6be86b4 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 15:30:12 +0800
Subject: [PATCH 2/9] refactor: handle filtering in Diagram instead of
 DiagramModel

In the future, we will need info on the items we filtered, so it is great
for them to be around
---
 data/resources/ui/diagram_view.ui |  3 +++
 src/diagram.rs                    |  4 ++++
 src/diagram_model.rs              | 11 -----------
 src/diagram_view.rs               |  8 +++++++-
 src/window.rs                     | 12 ++++++++++++
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/data/resources/ui/diagram_view.ui b/data/resources/ui/diagram_view.ui
index fbaf268..4f7c813 100644
--- a/data/resources/ui/diagram_view.ui
+++ b/data/resources/ui/diagram_view.ui
@@ -7,6 +7,9 @@
           <object class="GtkSingleSelection" id="selection_model">
             <property name="can-unselect">True</property>
             <property name="autoselect">False</property>
+            <property name="model">
+              <object class="GtkFilterListModel" id="filter_list_model"/>
+            </property>
           </object>
         </property>
         <style>
diff --git a/src/diagram.rs b/src/diagram.rs
index 5cb8790..05bb7f9 100644
--- a/src/diagram.rs
+++ b/src/diagram.rs
@@ -124,6 +124,10 @@ impl Diagram {
         self.imp().view.model()
     }
 
+    pub fn set_filter(&self, filter: Option<&impl IsA<gtk::Filter>>) {
+        self.imp().view.set_filter(filter);
+    }
+
     fn scroll_to_end(&self) {
         let imp = self.imp();
         imp.is_auto_scrolling.set(true);
diff --git a/src/diagram_model.rs b/src/diagram_model.rs
index c58d367..9697b38 100644
--- a/src/diagram_model.rs
+++ b/src/diagram_model.rs
@@ -203,17 +203,6 @@ impl DiagramModel {
     }
 
     fn push_inner(&self, diagram_item: DiagramItem) -> bool {
-        // Skip messages. TODO: define the exact rules and document why
-        if diagram_item
-            .message_destination()
-            .is_some_and(|d| d == "org.freedesktop.DBus")
-            || diagram_item
-                .message_sender()
-                .is_some_and(|s| s == "org.freedesktop.DBus")
-        {
-            return false;
-        }
-
         // Before we add the item to the list, we look for it other half
         // if we have a [`MessageType::MethodCall`] we would search for it
         // [`MessageType::MethodReturn`] or [`MessageType::Error`]
diff --git a/src/diagram_view.rs b/src/diagram_view.rs
index e6fedc6..3310aa6 100644
--- a/src/diagram_view.rs
+++ b/src/diagram_view.rs
@@ -30,6 +30,8 @@ mod imp {
         pub(super) list_view: TemplateChild<gtk::ListView>,
         #[template_child]
         pub(super) selection_model: TemplateChild<gtk::SingleSelection>,
+        #[template_child]
+        pub(super) filter_list_model: TemplateChild<gtk::FilterListModel>,
     }
 
     #[glib::object_subclass]
@@ -169,7 +171,7 @@ glib::wrapper! {
 
 impl DiagramView {
     pub fn set_model(&self, model: Option<&DiagramModel>) {
-        self.imp().selection_model.set_model(model);
+        self.imp().filter_list_model.set_model(model);
     }
 
     pub fn model(&self) -> Option<DiagramModel> {
@@ -179,6 +181,10 @@ impl DiagramView {
             .map(|selection_model| selection_model.downcast().unwrap())
     }
 
+    pub fn set_filter(&self, filter: Option<&impl IsA<gtk::Filter>>) {
+        self.imp().filter_list_model.set_filter(filter);
+    }
+
     pub fn unselect(&self) {
         self.imp()
             .selection_model
diff --git a/src/window.rs b/src/window.rs
index 2c55b12..50d5185 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -194,6 +194,18 @@ mod imp {
             }
 
             self.empty_status_page.set_icon_name(Some(APP_ID));
+            self.diagram
+                .set_filter(Some(&gtk::CustomFilter::new(|item| {
+                    let diagram_item = item.downcast_ref::<DiagramItem>().unwrap();
+
+                    // Skip messages. TODO: define the exact rules and document why
+                    !diagram_item
+                        .message_destination()
+                        .is_some_and(|d| d == "org.freedesktop.DBus")
+                        && !diagram_item
+                            .message_sender()
+                            .is_some_and(|s| s == "org.freedesktop.DBus")
+                })));
 
             // Load latest window state
             obj.load_window_size();
-- 
GitLab


From 2810801b9a22236ea16e904bfb2441f181bd82c1 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 15:37:13 +0800
Subject: [PATCH 3/9] fix: properly get elapsed time

Since we now filter items on the Diagram itself, the current visible
head item may change. Thus, we should refer to the filter list model
what is the current unfiltered head
---
 src/diagram_item.rs  | 17 ++++-------------
 src/diagram_model.rs |  7 +------
 src/diagram_row.rs   | 43 ++++++++++++++++++++++++++++++++++++-------
 src/diagram_view.rs  | 25 +++++++++++++++++++++----
 src/window.rs        |  3 +--
 5 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/src/diagram_item.rs b/src/diagram_item.rs
index 82d3ab7..48d46d3 100644
--- a/src/diagram_item.rs
+++ b/src/diagram_item.rs
@@ -17,13 +17,12 @@ mod imp {
     #[derive(Debug, Default, glib::Properties)]
     #[properties(wrapper = super::DiagramItem)]
     pub struct DiagramItem {
-        pub(super) message: OnceCell<Arc<zbus::Message>>,
         #[property(get, set, construct_only, builder(MessageType::Invalid))]
         pub(super) message_type: Cell<MessageType>,
         #[property(get, set, construct_only)]
         pub(super) timestamp: OnceCell<Timestamp>,
-        #[property(get, set, construct_only)]
-        pub(super) elapsed_time: Cell<Timestamp>,
+
+        pub(super) message: OnceCell<Arc<zbus::Message>>,
         pub(super) associated_item: OnceCell<WeakRef<super::DiagramItem>>,
     }
 
@@ -42,24 +41,16 @@ glib::wrapper! {
 }
 
 impl DiagramItem {
-    pub fn from_event(event: Event, head_time: Option<Timestamp>) -> Self {
-        let elapsed_time = if let Some(time) = head_time {
-            event.timestamp - time
-        } else {
-            Timestamp::default()
-        };
-
+    pub fn from_event(event: Event) -> Self {
         let this = glib::Object::builder::<Self>()
             .property(
                 "message-type",
                 MessageType::from(event.message.message_type()),
             )
             .property("timestamp", event.timestamp)
-            .property("elapsed-time", elapsed_time)
             .build();
 
-        let imp = this.imp();
-        imp.message.set(event.message).unwrap();
+        this.imp().message.set(event.message).unwrap();
 
         this
     }
diff --git a/src/diagram_model.rs b/src/diagram_model.rs
index 9697b38..e525ffc 100644
--- a/src/diagram_model.rs
+++ b/src/diagram_model.rs
@@ -151,13 +151,8 @@ impl DiagramModel {
 
         let this = Self::default();
 
-        let mut head_timestamp = None;
         for event in events {
-            let item = DiagramItem::from_event(event, head_timestamp);
-            let was_added = this.push_inner(item.clone());
-            if head_timestamp.is_none() && was_added {
-                head_timestamp = Some(item.timestamp());
-            }
+            this.push_inner(DiagramItem::from_event(event));
         }
 
         Ok(this)
diff --git a/src/diagram_row.rs b/src/diagram_row.rs
index 36f049b..7186f58 100644
--- a/src/diagram_row.rs
+++ b/src/diagram_row.rs
@@ -1,6 +1,6 @@
 use gtk::{glib, prelude::*, subclass::prelude::*};
 
-use crate::diagram_item::DiagramItem;
+use crate::{diagram_item::DiagramItem, timestamp::Timestamp};
 
 mod imp {
     use std::cell::RefCell;
@@ -13,6 +13,8 @@ mod imp {
     pub struct DiagramRow {
         #[property(get, set = Self::set_item, explicit_notify, nullable)]
         pub(super) item: RefCell<Option<DiagramItem>>,
+        #[property(get, set = Self::set_head_item, explicit_notify, nullable)]
+        pub(super) head_item: RefCell<Option<DiagramItem>>,
 
         #[template_child]
         pub(super) hbox: TemplateChild<gtk::Box>,
@@ -55,9 +57,20 @@ mod imp {
             }
 
             let obj = self.obj();
-            obj.update_labels();
+            obj.update_timestamp_label();
+            obj.update_title_subtitle_labels();
             obj.notify_item();
         }
+
+        fn set_head_item(&self, head_item: Option<DiagramItem>) {
+            if head_item == self.head_item.replace(head_item.clone()) {
+                return;
+            }
+
+            let obj = self.obj();
+            obj.update_timestamp_label();
+            obj.notify_head_item();
+        }
     }
 }
 
@@ -67,14 +80,31 @@ glib::wrapper! {
 }
 
 impl DiagramRow {
-    fn update_labels(&self) {
+    fn update_timestamp_label(&self) {
         let imp = self.imp();
 
-        if let Some(item) = imp.item.borrow().as_ref() {
-            let elapsed_ms = item.elapsed_time().as_millis_f64().round();
+        if let Some(item) = self.item() {
+            let elapsed_ms = {
+                let head_item = self
+                    .head_item()
+                    .expect("there must always be a head item if there is an item");
+                if head_item == item {
+                    Timestamp::default()
+                } else {
+                    item.timestamp() - head_item.timestamp()
+                }
+            };
+            imp.timestamp_label
+                .set_label(&format!("{} ms", elapsed_ms.as_millis_f64().round()));
+        } else {
+            imp.timestamp_label.set_label("");
+        }
+    }
 
-            imp.timestamp_label.set_label(&format!("{elapsed_ms} ms"));
+    fn update_title_subtitle_labels(&self) {
+        let imp = self.imp();
 
+        if let Some(item) = self.item() {
             let title = item.display_path();
             if item.message_type().is_method_return() {
                 imp.title_label.set_text(Some(&title));
@@ -89,7 +119,6 @@ impl DiagramRow {
                     .set_markup(Some(&item.markup_member_name(true)));
             }
         } else {
-            imp.timestamp_label.set_label("");
             imp.title_label.set_text(None);
             imp.subtitle_label.set_text(None);
         }
diff --git a/src/diagram_view.rs b/src/diagram_view.rs
index 3310aa6..b66a09a 100644
--- a/src/diagram_view.rs
+++ b/src/diagram_view.rs
@@ -60,13 +60,30 @@ mod imp {
             let factory = gtk::SignalListItemFactory::new();
             factory.connect_setup(clone!(@weak obj => move  |_, list_item| {
                 let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
-
                 let row = DiagramRow::default();
-
-                list_item.property_expression("item").bind(&row, "item", glib::Object::NONE);
-
                 list_item.set_child(Some(&row));
             }));
+            factory.connect_bind(clone!(@weak obj => move |_, list_item| {
+                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+                let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
+                row.set_head_item(
+                    obj.imp()
+                        .filter_list_model
+                        .item(0)
+                        .map(|obj| obj.downcast::<DiagramItem>().unwrap()),
+                );
+                row.set_item(
+                    list_item
+                        .item()
+                        .map(|item| item.downcast_ref::<DiagramItem>().unwrap().clone()),
+                );
+            }));
+            factory.connect_unbind(|_, list_item| {
+                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+                let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
+                row.set_item(None::<DiagramItem>);
+                row.set_head_item(None::<DiagramItem>);
+            });
             self.list_view.set_factory(Some(&factory));
 
             self.selection_model
diff --git a/src/window.rs b/src/window.rs
index 50d5185..97478c7 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -450,8 +450,7 @@ impl Window {
 
         monitor
             .start(clone!(@weak model => move |event| {
-                let timestamp = model.head().map(|i| i.timestamp());
-                model.push(DiagramItem::from_event(event, timestamp));
+                model.push(DiagramItem::from_event(event));
             }))
             .await
             .context("Failed to start monitor")?;
-- 
GitLab


From ac370dacf2cdcabdea5a45337049a38b713d534c Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 16:48:23 +0800
Subject: [PATCH 4/9] fix: respect filter on StatisticsView and logged messages
 count

This introduces DiagramFilterListModel that will also be helpful in diagram drawing
later on
---
 data/resources/ui/diagram_view.ui   |   3 -
 data/resources/ui/window.ui         |   3 +
 src/diagram.rs                      |  27 +++----
 src/diagram_filter_list_model.rs    |  84 ++++++++++++++++++++
 src/diagram_view.rs                 |  23 +++---
 src/main.rs                         |   1 +
 src/statistics/pages/durations.rs   |   9 ++-
 src/statistics/pages/frequencies.rs |   9 ++-
 src/statistics/pages/sizes.rs       |   8 +-
 src/statistics/window.rs            |   6 +-
 src/window.rs                       | 115 +++++++++++++---------------
 11 files changed, 183 insertions(+), 105 deletions(-)
 create mode 100644 src/diagram_filter_list_model.rs

diff --git a/data/resources/ui/diagram_view.ui b/data/resources/ui/diagram_view.ui
index 4f7c813..fbaf268 100644
--- a/data/resources/ui/diagram_view.ui
+++ b/data/resources/ui/diagram_view.ui
@@ -7,9 +7,6 @@
           <object class="GtkSingleSelection" id="selection_model">
             <property name="can-unselect">True</property>
             <property name="autoselect">False</property>
-            <property name="model">
-              <object class="GtkFilterListModel" id="filter_list_model"/>
-            </property>
           </object>
         </property>
         <style>
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 4c2fc8d..88a6ca5 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -264,6 +264,9 @@
                         <property name="pin-sidebar">True</property>
                         <property name="content">
                           <object class="BustleDiagram" id="diagram">
+                            <property name="model">
+                              <object class="BustleDiagramFilterListModel" id="diagram_filter_list_model"/>
+                            </property>
                             <signal name="notify::selected-item" handler="diagram_selected_item_notify" swapped="yes"/>
                           </object>
                         </property>
diff --git a/src/diagram.rs b/src/diagram.rs
index 05bb7f9..a5350d4 100644
--- a/src/diagram.rs
+++ b/src/diagram.rs
@@ -5,7 +5,10 @@ use gtk::{
     subclass::prelude::*,
 };
 
-use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, diagram_view::DiagramView};
+use crate::{
+    diagram_filter_list_model::DiagramFilterListModel, diagram_item::DiagramItem,
+    diagram_view::DiagramView,
+};
 
 mod imp {
     use std::{cell::Cell, marker::PhantomData};
@@ -16,6 +19,8 @@ mod imp {
     #[properties(wrapper_type = super::Diagram)]
     #[template(resource = "/org/freedesktop/Bustle/ui/diagram.ui")]
     pub struct Diagram {
+        #[property(get = Self::model, set = Self::set_model, explicit_notify, nullable)]
+        pub(super) model: PhantomData<Option<DiagramFilterListModel>>,
         #[property(get = Self::selected_item)]
         pub(super) selected_item: PhantomData<Option<DiagramItem>>,
 
@@ -103,6 +108,14 @@ mod imp {
     impl WidgetImpl for Diagram {}
 
     impl Diagram {
+        fn set_model(&self, model: Option<&DiagramFilterListModel>) {
+            self.view.set_model(model);
+        }
+
+        fn model(&self) -> Option<DiagramFilterListModel> {
+            self.view.model()
+        }
+
         fn selected_item(&self) -> Option<DiagramItem> {
             self.view.selected_item()
         }
@@ -116,18 +129,6 @@ glib::wrapper! {
 }
 
 impl Diagram {
-    pub fn set_model(&self, model: Option<&DiagramModel>) {
-        self.imp().view.set_model(model);
-    }
-
-    pub fn model(&self) -> Option<DiagramModel> {
-        self.imp().view.model()
-    }
-
-    pub fn set_filter(&self, filter: Option<&impl IsA<gtk::Filter>>) {
-        self.imp().view.set_filter(filter);
-    }
-
     fn scroll_to_end(&self) {
         let imp = self.imp();
         imp.is_auto_scrolling.set(true);
diff --git a/src/diagram_filter_list_model.rs b/src/diagram_filter_list_model.rs
new file mode 100644
index 0000000..6dad35f
--- /dev/null
+++ b/src/diagram_filter_list_model.rs
@@ -0,0 +1,84 @@
+use gtk::{
+    gio,
+    glib::{self, clone},
+    prelude::*,
+    subclass::prelude::*,
+};
+
+use crate::diagram_model::DiagramModel;
+
+mod imp {
+    use crate::diagram_item::DiagramItem;
+
+    use super::*;
+
+    #[derive(Default)]
+    pub struct DiagramFilterListModel {
+        pub(super) inner: gtk::FilterListModel,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for DiagramFilterListModel {
+        const NAME: &'static str = "BustleDiagramFilterListModel";
+        type Type = super::DiagramFilterListModel;
+        type Interfaces = (gio::ListModel,);
+    }
+
+    impl ObjectImpl for DiagramFilterListModel {
+        fn constructed(&self) {
+            self.parent_constructed();
+
+            let obj = self.obj();
+
+            self.inner.connect_items_changed(
+                clone!(@weak obj => move |_, position, removed, added| {
+                    obj.items_changed(position, removed, added);
+                }),
+            );
+
+            self.inner.set_filter(Some(&gtk::CustomFilter::new(|item| {
+                let diagram_item = item.downcast_ref::<DiagramItem>().unwrap();
+
+                // Skip messages. TODO: define the exact rules and document why
+                !diagram_item
+                    .message_destination()
+                    .is_some_and(|d| d == "org.freedesktop.DBus")
+                    && !diagram_item
+                        .message_sender()
+                        .is_some_and(|s| s == "org.freedesktop.DBus")
+            })));
+        }
+    }
+
+    impl ListModelImpl for DiagramFilterListModel {
+        fn item_type(&self) -> glib::Type {
+            DiagramItem::static_type()
+        }
+
+        fn n_items(&self) -> u32 {
+            self.inner.n_items()
+        }
+
+        fn item(&self, position: u32) -> Option<glib::Object> {
+            self.inner.item(position)
+        }
+    }
+}
+
+glib::wrapper! {
+    pub struct DiagramFilterListModel(ObjectSubclass<imp::DiagramFilterListModel>)
+        @implements gio::ListModel;
+}
+
+impl DiagramFilterListModel {
+    pub fn set_model(&self, model: Option<&DiagramModel>) {
+        self.imp().inner.set_model(model);
+    }
+
+    pub fn model(&self) -> Option<DiagramModel> {
+        self.imp()
+            .inner
+            .model()
+            .map(|model| model.downcast().unwrap())
+    }
+}
diff --git a/src/diagram_view.rs b/src/diagram_view.rs
index b66a09a..001cfd2 100644
--- a/src/diagram_view.rs
+++ b/src/diagram_view.rs
@@ -4,7 +4,10 @@ use gtk::{
     subclass::prelude::*,
 };
 
-use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, diagram_row::DiagramRow};
+use crate::{
+    diagram_filter_list_model::DiagramFilterListModel, diagram_item::DiagramItem,
+    diagram_row::DiagramRow,
+};
 
 mod imp {
     use std::marker::PhantomData;
@@ -30,8 +33,6 @@ mod imp {
         pub(super) list_view: TemplateChild<gtk::ListView>,
         #[template_child]
         pub(super) selection_model: TemplateChild<gtk::SingleSelection>,
-        #[template_child]
-        pub(super) filter_list_model: TemplateChild<gtk::FilterListModel>,
     }
 
     #[glib::object_subclass]
@@ -67,8 +68,8 @@ mod imp {
                 let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
                 let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
                 row.set_head_item(
-                    obj.imp()
-                        .filter_list_model
+                    obj.model()
+                        .unwrap()
                         .item(0)
                         .map(|obj| obj.downcast::<DiagramItem>().unwrap()),
                 );
@@ -187,19 +188,15 @@ glib::wrapper! {
 }
 
 impl DiagramView {
-    pub fn set_model(&self, model: Option<&DiagramModel>) {
-        self.imp().filter_list_model.set_model(model);
+    pub fn set_model(&self, model: Option<&DiagramFilterListModel>) {
+        self.imp().selection_model.set_model(model);
     }
 
-    pub fn model(&self) -> Option<DiagramModel> {
+    pub fn model(&self) -> Option<DiagramFilterListModel> {
         self.imp()
             .selection_model
             .model()
-            .map(|selection_model| selection_model.downcast().unwrap())
-    }
-
-    pub fn set_filter(&self, filter: Option<&impl IsA<gtk::Filter>>) {
-        self.imp().filter_list_model.set_filter(filter);
+            .map(|model| model.downcast().unwrap())
     }
 
     pub fn unselect(&self) {
diff --git a/src/main.rs b/src/main.rs
index e8e67e0..06db835 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,7 @@ mod application;
 mod config;
 mod details_view;
 mod diagram;
+mod diagram_filter_list_model;
 mod diagram_item;
 mod diagram_model;
 mod diagram_row;
diff --git a/src/statistics/pages/durations.rs b/src/statistics/pages/durations.rs
index cad3b83..161ca6f 100644
--- a/src/statistics/pages/durations.rs
+++ b/src/statistics/pages/durations.rs
@@ -1,7 +1,10 @@
 use adw::subclass::prelude::*;
 use gtk::{gio, glib, prelude::*};
 
-use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, statistics::DurationItem};
+use crate::{
+    diagram_filter_list_model::DiagramFilterListModel, diagram_item::DiagramItem,
+    statistics::DurationItem,
+};
 
 mod imp {
     use std::cell::RefCell;
@@ -13,7 +16,7 @@ mod imp {
     #[template(resource = "/org/freedesktop/Bustle/ui/durations_page.ui")]
     pub struct DurationsPage {
         #[property(get, set = Self::set_model)]
-        pub(super) model: RefCell<Option<DiagramModel>>,
+        pub(super) model: RefCell<Option<DiagramFilterListModel>>,
         #[template_child]
         pub(super) column_view: TemplateChild<gtk::ColumnView>,
         #[template_child]
@@ -81,7 +84,7 @@ mod imp {
     impl BinImpl for DurationsPage {}
 
     impl DurationsPage {
-        fn set_model(&self, model: &DiagramModel) {
+        fn set_model(&self, model: &DiagramFilterListModel) {
             let mut durations_map = std::collections::HashMap::new();
             let durations = gio::ListStore::new::<DurationItem>();
             for item in model.iter::<DiagramItem>() {
diff --git a/src/statistics/pages/frequencies.rs b/src/statistics/pages/frequencies.rs
index 6ff349d..19fa59d 100644
--- a/src/statistics/pages/frequencies.rs
+++ b/src/statistics/pages/frequencies.rs
@@ -1,7 +1,10 @@
 use adw::subclass::prelude::*;
 use gtk::{gio, glib, prelude::*};
 
-use crate::{diagram_item::DiagramItem, diagram_model::DiagramModel, statistics::FrequencyItem};
+use crate::{
+    diagram_filter_list_model::DiagramFilterListModel, diagram_item::DiagramItem,
+    statistics::FrequencyItem,
+};
 
 mod imp {
     use std::cell::RefCell;
@@ -14,7 +17,7 @@ mod imp {
     #[template(resource = "/org/freedesktop/Bustle/ui/frequencies_page.ui")]
     pub struct FrequenciesPage {
         #[property(get, set = Self::set_model)]
-        pub(super) model: RefCell<Option<DiagramModel>>,
+        pub(super) model: RefCell<Option<DiagramFilterListModel>>,
         #[template_child]
         pub(super) column_view: TemplateChild<gtk::ColumnView>,
         #[template_child]
@@ -69,7 +72,7 @@ mod imp {
     impl BinImpl for FrequenciesPage {}
 
     impl FrequenciesPage {
-        fn set_model(&self, model: &DiagramModel) {
+        fn set_model(&self, model: &DiagramFilterListModel) {
             let mut n_items = model.n_items();
 
             let frequencies = gio::ListStore::new::<FrequencyItem>();
diff --git a/src/statistics/pages/sizes.rs b/src/statistics/pages/sizes.rs
index d798213..3a894ee 100644
--- a/src/statistics/pages/sizes.rs
+++ b/src/statistics/pages/sizes.rs
@@ -4,8 +4,8 @@ use adw::subclass::prelude::*;
 use gtk::{gio, glib, prelude::*};
 
 use crate::{
-    diagram_item::DiagramItem, diagram_model::DiagramModel, message_type::MessageType,
-    statistics::SizeItem,
+    diagram_filter_list_model::DiagramFilterListModel, diagram_item::DiagramItem,
+    message_type::MessageType, statistics::SizeItem,
 };
 
 mod imp {
@@ -18,7 +18,7 @@ mod imp {
     #[template(resource = "/org/freedesktop/Bustle/ui/sizes_page.ui")]
     pub struct SizesPage {
         #[property(get, set = Self::set_model)]
-        pub(super) model: RefCell<Option<DiagramModel>>,
+        pub(super) model: RefCell<Option<DiagramFilterListModel>>,
         #[template_child]
         pub(super) column_view: TemplateChild<gtk::ColumnView>,
         #[template_child]
@@ -91,7 +91,7 @@ mod imp {
     impl BinImpl for SizesPage {}
 
     impl SizesPage {
-        fn set_model(&self, model: &DiagramModel) {
+        fn set_model(&self, model: &DiagramFilterListModel) {
             let mut sizes_map: HashMap<(MessageType, String), (usize, Vec<usize>)> =
                 std::collections::HashMap::new();
             let sizes = gio::ListStore::new::<SizeItem>();
diff --git a/src/statistics/window.rs b/src/statistics/window.rs
index c7a8ff5..6c4a4da 100644
--- a/src/statistics/window.rs
+++ b/src/statistics/window.rs
@@ -1,7 +1,7 @@
 use adw::subclass::prelude::*;
 use gtk::{gdk, glib, prelude::*};
 
-use crate::diagram_model::DiagramModel;
+use crate::diagram_filter_list_model::DiagramFilterListModel;
 
 mod imp {
     use std::cell::OnceCell;
@@ -14,7 +14,7 @@ mod imp {
     #[template(resource = "/org/freedesktop/Bustle/ui/statistics.ui")]
     pub struct StatisticsWindow {
         #[property(get, set, construct_only)]
-        pub(super) model: OnceCell<DiagramModel>,
+        pub(super) model: OnceCell<DiagramFilterListModel>,
         #[template_child]
         pub(super) durations_page: TemplateChild<DurationsPage>,
         #[template_child]
@@ -72,7 +72,7 @@ glib::wrapper! {
 }
 
 impl StatisticsWindow {
-    pub fn new(model: &DiagramModel, parent: &impl IsA<gtk::Window>) -> Self {
+    pub fn new(model: &DiagramFilterListModel, parent: &impl IsA<gtk::Window>) -> Self {
         glib::Object::builder()
             .property("model", model)
             .property("transient-for", parent)
diff --git a/src/window.rs b/src/window.rs
index 97478c7..072eca9 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -13,6 +13,7 @@ use crate::{
     config::{APP_ID, PROFILE, VERSION},
     details_view::DetailsView,
     diagram::Diagram,
+    diagram_filter_list_model::DiagramFilterListModel,
     diagram_item::DiagramItem,
     diagram_model::DiagramModel,
     i18n::gettext_f,
@@ -33,6 +34,8 @@ pub enum View {
 mod imp {
     use std::cell::RefCell;
 
+    use crate::diagram_filter_list_model::DiagramFilterListModel;
+
     use super::*;
 
     #[derive(Debug, gtk::CompositeTemplate)]
@@ -63,12 +66,13 @@ mod imp {
         #[template_child]
         pub(super) diagram: TemplateChild<Diagram>,
         #[template_child]
+        pub(super) diagram_filter_list_model: TemplateChild<DiagramFilterListModel>,
+        #[template_child]
         pub(super) details_view: TemplateChild<DetailsView>,
 
         pub(super) settings: gio::Settings,
 
         pub(super) monitor: RefCell<Option<Monitor>>,
-        pub(super) handler_id: RefCell<Option<glib::SignalHandlerId>>,
         // The currently recorded filename
         pub(super) filename: RefCell<Option<String>>,
     }
@@ -88,9 +92,9 @@ mod imp {
                 waiting_sub_page: TemplateChild::default(),
                 split_view_sub_page: TemplateChild::default(),
                 diagram: TemplateChild::default(),
+                diagram_filter_list_model: TemplateChild::default(),
                 details_view: TemplateChild::default(),
                 settings: gio::Settings::new(APP_ID),
-                handler_id: RefCell::default(),
                 monitor: RefCell::default(),
                 filename: RefCell::default(),
             }
@@ -194,18 +198,12 @@ mod imp {
             }
 
             self.empty_status_page.set_icon_name(Some(APP_ID));
-            self.diagram
-                .set_filter(Some(&gtk::CustomFilter::new(|item| {
-                    let diagram_item = item.downcast_ref::<DiagramItem>().unwrap();
-
-                    // Skip messages. TODO: define the exact rules and document why
-                    !diagram_item
-                        .message_destination()
-                        .is_some_and(|d| d == "org.freedesktop.DBus")
-                        && !diagram_item
-                            .message_sender()
-                            .is_some_and(|s| s == "org.freedesktop.DBus")
-                })));
+
+            self.diagram_filter_list_model.connect_items_changed(
+                clone!(@weak obj => move |model, position, removed, added| {
+                    obj.on_filter_list_model_items_changed(model, position, removed, added);
+                }),
+            );
 
             // Load latest window state
             obj.load_window_size();
@@ -259,7 +257,7 @@ impl Window {
         };
 
         let imp = self.imp();
-        imp.diagram.set_model(Some(&model));
+        imp.diagram_filter_list_model.set_model(Some(&model));
         let filename = file.basename().unwrap_or_default().display().to_string();
 
         imp.diagram_title.set_title(&filename);
@@ -394,13 +392,11 @@ impl Window {
     }
 
     fn show_statistics(&self) {
-        let model = self
-            .imp()
-            .diagram
-            .model()
-            .expect("A model is required for statistics");
-        let statistics = StatisticsWindow::new(&model, self);
-        statistics.present();
+        let imp = self.imp();
+
+        debug_assert!(imp.diagram_filter_list_model.model().is_some());
+
+        StatisticsWindow::new(&imp.diagram_filter_list_model, self).present();
     }
 
     fn show_filter_services(&self) {
@@ -416,16 +412,6 @@ impl Window {
             .expect("monitor must be set when recording");
         drop(monitor);
 
-        let model = imp
-            .diagram
-            .model()
-            .expect("diagram must have a model when recording");
-        model.disconnect(
-            imp.handler_id
-                .take()
-                .expect("handler_id must be set when recording"),
-        );
-
         let filename = glib::DateTime::now_local()
             .unwrap()
             .format("%Y-%m-%d %H:%M:%S")
@@ -433,7 +419,7 @@ impl Window {
         imp.diagram_title.set_title(&format!("*{filename}.pcap"));
         imp.filename.replace(Some(filename.to_string()));
 
-        if model.n_items() != 0 {
+        if imp.diagram_filter_list_model.n_items() != 0 {
             self.set_view(View::Diagram);
             imp.diagram_page_stack
                 .set_visible_child(&*imp.split_view_sub_page);
@@ -456,34 +442,7 @@ impl Window {
             .context("Failed to start monitor")?;
         imp.monitor.replace(Some(monitor));
 
-        let handler_id = model.connect_items_changed(
-            clone!(@weak self as obj => move |model, _, removed, added| {
-                if removed == 0 && added == 0 {
-                    return;
-                }
-
-                let imp = obj.imp();
-                let n_messages = model.n_items();
-
-                imp.diagram_title.set_subtitle(&gettext_f(
-                    // Translators: Do NOT translate the contents between '{' and '}', this is a variable name.
-                    "Logged {n_messages} messages",
-                    &[("n_messages", &n_messages.to_string())],
-                ));
-
-                if n_messages != 0 {
-                    imp.diagram_page_stack
-                        .set_visible_child(&*imp.split_view_sub_page);
-                }
-            }),
-        );
-        let prev_handler_id = imp.handler_id.replace(Some(handler_id));
-        debug_assert!(
-            prev_handler_id.is_none(),
-            "handler id must be removed on stop"
-        );
-
-        imp.diagram.set_model(Some(&model));
+        imp.diagram_filter_list_model.set_model(Some(&model));
         imp.diagram_title.set_title(display_message);
         imp.diagram_title.set_subtitle("");
 
@@ -537,7 +496,7 @@ impl Window {
         let file = chooser.save_future(Some(self)).await?;
         let path = file.path().unwrap();
         let model = imp
-            .diagram
+            .diagram_filter_list_model
             .model()
             .expect("A model must exists before saving");
         model.save_to_file(path).await?;
@@ -570,7 +529,7 @@ impl Window {
 
         let file = chooser.save_future(Some(self)).await?;
         let model = imp
-            .diagram
+            .diagram_filter_list_model
             .model()
             .expect("A model must exists before saving");
         model.save_as_dot(&file).await?;
@@ -578,6 +537,36 @@ impl Window {
         Ok(())
     }
 
+    fn on_filter_list_model_items_changed(
+        &self,
+        model: &DiagramFilterListModel,
+        _position: u32,
+        removed: u32,
+        added: u32,
+    ) {
+        if removed == 0 && added == 0 {
+            return;
+        }
+
+        let imp = self.imp();
+        let is_recording = imp.monitor.borrow().is_some();
+
+        if is_recording {
+            let n_messages = model.n_items();
+
+            imp.diagram_title.set_subtitle(&gettext_f(
+                // Translators: Do NOT translate the contents between '{' and '}', this is a variable name.
+                "Logged {n_messages} messages",
+                &[("n_messages", &n_messages.to_string())],
+            ));
+
+            if n_messages != 0 {
+                imp.diagram_page_stack
+                    .set_visible_child(&*imp.split_view_sub_page);
+            }
+        }
+    }
+
     fn update_details_view(&self) {
         let imp = self.imp();
 
-- 
GitLab


From d3d29c4c7becb42c33e789287ce467cf0e02ae32 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 17:28:59 +0800
Subject: [PATCH 5/9] perf: reverse call_of_return iteration

This speeds up about 32x in a 2.2 MB file since it considers
the common case where the method return is close to the call
---
 src/diagram_item.rs  | 10 +++++++++
 src/diagram_model.rs | 50 ++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/diagram_item.rs b/src/diagram_item.rs
index 48d46d3..950d2ce 100644
--- a/src/diagram_item.rs
+++ b/src/diagram_item.rs
@@ -211,6 +211,16 @@ impl DiagramItem {
             .and_then(|d| d.as_deref())
             .cloned()
     }
+
+    /// Whether this contains the return/error message of the given item's message.
+    pub fn is_return_of(&self, other: &Self) -> bool {
+        debug_assert!(self.message_type().is_method_return());
+
+        other.message_type().is_method_call()
+            && self.message().reply_serial()
+                == other.message().primary_header().serial_num().copied()
+            && self.message_destination() == other.message_sender()
+    }
 }
 
 impl std::fmt::Display for DiagramItem {
diff --git a/src/diagram_model.rs b/src/diagram_model.rs
index e525ffc..91edbc0 100644
--- a/src/diagram_model.rs
+++ b/src/diagram_model.rs
@@ -158,31 +158,12 @@ impl DiagramModel {
         Ok(this)
     }
 
-    pub fn push(&self, diagram_item: DiagramItem) {
-        if self.push_inner(diagram_item) {
+    pub fn push(&self, item: DiagramItem) {
+        if self.push_inner(item) {
             self.items_changed(self.n_items() - 1, 0, 1);
         }
     }
 
-    /// Search the items for the associated [`MessageType::MethodCall`] of
-    /// a [`MessageType::MethodReturn`] or [`MessageType::Error`]
-    fn call_of_return(&self, return_item: &DiagramItem) -> Option<DiagramItem> {
-        debug_assert!(return_item.message_type().is_method_return());
-
-        for item in self.imp().list.borrow().iter() {
-            if !item.message_type().is_method_call() {
-                continue;
-            }
-            if return_item.message().reply_serial()
-                == item.message().primary_header().serial_num().copied()
-                && return_item.message_destination() == item.message_sender()
-            {
-                return Some(item.clone());
-            }
-        }
-        None
-    }
-
     /// Get the first item in the model.
     pub fn head(&self) -> Option<DiagramItem> {
         let imp = self.imp();
@@ -197,18 +178,27 @@ impl DiagramModel {
         Some(first)
     }
 
-    fn push_inner(&self, diagram_item: DiagramItem) -> bool {
-        // Before we add the item to the list, we look for it other half
-        // if we have a [`MessageType::MethodCall`] we would search for it
-        // [`MessageType::MethodReturn`] or [`MessageType::Error`]
-        if diagram_item.message_type().is_method_return() {
-            if let Some(associated_item) = self.call_of_return(&diagram_item) {
-                diagram_item.set_associated_item(&associated_item);
-                associated_item.set_associated_item(&diagram_item);
+    fn push_inner(&self, item: DiagramItem) -> bool {
+        let imp = self.imp();
+
+        // Before we add the item to the list, we look for the method call half
+        // of the method return/error message
+        if item.message_type().is_method_return() {
+            // Reverse the list so we first look at the most recent call. This speeds up the search
+            // substantially in the common case where the return is close to the call.
+            if let Some(associated_item) = imp
+                .list
+                .borrow()
+                .iter()
+                .rev()
+                .find(|other_item| item.is_return_of(other_item))
+            {
+                item.set_associated_item(associated_item);
+                associated_item.set_associated_item(&item);
             }
         }
 
-        self.imp().list.borrow_mut().push(diagram_item);
+        imp.list.borrow_mut().push(item);
         true
     }
 }
-- 
GitLab


From f011e7d7c0630021532db32c177fa185e9fc25e6 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 13 Aug 2023 17:43:13 +0800
Subject: [PATCH 6/9] misc: drop unused DiagramModel.head method

---
 src/diagram_model.rs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/diagram_model.rs b/src/diagram_model.rs
index 91edbc0..ceaf9fa 100644
--- a/src/diagram_model.rs
+++ b/src/diagram_model.rs
@@ -164,20 +164,6 @@ impl DiagramModel {
         }
     }
 
-    /// Get the first item in the model.
-    pub fn head(&self) -> Option<DiagramItem> {
-        let imp = self.imp();
-
-        let first = imp.list.borrow().first().cloned()?;
-
-        debug_assert_eq!(
-            imp.list.borrow().iter().map(|item| item.timestamp()).min(),
-            Some(first.timestamp())
-        );
-
-        Some(first)
-    }
-
     fn push_inner(&self, item: DiagramItem) -> bool {
         let imp = self.imp();
 
-- 
GitLab


From 34751d4c8e4730e5d4c6cc59ec02c2938193732c Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Mon, 14 Aug 2023 20:05:40 +0800
Subject: [PATCH 7/9] style: consistently use 'Translators:'

This replaces usage of 'TRANSLATORS' project wide
---
 data/resources/ui/window.ui | 2 +-
 src/window.rs               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 88a6ca5..535cd3c 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -116,7 +116,7 @@
                 <property name="content">
                   <object class="AdwStatusPage" id="empty_status_page">
                     <property name="title" translatable="yes">Welcome to Bustle</property>
-                    <property name="description" translatable="yes" comments="TRANSLATORS Do not localize D-Bus. It is a proper name">Start recording D-Bus activity, you can also run the command</property>
+                    <property name="description" translatable="yes" comments="Translators: Do not localize D-Bus. It is a proper name">Start recording D-Bus activity, you can also run the command</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="AdwClamp">
diff --git a/src/window.rs b/src/window.rs
index 072eca9..bf96a9b 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -456,7 +456,7 @@ impl Window {
 
     async fn open_log(&self) -> anyhow::Result<()> {
         let filter = gtk::FileFilter::new();
-        // TRANSLATORS PCAP is a type of file, do not translate.
+        // Translators: PCAP is a type of file, do not translate.
         filter.set_property("name", gettext("PCAP Files"));
         filter.add_mime_type("application/vnd.tcpdump.pcap");
 
@@ -477,7 +477,7 @@ impl Window {
     async fn save(&self) -> anyhow::Result<()> {
         let imp = self.imp();
         let filter = gtk::FileFilter::new();
-        // TRANSLATORS PCAP is a type of file, do not translate.
+        // Translators: PCAP is a type of file, do not translate.
         filter.set_property("name", gettext("PCAP Files"));
         filter.add_mime_type("application/vnd.tcpdump.pcap");
 
@@ -511,7 +511,7 @@ impl Window {
     async fn save_as_dot(&self) -> Result<()> {
         let imp = self.imp();
         let filter = gtk::FileFilter::new();
-        // TRANSLATORS Dot is a type of file, do not translate.
+        // Translators: Dot is a type of file, do not translate.
         filter.set_property("name", gettext("DOT Graph"));
         filter.add_mime_type("text/vnd.graphviz");
 
-- 
GitLab


From 1566c1b419cccb1a2cba524d4509f2c89963c2c9 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Mon, 14 Aug 2023 21:09:26 +0800
Subject: [PATCH 8/9] refactor: use template_callbacks where applicable

---
 data/resources/ui/diagram.ui      |  4 +-
 data/resources/ui/diagram_view.ui |  8 +++
 data/resources/ui/window.ui       |  4 +-
 src/diagram.rs                    | 12 +++--
 src/diagram_view.rs               | 81 ++++++++++++++++---------------
 src/window.rs                     | 58 +++++++++-------------
 6 files changed, 85 insertions(+), 82 deletions(-)

diff --git a/data/resources/ui/diagram.ui b/data/resources/ui/diagram.ui
index 978d09e..7200068 100644
--- a/data/resources/ui/diagram.ui
+++ b/data/resources/ui/diagram.ui
@@ -7,7 +7,9 @@
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="child">
-          <object class="BustleDiagramView" id="view"/>
+          <object class="BustleDiagramView" id="view">
+            <signal name="notify::selected-item" handler="view_selected_item_notify" swapped="yes"/>
+          </object>
         </property>
       </object>
     </child>
diff --git a/data/resources/ui/diagram_view.ui b/data/resources/ui/diagram_view.ui
index fbaf268..21d2f6a 100644
--- a/data/resources/ui/diagram_view.ui
+++ b/data/resources/ui/diagram_view.ui
@@ -3,10 +3,18 @@
   <template class="BustleDiagramView">
     <child>
       <object class="GtkListView" id="list_view">
+        <property name="factory">
+          <object class="GtkSignalListItemFactory">
+            <signal name="setup" handler="factory_setup" swapped="yes"/>
+            <signal name="bind" handler="factory_bind" swapped="yes"/>
+            <signal name="unbind" handler="factory_unbind" swapped="yes"/>
+          </object>
+        </property>
         <property name="model">
           <object class="GtkSingleSelection" id="selection_model">
             <property name="can-unselect">True</property>
             <property name="autoselect">False</property>
+            <signal name="notify::selected-item" handler="selection_model_selected_item_notify" swapped="yes"/>
           </object>
         </property>
         <style>
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 535cd3c..7695ab9 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -265,7 +265,9 @@
                         <property name="content">
                           <object class="BustleDiagram" id="diagram">
                             <property name="model">
-                              <object class="BustleDiagramFilterListModel" id="diagram_filter_list_model"/>
+                              <object class="BustleDiagramFilterListModel" id="diagram_filter_list_model">
+                                <signal name="items-changed" handler="diagram_filter_list_model_items_changed" swapped="yes"/>
+                              </object>
                             </property>
                             <signal name="notify::selected-item" handler="diagram_selected_item_notify" swapped="yes"/>
                           </object>
diff --git a/src/diagram.rs b/src/diagram.rs
index a5350d4..6c644e3 100644
--- a/src/diagram.rs
+++ b/src/diagram.rs
@@ -41,6 +41,7 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             klass.bind_template();
+            klass.bind_template_instance_callbacks();
 
             klass.add_binding(
                 gdk::Key::Escape,
@@ -65,11 +66,6 @@ mod imp {
 
             let obj = self.obj();
 
-            self.view
-                .connect_selected_item_notify(clone!(@weak obj => move |_| {
-                    obj.notify_selected_item();
-                }));
-
             self.is_sticky.set(true);
 
             let vadj = self.view.vadjustment().unwrap();
@@ -128,6 +124,7 @@ glib::wrapper! {
         @extends gtk::Widget;
 }
 
+#[gtk::template_callbacks]
 impl Diagram {
     fn scroll_to_end(&self) {
         let imp = self.imp();
@@ -135,4 +132,9 @@ impl Diagram {
         imp.scrolled_window
             .emit_scroll_child(gtk::ScrollType::End, false);
     }
+
+    #[template_callback]
+    fn view_selected_item_notify(&self) {
+        self.notify_selected_item();
+    }
 }
diff --git a/src/diagram_view.rs b/src/diagram_view.rs
index 001cfd2..1506adc 100644
--- a/src/diagram_view.rs
+++ b/src/diagram_view.rs
@@ -44,6 +44,7 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             klass.bind_template();
+            klass.bind_template_instance_callbacks();
         }
 
         fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
@@ -53,46 +54,6 @@ mod imp {
 
     #[glib::derived_properties]
     impl ObjectImpl for DiagramView {
-        fn constructed(&self) {
-            self.parent_constructed();
-
-            let obj = self.obj();
-
-            let factory = gtk::SignalListItemFactory::new();
-            factory.connect_setup(clone!(@weak obj => move  |_, list_item| {
-                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
-                let row = DiagramRow::default();
-                list_item.set_child(Some(&row));
-            }));
-            factory.connect_bind(clone!(@weak obj => move |_, list_item| {
-                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
-                let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
-                row.set_head_item(
-                    obj.model()
-                        .unwrap()
-                        .item(0)
-                        .map(|obj| obj.downcast::<DiagramItem>().unwrap()),
-                );
-                row.set_item(
-                    list_item
-                        .item()
-                        .map(|item| item.downcast_ref::<DiagramItem>().unwrap().clone()),
-                );
-            }));
-            factory.connect_unbind(|_, list_item| {
-                let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
-                let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
-                row.set_item(None::<DiagramItem>);
-                row.set_head_item(None::<DiagramItem>);
-            });
-            self.list_view.set_factory(Some(&factory));
-
-            self.selection_model
-                .connect_selected_item_notify(clone!(@weak obj => move |_| {
-                    obj.notify_selected_item();
-                }));
-        }
-
         fn dispose(&self) {
             self.dispose_template();
         }
@@ -205,3 +166,43 @@ impl DiagramView {
             .set_selected(gtk::INVALID_LIST_POSITION);
     }
 }
+
+#[gtk::template_callbacks]
+impl DiagramView {
+    #[template_callback]
+    fn factory_setup(&self, list_item: &glib::Object) {
+        let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+        let row = DiagramRow::default();
+        list_item.set_child(Some(&row));
+    }
+
+    #[template_callback]
+    fn factory_bind(&self, list_item: &glib::Object) {
+        let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+        let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
+        row.set_head_item(
+            self.model()
+                .unwrap()
+                .item(0)
+                .map(|model| model.downcast::<DiagramItem>().unwrap()),
+        );
+        row.set_item(
+            list_item
+                .item()
+                .map(|item| item.downcast_ref::<DiagramItem>().unwrap().clone()),
+        );
+    }
+
+    #[template_callback]
+    fn factory_unbind(&self, list_item: &glib::Object) {
+        let list_item = list_item.downcast_ref::<gtk::ListItem>().unwrap();
+        let row = list_item.child().unwrap().downcast::<DiagramRow>().unwrap();
+        row.set_item(None::<DiagramItem>);
+        row.set_head_item(None::<DiagramItem>);
+    }
+
+    #[template_callback]
+    fn selection_model_selected_item_notify(&self) {
+        self.notify_selected_item();
+    }
+}
diff --git a/src/window.rs b/src/window.rs
index bf96a9b..1137730 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -13,7 +13,6 @@ use crate::{
     config::{APP_ID, PROFILE, VERSION},
     details_view::DetailsView,
     diagram::Diagram,
-    diagram_filter_list_model::DiagramFilterListModel,
     diagram_item::DiagramItem,
     diagram_model::DiagramModel,
     i18n::gettext_f,
@@ -199,12 +198,6 @@ mod imp {
 
             self.empty_status_page.set_icon_name(Some(APP_ID));
 
-            self.diagram_filter_list_model.connect_items_changed(
-                clone!(@weak obj => move |model, position, removed, added| {
-                    obj.on_filter_list_model_items_changed(model, position, removed, added);
-                }),
-            );
-
             // Load latest window state
             obj.load_window_size();
 
@@ -537,13 +530,28 @@ impl Window {
         Ok(())
     }
 
-    fn on_filter_list_model_items_changed(
-        &self,
-        model: &DiagramFilterListModel,
-        _position: u32,
-        removed: u32,
-        added: u32,
-    ) {
+    fn update_details_view(&self) {
+        let imp = self.imp();
+
+        if let Some(item) = imp.diagram.selected_item() {
+            imp.details_view.set_item(Some(item));
+            imp.split_view_sub_page.set_show_sidebar(true);
+        } else {
+            imp.details_view.set_item(None::<DiagramItem>);
+            imp.split_view_sub_page.set_show_sidebar(false);
+        }
+    }
+}
+
+#[gtk::template_callbacks]
+impl Window {
+    #[template_callback]
+    fn diagram_selected_item_notify(&self) {
+        self.update_details_view();
+    }
+
+    #[template_callback]
+    fn diagram_filter_list_model_items_changed(&self, _position: u32, removed: u32, added: u32) {
         if removed == 0 && added == 0 {
             return;
         }
@@ -552,7 +560,7 @@ impl Window {
         let is_recording = imp.monitor.borrow().is_some();
 
         if is_recording {
-            let n_messages = model.n_items();
+            let n_messages = imp.diagram_filter_list_model.n_items();
 
             imp.diagram_title.set_subtitle(&gettext_f(
                 // Translators: Do NOT translate the contents between '{' and '}', this is a variable name.
@@ -567,26 +575,6 @@ impl Window {
         }
     }
 
-    fn update_details_view(&self) {
-        let imp = self.imp();
-
-        if let Some(item) = imp.diagram.selected_item() {
-            imp.details_view.set_item(Some(item));
-            imp.split_view_sub_page.set_show_sidebar(true);
-        } else {
-            imp.details_view.set_item(None::<DiagramItem>);
-            imp.split_view_sub_page.set_show_sidebar(false);
-        }
-    }
-}
-
-#[gtk::template_callbacks]
-impl Window {
-    #[template_callback]
-    fn diagram_selected_item_notify(&self) {
-        self.update_details_view();
-    }
-
     #[template_callback]
     fn copy_command_clicked(&self) {
         const CMD: &str = "dbus-monitor --pcap";
-- 
GitLab


From ff27ab8879c66fb604dc2aaa52140ba5b88f2c6b Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Mon, 14 Aug 2023 22:05:30 +0800
Subject: [PATCH 9/9] style: use consistent swapped value

---
 data/resources/ui/address_dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/resources/ui/address_dialog.ui b/data/resources/ui/address_dialog.ui
index 3d144ff..504dbd2 100644
--- a/data/resources/ui/address_dialog.ui
+++ b/data/resources/ui/address_dialog.ui
@@ -16,7 +16,7 @@
         <child>
           <object class="AdwEntryRow" id="entry_row">
             <property name="title" translatable="yes">Server Address</property>
-            <signal name="changed" handler="update_record_response_enabled" swapped="true" />
+            <signal name="changed" handler="update_record_response_enabled" swapped="yes"/>
           </object>
         </child>
       </object>
-- 
GitLab