Merge pull request #143 from cooklang/feat/templates

feat: add basic (very) support for templates

Author: dubadub

Cargo.lock

@@ -13,32 +13,33 @@ path = "src/main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.5", features = ["derive"] }
-cooklang = { version = "0.16.1" }
+anstream = "0.6"
+anstyle = "1"
+anstyle-yansi = "2"
 anyhow = "1"
+axum = { version = "0.8" }
 camino = { version = "1", features = ["serde1"] }
+clap = { version = "4.5", features = ["derive"] }
+cooklang = { version = "0.16.1" }
+cooklang-find = { version = "0.2.1" }
+cooklang-import = "0.4.1"
+cooklang-reports = { version = "0.1" }
+directories = "6"
+humantime = "2"
+mime_guess = "2.0"
 once_cell = "1"
-serde_json = "1.0"
-anstream = "0.6"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+open = "5.3"
+openssl = { version = "0.10", features = ["vendored"] }
+regex = "1"
+rust-embed = "8"
 serde = "1.0"
-directories = "6"
+serde_json = "1.0"
 serde_yaml = "0.9"
-rust-embed = "8"
+tabular = { version = "0.2", features = ["ansi-cell"] }
+textwrap = { version = "0.16", features = ["terminal_size"] }
 tokio = { version = "1", features = ["full"] }
-axum = { version = "0.8" }
 tower = { version = "0.5", features = ["util"] }
 tower-http = { version = "0.6", features = ["fs", "trace", "cors"] }
-mime_guess = "2.0"
-open = "5.3"
-openssl = { version = "0.10", features = ["vendored"] }
-cooklang-find = { version = "0.2.1" }
-textwrap = { version = "0.16", features = ["terminal_size"] }
-tabular = { version = "0.2", features = ["ansi-cell"] }
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 yansi = "1"
-anstyle-yansi = "2"
-humantime = "2"
-anstyle = "1"
-regex = "1"
-cooklang-import = "0.4.1"

Cargo.toml

@@ -3,14 +3,19 @@ servings: 2
 tags: breakfast
 ---
 
-Crack the @eggs{3} into a blender, then add the @flour{125%g}, @milk{250%ml} and @sea salt{pinch}, and blitz until smooth.
+Crack the @eggs{3} into a blender, then add the @flour{125%g},
+@milk{250%ml} and @sea salt{1%pinch}, and blitz until smooth.
 
 Pour into a bowl and leave to stand for 15 minutes.
 
-Melt the butter (or a drizzle of @olive oil{} if you want to be a bit healthier) in a large non-stick frying pan on a medium heat, then tilt the pan so the butter coats the surface.
+Melt @olive oil{1%drizzle} in a large non-stick frying pan on
+a medium heat, then tilt the pan so the butter coats the surface.
 
-Pour in 1 ladle of batter and tilt again, so that the batter spreads all over the base, then cook for 1 to 2 minutes, or until it starts to come away from the sides.
+Pour in 1 ladle of batter and tilt again, so that the batter
+spreads all over the base, then cook for 1 to 2 minutes,
+or until it starts to come away from the sides.
 
-Once golden underneath, flip the pancake over and cook for 1 further minute, or until cooked through.
+Once golden underneath, flip the pancake over and cook
+for 1 further minute, or until cooked through.
 
 Serve straightaway with your favourite topping.

seed/Breakfast/Easy Pancakes.cook

@@ -0,0 +1,4 @@
+storage:
+  shelf life: 30
+  fridge life: 60
+density: 1.03

seed/db/eggs/meta.yml

@@ -0,0 +1 @@
+price_per_unit: 0.25 # 1 egg

seed/db/eggs/shopping.yml

@@ -0,0 +1 @@
+price_per_unit: 0.0015 # 1g

seed/db/flour/shopping.yml

@@ -0,0 +1 @@
+price_per_unit: 0.001 # 1ml

seed/db/milk/shopping.yml

@@ -0,0 +1 @@
+price_per_unit: 0.005 # 1ml

seed/db/olive oil/shopping.yml

@@ -0,0 +1 @@
+price_per_unit: 0.001 # 1g

seed/db/sea salt/shopping.yml

@@ -0,0 +1,10 @@
+# Cost Report
+{% set ns = namespace() %}
+{%- set ns.total = 0 %}
+{%- for ingredient in ingredients %}
+{%- set price = db(ingredient.name ~ '.shopping.price_per_unit') * (ingredient.quantity.value | float) %}
+* {{ ingredient.name }}: ${{ price | format_price(2) }}
+{%- set ns.total = ns.total + price %}
+{%- endfor %}
+
+Total: ${{ ns.total | format_price }}

seed/reports/cost.md.jinja

@@ -0,0 +1,9 @@
+{{ metadata }}
+
+Scale: {{ scale }}x
+
+## Ingredients
+{%- for ingredient in ingredients %}
+- {{ ingredient.name }} {{ ingredient.quantity }}
+{%- endfor %}
+

