fix: address clippy lints

Signed-off-by: Oskar Manhart <[email protected]>

Author: oskardotglobal

winapps/src/backend/container.rs

@@ -5,7 +5,7 @@ use crate::{
 use std::net::{IpAddr, Ipv4Addr};
 use tracing::debug;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Container {
     config: &'static Config,
 }

winapps/src/backend/manual.rs

@@ -2,7 +2,7 @@ use std::{net::IpAddr, str::FromStr};
 
 use crate::{command::Command, ensure, Backend, Config, Error, Result};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Manual {
     config: &'static Config,
 }

winapps/src/backend/mod.rs

@@ -19,33 +19,29 @@ pub trait Backend {
     fn get_host(&self) -> IpAddr;
 
     fn as_remote_command(&self, command: Command) -> Command;
-
-    fn get_installed_apps(&self) -> Result<Vec<App>>;
 }
 
 #[enum_dispatch(Backend)]
+#[derive(Debug, Clone)]
 pub enum Backends {
     Container,
     Manual,
 }
 
 impl Config {
-    pub fn get_backend(&'static self) -> Backends {
-        assert!(self.libvirt.enable ^ self.container.enable ^ self.manual.enable);
-
-        if self.libvirt.enable {
-            todo!()
-        }
-
-        if self.container.enable {
-            return Container::new(self).into();
-        }
-
-        if self.manual.enable {
-            return Manual::new(self).into();
-        }
-
-        unreachable!()
+    pub fn get_backend(&'static self) -> &'static Backends {
+        self.backend.get_or_init(|| {
+            match (
+                self.libvirt.enable,
+                self.container.enable,
+                self.manual.enable,
+            ) {
+                (true, _, _) => todo!(),
+                (_, true, _) => Container::new(self).into(),
+                (_, _, true) => Manual::new(self).into(),
+                _ => unreachable!(),
+            }
+        })
     }
 
     pub fn get_host(&'static self) -> IpAddr {
@@ -57,8 +53,8 @@ impl Config {
     }
 
     fn get_installed_apps(&'static self) -> Result<Vec<App>> {
-        Ok(self
-            .as_remote_command(Command::new("C:\\ExtractPrograms.ps1"))
+        let apps = Command::new("C:\\ExtractPrograms.ps1")
+            .into_remote(self.get_backend())
             .wait_with_output()?
             .lines()
             .filter_map(|line| {
@@ -75,6 +71,8 @@ impl Config {
                     _ => None,
                 }
             })
-            .collect::<Vec<App>>())
+            .collect::<Vec<App>>();
+
+        Ok(apps)
     }
 }

winapps/src/command.rs

@@ -1,4 +1,4 @@
-use crate::{ensure, Error, IntoResult, Result};
+use crate::{ensure, Backend, Backends, Error, IntoResult, Result};
 use std::{
     fmt::{Display, Formatter},
     process::{Child, Command as StdCommand, Stdio},
@@ -60,6 +60,10 @@ impl Command {
         }
     }
 
+    pub fn into_remote(self, backend: &Backends) -> Self {
+        backend.as_remote_command(self)
+    }
+
     pub fn with_err(mut self, message: &'static str) -> Self {
         self.error_message = message.to_string();
         self

winapps/src/config/mod.rs

@@ -1,5 +1,7 @@
+use crate::Backends;
 use derive_new::new;
 use serde::{Deserialize, Serialize};
+use std::sync::OnceLock;
 
 mod apps;
 mod operations;
@@ -20,6 +22,9 @@ pub struct Config {
     pub linked_apps: Vec<App>,
     #[new(value = "false")]
     pub debug: bool,
+    #[new(value = "OnceLock::new()")]
+    #[serde(skip)]
+    pub(crate) backend: OnceLock<Backends>,
 }
 
 #[derive(new, Debug, Deserialize, Serialize, Clone)]

winapps/src/config/operations.rs

@@ -1,12 +1,4 @@
-use std::{
-    fs,
-    fs::File,
-    io::Write,
-    net::IpAddr,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::OnceLock,
-};
+use std::{fs, fs::File, io::Write, net::IpAddr, path::PathBuf, str::FromStr, sync::OnceLock};
 use tracing::warn;
 
 use crate::{bail, dirs::path_ok, Config, Error, IntoResult, Result};

winapps/src/dirs.rs

@@ -1,5 +1,8 @@
 use crate::{bail, Result};
-use std::{fs, path::Path};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
 /// Check whether a directory exists and is a directory
 /// If not, try creating it
@@ -18,33 +21,31 @@ pub fn path_ok(path: &Path) -> Result<()> {
 }
 
 /// Get the data dir and validates it exists
-pub fn data_dir() -> Result<&'static Path> {
-    let Some(data_dir) = dirs::data_local_dir() else {
+pub fn data_dir() -> Result<PathBuf> {
+    let Some(data_dir) = dirs::data_dir().map(|path| path.join("winapps")) else {
         bail!("Could not determine $XDG_DATA_HOME")
     };
 
-    let dir = data_dir.join("winapps").as_path();
-    path_ok(dir)?;
-
-    Ok(dir)
+    path_ok(data_dir.as_path())?;
+    Ok(data_dir)
 }
 
 /// Get the icons dir and validates it exists
-pub fn icons_dir() -> Result<&'static Path> {
-    let dir = data_dir()?.join("icons").as_path();
-    path_ok(dir)?;
+pub fn icons_dir() -> Result<PathBuf> {
+    let Some(data_dir) = dirs::data_dir().map(|path| path.join("icons")) else {
+        bail!("Could not determine $XDG_DATA_HOME")
+    };
 
-    Ok(dir)
+    path_ok(data_dir.as_path())?;
+    Ok(data_dir)
 }
 
 /// Get the XDG applications dir and validates it exists
-pub fn desktop_dir() -> Result<&'static Path> {
-    let Some(data_dir) = dirs::data_local_dir() else {
+pub fn desktop_dir() -> Result<PathBuf> {
+    let Some(data_dir) = dirs::data_dir().map(|path| path.join("applications")) else {
         bail!("Could not determine $XDG_DATA_HOME")
     };
 
-    let dir = data_dir.join("applications").as_path();
-    path_ok(dir)?;
-
-    Ok(dir)
+    path_ok(data_dir.as_path())?;
+    Ok(data_dir)
 }

winapps/src/errors.rs

@@ -44,6 +44,13 @@ pub enum Error {
     #[diagnostic(code(winapps::toml_invalid_error))]
     Serialize(#[from] toml::ser::Error),
 
+    #[error("Icon is invalid base64")]
+    #[diagnostic(
+        code(winapps::setup_error),
+        help("Setup returned a badly formed base64 string, is your config correct and are apps correctly installed?")
+    )]
+    InvalidIcon(#[from] base64::DecodeError),
+
     #[error("RDP host is unreachable")]
     #[diagnostic(
         code(winapps::bad_vm_state),
@@ -57,6 +64,12 @@ pub enum Error {
     EmptyCommand,
 }
 
+impl From<&str> for Error {
+    fn from(value: &str) -> Self {
+        Self::Message(value.to_string())
+    }
+}
+
 pub type Result<T> = std::result::Result<T, Error>;
 
 impl<T> From<Error> for Result<T> {

winapps/src/remote_client/freerdp.rs

@@ -4,7 +4,7 @@ use std::{
 };
 use tracing::info;
 
-use crate::{command::Command, config::App, Config, Error, RemoteClient, Result};
+use crate::{command::Command, Config, Error, RemoteClient, Result};
 
 pub struct Freerdp {
     config: &'static Config,