cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed defect in NEVER_UNIT automation

Browse Source
This commit is contained in:
smilerz
2023-05-01 17:00:11 -05:00
parent 8411537f87
commit cde8dd8b53
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cookbook/helper/ingredient_parser.py
View File

@ -158,10 +158,10 @@ class IngredientParser:
end = 0 end = 0
while (end < len(x) and (x[end] in string.digits while (end < len(x) and (x[end] in string.digits
or ( or (
(x[end] == '.' or x[end] == ',' or x[end] == '/') (x[end] == '.' or x[end] == ',' or x[end] == '/')
and end + 1 < len(x) and end + 1 < len(x)
and x[end + 1] in string.digits and x[end + 1] in string.digits
))): ))):
end += 1 end += 1
if end > 0: if end > 0:
if "/" in x[:end]: if "/" in x[:end]:
@ -185,7 +185,8 @@ class IngredientParser:
if unit is not None and unit.strip() == '': if unit is not None and unit.strip() == '':
unit = None unit = None
if unit is not None and (unit.startswith('(') or unit.startswith('-')): # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3 if unit is not None and (unit.startswith('(') or unit.startswith(
'-')): # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
unit = None unit = None
note = x note = x
return amount, unit, note return amount, unit, note
@ -254,7 +255,8 @@ class IngredientParser:
return tokens return tokens
else: else:
if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1__in=[tokens[1], alt_unit], disabled=False).order_by('order').first(): if automation := Automation.objects.filter(space=self.request.space, type=Automation.NEVER_UNIT, param_1__in=[
tokens[1], alt_unit], disabled=False).order_by('order').first():
new_unit = automation.param_2 new_unit = automation.param_2
never_unit = True never_unit = True
@ -275,7 +277,7 @@ class IngredientParser:
return ingredient return ingredient
else: else:
tokens = ingredient.replace(',',' ').split() tokens = ingredient.replace(',', ' ').split()
if self.transpose_words: if self.transpose_words:
filtered_rules = {} filtered_rules = {}
for key, value in self.transpose_words.items(): for key, value in self.transpose_words.items():
@ -284,7 +286,8 @@ class IngredientParser:
for k, v in filtered_rules.items(): for k, v in filtered_rules.items():
ingredient = re.sub(rf"\b({v[0]})\W*({v[1]})\b", r"\2 \1", ingredient) ingredient = re.sub(rf"\b({v[0]})\W*({v[1]})\b", r"\2 \1", ingredient)
else: else:
for rule in Automation.objects.filter(space=self.request.space, type=Automation.TRANSPOSE_WORDS, disabled=False).filter(Q(Q(param_1__in=tokens) | Q(param_2__in=tokens))).order_by('order'): for rule in Automation.objects.filter(space=self.request.space, type=Automation.TRANSPOSE_WORDS, disabled=False).filter(
Q(Q(param_1__in=tokens) | Q(param_2__in=tokens))).order_by('order'):
ingredient = re.sub(rf"\b({v[0]})\W*({v[1]})\b", r"\2 \1", ingredient) ingredient = re.sub(rf"\b({v[0]})\W*({v[1]})\b", r"\2 \1", ingredient)
return ingredient return ingredient
@ -313,8 +316,8 @@ class IngredientParser:
# 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):
match = re.search('\((.[^\(])+\)', ingredient) match = re.search('\\((.[^\\(])+\\)', ingredient)
ingredient = ingredient[:match.start()] + ingredient[match.end():] + ' ' + ingredient[match.start():match.end()] ingredient = ingredient[:match.start()] + ingredient[match.end():] + ' ' + ingredient[match.start():match.end()]
# leading spaces before commas result in extra tokens, clean them out # leading spaces before commas result in extra tokens, clean them out
@ -322,10 +325,10 @@ class IngredientParser:
# handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description # handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description
# "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)" # "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)"
ingredient = re.sub("^(\d+|\d+[\\.,]\d+) - (\d+|\d+[\\.,]\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient) ingredient = re.sub("^(\\d+|\\d+[\\.,]\\d+) - (\\d+|\\d+[\\.,]\\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
# if amount and unit are connected add space in between # if amount and unit are connected add space in between
if re.match('([0-9])+([A-z])+\s', ingredient): if re.match('([0-9])+([A-z])+\\s', ingredient):
ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient) ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient)
ingredient = self.apply_transpose_words_automations(ingredient) ingredient = self.apply_transpose_words_automations(ingredient)