seed/reports/ingredients.md.jinja

@@ -30,7 +30,7 @@
 
 use clap::{Parser, Subcommand};
 
-use crate::{recipe, search, seed, server, shopping_list, import};
+use crate::{import, recipe, report, search, seed, server, shopping_list};
 
 #[derive(Parser, Debug)]
 #[command(
@@ -71,4 +71,8 @@ pub enum Command {
     /// Import a recipe from a URL
     #[command(alias = "i")]
     Import(import::ImportArgs),
+
+    /// Generate a report from a recipe using a Jinja2 template
+    #[command(alias = "rp")]
+    Report(report::ReportArgs),
 }

src/args.rs

@@ -17,15 +17,17 @@ pub struct ImportArgs {
 pub fn run(_ctx: &Context, args: ImportArgs) -> Result<()> {
     let recipe = tokio::runtime::Runtime::new()?.block_on(async {
         if args.skip_conversion {
-            let recipe = fetch_recipe(&args.url).await.map_err(|e| anyhow::anyhow!("{}", e))?;
+            let recipe = fetch_recipe(&args.url)
+                .await
+                .map_err(|e| anyhow::anyhow!("{}", e))?;
             Ok(format!(
                 "{}\n\n[Ingredients]\n{}\n\n[Instructions]\n{}",
-                recipe.name,
-                recipe.ingredients,
-                recipe.instructions
+                recipe.name, recipe.ingredients, recipe.instructions
             ))
         } else {
-            import_recipe(&args.url).await.map_err(|e| anyhow::anyhow!("{}", e))
+            import_recipe(&args.url)
+                .await
+                .map_err(|e| anyhow::anyhow!("{}", e))
         }
     })?;
 

src/import.rs

@@ -37,12 +37,13 @@ use cooklang::CooklangParser;
 use once_cell::sync::OnceCell;
 
 // commands
+mod import;
 mod recipe;
+mod report;
 mod search;
 mod seed;
 mod server;
 mod shopping_list;
-mod import;
 
 // other modules
 mod args;
@@ -67,6 +68,7 @@ pub fn main() -> Result<()> {
         Command::Seed(args) => seed::run(&ctx, args),
         Command::Search(args) => search::run(&ctx, args),
         Command::Import(args) => import::run(&ctx, args),
+        Command::Report(args) => report::run(&ctx, args),
     }
 }
 

src/main.rs

@@ -0,0 +1,68 @@
+use crate::util::split_recipe_name_and_scaling_factor;
+use anyhow::{Context, Result};
+use camino::Utf8PathBuf;
+use clap::{CommandFactory, Parser};
+use cooklang_reports::{config::Config, render_template_with_config};
+use std::{fs, path::PathBuf};
+
+#[derive(Parser, Debug)]
+pub struct ReportArgs {
+    /// Path to the Jinja2 template file
+    #[arg(short, long)]
+    template: Utf8PathBuf,
+
+    /// Path to the recipe file (can include scaling factor with :N suffix)
+    #[arg()]
+    recipe: String,
+
+    /// Path to the datastore directory (optional)
+    #[arg(short, long)]
+    datastore: Option<Utf8PathBuf>,
+}
+
+pub fn run(_ctx: &crate::Context, args: ReportArgs) -> Result<()> {
+    // Print warning about prototype feature
+    eprintln!("⚠️  Warning: The report command is a prototype feature and will change in future versions.");
+
+    // Split recipe name and scaling factor
+    let (recipe_name, scaling_factor) = split_recipe_name_and_scaling_factor(&args.recipe)
+        .map(|(name, factor)| {
+            let scale = factor.parse::<f64>().unwrap_or_else(|err| {
+                let mut cmd = crate::CliArgs::command();
+                cmd.error(
+                    clap::error::ErrorKind::InvalidValue,
+                    format!("Invalid scaling factor for '{name}': {err}"),
+                )
+                .exit()
+            });
+            (name, scale)
+        })
+        .unwrap_or((&args.recipe, 1.0));
+
+    // Read the recipe file
+    let recipe = fs::read_to_string(recipe_name)
+        .with_context(|| format!("Failed to read recipe file: {}", recipe_name))?;
+
+    // Read the template file
+    let template = fs::read_to_string(&args.template)
+        .with_context(|| format!("Failed to read template file: {}", args.template))?;
+
+    // Create config with scale and optional datastore
+    let mut builder = Config::builder();
+    builder.scale(scaling_factor);
+
+    if let Some(datastore) = args.datastore {
+        builder.datastore_path(PathBuf::from(datastore));
+    }
+
+    let config = builder.build();
+
+    // Render the report
+    let report = render_template_with_config(&recipe, &template, &config)
+        .with_context(|| "Failed to render report from template")?;
+
+    // Print the report
+    println!("{}", report);
+
+    Ok(())
+}