feat!: Add rebuild and remove library

- Add manifest info printing to identify manifest more easily. - Rebuild
cleans before building - The lib and CLI were already too tightly
coupled - The lib didn't have any reason to exist

Author: mufeedali

Cargo.toml

@@ -27,7 +27,3 @@ nix = { version = "0.30.1", features = ["process", "signal", "user"] }
 [[bin]]
 name = "flatplay"
 path = "src/main.rs"
-
-[lib]
-name = "flatplay"
-path = "src/lib.rs"

src/lib.rs renamed to src/flatpak_manager.rs

@@ -1,22 +1,14 @@
-mod build_dirs;
-mod command;
-mod manifest;
-pub mod process;
-pub mod state;
-mod utils;
-
 use std::fs;
 use std::path::PathBuf;
 
 use anyhow::Result;
 use colored::*;
-use command::{flatpak_builder, run_command};
 use dialoguer::{Select, theme::ColorfulTheme};
 use nix::unistd::geteuid;
 
 use crate::build_dirs::BuildDirs;
+use crate::command::{flatpak_builder, run_command};
 use crate::manifest::{Manifest, Module, find_manifests_in_path};
-use crate::process::kill_process_group;
 use crate::state::State;
 use crate::utils::{get_a11y_bus_args, get_host_env};
 
@@ -46,16 +38,25 @@ impl<'a> FlatpakManager<'a> {
     fn auto_select_manifest(&mut self) -> Result<bool> {
         let manifests = self.find_manifests()?;
         if let Some(manifest_path) = manifests.first() {
-            self.state.active_manifest = Some(manifest_path.clone());
-            self.state.save()?;
             println!("{} {:?}", "Auto-selected manifest:".green(), manifest_path);
-            self.manifest = Some(Manifest::from_file(manifest_path)?);
+            let manifest = Manifest::from_file(manifest_path)?;
+            self.set_active_manifest(manifest_path.clone(), Some(manifest))?;
             Ok(true)
         } else {
             Ok(false)
         }
     }
 
+    fn print_manifest_info(&self) {
+        if let Some(manifest) = &self.manifest {
+            println!("{}", "Manifest Info:".bold().blue());
+            println!("  App ID: {}", manifest.id.yellow());
+            println!("  SDK: {}", manifest.sdk.cyan());
+            println!("  Runtime: {}", manifest.runtime.cyan());
+            println!("  Runtime Version: {}", manifest.runtime_version.cyan());
+        }
+    }
+
     pub fn new(state: &'a mut State) -> Result<Self> {
         let manifest = if let Some(path) = &state.active_manifest {
             Some(Manifest::from_file(path)?)
@@ -71,6 +72,12 @@ impl<'a> FlatpakManager<'a> {
         if manager.manifest.is_none() && !manager.auto_select_manifest()? {
             return Err(anyhow::anyhow!("No manifest found."));
         }
+
+        // Print manifest info when we have one
+        if manager.manifest.is_some() {
+            manager.print_manifest_info();
+        }
+
         manager.init()?;
         Ok(manager)
     }
@@ -335,15 +342,18 @@ impl<'a> FlatpakManager<'a> {
         self.state.save()
     }
 
+    pub fn rebuild(&mut self) -> Result<()> {
+        println!("{}", "Rebuilding application...".bold());
+        self.clean()?;
+        self.build()
+    }
+
     pub fn build_and_run(&mut self) -> Result<()> {
+        println!("{}", "Building and running application...".bold());
         self.build()?;
         self.run()
     }
 
-    pub fn stop(&mut self) -> Result<()> {
-        kill_process_group(self.state)
-    }
-
     pub fn run(&self) -> Result<()> {
         if !self.state.application_built {
             println!(
@@ -572,6 +582,10 @@ impl<'a> FlatpakManager<'a> {
         if let Some(manifest) = manifest {
             self.manifest = Some(manifest);
         }
+
+        // Print manifest info
+        self.print_manifest_info();
+
         println!(
             "{} {:?}. You can now run `{}`.",
             "Selected manifest:".green(),

src/main.rs

@@ -6,9 +6,17 @@ use clap::{CommandFactory, Parser, Subcommand};
 use colored::*;
 use nix::unistd::{getpid, setpgid};
 
-use flatplay::FlatpakManager;
-use flatplay::process::{is_process_running, kill_process_group};
-use flatplay::state::State;
+mod build_dirs;
+mod command;
+mod flatpak_manager;
+mod manifest;
+mod process;
+mod state;
+mod utils;
+
+use flatpak_manager::FlatpakManager;
+use process::{is_process_running, kill_process_group};
+use state::State;
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
@@ -23,6 +31,8 @@ enum Commands {
     Build,
     /// Build or rebuild the application then run it
     BuildAndRun,
+    /// Clean the Flatpak repo directory and rebuild the application
+    Rebuild,
     /// Stop the currently running task
     Stop,
     /// Run the application
@@ -149,6 +159,7 @@ fn main() {
 
         Some(Commands::Build) => handle_command!(flatpak_manager.build()),
         Some(Commands::BuildAndRun) => handle_command!(flatpak_manager.build_and_run()),
+        Some(Commands::Rebuild) => handle_command!(flatpak_manager.rebuild()),
         Some(Commands::Run) => handle_command!(flatpak_manager.run()),
         Some(Commands::UpdateDependencies) => {
             handle_command!(flatpak_manager.update_dependencies())