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

Merge branch 'develop' into feature/spaces

Browse Source 
# Conflicts:
#	cookbook/views/data.py
#	cookbook/views/views.py
This commit is contained in:
vabene1111
2021-02-25 15:59:32 +01:00
parent 59cc22a877 59b2da933d
commit 29ab6cfb2d
19 changed files with 2353 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cookbook/helper/recipe_url_import.py
View File

@@ -69,8 +69,10 @@ def find_recipe_json(ld_json, url, space):
if 'recipeIngredient' in ld_json:
# some pages have comma separated ingredients in a single array entry
if (len(ld_json['recipeIngredient']) == 1
and len(ld_json['recipeIngredient'][0]) > 30):
and type(ld_json['recipeIngredient']) == list):
ld_json['recipeIngredient'] = ld_json['recipeIngredient'][0].split(',') # noqa: E501
elif type(ld_json['recipeIngredient']) == str:
ld_json['recipeIngredient'] = ld_json['recipeIngredient'].split(',')
for x in ld_json['recipeIngredient']:
if '\n' in x:
@@ -218,13 +220,15 @@ def find_recipe_json(ld_json, url, space):
else:
ld_json['prepTime'] = 0
ld_json['servings'] = 1
try:
if 'recipeYield' in ld_json:
if type(ld_json['recipeYield']) == str:
ld_json['servings'] = int(re.findall(r'\b\d+\b', ld_json['recipeYield'])[0])
elif type(ld_json['recipeYield']) == list:
ld_json['servings'] = int(re.findall(r'\b\d+\b', ld_json['recipeYield'][0])[0])
except Exception as e:
print(e)
ld_json['servings'] = 1
for key in list(ld_json):
if key not in [