wip wip wip wip - multi shell attachment persisting

Author: mikonse

debian/changelog

@@ -1,4 +1,4 @@
-debmagic (0.0.1-alpha1) UNRELEASED; urgency=medium
+debmagic (0.0.1-alpha1) forky; urgency=medium
 
   * WIP: Initial release.
 

packages/debmagic/Cargo.toml

@@ -2,6 +2,7 @@
 name = "debmagic"
 version = "0.0.1-alpha1"
 edition = "2024"
+rust-version = "1.89"
 documentation = "https://debmagic.readthedocs.org"
 homepage = "https://github.com/SFTtech/debmagic"
 repository = "https://github.com/SFTtech/debmagic.git"

packages/debmagic/src/build.rs

@@ -1,5 +1,6 @@
 use std::{
     fs,
+    io::{BufReader, BufWriter},
     path::{Path, PathBuf},
 };
 
@@ -44,38 +45,59 @@ fn create_driver_from_build_root(
         return Err(anyhow!("No build.json found"));
     }
 
-    let content = fs::read_to_string(&build_metadata_path)?;
-    let metadata: BuildMetadata = serde_json::from_str(&content).with_context(|| {
-        format!(
-            "Failed to read build metadata from {} - invalid json",
-            build_metadata_path.display()
-        )
-    })?;
-
-    match metadata.driver {
-        BuildDriverType::Docker => Ok(Box::new(DriverDocker::from_build_metadata(
-            &metadata.config,
-            &config.docker,
-            &metadata,
-        ))),
-        BuildDriverType::Bare => Ok(Box::new(DriverBare::from_build_metadata(
-            &metadata.config,
-            &config.bare,
-            &metadata,
-        ))),
-        // BuildDriverType::Lxd => ...
-    }
+    let file = fs::OpenOptions::new()
+        .read(true)
+        .write(true)
+        .open(&build_metadata_path)?;
+    file.lock()?;
+
+    let result = || -> anyhow::Result<Box<dyn BuildDriver>> {
+        let reader = BufReader::new(&file);
+        let metadata: BuildMetadata = serde_json::from_reader(reader).with_context(|| {
+            format!(
+                "Failed to read build metadata from {} - invalid json",
+                build_metadata_path.display()
+            )
+        })?;
+
+        let driver: anyhow::Result<Box<dyn BuildDriver>> = match &metadata.driver {
+            BuildDriverType::Docker => Ok(Box::new(DriverDocker::from_build_metadata(
+                &metadata.config,
+                &config.docker,
+                &metadata,
+            ))),
+            BuildDriverType::Bare => Ok(Box::new(DriverBare::from_build_metadata(
+                &metadata.config,
+                &config.bare,
+                &metadata,
+            ))),
+            // BuildDriverType::Lxd => ...
+        };
+        if driver.is_ok() {
+            let updated_metadata = BuildMetadata {
+                num_shells_attached: metadata.num_shells_attached + 1,
+                ..metadata
+            };
+            let writer = BufWriter::new(&file);
+            serde_json::to_writer_pretty(writer, &updated_metadata)
+                .context("Failed to serialize build metadata")?;
+        }
+        driver
+    }();
+    file.unlock()?;
+    result
 }
 
 fn write_build_metadata(config: &BuildConfig, driver: &dyn BuildDriver) -> anyhow::Result<()> {
     let metadata = BuildMetadata {
         driver: driver.driver_type(),
         config: config.clone(),
         driver_metadata: driver.get_build_metadata(),
+        num_shells_attached: 0,
     };
     let path = config.build_root_dir.join("build.json");
     let json =
-        serde_json::to_string_pretty(&metadata).context("Failed serialize build metadata")?;
+        serde_json::to_string_pretty(&metadata).context("Failed to serialize build metadata")?;
     fs::write(path, json)?;
     Ok(())
 }
@@ -138,7 +160,7 @@ fn prepare_build_env(
         output_dir: output_dir.to_path_buf(),
         build_root_dir: build_root,
         distro: "debian".to_string(),
-        distro_version: "trixie".to_string(),
+        distro_version: "forky".to_string(),
         dry_run: config.dry_run,
         sign_package: false,
     };

packages/debmagic/src/build/common.rs

@@ -29,6 +29,7 @@ pub struct BuildMetadata {
     pub driver: BuildDriverType,
     pub config: BuildConfig,
     pub driver_metadata: DriverSpecificBuildMetadata,
+    pub num_shells_attached: i64,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]