Add downloaded icon on image picker

ranfdev · ranfdev · commit ee6d66e6f920 · 2025-11-19T12:21:15.000+01:00
diff --git a/src/dialogs/create_distrobox_dialog.rs b/src/dialogs/create_distrobox_dialog.rs
@@ -9,6 +9,7 @@ use crate::distrobox::{self, CreateArgName, CreateArgs, Error};
 use crate::root_store::RootStore;
 use crate::sidebar_row::SidebarRow;
 
+use std::collections::HashSet;
 use std::path::PathBuf;
 use std::{cell::RefCell, rc::Rc};
 
@@ -54,6 +55,7 @@ mod imp {
         pub cloning_content: gtk::Box,
         pub view_switcher: adw::InlineViewSwitcher,
         pub clone_warning_banner: adw::Banner,
+        pub downloaded_tags: RefCell<HashSet<String>>,
     }
 
     impl CreateDistroboxDialog {
@@ -403,6 +405,16 @@ impl CreateDistroboxDialog {
             }
         ));
 
+        let this_clone = this.clone();
+        this
+            .root_store()
+            .downloaded_images_query()
+            .connect_success(move |images| {
+                *this_clone.imp().downloaded_tags.borrow_mut() = images.clone();
+            });
+
+        this.root_store().downloaded_images_query().refetch();
+
         this
     }
 
@@ -511,7 +523,8 @@ impl CreateDistroboxDialog {
             let row = image_row_item::ImageRowItem::new();
             item.set_child(Some(&row));
         });
-        factory.connect_bind(|_, item| {
+        let obj = self.clone();
+        factory.connect_bind(move |_, item| {
             let item = item.downcast_ref::<gtk::ListItem>().unwrap();
             let image = item
                 .item()
@@ -521,6 +534,9 @@ impl CreateDistroboxDialog {
             let child = item.child();
             let child: &image_row_item::ImageRowItem = child.and_downcast_ref().unwrap();
             child.set_image(&image);
+
+            let is_downloaded = obj.imp().downloaded_tags.borrow().contains(image.as_str());
+            child.set_is_downloaded(is_downloaded);
         });
 
         let list_view = gtk::ListView::new(Some(selection_model), Some(factory));
diff --git a/src/image_row_item.rs b/src/image_row_item.rs
@@ -21,6 +21,9 @@ mod imp {
         pub distro: RefCell<Option<KnownDistro>>,
         pub icon: gtk::Image,
         pub label: gtk::Label,
+        #[property(get, set = Self::set_is_downloaded)]
+        pub is_downloaded: std::cell::Cell<bool>,
+        pub downloaded_icon: gtk::Image,
     }
 
     #[glib::derived_properties]
@@ -31,12 +34,25 @@ mod imp {
             self.label.set_xalign(0.0);
             self.label.set_ellipsize(pango::EllipsizeMode::Middle);
             self.label.set_has_tooltip(true);
+            self.label.set_hexpand(true);
+
+            self.downloaded_icon.set_icon_name(Some("drive-harddisk-symbolic"));
+            self.downloaded_icon.set_visible(false);
+            self.downloaded_icon.set_tooltip_text(Some("Image already downloaded"));
 
             let obj = self.obj();
             obj.add_css_class("distro-row-item");
             obj.set_spacing(6);
             obj.append(&self.icon);
             obj.append(&self.label);
+            obj.append(&self.downloaded_icon);
+        }
+    }
+
+    impl ImageRowItem {
+        fn set_is_downloaded(&self, is_downloaded: bool) {
+            self.is_downloaded.set(is_downloaded);
+            self.downloaded_icon.set_visible(is_downloaded);
         }
     }
 
diff --git a/src/store/root_store.rs b/src/store/root_store.rs
@@ -9,8 +9,12 @@ use gtk::prelude::*;
 use gtk::{gio, glib};
 use std::cell::OnceCell;
 use std::cell::RefCell;
+use std::collections::HashSet;
+use std::collections::HashMap;
 use std::path::Path;
 use std::time::Duration;
+use std::pin::Pin;
+use std::task::{Context as TaskContext, Poll};
 use tracing::error;
 use tracing::info;
 use tracing::{debug, warn};
@@ -29,9 +33,6 @@ use crate::supported_terminals::{Terminal, TerminalRepository};
 use crate::tagged_object::TaggedObject;
 
 use serde::Deserialize;
-use std::collections::HashMap;
-use std::pin::Pin;
-use std::task::{Context as TaskContext, Poll};
 
 /// Podman event structure
 #[derive(Debug, Clone, Deserialize)]
@@ -116,6 +117,15 @@ pub fn listen_podman_events(
     })
 }
 
