Merge pull request #501 from smilerz/main_fork

fix json direct import when wrapped in @graph

cookbook/helper/recipe_url_import.py

@@ -214,7 +214,7 @@ def find_recipe_json(ld_json, url, space):
     for key in list(ld_json):
         if key not in [
             'prepTime', 'cookTime', 'image', 'recipeInstructions',
-            'keywords', 'name', 'recipeIngredient', 'servings'
+            'keywords', 'name', 'recipeIngredient', 'servings', 'description'
         ]:
             ld_json.pop(key, None)
 

cookbook/views/api.py

@@ -589,9 +589,17 @@ def recipe_from_json(request):
     mjson = request.POST['json']
 
     md_json = json.loads(mjson)
+    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,