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

Fix CodeQL issue with regular expression

Browse Source
This commit is contained in:
Marcus Wolschon
2023-01-15 14:27:55 +01:00
parent 394f24c29f
commit c690bc18a0
3 changed files with 12163 additions and 16677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/ingredient_parser.py
View File

@@ -246,7 +246,7 @@ class IngredientParser:
# 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)"
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 re.match('([0-9])+([A-z])+\s', ingredient):