fix: use single state object

except in the panic hook

Author: mufeedali

src/lib.rs

@@ -19,14 +19,14 @@ use crate::process::kill_process_group;
 
 const BUILD_DIR: &str = ".flatplay";
 
-pub struct FlatpakManager {
-    state: State,
+pub struct FlatpakManager<'a> {
+    state: &'a mut State,
     manifest: Option<Manifest>,
 }
 
 use std::path::PathBuf;
 
-impl FlatpakManager {
+impl<'a> FlatpakManager<'a> {
     fn find_manifests(&self) -> Result<Vec<PathBuf>> {
         let mut manifests = vec![];
         for entry in WalkDir::new(".")
@@ -70,7 +70,7 @@ impl FlatpakManager {
         Ok(())
     }
 
-    pub fn new(state: State) -> Result<Self> {
+    pub fn new(state: &'a mut State) -> Result<Self> {
         let manifest = if let Some(path) = &state.active_manifest {
             Some(Manifest::from_file(path)?)
         } else {
@@ -318,7 +318,7 @@ impl FlatpakManager {
     }
 
     pub fn stop(&mut self) -> Result<()> {
-        kill_process_group(&mut self.state)
+        kill_process_group(self.state)
     }
 
     pub fn run(&self) -> Result<()> {

src/main.rs

@@ -58,7 +58,6 @@ fn main() {
     let cli = Cli::parse();
     let mut state = State::load().unwrap();
 
-    // Special handling for the 'stop' command, which doesn't need the full manager setup.
     if let Some(Commands::Stop) = cli.command {
         handle_command!(kill_process_group(&mut state));
         return;
@@ -95,13 +94,16 @@ fn main() {
     // Handle unclean ends where possible.
     let original_hook = panic::take_hook();
     panic::set_hook(Box::new(move |panic_info| {
-        let mut state = State::load().unwrap();
-        state.process_group_id = None;
-        state.save().unwrap();
+        if let Ok(mut state) = State::load() {
+            state.process_group_id = None;
+            if let Err(e) = state.save() {
+                eprintln!("Failed to save state in panic hook: {e}");
+            }
+        }
         original_hook(panic_info);
     }));
 
-    let mut flatpak_manager = FlatpakManager::new(state).unwrap();
+    let mut flatpak_manager = FlatpakManager::new(&mut state).unwrap();
     match &cli.command {
         Some(Commands::Completions { shell }) => {
             use clap_complete::generate;
@@ -128,7 +130,6 @@ fn main() {
     }
 
     // Clean up pgid in the state file on normal exit.
-    let mut state = State::load().unwrap();
     state.process_group_id = None;
     state.save().unwrap();
 }