Merge branch 'develop'

Bump recipe-scrapers from 13.18.0 to 13.19.0

.github/workflows/docker-publish-beta.yml

@@ -35,8 +35,8 @@ jobs:
           publish: true
           imageName: vabene1111/recipes
           tag: beta
-          dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
-          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
       # Send discord notification
       - name: Discord notification
         env:

.github/workflows/docker-publish-latest.yml

@@ -39,6 +39,5 @@ jobs:
           publish: true
           imageName: vabene1111/recipes
           tag: latest
-          platform: linux/amd64,linux/arm64
-          dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
-          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/docker-publish-release.yml

@@ -41,7 +41,6 @@ jobs:
           publish: true
           imageName: vabene1111/recipes
           tag: ${{ steps.get_version.outputs.VERSION }}
-          platform: linux/amd64,linux/arm64
           dockerUser: ${{ secrets.DOCKER_USERNAME }}
           dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
       # Send discord notification

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.10-alpine3.15
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography openldap
 
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
@@ -15,13 +15,12 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
-RUN sed -i '/cryptography==/d' ./requirements.txt
-
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev python3-dev libffi-dev cargo openldap-dev && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev python3-dev && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
     venv/bin/pip install wheel==0.37.1 && \
+    venv/bin/pip install setuptools_rust==1.1.2 && \
     venv/bin/pip install -r requirements.txt --no-cache-dir &&\
     apk --purge del .build-deps
 

boot.sh

@@ -21,18 +21,23 @@ if [ -z "${SECRET_KEY}" ]; then
     display_warning "The environment variable 'SECRET_KEY' is not set but REQUIRED for running Tandoor!"
 fi
 
-# POSTGRES_PASSWORD must be set in .env file
-if [ -z "${POSTGRES_PASSWORD}" ]; then
-    display_warning "The environment variable 'POSTGRES_PASSWORD' is not set but REQUIRED for running Tandoor!"
-fi
 
 echo "Waiting for database to be ready..."
 
 attempt=0
 max_attempts=20
-while pg_isready --host=${POSTGRES_HOST} -q; status=$?; attempt=$((attempt+1)); [ $status -ne 0 ] && [ $attempt -le $max_attempts ]; do
-    sleep 5
-done
+
+if [ "${DB_ENGINE}" != 'django.db.backends.sqlite3' ]; then
+
+  # POSTGRES_PASSWORD must be set in .env file
+  if [ -z "${POSTGRES_PASSWORD}" ]; then
+      display_warning "The environment variable 'POSTGRES_PASSWORD' is not set but REQUIRED for running Tandoor!"
+  fi
+
+  while pg_isready --host=${POSTGRES_HOST} --port=${POSTGRES_PORT} -q; status=$?; attempt=$((attempt+1)); [ $status -ne 0 ] && [ $attempt -le $max_attempts ]; do
+      sleep 5
+  done
+fi
 
 if [ $attempt -gt $max_attempts ]; then
     echo -e "\nDatabase not reachable. Maximum attempts exceeded."
@@ -58,4 +63,4 @@ echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles
 
-exec gunicorn -b :$TANDOOR_PORT --access-logfile - --error-logfile - --log-level INFO recipes.wsgi
+exec gunicorn -b :$TANDOOR_PORT --access-logfile - --error-logfile - --log-level INFO recipes.wsgi

cookbook/helper/recipe_search.py

@@ -89,7 +89,10 @@ class RecipeSearch():
 
         self._search_type = self._search_prefs.search or 'plain'
         if self._string:
-            self._unaccent_include = self._search_prefs.unaccent.values_list('field', flat=True)
+            if self._postgres:
+                self._unaccent_include = self._search_prefs.unaccent.values_list('field', flat=True)
+            else:
+                self._unaccent_include = []
             self._icontains_include = [x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.icontains.values_list('field', flat=True)]
             self._istartswith_include = [x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.istartswith.values_list('field', flat=True)]
             self._trigram_include = None
@@ -726,9 +729,8 @@ class RecipeFacet():
         return self.get_facets()
 
     def _recipe_count_queryset(self, field, depth=1, steplen=4):
-        return Recipe.objects.filter(**{f'{field}__path__startswith': OuterRef('path')}, id__in=self._recipe_list, space=self._request.space
-                                     ).values(child=Substr(f'{field}__path',  1, steplen*depth)
-                                              ).annotate(count=Count('pk', distinct=True)).values('count')
+        return Recipe.objects.filter(**{f'{field}__path__startswith': OuterRef('path'), f'{field}__depth__gte': depth}, id__in=self._recipe_list, space=self._request.space
+                                     ).annotate(count=Coalesce(Func('pk', function='Count'), 0)).values('count')
 
     def _keyword_queryset(self, queryset, keyword=None):
         depth = getattr(keyword, 'depth', 0) + 1

cookbook/helper/recipe_url_import.py

@@ -3,8 +3,8 @@ import re
 from html import unescape
 from unicodedata import decomposition
 
