feat: allow uninstalling apps

Author: oskardotglobal

winapps-cli/src/main.rs

@@ -1,8 +1,11 @@
+use std::collections::HashSet;
+
 use clap::{Command, arg};
+use inquire::MultiSelect;
 use miette::{IntoDiagnostic, Result};
 use tracing::{Level, info};
 use tracing_subscriber::EnvFilter;
-use winapps::{Config, Freerdp, RemoteClient};
+use winapps::{Config, Freerdp, RemoteClient, config::App};
 
 fn cli() -> Command {
     Command::new("winapps-cli")
@@ -45,16 +48,34 @@ fn main() -> Result<()> {
         Some(("setup", _)) => {
             info!("Running setup");
 
-            // TODO: Allow deleting apps, maybe pass installed apps
-            // so they can be deselected?
-            match inquire::MultiSelect::new("Select apps to link", config.get_available_apps()?)
+            let apps = config.get_available_apps()?;
+            let installed: Vec<usize> = apps
+                .iter()
+                .enumerate()
+                .filter_map(|(i, app)| config.linked_apps.contains_key(&app.id).then_some(i))
+                .collect();
+
+            match MultiSelect::new("Select apps to link", apps)
+                .with_default(installed.as_slice())
                 .prompt_skippable()
                 .map_err(|e| winapps::Error::Command {
                     message: "Failed to display selection dialog".into(),
                     source: e.into(),
                 })? {
-                Some(apps) => apps.into_iter().try_for_each(|app| app.link(&mut config))?,
-                None => info!("No apps selected, skipping setup..."),
+                Some(apps) => {
+                    let selected: HashSet<App> = apps.into_iter().collect();
+                    let installed: HashSet<App> = config.linked_apps.values().cloned().collect();
+
+                    for app in selected.symmetric_difference(&installed).cloned() {
+                        match (selected.contains(&app), installed.contains(&app)) {
+                            (true, false) => app.link(&mut config)?,
+                            (false, true) => app.unlink(&mut config)?,
+                            (false, false) => (),
+                            (true, true) => unreachable!(),
+                        }
+                    }
+                }
+                None => info!("No apps (de-)selected, skipping setup..."),
             };
 
             Ok(())

winapps/src/config/apps.rs

@@ -5,7 +5,10 @@ use crate::{
     ensure,
 };
 use base64::{Engine, prelude::BASE64_STANDARD};
-use std::{fmt::Display, fs::write};
+use std::{
+    fmt::Display,
+    fs::{self, write},
+};
 use tracing::debug;
 
 impl PartialEq for App {
@@ -14,6 +17,8 @@ impl PartialEq for App {
     }
 }
 
+impl Eq for App {}
+
 impl Display for App {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         f.write_fmt(format_args!("{} ({})", self.name, self.win_exec))
@@ -74,19 +79,23 @@ Comment={} (WinApps)",
 
         write(&path, self.try_as_desktop_file()?)?;
 
-        if !config.linked_apps.contains(&self) {
+        if !config.linked_apps.contains_key(&self.id) {
             debug!("Writing app {} to config", self.id);
 
-            config.linked_apps.push(self);
+            config.linked_apps.insert(self.id.clone(), self);
             config.save()?;
         }
 
         Ok(())
     }
-}
 
-impl Config {
-    pub fn find_linked_app(&self, id: String) -> Option<&App> {
-        self.linked_apps.iter().find(|app| app.id == id)
+    pub fn unlink(self, config: &mut Config) -> Result<()> {
+        let path = desktop_dir()?.join(format!("{}.desktop", self.id));
+        fs::remove_file(path)?;
+
+        debug!("Removing app {} to config", self.id);
+
+        config.linked_apps.remove_entry(&self.id);
+        config.save()
     }
 }

winapps/src/config/mod.rs

@@ -1,6 +1,6 @@
 use derive_new::new;
 use serde::{Deserialize, Serialize};
-use std::net::IpAddr;
+use std::{collections::HashMap, net::IpAddr};
 
 use crate::Backends;
 
@@ -19,8 +19,8 @@ pub struct Config {
     pub manual: ManualConfig,
     #[new(value = "FreerdpConfig::new()")]
     pub freerdp: FreerdpConfig,
-    #[new(value = "Vec::new()")]
-    pub linked_apps: Vec<App>,
+    #[new(value = "HashMap::new()")]
+    pub linked_apps: HashMap<String, App>,
     #[new(value = "false")]
     pub debug: bool,
 
@@ -83,16 +83,18 @@ pub struct FreerdpConfig {
     pub executable: String,
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Hash)]
 pub enum AppKind {
     FromBase64(String),
     #[default]
     Existing,
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Debug, Deserialize, Serialize, Clone, Hash)]
 pub struct App {
+    #[serde(skip)]
     pub id: String,
+
     pub name: String,
     pub win_exec: String,
     #[serde(skip)]

winapps/src/remote_client/freerdp.rs

@@ -48,9 +48,8 @@ impl RemoteClient for Freerdp {
     fn run_app(self, config: &Config, app_name: String, args: Vec<String>) -> Result<()> {
         let path = config
             .linked_apps
-            .iter()
-            .filter_map(|app| app.id.eq(&app_name).then_some(app.win_exec.clone()))
-            .next()
+            .get(&app_name)
+            .map(|app| app.win_exec.clone())
             .unwrap_or(app_name);
 
         let Some(home_regex) = dirs::home_dir().map(|home| {