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

ingredient editor and parser

Browse Source
This commit is contained in:
vabene1111
2022-04-23 19:58:35 +02:00
parent b9fb78c24d
commit 825b7b7cf9
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/ingredient_parser.py
View File

@@ -221,7 +221,7 @@ class IngredientParser:
# some people/languages put amount and unit at the end of the ingredient string # 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 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): if len(ingredient) < 1000 and re.search(r'^([A-z])+(.)*[1-9](\d)*\s([A-z])+', ingredient):
match = re.search(r'[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()], "")}') 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()], '') ingredient = ingredient[match.start():match.end()] + ' ' + ingredient.replace(ingredient[match.start():match.end()], '')

6
vue/src/apps/IngredientEditorView/IngredientEditorView.vue
View File

@@ -7,7 +7,8 @@
<generic-multiselect @change="food = $event.val; refreshList()" ref="food_multiselect" <generic-multiselect @change="food = $event.val; refreshList()" ref="food_multiselect"
:model="Models.FOOD" :model="Models.FOOD"
:initial_single_selection="food" :initial_single_selection="food"
:multiple="false"></generic-multiselect> :multiple="false"
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"></generic-multiselect>
<b-input-group-append> <b-input-group-append>
<b-dropdown no-caret right :disabled="food === null"> <b-dropdown no-caret right :disabled="food === null">
@@ -45,7 +46,8 @@
:model="Models.UNIT" :model="Models.UNIT"
ref="unit_multiselect" ref="unit_multiselect"
:initial_single_selection="unit" :initial_single_selection="unit"
:multiple="false"></generic-multiselect> :multiple="false"
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"></generic-multiselect>
<b-input-group-append> <b-input-group-append>
<b-dropdown no-caret right :disabled="unit === null"> <b-dropdown no-caret right :disabled="unit === null">