Improve variable replacement

Author: morr0ne

Cargo.lock

@@ -13,7 +13,7 @@ anyhow = "1.0.94"
 base16ct = { version = "0.2.0", features = ["std"] }
 blake3 = "1.5.5"
 bzip2 = "0.4.4"
-camino = "1.1.9"
+camino = { version = "1.1.9", features = ["serde1"] }
 clap = { version = "4.5.23", features = ["derive"] }
 flate2 = "1.0.35"
 indicatif = "0.17.9"

Cargo.toml

@@ -18,7 +18,6 @@ use xz2::read::XzDecoder;
 use crate::{
     check_hash,
     package::{Info, Package, Source, StepVariant},
-    replace_vars,
 };
 
 pub async fn build() -> Result<()> {
@@ -28,9 +27,7 @@ pub async fn build() -> Result<()> {
         bail!("package.toml not found in the specified path.");
     }
 
-    let package: Package = toml_edit::de::from_str(&fs::read_to_string(package_path)?)?;
-
-    // dbg!(&package);
+    let package = Package::parse(&fs::read_to_string(package_path)?)?;
 
     let info = package.info;
     info!(
@@ -73,7 +70,7 @@ pub async fn build() -> Result<()> {
             StepVariant::Move { path } => {
                 fs::create_dir_all(&path)?;
 
-                working_dir = path
+                working_dir = path.into();
             }
         }
     }
@@ -85,7 +82,7 @@ pub async fn build() -> Result<()> {
 }
 
 async fn fetch_and_verify_source(client: &Client, source: &Source, info: &Info) -> Result<PathBuf> {
-    let url: Url = replace_vars(&source.url, info)?.as_ref().try_into()?;
+    let url: Url = source.url.as_str().try_into()?;
 
     let target_path = PathBuf::from(url.path_segments().unwrap().last().unwrap());
 

src/commands/build.rs

@@ -34,19 +34,6 @@ pub fn check_hash<P: AsRef<Path>>(path: P, hash: &str) -> Result<bool> {
     Ok(hash == computed_hash)
 }
 
-pub fn replace_vars<'a>(haystack: &'a str, info: &Info) -> Result<Cow<'a, str>> {
-    let res = if let Some(captures) = VARIABLE_REGEX.captures(haystack) {
-        match &captures[1] {
-            "version" => VARIABLE_REGEX.replace_all(haystack, &info.version),
-            _ => bail!("Wrong matcher"),
-        }
-    } else {
-        Cow::Borrowed(haystack)
-    };
-
-    Ok(res)
-}
-
 fn _create_tarball<P: AsRef<Path>>(package_path: P, package: &Package) -> Result<()> {
     let tarball_name = format!("{}_{}.peach", package.info.name, package.info.version);
     let tarball_path = package_path.as_ref().join(&tarball_name);

src/lib.rs

@@ -1,6 +1,8 @@
-use std::{collections::HashMap, fmt::Display, path::PathBuf, process::Command, str::FromStr};
+use std::{collections::HashMap, fmt::Display, process::Command, str::FromStr, sync::LazyLock};
 
-use anyhow::anyhow;
+use anyhow::{anyhow, Result};
+use camino::Utf8PathBuf;
+use regex::{Captures, Regex};
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
 use spdx::Expression;
@@ -60,7 +62,7 @@ pub enum StepVariant {
         command: String,
     },
     Move {
-        path: PathBuf,
+        path: Utf8PathBuf,
     },
 }
 
@@ -102,3 +104,38 @@ impl Runner {
         }
     }
 }
+
+static VARIABLE_REGEX: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"%\{([^}]+)\}").expect("invalid regex"));
+
+impl Package {
+    pub fn parse(s: &str) -> Result<Self> {
+        let mut package: Package = toml_edit::de::from_str(s)?;
+
+        let mut variables = HashMap::new();
+        variables.insert("version", package.info.version.as_str());
+
+        for source in package.sources.iter_mut() {
+            source.url = replace_vars(&source.url, &variables)
+        }
+
+        for step in package.steps.iter_mut() {
+            match &mut step.variant {
+                StepVariant::Command { .. } => {}
+                StepVariant::Move { path } => {
+                    *path = replace_vars(path.as_str(), &variables).into();
+                }
+            }
+        }
+
+        Ok(package)
+    }
+}
+
+fn replace_vars<'h>(haystack: &'h str, variables: &HashMap<&str, &str>) -> String {
+    VARIABLE_REGEX
+        .replace_all(haystack, |caps: &Captures| {
+            variables.get(&caps[1]).expect("Unknown variable") // FIXME: error handling
+        })
+        .into_owned()
+}