Merge branch 'feature/keywords-rework' into feature/fulltext-search

# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock

cookbook/helper/AllAuthCustomAdapter.py

@@ -7,6 +7,8 @@ from django.contrib import messages
 from django.core.cache import caches
 from gettext import gettext as _
 
+from cookbook.models import InviteLink
+
 
 class AllAuthCustomAdapter(DefaultAccountAdapter):
 
@@ -14,7 +16,11 @@ class AllAuthCustomAdapter(DefaultAccountAdapter):
         """
         Whether to allow sign ups.
         """
-        if request.resolver_match.view_name == 'account_signup' and not settings.ENABLE_SIGNUP:
+        signup_token = False
+        if 'signup_token' in request.session and InviteLink.objects.filter(valid_until__gte=datetime.datetime.today(), used_by=None, uuid=request.session['signup_token']).exists():
+            signup_token = True
+
+        if (request.resolver_match.view_name == 'account_signup' or request.resolver_match.view_name == 'socialaccount_signup') and not settings.ENABLE_SIGNUP and not signup_token:
             return False
         else:
             return super(AllAuthCustomAdapter, self).is_open_for_signup(request)

cookbook/helper/context_processors.py

@@ -6,6 +6,7 @@ def context_settings(request):
         'EMAIL_ENABLED': settings.EMAIL_HOST != '',
         'SIGNUP_ENABLED': settings.ENABLE_SIGNUP,
         'CAPTCHA_ENABLED': settings.HCAPTCHA_SITEKEY != '',
+        'HOSTED': settings.HOSTED,
         'TERMS_URL': settings.TERMS_URL,
         'PRIVACY_URL': settings.PRIVACY_URL,
         'IMPRINT_URL': settings.IMPRINT_URL,

cookbook/helper/image_processing.py

@@ -0,0 +1,45 @@
+import os
+import sys
+
+from PIL import Image
+from io import BytesIO
+
+
+def rescale_image_jpeg(image_object, base_width=720):
+    img = Image.open(image_object)
+    icc_profile = img.info.get('icc_profile')  # remember color profile to not mess up colors
+    width_percent = (base_width / float(img.size[0]))
+    height = int((float(img.size[1]) * float(width_percent)))
+
+    img = img.resize((base_width, height), Image.ANTIALIAS)
+    img_bytes = BytesIO()
+    img.save(img_bytes, 'JPEG', quality=75, optimize=True, icc_profile=icc_profile)
+
+    return img_bytes
+
+
+def rescale_image_png(image_object, base_width=720):
+    basewidth = 720
+    wpercent = (basewidth / float(image_object.size[0]))
+    hsize = int((float(image_object.size[1]) * float(wpercent)))
+    img = image_object.resize((basewidth, hsize), Image.ANTIALIAS)
+
+    im_io = BytesIO()
+    img.save(im_io, 'PNG', quality=70)
+    return img
+
+
+def get_filetype(name):
+    try:
+        return os.path.splitext(name)[1]
+    except:
+        return '.jpeg'
+
+
+def handle_image(request, image_object, filetype='.jpeg'):
+    if sys.getsizeof(image_object) / 8 > 500:
+        if filetype == '.jpeg':
+            return rescale_image_jpeg(image_object), filetype
+        if filetype == '.png':
+            return rescale_image_png(image_object), filetype
+    return image_object, filetype

cookbook/helper/ingredient_parser.py

@@ -1,3 +1,4 @@
+import re
 import string
 import unicodedata
 
@@ -22,20 +23,16 @@ def parse_fraction(x):
 def parse_amount(x):
     amount = 0
     unit = ''
+    note = ''
 
     did_check_frac = False
     end = 0
-    while (
-            end < len(x)
-            and (
-                    x[end] in string.digits
-                    or (
-                            (x[end] == '.' or x[end] == ',' or x[end] == '/')
-                            and end + 1 < len(x)
-                            and x[end + 1] in string.digits
-                    )
-            )
-    ):
+    while (end < len(x) and (x[end] in string.digits
+                             or (
+                                     (x[end] == '.' or x[end] == ',' or x[end] == '/')
+                                     and end + 1 < len(x)
+                                     and x[end + 1] in string.digits
+                             ))):
         end += 1
     if end > 0:
         if "/" in x[:end]:
