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

importing improvements

Browse Source
This commit is contained in:
vabene1111
2020-06-23 11:04:49 +02:00
parent 8594346488
commit 98c278fe60
5 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/views/api.py
View File

@@ -291,7 +291,7 @@ def recipe_from_url(request, url):
ld_json_item = x
if '@type' in ld_json_item and ld_json_item['@type'] == 'Recipe':
return find_recipe_json(ld_json_item)
return find_recipe_json(ld_json_item, url)
except JSONDecodeError:
JsonResponse({'error': True, 'msg': _('The requested site does not provided malformed data and cannot be read.')}, status=400)
@@ -300,6 +300,6 @@ def recipe_from_url(request, url):
for i in items:
md_json = json.loads(i.json())
if 'schema.org/Recipe' in str(md_json['type']):
return find_recipe_json(md_json['properties'])
return find_recipe_json(md_json['properties'], url)
return JsonResponse({'error': True, 'msg': _('The requested site does not provide any recognized data format to import the recipe from.')}, status=400)

2
cookbook/views/data.py
View File

@@ -101,6 +101,8 @@ def import_url(request):
recipe = Recipe.objects.create(
name=data['name'],
instructions=data['recipeInstructions'],
waiting_time=data['cookTime'],
working_time=data['prepTime'],
internal=True,
created_by=request.user,
)