Fix assemble from file and from url, resolve path in file row.

Author: ranfdev

src/create_distrobox_dialog.rs

@@ -349,13 +349,35 @@ impl CreateDistroboxDialog {
 
         let title = title.to_owned();
         let dialog_cb = clone!(
+            #[weak(rename_to=this)]
+            self,
+            #[strong]
+            title,
             #[weak]
             row,
             move |res: Result<File, _>| {
                 if let Ok(file) = res {
                     if let Some(path) = file.path() {
-                        row.set_subtitle(&path.display().to_string());
-                        cb(path);
+
+                    glib::MainContext::ref_thread_default().spawn_local(async move {
+                        match this
+                            .root_store()
+                            .resolve_host_path(&path.display().to_string())
+                            .await
+                        {
+                            Ok(resolved_path) => {
+                                row.set_subtitle(&resolved_path);
+                                cb(PathBuf::from(resolved_path));
+                            }
+
+                            Err(e) => {
+                                this.update_errors::<()>(&Err(Error::InvalidField(
+                                    title.to_lowercase(),
+                                    e.to_string(),
+                                )));
+                            }
+                        }
+                    });
                     }
                 }
             }
@@ -432,7 +454,9 @@ impl CreateDistroboxDialog {
     pub fn build_volumes_group(&self) -> adw::PreferencesGroup {
         let volumes_group = adw::PreferencesGroup::new();
         volumes_group.set_title("Volumes");
-        volumes_group.set_description(Some("Specify volumes in the format 'host_path:container_path'"));
+        volumes_group.set_description(Some(
+            "Specify volumes in the format 'host_path:container_path'",
+        ));
 
         let add_volume_button = adw::ButtonRow::builder().title("Add Volume").build();
         add_volume_button.connect_activated(clone!(

src/distrobox/mod.rs

@@ -717,14 +717,26 @@ impl Distrobox {
 
     // assemble
     pub fn assemble(&self, file_path: &str) -> Result<Box<dyn Child + Send>, Error> {
+        if file_path.is_empty() {
+            return Err(Error::InvalidField(
+                "file_path".into(),
+                "File path cannot be empty".into(),
+            ));
+        }
         let mut cmd = dbcmd();
-        cmd.arg("assemble").arg("--file").arg(file_path);
+        cmd.arg("assemble").arg("create").arg("--file").arg(file_path);
         self.cmd_spawn(cmd)
     }
 
     pub fn assemble_from_url(&self, url: &str) -> Result<Box<dyn Child + Send>, Error> {
+        if url.is_empty() {
+            return Err(Error::InvalidField(
+                "url".into(),
+                "URL cannot be empty".into(),
+            ));
+        }
         let mut cmd = dbcmd();
-        cmd.arg("assemble").arg("--file").arg(url);
+        cmd.arg("assemble").arg("create").arg("--file").arg(url);
         self.cmd_spawn(cmd)
     }
     // create
@@ -1009,7 +1021,7 @@ Categories=Utility;Network;
         db.assemble("/path/to/assemble.yml")?;
         assert_eq!(
             output_tracker.items()[0],
-            "\"distrobox\" [\"assemble\", \"--file\", \"/path/to/assemble.yml\"]"
+            "\"distrobox\" [\"assemble\", \"create\", \"--file\", \"/path/to/assemble.yml\"]"
         );
         Ok(())
     }

src/store/root_store.rs

@@ -8,7 +8,7 @@ use gtk::prelude::*;
 use gtk::{gio, glib};
 use std::cell::RefCell;
 use std::default;
-use std::path::PathBuf;
+use std::path::Path;
 use std::rc::Rc;
 use std::time::Duration;
 use tracing::debug;
@@ -245,11 +245,17 @@ impl RootStore {
     }
     pub fn assemble_container(&self, file_path: &str) {
         let this = self.clone();
-        let file_path = file_path.to_string();
-        self.create_task("assemble", "assemble", move |task| async move {
-            let child = this.distrobox().assemble(&file_path)?;
+        let file_path_clone = file_path.to_string();
+        let file_name = Path::new(file_path)
+            .file_name()
+            .and_then(|s| s.to_str())
+            .unwrap_or(file_path);
+
+        let task = self.create_task(&file_name, "assemble", move |task| async move {
+            let child = this.distrobox().assemble(&file_path_clone)?;
             task.handle_child_output(child).await
         });
+        self.view_task(&task);
     }
     pub fn upgrade_all(&self) {
         for container in self.containers().snapshot() {