@@ -55,7 +52,11 @@ def parse_amount(x):
                 unit = x[end + 1:]
             except ValueError:
                 unit = x[end:]
-    return amount, unit
+
+    if unit.startswith('(') or unit.startswith('-'):  # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
+        unit = ''
+        note = x
+    return amount, unit, note
 
 
 def parse_ingredient_with_comma(tokens):
@@ -106,6 +107,13 @@ def parse(x):
     unit = ''
     ingredient = ''
     note = ''
+    unit_note = ''
+
+    # if the string contains parenthesis early on remove it and place it at the end
+    # because its likely some kind of note
+    if re.match('(.){1,6}\s\((.[^\(\)])+\)\s', x):
+        match = re.search('\((.[^\(])+\)', x)
+        x = x[:match.start()] + x[match.end():] + ' ' + x[match.start():match.end()]
 
     tokens = x.split()
     if len(tokens) == 1:
@@ -114,17 +122,17 @@ def parse(x):
     else:
         try:
             # try to parse first argument as amount
-            amount, unit = parse_amount(tokens[0])
+            amount, unit, unit_note = parse_amount(tokens[0])
             # only try to parse second argument as amount if there are at least
             # three arguments if it already has a unit there can't be
             # a fraction for the amount
             if len(tokens) > 2:
                 try:
                     if not unit == '':
-                        # a unit is already found, no need to try the second argument for a fraction  # noqa: E501
+                        # a unit is already found, no need to try the second argument for a fraction
                         # probably not the best method to do it, but I didn't want to make an if check and paste the exact same thing in the else as already is in the except  # noqa: E501
                         raise ValueError
-                    # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'  # noqa: E501
+                    # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'
                     amount += parse_fraction(tokens[1])
                     # assume that units can't end with a comma
                     if len(tokens) > 3 and not tokens[2].endswith(','):
@@ -142,7 +150,10 @@ def parse(x):
                         # try to use second argument as unit and everything else as ingredient, use everything as ingredient if it fails  # noqa: E501
                         try:
                             ingredient, note = parse_ingredient(tokens[2:])
-                            unit = tokens[1]
+                            if unit == '':
+                                unit = tokens[1]
+                            else:
+                                note = tokens[1]
                         except ValueError:
                             ingredient, note = parse_ingredient(tokens[1:])
                     else:
@@ -158,11 +169,16 @@ def parse(x):
                 ingredient, note = parse_ingredient(tokens)
             except ValueError:
                 ingredient = ' '.join(tokens[1:])
+
+    if unit_note not in note:
+        note += ' ' + unit_note
     return amount, unit.strip(), ingredient.strip(), note.strip()
 
 
 # small utility functions to prevent emtpy unit/food creation
 def get_unit(unit, space):
+    if not unit:
+        return None
     if len(unit) > 0:
         u, created = Unit.objects.get_or_create(name=unit, space=space)
         return u
@@ -170,6 +186,8 @@ def get_unit(unit, space):
 
 
 def get_food(food, space):
+    if not food:
+        return None
     if len(food) > 0:
         f, created = Food.objects.get_or_create(name=food, space=space)
         return f

cookbook/helper/permission_helper.py

@@ -1,6 +1,8 @@
 """
 Source: https://djangosnippets.org/snippets/1703/
 """
+from django.conf import settings
+from django.core.cache import caches
 from django.views.generic.detail import SingleObjectTemplateResponseMixin
 from django.views.generic.edit import ModelFormMixin
 