-from django.utils.translation import gettext as _
 from django.utils.dateparse import parse_duration
+from django.utils.translation import gettext as _
 from isodate import parse_duration as iso_parse_duration
 from isodate.isoerror import ISO8601Error
 from recipe_scrapers._utils import get_minutes
@@ -28,9 +28,14 @@ def get_from_scraper(scrape, request):
             recipe_json['name'] = ''
 
     try:
-        description = scrape.schema.data.get("description") or ''
+        description = scrape.description()  or None
     except Exception:
-        description = ''
+        description = None
+    if not description:
+        try:
+            description = scrape.schema.data.get("description") or ''
+        except Exception:
+            description = ''
 
     recipe_json['description'] = parse_description(description)
 
@@ -51,20 +56,26 @@ def get_from_scraper(scrape, request):
     recipe_json['servings'] = max(servings, 1)
 
     try:
-        recipe_json['prepTime'] = get_minutes(scrape.schema.data.get("prepTime")) or 0
+        recipe_json['prepTime'] = get_minutes(scrape.prep_time()) or 0
     except Exception:
-        recipe_json['prepTime'] = 0
+        try:
+            recipe_json['prepTime'] = get_minutes(scrape.schema.data.get("prepTime")) or 0
+        except Exception:
+            recipe_json['prepTime'] = 0
     try:
-        recipe_json['cookTime'] = get_minutes(scrape.schema.data.get("cookTime")) or 0
+        recipe_json['cookTime'] = get_minutes(scrape.cook_time()) or 0
     except Exception:
-        recipe_json['cookTime'] = 0
+        try:
+            recipe_json['cookTime'] = get_minutes(scrape.schema.data.get("cookTime")) or 0
+        except Exception:
+            recipe_json['cookTime'] = 0
 
     if recipe_json['cookTime'] + recipe_json['prepTime'] == 0:
         try:
             recipe_json['prepTime'] = get_minutes(scrape.total_time()) or 0
         except Exception:
             try:
-                get_minutes(scrape.schema.data.get("totalTime")) or 0
+                recipe_json['prepTime'] = get_minutes(scrape.schema.data.get("totalTime")) or 0
             except Exception:
                 pass
 
@@ -85,15 +96,23 @@ def get_from_scraper(scrape, request):
     except Exception:
         pass
     try:
-        if scrape.schema.data.get('recipeCategory'):
-            keywords += listify_keywords(scrape.schema.data.get("recipeCategory"))
+        if scrape.category():
+            keywords += listify_keywords(scrape.category())
     except Exception:
-        pass
+        try:
+            if scrape.schema.data.get('recipeCategory'):
+                keywords += listify_keywords(scrape.schema.data.get("recipeCategory"))
+        except Exception:
+            pass
     try:
-        if scrape.schema.data.get('recipeCuisine'):
-            keywords += listify_keywords(scrape.schema.data.get("recipeCuisine"))
+        if scrape.cuisine():
+            keywords += listify_keywords(scrape.cuisine())
     except Exception:
-        pass
+        try:
+            if scrape.schema.data.get('recipeCuisine'):
+                keywords += listify_keywords(scrape.schema.data.get("recipeCuisine"))
+        except Exception:
+            pass
     try:
         recipe_json['keywords'] = parse_keywords(list(set(map(str.casefold, keywords))), request.space)
     except AttributeError:
@@ -146,9 +165,9 @@ def get_from_scraper(scrape, request):
     except Exception:
         recipe_json['recipeInstructions'] = ""
 
-    if scrape.url:
-        recipe_json['url'] = scrape.url
-        recipe_json['recipeInstructions'] += "\n\n" + _("Imported from") + ": " + scrape.url
+    if scrape.canonical_url():
+        recipe_json['url'] = scrape.canonical_url()
+        recipe_json['recipeInstructions'] += "\n\n" + _("Imported from") + ": " + scrape.canonical_url()
     return recipe_json
 
 

requirements.txt

@@ -22,13 +22,14 @@ webdavclient3==3.14.6
 whitenoise==5.3.0
 icalendar==4.0.9
 pyyaml==6.0
+uritemplate==4.1.1
 beautifulsoup4==4.10.0
 microdata==0.8.0
 Jinja2==3.0.3
 django-webpack-loader==1.4.1
 django-js-reverse==0.9.1
 django-allauth==0.47.0
-recipe-scrapers==13.18.0
+recipe-scrapers==13.19.0
 django-scopes==1.2.0
 pytest==6.2.5
 pytest-django==4.5.2

vue/src/components/MealPlanEditModal.vue

@@ -206,7 +206,7 @@ export default {
             }
             if (!cancel) {
                 this.$bvModal.hide(`edit-modal`)
-                this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.entryEditing.addshopping && !this.autoMealPlan } })
+                this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.mealplan_settings.addshopping && !this.autoMealPlan } })
             }
         },
         deleteEntry() {