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

more cleanup from ugly merge

Browse Source
This commit is contained in:
smilerz
2021-03-19 13:17:10 -05:00
parent 36841d74af
commit 58e33ef31a
7 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cookbook/views/api.py
View File

@@ -607,9 +607,17 @@ def recipe_from_json(request):
mjson = request.POST['json']
md_json = json.loads(mjson)
if ('@type' in md_json
and md_json['@type'] == 'Recipe'):
return JsonResponse(find_recipe_json(md_json, ''))
for ld_json_item in md_json:
# recipes type might be wrapped in @graph type
if '@graph' in ld_json_item:
for x in md_json['@graph']:
if '@type' in x and x['@type'] == 'Recipe':
md_json = x
if ('@type' in md_json
and md_json['@type'] == 'Recipe'):
return JsonResponse(find_recipe_json(md_json, '', request.space))
return JsonResponse(
{
'error': True,
@@ -698,14 +706,14 @@ def recipe_from_url(request):
@group_required('user')
def recipe_from_html(request):
html_data = request.POST['html_data']
recipe_json, recipe_tree = get_from_raw(html_data)
def manual_recipe_from_json(request):
json_data = request.POST['data']
recipe_json, recipe_tree = get_from_raw(json_data)
if len(recipe_tree) == 0 and len(recipe_json) == 0:
return JsonResponse(
{
'error': True,
'msg': _('The requested page refused to provide any information (Status Code 403).') # noqa: E501
'msg': _('No useable data could be found.') # noqa: E501
},
status=400
)

12
cookbook/views/data.py
View File

@@ -132,13 +132,11 @@ def import_url(request):
recipe.steps.add(step)
for kw in data['keywords']:
# if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
# recipe.keywords.add(k)
# elif data['all_keywords']:
# k = Keyword.objects.create(name=kw['text'], space=request.space)
# recipe.keywords.add(k)
k, created = Keyword.objects.get_or_create(name=kw['text'].strip(), space=request.space)
recipe.keywords.add(k)
if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
recipe.keywords.add(k)
elif data['all_keywords']:
k = Keyword.objects.create(name=kw['text'])
recipe.keywords.add(k)
for ing in data['recipeIngredient']:
ingredient = Ingredient()