diff --git a/comfyrecipes/parsing.py b/comfyrecipes/parsing.py
index 7f73140..6778e05 100644
--- a/comfyrecipes/parsing.py
+++ b/comfyrecipes/parsing.py
@@ -289,7 +289,7 @@ class Recipe(Element):
source: Optional[SafeHTML],
ingredients: List[IngredientInstance],
subrecipes: List["Recipe"],
- price: Optional["PriceDB"],
+ price: Optional["MultiPriceDB"],
stepsections: List[StepSection],
) -> None:
super().__init__(ctx)
@@ -317,7 +317,7 @@ class Recipe(Element):
rp = Recipe.from_dict(ctx, partdct)
subrecipes.append(rp)
- price: Optional[PriceDB] = None
+ price: Optional[MultiPriceDB] = None
pricex: float = 0
ingswithprice = 0
ingswithoutprice = 0
@@ -335,16 +335,22 @@ class Recipe(Element):
# we don't know how to convert currencies yet
currency = None
break
- if currency is None or ingswithoutprice != 0 or len(ingredients) == 0:
+ if currency is None or len(ingredients) == 0:
price = None
else:
- price = PriceDB(
+ pricedb = PriceDB(
ctx=ctx,
price=pricex,
amount=1,
unit=ctx.default_unit,
currency=currency,
)
+ price = MultiPriceDB(
+ ctx=ctx,
+ pricedb=pricedb,
+ item_count=len(ingredients),
+ item_prices_missing=ingswithoutprice,
+ )
stepsections: List[StepSection] = []
if "steps" in dct:
@@ -594,3 +600,16 @@ class PriceDB(Element):
if currency is None:
raise RuntimeError("currency not specified and default_currency is also not set")
return cls(ctx=ctx, price=price, amount=amount, unit=unit, currency=currency)
+
+class MultiPriceDB(Element):
+ def __init__(
+ self,
+ ctx: Context,
+ pricedb: PriceDB,
+ item_count: int,
+ item_prices_missing: int,
+ ) -> None:
+ super().__init__(ctx)
+ self.pricedb = pricedb
+ self.item_count = item_count
+ self.item_prices_missing = item_prices_missing
diff --git a/comfyrecipes/templates/base.html b/comfyrecipes/templates/base.html
index 720c2a8..b85b929 100644
--- a/comfyrecipes/templates/base.html
+++ b/comfyrecipes/templates/base.html
@@ -1,6 +1,17 @@
{% macro price(price) -%}
{% if price != None and price is defined and price.price is defined %}{{price.price|round(1)|numprint}}{%else%}?{% endif %} {{price.currency}}
{%- endmacro %}
+{% macro multiprice(multiprice, shortform) -%}
+{% if multiprice != None and multiprice.pricedb != None and multiprice.pricedb is defined and multiprice.pricedb.price is defined -%}
+{{multiprice.pricedb.price|round(1)|numprint}}
+{%else%}
+?
+{%- endif %}
+ {{multiprice.pricedb.currency}}
+{%if multiprice.item_prices_missing != 0 and not shortform%}
+({{multiprice.item_prices_missing}}/{{multiprice.item_count}} prices missing)
+{%endif%}
+{%- endmacro %}
diff --git a/comfyrecipes/templates/index.html b/comfyrecipes/templates/index.html
index 9a38e25..eaccdb5 100644
--- a/comfyrecipes/templates/index.html
+++ b/comfyrecipes/templates/index.html
@@ -3,6 +3,6 @@
{%block body %}
Recipes
{% for recipe in recipes %}
- {% if recipe.price != None %}{{price(recipe.price)}} {%endif%}{{ recipe.title }}
+ {% if recipe.price != None %}{{multiprice(recipe.price, true)}} {%endif%}{{ recipe.title }}
{% endfor %}
{%endblock%}
diff --git a/comfyrecipes/templates/recipe.html b/comfyrecipes/templates/recipe.html
index 2ffc5b1..81e7591 100644
--- a/comfyrecipes/templates/recipe.html
+++ b/comfyrecipes/templates/recipe.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% macro ingredientpart(ing) -%}
-{% if recipe.price != None %}{{price(ing.price)}} {%endif%}
+{% if ing.price != None %}{{price(ing.price)}} {%endif%}
{% if ing.amount != None %} {{ing.amount|amountprint}}
{% if ing.unit != None %} {{ing.unit.name}}{% endif %}
{%endif%}
@@ -29,7 +29,10 @@
{% for ing in rec.ingredients %}
{{ingredient(ing)}}
{% endfor %}
-{% if rec.price != None %}price: {{price(rec.price)}}{%endif%}
+{% if rec.price != None %}
+
+price: {{multiprice(rec.price)}}
+{%endif%}
{% endif %}
{% if rec.stepsections|length != 0 %}
Steps