@@ -90,7 +92,18 @@ def share_link_valid(recipe, share):
     :return: true if a share link with the given recipe and uuid exists
     """
     try:
-        return True if ShareLink.objects.filter(recipe=recipe, uuid=share).exists() else False
+        CACHE_KEY = f'recipe_share_{recipe.pk}_{share}'
+        if c := caches['default'].get(CACHE_KEY, False):
+            return c
+
+        if link := ShareLink.objects.filter(recipe=recipe, uuid=share, abuse_blocked=False).first():
+            if 0 < settings.SHARING_LIMIT < link.request_count:
+                return False
+            link.request_count += 1
+            link.save()
+            caches['default'].set(CACHE_KEY, True, timeout=3)
+            return True
+        return False
     except ValidationError:
         return False
 
@@ -121,15 +134,18 @@ class GroupRequiredMixin(object):
     def dispatch(self, request, *args, **kwargs):
         if not has_group_permission(request.user, self.groups_required):
             if not request.user.is_authenticated:
-                messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You are not logged in and therefore cannot view this page!'))
                 return HttpResponseRedirect(reverse_lazy('account_login') + '?next=' + request.path)
             else:
-                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         try:
             obj = self.get_object()
             if obj.get_space() != request.space:
-                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         except AttributeError:
             pass
@@ -141,17 +157,20 @@ class OwnerRequiredMixin(object):
 
     def dispatch(self, request, *args, **kwargs):
         if not request.user.is_authenticated:
-            messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
+            messages.add_message(request, messages.ERROR,
+                                 _('You are not logged in and therefore cannot view this page!'))
             return HttpResponseRedirect(reverse_lazy('account_login') + '?next=' + request.path)
         else:
             if not is_object_owner(request.user, self.get_object()):
-                messages.add_message(request, messages.ERROR, _('You cannot interact with this object as it is not owned by you!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You cannot interact with this object as it is not owned by you!'))
                 return HttpResponseRedirect(reverse('index'))
 
         try:
             obj = self.get_object()
             if obj.get_space() != request.space:
-                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         except AttributeError:
             pass

cookbook/helper/recipe_search.py

@@ -148,3 +148,7 @@ def search_recipes(request, queryset, params):
         queryset = queryset.order_by('-rank')
 
     return queryset
+
+
+# this returns a list of keywords in the queryset and how many times it appears
+# Keyword.objects.filter(recipe__in=queryset).annotate(kw_count=Count('recipe'))

cookbook/helper/recipe_url_import.py

@@ -100,22 +100,21 @@ def get_from_scraper(scrape, space):
         for x in scrape.ingredients():
             try:
                 amount, unit, ingredient, note = parse_single_ingredient(x)
-                if ingredient:
-                    ingredients.append(
-                        {
-                            'amount': amount,
-                            'unit': {
-                                'text': unit,
-                                'id': random.randrange(10000, 99999)
-                            },
-                            'ingredient': {
-                                'text': ingredient,
-                                'id': random.randrange(10000, 99999)
-                            },
-                            'note': note,
-                            'original': x
-                        }
-                    )
+                ingredients.append(
+                    {
+                        'amount': amount,
+                        'unit': {
+                            'text': unit,
+                            'id': random.randrange(10000, 99999)
+                        },
+                        'ingredient': {
+                            'text': ingredient,
+                            'id': random.randrange(10000, 99999)
+                        },
+                        'note': note,
+                        'original': x
+                    }
+                )
             except Exception:
                 ingredients.append(
                     {
@@ -358,3 +357,11 @@ def normalize_string(string):
     unescaped_string = re.sub(r'\n\s*\n', '\n\n', unescaped_string)
     unescaped_string = unescaped_string.replace("\xa0", " ").replace("\t", " ").strip()
     return unescaped_string
+
+
+def iso_duration_to_minutes(string):
+    match = re.match(
+        r'P((?P<years>\d+)Y)?((?P<months>\d+)M)?((?P<weeks>\d+)W)?((?P<days>\d+)D)?T((?P<hours>\d+)H)?((?P<minutes>\d+)M)?((?P<seconds>\d+)S)?',
+        string
+    ).groupdict()
+    return int(match['days'] or 0) * 24 * 60 + int(match['hours'] or 0) * 60 + int(match['minutes'] or 0)

cookbook/helper/scope_middleware.py

@@ -16,7 +16,10 @@ class ScopeMiddleware:
                 with scopes_disabled():
                     return self.get_response(request)
 
-            if request.path.startswith('/signup/'):
+            if request.path.startswith('/signup/') or request.path.startswith('/invite/'):
+                return self.get_response(request)
+
+            if request.path.startswith('/accounts/'):
                 return self.get_response(request)
 
             with scopes_disabled():