paprika improvements and importer fixes

cookbook/integration/Pepperplate.py

@@ -44,12 +44,13 @@ def get_recipe_from_file(self, file):
         )
 
         for ingredient in ingredients:
-            amount, unit, ingredient, note = parse(ingredient)
-            f = get_food(ingredient, self.request.space)
-            u = get_unit(unit, self.request.space)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note
-            ))
+            if len(ingredient.strip()) > 0:
+                amount, unit, ingredient, note = parse(ingredient)
+                f = get_food(ingredient, self.request.space)
+                u = get_unit(unit, self.request.space)
+                step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=amount, note=note
+                ))
         recipe.steps.add(step)
 
         return recipe

cookbook/integration/cheftap.py

@@ -45,12 +45,13 @@ def get_recipe_from_file(self, file):
             step.save()
 
         for ingredient in ingredients:
-            amount, unit, ingredient, note = parse(ingredient)
-            f = get_food(ingredient, self.request.space)
-            u = get_unit(unit, self.request.space)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note
-            ))
+            if len(ingredient.strip()) > 0:
+                amount, unit, ingredient, note = parse(ingredient)
+                f = get_food(ingredient, self.request.space)
+                u = get_unit(unit, self.request.space)
+                step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=amount, note=note
+                ))
         recipe.steps.add(step)
 
         return recipe

cookbook/integration/domestica.py

@@ -35,12 +35,13 @@ def get_recipe_from_file(self, file):
             step.instruction += '\n' + file['source']
 
         for ingredient in file['ingredients'].split('\n'):
-            amount, unit, ingredient, note = parse(ingredient)
-            f = get_food(ingredient, self.request.space)
-            u = get_unit(unit, self.request.space)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note
-            ))
+            if len(ingredient.strip()) > 0:
+                amount, unit, ingredient, note = parse(ingredient)
+                f = get_food(ingredient, self.request.space)
+                u = get_unit(unit, self.request.space)
+                step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=amount, note=note
+                ))
         recipe.steps.add(step)
 
         if file['image'] != '':

cookbook/integration/mealmaster.py

@@ -48,12 +48,13 @@ def get_recipe_from_file(self, file):
         )
 
         for ingredient in ingredients:
-            amount, unit, ingredient, note = parse(ingredient)
-            f = get_food(ingredient, self.request.space)
-            u = get_unit(unit, self.request.space)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note
-            ))
+            if len(ingredient.strip()) > 0:
+                amount, unit, ingredient, note = parse(ingredient)
+                f = get_food(ingredient, self.request.space)
+                u = get_unit(unit, self.request.space)
+                step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=amount, note=note
+                ))
         recipe.steps.add(step)
 
         return recipe

cookbook/integration/paprika.py

@@ -1,11 +1,13 @@
 import base64
 import gzip
 import json
+import re
 from io import BytesIO
 
 from cookbook.helper.ingredient_parser import parse, get_food, get_unit
 from cookbook.integration.integration import Integration
-from cookbook.models import Recipe, Step, Ingredient
+from cookbook.models import Recipe, Step, Ingredient, Keyword
+from gettext import gettext as _
 
 
 class Paprika(Integration):
@@ -21,17 +23,49 @@ def get_recipe_from_file(self, file):
                 name=recipe_json['name'].strip(), description=recipe_json['description'].strip(),
                 created_by=self.request.user, internal=True, space=self.request.space)
 
+            try:
+                if re.match(r'([0-9])+\s(.)*', recipe_json['servings'] ):
+                    s = recipe_json['servings'].split(' ')
+                    recipe.servings = s[0]
+                    recipe.servings_text = s[1]
+
+                if len(recipe_json['cook_time'].strip()) > 0:
+                    recipe.waiting_time = re.findall(r'\d+', recipe_json['cook_time'])[0]
+
+                if len(recipe_json['prep_time'].strip()) > 0:
+                    recipe.working_time = re.findall(r'\d+', recipe_json['prep_time'])[0]
+            except Exception:
+                pass
+
+            recipe.save()
+
+            instructions = recipe_json['directions']
+            if len(recipe_json['notes'].strip()) > 0:
+                instructions += '\n\n### ' + _('Notes') + ' \n' + recipe_json['notes']
+
+            if len(recipe_json['nutritional_info'].strip()) > 0:
+                instructions += '\n\n### ' + _('Nutritional Information') + ' \n' + recipe_json['nutritional_info']
+
+            if len(recipe_json['source'].strip()) > 0 or len(recipe_json['source_url'].strip()) > 0:
+                instructions += '\n\n### ' + _('Source') + ' \n' + recipe_json['source'].strip() + ' \n' + recipe_json['source_url'].strip()
+
             step = Step.objects.create(
-                instruction=recipe_json['directions'] + '\n\n' + recipe_json['nutritional_info']
+                instruction=instructions
             )
 
+            if 'categories' in recipe_json:
+                for c in recipe_json['categories']:
+                    keyword, created = Keyword.objects.get_or_create(name=c.strip(), space=self.request.space)
+                    recipe.keywords.add(keyword)
+
             for ingredient in recipe_json['ingredients'].split('\n'):
-                amount, unit, ingredient, note = parse(ingredient)
-                f = get_food(ingredient, self.request.space)
-                u = get_unit(unit, self.request.space)
-                step.ingredients.add(Ingredient.objects.create(
-                    food=f, unit=u, amount=amount, note=note
-                ))
+                if len(ingredient.strip()) > 0:
+                    amount, unit, ingredient, note = parse(ingredient)
+                    f = get_food(ingredient, self.request.space)
+                    u = get_unit(unit, self.request.space)
+                    step.ingredients.add(Ingredient.objects.create(
+                        food=f, unit=u, amount=amount, note=note
+                    ))
 
             recipe.steps.add(step)
 

cookbook/integration/rezkonv.py

@@ -47,12 +47,13 @@ def get_recipe_from_file(self, file):
         )
 
         for ingredient in ingredients:
-            amount, unit, ingredient, note = parse(ingredient)
-            f = get_food(ingredient, self.request.space)
-            u = get_unit(unit, self.request.space)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note
-            ))
+            if len(ingredient.strip()) > 0:
+                amount, unit, ingredient, note = parse(ingredient)
+                f = get_food(ingredient, self.request.space)
+                u = get_unit(unit, self.request.space)
+                step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=amount, note=note
+                ))
         recipe.steps.add(step)
 
         return recipe

cookbook/views/import_export.py

@@ -64,7 +64,7 @@ def import_recipe(request):
                 files = []
                 for f in request.FILES.getlist('files'):
                     files.append({'file': BytesIO(f.read()), 'name': f.name})
-                t = threading.Thread(target=integration.do_import, args=[files, il, form['duplicates']])
+                t = threading.Thread(target=integration.do_import, args=[files, il, form.cleaned_data['duplicates']])
                 t.setDaemon(True)
                 t.start()