Add TypedListStore

Author: ranfdev

src/container.rs

@@ -2,14 +2,14 @@ use crate::{
     distrobox::{ContainerInfo, ExportableApp, Status},
     distrobox_task::DistroboxTask,
     fakers::CommandRunner,
+    gtk_utils::TypedListStore,
     known_distros::{known_distro_by_image, KnownDistro},
     query::Query,
     root_store::RootStore,
     fakers::Command
 };
 
 use gtk::{
-    gio,
     glib::{derived_properties, BoxedAnyObject, Properties},
 };
 
@@ -38,8 +38,8 @@ mod imp {
         pub image: RefCell<String>,
         #[property(get, set)]
         pub distro: RefCell<Option<KnownDistro>>,
-        pub apps: Query<gio::ListStore, anyhow::Error>,
-        pub binaries: Query<gio::ListStore, anyhow::Error>,
+        pub apps: Query<TypedListStore<glib::BoxedAnyObject>, anyhow::Error>,
+        pub binaries: Query<TypedListStore<glib::BoxedAnyObject>, anyhow::Error>,
     }
 
     impl Default for Container {
@@ -52,10 +52,10 @@ mod imp {
                 image: RefCell::new(String::new()),
                 distro: RefCell::new(None),
                 apps: Query::new("apps".into(), || async {
-                    Ok(gio::ListStore::new::<BoxedAnyObject>())
+                    Ok(TypedListStore::new())
                 }),
                 binaries: Query::new("binaries".into(), || async {
-                    Ok(gio::ListStore::new::<BoxedAnyObject>())
+                    Ok(TypedListStore::new())
                 }),
             }
         }
@@ -106,8 +106,7 @@ impl Container {
                     .list_apps(&this.name())
                     .await?;
 
-                let mut apps_list = gio::ListStore::new::<BoxedAnyObject>();
-                apps_list.extend(apps.into_iter().map(BoxedAnyObject::new));
+                let apps_list: TypedListStore<BoxedAnyObject> = TypedListStore::from_iter(apps.into_iter().map(BoxedAnyObject::new));
 
                 // Listing the apps starts the container, we need to update its status
                 this.root_store().load_containers();
@@ -125,8 +124,7 @@ impl Container {
                     .get_exported_binaries(&this.name())
                     .await?;
 
-                let mut binaries_list = gio::ListStore::new::<BoxedAnyObject>();
-                binaries_list.extend(binaries.into_iter().map(BoxedAnyObject::new));
+                let binaries_list: TypedListStore<BoxedAnyObject> = TypedListStore::from_iter(binaries.into_iter().map(BoxedAnyObject::new));
 
                 // Listing the binaries starts the container, we need to update its status
                 this.root_store().load_containers();
@@ -137,11 +135,11 @@ impl Container {
         this
     }
 
-    pub fn apps(&self) -> Query<gio::ListStore, anyhow::Error> {
+    pub fn apps(&self) -> Query<TypedListStore<BoxedAnyObject>, anyhow::Error> {
         self.imp().apps.clone()
     }
 
-    pub fn binaries(&self) -> Query<gio::ListStore, anyhow::Error> {
+    pub fn binaries(&self) -> Query<TypedListStore<BoxedAnyObject>, anyhow::Error> {
         self.imp().binaries.clone()
     }
 

src/dialogs/exportable_apps_dialog.rs

@@ -5,7 +5,7 @@ use gtk::{gio, glib, pango};
 
 use crate::container::Container;
 use crate::distrobox::{ExportableApp, ExportableBinary};
-use crate::gtk_utils::reaction;
+use crate::gtk_utils::{reaction, TypedListStore};
 use crate::fakers::Command;
 
 use std::cell::RefCell;
@@ -227,8 +227,8 @@ impl ExportableAppsDialog {
         });
 
         let this_clone = this.clone();
-        let render_apps = move |apps_data: &gio::ListStore| {
-            let n_apps = apps_data.n_items();
+        let render_apps = move |apps_data: &TypedListStore<BoxedAnyObject>| {
+            let n_apps = apps_data.len();
 
             // Update description based on whether there are apps
             if n_apps == 0 {
@@ -242,7 +242,7 @@ impl ExportableAppsDialog {
             this_clone
                 .imp()
                 .list_box
-                .bind_model(Some(apps_data), move |obj| {
+                .bind_model(Some(apps_data.inner()), move |obj| {
                     let app = obj
                         .downcast_ref::<BoxedAnyObject>()
                         .map(|obj| obj.borrow::<ExportableApp>())
@@ -252,8 +252,8 @@ impl ExportableAppsDialog {
         };
 
         let this_clone = this.clone();
-        let render_binaries = move |binaries_data: &gio::ListStore| {
-            let n_binaries = binaries_data.n_items();
+        let render_binaries = move |binaries_data: &TypedListStore<BoxedAnyObject>| {
+            let n_binaries = binaries_data.len();
 
             // Update description based on whether there are binaries
             if n_binaries == 0 {
@@ -267,7 +267,7 @@ impl ExportableAppsDialog {
             this_clone
                 .imp()
                 .binaries_list_box
-                .bind_model(Some(binaries_data), move |obj| {
+                .bind_model(Some(binaries_data.inner()), move |obj| {
                     let binary = obj
                         .downcast_ref::<BoxedAnyObject>()
                         .map(|obj| obj.borrow::<ExportableBinary>())

src/dialogs/task_manager_dialog.rs

@@ -68,7 +68,7 @@ mod imp {
             let this = self.obj().clone();
             let root_store = self.obj().root_store();
             self.list_box
-                .bind_model(Some(&root_store.tasks()), move |obj| {
+                .bind_model(Some(root_store.tasks().inner()), move |obj| {
                     let task = obj.downcast_ref::<DistroboxTask>().unwrap();
                     this.build_row(task).upcast()
                 });
@@ -102,13 +102,13 @@ mod imp {
                 "Manage Tasks",
             ));
             let this = self.obj().clone();
-            if root_store.tasks().n_items() == 0 {
+            if root_store.tasks().len() == 0 {
                 this.imp().stack.set_visible_child_name("empty");
             } else {
                 this.imp().stack.set_visible_child_name("list");
             }
             root_store
-                .tasks()
+                .tasks().inner()
                 .connect_items_changed(move |tasks, _, _, _| {
                     dbg!(tasks.n_items());
                     if tasks.n_items() == 0 {

src/gtk_utils.rs src/gtk_utils/mod.rssrc/gtk_utils.rs renamed to src/gtk_utils/mod.rs

@@ -2,7 +2,9 @@ use std::collections::HashMap;
 use std::hash::Hash;
 
 use gtk::prelude::*;
-use gtk::{gio, glib};
+use gtk::glib;
+mod typed_list_store;
+pub use typed_list_store::TypedListStore;
 
 pub fn reconcile_properties<T: IsA<glib::Object>>(dest: &T, src: &T, properties: &[&str]) {
     for prop in dest.list_properties() {
@@ -19,15 +21,14 @@ pub fn reconcile_properties<T: IsA<glib::Object>>(dest: &T, src: &T, properties:
     }
 }
 pub fn reconcile_list_by_key<T: IsA<glib::Object>, K: Hash + std::cmp::Eq>(
-    list: gio::ListStore,
+    list: &TypedListStore<T>,
     other: &[T],
     key_fn: impl Fn(&T) -> K,
     properties: &[&str],
 ) {
     let mut other_map: HashMap<K, (&T, bool)> =
         other.iter().map(|v| (key_fn(v), (v, false))).collect();
     list.retain(|item| {
-        let item = item.downcast_ref().unwrap();
         let key = key_fn(item);
         if let Some(other) = other_map.get_mut(&key) {
             reconcile_properties(item, other.0, properties);