mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-10 00:28:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

added support for unit/amount at end of ingredient

Browse Source
This commit is contained in:
vabene1111
2022-04-23 13:53:04 +02:00
parent 012a1a7915
commit e0b7d1a8f0
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cookbook/helper/ingredient_parser.py
View File

@@ -219,6 +219,13 @@ class IngredientParser:
if len(ingredient) == 0: if len(ingredient) == 0:
raise ValueError('string to parse cannot be empty') raise ValueError('string to parse cannot be empty')
# some people/languages put amount and unit at the end of the ingredient string
# if something like this is detected move it to the beginning so the parser can handle it
if re.search(r'^([A-z])+(.)*[1-9](\d)*\s([A-z])+', ingredient):
match = re.search(r'[1-9](\d)*\s([A-z])+', ingredient)
print(f'reording from {ingredient} to {ingredient[match.start():match.end()] + " " + ingredient.replace(ingredient[match.start():match.end()], "")}')
ingredient = ingredient[match.start():match.end()] + ' ' + ingredient.replace(ingredient[match.start():match.end()], '')
# if the string contains parenthesis early on remove it and place it at the end # if the string contains parenthesis early on remove it and place it at the end
# because its likely some kind of note # because its likely some kind of note
if re.match('(.){1,6}\s\((.[^\(\)])+\)\s', ingredient): if re.match('(.){1,6}\s\((.[^\(\)])+\)\s', ingredient):

3
cookbook/tests/other/test_ingredient_parser.py
View File

@@ -58,7 +58,7 @@ def test_ingredient_parser():
"2L Wasser": (2, "L", "Wasser", ""), "2L Wasser": (2, "L", "Wasser", ""),
"1 (16 ounce) package dry lentils, rinsed": (1, "package", "dry lentils, rinsed", "16 ounce"), "1 (16 ounce) package dry lentils, rinsed": (1, "package", "dry lentils, rinsed", "16 ounce"),
"2-3 c Water": (2, "c", "Water", "2-3"), "2-3 c Water": (2, "c", "Water", "2-3"),
"Pane (raffermo o secco) 80 g": (0, None, "Pane 80 g", "raffermo o secco"), # TODO this is actually not a good result but currently expected "Pane (raffermo o secco) 80 g": (80, "g", "Pane", "raffermo o secco"),
} }
# for German you could say that if an ingredient does not have # for German you could say that if an ingredient does not have
# an amount # and it starts with a lowercase letter, then that # an amount # and it starts with a lowercase letter, then that
@@ -70,4 +70,5 @@ def test_ingredient_parser():
for key, val in expectations.items(): for key, val in expectations.items():
count += 1 count += 1
parsed = ingredient_parser.parse(key) parsed = ingredient_parser.parse(key)
print(f'testing if {key} becomes {val}')
assert parsed == val assert parsed == val

2
cookbook/views/views.py
View File

@@ -666,7 +666,7 @@ def test(request):
parser = IngredientParser(request, False) parser = IngredientParser(request, False)
data = { data = {
'original': 'Pane (raffermo o secco) 80 g' 'original': 'Creme Frainche'
} }
data['parsed'] = parser.parse(data['original']) data['parsed'] = parser.parse(data['original'])