Merge pull request #33 from ranfdev/next

Next

Author: ranfdev

.github/workflows/flatpak.yml

@@ -1,7 +1,6 @@
 on:
   push:
     tags: [ v*.*.* ]
-  pull_request:
   workflow_dispatch:
 
 concurrency:

data/com.ranfdev.DistroShelf.metainfo.xml.in

@@ -71,6 +71,21 @@
   </screenshots>
 
   <releases>
+    <release version="1.0.10" date="2025-06-24">
+      <description translate="no">
+        <ul>
+          <li>Added command log dialog</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.0.9" date="2025-06-24">
+      <description translate="no">
+        <ul>
+          <li>Fixed assemble from file and from url</li>
+          <li>Preview resolved path from host filesystem in assemble dialog</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.0.8" date="2025-05-28">
       <description translate="no">
         <ul>

meson.build

@@ -1,5 +1,5 @@
 project('distroshelf', 'rust',
-          version: '1.0.8',
+          version: '1.0.10',
     meson_version: '>= 1.0.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/application.rs

@@ -27,10 +27,8 @@ use gettextrs::gettext;
 use gtk::{gio, glib};
 
 use crate::config::VERSION;
-use crate::distrobox::{
-    CommandRunner, Distrobox, DistroboxCommandRunnerResponse, FlatpakCommandRunner,
-    RealCommandRunner,
-};
+use crate::distrobox::{Distrobox, DistroboxCommandRunnerResponse, FlatpakCommandRunner};
+use crate::fakers::{CommandRunner, RealCommandRunner};
 use crate::root_store::RootStore;
 use crate::DistroShelfWindow;
 
@@ -224,13 +222,17 @@ impl DistroShelfApplication {
             }
             _ => {
                 if Self::get_is_in_flatpak() {
-                    Rc::new(FlatpakCommandRunner::new(Rc::new(RealCommandRunner {}))) as Rc<dyn CommandRunner>
+                    CommandRunner::new(Rc::new(FlatpakCommandRunner::new(Rc::new(
+                        RealCommandRunner::new(),
+                    ))))
                 } else {
-                    Rc::new(RealCommandRunner {}) as Rc<dyn CommandRunner>
+                    CommandRunner::new_real()
                 }
             }
         };
 
+        command_runner.output_tracker().enable();
+
         self.set_root_store(RootStore::new(command_runner));
         let window =
             DistroShelfWindow::new(self.upcast_ref::<adw::Application>(), self.root_store());

src/config.rs

@@ -1,4 +1,4 @@
-pub static VERSION: &str = "1.0.8";
+pub static VERSION: &str = "1.0.10";
 pub static GETTEXT_PACKAGE: &str = "distroshelf";
 pub static LOCALEDIR: &str = "/app/share/locale";
 pub static PKGDATADIR: &str = "/app/share/distroshelf";

src/container.rs

@@ -1,9 +1,10 @@
 use crate::{
-    distrobox::{Command, ContainerInfo, ExportableApp, Status},
+    distrobox::{ContainerInfo, ExportableApp, Status},
     distrobox_task::DistroboxTask,
     known_distros::{known_distro_by_image, KnownDistro},
     remote_resource::RemoteResource,
     root_store::RootStore,
+    fakers::Command
 };
 
 use gtk::{

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!(