feat(install): add partial support for excluding files on install

Author: QaidVoid

soar-cli/src/cli.rs

@@ -84,6 +84,12 @@ pub enum Commands {
         /// Don't display notes
         #[arg(required = false, long)]
         no_notes: bool,
+
+        /// Exclude log, build/spec files, and desktop integration files
+        ///
+        /// Note: This won't prevent desktop integration
+        #[arg(required = false, long)]
+        binary_only: bool,
     },
 
     /// Search package

soar-cli/src/install.rs

@@ -54,6 +54,7 @@ pub struct InstallContext {
     pub retrying: Arc<AtomicU64>,
     pub failed: Arc<AtomicU64>,
     pub installed_indices: Arc<Mutex<HashSet<usize>>>,
+    pub binary_only: bool,
 }
 
 pub fn create_install_context(
@@ -62,6 +63,7 @@ pub fn create_install_context(
     portable: Option<String>,
     portable_home: Option<String>,
     portable_config: Option<String>,
+    binary_only: bool,
 ) -> InstallContext {
     let multi_progress = Arc::new(MultiProgress::new());
     let total_progress_bar = multi_progress.add(ProgressBar::new(total_packages as u64));
@@ -82,6 +84,7 @@ pub fn create_install_context(
         retrying: Arc::new(AtomicU64::new(0)),
         failed: Arc::new(AtomicU64::new(0)),
         installed_indices: Arc::new(Mutex::new(HashSet::new())),
+        binary_only,
     }
 }
 
@@ -93,6 +96,7 @@ pub async fn install_packages(
     portable_home: Option<String>,
     portable_config: Option<String>,
     no_notes: bool,
+    binary_only: bool,
 ) -> SoarResult<()> {
     let state = AppState::new();
     let repo_db = state.repo_db().await?;
@@ -106,6 +110,7 @@ pub async fn install_packages(
         portable,
         portable_home,
         portable_config,
+        binary_only,
     );
 
     perform_installation(install_context, install_targets, core_db.clone(), no_notes).await
@@ -440,6 +445,7 @@ pub async fn install_single_package(
         Some(progress_callback),
         core_db,
         target.with_pkg_id,
+        ctx.binary_only,
     )
     .await?;
 

soar-cli/src/main.rs

@@ -95,6 +95,7 @@ async fn handle_cli() -> SoarResult<()> {
             portable_home,
             portable_config,
             no_notes,
+            binary_only,
         } => {
             if portable.is_some() && (portable_home.is_some() || portable_config.is_some()) {
                 error!("--portable cannot be used with --portable-home or --portable-config");
@@ -113,6 +114,7 @@ async fn handle_cli() -> SoarResult<()> {
                 portable_home,
                 portable_config,
                 no_notes,
+                binary_only,
             )
             .await?;
         }

soar-cli/src/update.rs

@@ -143,6 +143,7 @@ pub async fn update_packages(packages: Option<Vec<String>>, keep: bool) -> SoarR
         None,
         None,
         None,
+        false,
     );
 
     perform_update(ctx, update_targets, core_db.clone(), keep).await?;

soar-core/src/config.rs

@@ -10,7 +10,10 @@ use tracing::info;
 
 use crate::{
     error::{ConfigError, SoarError},
-    utils::{build_path, get_platform, home_config_path, home_data_path, parse_duration},
+    utils::{
+        build_path, default_install_excludes, get_platform, home_config_path, home_data_path,
+        parse_duration,
+    },
 };
 
 type Result<T> = std::result::Result<T, ConfigError>;
@@ -143,6 +146,10 @@ pub struct Config {
     /// Whether to allow cross-repo updates
     #[serde(skip_serializing)]
     pub cross_repo_updates: Option<bool>,
+
+    /// Install excludes
+    #[serde(skip_serializing)]
+    pub install_excludes: Option<Vec<String>>,
 }
 
 pub fn init() {
@@ -208,6 +215,10 @@ impl Config {
             config.parallel_limit = config.parallel_limit.or(Some(4));
         }
 
+        if config.install_excludes.is_none() {
+            config.install_excludes = Some(default_install_excludes());
+        }
+
         let mut seen = HashSet::new();
         for repo in &mut config.repositories {
             if repo.name == "local" {
@@ -366,6 +377,7 @@ impl Default for Config {
             search_limit: Some(20),
             ghcr_concurrency: Some(8),
             cross_repo_updates: Some(false),
+            install_excludes: Some(default_install_excludes()),
         }
     }
 }

soar-core/src/package/formats/common.rs

@@ -9,7 +9,6 @@ use std::{
 use image::{imageops::FilterType, DynamicImage, GenericImageView};
 use regex::Regex;
 use soar_dl::downloader::{DownloadOptions, Downloader};
-use tracing::info;
 
 use crate::{
     config::get_config,
@@ -68,7 +67,6 @@ pub fn symlink_icon<P: AsRef<Path>>(real_path: P) -> SoarResult<PathBuf> {
     let ext = real_path.extension();
 
     let (w, h) = if ext == Some(OsStr::new("svg")) {
-        info!("CAME HERE??");
         (128, 128)
     } else {
         let image = image::open(real_path)?;

soar-core/src/package/install.rs

@@ -1,7 +1,5 @@
 use std::{
-    env,
-    ffi::OsString,
-    fs,
+    env, fs,
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
     thread::sleep,
@@ -22,7 +20,7 @@ use crate::{
         packages::{FilterCondition, PackageQueryBuilder, ProvideStrategy},
     },
     error::{ErrorContext, SoarError},
-    utils::{desktop_dir, icons_dir, process_dir},
+    utils::{default_install_excludes, desktop_dir, icons_dir, process_dir},
     SoarResult,
 };
 
@@ -32,6 +30,7 @@ pub struct PackageInstaller {
     progress_callback: Option<Arc<dyn Fn(DownloadState) + Send + Sync>>,
     db: Arc<Mutex<Connection>>,
     with_pkg_id: bool,
+    binary_only: bool,
 }
 
 #[derive(Clone)]
@@ -49,6 +48,7 @@ impl PackageInstaller {
         progress_callback: Option<Arc<dyn Fn(DownloadState) + Send + Sync>>,
         db: Arc<Mutex<Connection>>,
         with_pkg_id: bool,
+        binary_only: bool,
     ) -> SoarResult<Self> {
         let install_dir = install_dir.as_ref().to_path_buf();
         let package = &target.package;
@@ -90,6 +90,7 @@ impl PackageInstaller {
             progress_callback,
             db: db.clone(),
             with_pkg_id,
+            binary_only,
         })
     }
 
@@ -114,14 +115,27 @@ impl PackageInstaller {
 
         if self.package.ghcr_pkg.is_some() {
             let progress_callback = &self.progress_callback.clone();
+            let exclude_keywords = self
+                .binary_only
+                .then_some(
+                    default_install_excludes()
+                        .into_iter()
+                        .chain(
+                            [".png", ".svg", "LICENSE", ".version", "CHECKSUM"]
+                                .iter()
+                                .map(|s| s.to_string()),
+                        )
+                        .collect::<Vec<String>>(),
+                )
+                .unwrap_or_else(|| get_config().install_excludes.clone().unwrap_or_default());
             let options = OciDownloadOptions {
                 url: url.to_string(),
                 output_path: Some(output_path.to_string_lossy().to_string()),
                 progress_callback: self.progress_callback.clone(),
                 api: None,
                 concurrency: Some(get_config().ghcr_concurrency.unwrap_or(8)),
                 regex_patterns: Vec::new(),
-                exclude_keywords: Vec::new(),
+                exclude_keywords,
                 match_keywords: Vec::new(),
                 exact_case: false,
             };
@@ -335,13 +349,11 @@ impl PackageInstaller {
                 let installed_path = PathBuf::from(&package.installed_path);
 
                 let mut remove_action = |path: &Path| -> SoarResult<()> {
-                    if path.extension() == Some(&OsString::from("desktop")) {
-                        if let Ok(real_path) = fs::read_link(&path) {
-                            if real_path.parent() == Some(&installed_path) {
-                                fs::remove_file(&path).with_context(|| {
-                                    format!("removing desktop file {}", path.display())
-                                })?;
-                            }
+                    if let Ok(real_path) = fs::read_link(&path) {
+                        if real_path.parent() == Some(&installed_path) {
+                            fs::remove_file(&path).with_context(|| {
+                                format!("removing desktop file {}", path.display())
+                            })?;
                         }
                     }
                     Ok(())

soar-core/src/utils.rs

@@ -302,3 +302,10 @@ pub fn parse_duration(input: &str) -> Option<u128> {
 
     Some(multiplier * number)
 }
+
+pub fn default_install_excludes() -> Vec<String> {
+    [".log", "SBUILD", ".json"]
+        .into_iter()
+        .map(String::from)
+        .collect::<Vec<String>>()
+}