From 11cb40702dfb8856b5326b5854703f31838ffaef Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 20 Jun 2022 16:29:33 +0200
Subject: [PATCH] cookmate fixes

---
 cookbook/helper/recipe_url_import.py |  2 +-
 cookbook/integration/cookmate.py     | 34 +++++++++++++++++-----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py
index d6765fb06..f991c17cc 100644
--- a/cookbook/helper/recipe_url_import.py
+++ b/cookbook/helper/recipe_url_import.py
@@ -301,7 +301,7 @@ def parse_servings_text(servings):
             servings = re.sub("\d+", '', servings).strip()
         except Exception:
             servings = ''
-    return servings
+    return servings[:32]
 
 
 def parse_time(recipe_time):
diff --git a/cookbook/integration/cookmate.py b/cookbook/integration/cookmate.py
index e804180a1..940952ce5 100644
--- a/cookbook/integration/cookmate.py
+++ b/cookbook/integration/cookmate.py
@@ -46,22 +46,30 @@ class Cookmate(Integration):
             if len(recipe_xml.find('description')) > 0:
                 recipe.description = recipe_xml.find('description')[0].text[:512]
 
-        for step in recipe_xml.find('recipetext').getchildren():
-            step = Step.objects.create(
-                instruction=step.text.strip(), space=self.request.space,
-            )
-            recipe.steps.add(step)
+        if recipe_text := recipe_xml.find('recipetext'):
+            for step in recipe_text.getchildren():
+                if step.text:
+                    step = Step.objects.create(
+                        instruction=step.text.strip(), space=self.request.space,
+                    )
+                    recipe.steps.add(step)
 
         ingredient_parser = IngredientParser(self.request, True)
 
-        for ingredient in recipe_xml.find('ingredient').getchildren():
-            if ingredient.text.strip() != '':
-                amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip())
-                f = ingredient_parser.get_food(food)
-                u = ingredient_parser.get_unit(unit)
-                recipe.steps.first().ingredients.add(Ingredient.objects.create(
-                    food=f, unit=u, amount=amount, note=note, original_text=ingredient.text.strip(), space=self.request.space,
-                ))
+        if recipe_ingredients := recipe_xml.find('ingredient'):
+            ingredient_step = recipe.steps.first()
+            if ingredient_step is None:
+                ingredient_step = Step.objects.create(space=self.request.space, instruction='')
+
+            for ingredient in recipe_ingredients.getchildren():
+                if ingredient.text:
+                    if ingredient.text.strip() != '':
+                        amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip())
+                        f = ingredient_parser.get_food(food)
+                        u = ingredient_parser.get_unit(unit)
+                        ingredient_step.ingredients.add(Ingredient.objects.create(
+                            food=f, unit=u, amount=amount, note=note, original_text=ingredient.text.strip(), space=self.request.space,
+                        ))
 
         if recipe_xml.find('imageurl') is not None:
             try: