generator: update to account for embedded bootspec docs

DeterminateSystems · May 17, 2022 · 18004b9 · 18004b9
1 parent d41b90f
commit 18004b9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
@@ -19,5 +19,5 @@ regex = { version = "1.5.5" }
 serde_json = "1.0.81"
 tempfile = "3.3.0"
 structopt = { version = "0.3.26", default-features = false }
-bootspec = { git = "https://github.com/DeterminateSystems/bootspec", branch = "import" }
-synthesize = { git = "https://github.com/DeterminateSystems/bootspec", branch = "import" }
+bootspec = { git = "https://github.com/DeterminateSystems/bootspec", branch = "rfc-embed-subs" }
+synthesize = { git = "https://github.com/DeterminateSystems/bootspec", branch = "rfc-embed-subs" }
diff --git a/generator/src/bootable/mod.rs b/generator/src/bootable/mod.rs
@@ -1,7 +1,6 @@
-use std::fs;
 use std::io::{self, Write};
 
-use bootspec::{BootJson, SpecialisationName};
+use bootspec::SpecialisationName;
 
 use crate::{Generation, Result};
 
@@ -51,22 +50,18 @@ fn flatten_impl(
         });
 
         for (name, desc) in input.bootspec.specialisation {
-            let bootspec_path = desc.bootspec.0;
-
             writeln!(
                 io::stderr(),
                 "Flattening specialisation '{name}' of toplevel {toplevel}: {path}",
                 toplevel = input.bootspec.toplevel.0.display(),
                 name = name.0,
-                path = bootspec_path.display()
+                path = desc.toplevel.0.display()
             )?;
 
-            let json = fs::read_to_string(&bootspec_path)?;
-            let parsed: BootJson = serde_json::from_str(&json)?;
             let gen = Generation {
                 index: input.index,
                 profile: input.profile.clone(),
-                bootspec: parsed,
+                bootspec: desc,
             };
 
             toplevels.extend(self::flatten_impl(vec![gen], Some(name))?);

diff --git a/generator/src/lib.rs b/generator/src/lib.rs
@@ -1,6 +1,6 @@
 use std::error::Error;
 use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use bootspec::{BootJson, JSON_FILENAME};
 use regex::Regex;
@@ -23,7 +23,7 @@ lazy_static::lazy_static! {
     static ref PROFILE_RE: Regex = Regex::new("/system-profiles/(?P<profile>[^-]+)-(?P<generation>\\d+)-link").unwrap();
 }
 
-pub fn get_json(tempdir: &Path, generation_path: PathBuf) -> Result<BootJson> {
+pub fn get_json(generation_path: PathBuf) -> Result<BootJson> {
     let json_path = generation_path.join(JSON_FILENAME);
 
     let mut json: Option<BootJson> = None;
@@ -36,17 +36,9 @@ pub fn get_json(tempdir: &Path, generation_path: PathBuf) -> Result<BootJson> {
     }
 
     if json.is_none() {
-        let dest = tempdir.join("synthesis");
-
-        // Time to synthesize
-        synthesize::synthesize_schema_from_generation(&generation_path, &dest)?;
-        let json_path = dest.join("boot.v1.json");
-
-        if let Ok(cont) = fs::read_to_string(&json_path) {
-            if let Ok(parsed) = serde_json::from_str(&cont) {
-                json = Some(parsed)
-            }
-        }
+        json = Some(synthesize::synthesize_schema_from_generation(
+            &generation_path,
+        )?);
     }
 
     Ok(json.unwrap())

diff --git a/generator/src/main.rs b/generator/src/main.rs
@@ -3,7 +3,6 @@ use std::path::PathBuf;
 use generator::bootable::{self, Bootable, EfiProgram};
 use generator::{systemd_boot, Generation, Result};
 use structopt::StructOpt;
-use tempfile::{tempdir, tempdir_in, TempDir};
 
 #[derive(Default, Debug, StructOpt)]
 struct Args {
@@ -28,8 +27,6 @@ struct Args {
 
 fn main() -> Result<()> {
     let args = Args::from_args();
-    let parent_tempdir = tempdir()?;
-    let mut tempdirs: Vec<TempDir> = vec![];
 
     let generations = args
         .generations
@@ -38,11 +35,7 @@ fn main() -> Result<()> {
             generator::parse_generation(&gen)
                 .ok()
                 .map(|(index, profile)| {
-                    let tempdir =
-                        tempdir_in(parent_tempdir.path()).expect("Failed to get a new tempdir");
-
-                    let bootspec = generator::get_json(tempdir.path(), PathBuf::from(gen));
-                    tempdirs.push(tempdir);
+                    let bootspec = generator::get_json(PathBuf::from(gen));
 
                     if let Ok(bootspec) = bootspec {
                         Some(Generation {