+#[derive(Debug, Clone, Deserialize, Hash, Eq, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct Image {
+    #[serde(rename = "Id")]
+    pub id: String,
+    #[serde(rename = "Names")]
+    pub names: Option<Vec<String>>,
+}
+
 mod imp {
     use crate::query::Query;
 
@@ -131,6 +141,7 @@ mod imp {
 
         pub distrobox_version: Query<String>,
         pub images_query: Query<Vec<String>>,
+        pub downloaded_images_query: Query<HashSet<String>>,
         pub containers_query: Query<Vec<Container>>,
 
         pub containers: TypedListStore<Container>,
@@ -166,6 +177,7 @@ mod imp {
                     Ok(String::new())
                 }),
                 images_query: Query::new("images".into(), || async { Ok(vec![]) }),
+                downloaded_images_query: Query::new("downloaded_images".into(), || async { Ok(HashSet::new()) }),
                 containers_query: Query::new("containers".into(), || async { Ok(vec![]) }),
                 tasks: TypedListStore::new(),
                 selected_task: Default::default(),
@@ -238,6 +250,15 @@ impl RootStore {
             }
         });
 
+        let this_clone = this.clone();
+        this.imp().downloaded_images_query.set_fetcher(move || {
+            let this_clone = this_clone.clone();
+            async move {
+                dbg!("Fetching downloaded images");
+                this_clone.fetch_downloaded_images().await
+            }
+        });
+
         let this_clone = this.clone();
         this.imp().containers_query.set_fetcher(move || {
             let this_clone = this_clone.clone();
@@ -291,6 +312,10 @@ impl RootStore {
         self.imp().images_query.clone()
     }
 
+    pub fn downloaded_images_query(&self) -> Query<HashSet<String>> {
+        self.imp().downloaded_images_query.clone()
+    }
+
     pub fn containers_query(&self) -> Query<Vec<Container>> {
         self.imp().containers_query.clone()
     }
@@ -703,6 +728,42 @@ impl RootStore {
         *self.imp().container_runtime.borrow_mut() = Some(runtime);
         Ok(runtime)
     }
+
+    async fn fetch_downloaded_images(&self) -> anyhow::Result<HashSet<String>> {
+        let runtime = self.get_container_runtime().await?;
+        let mut cmd = Command::new(runtime.as_str());
+        cmd.arg("images").arg("--format").arg("json");
+
+        let output = self.run_to_string(cmd).await?;
+        dbg!(&output);
+        // Some versions of podman/docker might return empty string if no images?
+        if output.trim().is_empty() {
+            return Ok(HashSet::new());
+        }
+        
+        // Handle potential JSON Lines vs JSON Array
+        // Try parsing as array first
+        let images_vec: Vec<Image> = match serde_json::from_str::<Vec<Image>>(&output) {
+            Ok(images) => images,
+            Err(_) => {
+                // Try parsing as JSON lines
+                let mut images = Vec::new();
+                for line in output.lines() {
+                    if !line.trim().is_empty() {
+                        images.push(serde_json::from_str::<Image>(line)?);
+                    }
+                }
+                images
+            }
+        };
+        
+        let names: HashSet<String> = images_vec
+            .into_iter()
+            .flat_map(|img| img.names.unwrap_or_default())
+            .collect();
+
+        Ok(names)
+    }
 }
 
 impl Default for RootStore {
@@ -728,7 +789,7 @@ mod tests {
                 Ok("/home/user/Documents/custom-home-folder"),
             ),
             ("/home/user/Documents/custom-home-folder", Ok(""), {
-                Ok("/home/user/Documents/custom-home-folder")
+                Ok("/home/user/Documents/custom/home/folder")
             }),
             // If the resolution fails and the path is from a sandbox, we expect an error
             ("/run/user/1000/doc/xyz456", Err(()), Err(())),
