.

Author: eatradish

src/cxx_qt_bridge.rs

@@ -14,6 +14,15 @@ pub mod qobject {
         Downgrade,
     }
 
+    #[qenum]
+    #[namespace = "InstallStatus"]
+    enum InstallStatus {
+        OkToInstall,
+        DependencyIssue,
+        DiskSpaceInsufficient,
+        Other,
+    }
+
     impl cxx_qt::Threading for DebInstaller {}
 
     extern "RustQt" {
@@ -29,6 +38,7 @@ pub mod qobject {
         #[qproperty(bool, finished)]
         #[qproperty(QString, path)]
         #[qproperty(InstallAction, action)]
+        #[qproperty(InstallStatus, status)]
         type DebInstaller = super::DebInstallerRust;
 
         #[qinvokable]
@@ -50,9 +60,12 @@ use core::pin::Pin;
 use cxx_qt::Threading;
 use cxx_qt_lib::QString;
 use gettextrs::pgettext;
-use oma_pm::apt::{AptConfig, OmaApt, OmaAptArgs};
+use oma_pm::apt::{AptConfig, OmaApt, OmaAptArgs, OmaAptError};
 
-use crate::{Progress, cxx_qt_bridge::qobject::InstallAction};
+use crate::{
+    Progress,
+    cxx_qt_bridge::qobject::{InstallAction, InstallStatus},
+};
 
 pub struct DebInstallerRust {
     pub package: QString,
@@ -65,6 +78,7 @@ pub struct DebInstallerRust {
     pub progress: f32,
     pub is_installing: bool,
     pub finished: bool,
+    pub status: InstallStatus,
 }
 
 impl Default for DebInstallerRust {
@@ -80,6 +94,7 @@ impl Default for DebInstallerRust {
             is_installing: false,
             finished: false,
             action: InstallAction::Install,
+            status: InstallStatus::OkToInstall,
         }
     }
 }
@@ -125,6 +140,27 @@ impl qobject::DebInstaller {
             };
 
             this.as_mut().set_action(action);
+            let result = apt
+                .install(&[pkg], true)
+                .and_then(|_| apt.resolve(false, false));
+
+            let mut status = InstallStatus::OkToInstall;
+
+            if let Err(e) = result {
+                match e {
+                    OmaAptError::DependencyIssue { .. } => {
+                        status = InstallStatus::DependencyIssue;
+                    }
+                    OmaAptError::DiskSpaceInsufficient(_, _) => {
+                        status = InstallStatus::DiskSpaceInsufficient;
+                    }
+                    _ => {
+                        status = InstallStatus::Other;
+                    }
+                }
+            }
+
+            this.as_mut().set_status(status);
         }
     }
 

src/main.qml

@@ -64,6 +64,40 @@ Kirigami.ApplicationWindow {
             anchors.margins: Kirigami.Units.largeSpacing
             spacing: Kirigami.Units.mediumSpacing
 
+            Kirigami.AbstractCard {
+                Layout.fillWidth: true
+                visible: !installer.is_installing && !installer.finished
+
+                contentItem: ColumnLayout {
+                    Controls.Label {
+                        text: installer.pkg_description
+                        font.bold: true
+                        wrapMode: Text.WordWrap
+                        Layout.fillWidth: true
+                    }
+
+                    Controls.Label {
+                        text: installer.pkg_version
+                    }
+
+                    Controls.Label {
+                        text: {
+                            switch (installer.status) {
+                            case DebInstaller.OkToInstall:
+                                return installer.i18n("OK to install");
+                            case DebInstaller.DependencyIssue:
+                                return installer.i18n("Dependencies unmet");
+                            case DebInstaller.DiskSpaceInsufficient:
+                                return installer.i18n("Insufficient disk space");
+                            case DebInstaller.Other:
+                                return installer.i18n("other");
+                            }
+                        }
+                    }
+                }
+
+            }
+
             ColumnLayout {
                 visible: !installer.is_installing && !installer.finished
                 spacing: Kirigami.Units.smallSpacing

src/main.rs

@@ -12,11 +12,7 @@ use anyhow::{Context, Result};
 use backend::Backend;
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, bindtextdomain, setlocale, textdomain};
-use oma_pm::{
-    apt::{OmaApt, OmaAptError},
-    matches::PackagesMatcher,
-    pkginfo::OmaPackage,
-};
+use oma_pm::{apt::OmaApt, matches::PackagesMatcher, pkginfo::OmaPackage};
 use tokio::fs::create_dir_all;
 use tracing::{debug, error, level_filters::LevelFilter};
 use tracing_subscriber::{EnvFilter, Layer, fmt, layer::SubscriberExt, util::SubscriberInitExt};
@@ -60,14 +56,6 @@ pub enum Progress {
     Done,
 }
 
-fn u8_oma_pm_errors(error: &OmaAptError) -> u8 {
-    match error {
-        OmaAptError::DependencyIssue { .. } => 6,
-        OmaAptError::DiskSpaceInsufficient(_, _) => 17,
-        _ => 255,
-    }
-}
-
 fn main() {
     let Args {
         package,