formatting

This commit is contained in:
vabene1111
2021-01-07 22:47:53 +01:00
parent fe3f817bc5
commit e9f2b875b9

View File

@@ -1,6 +1,7 @@
import unicodedata
import string
def parse_fraction(x):
if len(x) == 1 and 'fraction' in unicodedata.decomposition(x):
frac_split = unicodedata.decomposition(x[-1:]).split()
@@ -14,6 +15,7 @@ def parse_fraction(x):
except ZeroDivisionError:
raise ValueError
def parse_amount(x):
amount = 0
unit = ''
@@ -39,11 +41,12 @@ def parse_amount(x):
unit = x[end:]
return amount, unit
def parse_ingredient_with_comma(tokens):
ingredient = ''
note = ''
start = 0
# search for first occurence of an argument ending in a comma
# search for first occurrence of an argument ending in a comma
while start < len(tokens) and not tokens[start].endswith(','):
start += 1
if start == len(tokens):
@@ -54,12 +57,13 @@ def parse_ingredient_with_comma(tokens):
note = ' '.join(tokens[start + 1:])
return ingredient, note
def parse_ingredient(tokens):
ingredient = ''
note = ''
if tokens[-1].endswith(')'):
# Check if the matching opening bracket is in the same token
if ((not tokens[-1].startswith('(')) and ('(' in tokens[-1])):
if (not tokens[-1].startswith('(')) and ('(' in tokens[-1]):
return parse_ingredient_with_comma(tokens)
# last argument ends with closing bracket -> look for opening bracket
start = len(tokens) - 1
@@ -79,6 +83,7 @@ def parse_ingredient(tokens):
ingredient, note = parse_ingredient_with_comma(tokens)
return ingredient, note
def parse(x):
# initialize default values
amount = 0