Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-06 05:55:23 +02:00
Code Issues Releases Activity

fix: Use recipe-parsers nutrients function for nutrition parsing (#5165)

Browse source
This commit is contained in:
Eric Hoffmann 2025-03-03 06:00:17 -08:00 • committed by Ian Pösse-Koch
parent e6287fa7b5
commit 094b14afb7
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mealie/services/scraper/scraper_strategies.py
View file

@ -189,18 +189,18 @@ class RecipeScraperPackage(ABCScraperStrategy):
cook_time = try_get_default( cook_time = try_get_default(
None, "performTime", None, cleaner.clean_time, translator=self.translator None, "performTime", None, cleaner.clean_time, translator=self.translator
) or try_get_default(None, "cookTime", None, cleaner.clean_time, translator=self.translator) ) or try_get_default(scraped_data.cook_time, "cookTime", None, cleaner.clean_time, translator=self.translator)
extras = ScrapedExtras() extras = ScrapedExtras()
extras.set_tags(try_get_default(None, "keywords", "", cleaner.clean_tags)) extras.set_tags(try_get_default(scraped_data.keywords, "keywords", "", cleaner.clean_tags))
recipe = Recipe( recipe = Recipe(
name=try_get_default(scraped_data.title, "name", "No Name Found", cleaner.clean_string), name=try_get_default(scraped_data.title, "name", "No Name Found", cleaner.clean_string),
slug="", slug="",
image=try_get_default(None, "image", None, cleaner.clean_image), image=try_get_default(scraped_data.image, "image", None, cleaner.clean_image),
description=try_get_default(None, "description", "", cleaner.clean_string), description=try_get_default(scraped_data.description, "description", "", cleaner.clean_string),
nutrition=try_get_default(None, "nutrition", None, cleaner.clean_nutrition), nutrition=try_get_default(scraped_data.nutrients, "nutrition", None, cleaner.clean_nutrition),
recipe_yield=try_get_default(scraped_data.yields, "recipeYield", "1", cleaner.clean_string), recipe_yield=try_get_default(scraped_data.yields, "recipeYield", "1", cleaner.clean_string),
recipe_ingredient=try_get_default( recipe_ingredient=try_get_default(
scraped_data.ingredients, scraped_data.ingredients,
@ -209,8 +209,12 @@ class RecipeScraperPackage(ABCScraperStrategy):
cleaner.clean_ingredients, cleaner.clean_ingredients,
), ),
recipe_instructions=get_instructions(), recipe_instructions=get_instructions(),
total_time=try_get_default(None, "totalTime", None, cleaner.clean_time, translator=self.translator), total_time=try_get_default(
prep_time=try_get_default(None, "prepTime", None, cleaner.clean_time, translator=self.translator), scraped_data.total_time, "totalTime", None, cleaner.clean_time, translator=self.translator
),
prep_time=try_get_default(
scraped_data.prep_time, "prepTime", None, cleaner.clean_time, translator=self.translator
),
perform_time=cook_time, perform_time=cook_time,
org_url=url or try_get_default(None, "url", None, cleaner.clean_string), org_url=url or try_get_default(None, "url", None, cleaner.clean_string),
) )