work in progress, playing around

.dockerignore

@@ -3,6 +3,7 @@ npm-debug.log
 Dockerfile*
 docker-compose*
 .dockerignore
+.git
 .gitignore
 README.md
 LICENSE

.env.template

@@ -2,10 +2,6 @@
 # when unset: 1 (true) - dont unset this, just for development
 DEBUG=0
 SQL_DEBUG=0
-DEBUG_TOOLBAR=0
-# Gunicorn log level for debugging (default value is "info" when unset)
-# (see https://docs.gunicorn.org/en/stable/settings.html#loglevel for available settings)
-# GUNICORN_LOG_LEVEL="debug"
 
 # HTTP port to bind to
 # TANDOOR_PORT=8080
@@ -13,18 +9,9 @@ DEBUG_TOOLBAR=0
 # hosts the application can run under e.g. recipes.mydomain.com,cooking.mydomain.com,...
 ALLOWED_HOSTS=*
 
-# Cross Site Request Forgery protection
-# (https://docs.djangoproject.com/en/4.2/ref/settings/#std-setting-CSRF_TRUSTED_ORIGINS)
-# CSRF_TRUSTED_ORIGINS = []
-
-# Cross Origin Resource Sharing
-# (https://github.com/adamchainz/django-cors-header)
-# CORS_ALLOW_ALL_ORIGINS = True
-
 # random secret key, use for example `base64 /dev/urandom | head -c50` to generate one
-# ---------------------------- AT LEAST ONE REQUIRED -------------------------
+# ---------------------------- REQUIRED -------------------------
 SECRET_KEY=
-SECRET_KEY_FILE=
 # ---------------------------------------------------------------
 
 # your default timezone See https://timezonedb.com/time-zones for a list of timezones
@@ -36,9 +23,8 @@ DB_ENGINE=django.db.backends.postgresql
 POSTGRES_HOST=db_recipes
 POSTGRES_PORT=5432
 POSTGRES_USER=djangouser
-# ---------------------------- AT LEAST ONE REQUIRED -------------------------
+# ---------------------------- REQUIRED -------------------------
 POSTGRES_PASSWORD=
-POSTGRES_PASSWORD_FILE=
 # ---------------------------------------------------------------
 POSTGRES_DB=djangodb
 
@@ -110,12 +96,10 @@ GUNICORN_MEDIA=0
 # prefix used for account related emails (default "[Tandoor Recipes] ")
 # ACCOUNT_EMAIL_SUBJECT_PREFIX=
 
-# allow authentication via the REMOTE-USER header (can be used for e.g. authelia).
-# ATTENTION: Leave off if you don't know what you are doing! Enabling this without proper configuration will enable anybody
-#   to login with any username!
-# See docs for additional information: https://docs.tandoor.dev/features/authentication/#reverse-proxy-authentication
+# allow authentication via reverse proxy (e.g. authelia), leave off if you dont know what you are doing
+# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
 # when unset: 0 (false)
-REMOTE_USER_AUTH=0
+REVERSE_PROXY_AUTH=0
 
 # Default settings for spaces, apply per space and can be changed in the admin view
 # SPACE_DEFAULT_MAX_RECIPES=0 # 0=unlimited recipes
@@ -123,8 +107,7 @@ REMOTE_USER_AUTH=0
 # SPACE_DEFAULT_MAX_FILES=0 # Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.
 # SPACE_DEFAULT_ALLOW_SHARING=1 # Allow users to share recipes with public links
 
-# allow people to create local accounts on your application instance (without an invite link)
-# social accounts will always be able to sign up
+# allow people to create accounts on your application instance (without an invite link)
 # when unset: 0 (false)
 # ENABLE_SIGNUP=0
 
@@ -143,7 +126,7 @@ REMOTE_USER_AUTH=0
 # ENABLE_METRICS=0
 
 # allows you to setup OAuth providers
-# see docs for more information https://docs.tandoor.dev/features/authentication/
+# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
 # SOCIAL_PROVIDERS = allauth.socialaccount.providers.github, allauth.socialaccount.providers.nextcloud,
 
 # Should a newly created user from a social provider get assigned to the default space and given permission by default ?
@@ -174,7 +157,6 @@ REMOTE_USER_AUTH=0
 #AUTH_LDAP_BIND_PASSWORD=
 #AUTH_LDAP_USER_SEARCH_BASE_DN=
 #AUTH_LDAP_TLS_CACERTFILE=
-#AUTH_LDAP_START_TLS=
 
 # Enables exporting PDF (see export docs)
 # Disabled by default, uncomment to enable

.github/dependabot.yml

@@ -14,8 +14,3 @@ updates:
     directory: "/vue/"
     schedule:
       interval: "monthly"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"

.github/workflows/build-docker-open-data.yml

@@ -1,110 +0,0 @@
-name: Build Docker Container with open data plugin installed
-
-on: push
-
-jobs:
-  build-container:
-    name: Build ${{ matrix.name }} Container
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'TandoorRecipes'
-    continue-on-error: ${{ matrix.continue-on-error }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include:
-          # Standard build config
-          - name: Standard
-            dockerfile: Dockerfile
-            platforms: linux/amd64,linux/arm64
-            suffix: ""
-            continue-on-error: false
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get version number
-        id: get_version
-        run: |
-          if [[ "$GITHUB_REF" = refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
-          elif [[ "$GITHUB_REF" = refs/heads/beta ]]; then
-            echo VERSION=beta >> $GITHUB_OUTPUT
-          else
-            echo VERSION=develop >> $GITHUB_OUTPUT
-          fi
-
-      # clone open data plugin
-      - name: clone open data plugin repo
-        uses: actions/checkout@master
-        with:
-          repository: TandoorRecipes/open_data_plugin
-          ref: master
-          path: ./recipes/plugins/open_data_plugin
-
-      # Build Vue frontend
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: yarn
-          cache-dependency-path: vue/yarn.lock
-      - name: Install dependencies
-        working-directory: ./vue
-        run: yarn install --frozen-lockfile
-      - name: Build dependencies
-        working-directory: ./vue
-        run: yarn build
-
-      - name: Setup Open Data Plugin Links
-        working-directory: ./recipes/plugins/open_data_plugin
-        run: python setup_repo.py
-        
-      - name: Build Open Data Frontend
-        working-directory: ./recipes/plugins/open_data_plugin/vue
-        run: yarn build
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            vabene1111/recipes
-            ghcr.io/TandoorRecipes/recipes
-          flavor: |
-            latest=false
-            suffix=${{ matrix.suffix }}
-          tags: |
-            type=raw,value=latest,suffix=-open-data-plugin,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=semver,suffix=-open-data-plugin,pattern={{version}}
-            type=semver,suffix=-open-data-plugin,pattern={{major}}.{{minor}}
-            type=semver,suffix=-open-data-plugin,pattern={{major}}
-            type=ref,suffix=-open-data-plugin,event=branch
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ matrix.dockerfile }}
-          pull: true
-          push: ${{ github.secret_source == 'Actions' }}
-          platforms: ${{ matrix.platforms }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/build-docker.yml

@@ -1,126 +0,0 @@
-name: Build Docker Container
-
-on: push
-
-jobs:
-  build-container:
-    name: Build ${{ matrix.name }} Container
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'TandoorRecipes'
-    continue-on-error: ${{ matrix.continue-on-error }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include:
-          # Standard build config
-          - name: Standard
-            dockerfile: Dockerfile
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-            suffix: ""
-            continue-on-error: false
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get version number
-        id: get_version
-        run: |
-          if [[ "$GITHUB_REF" = refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
-          elif [[ "$GITHUB_REF" = refs/heads/beta ]]; then
-            echo VERSION=beta >> $GITHUB_OUTPUT
-          else
-            echo VERSION=develop >> $GITHUB_OUTPUT
-          fi
-
-      # Build Vue frontend
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: yarn
-          cache-dependency-path: vue/yarn.lock
-      - name: Install dependencies
-        working-directory: ./vue
-        run: yarn install --frozen-lockfile
-      - name: Build dependencies
-        working-directory: ./vue
-        run: yarn build
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            vabene1111/recipes
-            ghcr.io/TandoorRecipes/recipes
-          flavor: |
-            latest=false
-            suffix=${{ matrix.suffix }}
-          tags: |
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=ref,event=branch
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ matrix.dockerfile }}
-          pull: true
-          push: ${{ github.secret_source == 'Actions' }}
-          platforms: ${{ matrix.platforms }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  notify-stable:
-    name: Notify Stable
-    runs-on: ubuntu-latest
-    needs: build-container
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Set tag name
-        run: |
-          # Strip "refs/tags/" prefix
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      # Send stable discord notification
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: '🚀 Version {{ VERSION }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ VERSION }}'
-
-  notify-beta:
-    name: Notify Beta
-    runs-on: ubuntu-latest
-    needs: build-container
-    if: github.ref == 'refs/heads/beta'
-    steps:
-      # Send beta discord notification
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_BETA_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: '🚀 The BETA Image has been updated! 🥳'

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: Continuous Integration
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
@@ -12,15 +12,15 @@ jobs:
         python-version: ['3.10']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1
     - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v1
       with:
         python-version: '3.10'
     # Build Vue frontend
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v2
       with:
-        node-version: '18'
+        node-version: '14'
     - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install
@@ -30,7 +30,7 @@ jobs:
     - name: Install Django dependencies
       run: |
         sudo apt-get -y update
-        sudo apt-get install -y libsasl2-dev python3-dev libldap2-dev libssl-dev
+        sudo apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         python3 manage.py collectstatic --noinput

.github/workflows/codeql-analysis.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -25,7 +25,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v1
         # Override language selection by uncommenting this and choosing your languages
         with:
           languages: python, javascript
@@ -47,6 +47,6 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v1
         with:
           languages: javascript, python

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

@@ -0,0 +1,48 @@
+name: publish beta raspi image docker
+on:
+  push:
+    branches:
+      - 'beta'
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = 'beta'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          tag: beta-raspi
+          dockerFile: Dockerfile-raspi
+          platform: linux/arm/v7
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
+      # Send discord notification
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_BETA_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: '🚀 The BETA Image has been updated! 🥳'

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

@@ -0,0 +1,47 @@
+name: publish beta image docker
+on:
+  push:
+    branches:
+      - 'beta'
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = 'beta'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          tag: beta
+          platform: linux/amd64,linux/arm64
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
+      # Send discord notification
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_BETA_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: '🚀 The BETA Image has been updated! 🥳'

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

@@ -0,0 +1,42 @@
+name: publish dev image docker
+on:
+  push:
+    branches:
+      - '*'
+      - '*/*'
+      - '!master'
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = 'develop'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Clear Cache
+        working-directory: ./vue
+        run: yarn cache clean --all
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.13
+        with:
+          name: vabene1111/recipes
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,45 @@
+name: publish latest raspi image docker
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Get version number
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}-raspi
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}-raspi'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          dockerFile: Dockerfile-raspi
+          platform: linux/arm/v7
+          tag: latest-raspi
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,44 @@
+name: publish latest image docker
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Get version number
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          platform: linux/amd64,linux/arm64
+          tag: latest
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,47 @@
+name: publish tagged raspi release docker
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    name: Build image job
+    steps:
+      - name: Checkout master
+        uses: actions/checkout@master
+      - name: Get version number
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          dockerFile: Dockerfile-raspi
+          platform: linux/arm/v7
+          tag: ${{ steps.get_version.outputs.VERSION }}-raspi
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,53 @@
+name: publish tagged release docker
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    name: Build image job
+    steps:
+      - name: Checkout master
+        uses: actions/checkout@master
+      - name: Get version number
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: recipes/version.py
+          contents: |
+            VERSION_NUMBER = '${{ steps.get_version.outputs.VERSION }}'
+            BUILD_REF = '${{ github.sha }}'
+          write-mode: overwrite
+      # Build Vue frontend
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+      # Build container
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          platform: linux/amd64,linux/arm64
+          tag: ${{ steps.get_version.outputs.VERSION }}
+          dockerUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
+      # Send discord notification
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: '🚀 Version {{ EVENT_PAYLOAD.release.tag_name }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}'

.github/workflows/docs.yml

@@ -9,8 +9,8 @@ jobs:
     if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-include-markdown-plugin

.gitignore

@@ -74,16 +74,13 @@ mediafiles/
 \.env
 staticfiles/
 postgresql/
-data/
 
 
 /docker-compose.override.yml
 vue/node_modules
-plugins
 .vscode/
 vetur.config.js
 cookbook/static/vue
 vue/webpack-stats.json
 cookbook/templates/sw.js
 .prettierignore
-vue/.yarn

.idea/dictionaries/vaben.xml

@@ -1,8 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="vaben">
-    <words>
-      <w>pinia</w>
-      <w>selfhosted</w>
-    </words>
-  </dictionary>
-</component>

.idea/dictionaries/vabene1111_PC.xml

@@ -3,6 +3,8 @@
     <words>
       <w>autosync</w>
       <w>chowdown</w>
+      <w>cookingmachine</w>
+      <w>cookit</w>
       <w>csrftoken</w>
       <w>gunicorn</w>
       <w>ical</w>

.idea/recipes.iml

@@ -18,7 +18,7 @@
       <excludeFolder url="file://$MODULE_DIR$/staticfiles" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.9 (recipes)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.10-alpine3.18
+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 openldap git
+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,11 +15,7 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
-RUN \
-    if [ `apk --print-arch` = "armv7" ]; then \
-    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
-    fi
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev git && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
@@ -30,11 +26,5 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 
 #Copy project and execute it.
 COPY . ./
-
-# collect information from git repositories
-RUN /opt/recipes/venv/bin/python version.py
-# delete git repositories to reduce image size
-RUN find . -type d -name ".git" | xargs rm -rf
-
 RUN chmod +x boot.sh
 ENTRYPOINT ["/opt/recipes/boot.sh"]

Dockerfile-raspi

@@ -0,0 +1,33 @@
+# builds of cryptography for raspberry pi (or better arm v7) fail for some
+FROM python:3.9-alpine3.15
+
+#Install all dependencies.
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography openldap gcompat
+
+#Print all logs without buffering it.
+ENV PYTHONUNBUFFERED 1
+
+#This port will be used by gunicorn.
+EXPOSE 8080
+
+#Create app dir and install requirements.
+RUN mkdir /opt/recipes
+WORKDIR /opt/recipes
+
+COPY requirements.txt ./
+RUN \
+    if [ `apk --print-arch` = "armv7" ]; then \
+    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
+    fi
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev zlib-dev jpeg-dev libwebp-dev python3-dev git && \
+    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 -r requirements.txt --no-cache-dir --no-binary=Pillow && \
+    apk --purge del .build-deps
+
+#Copy project and execute it.
+COPY . ./
+RUN chmod +x boot.sh
+ENTRYPOINT ["/opt/recipes/boot.sh"]

SECURITY.md

@@ -6,4 +6,5 @@ Since this software is still considered beta/WIP support is always only given fo
 
 ## Reporting a Vulnerability
 
-Please use GitHub Security Advisories to report any kind of security vulnerabilities.
+Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in 
+public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/).

boot.sh

@@ -4,7 +4,6 @@ source venv/bin/activate
 TANDOOR_PORT="${TANDOOR_PORT:-8080}"
 GUNICORN_WORKERS="${GUNICORN_WORKERS:-3}"
 GUNICORN_THREADS="${GUNICORN_THREADS:-2}"
-GUNICORN_LOG_LEVEL="${GUNICORN_LOG_LEVEL:-'info'}"
 NGINX_CONF_FILE=/opt/recipes/nginx/conf.d/Recipes.conf
 
 display_warning() {
@@ -19,14 +18,9 @@ if [ ! -f "$NGINX_CONF_FILE" ] && [ $GUNICORN_MEDIA -eq 0 ]; then
     display_warning "Nginx configuration file could not be found at the default location!\nPath: ${NGINX_CONF_FILE}"
 fi
 
-# SECRET_KEY (or a valid file at SECRET_KEY_FILE) must be set in .env file
-
-if [ -f "${SECRET_KEY_FILE}" ]; then
-    export SECRET_KEY=$(cat "$SECRET_KEY_FILE")
-fi
-
+# SECRET_KEY must be set in .env file
 if [ -z "${SECRET_KEY}" ]; then
-    display_warning "The environment variable 'SECRET_KEY' (or 'SECRET_KEY_FILE' that points to an existing file) is not set but REQUIRED for running Tandoor!"
+    display_warning "The environment variable 'SECRET_KEY' is not set but REQUIRED for running Tandoor!"
 fi
 
 
@@ -35,16 +29,11 @@ echo "Waiting for database to be ready..."
 attempt=0
 max_attempts=20
 
-if [ "${DB_ENGINE}" == 'django.db.backends.postgresql' ] || [ "${DATABASE_URL}" == 'postgres'* ]; then
-
-  # POSTGRES_PASSWORD (or a valid file at POSTGRES_PASSWORD_FILE) must be set in .env file
-
-  if [ -f "${POSTGRES_PASSWORD_FILE}" ]; then
-    export POSTGRES_PASSWORD=$(cat "$POSTGRES_PASSWORD_FILE")
-  fi
+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' (or 'POSTGRES_PASSWORD_FILE' that points to an existing file) is not set but REQUIRED for running Tandoor!"
+      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} --user=${POSTGRES_USER} -q; status=$?; attempt=$((attempt+1)); [ $status -ne 0 ] && [ $attempt -le $max_attempts ]; do
@@ -76,4 +65,4 @@ echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles
 
-exec gunicorn -b :$TANDOOR_PORT --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
+exec gunicorn -b :$TANDOOR_PORT --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level INFO recipes.wsgi

cookbook/admin.py

@@ -10,13 +10,12 @@ from treebeard.forms import movenodeform_factory
 
 from cookbook.managers import DICTIONARY
 
-from .models import (BookmarkletImport, Comment, CookLog, Food, ImportLog, Ingredient, InviteLink,
-                     Keyword, MealPlan, MealType, NutritionInformation, Property, PropertyType,
+from .models import (BookmarkletImport, Comment, CookLog, Food, FoodInheritField, ImportLog,
+                     Ingredient, InviteLink, Keyword, MealPlan, MealType, NutritionInformation,
                      Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
                      ShoppingList, ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                      Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog,
-                     TelegramBot, Unit, UnitConversion, UserFile, UserPreference, UserSpace,
-                     ViewLog)
+                     TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation, UserSpace)
 
 
 class CustomUserAdmin(UserAdmin):
@@ -33,14 +32,12 @@ admin.site.unregister(Group)
 @admin.action(description='Delete all data from a space')
 def delete_space_action(modeladmin, request, queryset):
     for space in queryset:
-        space.safe_delete()
+        space.save()
 
 
 class SpaceAdmin(admin.ModelAdmin):
     list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     search_fields = ('name', 'created_by__username')
-    autocomplete_fields = ('created_by',)
-    filter_horizontal = ('food_inherit',)
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'
     actions = [delete_space_action]
@@ -52,8 +49,6 @@ admin.site.register(Space, SpaceAdmin)
 class UserSpaceAdmin(admin.ModelAdmin):
     list_display = ('user', 'space',)
     search_fields = ('user__username', 'space__name',)
-    filter_horizontal = ('groups',)
-    autocomplete_fields = ('user', 'space',)
 
 
 admin.site.register(UserSpace, UserSpaceAdmin)
@@ -64,7 +59,6 @@ class UserPreferenceAdmin(admin.ModelAdmin):
     search_fields = ('user__username',)
     list_filter = ('theme', 'nav_color', 'default_page',)
     date_hierarchy = 'created_at'
-    filter_horizontal = ('plan_share', 'shopping_share',)
 
     @staticmethod
     def name(obj):
@@ -156,16 +150,9 @@ class KeywordAdmin(TreeAdmin):
 admin.site.register(Keyword, KeywordAdmin)
 
 
-@admin.action(description='Delete Steps not part of a Recipe.')
-def delete_unattached_steps(modeladmin, request, queryset):
-    with scopes_disabled():
-        Step.objects.filter(recipe=None).delete()
-
-
 class StepAdmin(admin.ModelAdmin):
     list_display = ('name', 'order',)
     search_fields = ('name',)
-    actions = [delete_unattached_steps]
 
 
 admin.site.register(Step, StepAdmin)
@@ -192,7 +179,7 @@ class RecipeAdmin(admin.ModelAdmin):
     def created_by(obj):
         return obj.created_by.get_user_display_name()
 
-    if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql':
+    if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
         actions = [rebuild_index]
 
 
@@ -214,24 +201,9 @@ class FoodAdmin(TreeAdmin):
 admin.site.register(Food, FoodAdmin)
 
 
-class UnitConversionAdmin(admin.ModelAdmin):
-    list_display = ('base_amount', 'base_unit', 'food', 'converted_amount', 'converted_unit')
-    search_fields = ('food__name', 'unit__name')
-
-
-admin.site.register(UnitConversion, UnitConversionAdmin)
-
-
-@admin.action(description='Delete Ingredients not part of a Recipe.')
-def delete_unattached_ingredients(modeladmin, request, queryset):
-    with scopes_disabled():
-        Ingredient.objects.filter(step__recipe=None).delete()
-
-
 class IngredientAdmin(admin.ModelAdmin):
     list_display = ('food', 'amount', 'unit')
     search_fields = ('food__name', 'unit__name')
-    actions = [delete_unattached_ingredients]
 
 
 admin.site.register(Ingredient, IngredientAdmin)
@@ -277,7 +249,7 @@ admin.site.register(RecipeBookEntry, RecipeBookEntryAdmin)
 
 
 class MealPlanAdmin(admin.ModelAdmin):
-    list_display = ('user', 'recipe', 'meal_type', 'from_date', 'to_date')
+    list_display = ('user', 'recipe', 'meal_type', 'date')
 
     @staticmethod
     def user(obj):
@@ -314,7 +286,6 @@ admin.site.register(InviteLink, InviteLinkAdmin)
 
 class CookLogAdmin(admin.ModelAdmin):
     list_display = ('recipe', 'created_by', 'created_at', 'rating', 'servings')
-    search_fields = ('recipe__name', 'space__name',)
 
 
 admin.site.register(CookLog, CookLogAdmin)
@@ -348,20 +319,6 @@ class ShareLinkAdmin(admin.ModelAdmin):
 admin.site.register(ShareLink, ShareLinkAdmin)
 
 
-class PropertyTypeAdmin(admin.ModelAdmin):
-    list_display = ('id', 'name')
-
-
-admin.site.register(PropertyType, PropertyTypeAdmin)
-
-
-class PropertyAdmin(admin.ModelAdmin):
-    list_display = ('property_amount', 'property_type')
-
-
-admin.site.register(Property, PropertyAdmin)
-
-
 class NutritionInformationAdmin(admin.ModelAdmin):
     list_display = ('id',)
 

cookbook/cooking_machines/homeconnect_cookit.py

@@ -0,0 +1,116 @@
+import json
+import random
+from datetime import timedelta
+
+import requests
+from django.utils.timezone import now
+
+from cookbook.models import CookingMachine
+
+
+# Tandoor is not affiliated in any way or form with the holders of Trademark or other right associated with the mentioned names. All mentioned protected names are purely used to identify to the user a certain device or integration.
+class HomeConnectCookit:
+    AUTH_AUTHORIZE_URL = 'https://api.home-connect.com/security/oauth/authorize'
+    AUTH_TOKEN_URL = 'https://api.home-connect.com/security/oauth/token'
+    AUTH_REFRESH_URL = 'https://api.home-connect.com/security/oauth/token'
+
+    RECIPE_API_URL = 'https://prod.reu.rest.homeconnectegw.com/user-generated-recipes/server/api/v1/recipes'
+    IMAGE_API_URL = 'https://prod.reu.rest.homeconnectegw.com/user-generated-recipes/server/api/v1/images'
+
+    CLIENT_ID = ''  # TODO load from .env settings
+    _CLIENT_SECRET = ''  # TODO load from .env settings
+
+    _cooking_machine = None
+
+    def __init__(self, cooking_machine):
+        self._cooking_machine = cooking_machine
+
+    def get_auth_link(self):
+        return f"{self.AUTH_AUTHORIZE_URL}?client_id={self.CLIENT_ID}&response_type=code&scope=IdentifyAppliance%20Settings&state={random.randint(100000, 999999)}"
+
+    def _validate_token(self):
+        if self._cooking_machine.access_token is None and self._cooking_machine.refresh_token is None:
+            return False  # user needs to login
+        elif self._cooking_machine.access_token_expiry < now() + timedelta(minutes=10):
+            return False  # refresh token
+
+    def _refresh_access_token(self):
+        token_response = requests.post(self.AUTH_REFRESH_URL, {
+            'grant_type': 'refresh_token',
+            'refresh_token': self._cooking_machine.refresh_token,
+            'client_secret': self._CLIENT_SECRET,
+        })
+        if token_response.status_code == 200:
+            token_response_body = json.loads(token_response.content)
+            self._cooking_machine.access_token = token_response_body['access_token']
+            self._cooking_machine.access_token_expiry = now() + timedelta(seconds=(token_response_body['expires_in'] - (60 * 10)))
+            self._cooking_machine.refresh_token = token_response_body['refresh_token']
+            self._cooking_machine.refresh_token_expiry = now() + timedelta(days=58)
+            self._cooking_machine.save()
+
+    def get_access_token(self, code):
+        token_response = requests.post(self.AUTH_TOKEN_URL, {
+            'grant_type': 'authorization_code',
+            'code': code,
+            'client_id': self.CLIENT_ID,
+            'client_secret': self._CLIENT_SECRET,
+        })
+        if token_response.status_code == 200:
+            token_response_body = json.loads(token_response.content)
+            self._cooking_machine.access_token = token_response_body['access_token']
+            self._cooking_machine.access_token_expiry = now() + timedelta(seconds=(token_response_body['expires_in'] - (60 * 10)))
+            self._cooking_machine.refresh_token = token_response_body['refresh_token']
+            self._cooking_machine.refresh_token_expiry = now() + timedelta(days=58)
+            self._cooking_machine.save()
+
+    def _get_default_headers(self):
+        auth_token = ''
+        return {
+            'authorization': f'Bearer {self._cooking_machine.access_token}',
+            'accept-language': "en-US",
+            "referer": "https://prod.reu.rest.homeconnectegw.com/user-generated- recipes/client/editor/recipedetails",
+            "user-agent": "Mozilla/5.0 (Linux; Android 10; Android SDK built for x86 Build/QSR1.210802.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.185 Mobile Safari/537.36",
+            "x-requested-with": "com.bshg.homeconnect.android.release"
+        }
+
+    def push_recipe(self, recipe):
+        data = {
+            "title": recipe.name,
+            "description": recipe.description,
+            "ingredients": [],
+            "steps": [],
+            "durations": {
+                "totalTime": (recipe.working_time + recipe.waiting_time) * 60,
+                "cookingTime": 0,  # recipe.waiting_time * 60, #TODO cooking time must be sum of step duration attribute, otherwise creation fails
+                "preparationTime": recipe.working_time * 60,
+            },
+            "keywords": [],
+            "servings": {
+                "amount": int(recipe.servings),
+                "unit": 'portion',  # required
+            },
+            "servingTipsStep": {
+                "textInstructions": "Serve"
+            },
+            "complexityLevel": "medium",
+            "image": {
+                "url": "https://media3.bsh-group.com/Recipes/800x480/17062805_210217_My-own-recipe_Picture_188ppi.jpg",
+                "mimeType": "image/jpeg"
+                # TODO add image upload
+            },
+            "accessories": [],  # TODO add once tandoor supports tools
+            "legalDisclaimerApproved": True  # TODO force user to approve disclaimer
+        }
+        for step in recipe.steps.all():
+            data['steps'].append({
+                "textInstructions": step.instruction
+            })
+            for i in step.ingredients.all():
+                data['ingredients'].append({
+                    "amount": int(i.amount),
+                    "unit": i.unit.name,
+                    "name": i.food.name,
+                })
+        # TODO create synced recipe
+        response = requests.post(f'{self.RECIPE_API_URL}', json=data, headers=self._get_default_headers())
+        return response

cookbook/forms.py

@@ -9,8 +9,8 @@ from django_scopes import scopes_disabled
 from django_scopes.forms import SafeModelChoiceField, SafeModelMultipleChoiceField
 from hcaptcha.fields import hCaptchaField
 
-from .models import (Comment, Food, InviteLink, Keyword, Recipe, RecipeBook, RecipeBookEntry,
-                     SearchPreference, Space, Storage, Sync, User, UserPreference)
+from .models import (Comment, Food, InviteLink, Keyword, MealPlan, MealType, Recipe, RecipeBook,
+                     RecipeBookEntry, SearchPreference, Space, Storage, Sync, User, UserPreference)
 
 
 class SelectWidget(widgets.Select):
@@ -45,7 +45,7 @@ class UserPreferenceForm(forms.ModelForm):
         model = UserPreference
         fields = (
             'default_unit', 'use_fractions', 'use_kj', 'theme', 'nav_color',
-            'sticky_navbar', 'default_page', 'plan_share', 'ingredient_decimals', 'comments', 'left_handed', 'show_step_ingredients',
+            'sticky_navbar', 'default_page', 'plan_share', 'ingredient_decimals', 'comments', 'left_handed',
         )
 
         labels = {
@@ -60,29 +60,29 @@ class UserPreferenceForm(forms.ModelForm):
             'ingredient_decimals': _('Ingredient decimal places'),
             'shopping_auto_sync': _('Shopping list auto sync period'),
             'comments': _('Comments'),
-            'left_handed': _('Left-handed mode'),
-            'show_step_ingredients': _('Show step ingredients table')
+            'left_handed': _('Left-handed mode')
         }
 
         help_texts = {
             'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
-            'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),
+            
+            'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),  
             'use_fractions': _(
                 'Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'),
-            'use_kj': _('Display nutritional energy amounts in joules instead of calories'),
+            
+            'use_kj': _('Display nutritional energy amounts in joules instead of calories'),  
             'plan_share': _('Users with whom newly created meal plans should be shared by default.'),
             'shopping_share': _('Users with whom to share shopping lists.'),
-            'ingredient_decimals': _('Number of decimals to round ingredients.'),
-            'comments': _('If you want to be able to create and see comments underneath recipes.'),
+            'ingredient_decimals': _('Number of decimals to round ingredients.'),  
+            'comments': _('If you want to be able to create and see comments underneath recipes.'),  
             'shopping_auto_sync': _(
-                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '
-                'of mobile data. If lower than instance limit it is reset when saving.'
+                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  
+                'of mobile data. If lower than instance limit it is reset when saving.'  
             ),
-            'sticky_navbar': _('Makes the navbar stick to the top of the page.'),
+            'sticky_navbar': _('Makes the navbar stick to the top of the page.'),  
             'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
             'mealplan_autoexclude_onhand': _('Exclude ingredients that are on hand.'),
-            'left_handed': _('Will optimize the UI for use with your left hand.'),
-            'show_step_ingredients': _('Add ingredients table next to recipe steps. Applies at creation time for manually created and URL imported recipes. Individual steps can be overridden in the edit recipe view.')
+            'left_handed': _('Will optimize the UI for use with your left hand.')
         }
 
         widgets = {
@@ -154,7 +154,6 @@ class ImportExportBase(forms.Form):
     COOKBOOKAPP = 'COOKBOOKAPP'
     COPYMETHAT = 'COPYMETHAT'
     COOKMATE = 'COOKMATE'
-    REZEPTSUITEDE = 'REZEPTSUITEDE'
     PDF = 'PDF'
 
     type = forms.ChoiceField(choices=(
@@ -163,30 +162,12 @@ class ImportExportBase(forms.Form):
         (PEPPERPLATE, 'Pepperplate'), (RECETTETEK, 'RecetteTek'), (RECIPESAGE, 'Recipe Sage'), (DOMESTICA, 'Domestica'),
         (MEALMASTER, 'MealMaster'), (REZKONV, 'RezKonv'), (OPENEATS, 'Openeats'), (RECIPEKEEPER, 'Recipe Keeper'),
         (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
-        (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')
+        (COOKMATE, 'Cookmate')
     ))
 
 
-class MultipleFileInput(forms.ClearableFileInput):
-    allow_multiple_selected = True
-
-
-class MultipleFileField(forms.FileField):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault("widget", MultipleFileInput())
-        super().__init__(*args, **kwargs)
-
-    def clean(self, data, initial=None):
-        single_file_clean = super().clean
-        if isinstance(data, (list, tuple)):
-            result = [single_file_clean(d, initial) for d in data]
-        else:
-            result = single_file_clean(data, initial)
-        return result
-
-
 class ImportForm(ImportExportBase):
-    files = MultipleFileField(required=True)
+    files = forms.FileField(required=True, widget=forms.ClearableFileInput(attrs={'multiple': True}))
     duplicates = forms.BooleanField(help_text=_(
         'To prevent duplicates recipes with the same name as existing ones are ignored. Check this box to import everything.'),
         required=False)
@@ -323,6 +304,50 @@ class ImportRecipeForm(forms.ModelForm):
         }
 
 
+# TODO deprecate
+class MealPlanForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['recipe'].queryset = Recipe.objects.filter(space=space).all()
+        self.fields['meal_type'].queryset = MealType.objects.filter(space=space).all()
+        self.fields['shared'].queryset = User.objects.filter(userpreference__space=space).all()
+
+    def clean(self):
+        cleaned_data = super(MealPlanForm, self).clean()
+
+        if cleaned_data['title'] == '' and cleaned_data['recipe'] is None:
+            raise forms.ValidationError(
+                _('You must provide at least a recipe or a title.')
+            )
+
+        return cleaned_data
+
+    class Meta:
+        model = MealPlan
+        fields = (
+            'recipe', 'title', 'meal_type', 'note',
+            'servings', 'date', 'shared'
+        )
+
+        help_texts = {
+            'shared': _('You can list default users to share recipes with in the settings.'),  
+            'note': _('You can use markdown to format this field. See the <a href="/docs/markdown/">docs here</a>')
+            
+        }
+
+        widgets = {
+            'recipe': SelectWidget,
+            'date': DateWidget,
+            'shared': MultiSelectWidget
+        }
+        field_classes = {
+            'recipe': SafeModelChoiceField,
+            'meal_type': SafeModelChoiceField,
+            'shared': SafeModelMultipleChoiceField,
+        }
+
+
 class InviteLinkForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
@@ -463,8 +488,8 @@ class ShoppingPreferenceForm(forms.ModelForm):
         help_texts = {
             'shopping_share': _('Users will see all items you add to your shopping list.  They must add you to see items on their list.'),
             'shopping_auto_sync': _(
-                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '
-                'of mobile data. If lower than instance limit it is reset when saving.'
+                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  
+                'of mobile data. If lower than instance limit it is reset when saving.'  
             ),
             'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
             'mealplan_autoinclude_related': _('When adding a meal plan to the shopping list (manually or automatically), include all related recipes.'),
@@ -508,12 +533,11 @@ class SpacePreferenceForm(forms.ModelForm):
     class Meta:
         model = Space
 
-        fields = ('food_inherit', 'reset_food_inherit', 'use_plural')
+        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count')
 
         help_texts = {
             'food_inherit': _('Fields on food that should be inherited by default.'),
-            'use_plural': _('Use the plural form for units and food inside this space.'),
-        }
+            'show_facet_count': _('Show recipe counts on search filters'), }
 
         widgets = {
             'food_inherit': MultiSelectWidget

cookbook/helper/AllAuthCustomAdapter.py

@@ -1,10 +1,11 @@
 import datetime
-from gettext import gettext as _
+
+from django.conf import settings
 
 from allauth.account.adapter import DefaultAccountAdapter
-from django.conf import settings
 from django.contrib import messages
 from django.core.cache import caches
+from gettext import gettext as _
 
 from cookbook.models import InviteLink
 
@@ -16,13 +17,10 @@ class AllAuthCustomAdapter(DefaultAccountAdapter):
         Whether to allow sign-ups.
         """
         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():
+        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' and not settings.ENABLE_SIGNUP and not signup_token:
-            return False
-        elif request.resolver_match.view_name == 'socialaccount_signup' and len(settings.SOCIAL_PROVIDERS) < 1:
+        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)
@@ -35,7 +33,7 @@ class AllAuthCustomAdapter(DefaultAccountAdapter):
             if c == default:
                 try:
                     super(AllAuthCustomAdapter, self).send_mail(template_prefix, email, context)
-                except Exception:  # dont fail signup just because confirmation mail could not be send
+                except Exception: # dont fail signup just because confirmation mail could not be send
                     pass
             else:
                 messages.add_message(self.request, messages.ERROR, _('In order to prevent spam, the requested email was not send. Please wait a few minutes and try again.'))

cookbook/helper/automation_helper.py

@@ -1,227 +0,0 @@
-import re
-
-from django.core.cache import caches
-from django.db.models.functions import Lower
-
-from cookbook.models import Automation
-
-
-class AutomationEngine:
-    request = None
-    source = None
-    use_cache = None
-    food_aliases = None
-    keyword_aliases = None
-    unit_aliases = None
-    never_unit = None
-    transpose_words = None
-    regex_replace = {
-        Automation.DESCRIPTION_REPLACE: None,
-        Automation.INSTRUCTION_REPLACE: None,
-        Automation.FOOD_REPLACE: None,
-        Automation.UNIT_REPLACE: None,
-        Automation.NAME_REPLACE: None,
-    }
-
-    def __init__(self, request, use_cache=True, source=None):
-        self.request = request
-        self.use_cache = use_cache
-        if not source:
-            self.source = "default_string_to_avoid_false_regex_match"
-        else:
-            self.source = source
-
-    def apply_keyword_automation(self, keyword):
-        keyword = keyword.strip()
-        if self.use_cache and self.keyword_aliases is None:
-            self.keyword_aliases = {}
-            KEYWORD_CACHE_KEY = f'automation_keyword_alias_{self.request.space.pk}'
-            if c := caches['default'].get(KEYWORD_CACHE_KEY, None):
-                self.keyword_aliases = c
-                caches['default'].touch(KEYWORD_CACHE_KEY, 30)
-            else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.KEYWORD_ALIAS).only('param_1', 'param_2').order_by('order').all():
-                    self.keyword_aliases[a.param_1.lower()] = a.param_2
-                caches['default'].set(KEYWORD_CACHE_KEY, self.keyword_aliases, 30)
-        else:
-            self.keyword_aliases = {}
-        if self.keyword_aliases:
-            try:
-                keyword = self.keyword_aliases[keyword.lower()]
-            except KeyError:
-                pass
-        else:
-            if automation := Automation.objects.filter(space=self.request.space, type=Automation.KEYWORD_ALIAS, param_1__iexact=keyword, disabled=False).order_by('order').first():
-                return automation.param_2
-        return keyword
-
-    def apply_unit_automation(self, unit):
-        unit = unit.strip()
-        if self.use_cache and self.unit_aliases is None:
-            self.unit_aliases = {}
-            UNIT_CACHE_KEY = f'automation_unit_alias_{self.request.space.pk}'
-            if c := caches['default'].get(UNIT_CACHE_KEY, None):
-                self.unit_aliases = c
-                caches['default'].touch(UNIT_CACHE_KEY, 30)
-            else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').order_by('order').all():
-                    self.unit_aliases[a.param_1.lower()] = a.param_2
-                caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
-        else:
-            self.unit_aliases = {}
-        if self.unit_aliases:
-            try:
-                unit = self.unit_aliases[unit.lower()]
-            except KeyError:
-                pass
-        else:
-            if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1__iexact=unit, disabled=False).order_by('order').first():
-                return automation.param_2
-        return self.apply_regex_replace_automation(unit, Automation.UNIT_REPLACE)
-
-    def apply_food_automation(self, food):
-        food = food.strip()
-        if self.use_cache and self.food_aliases is None:
-            self.food_aliases = {}
-            FOOD_CACHE_KEY = f'automation_food_alias_{self.request.space.pk}'
-            if c := caches['default'].get(FOOD_CACHE_KEY, None):
-                self.food_aliases = c
-                caches['default'].touch(FOOD_CACHE_KEY, 30)
-            else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').order_by('order').all():
-                    self.food_aliases[a.param_1.lower()] = a.param_2
-                caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
-        else:
-            self.food_aliases = {}
-
-        if self.food_aliases:
-            try:
-                return self.food_aliases[food.lower()]
-            except KeyError:
-                return food
-        else:
-            if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1__iexact=food, disabled=False).order_by('order').first():
-                return automation.param_2
-        return self.apply_regex_replace_automation(food, Automation.FOOD_REPLACE)
-
-    def apply_never_unit_automation(self, tokens):
-        """
-        Moves a string that should never be treated as a unit to next token and optionally replaced with default unit
-        e.g. NEVER_UNIT: param1: egg, param2: None would modify ['1', 'egg', 'white'] to ['1', '', 'egg', 'white']
-        or NEVER_UNIT: param1: egg, param2: pcs would modify ['1', 'egg', 'yolk'] to ['1', 'pcs', 'egg', 'yolk']
-        :param1 string: string that should never be considered a unit, will be moved to token[2]
-        :param2 (optional) unit as string: will insert unit string into token[1]
-        :return: unit as string (possibly changed by automation)
-        """
-
-        if self.use_cache and self.never_unit is None:
-            self.never_unit = {}
-            NEVER_UNIT_CACHE_KEY = f'automation_never_unit_{self.request.space.pk}'
-            if c := caches['default'].get(NEVER_UNIT_CACHE_KEY, None):
-                self.never_unit = c
-                caches['default'].touch(NEVER_UNIT_CACHE_KEY, 30)
-            else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.NEVER_UNIT).only('param_1', 'param_2').order_by('order').all():
-                    self.never_unit[a.param_1.lower()] = a.param_2
-                caches['default'].set(NEVER_UNIT_CACHE_KEY, self.never_unit, 30)
-        else:
-            self.never_unit = {}
-
-        new_unit = None
-        alt_unit = self.apply_unit_automation(tokens[1])
-        never_unit = False
-        if self.never_unit:
-            try:
-                new_unit = self.never_unit[tokens[1].lower()]
-                never_unit = True
-            except KeyError:
-                return tokens
-        else:
-            if a := Automation.objects.annotate(param_1_lower=Lower('param_1')).filter(space=self.request.space, type=Automation.NEVER_UNIT, param_1_lower__in=[
-                    tokens[1].lower(), alt_unit.lower()], disabled=False).order_by('order').first():
-                new_unit = a.param_2
-                never_unit = True
-
-        if never_unit:
-            tokens.insert(1, new_unit)
-        return tokens
-
-    def apply_transpose_automation(self, string):
-        """
-        If two words (param_1 & param_2) are detected in sequence, swap their position in the ingredient string
-        :param 1: first word to detect
-        :param 2: second word to detect
-        return: new ingredient string
-        """
-        if self.use_cache and self.transpose_words is None:
-            self.transpose_words = {}
-            TRANSPOSE_WORDS_CACHE_KEY = f'automation_transpose_words_{self.request.space.pk}'
-            if c := caches['default'].get(TRANSPOSE_WORDS_CACHE_KEY, None):
-                self.transpose_words = c
-                caches['default'].touch(TRANSPOSE_WORDS_CACHE_KEY, 30)
-            else:
-                i = 0
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.TRANSPOSE_WORDS).only(
-                        'param_1', 'param_2').order_by('order').all()[:512]:
-                    self.transpose_words[i] = [a.param_1.lower(), a.param_2.lower()]
-                    i += 1
-                caches['default'].set(TRANSPOSE_WORDS_CACHE_KEY, self.transpose_words, 30)
-        else:
-            self.transpose_words = {}
-
-        tokens = [x.lower() for x in string.replace(',', ' ').split()]
-        if self.transpose_words:
-            for key, value in self.transpose_words.items():
-                if value[0] in tokens and value[1] in tokens:
-                    string = re.sub(rf"\b({value[0]})\W*({value[1]})\b", r"\2 \1", string, flags=re.IGNORECASE)
-        else:
-            for rule in Automation.objects.filter(space=self.request.space, type=Automation.TRANSPOSE_WORDS, disabled=False) \
-                    .annotate(param_1_lower=Lower('param_1'), param_2_lower=Lower('param_2')) \
-                    .filter(param_1_lower__in=tokens, param_2_lower__in=tokens).order_by('order')[:512]:
-                if rule.param_1 in tokens and rule.param_2 in tokens:
-                    string = re.sub(rf"\b({rule.param_1})\W*({rule.param_2})\b", r"\2 \1", string, flags=re.IGNORECASE)
-        return string
-
-    def apply_regex_replace_automation(self, string, automation_type):
-        # TODO add warning - maybe on SPACE page? when a max of 512 automations of a specific type is exceeded (ALIAS types excluded?)
-        """
-        Replaces strings in a recipe field that are from a matched source
-        field_type are Automation.type that apply regex replacements
-        Automation.DESCRIPTION_REPLACE
-        Automation.INSTRUCTION_REPLACE
-        Automation.FOOD_REPLACE
-        Automation.UNIT_REPLACE
-        Automation.NAME_REPLACE
-
-        regex replacment utilized the following fields from the Automation model
-        :param 1: source that should apply the automation in regex format ('.*' for all)
-        :param 2: regex pattern to match ()
-        :param 3: replacement string (leave blank to delete)
-        return: new string
-        """
-        if self.use_cache and self.regex_replace[automation_type] is None:
-            self.regex_replace[automation_type] = {}
-            REGEX_REPLACE_CACHE_KEY = f'automation_regex_replace_{self.request.space.pk}'
-            if c := caches['default'].get(REGEX_REPLACE_CACHE_KEY, None):
-                self.regex_replace[automation_type] = c[automation_type]
-                caches['default'].touch(REGEX_REPLACE_CACHE_KEY, 30)
-            else:
-                i = 0
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=automation_type).only(
-                        'param_1', 'param_2', 'param_3').order_by('order').all()[:512]:
-                    self.regex_replace[automation_type][i] = [a.param_1, a.param_2, a.param_3]
-                    i += 1
-                caches['default'].set(REGEX_REPLACE_CACHE_KEY, self.regex_replace, 30)
-        else:
-            self.regex_replace[automation_type] = {}
-
-        if self.regex_replace[automation_type]:
-            for rule in self.regex_replace[automation_type].values():
-                if re.match(rule[0], (self.source)[:512]):
-                    string = re.sub(rule[1], rule[2], string, flags=re.IGNORECASE)
-        else:
-            for rule in Automation.objects.filter(space=self.request.space, disabled=False, type=automation_type).only(
-                    'param_1', 'param_2', 'param_3').order_by('order').all()[:512]:
-                if re.match(rule.param_1, (self.source)[:512]):
-                    string = re.sub(rule.param_2, rule.param_3, string, flags=re.IGNORECASE)
-        return string

cookbook/helper/cache_helper.py

@@ -1,11 +0,0 @@
-class CacheHelper:
-    space = None
-
-    BASE_UNITS_CACHE_KEY = None
-    PROPERTY_TYPE_CACHE_KEY = None
-
-    def __init__(self, space):
-        self.space = space
-
-        self.BASE_UNITS_CACHE_KEY = f'SPACE_{space.id}_BASE_UNITS'
-        self.PROPERTY_TYPE_CACHE_KEY = f'SPACE_{space.id}_PROPERTY_TYPES'

cookbook/helper/image_processing.py

@@ -1,7 +1,8 @@
 import os
-from io import BytesIO
+import sys
 
 from PIL import Image
+from io import BytesIO
 
 
 def rescale_image_jpeg(image_object, base_width=1020):
@@ -10,7 +11,7 @@ def rescale_image_jpeg(image_object, base_width=1020):
     width_percent = (base_width / float(img.size[0]))
     height = int((float(img.size[1]) * float(width_percent)))
 
-    img = img.resize((base_width, height), Image.LANCZOS)
+    img = img.resize((base_width, height), Image.ANTIALIAS)
     img_bytes = BytesIO()
     img.save(img_bytes, 'JPEG', quality=90, optimize=True, icc_profile=icc_profile)
 
@@ -21,7 +22,7 @@ def rescale_image_png(image_object, base_width=1020):
     image_object = Image.open(image_object)
     wpercent = (base_width / float(image_object.size[0]))
     hsize = int((float(image_object.size[1]) * float(wpercent)))
-    img = image_object.resize((base_width, hsize), Image.LANCZOS)
+    img = image_object.resize((base_width, hsize), Image.ANTIALIAS)
 
     im_io = BytesIO()
     img.save(im_io, 'PNG', quality=90)
@@ -39,12 +40,7 @@ def get_filetype(name):
 # TODO also add env variable to define which images sizes should be compressed
 # filetype argument can not be optional, otherwise this function will treat all images as if they were a jpeg
 # Because it's no longer optional, no reason to return it
-def handle_image(request, image_object, filetype):
-    try:
-        Image.open(image_object).verify()
-    except Exception:
-        return None
-
+def handle_image(request, image_object, filetype): 
     if (image_object.size / 1000) > 500:  # if larger than 500 kb compress
         if filetype == '.jpeg' or filetype == '.jpg':
             return rescale_image_jpeg(image_object)

cookbook/helper/ingredient_parser.py

@@ -2,16 +2,18 @@ import re
 import string
 import unicodedata
 
-from cookbook.helper.automation_helper import AutomationEngine
-from cookbook.models import Food, Ingredient, Unit
+from django.core.cache import caches
+
+from cookbook.models import Unit, Food, Automation, Ingredient
 
 
 class IngredientParser:
     request = None
     ignore_rules = False
-    automation = None
+    food_aliases = {}
+    unit_aliases = {}
 
-    def __init__(self, request, cache_mode=True, ignore_automations=False):
+    def __init__(self, request, cache_mode, ignore_automations=False):
         """
         Initialize ingredient parser
         :param request: request context (to control caching, rule ownership, etc.)
@@ -20,8 +22,65 @@ class IngredientParser:
         """
         self.request = request
         self.ignore_rules = ignore_automations
-        if not self.ignore_rules:
-            self.automation = AutomationEngine(self.request, use_cache=cache_mode)
+        if cache_mode:
+            FOOD_CACHE_KEY = f'automation_food_alias_{self.request.space.pk}'
+            if c := caches['default'].get(FOOD_CACHE_KEY, None):
+                self.food_aliases = c
+                caches['default'].touch(FOOD_CACHE_KEY, 30)
+            else:
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').all():
+                    self.food_aliases[a.param_1] = a.param_2
+                caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
+
+            UNIT_CACHE_KEY = f'automation_unit_alias_{self.request.space.pk}'
+            if c := caches['default'].get(UNIT_CACHE_KEY, None):
+                self.unit_aliases = c
+                caches['default'].touch(UNIT_CACHE_KEY, 30)
+            else:
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').all():
+                    self.unit_aliases[a.param_1] = a.param_2
+                caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
+        else:
+            self.food_aliases = {}
+            self.unit_aliases = {}
+
+    def apply_food_automation(self, food):
+        """
+        Apply food alias automations to passed food
+        :param food: unit as string
+        :return: food as string (possibly changed by automation)
+        """
+        if self.ignore_rules:
+            return food
+        else:
+            if self.food_aliases:
+                try:
+                    return self.food_aliases[food]
+                except KeyError:
+                    return food
+            else:
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).first():
+                    return automation.param_2
+        return food
+
+    def apply_unit_automation(self, unit):
+        """
+        Apply unit alias automations to passed unit
+        :param unit: unit as string
+        :return: unit as string (possibly changed by automation)
+        """
+        if self.ignore_rules:
+            return unit
+        else:
+            if self.unit_aliases:
+                try:
+                    return self.unit_aliases[unit]
+                except KeyError:
+                    return unit
+            else:
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).first():
+                    return automation.param_2
+        return unit
 
     def get_unit(self, unit):
         """
@@ -32,10 +91,7 @@ class IngredientParser:
         if not unit:
             return None
         if len(unit) > 0:
-            if self.ignore_rules:
-                u, created = Unit.objects.get_or_create(name=unit.strip(), space=self.request.space)
-            else:
-                u, created = Unit.objects.get_or_create(name=self.automation.apply_unit_automation(unit), space=self.request.space)
+            u, created = Unit.objects.get_or_create(name=self.apply_unit_automation(unit), space=self.request.space)
             return u
         return None
 
@@ -48,10 +104,7 @@ class IngredientParser:
         if not food:
             return None
         if len(food) > 0:
-            if self.ignore_rules:
-                f, created = Food.objects.get_or_create(name=food.strip(), space=self.request.space)
-            else:
-                f, created = Food.objects.get_or_create(name=self.automation.apply_food_automation(food), space=self.request.space)
+            f, created = Food.objects.get_or_create(name=self.apply_food_automation(food), space=self.request.space)
             return f
         return None
 
@@ -73,17 +126,15 @@ class IngredientParser:
         amount = 0
         unit = None
         note = ''
-        if x.strip() == '':
-            return amount, 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
-        ))):
+                                         (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]:
@@ -107,8 +158,7 @@ class IngredientParser:
         if unit is not None and unit.strip() == '':
             unit = None
 
-        if unit is not None and (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
+        if unit is not None and (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 = None
             note = x
         return amount, unit, note
@@ -178,24 +228,13 @@ class IngredientParser:
 
         # 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', ingredient):
-            match = re.search('\\((.[^\\(])+\\)', ingredient)
+        if re.match('(.){1,6}\s\((.[^\(\)])+\)\s', ingredient):
+            match = re.search('\((.[^\(])+\)', ingredient)
             ingredient = ingredient[:match.start()] + ingredient[match.end():] + ' ' + ingredient[match.start():match.end()]
 
         # leading spaces before commas result in extra tokens, clean them out
         ingredient = ingredient.replace(' ,', ',')
 
-        # handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description
-        # "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)"
-        ingredient = re.sub("^(\\d+|\\d+[\\.,]\\d+) - (\\d+|\\d+[\\.,]\\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
-
-        # if amount and unit are connected add space in between
-        if re.match('([0-9])+([A-z])+\\s', ingredient):
-            ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient)
-
-        if not self.ignore_rules:
-            ingredient = self.automation.apply_transpose_automation(ingredient)
-
         tokens = ingredient.split()  # split at each space into tokens
         if len(tokens) == 1:
             # there only is one argument, that must be the food
@@ -208,8 +247,6 @@ class IngredientParser:
                 # three arguments if it already has a unit there can't be
                 # a fraction for the amount
                 if len(tokens) > 2:
-                    if not self.ignore_rules:
-                        tokens = self.automation.apply_never_unit_automation(tokens)
                     try:
                         if unit is not None:
                             # a unit is already found, no need to try the second argument for a fraction
@@ -256,11 +293,10 @@ class IngredientParser:
         if unit_note not in note:
             note += ' ' + unit_note
 
-        if unit and not self.ignore_rules:
-            unit = self.automation.apply_unit_automation(unit)
+        if unit:
+            unit = self.apply_unit_automation(unit.strip())
 
-        if food and not self.ignore_rules:
-            food = self.automation.apply_food_automation(food)
+        food = self.apply_food_automation(food.strip())
         if len(food) > Food._meta.get_field('name').max_length:  # test if food name is to long
             # try splitting it at a space and taking only the first arg
             if len(food.split()) > 1 and len(food.split()[0]) < Food._meta.get_field('name').max_length:

cookbook/helper/mdx_urlize.py

@@ -35,7 +35,6 @@ Negative examples:
 u'<p>del.icio.us</p>'
 
 """
-from xml.etree.ElementTree import Element
 
 import markdown
 
@@ -65,7 +64,7 @@ class UrlizePattern(markdown.inlinepatterns.Pattern):
             else:
                 url = 'http://' + url
 
-        el = Element("a")
+        el = markdown.util.etree.Element("a")
         el.set('href', url)
         el.text = markdown.util.AtomicString(text)
         return el

cookbook/helper/open_data_importer.py

@@ -1,210 +0,0 @@
-from cookbook.models import (Food, FoodProperty, Property, PropertyType, Supermarket,
-                             SupermarketCategory, SupermarketCategoryRelation, Unit, UnitConversion)
-
-
-class OpenDataImporter:
-    request = None
-    data = {}
-    slug_id_cache = {}
-    update_existing = False
-    use_metric = True
-
-    def __init__(self, request, data, update_existing=False, use_metric=True):
-        self.request = request
-        self.data = data
-        self.update_existing = update_existing
-        self.use_metric = use_metric
-
-    def _update_slug_cache(self, object_class, datatype):
-        self.slug_id_cache[datatype] = dict(object_class.objects.filter(space=self.request.space, open_data_slug__isnull=False).values_list('open_data_slug', 'id', ))
-
-    def import_units(self):
-        datatype = 'unit'
-
-        insert_list = []
-        for u in list(self.data[datatype].keys()):
-            insert_list.append(Unit(
-                name=self.data[datatype][u]['name'],
-                plural_name=self.data[datatype][u]['plural_name'],
-                base_unit=self.data[datatype][u]['base_unit'] if self.data[datatype][u]['base_unit'] != '' else None,
-                open_data_slug=u,
-                space=self.request.space
-            ))
-
-        if self.update_existing:
-            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=(
-                'name', 'plural_name', 'base_unit', 'open_data_slug'), unique_fields=('space', 'name',))
-        else:
-            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
-
-    def import_category(self):
-        datatype = 'category'
-
-        insert_list = []
-        for k in list(self.data[datatype].keys()):
-            insert_list.append(SupermarketCategory(
-                name=self.data[datatype][k]['name'],
-                open_data_slug=k,
-                space=self.request.space
-            ))
-
-        return SupermarketCategory.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
-
-    def import_property(self):
-        datatype = 'property'
-
-        insert_list = []
-        for k in list(self.data[datatype].keys()):
-            insert_list.append(PropertyType(
-                name=self.data[datatype][k]['name'],
-                unit=self.data[datatype][k]['unit'],
-                open_data_slug=k,
-                space=self.request.space
-            ))
-
-        return PropertyType.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
-
-    def import_supermarket(self):
-        datatype = 'store'
-
-        self._update_slug_cache(SupermarketCategory, 'category')
-        insert_list = []
-        for k in list(self.data[datatype].keys()):
-            insert_list.append(Supermarket(
-                name=self.data[datatype][k]['name'],
-                open_data_slug=k,
-                space=self.request.space
-            ))
-
-        # always add open data slug if matching supermarket is found, otherwise relation might fail
-        supermarkets = Supermarket.objects.bulk_create(insert_list, unique_fields=('space', 'name',), update_conflicts=True, update_fields=('open_data_slug',))
-        self._update_slug_cache(Supermarket, 'store')
-
-        insert_list = []
-        for k in list(self.data[datatype].keys()):
-            relations = []
-            order = 0
-            for c in self.data[datatype][k]['categories']:
-                relations.append(
-                    SupermarketCategoryRelation(
-                        supermarket_id=self.slug_id_cache[datatype][k],
-                        category_id=self.slug_id_cache['category'][c],
-                        order=order,
-                    )
-                )
-                order += 1
-
-            SupermarketCategoryRelation.objects.bulk_create(relations, ignore_conflicts=True, unique_fields=('supermarket', 'category',))
-
-        return supermarkets
-
-    def import_food(self):
-        identifier_list = []
-        datatype = 'food'
-        for k in list(self.data[datatype].keys()):
-            identifier_list.append(self.data[datatype][k]['name'])
-            identifier_list.append(self.data[datatype][k]['plural_name'])
-
-        existing_objects_flat = []
-        existing_objects = {}
-        for f in Food.objects.filter(space=self.request.space).filter(name__in=identifier_list).values_list('id', 'name', 'plural_name'):
-            existing_objects_flat.append(f[1])
-            existing_objects_flat.append(f[2])
-            existing_objects[f[1]] = f
-            existing_objects[f[2]] = f
-
-        self._update_slug_cache(Unit, 'unit')
-        self._update_slug_cache(PropertyType, 'property')
-
-        insert_list = []
-        insert_list_flat = []
-        update_list = []
-        update_field_list = []
-        for k in list(self.data[datatype].keys()):
-            if not (self.data[datatype][k]['name'] in existing_objects_flat or self.data[datatype][k]['plural_name'] in existing_objects_flat):
-                if not (self.data[datatype][k]['name'] in insert_list_flat or self.data[datatype][k]['plural_name'] in insert_list_flat):
-                    insert_list.append({'data': {
-                        'name': self.data[datatype][k]['name'],
-                        'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
-                        'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
-                        'fdc_id': self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
-                        'open_data_slug': k,
-                        'space': self.request.space.id,
-                    }})
-                    # build a fake second flat array to prevent duplicate foods from being inserted.
-                    # trying to insert a duplicate would throw a db error :(
-                    insert_list_flat.append(self.data[datatype][k]['name'])
-                    insert_list_flat.append(self.data[datatype][k]['plural_name'])
-            else:
-                if self.data[datatype][k]['name'] in existing_objects:
-                    existing_food_id = existing_objects[self.data[datatype][k]['name']][0]
-                else:
-                    existing_food_id = existing_objects[self.data[datatype][k]['plural_name']][0]
-
-                if self.update_existing:
-                    update_field_list = ['name', 'plural_name', 'preferred_unit_id', 'preferred_shopping_unit_id', 'supermarket_category_id', 'fdc_id', 'open_data_slug', ]
-                    update_list.append(Food(
-                        id=existing_food_id,
-                        name=self.data[datatype][k]['name'],
-                        plural_name=self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
-                        supermarket_category_id=self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
-                        fdc_id=self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
-                        open_data_slug=k,
-                    ))
-                else:
-                    update_field_list = ['open_data_slug', ]
-                    update_list.append(Food(id=existing_food_id, open_data_slug=k, ))
-
-        Food.load_bulk(insert_list, None)
-        if len(update_list) > 0:
-            Food.objects.bulk_update(update_list, update_field_list)
-
-        self._update_slug_cache(Food, 'food')
-
-        food_property_list = []
-        # alias_list = []
-
-        for k in list(self.data[datatype].keys()):
-            for fp in self.data[datatype][k]['properties']['type_values']:
-                # try catch here because somettimes key "k" is not set for he food cache
-                try:
-                    food_property_list.append(Property(
-                        property_type_id=self.slug_id_cache['property'][fp['property_type']],
-                        property_amount=fp['property_value'],
-                        import_food_id=self.slug_id_cache['food'][k],
-                        space=self.request.space,
-                    ))
-                except KeyError:
-                    print(str(k) + ' is not in self.slug_id_cache["food"]')
-
-        Property.objects.bulk_create(food_property_list, ignore_conflicts=True, unique_fields=('space', 'import_food_id', 'property_type',))
-
-        property_food_relation_list = []
-        for p in Property.objects.filter(space=self.request.space, import_food_id__isnull=False).values_list('import_food_id', 'id', ):
-            property_food_relation_list.append(Food.properties.through(food_id=p[0], property_id=p[1]))
-
-        FoodProperty.objects.bulk_create(property_food_relation_list, ignore_conflicts=True, unique_fields=('food_id', 'property_id',))
-
-        return insert_list + update_list
-
-    def import_conversion(self):
-        datatype = 'conversion'
-
-        insert_list = []
-        for k in list(self.data[datatype].keys()):
-            # try catch here because sometimes key "k" is not set for he food cache
-            try:
-                insert_list.append(UnitConversion(
-                    base_amount=self.data[datatype][k]['base_amount'],
-                    base_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['base_unit']],
-                    converted_amount=self.data[datatype][k]['converted_amount'],
-                    converted_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['converted_unit']],
-                    food_id=self.slug_id_cache['food'][self.data[datatype][k]['food']],
-                    open_data_slug=k,
-                    space=self.request.space,
-                    created_by=self.request.user,
-                ))
-            except KeyError:
-                print(str(k) + ' is not in self.slug_id_cache["food"]')
-
-        return UnitConversion.objects.bulk_create(insert_list, ignore_conflicts=True, unique_fields=('space', 'base_unit', 'converted_unit', 'food', 'open_data_slug'))

cookbook/helper/permission_helper.py

@@ -4,16 +4,16 @@ from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import user_passes_test
 from django.core.cache import cache
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.http import HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
-from oauth2_provider.contrib.rest_framework import TokenHasReadWriteScope, TokenHasScope
+from oauth2_provider.contrib.rest_framework import TokenHasScope, TokenHasReadWriteScope
 from oauth2_provider.models import AccessToken
 from rest_framework import permissions
 from rest_framework.permissions import SAFE_METHODS
 
-from cookbook.models import Recipe, ShareLink, UserSpace
+from cookbook.models import ShareLink, Recipe, UserSpace
 
 
 def get_allowed_groups(groups_required):
@@ -123,7 +123,7 @@ def share_link_valid(recipe, share):
             return c
 
         if link := ShareLink.objects.filter(recipe=recipe, uuid=share, abuse_blocked=False).first():
-            if 0 < settings.SHARING_LIMIT < link.request_count and not link.space.no_sharing_limit:
+            if 0 < settings.SHARING_LIMIT < link.request_count:
                 return False
             link.request_count += 1
             link.save()
@@ -255,6 +255,9 @@ class CustomIsShared(permissions.BasePermission):
         return request.user.is_authenticated
 
     def has_object_permission(self, request, view, obj):
+        # # temporary hack to make old shopping list work with new shopping list
+        # if obj.__class__.__name__ in ['ShoppingList', 'ShoppingListEntry']:
+        #     return is_object_shared(request.user, obj) or obj.created_by in list(request.user.get_shopping_share())
         return is_object_shared(request.user, obj)
 
 
@@ -319,8 +322,7 @@ class CustomRecipePermission(permissions.BasePermission):
 
     def has_permission(self, request, view):  # user is either at least a guest or a share link is given and the request is safe
         share = request.query_params.get('share', None)
-        return ((has_group_permission(request.user, ['guest']) and request.method in SAFE_METHODS) or has_group_permission(
-            request.user, ['user'])) or (share and request.method in SAFE_METHODS and 'pk' in view.kwargs)
+        return has_group_permission(request.user, ['guest']) or (share and request.method in SAFE_METHODS and 'pk' in view.kwargs)
 
     def has_object_permission(self, request, view, obj):
         share = request.query_params.get('share', None)
@@ -330,8 +332,7 @@ class CustomRecipePermission(permissions.BasePermission):
             if obj.private:
                 return ((obj.created_by == request.user) or (request.user in obj.shared.all())) and obj.space == request.space
             else:
-                return ((has_group_permission(request.user, ['guest']) and request.method in SAFE_METHODS)
-                        or has_group_permission(request.user, ['user'])) and obj.space == request.space
+                return has_group_permission(request.user, ['guest']) and obj.space == request.space
 
 
 class CustomUserPermission(permissions.BasePermission):
@@ -360,7 +361,7 @@ class CustomTokenHasScope(TokenHasScope):
     """
 
     def has_permission(self, request, view):
-        if isinstance(request.auth, AccessToken):
+        if type(request.auth) == AccessToken:
             return super().has_permission(request, view)
         else:
             return request.user.is_authenticated
@@ -374,7 +375,7 @@ class CustomTokenHasReadWriteScope(TokenHasReadWriteScope):
     """
 
     def has_permission(self, request, view):
-        if isinstance(request.auth, AccessToken):
+        if type(request.auth) == AccessToken:
             return super().has_permission(request, view)
         else:
             return True
@@ -433,10 +434,3 @@ def switch_user_active_space(user, space):
             return us
     except ObjectDoesNotExist:
         return None
-
-
-class IsReadOnlyDRF(permissions.BasePermission):
-    message = 'You cannot interact with this object as it is not owned by you!'
-
-    def has_permission(self, request, view):
-        return request.method in SAFE_METHODS

cookbook/helper/property_helper.py

@@ -1,74 +0,0 @@
-from django.core.cache import caches
-
-from cookbook.helper.cache_helper import CacheHelper
-from cookbook.helper.unit_conversion_helper import UnitConversionHelper
-from cookbook.models import PropertyType
-
-
-class FoodPropertyHelper:
-    space = None
-
-    def __init__(self, space):
-        """
-        Helper to perform food property calculations
-        :param space: space to limit scope to
-        """
-        self.space = space
-
-    def calculate_recipe_properties(self, recipe):
-        """
-        Calculate all food properties for a given recipe.
-        :param recipe: recipe to calculate properties for
-        :return: dict of with property keys and total/food values for each property available
-        """
-        ingredients = []
-        computed_properties = {}
-
-        for s in recipe.steps.all():
-            ingredients += s.ingredients.all()
-
-        property_types = caches['default'].get(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, None)
-
-        if not property_types:
-            property_types = PropertyType.objects.filter(space=self.space).all()
-            # cache is cleared on property type save signal so long duration is fine
-            caches['default'].set(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, property_types, 60 * 60)
-
-        for fpt in property_types:
-            computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'description': fpt.description,
-                                           'unit': fpt.unit, 'order': fpt.order, 'food_values': {}, 'total_value': 0, 'missing_value': False}
-
-        uch = UnitConversionHelper(self.space)
-
-        for i in ingredients:
-            if i.food is not None:
-                conversions = uch.get_conversions(i)
-                for pt in property_types:
-                    found_property = False
-                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:
-                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
-                        computed_properties[pt.id]['missing_value'] = i.food.properties_food_unit is None
-                    else:
-                        for p in i.food.properties.all():
-                            if p.property_type == pt:
-                                for c in conversions:
-                                    if c.unit == i.food.properties_food_unit:
-                                        found_property = True
-                                        computed_properties[pt.id]['total_value'] += (c.amount / i.food.properties_food_amount) * p.property_amount
-                                        computed_properties[pt.id]['food_values'] = self.add_or_create(
-                                            computed_properties[p.property_type.id]['food_values'], c.food.id, (c.amount / i.food.properties_food_amount) * p.property_amount, c.food)
-                    if not found_property:
-                        computed_properties[pt.id]['missing_value'] = True
-                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
-
-        return computed_properties
-
-    # small dict helper to add to existing key or create new, probably a better way of doing this
-    # TODO move to central helper ?
-    @staticmethod
-    def add_or_create(d, key, value, food):
-        if key in d:
-            d[key]['value'] += value
-        else:
-            d[key] = {'id': food.id, 'food': food.name, 'value': value}
-        return d

cookbook/helper/recipe_html_import.py

@@ -0,0 +1,191 @@
+# import json
+# import re
+# from json import JSONDecodeError
+# from urllib.parse import unquote
+
+# from bs4 import BeautifulSoup
+# from bs4.element import Tag
+# from recipe_scrapers import scrape_html, scrape_me
+# from recipe_scrapers._exceptions import NoSchemaFoundInWildMode
+# from recipe_scrapers._utils import get_host_name, normalize_string
+
+# from cookbook.helper import recipe_url_import as helper
+# from cookbook.helper.scrapers.scrapers import text_scraper
+
+
+# def get_recipe_from_source(text, url, request):
+#     def build_node(k, v):
+#         if isinstance(v, dict):
+#             node = {
+#                 'name': k,
+#                 'value': k,
+#                 'children': get_children_dict(v)
+#             }
+#         elif isinstance(v, list):
+#             node = {
+#                 'name': k,
+#                 'value': k,
+#                 'children': get_children_list(v)
+#             }
+#         else:
+#             node = {
+#                 'name': k + ": " + normalize_string(str(v)),
+#                 'value': normalize_string(str(v))
+#             }
+#         return node
+
+#     def get_children_dict(children):
+#         kid_list = []
+#         for k, v in children.items():
+#             kid_list.append(build_node(k, v))
+#         return kid_list
+
+#     def get_children_list(children):
+#         kid_list = []
+#         for kid in children:
+#             if type(kid) == list:
+#                 node = {
+#                     'name': "unknown list",
+#                     'value': "unknown list",
+#                     'children': get_children_list(kid)
+#                 }
+#                 kid_list.append(node)
+#             elif type(kid) == dict:
+#                 for k, v in kid.items():
+#                     kid_list.append(build_node(k, v))
+#             else:
+#                 kid_list.append({
+#                     'name': normalize_string(str(kid)),
+#                     'value': normalize_string(str(kid))
+#                 })
+#         return kid_list
+
+#     recipe_tree = []
+#     parse_list = []
+#     soup = BeautifulSoup(text, "html.parser")
+#     html_data = get_from_html(soup)
+#     images = get_images_from_source(soup, url)
+#     text = unquote(text)
+#     scrape = None
+
+#     if url and not text:
+#         try:
+#             scrape = scrape_me(url_path=url, wild_mode=True)
+#         except(NoSchemaFoundInWildMode):
+#             pass
+
+#     if not scrape:
+#         try:
+#             parse_list.append(remove_graph(json.loads(text)))
+#             if not url and 'url' in parse_list[0]:
+#                 url = parse_list[0]['url']
+#             scrape = text_scraper("<script type='application/ld+json'>" + text + "</script>", url=url)
+
+#         except JSONDecodeError:
+#             for el in soup.find_all('script', type='application/ld+json'):
+#                 el = remove_graph(el)
+#                 if not url and 'url' in el:
+#                     url = el['url']
+#                 if type(el) == list:
+#                     for le in el:
+#                         parse_list.append(le)
+#                 elif type(el) == dict:
+#                     parse_list.append(el)
+#             for el in soup.find_all(type='application/json'):
+#                 el = remove_graph(el)
+#                 if type(el) == list:
+#                     for le in el:
+#                         parse_list.append(le)
+#                 elif type(el) == dict:
+#                     parse_list.append(el)
+#             scrape = text_scraper(text, url=url)
+
+#     recipe_json = helper.get_from_scraper(scrape, request)
+
+#     # TODO: DEPRECATE recipe_tree & html_data.  first validate it isn't used anywhere
+#     for el in parse_list:
+#         temp_tree = []
+#         if isinstance(el, Tag):
+#             try:
+#                 el = json.loads(el.string)
+#             except TypeError:
+#                 continue
+
+#         for k, v in el.items():
+#             if isinstance(v, dict):
+#                 node = {
+#                     'name': k,
+#                     'value': k,
+#                     'children': get_children_dict(v)
+#                 }
+#             elif isinstance(v, list):
+#                 node = {
+#                     'name': k,
+#                     'value': k,
+#                     'children': get_children_list(v)
+#                 }
+#             else:
+#                 node = {
+#                     'name': k + ": " + normalize_string(str(v)),
+#                     'value': normalize_string(str(v))
+#                 }
+#             temp_tree.append(node)
+
+#         if '@type' in el and el['@type'] == 'Recipe':
+#             recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
+#         else:
+#             recipe_tree += [{'name': 'json', 'children': temp_tree}]
+
+#     return recipe_json, recipe_tree, html_data, images
+
+
+# def get_from_html(soup):
+#     INVISIBLE_ELEMS = ('style', 'script', 'head', 'title')
+#     html = []
+#     for s in soup.strings:
+#         if ((s.parent.name not in INVISIBLE_ELEMS) and (len(s.strip()) > 0)):
+#             html.append(s)
+#     return html
+
+
+# def get_images_from_source(soup, url):
+#     sources = ['src', 'srcset', 'data-src']
+#     images = []
+#     img_tags = soup.find_all('img')
+#     if url:
+#         site = get_host_name(url)
+#         prot = url.split(':')[0]
+
+#     urls = []
+#     for img in img_tags:
+#         for src in sources:
+#             try:
+#                 urls.append(img[src])
+#             except KeyError:
+#                 pass
+
+#     for u in urls:
+#         u = u.split('?')[0]
+#         filename = re.search(r'/([\w_-]+[.](jpg|jpeg|gif|png))$', u)
+#         if filename:
+#             if (('http' not in u) and (url)):
+#                 # sometimes an image source can be relative
+#                 # if it is provide the base url
+#                 u = '{}://{}{}'.format(prot, site, u)
+#             if 'http' in u:
+#                 images.append(u)
+#     return images
+
+
+# def remove_graph(el):
+#     # recipes type might be wrapped in @graph type
+#     if isinstance(el, Tag):
+#         try:
+#             el = json.loads(el.string)
+#             if '@graph' in el:
+#                 for x in el['@graph']:
+#                     if '@type' in x and x['@type'] == 'Recipe':
+#                         el = x
+#         except (TypeError, JSONDecodeError):
+#             pass
+#     return el

cookbook/helper/recipe_search.py

@@ -1,11 +1,14 @@
 import json
+from collections import Counter
 from datetime import date, timedelta
 
 from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector, TrigramSimilarity
 from django.core.cache import cache
-from django.db.models import Avg, Case, Count, Exists, F, Max, OuterRef, Q, Subquery, Value, When
+from django.core.cache import caches
+from django.db.models import (Avg, Case, Count, Exists, F, Func, Max, OuterRef, Q, Subquery, Value, When, FilteredRelation)
 from django.db.models.functions import Coalesce, Lower, Substr
 from django.utils import timezone, translation
+from django.utils.translation import gettext as _
 
 from cookbook.helper.HelperFunctions import Round, str2bool
 from cookbook.managers import DICTIONARY
@@ -14,25 +17,20 @@ from cookbook.models import (CookLog, CustomFilter, Food, Keyword, Recipe, Searc
 from recipes import settings
 
 
+# TODO create extensive tests to make sure ORs ANDs and various filters, sorting, etc work as expected
 # TODO consider creating a simpleListRecipe API that only includes minimum of recipe info and minimal filtering
 class RecipeSearch():
-    _postgres = settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql'
+    _postgres = settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']
 
     def __init__(self, request, **params):
         self._request = request
         self._queryset = None
         if f := params.get('filter', None):
-            custom_filter = (
-                CustomFilter.objects.filter(id=f, space=self._request.space)
-                .filter(Q(created_by=self._request.user) | Q(shared=self._request.user) | Q(recipebook__shared=self._request.user))
-                .first()
-            )
+            custom_filter = CustomFilter.objects.filter(id=f, space=self._request.space).filter(Q(created_by=self._request.user) |
+                                                                                                Q(shared=self._request.user) | Q(recipebook__shared=self._request.user)).first()
             if custom_filter:
                 self._params = {**json.loads(custom_filter.search)}
                 self._original_params = {**(params or {})}
-                # json.loads casts rating as an integer, expecting string
-                if isinstance(self._params.get('rating', None), int):
-                    self._params['rating'] = str(self._params['rating'])
             else:
                 self._params = {**(params or {})}
         else:
@@ -47,8 +45,7 @@ class RecipeSearch():
             cache.set(CACHE_KEY, self._search_prefs, timeout=10)
         else:
             self._search_prefs = SearchPreference()
-        self._string = self._params.get('query').strip(
-        ) if self._params.get('query', None) else None
+        self._string = self._params.get('query').strip() if self._params.get('query', None) else None
         self._rating = self._params.get('rating', None)
         self._keywords = {
             'or': self._params.get('keywords_or', None) or self._params.get('keywords', None),
@@ -77,8 +74,7 @@ class RecipeSearch():
         self._random = str2bool(self._params.get('random', False))
         self._new = str2bool(self._params.get('new', False))
         self._num_recent = int(self._params.get('num_recent', 0))
-        self._include_children = str2bool(
-            self._params.get('include_children', None))
+        self._include_children = str2bool(self._params.get('include_children', None))
         self._timescooked = self._params.get('timescooked', None)
         self._cookedon = self._params.get('cookedon', None)
         self._createdon = self._params.get('createdon', None)
@@ -86,9 +82,9 @@ class RecipeSearch():
         self._viewedon = self._params.get('viewedon', None)
         self._makenow = self._params.get('makenow', None)
         # this supports hidden feature to find recipes missing X ingredients
-        if isinstance(self._makenow, bool) and self._makenow == True:
+        if type(self._makenow) == bool and self._makenow == True:
             self._makenow = 0
-        elif isinstance(self._makenow, str) and self._makenow in ["yes", "true"]:
+        elif type(self._makenow) == str and self._makenow in ["yes", "true"]:
             self._makenow = 0
         else:
             try:
@@ -145,7 +141,7 @@ class RecipeSearch():
         self.unit_filters(units=self._units)
         self._makenow_filter(missing=self._makenow)
         self.string_filters(string=self._string)
-        return self._queryset.filter(space=self._request.space).order_by(*self.orderby)
+        return self._queryset.filter(space=self._request.space).distinct().order_by(*self.orderby)
 
     def _sort_includes(self, *args):
         for x in args:
@@ -161,7 +157,7 @@ class RecipeSearch():
         else:
             order = []
             # TODO add userpreference for default sort order and replace '-favorite'
-            default_order = ['name']
+            default_order = ['-name']
             # recent and new_recipe are always first; they float a few recipes to the top
             if self._num_recent:
                 order += ['-recent']
@@ -170,6 +166,7 @@ class RecipeSearch():
 
             # if a sort order is provided by user - use that order
             if self._sort_order:
+
                 if not isinstance(self._sort_order, list):
                     order += [self._sort_order]
                 else:
@@ -185,10 +182,8 @@ class RecipeSearch():
             # otherwise sort by the remaining order_by attributes or favorite by default
             else:
                 order += default_order
-            order[:] = [Lower('name').asc() if x ==
-                        'name' else x for x in order]
-            order[:] = [Lower('name').desc() if x ==
-                        '-name' else x for x in order]
+            order[:] = [Lower('name').asc() if x == 'name' else x for x in order]
+            order[:] = [Lower('name').desc() if x == '-name' else x for x in order]
             self.orderby = order
 
     def string_filters(self, string=None):
@@ -205,8 +200,7 @@ class RecipeSearch():
             for f in self._filters:
                 query_filter |= f
 
-            # this creates duplicate records which can screw up other aggregates, see makenow for workaround
-            self._queryset = self._queryset.filter(query_filter).distinct()
+            self._queryset = self._queryset.filter(query_filter).distinct()  # this creates duplicate records which can screw up other aggregates, see makenow for workaround
             if self._fulltext_include:
                 if self._fuzzy_match is None:
                     self._queryset = self._queryset.annotate(score=Coalesce(Max(self.search_rank), 0.0))
@@ -234,13 +228,12 @@ class RecipeSearch():
                 default = timezone.now() - timedelta(days=100000)
             else:
                 default = timezone.now()
-            self._queryset = self._queryset.annotate(
-                lastcooked=Coalesce(Max(Case(When(cooklog__created_by=self._request.user, cooklog__space=self._request.space, then='cooklog__created_at'))), Value(default))
-            )
+            self._queryset = self._queryset.annotate(lastcooked=Coalesce(
+                Max(Case(When(cooklog__created_by=self._request.user, cooklog__space=self._request.space, then='cooklog__created_at'))), Value(default)))
         if cooked_date is None:
             return
 
-        cooked_date = date(*[int(x)for x in cooked_date.split('-') if x != ''])
+        cooked_date = date(*[int(x) for x in cooked_date.split('-') if x != ''])
 
         if lessthan:
             self._queryset = self._queryset.filter(lastcooked__date__lte=cooked_date).exclude(lastcooked=default)
@@ -261,7 +254,7 @@ class RecipeSearch():
         if updated_date is None:
             return
         lessthan = '-' in updated_date[:1]
-        updated_date = date(*[int(x)for x in updated_date.split('-') if x != ''])
+        updated_date = date(*[int(x) for x in updated_date.split('-') if x != ''])
         if lessthan:
             self._queryset = self._queryset.filter(updated_at__date__lte=updated_date)
         else:
@@ -270,13 +263,12 @@ class RecipeSearch():
     def _viewed_on_filter(self, viewed_date=None):
         if self._sort_includes('lastviewed') or viewed_date:
             longTimeAgo = timezone.now() - timedelta(days=100000)
-            self._queryset = self._queryset.annotate(
-                lastviewed=Coalesce(Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__created_at'))), Value(longTimeAgo))
-            )
+            self._queryset = self._queryset.annotate(lastviewed=Coalesce(
+                Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__created_at'))), Value(longTimeAgo)))
         if viewed_date is None:
             return
         lessthan = '-' in viewed_date[:1]
-        viewed_date = date(*[int(x)for x in viewed_date.split('-') if x != ''])
+        viewed_date = date(*[int(x) for x in viewed_date.split('-') if x != ''])
 
         if lessthan:
             self._queryset = self._queryset.filter(lastviewed__date__lte=viewed_date).exclude(lastviewed=longTimeAgo)
@@ -287,11 +279,9 @@ class RecipeSearch():
         # TODO make new days a user-setting
         if not self._new:
             return
-        self._queryset = self._queryset.annotate(
-            new_recipe=Case(
-                When(created_at__gte=(timezone.now() - timedelta(days=new_days)), then=('pk')),
-                default=Value(0),
-            )
+        self._queryset = (
+            self._queryset.annotate(new_recipe=Case(
+                When(created_at__gte=(timezone.now() - timedelta(days=new_days)), then=('pk')), default=Value(0), ))
         )
 
     def _recently_viewed(self, num_recent=None):
@@ -301,25 +291,19 @@ class RecipeSearch():
                     Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__pk'))), Value(0)))
             return
 
-        num_recent_recipes = (
-            ViewLog.objects.filter(created_by=self._request.user, space=self._request.space)
-            .values('recipe').annotate(recent=Max('created_at')).order_by('-recent')[:num_recent]
-        )
+        num_recent_recipes = ViewLog.objects.filter(created_by=self._request.user, space=self._request.space).values(
+            'recipe').annotate(recent=Max('created_at')).order_by('-recent')[:num_recent]
         self._queryset = self._queryset.annotate(recent=Coalesce(Max(Case(When(pk__in=num_recent_recipes.values('recipe'), then='viewlog__pk'))), Value(0)))
 
     def _favorite_recipes(self, times_cooked=None):
         if self._sort_includes('favorite') or times_cooked:
-            less_than = '-' in (times_cooked or []) and not self._sort_includes('-favorite')
+            less_than = '-' in (times_cooked or []) or not self._sort_includes('-favorite')
             if less_than:
                 default = 1000
             else:
                 default = 0
-            favorite_recipes = (
-                CookLog.objects.filter(created_by=self._request.user, space=self._request.space, recipe=OuterRef('pk'))
-                .values('recipe')
-                .annotate(count=Count('pk', distinct=True))
-                .values('count')
-            )
+            favorite_recipes = CookLog.objects.filter(created_by=self._request.user, space=self._request.space, recipe=OuterRef('pk')
+                                                      ).values('recipe').annotate(count=Count('pk', distinct=True)).values('count')
             self._queryset = self._queryset.annotate(favorite=Coalesce(Subquery(favorite_recipes), default))
         if times_cooked is None:
             return
@@ -327,7 +311,7 @@ class RecipeSearch():
         if times_cooked == '0':
             self._queryset = self._queryset.filter(favorite=0)
         elif less_than:
-            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked.replace('-', ''))).exclude(favorite=0)
+            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked[1:])).exclude(favorite=0)
         else:
             self._queryset = self._queryset.filter(favorite__gte=int(times_cooked))
 
@@ -409,9 +393,8 @@ class RecipeSearch():
 
     def rating_filter(self, rating=None):
         if rating or self._sort_includes('rating'):
-            lessthan = '-' in (rating or [])
-            reverse = 'rating' in (self._sort_order or []) and '-rating' not in (self._sort_order or [])
-            if lessthan or reverse:
+            lessthan = self._sort_includes('-rating') or '-' in (rating or [])
+            if lessthan:
                 default = 100
             else:
                 default = 0
@@ -463,7 +446,7 @@ class RecipeSearch():
         if not steps:
             return
         if not isinstance(steps, list):
-            steps = [steps]
+            steps = [unistepsts]
         self._queryset = self._queryset.filter(steps__id__in=steps)
 
     def build_fulltext_filters(self, string=None):
@@ -520,62 +503,263 @@ class RecipeSearch():
                     trigram += TrigramSimilarity(f, self._string)
                 else:
                     trigram = TrigramSimilarity(f, self._string)
-            self._fuzzy_match = (
-                Recipe.objects.annotate(trigram=trigram)
-                .distinct()
-                .annotate(simularity=Max('trigram'))
-                .values('id', 'simularity')
-                .filter(simularity__gt=self._search_prefs.trigram_threshold)
-            )
+            self._fuzzy_match = Recipe.objects.annotate(trigram=trigram).distinct(
+            ).annotate(simularity=Max('trigram')).values('id', 'simularity').filter(simularity__gt=self._search_prefs.trigram_threshold)
             self._filters += [Q(pk__in=self._fuzzy_match.values('pk'))]
 
     def _makenow_filter(self, missing=None):
-        if missing is None or (isinstance(missing, bool) and missing == False):
+        if missing is None or (type(missing) == bool and missing == False):
             return
         shopping_users = [*self._request.user.get_shopping_share(), self._request.user]
 
         onhand_filter = (
-            Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
-            # or substitute food onhand
-            | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)
-            | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
-            | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
+                Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
+                | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)  # or substitute food onhand
+                | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
+                | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
         )
         makenow_recipes = Recipe.objects.annotate(
             count_food=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__isnull=False), distinct=True),
             count_onhand=Count('steps__ingredients__food__pk', filter=onhand_filter, distinct=True),
-            count_ignore_shopping=Count(
-                'steps__ingredients__food__pk', filter=Q(steps__ingredients__food__ignore_shopping=True, steps__ingredients__food__recipe__isnull=True), distinct=True
-            ),
+            count_ignore_shopping=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__ignore_shopping=True,
+                                                                                 steps__ingredients__food__recipe__isnull=True), distinct=True),
             has_child_sub=Case(When(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users), then=Value(1)), default=Value(0)),
             has_sibling_sub=Case(When(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users), then=Value(1)), default=Value(0))
-        ).annotate(missingfood=F('count_food') - F('count_onhand') - F('count_ignore_shopping')).filter(missingfood__lte=missing)
+        ).annotate(missingfood=F('count_food') - F('count_onhand') - F('count_ignore_shopping')).filter(missingfood=missing)
         self._queryset = self._queryset.distinct().filter(id__in=makenow_recipes.values('id'))
 
     @staticmethod
     def __children_substitute_filter(shopping_users=None):
-        children_onhand_subquery = Food.objects.filter(path__startswith=OuterRef('path'), depth__gt=OuterRef('depth'), onhand_users__in=shopping_users)
-        return (
-            Food.objects.exclude(  # list of foods that are onhand and children of: foods that are not onhand and are set to use children as substitutes
-                Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True) | Q(substitute__onhand_users__in=shopping_users)
-            )
-            .exclude(depth=1, numchild=0)
-            .filter(substitute_children=True)
-            .annotate(child_onhand_count=Exists(children_onhand_subquery))
-            .filter(child_onhand_count=True)
+        children_onhand_subquery = Food.objects.filter(
+            path__startswith=OuterRef('path'),
+            depth__gt=OuterRef('depth'),
+            onhand_users__in=shopping_users
         )
+        return Food.objects.exclude(  # list of foods that are onhand and children of: foods that are not onhand and are set to use children as substitutes
+            Q(onhand_users__in=shopping_users)
+            | Q(ignore_shopping=True, recipe__isnull=True)
+            | Q(substitute__onhand_users__in=shopping_users)
+        ).exclude(depth=1, numchild=0
+                  ).filter(substitute_children=True
+                           ).annotate(child_onhand_count=Exists(children_onhand_subquery)
+                                      ).filter(child_onhand_count=True)
 
     @staticmethod
     def __sibling_substitute_filter(shopping_users=None):
         sibling_onhand_subquery = Food.objects.filter(
-            path__startswith=Substr(OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)), depth=OuterRef('depth'), onhand_users__in=shopping_users
+            path__startswith=Substr(OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)),
+            depth=OuterRef('depth'),
+            onhand_users__in=shopping_users
         )
-        return (
-            Food.objects.exclude(  # list of foods that are onhand and siblings of: foods that are not onhand and are set to use siblings as substitutes
-                Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True) | Q(substitute__onhand_users__in=shopping_users)
-            )
-            .exclude(depth=1, numchild=0)
-            .filter(substitute_siblings=True)
-            .annotate(sibling_onhand=Exists(sibling_onhand_subquery))
-            .filter(sibling_onhand=True)
+        return Food.objects.exclude(  # list of foods that are onhand and siblings of: foods that are not onhand and are set to use siblings as substitutes
+            Q(onhand_users__in=shopping_users)
+            | Q(ignore_shopping=True, recipe__isnull=True)
+            | Q(substitute__onhand_users__in=shopping_users)
+        ).exclude(depth=1, numchild=0
+                  ).filter(substitute_siblings=True
+                           ).annotate(sibling_onhand=Exists(sibling_onhand_subquery)
+                                      ).filter(sibling_onhand=True)
+
+
+class RecipeFacet():
+    class CacheEmpty(Exception):
+        pass
+
+    def __init__(self, request, queryset=None, hash_key=None, cache_timeout=3600):
+        if hash_key is None and queryset is None:
+            raise ValueError(_("One of queryset or hash_key must be provided"))
+
+        self._request = request
+        self._queryset = queryset
+        self.hash_key = hash_key or str(hash(self._queryset.query))
+        self._SEARCH_CACHE_KEY = f"recipes_filter_{self.hash_key}"
+        self._cache_timeout = cache_timeout
+        self._cache = caches['default'].get(self._SEARCH_CACHE_KEY, {})
+        if self._cache is None and self._queryset is None:
+            raise self.CacheEmpty("No queryset provided and cache empty")
+
+        self.Keywords = self._cache.get('Keywords', None)
+        self.Foods = self._cache.get('Foods', None)
+        self.Books = self._cache.get('Books', None)
+        self.Ratings = self._cache.get('Ratings', None)
+        # TODO Move Recent to recipe annotation/serializer:  requrires change in RecipeSearch(), RecipeSearchView.vue and serializer
+        self.Recent = self._cache.get('Recent', None)
+
+        if self._queryset is not None:
+            self._recipe_list = list(self._queryset.values_list('id', flat=True))
+            self._search_params = {
+                'keyword_list': self._request.query_params.getlist('keywords', []),
+                'food_list': self._request.query_params.getlist('foods', []),
+                'book_list': self._request.query_params.getlist('book', []),
+                'search_keywords_or': str2bool(self._request.query_params.get('keywords_or', True)),
+                'search_foods_or': str2bool(self._request.query_params.get('foods_or', True)),
+                'search_books_or': str2bool(self._request.query_params.get('books_or', True)),
+                'space': self._request.space,
+            }
+        elif self.hash_key is not None:
+            self._recipe_list = self._cache.get('recipe_list', [])
+            self._search_params = {
+                'keyword_list': self._cache.get('keyword_list', None),
+                'food_list': self._cache.get('food_list', None),
+                'book_list': self._cache.get('book_list', None),
+                'search_keywords_or': self._cache.get('search_keywords_or', None),
+                'search_foods_or': self._cache.get('search_foods_or', None),
+                'search_books_or': self._cache.get('search_books_or', None),
+                'space': self._cache.get('space', None),
+            }
+
+        self._cache = {
+            **self._search_params,
+            'recipe_list': self._recipe_list,
+            'Ratings': self.Ratings,
+            'Recent': self.Recent,
+            'Keywords': self.Keywords,
+            'Foods': self.Foods,
+            'Books': self.Books
+
+        }
+        caches['default'].set(self._SEARCH_CACHE_KEY, self._cache, self._cache_timeout)
+
+    def get_facets(self, from_cache=False):
+        if from_cache:
+            return {
+                'cache_key': self.hash_key or '',
+                'Ratings': self.Ratings or {},
+                'Recent': self.Recent or [],
+                'Keywords': self.Keywords or [],
+                'Foods': self.Foods or [],
+                'Books': self.Books or []
+            }
+        return {
+            'cache_key': self.hash_key,
+            'Ratings': self.get_ratings(),
+            'Recent': self.get_recent(),
+            'Keywords': self.get_keywords(),
+            'Foods': self.get_foods(),
+            'Books': self.get_books()
+        }
+
+    def set_cache(self, key, value):
+        self._cache = {**self._cache, key: value}
+        caches['default'].set(
+            self._SEARCH_CACHE_KEY,
+            self._cache,
+            self._cache_timeout
         )
+
+    def get_books(self):
+        if self.Books is None:
+            self.Books = []
+        return self.Books
+
+    def get_keywords(self):
+        if self.Keywords is None:
+            if self._search_params['search_keywords_or']:
+                keywords = Keyword.objects.filter(space=self._request.space).distinct()
+            else:
+                keywords = Keyword.objects.filter(Q(recipe__in=self._recipe_list) | Q(depth=1)).filter(space=self._request.space).distinct()
+
+            # set keywords to root objects only
+            keywords = self._keyword_queryset(keywords)
+            self.Keywords = [{**x, 'children': None} if x['numchild'] > 0 else x for x in list(keywords)]
+            self.set_cache('Keywords', self.Keywords)
+        return self.Keywords
+
+    def get_foods(self):
+        if self.Foods is None:
+            # # if using an OR search, will annotate all keywords, otherwise, just those that appear in results
+            if self._search_params['search_foods_or']:
+                foods = Food.objects.filter(space=self._request.space).distinct()
+            else:
+                foods = Food.objects.filter(Q(ingredient__step__recipe__in=self._recipe_list) | Q(depth=1)).filter(space=self._request.space).distinct()
+
+            # set keywords to root objects only
+            foods = self._food_queryset(foods)
+
+            self.Foods = [{**x, 'children': None} if x['numchild'] > 0 else x for x in list(foods)]
+            self.set_cache('Foods', self.Foods)
+        return self.Foods
+
+    def get_books(self):
+        if self.Books is None:
+            self.Books = []
+        return self.Books
+
+    def get_ratings(self):
+        if self.Ratings is None:
+            if not self._request.space.demo and self._request.space.show_facet_count:
+                if self._queryset is None:
+                    self._queryset = Recipe.objects.filter(id__in=self._recipe_list)
+                rating_qs = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=Value(0)))))
+                self.Ratings = dict(Counter(r.rating for r in rating_qs))
+            else:
+                self.Rating = {}
+            self.set_cache('Ratings', self.Ratings)
+        return self.Ratings
+
+    def get_recent(self):
+        if self.Recent is None:
+            # TODO make days of recent recipe a setting
+            recent_recipes = ViewLog.objects.filter(created_by=self._request.user, space=self._request.space, created_at__gte=timezone.now() - timedelta(days=14)
+                                                    ).values_list('recipe__pk', flat=True)
+            self.Recent = list(recent_recipes)
+            self.set_cache('Recent', self.Recent)
+        return self.Recent
+
+    def add_food_children(self, id):
+        try:
+            food = Food.objects.get(id=id)
+            nodes = food.get_ancestors()
+        except Food.DoesNotExist:
+            return self.get_facets()
+        foods = self._food_queryset(food.get_children(), food)
+        deep_search = self.Foods
+        for node in nodes:
+            index = next((i for i, x in enumerate(deep_search) if x["id"] == node.id), None)
+            deep_search = deep_search[index]['children']
+        index = next((i for i, x in enumerate(deep_search) if x["id"] == food.id), None)
+        deep_search[index]['children'] = [{**x, 'children': None} if x['numchild'] > 0 else x for x in list(foods)]
+        self.set_cache('Foods', self.Foods)
+        return self.get_facets()
+
+    def add_keyword_children(self, id):
+        try:
+            keyword = Keyword.objects.get(id=id)
+            nodes = keyword.get_ancestors()
+        except Keyword.DoesNotExist:
+            return self.get_facets()
+        keywords = self._keyword_queryset(keyword.get_children(), keyword)
+        deep_search = self.Keywords
+        for node in nodes:
+            index = next((i for i, x in enumerate(deep_search) if x["id"] == node.id), None)
+            deep_search = deep_search[index]['children']
+        index = next((i for i, x in enumerate(deep_search) if x["id"] == keyword.id), None)
+        deep_search[index]['children'] = [{**x, 'children': None} if x['numchild'] > 0 else x for x in list(keywords)]
+        self.set_cache('Keywords', self.Keywords)
+        return self.get_facets()
+
+    def _recipe_count_queryset(self, field, depth=1, steplen=4):
+        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
+        steplen = depth * Keyword.steplen
+
+        if not self._request.space.demo and self._request.space.show_facet_count:
+            return queryset.annotate(count=Coalesce(Subquery(self._recipe_count_queryset('keywords', depth, steplen)), 0)
+                                     ).filter(depth=depth, count__gt=0
+                                              ).values('id', 'name', 'count', 'numchild').order_by(Lower('name').asc())[:200]
+        else:
+            return queryset.filter(depth=depth).values('id', 'name', 'numchild').order_by(Lower('name').asc())
+
+    def _food_queryset(self, queryset, food=None):
+        depth = getattr(food, 'depth', 0) + 1
+        steplen = depth * Food.steplen
+
+        if not self._request.space.demo and self._request.space.show_facet_count:
+            return queryset.annotate(count=Coalesce(Subquery(self._recipe_count_queryset('steps__ingredients__food', depth, steplen)), 0)
+                                     ).filter(depth__lte=depth, count__gt=0
+                                              ).values('id', 'name', 'count', 'numchild').order_by(Lower('name').asc())[:200]
+        else:
+            return queryset.filter(depth__lte=depth).values('id', 'name', 'numchild').order_by(Lower('name').asc())

cookbook/helper/recipe_url_import.py

@@ -1,6 +1,7 @@
+import random
 import re
-import traceback
 from html import unescape
+from unicodedata import decomposition
 
 from django.utils.dateparse import parse_duration
 from django.utils.translation import gettext as _
@@ -9,37 +10,16 @@ from isodate.isoerror import ISO8601Error
 from pytube import YouTube
 from recipe_scrapers._utils import get_host_name, get_minutes
 
-from cookbook.helper.automation_helper import AutomationEngine
+from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.models import Automation, Keyword, PropertyType
+from cookbook.models import Keyword
+
+# from recipe_scrapers._utils import get_minutes  ## temporary until/unless upstream incorporates get_minutes() PR
 
 
 def get_from_scraper(scrape, request):
     # converting the scrape_me object to the existing json format based on ld+json
-
-    recipe_json = {
-        'steps': [],
-        'internal': True
-    }
-    keywords = []
-
-    # assign source URL
-    try:
-        source_url = scrape.canonical_url()
-    except Exception:
-        try:
-            source_url = scrape.url
-        except Exception:
-            pass
-    if source_url:
-        recipe_json['source_url'] = source_url
-        try:
-            keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
-        except Exception:
-            recipe_json['source_url'] = ''
-
-    automation_engine = AutomationEngine(request, source=recipe_json.get('source_url'))
-    # assign recipe name
+    recipe_json = {}
     try:
         recipe_json['name'] = parse_name(scrape.title()[:128] or None)
     except Exception:
@@ -50,13 +30,6 @@ def get_from_scraper(scrape, request):
         except Exception:
             recipe_json['name'] = ''
 
-    if isinstance(recipe_json['name'], list) and len(recipe_json['name']) > 0:
-        recipe_json['name'] = recipe_json['name'][0]
-
-    recipe_json['name'] = automation_engine.apply_regex_replace_automation(recipe_json['name'], Automation.NAME_REPLACE)
-
-    # assign recipe description
-    # TODO notify user about limit if reached - >256 description will be truncated
     try:
         description = scrape.description() or None
     except Exception:
@@ -67,20 +40,16 @@ def get_from_scraper(scrape, request):
         except Exception:
             description = ''
 
-    recipe_json['description'] = parse_description(description)
-    recipe_json['description'] = automation_engine.apply_regex_replace_automation(recipe_json['description'], Automation.DESCRIPTION_REPLACE)
+    recipe_json['internal'] = True
 
-    # assign servings attributes
     try:
-        # dont use scrape.yields() as this will always return "x servings" or "x items", should be improved in scrapers directly
-        servings = scrape.schema.data.get('recipeYield') or 1
+        servings = scrape.schema.data.get('recipeYield') or 1  # dont use scrape.yields() as this will always return "x servings" or "x items", should be improved in scrapers directly
     except Exception:
         servings = 1
 
     recipe_json['servings'] = parse_servings(servings)
     recipe_json['servings_text'] = parse_servings_text(servings)
 
-    # assign time attributes
     try:
         recipe_json['working_time'] = get_minutes(scrape.prep_time()) or 0
     except Exception:
@@ -105,7 +74,6 @@ def get_from_scraper(scrape, request):
             except Exception:
                 pass
 
-    # assign image
     try:
         recipe_json['image'] = parse_image(scrape.image()) or None
     except Exception:
@@ -116,7 +84,7 @@ def get_from_scraper(scrape, request):
         except Exception:
             recipe_json['image'] = ''
 
-    # assign keywords
+    keywords = []
     try:
         if scrape.schema.data.get("keywords"):
             keywords += listify_keywords(scrape.schema.data.get("keywords"))
@@ -142,102 +110,74 @@ def get_from_scraper(scrape, request):
             pass
 
     try:
-        if scrape.author():
-            keywords.append(scrape.author())
+        source_url = scrape.canonical_url()
     except Exception:
-        pass
+        try:
+            source_url = scrape.url
+        except Exception:
+            pass
+    if source_url:
+        recipe_json['source_url'] = source_url
+        try:
+            keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
+        except Exception:
+            pass
 
     try:
-        recipe_json['keywords'] = parse_keywords(list(set(map(str.casefold, keywords))), request)
+        recipe_json['keywords'] = parse_keywords(list(set(map(str.casefold, keywords))), request.space)
     except AttributeError:
         recipe_json['keywords'] = keywords
 
     ingredient_parser = IngredientParser(request, True)
 
-    # assign steps
+    recipe_json['steps'] = []
     try:
         for i in parse_instructions(scrape.instructions()):
-            recipe_json['steps'].append({'instruction': i, 'ingredients': [], 'show_ingredients_table': request.user.userpreference.show_step_ingredients, })
+            recipe_json['steps'].append({'instruction': i, 'ingredients': [], })
     except Exception:
         pass
     if len(recipe_json['steps']) == 0:
         recipe_json['steps'].append({'instruction': '', 'ingredients': [], })
 
-    if len(recipe_json['description']) > 256:  # split at 256 as long descriptions don't look good on recipe cards
-        recipe_json['steps'][0]['instruction'] = f"*{recipe_json['description']}*  \n\n" + recipe_json['steps'][0]['instruction']
+    if len(parse_description(description)) > 256:  # split at 256 as long descriptions dont look good on recipe cards
+        recipe_json['steps'][0]['instruction'] = f'*{parse_description(description)}*  \n\n' + recipe_json['steps'][0]['instruction']
     else:
-        recipe_json['description'] = recipe_json['description'][:512]
+        recipe_json['description'] = parse_description(description)[:512]
 
     try:
         for x in scrape.ingredients():
-            if x.strip() != '':
-                try:
-                    amount, unit, ingredient, note = ingredient_parser.parse(x)
-                    ingredient = {
-                        'amount': amount,
-                        'food': {
-                            'name': ingredient,
-                        },
+            try:
+                amount, unit, ingredient, note = ingredient_parser.parse(x)
+                ingredient = {
+                    'amount': amount,
+                    'food': {
+                        'name': ingredient,
+                    },
+                    'unit': None,
+                    'note': note,
+                    'original_text': x
+                }
+                if unit:
+                    ingredient['unit'] = {'name': unit, }
+                recipe_json['steps'][0]['ingredients'].append(ingredient)
+            except Exception:
+                recipe_json['steps'][0]['ingredients'].append(
+                    {
+                        'amount': 0,
                         'unit': None,
-                        'note': note,
+                        'food': {
+                            'name': x,
+                        },
+                        'note': '',
                         'original_text': x
                     }
-                    if unit:
-                        ingredient['unit'] = {'name': unit, }
-                    recipe_json['steps'][0]['ingredients'].append(ingredient)
-                except Exception:
-                    recipe_json['steps'][0]['ingredients'].append(
-                        {
-                            'amount': 0,
-                            'unit': None,
-                            'food': {
-                                'name': x,
-                            },
-                            'note': '',
-                            'original_text': x
-                        }
-                    )
+                )
     except Exception:
         pass
 
-    try:
-        recipe_json['properties'] = get_recipe_properties(request.space, scrape.schema.nutrients())
-        print(recipe_json['properties'])
-    except Exception:
-        traceback.print_exc()
-        pass
-
-    for s in recipe_json['steps']:
-        s['instruction'] = automation_engine.apply_regex_replace_automation(s['instruction'], Automation.INSTRUCTION_REPLACE)
-        # re.sub(a.param_2, a.param_3, s['instruction'])
-
     return recipe_json
 
 
-def get_recipe_properties(space, property_data):
-    # {'servingSize': '1', 'calories': '302 kcal', 'proteinContent': '7,66g', 'fatContent': '11,56g', 'carbohydrateContent': '41,33g'}
-    properties = {
-        "property-calories": "calories",
-        "property-carbohydrates": "carbohydrateContent",
-        "property-proteins": "proteinContent",
-        "property-fats": "fatContent",
-    }
-    recipe_properties = []
-    for pt in PropertyType.objects.filter(space=space, open_data_slug__in=list(properties.keys())).all():
-        for p in list(properties.keys()):
-            if pt.open_data_slug == p:
-                if properties[p] in property_data:
-                    recipe_properties.append({
-                        'property_type': {
-                            'id': pt.id,
-                            'name': pt.name,
-                        },
-                        'property_amount': parse_servings(property_data[properties[p]]) / float(property_data['servingSize']),
-                    })
-
-    return recipe_properties
-
-
 def get_from_youtube_scraper(url, request):
     """A YouTube Information Scraper."""
     kw, created = Keyword.objects.get_or_create(name='YouTube', space=request.space)
@@ -259,14 +199,11 @@ def get_from_youtube_scraper(url, request):
         ]
     }
 
-    # TODO add automation here
     try:
-        automation_engine = AutomationEngine(request, source=url)
         video = YouTube(url=url)
-        default_recipe_json['name'] = automation_engine.apply_regex_replace_automation(video.title, Automation.NAME_REPLACE)
+        default_recipe_json['name'] = video.title
         default_recipe_json['image'] = video.thumbnail_url
-        default_recipe_json['steps'][0]['instruction'] = automation_engine.apply_regex_replace_automation(video.description, Automation.INSTRUCTION_REPLACE)
-
+        default_recipe_json['steps'][0]['instruction'] = video.description
     except Exception:
         pass
 
@@ -274,7 +211,7 @@ def get_from_youtube_scraper(url, request):
 
 
 def parse_name(name):
-    if isinstance(name, list):
+    if type(name) == list:
         try:
             name = name[0]
         except Exception:
@@ -287,27 +224,10 @@ def parse_description(description):
 
 
 def clean_instruction_string(instruction):
-    # handle HTML tags that can be converted to markup
-    normalized_string = instruction \
-        .replace("<nobr>", "**") \
-        .replace("</nobr>", "**") \
-        .replace("<strong>", "**") \
-        .replace("</strong>", "**")
-    normalized_string = normalize_string(normalized_string)
+    normalized_string = normalize_string(instruction)
     normalized_string = normalized_string.replace('\n', '  \n')
     normalized_string = normalized_string.replace('  \n  \n', '\n\n')
-
-    # handle unsupported, special UTF8 character in Thermomix-specific instructions,
-    # that happen in nearly every recipe on Cookidoo, Zaubertopf Club, Rezeptwelt
-    # and in Thermomix-specific recipes on many other sites
-    return normalized_string \
-        .replace("", _('reverse rotation')) \
-        .replace("", _('careful rotation')) \
-        .replace("", _('knead')) \
-        .replace("Andicken ", _('thicken')) \
-        .replace("Erwärmen ", _('warm up')) \
-        .replace("Fermentieren ", _('ferment')) \
-        .replace("Sous-vide ", _("sous-vide"))
+    return normalized_string
 
 
 def parse_instructions(instructions):
@@ -318,16 +238,16 @@ def parse_instructions(instructions):
     """
     instruction_list = []
 
-    if isinstance(instructions, list):
+    if type(instructions) == list:
         for i in instructions:
-            if isinstance(i, str):
+            if type(i) == str:
                 instruction_list.append(clean_instruction_string(i))
             else:
                 if 'text' in i:
                     instruction_list.append(clean_instruction_string(i['text']))
                 elif 'itemListElement' in i:
                     for ile in i['itemListElement']:
-                        if isinstance(ile, str):
+                        if type(ile) == str:
                             instruction_list.append(clean_instruction_string(ile))
                         elif 'text' in ile:
                             instruction_list.append(clean_instruction_string(ile['text']))
@@ -343,13 +263,13 @@ def parse_image(image):
     # check if list of images is returned, take first if so
     if not image:
         return None
-    if isinstance(image, list):
+    if type(image) == list:
         for pic in image:
-            if (isinstance(pic, str)) and (pic[:4] == 'http'):
+            if (type(pic) == str) and (pic[:4] == 'http'):
                 image = pic
             elif 'url' in pic:
                 image = pic['url']
-    elif isinstance(image, dict):
+    elif type(image) == dict:
         if 'url' in image:
             image = image['url']
 
@@ -360,12 +280,12 @@ def parse_image(image):
 
 
 def parse_servings(servings):
-    if isinstance(servings, str):
+    if type(servings) == str:
         try:
             servings = int(re.search(r'\d+', servings).group())
         except AttributeError:
             servings = 1
-    elif isinstance(servings, list):
+    elif type(servings) == list:
         try:
             servings = int(re.findall(r'\b\d+\b', servings[0])[0])
         except KeyError:
@@ -374,16 +294,11 @@ def parse_servings(servings):
 
 
 def parse_servings_text(servings):
-    if isinstance(servings, str):
+    if type(servings) == str:
         try:
-            servings = re.sub("\\d+", '', servings).strip()
+            servings = re.sub("\d+", '', servings).strip()
         except Exception:
             servings = ''
-    if isinstance(servings, list):
-        try:
-            servings = parse_servings_text(servings[1])
-        except Exception:
-            pass
     return str(servings)[:32]
 
 
@@ -396,7 +311,7 @@ def parse_time(recipe_time):
                 recipe_time = round(iso_parse_duration(recipe_time).seconds / 60)
             except ISO8601Error:
                 try:
-                    if (isinstance(recipe_time, list) and len(recipe_time) > 0):
+                    if (type(recipe_time) == list and len(recipe_time) > 0):
                         recipe_time = recipe_time[0]
                     recipe_time = round(parse_duration(recipe_time).seconds / 60)
                 except AttributeError:
@@ -405,18 +320,13 @@ def parse_time(recipe_time):
     return recipe_time
 
 
-def parse_keywords(keyword_json, request):
+def parse_keywords(keyword_json, space):
     keywords = []
-    automation_engine = AutomationEngine(request)
-
     # keywords as list
     for kw in keyword_json:
         kw = normalize_string(kw)
-        # if alias exists use that instead
-
         if len(kw) != 0:
-            automation_engine.apply_keyword_automation(kw)
-            if k := Keyword.objects.filter(name=kw, space=request.space).first():
+            if k := Keyword.objects.filter(name=kw, space=space).first():
                 keywords.append({'label': str(k), 'name': k.name, 'id': k.id})
             else:
                 keywords.append({'label': kw, 'name': kw})
@@ -427,15 +337,15 @@ def parse_keywords(keyword_json, request):
 def listify_keywords(keyword_list):
     # keywords as string
     try:
-        if isinstance(keyword_list[0], dict):
+        if type(keyword_list[0]) == dict:
             return keyword_list
     except (KeyError, IndexError):
         pass
-    if isinstance(keyword_list, str):
+    if type(keyword_list) == str:
         keyword_list = keyword_list.split(',')
 
     # keywords as string in list
-    if (isinstance(keyword_list, list) and len(keyword_list) == 1 and ',' in keyword_list[0]):
+    if (type(keyword_list) == list and len(keyword_list) == 1 and ',' in keyword_list[0]):
         keyword_list = keyword_list[0].split(',')
     return [x.strip() for x in keyword_list]
 
@@ -486,18 +396,3 @@ def get_images_from_soup(soup, url):
             if 'http' in u:
                 images.append(u)
     return images
-
-
-def clean_dict(input_dict, key):
-    if isinstance(input_dict, dict):
-        for x in list(input_dict):
-            if x == key:
-                del input_dict[x]
-            elif isinstance(input_dict[x], dict):
-                input_dict[x] = clean_dict(input_dict[x], key)
-            elif isinstance(input_dict[x], list):
-                temp_list = []
-                for e in input_dict[x]:
-                    temp_list.append(clean_dict(e, key))
-
-    return input_dict

cookbook/helper/scope_middleware.py

@@ -1,6 +1,8 @@
 from django.urls import reverse
 from django_scopes import scope, scopes_disabled
 from oauth2_provider.contrib.rest_framework import OAuth2Authentication
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.authtoken.models import Token
 from rest_framework.exceptions import AuthenticationFailed
 
 from cookbook.views import views
@@ -48,6 +50,7 @@ class ScopeMiddleware:
                 return views.no_groups(request)
 
             request.space = user_space.space
+            # with scopes_disabled():
             with scope(space=request.space):
                 return self.get_response(request)
         else:

cookbook/helper/shopping_helper.py

@@ -1,13 +1,16 @@
 from datetime import timedelta
 from decimal import Decimal
 
+from django.contrib.postgres.aggregates import ArrayAgg
 from django.db.models import F, OuterRef, Q, Subquery, Value
 from django.db.models.functions import Coalesce
 from django.utils import timezone
 from django.utils.translation import gettext as _
 
+from cookbook.helper.HelperFunctions import Round, str2bool
 from cookbook.models import (Ingredient, MealPlan, Recipe, ShoppingListEntry, ShoppingListRecipe,
                              SupermarketCategoryRelation)
+from recipes import settings
 
 
 def shopping_helper(qs, request):
@@ -44,8 +47,6 @@ class RecipeShoppingEditor():
         self.mealplan = self._kwargs.get('mealplan', None)
         if type(self.mealplan) in [int, float]:
             self.mealplan = MealPlan.objects.filter(id=self.mealplan, space=self.space)
-        if isinstance(self.mealplan, dict):
-            self.mealplan = MealPlan.objects.filter(id=self.mealplan['id'], space=self.space).first()
         self.id = self._kwargs.get('id', None)
 
         self._shopping_list_recipe = self.get_shopping_list_recipe(self.id, self.created_by, self.space)
@@ -66,12 +67,11 @@ class RecipeShoppingEditor():
 
     @property
     def _recipe_servings(self):
-        return getattr(self.recipe, 'servings', None) or getattr(getattr(self.mealplan, 'recipe', None), 'servings',
-                                                                 None) or getattr(getattr(self._shopping_list_recipe, 'recipe', None), 'servings', None)
+        return getattr(self.recipe, 'servings', None) or getattr(getattr(self.mealplan, 'recipe', None), 'servings', None) or getattr(getattr(self._shopping_list_recipe, 'recipe', None), 'servings', None)
 
     @property
     def _servings_factor(self):
-        return Decimal(self.servings) / Decimal(self._recipe_servings)
+        return Decimal(self.servings)/Decimal(self._recipe_servings)
 
     @property
     def _shared_users(self):
@@ -88,10 +88,9 @@ class RecipeShoppingEditor():
 
     def get_recipe_ingredients(self, id, exclude_onhand=False):
         if exclude_onhand:
-            return Ingredient.objects.filter(step__recipe__id=id, food__ignore_shopping=False, space=self.space).exclude(
-                food__onhand_users__id__in=[x.id for x in self._shared_users])
+            return Ingredient.objects.filter(step__recipe__id=id,  food__ignore_shopping=False,  space=self.space).exclude(food__onhand_users__id__in=[x.id for x in self._shared_users])
         else:
-            return Ingredient.objects.filter(step__recipe__id=id, food__ignore_shopping=False, space=self.space)
+            return Ingredient.objects.filter(step__recipe__id=id,  food__ignore_shopping=False,  space=self.space)
 
     @property
     def _include_related(self):
@@ -108,10 +107,7 @@ class RecipeShoppingEditor():
             self.servings = float(servings)
 
         if mealplan := kwargs.get('mealplan', None):
-            if isinstance(mealplan, dict):
-                self.mealplan = MealPlan.objects.filter(id=mealplan['id'], space=self.space).first()
-            else:
-                self.mealplan = mealplan
+            self.mealplan = mealplan
             self.recipe = mealplan.recipe
         elif recipe := kwargs.get('recipe', None):
             self.recipe = recipe
@@ -169,14 +165,14 @@ class RecipeShoppingEditor():
         try:
             self._shopping_list_recipe.delete()
             return True
-        except BaseException:
+        except:
             return False
 
     def _add_ingredients(self, ingredients=None):
         if not ingredients:
             return
-        elif isinstance(ingredients, list):
-            ingredients = Ingredient.objects.filter(id__in=ingredients, food__ignore_shopping=False)
+        elif type(ingredients) == list:
+            ingredients = Ingredient.objects.filter(id__in=ingredients)
         existing = self._shopping_list_recipe.entries.filter(ingredient__in=ingredients).values_list('ingredient__pk', flat=True)
         add_ingredients = ingredients.exclude(id__in=existing)
 
@@ -198,3 +194,120 @@ class RecipeShoppingEditor():
         to_delete = self._shopping_list_recipe.entries.exclude(ingredient__in=ingredients)
         ShoppingListEntry.objects.filter(id__in=to_delete).delete()
         self._shopping_list_recipe = self.get_shopping_list_recipe(self.id, self.created_by, self.space)
+
+
+# # TODO refactor as class
+# def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None, ingredients=None, created_by=None, space=None, append=False):
+#     """
+#     Creates ShoppingListRecipe and associated ShoppingListEntrys from a recipe or a meal plan with a recipe
+#     :param list_recipe: Modify an existing ShoppingListRecipe
+#     :param recipe: Recipe to use as list of ingredients.  One of [recipe, mealplan] are required
+#     :param mealplan: alternatively use a mealplan recipe as source of ingredients
+#     :param servings: Optional: Number of servings to use to scale shoppinglist.  If servings = 0 an existing recipe list will be deleted
+#     :param ingredients: Ingredients, list of ingredient IDs to include on the shopping list.  When not provided all ingredients will be used
+#     :param append: If False will remove any entries not included with ingredients, when True will append ingredients to the shopping list
+#     """
+#     r = recipe or getattr(mealplan, 'recipe', None) or getattr(list_recipe, 'recipe', None)
+#     if not r:
+#         raise ValueError(_("You must supply a recipe or mealplan"))
+
+#     created_by = created_by or getattr(ShoppingListEntry.objects.filter(list_recipe=list_recipe).first(), 'created_by', None)
+#     if not created_by:
+#         raise ValueError(_("You must supply a created_by"))
+
+#     try:
+#         servings = float(servings)
+#     except (ValueError, TypeError):
+#         servings = getattr(mealplan, 'servings', 1.0)
+
+#     servings_factor = servings / r.servings
+
+#     shared_users = list(created_by.get_shopping_share())
+#     shared_users.append(created_by)
+#     if list_recipe:
+#         created = False
+#     else:
+#         list_recipe = ShoppingListRecipe.objects.create(recipe=r, mealplan=mealplan, servings=servings)
+#         created = True
+
+#     related_step_ing = []
+#     if servings == 0 and not created:
+#         list_recipe.delete()
+#         return []
+#     elif ingredients:
+#         ingredients = Ingredient.objects.filter(pk__in=ingredients, space=space)
+#     else:
+#         ingredients = Ingredient.objects.filter(step__recipe=r,  food__ignore_shopping=False, space=space)
+
+#         if exclude_onhand := created_by.userpreference.mealplan_autoexclude_onhand:
+#             ingredients = ingredients.exclude(food__onhand_users__id__in=[x.id for x in shared_users])
+
+#         if related := created_by.userpreference.mealplan_autoinclude_related:
+#             # TODO: add levels of related recipes (related recipes of related recipes) to use when auto-adding mealplans
+#             related_recipes = r.get_related_recipes()
+
+#             for x in related_recipes:
+#                 # related recipe is a Step serving size is driven by recipe serving size
+#                 # TODO once/if Steps can have a serving size this needs to be refactored
+#                 if exclude_onhand:
+#                     # if steps are used more than once in a recipe or subrecipe - I don' think this results in the desired behavior
+#                     related_step_ing += Ingredient.objects.filter(step__recipe=x, space=space).exclude(food__onhand_users__id__in=[x.id for x in shared_users]).values_list('id', flat=True)
+#                 else:
+#                     related_step_ing += Ingredient.objects.filter(step__recipe=x, space=space).values_list('id', flat=True)
+
+#                 x_ing = []
+#                 if ingredients.filter(food__recipe=x).exists():
+#                     for ing in ingredients.filter(food__recipe=x):
+#                         if exclude_onhand:
+#                             x_ing = Ingredient.objects.filter(step__recipe=x,  food__ignore_shopping=False, space=space).exclude(food__onhand_users__id__in=[x.id for x in shared_users])
+#                         else:
+#                             x_ing = Ingredient.objects.filter(step__recipe=x,  food__ignore_shopping=False, space=space).exclude(food__ignore_shopping=True)
+#                         for i in [x for x in x_ing]:
+#                             ShoppingListEntry.objects.create(
+#                                 list_recipe=list_recipe,
+#                                 food=i.food,
+#                                 unit=i.unit,
+#                                 ingredient=i,
+#                                 amount=i.amount * Decimal(servings_factor),
+#                                 created_by=created_by,
+#                                 space=space,
+#                             )
+#                 # dont' add food to the shopping list that are actually recipes that will be added as ingredients
+#                 ingredients = ingredients.exclude(food__recipe=x)
+
+#     add_ingredients = list(ingredients.values_list('id', flat=True)) + related_step_ing
+#     if not append:
+#         existing_list = ShoppingListEntry.objects.filter(list_recipe=list_recipe)
+#         # delete shopping list entries not included in ingredients
+#         existing_list.exclude(ingredient__in=ingredients).delete()
+#         # add shopping list entries that did not previously exist
+#         add_ingredients = set(add_ingredients) - set(existing_list.values_list('ingredient__id', flat=True))
+#     add_ingredients = Ingredient.objects.filter(id__in=add_ingredients, space=space)
+
+#     # if servings have changed, update the ShoppingListRecipe and existing Entries
+#     if servings <= 0:
+#         servings = 1
+
+#     if not created and list_recipe.servings != servings:
+#         update_ingredients = set(ingredients.values_list('id', flat=True)) - set(add_ingredients.values_list('id', flat=True))
+#         list_recipe.servings = servings
+#         list_recipe.save()
+#         for sle in ShoppingListEntry.objects.filter(list_recipe=list_recipe, ingredient__id__in=update_ingredients):
+#             sle.amount = sle.ingredient.amount * Decimal(servings_factor)
+#             sle.save()
+
+#     # add any missing Entries
+#     for i in [x for x in add_ingredients if x.food]:
+
+#         ShoppingListEntry.objects.create(
+#             list_recipe=list_recipe,
+#             food=i.food,
+#             unit=i.unit,
+#             ingredient=i,
+#             amount=i.amount * Decimal(servings_factor),
+#             created_by=created_by,
+#             space=space,
+#         )
+
+#     # return all shopping list items
+#     return list_recipe

cookbook/helper/template_helper.py

@@ -2,6 +2,7 @@ from gettext import gettext as _
 
 import bleach
 import markdown as md
+from bleach_allowlist import markdown_attrs, markdown_tags
 from jinja2 import Template, TemplateSyntaxError, UndefinedError
 from markdown.extensions.tables import TableExtension
 
@@ -21,25 +22,10 @@ class IngredientObject(object):
         else:
             self.amount = f"<scalable-number v-bind:number='{bleach.clean(str(ingredient.amount))}' v-bind:factor='ingredient_factor'></scalable-number>"
         if ingredient.unit:
-            if ingredient.unit.plural_name in (None, ""):
-                self.unit = bleach.clean(str(ingredient.unit))
-            else:
-                if ingredient.always_use_plural_unit or ingredient.amount > 1 and not ingredient.no_amount:
-                    self.unit = bleach.clean(ingredient.unit.plural_name)
-                else:
-                    self.unit = bleach.clean(str(ingredient.unit))
+            self.unit = bleach.clean(str(ingredient.unit))
         else:
             self.unit = ""
-        if ingredient.food:
-            if ingredient.food.plural_name in (None, ""):
-                self.food = bleach.clean(str(ingredient.food))
-            else:
-                if ingredient.always_use_plural_food or ingredient.amount > 1 and not ingredient.no_amount:
-                    self.food = bleach.clean(str(ingredient.food.plural_name))
-                else:
-                    self.food = bleach.clean(str(ingredient.food))
-        else:
-            self.food = ""
+        self.food = bleach.clean(str(ingredient.food))
         self.note = bleach.clean(str(ingredient.note))
 
     def __str__(self):
@@ -52,17 +38,9 @@ class IngredientObject(object):
 def render_instructions(step):  # TODO deduplicate markdown cleanup code
     instructions = step.instruction
 
-    tags = {
-        "h1", "h2", "h3", "h4", "h5", "h6",
-        "b", "i", "strong", "em", "tt",
-        "p", "br",
-        "span", "div", "blockquote", "code", "pre", "hr",
-        "ul", "ol", "li", "dd", "dt",
-        "img",
-        "a",
-        "sub", "sup",
-        'pre', 'table', 'td', 'tr', 'th', 'tbody', 'style', 'thead'
-    }
+    tags = markdown_tags + [
+        'pre', 'table', 'td', 'tr', 'th', 'tbody', 'style', 'thead', 'img'
+    ]
     parsed_md = md.markdown(
         instructions,
         extensions=[
@@ -70,11 +48,7 @@ def render_instructions(step):  # TODO deduplicate markdown cleanup code
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )
-    markdown_attrs = {
-        "*": ["id", "class", 'width', 'height'],
-        "img": ["src", "alt", "title"],
-        "a": ["href", "alt", "title"],
-    }
+    markdown_attrs['*'] = markdown_attrs['*'] + ['class', 'width', 'height']
 
     instructions = bleach.clean(parsed_md, tags, markdown_attrs)
 

cookbook/helper/unit_conversion_helper.py

@@ -1,141 +0,0 @@
-from django.core.cache import caches
-from decimal import Decimal
-
-from cookbook.helper.cache_helper import CacheHelper
-from cookbook.models import Ingredient, Unit
-
-CONVERSION_TABLE = {
-    'weight': {
-        'g': 1000,
-        'kg': 1,
-        'ounce': 35.274,
-        'pound': 2.20462
-    },
-    'volume': {
-        'ml': 1000,
-        'l': 1,
-        'fluid_ounce': 33.814,
-        'pint': 2.11338,
-        'quart': 1.05669,
-        'gallon': 0.264172,
-        'tbsp': 67.628,
-        'tsp': 202.884,
-        'imperial_fluid_ounce': 35.1951,
-        'imperial_pint': 1.75975,
-        'imperial_quart': 0.879877,
-        'imperial_gallon': 0.219969,
-        'imperial_tbsp': 56.3121,
-        'imperial_tsp': 168.936,
-    },
-}
-
-BASE_UNITS_WEIGHT = list(CONVERSION_TABLE['weight'].keys())
-BASE_UNITS_VOLUME = list(CONVERSION_TABLE['volume'].keys())
-
-
-class ConversionException(Exception):
-    pass
-
-
-class UnitConversionHelper:
-    space = None
-
-    def __init__(self, space):
-        """
-        Initializes unit conversion helper
-        :param space: space to perform conversions on
-        """
-        self.space = space
-
-    @staticmethod
-    def convert_from_to(from_unit, to_unit, amount):
-        """
-        Convert from one base unit to another. Throws ConversionException if trying to convert between different systems (weight/volume) or if units are not supported.
-        :param from_unit: str unit to convert from
-        :param to_unit: str unit to convert to
-        :param amount: amount to convert
-        :return: Decimal converted amount
-        """
-        system = None
-        if from_unit in BASE_UNITS_WEIGHT and to_unit in BASE_UNITS_WEIGHT:
-            system = 'weight'
-        if from_unit in BASE_UNITS_VOLUME and to_unit in BASE_UNITS_VOLUME:
-            system = 'volume'
-
-        if not system:
-            raise ConversionException('Trying to convert units not existing or not in one unit system (weight/volume)')
-
-        return Decimal(amount / Decimal(CONVERSION_TABLE[system][from_unit] / CONVERSION_TABLE[system][to_unit]))
-
-    def base_conversions(self, ingredient_list):
-        """
-        Calculates all possible base unit conversions for each ingredient give.
-        Converts to all common base units IF they exist in the unit database of the space.
-        For useful results all ingredients passed should be of the same food, otherwise filtering afterwards might be required.
-        :param ingredient_list: list of ingredients to convert
-        :return: ingredient list with appended conversions
-        """
-        base_conversion_ingredient_list = ingredient_list.copy()
-        for i in ingredient_list:
-            try:
-                conversion_unit = i.unit.name
-                if i.unit.base_unit:
-                    conversion_unit = i.unit.base_unit
-
-                # TODO allow setting which units to convert to? possibly only once conversions become visible
-                units = caches['default'].get(CacheHelper(self.space).BASE_UNITS_CACHE_KEY, None)
-                if not units:
-                    units = Unit.objects.filter(space=self.space, base_unit__in=(BASE_UNITS_VOLUME + BASE_UNITS_WEIGHT)).all()
-                    caches['default'].set(CacheHelper(self.space).BASE_UNITS_CACHE_KEY, units, 60 * 60)  # cache is cleared on unit save signal so long duration is fine
-
-                for u in units:
-                    try:
-                        ingredient = Ingredient(amount=self.convert_from_to(conversion_unit, u.base_unit, i.amount), unit=u, food=ingredient_list[0].food, )
-                        if not any((x.unit.name == ingredient.unit.name or x.unit.base_unit == ingredient.unit.name) for x in base_conversion_ingredient_list):
-                            base_conversion_ingredient_list.append(ingredient)
-                    except ConversionException:
-                        pass
-            except Exception:
-                pass
-
-        return base_conversion_ingredient_list
-
-    def get_conversions(self, ingredient):
-        """
-        Converts an ingredient to all possible conversions based on the custom unit conversion database.
-        After that passes conversion to UnitConversionHelper.base_conversions() to get all base conversions possible.
-        :param ingredient: Ingredient object
-        :return: list of ingredients with all possible custom and base conversions
-        """
-        conversions = [ingredient]
-        if ingredient.unit:
-            for c in ingredient.unit.unit_conversion_base_relation.all():
-                if c.space == self.space:
-                    r = self._uc_convert(c, ingredient.amount, ingredient.unit, ingredient.food)
-                    if r and r not in conversions:
-                        conversions.append(r)
-            for c in ingredient.unit.unit_conversion_converted_relation.all():
-                if c.space == self.space:
-                    r = self._uc_convert(c, ingredient.amount, ingredient.unit, ingredient.food)
-                    if r and r not in conversions:
-                        conversions.append(r)
-
-        conversions = self.base_conversions(conversions)
-
-        return conversions
-
-    def _uc_convert(self, uc, amount, unit, food):
-        """
-        Helper to calculate values for custom unit conversions.
-        Converts given base values using the passed UnitConversion object into a converted Ingredient
-        :param uc: UnitConversion object
-        :param amount: base amount
-        :param unit: base unit
-        :param food: base food
-        :return: converted ingredient object from base amount/unit/food
-        """
-        if uc.food is None or uc.food == food:
-            if unit == uc.base_unit:
-                return Ingredient(amount=amount * (uc.converted_amount / uc.base_amount), unit=uc.converted_unit, food=food, space=self.space)
-            else:
-                return Ingredient(amount=amount * (uc.base_amount / uc.converted_amount), unit=uc.base_unit, food=food, space=self.space)

cookbook/integration/cheftap.py

@@ -36,7 +36,7 @@ class ChefTap(Integration):
 
         recipe = Recipe.objects.create(name=title, created_by=self.request.user, internal=True, space=self.request.space, )
 
-        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
+        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space,)
 
         if source_url != '':
             step.instruction += '\n' + source_url

cookbook/integration/chowdown.py

@@ -4,7 +4,6 @@ from zipfile import ZipFile
 
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Keyword, Recipe, Step
 
@@ -20,10 +19,6 @@ class Chowdown(Integration):
         direction_mode = False
         description_mode = False
 
-        description = None
-        prep_time = None
-        serving = None
-
         ingredients = []
         directions = []
         descriptions = []
@@ -31,12 +26,6 @@ class Chowdown(Integration):
             line = fl.decode("utf-8")
             if 'title:' in line:
                 title = line.replace('title:', '').replace('"', '').strip()
-            if 'description:' in line:
-                description = line.replace('description:', '').replace('"', '').strip()
-            if 'prep_time:' in line:
-                prep_time = line.replace('prep_time:', '').replace('"', '').strip()
-            if 'yield:' in line:
-                serving = line.replace('yield:', '').replace('"', '').strip()
             if 'image:' in line:
                 image = line.replace('image:', '').strip()
             if 'tags:' in line:
@@ -59,43 +48,15 @@ class Chowdown(Integration):
                 descriptions.append(line)
 
         recipe = Recipe.objects.create(name=title, created_by=self.request.user, internal=True, space=self.request.space)
-        if description:
-            recipe.description = description
 
         for k in tags.split(','):
+            print(f'adding keyword {k.strip()}')
             keyword, created = Keyword.objects.get_or_create(name=k.strip(), space=self.request.space)
             recipe.keywords.add(keyword)
 
-        ingredients_added = False
-        for direction in directions:
-            if len(direction.strip()) > 0:
-                step = Step.objects.create(
-                    instruction=direction, name='', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
-                )
-            else:
-                step = Step.objects.create(
-                    instruction=direction, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
-                )
-            if not ingredients_added:
-                ingredients_added = True
-
-                ingredient_parser = IngredientParser(self.request, True)
-                for ingredient in ingredients:
-                    if len(ingredient.strip()) > 0:
-                        amount, unit, food, note = ingredient_parser.parse(ingredient)
-                        f = ingredient_parser.get_food(food)
-                        u = ingredient_parser.get_unit(unit)
-                        step.ingredients.add(Ingredient.objects.create(
-                            food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
-                        ))
-            recipe.steps.add(step)
-
-        if serving:
-            recipe.servings = parse_servings(serving)
-            recipe.servings_text = 'servings'
-
-        if prep_time:
-            recipe.working_time = parse_time(prep_time)
+        step = Step.objects.create(
+            instruction='\n'.join(directions) + '\n\n' + '\n'.join(descriptions), space=self.request.space,
+        )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in ingredients:
@@ -115,7 +76,6 @@ class Chowdown(Integration):
                     if re.match(f'^images/{image}$', z.filename):
                         self.import_recipe_image(recipe, BytesIO(import_zip.read(z.filename)), filetype=get_filetype(z.filename))
 
-        recipe.save()
         return recipe
 
     def get_file_from_recipe(self, recipe):

cookbook/integration/cookbookapp.py

@@ -1,15 +1,20 @@
+import base64
+import gzip
+import json
 import re
+from gettext import gettext as _
 from io import BytesIO
 
 import requests
 import validators
+import yaml
 
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import (get_from_scraper, get_images_from_soup,
                                                iso_duration_to_minutes)
 from cookbook.helper.scrapers.scrapers import text_scraper
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Recipe, Step
+from cookbook.models import Ingredient, Keyword, Recipe, Step
 
 
 class CookBookApp(Integration):
@@ -20,6 +25,7 @@ class CookBookApp(Integration):
     def get_recipe_from_file(self, file):
         recipe_html = file.getvalue().decode("utf-8")
 
+        # recipe_json, recipe_tree, html_data, images = get_recipe_from_source(recipe_html, 'CookBookApp', self.request)
         scrape = text_scraper(text=recipe_html)
         recipe_json = get_from_scraper(scrape, self.request)
         images = list(dict.fromkeys(get_images_from_soup(scrape.soup, None)))
@@ -31,7 +37,7 @@ class CookBookApp(Integration):
 
         try:
             recipe.servings = re.findall('([0-9])+', recipe_json['recipeYield'])[0]
-        except Exception:
+        except Exception as e:
             pass
 
         try:
@@ -41,8 +47,7 @@ class CookBookApp(Integration):
             pass
 
         # assuming import files only contain single step
-        step = Step.objects.create(instruction=recipe_json['steps'][0]['instruction'], space=self.request.space,
-                                   show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
+        step = Step.objects.create(instruction=recipe_json['steps'][0]['instruction'], space=self.request.space, )
 
         if 'nutrition' in recipe_json:
             step.instruction = step.instruction + '\n\n' + recipe_json['nutrition']
@@ -57,7 +62,7 @@ class CookBookApp(Integration):
             if unit := ingredient.get('unit', None):
                 u = ingredient_parser.get_unit(unit.get('name', None))
             step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=ingredient.get('amount', None), note=ingredient.get('note', None), original_text=ingredient.get('original_text', None), space=self.request.space,
+                food=f, unit=u, amount=ingredient.get('amount', None), note=ingredient.get('note', None),  original_text=ingredient.get('original_text', None), space=self.request.space,
             ))
 
         if len(images) > 0:

cookbook/integration/cookmate.py

@@ -1,12 +1,17 @@
+import base64
+import json
 from io import BytesIO
 
+from gettext import gettext as _
+
 import requests
 import validators
+from lxml import etree
 
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
+from cookbook.helper.recipe_url_import import parse_servings, parse_time, parse_servings_text
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Recipe, Step
+from cookbook.models import Ingredient, Keyword, Recipe, Step
 
 
 class Cookmate(Integration):
@@ -45,7 +50,7 @@ class Cookmate(Integration):
             for step in recipe_text.getchildren():
                 if step.text:
                     step = Step.objects.create(
-                        instruction=step.text.strip(), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+                        instruction=step.text.strip(), space=self.request.space,
                     )
                     recipe.steps.add(step)
 

cookbook/integration/copymethat.py

@@ -1,3 +1,4 @@
+import re
 from io import BytesIO
 from zipfile import ZipFile
 
@@ -25,13 +26,12 @@ class CopyMeThat(Integration):
         except AttributeError:
             source = None
 
-        recipe = Recipe.objects.create(name=file.find("div", {"id": "name"}).text.strip(
-        )[:128], source_url=source, created_by=self.request.user, internal=True, space=self.request.space, )
+        recipe = Recipe.objects.create(name=file.find("div", {"id": "name"}).text.strip()[:128], source_url=source, created_by=self.request.user, internal=True, space=self.request.space, )
 
         for category in file.find_all("span", {"class": "recipeCategory"}):
             keyword, created = Keyword.objects.get_or_create(name=category.text, space=self.request.space)
             recipe.keywords.add(keyword)
-
+        
         try:
             recipe.servings = parse_servings(file.find("a", {"id": "recipeYield"}).text.strip())
             recipe.working_time = iso_duration_to_minutes(file.find("span", {"meta": "prepTime"}).text.strip())
@@ -51,7 +51,7 @@ class CopyMeThat(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
+        step = Step.objects.create(instruction='', space=self.request.space, )
 
         ingredient_parser = IngredientParser(self.request, True)
 
@@ -61,14 +61,7 @@ class CopyMeThat(Integration):
                 if not isinstance(ingredient, Tag) or not ingredient.text.strip() or "recipeIngredient_spacer" in ingredient['class']:
                     continue
                 if any(x in ingredient['class'] for x in ["recipeIngredient_subheader", "recipeIngredient_note"]):
-                    step.ingredients.add(
-                        Ingredient.objects.create(
-                            is_header=True,
-                            note=ingredient.text.strip()[
-                                :256],
-                            original_text=ingredient.text.strip(),
-                            space=self.request.space,
-                        ))
+                    step.ingredients.add(Ingredient.objects.create(is_header=True, note=ingredient.text.strip()[:256], original_text=ingredient.text.strip(), space=self.request.space, ))
                 else:
                     amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip())
                     f = ingredient_parser.get_food(food)
@@ -85,7 +78,7 @@ class CopyMeThat(Integration):
                         step.save()
                         recipe.steps.add(step)
                         step = Step.objects.create(instruction='', space=self.request.space, )
-
+                    
                     step.name = instruction.text.strip()[:128]
                 else:
                     step.instruction += instruction.text.strip() + ' \n\n'

cookbook/integration/default.py

@@ -1,5 +1,4 @@
 import json
-import traceback
 from io import BytesIO, StringIO
 from re import match
 from zipfile import ZipFile
@@ -20,10 +19,7 @@ class Default(Integration):
         recipe = self.decode_recipe(recipe_string)
         images = list(filter(lambda v: match('image.*', v), recipe_zip.namelist()))
         if images:
-            try:
-                self.import_recipe_image(recipe, BytesIO(recipe_zip.read(images[0])), filetype=get_filetype(images[0]))
-            except AttributeError:
-                traceback.print_exc()
+            self.import_recipe_image(recipe, BytesIO(recipe_zip.read(images[0])), filetype=get_filetype(images[0]))
         return recipe
 
     def decode_recipe(self, string):
@@ -58,7 +54,7 @@ class Default(Integration):
 
                 try:
                     recipe_zip_obj.writestr(f'image{get_filetype(r.image.file.name)}', r.image.file.read())
-                except (ValueError, FileNotFoundError):
+                except ValueError:
                     pass
 
                 recipe_zip_obj.close()
@@ -71,4 +67,4 @@ class Default(Integration):
 
         export_zip_obj.close()
 
-        return [[self.get_export_file_name(), export_zip_stream.getvalue()]]
+        return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]

cookbook/integration/domestica.py

@@ -28,7 +28,7 @@ class Domestica(Integration):
         recipe.save()
 
         step = Step.objects.create(
-            instruction=file['directions'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+            instruction=file['directions'], space=self.request.space,
         )
 
         if file['source'] != '':

cookbook/integration/integration.py

@@ -1,11 +1,16 @@
+import time
 import datetime
+import json
 import traceback
 import uuid
-from io import BytesIO
+from io import BytesIO, StringIO
 from zipfile import BadZipFile, ZipFile
 
-from bs4 import Tag
+import lxml
 from django.core.cache import cache
+import datetime
+
+from bs4 import Tag
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.db import IntegrityError
@@ -15,9 +20,11 @@ from django.utils.translation import gettext as _
 from django_scopes import scope
 from lxml import etree
 
-from cookbook.helper.image_processing import handle_image
+from cookbook.forms import ImportExportBase
+from cookbook.helper.image_processing import get_filetype, handle_image
 from cookbook.models import Keyword, Recipe
-from recipes.settings import DEBUG, EXPORT_FILE_CACHE_DURATION
+from recipes.settings import DEBUG
+from recipes.settings import EXPORT_FILE_CACHE_DURATION
 
 
 class Integration:
@@ -37,6 +44,7 @@ class Integration:
         self.ignored_recipes = []
 
         description = f'Imported by {request.user.get_user_display_name()} at {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}. Type: {export_type}'
+        icon = '📥'
 
         try:
             last_kw = Keyword.objects.filter(name__regex=r'^(Import [0-9]+)', space=request.space).latest('created_at')
@@ -49,19 +57,23 @@ class Integration:
             self.keyword = parent.add_child(
                 name=name,
                 description=description,
+                icon=icon,
                 space=request.space
             )
         except (IntegrityError, ValueError):  # in case, for whatever reason, the name does exist append UUID to it. Not nice but works for now.
             self.keyword = parent.add_child(
                 name=f'{name} {str(uuid.uuid4())[0:8]}',
                 description=description,
+                icon=icon,
                 space=request.space
             )
 
+
+
     def do_export(self, recipes, el):
 
         with scope(space=self.request.space):
-            el.total_recipes = len(recipes)
+            el.total_recipes = len(recipes) 
             el.cache_duration = EXPORT_FILE_CACHE_DURATION
             el.save()
 
@@ -73,7 +85,7 @@ class Integration:
                 export_file = file
 
             else:
-                # zip the files if there is more then one file
+                #zip the files if there is more then one file
                 export_filename = self.get_export_file_name()
                 export_stream = BytesIO()
                 export_obj = ZipFile(export_stream, 'w')
@@ -84,7 +96,8 @@ class Integration:
                 export_obj.close()
                 export_file = export_stream.getvalue()
 
-            cache.set('export_file_' + str(el.pk), {'filename': export_filename, 'file': export_file}, EXPORT_FILE_CACHE_DURATION)
+
+            cache.set('export_file_'+str(el.pk), {'filename': export_filename, 'file': export_file}, EXPORT_FILE_CACHE_DURATION)
             el.running = False
             el.save()
 
@@ -92,6 +105,7 @@ class Integration:
         response['Content-Disposition'] = 'attachment; filename="' + export_filename + '"'
         return response
 
+
     def import_file_name_filter(self, zip_info_object):
         """
         Since zipfile.namelist() returns all files in all subdirectories this function allows filtering of files
@@ -155,7 +169,7 @@ class Integration:
 
                         for z in file_list:
                             try:
-                                if not hasattr(z, 'filename') or isinstance(z, Tag):
+                                if not hasattr(z, 'filename') or type(z) == Tag:
                                     recipe = self.get_recipe_from_file(z)
                                 else:
                                     recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z.filename)))
@@ -168,7 +182,7 @@ class Integration:
                                 traceback.print_exc()
                                 self.handle_exception(e, log=il, message=f'-------------------- \nERROR \n{e}\n--------------------\n')
                         import_zip.close()
-                    elif '.json' in f['name'] or '.xml' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
+                    elif '.json' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
                         data_list = self.split_recipe_file(f['file'])
                         il.total_recipes += len(data_list)
                         for d in data_list:
@@ -289,6 +303,7 @@ class Integration:
         if DEBUG:
             traceback.print_exc()
 
+
     def get_export_file_name(self, format='zip'):
         return "export_{}.{}".format(datetime.datetime.now().strftime("%Y-%m-%d"), format)
 

cookbook/integration/mealie.py

@@ -5,9 +5,8 @@ from zipfile import ZipFile
 
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Keyword, Recipe, Step
+from cookbook.models import Ingredient, Recipe, Step
 
 
 class Mealie(Integration):
@@ -24,66 +23,41 @@ class Mealie(Integration):
             name=recipe_json['name'].strip(), description=description,
             created_by=self.request.user, internal=True, space=self.request.space)
 
+        # TODO parse times (given in PT2H3M )
+        # @vabene check recipe_url_import.iso_duration_to_minutes  I think it does what you are looking for
+
+        ingredients_added = False
         for s in recipe_json['recipe_instructions']:
-            step = Step.objects.create(instruction=s['text'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
-            recipe.steps.add(step)
-
-        step = recipe.steps.first()
-        if not step:  # if there is no step in the exported data
-            step = Step.objects.create(instruction='', space=self.request.space, )
-            recipe.steps.add(step)
-
-        if len(recipe_json['description'].strip()) > 500:
-            step.instruction = recipe_json['description'].strip() + '\n\n' + step.instruction
-
-        ingredient_parser = IngredientParser(self.request, True)
-        for ingredient in recipe_json['recipe_ingredient']:
-            try:
-                if ingredient['food']:
-                    f = ingredient_parser.get_food(ingredient['food'])
-                    u = ingredient_parser.get_unit(ingredient['unit'])
-                    amount = ingredient['quantity']
-                    note = ingredient['note']
-                    original_text = None
-                else:
-                    amount, unit, food, note = ingredient_parser.parse(ingredient['note'])
-                    f = ingredient_parser.get_food(food)
-                    u = ingredient_parser.get_unit(unit)
-                    original_text = ingredient['note']
-                step.ingredients.add(Ingredient.objects.create(
-                    food=f, unit=u, amount=amount, note=note, original_text=original_text, space=self.request.space,
-                ))
-            except Exception:
-                pass
-
-        if 'tags' in recipe_json and len(recipe_json['tags']) > 0:
-            for k in recipe_json['tags']:
-                if 'name' in k:
-                    keyword, created = Keyword.objects.get_or_create(name=k['name'].strip(), space=self.request.space)
-                    recipe.keywords.add(keyword)
-
-        if 'notes' in recipe_json and len(recipe_json['notes']) > 0:
-            notes_text = "#### Notes  \n\n"
-            for n in recipe_json['notes']:
-                notes_text += f'{n["text"]}  \n'
-
             step = Step.objects.create(
-                instruction=notes_text, space=self.request.space,
+                instruction=s['text'], space=self.request.space,
             )
+            if not ingredients_added:
+                ingredients_added = True
+
+                if len(recipe_json['description'].strip()) > 500:
+                    step.instruction = recipe_json['description'].strip() + '\n\n' + step.instruction
+
+                ingredient_parser = IngredientParser(self.request, True)
+                for ingredient in recipe_json['recipe_ingredient']:
+                    try:
+                        if ingredient['food']:
+                            f = ingredient_parser.get_food(ingredient['food'])
+                            u = ingredient_parser.get_unit(ingredient['unit'])
+                            amount = ingredient['quantity']
+                            note = ingredient['note']
+                            original_text = None
+                        else:
+                            amount, unit, food, note = ingredient_parser.parse(ingredient['note'])
+                            f = ingredient_parser.get_food(food)
+                            u = ingredient_parser.get_unit(unit)
+                            original_text = ingredient['note']
+                        step.ingredients.add(Ingredient.objects.create(
+                            food=f, unit=u, amount=amount, note=note, original_text=original_text, space=self.request.space,
+                        ))
+                    except Exception:
+                        pass
             recipe.steps.add(step)
 
-        if 'recipe_yield' in recipe_json:
-            recipe.servings = parse_servings(recipe_json['recipe_yield'])
-            recipe.servings_text = parse_servings_text(recipe_json['recipe_yield'])
-
-        if 'total_time' in recipe_json and recipe_json['total_time'] is not None:
-            recipe.working_time = parse_time(recipe_json['total_time'])
-
-        if 'org_url' in recipe_json:
-            recipe.source_url = recipe_json['org_url']
-
-        recipe.save()
-
         for f in self.files:
             if '.zip' in f['name']:
                 import_zip = ZipFile(f['file'])

cookbook/integration/mealmaster.py

@@ -39,7 +39,7 @@ class MealMaster(Integration):
             recipe.keywords.add(keyword)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/melarecipes.py

@@ -57,7 +57,7 @@ class MelaRecipes(Integration):
             recipe.source_url = recipe_json['link']
 
         step = Step.objects.create(
-            instruction=instruction, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients
+            instruction=instruction, space=self.request.space,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/nextcloud_cookbook.py

@@ -1,15 +1,13 @@
 import json
 import re
-from io import BytesIO, StringIO
+from io import BytesIO
 from zipfile import ZipFile
 
-from PIL import Image
-
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import iso_duration_to_minutes
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Keyword, NutritionInformation, Recipe, Step
+from cookbook.models import Ingredient, Keyword, Recipe, Step, NutritionInformation
 
 
 class NextcloudCookbook(Integration):
@@ -52,14 +50,9 @@ class NextcloudCookbook(Integration):
 
         ingredients_added = False
         for s in recipe_json['recipeInstructions']:
-            if 'text' in s:
-                step = Step.objects.create(
-                    instruction=s['text'], name=s['name'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
-                )
-            else:
-                step = Step.objects.create(
-                    instruction=s, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
-                )
+            step = Step.objects.create(
+                instruction=s, space=self.request.space,
+            )
             if not ingredients_added:
                 if len(recipe_json['description'].strip()) > 500:
                     step.instruction = recipe_json['description'].strip() + '\n\n' + step.instruction
@@ -91,7 +84,7 @@ class NextcloudCookbook(Integration):
                 if nutrition != {}:
                     recipe.nutrition = NutritionInformation.objects.create(**nutrition, space=self.request.space)
                     recipe.save()
-            except Exception:
+            except Exception as e:
                 pass
 
         for f in self.files:
@@ -103,90 +96,5 @@ class NextcloudCookbook(Integration):
 
         return recipe
 
-    def formatTime(self, min):
-        h = min // 60
-        m = min % 60
-        return f'PT{h}H{m}M0S'
-
     def get_file_from_recipe(self, recipe):
-
-        export = {}
-        export['name'] = recipe.name
-        export['description'] = recipe.description
-        export['url'] = recipe.source_url
-        export['prepTime'] = self.formatTime(recipe.working_time)
-        export['cookTime'] = self.formatTime(recipe.waiting_time)
-        export['totalTime'] = self.formatTime(recipe.working_time + recipe.waiting_time)
-        export['recipeYield'] = recipe.servings
-        export['image'] = f'/Recipes/{recipe.name}/full.jpg'
-        export['imageUrl'] = f'/Recipes/{recipe.name}/full.jpg'
-
-        recipeKeyword = []
-        for k in recipe.keywords.all():
-            recipeKeyword.append(k.name)
-
-        export['keywords'] = recipeKeyword
-
-        recipeInstructions = []
-        recipeIngredient = []
-        for s in recipe.steps.all():
-            recipeInstructions.append(s.instruction)
-
-            for i in s.ingredients.all():
-                recipeIngredient.append(f'{float(i.amount)} {i.unit} {i.food}')
-
-        export['recipeIngredient'] = recipeIngredient
-        export['recipeInstructions'] = recipeInstructions
-
-        return "recipe.json", json.dumps(export)
-
-    def get_files_from_recipes(self, recipes, el, cookie):
-        export_zip_stream = BytesIO()
-        export_zip_obj = ZipFile(export_zip_stream, 'w')
-
-        for recipe in recipes:
-            if recipe.internal and recipe.space == self.request.space:
-
-                recipe_stream = StringIO()
-                filename, data = self.get_file_from_recipe(recipe)
-                recipe_stream.write(data)
-                export_zip_obj.writestr(f'{recipe.name}/{filename}', recipe_stream.getvalue())
-                recipe_stream.close()
-
-                try:
-                    imageByte = recipe.image.file.read()
-                    export_zip_obj.writestr(f'{recipe.name}/full.jpg', self.getJPEG(imageByte))
-                    export_zip_obj.writestr(f'{recipe.name}/thumb.jpg', self.getThumb(171, imageByte))
-                    export_zip_obj.writestr(f'{recipe.name}/thumb16.jpg', self.getThumb(16, imageByte))
-                except ValueError:
-                    pass
-
-            el.exported_recipes += 1
-            el.msg += self.get_recipe_processed_msg(recipe)
-            el.save()
-
-        export_zip_obj.close()
-
-        return [[self.get_export_file_name(), export_zip_stream.getvalue()]]
-
-    def getJPEG(self, imageByte):
-        image = Image.open(BytesIO(imageByte))
-        image = image.convert('RGB')
-
-        bytes = BytesIO()
-        image.save(bytes, "JPEG")
-        return bytes.getvalue()
-
-    def getThumb(self, size, imageByte):
-        image = Image.open(BytesIO(imageByte))
-
-        w, h = image.size
-        m = min(w, h)
-
-        image = image.crop(((w - m) // 2, (h - m) // 2, (w + m) // 2, (h + m) // 2))
-        image = image.resize([size, size], Image.Resampling.LANCZOS)
-        image = image.convert('RGB')
-
-        bytes = BytesIO()
-        image.save(bytes, "JPEG")
-        return bytes.getvalue()
+        raise NotImplementedError('Method not implemented in storage integration')

cookbook/integration/openeats.py

@@ -1,59 +1,27 @@
 import json
 
-from django.utils.translation import gettext as _
-
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.integration.integration import Integration
-from cookbook.models import Comment, CookLog, Ingredient, Keyword, Recipe, Step
+from cookbook.models import Ingredient, Recipe, Step
 
 
 class OpenEats(Integration):
 
     def get_recipe_from_file(self, file):
-
-        description = file['info']
-        description_max_length = Recipe._meta.get_field('description').max_length
-        if len(description) > description_max_length:
-            description = description[0:description_max_length]
-
-        recipe = Recipe.objects.create(name=file['name'].strip(), description=description, created_by=self.request.user, internal=True,
+        recipe = Recipe.objects.create(name=file['name'].strip(), created_by=self.request.user, internal=True,
                                        servings=file['servings'], space=self.request.space, waiting_time=file['cook_time'], working_time=file['prep_time'])
 
         instructions = ''
+        if file["info"] != '':
+            instructions += file["info"]
 
         if file["directions"] != '':
             instructions += file["directions"]
 
         if file["source"] != '':
-            instructions += '\n' + _('Recipe source:') + f'[{file["source"]}]({file["source"]})'
+            instructions += file["source"]
 
-        cuisine_keyword, created = Keyword.objects.get_or_create(name="Cuisine", space=self.request.space)
-        if file["cuisine"] != '':
-            keyword, created = Keyword.objects.get_or_create(name=file["cuisine"].strip(), space=self.request.space)
-            if created:
-                keyword.move(cuisine_keyword, pos="last-child")
-            recipe.keywords.add(keyword)
-
-        course_keyword, created = Keyword.objects.get_or_create(name="Course", space=self.request.space)
-        if file["course"] != '':
-            keyword, created = Keyword.objects.get_or_create(name=file["course"].strip(), space=self.request.space)
-            if created:
-                keyword.move(course_keyword, pos="last-child")
-            recipe.keywords.add(keyword)
-
-        for tag in file["tags"]:
-            keyword, created = Keyword.objects.get_or_create(name=tag.strip(), space=self.request.space)
-            recipe.keywords.add(keyword)
-
-        for comment in file['comments']:
-            Comment.objects.create(recipe=recipe, text=comment['text'], created_by=self.request.user)
-            CookLog.objects.create(recipe=recipe, rating=comment['rating'], created_by=self.request.user, space=self.request.space)
-
-        if file["photo"] != '':
-            recipe.image = f'recipes/openeats-import/{file["photo"]}'
-            recipe.save()
-
-        step = Step.objects.create(instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
+        step = Step.objects.create(instruction=instructions, space=self.request.space,)
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file['ingredients']:
@@ -70,9 +38,6 @@ class OpenEats(Integration):
         recipe_json = json.loads(file.read())
         recipe_dict = {}
         ingredient_group_dict = {}
-        cuisine_group_dict = {}
-        course_group_dict = {}
-        tag_group_dict = {}
 
         for o in recipe_json:
             if o['model'] == 'recipe.recipe':
@@ -85,27 +50,11 @@ class OpenEats(Integration):
                     'cook_time': o['fields']['cook_time'],
                     'servings': o['fields']['servings'],
                     'ingredients': [],
-                    'photo': o['fields']['photo'],
-                    'cuisine': o['fields']['cuisine'],
-                    'course': o['fields']['course'],
-                    'tags': o['fields']['tags'],
-                    'comments': [],
                 }
             if o['model'] == 'ingredient.ingredientgroup':
                 ingredient_group_dict[o['pk']] = o['fields']['recipe']
-            if o['model'] == 'recipe_groups.cuisine':
-                cuisine_group_dict[o['pk']] = o['fields']['title']
-            if o['model'] == 'recipe_groups.course':
-                course_group_dict[o['pk']] = o['fields']['title']
-            if o['model'] == 'recipe_groups.tag':
-                tag_group_dict[o['pk']] = o['fields']['title']
 
         for o in recipe_json:
-            if o['model'] == 'rating.rating':
-                recipe_dict[o['fields']['recipe']]["comments"].append({
-                    "text": o['fields']['comment'],
-                    "rating": o['fields']['rating']
-                })
             if o['model'] == 'ingredient.ingredient':
                 ingredient = {
                     'food': o['fields']['title'],
@@ -114,15 +63,6 @@ class OpenEats(Integration):
                 }
                 recipe_dict[ingredient_group_dict[o['fields']['ingredient_group']]]['ingredients'].append(ingredient)
 
-        for k, r in recipe_dict.items():
-            if r["cuisine"] in cuisine_group_dict:
-                r["cuisine"] = cuisine_group_dict[r["cuisine"]]
-            if r["course"] in course_group_dict:
-                r["course"] = course_group_dict[r["course"]]
-            for index in range(len(r["tags"])):
-                if r["tags"][index] in tag_group_dict:
-                    r["tags"][index] = tag_group_dict[r["tags"][index]]
-
         return list(recipe_dict.values())
 
     def get_file_from_recipe(self, recipe):

cookbook/integration/paprika.py

@@ -5,9 +5,6 @@ import re
 from gettext import gettext as _
 from io import BytesIO
 
-import requests
-import validators
-
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text
 from cookbook.integration.integration import Integration
@@ -58,7 +55,7 @@ class Paprika(Integration):
                 pass
 
             step = Step.objects.create(
-                instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+                instruction=instructions, space=self.request.space,
             )
 
             if 'description' in recipe_json and len(recipe_json['description'].strip()) > 500:
@@ -84,14 +81,7 @@ class Paprika(Integration):
 
             recipe.steps.add(step)
 
-            try:
-                if recipe_json.get("image_url", None):
-                    url = recipe_json.get("image_url", None)
-                    if validators.url(url, public=True):
-                        response = requests.get(url)
-                        self.import_recipe_image(recipe, BytesIO(response.content))
-            except Exception:
-                if recipe_json.get("photo_data", None):
-                    self.import_recipe_image(recipe, BytesIO(base64.b64decode(recipe_json['photo_data'])), filetype='.jpeg')
+            if recipe_json.get("photo_data", None):
+                self.import_recipe_image(recipe, BytesIO(base64.b64decode(recipe_json['photo_data'])), filetype='.jpeg')
 
             return recipe

cookbook/integration/pdfexport.py

@@ -1,11 +1,21 @@
+import json
+from io import BytesIO
+from re import match
+from zipfile import ZipFile
 import asyncio
-
-import django.core.management.commands.runserver as runserver
-from asgiref.sync import sync_to_async
 from pyppeteer import launch
 
-from cookbook.integration.integration import Integration
+from rest_framework.renderers import JSONRenderer
 
+from cookbook.helper.image_processing import get_filetype
+from cookbook.integration.integration import Integration
+from cookbook.serializer import RecipeExportSerializer
+
+from cookbook.models import ExportLog
+from asgiref.sync import sync_to_async
+
+import django.core.management.commands.runserver as runserver
+import logging
 
 class PDFexport(Integration):
 
@@ -32,6 +42,7 @@ class PDFexport(Integration):
                    }
                    }
 
+
         files = []
         for recipe in recipes:
 
@@ -39,18 +50,20 @@ class PDFexport(Integration):
             await page.emulateMedia('print')
             await page.setCookie(cookies)
 
-            await page.goto('http://' + cmd.default_addr + ':' + cmd.default_port + '/view/recipe/' + str(recipe.id), {'waitUntil': 'domcontentloaded'})
-            await page.waitForSelector('#printReady')
+            await page.goto('http://'+cmd.default_addr+':'+cmd.default_port+'/view/recipe/'+str(recipe.id), {'waitUntil': 'domcontentloaded'})
+            await page.waitForSelector('#printReady');
 
             files.append([recipe.name + '.pdf', await page.pdf(options)])
-            await page.close()
+            await page.close();
 
             el.exported_recipes += 1
             el.msg += self.get_recipe_processed_msg(recipe)
             await sync_to_async(el.save, thread_sensitive=True)()
 
+
         await browser.close()
         return files
 
+
     def get_files_from_recipes(self, recipes, el, cookie):
         return asyncio.run(self.get_files_from_recipes_async(recipes, el, cookie))

cookbook/integration/pepperplate.py

@@ -35,7 +35,7 @@ class Pepperplate(Integration):
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
         )
 
         ingredient_parser = IngredientParser(self.request, True)

cookbook/integration/plantoeat.py

@@ -1,7 +1,6 @@
 from io import BytesIO
 
 import requests
-import validators
 
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.integration.integration import Integration
@@ -46,7 +45,7 @@ class Plantoeat(Integration):
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space)
 
         step = Step.objects.create(
-            instruction='\n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+            instruction='\n'.join(directions) + '\n\n', space=self.request.space,
         )
 
         if tags:
@@ -68,9 +67,8 @@ class Plantoeat(Integration):
 
         if image_url:
             try:
-                if validators.url(image_url, public=True):
-                    response = requests.get(image_url)
-                    self.import_recipe_image(recipe, BytesIO(response.content))
+                response = requests.get(image_url)
+                self.import_recipe_image(recipe, BytesIO(response.content))
             except Exception as e:
                 print('failed to import image ', str(e))
 

cookbook/integration/recettetek.py

@@ -46,7 +46,7 @@ class RecetteTek(Integration):
         if not instructions:
             instructions = ''
 
-        step = Step.objects.create(instruction=instructions, space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,)
+        step = Step.objects.create(instruction=instructions, space=self.request.space,)
 
         # Append the original import url to the step (if it exists)
         try:
@@ -61,7 +61,7 @@ class RecetteTek(Integration):
             ingredient_parser = IngredientParser(self.request, True)
             for ingredient in file['ingredients'].split('\n'):
                 if len(ingredient.strip()) > 0:
-                    amount, unit, food, note = ingredient_parser.parse(ingredient.strip())
+                    amount, unit, food, note = ingredient_parser.parse(food)
                     f = ingredient_parser.get_food(ingredient)
                     u = ingredient_parser.get_unit(unit)
                     step.ingredients.add(Ingredient.objects.create(

cookbook/integration/recipekeeper.py

@@ -41,7 +41,7 @@ class RecipeKeeper(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
+        step = Step.objects.create(instruction='', space=self.request.space, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file.find("div", {"itemprop": "recipeIngredients"}).findChildren("p"):
@@ -58,13 +58,6 @@ class RecipeKeeper(Integration):
             if s.text == "":
                 continue
             step.instruction += s.text + ' \n'
-            step.save()
-
-        for s in file.find("div", {"itemprop": "recipeNotes"}).find_all("p"):
-            if s.text == "":
-                continue
-            step.instruction += s.text + ' \n'
-            step.save()
 
         if file.find("span", {"itemprop": "recipeSource"}).text != '':
             step.instruction += "\n\n" + _("Imported from") + ": " + file.find("span", {"itemprop": "recipeSource"}).text

cookbook/integration/recipesage.py

@@ -5,7 +5,6 @@ import requests
 import validators
 
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text, parse_time
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Recipe, Step
 
@@ -19,27 +18,25 @@ class RecipeSage(Integration):
             created_by=self.request.user, internal=True,
             space=self.request.space)
 
-        if file['recipeYield'] != '':
-            recipe.servings = parse_servings(file['recipeYield'])
-            recipe.servings_text = parse_servings_text(file['recipeYield'])
-
         try:
-            if 'totalTime' in file and file['totalTime'] != '':
-                recipe.working_time = parse_time(file['totalTime'])
+            if file['recipeYield'] != '':
+                recipe.servings = int(file['recipeYield'])
 
-            if 'timePrep' in file and file['prepTime'] != '':
-                recipe.working_time = parse_time(file['timePrep'])
-                recipe.waiting_time = parse_time(file['totalTime']) - parse_time(file['timePrep'])
+            if file['totalTime'] != '':
+                recipe.waiting_time = int(file['totalTime']) - int(file['timePrep'])
+
+            if file['prepTime'] != '':
+                recipe.working_time = int(file['timePrep'])
+
+            recipe.save()
         except Exception as e:
-            print('failed to parse time ', str(e))
-
-        recipe.save()
+            print('failed to parse yield or time ', str(e))
 
         ingredient_parser = IngredientParser(self.request, True)
         ingredients_added = False
         for s in file['recipeInstructions']:
             step = Step.objects.create(
-                instruction=s['text'], space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+                instruction=s['text'], space=self.request.space,
             )
             if not ingredients_added:
                 ingredients_added = True

cookbook/integration/rezeptsuitede.py

@@ -1,75 +0,0 @@
-import base64
-from io import BytesIO
-from xml import etree
-
-from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text
-from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Keyword, Recipe, Step
-
-
-class Rezeptsuitede(Integration):
-
-    def split_recipe_file(self, file):
-        return etree.parse(file).getroot().getchildren()
-
-    def get_recipe_from_file(self, file):
-        recipe_xml = file
-
-        recipe = Recipe.objects.create(
-            name=recipe_xml.find('head').attrib['title'].strip(),
-            created_by=self.request.user, internal=True, space=self.request.space)
-
-        try:
-            if recipe_xml.find('head').attrib['servingtype']:
-                recipe.servings = parse_servings(recipe_xml.find('head').attrib['servingtype'].strip())
-                recipe.servings_text = parse_servings_text(recipe_xml.find('head').attrib['servingtype'].strip())
-        except KeyError:
-            pass
-
-        if recipe_xml.find('remark') is not None:  # description is a list of <li>'s with text
-            if recipe_xml.find('remark').find('line') is not None:
-                recipe.description = recipe_xml.find('remark').find('line').text[:512]
-
-        for prep in recipe_xml.findall('preparation'):
-            try:
-                if prep.find('step').text:
-                    step = Step.objects.create(
-                        instruction=prep.find('step').text.strip(), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
-                    )
-                    recipe.steps.add(step)
-            except Exception:
-                pass
-
-        ingredient_parser = IngredientParser(self.request, True)
-
-        if recipe_xml.find('part').find('ingredient') is not None:
-            ingredient_step = recipe.steps.first()
-            if ingredient_step is None:
-                ingredient_step = Step.objects.create(space=self.request.space, instruction='')
-
-            for ingredient in recipe_xml.find('part').findall('ingredient'):
-                f = ingredient_parser.get_food(ingredient.attrib['item'])
-                u = ingredient_parser.get_unit(ingredient.attrib['unit'])
-                amount = 0
-                if ingredient.attrib['qty'].strip() != '':
-                    amount, unit, note = ingredient_parser.parse_amount(ingredient.attrib['qty'])
-                ingredient_step.ingredients.add(Ingredient.objects.create(food=f, unit=u, amount=amount, space=self.request.space, ))
-
-        try:
-            k, created = Keyword.objects.get_or_create(name=recipe_xml.find('head').find('cat').text.strip(), space=self.request.space)
-            recipe.keywords.add(k)
-        except Exception:
-            pass
-
-        recipe.save()
-
-        try:
-            self.import_recipe_image(recipe, BytesIO(base64.b64decode(recipe_xml.find('head').find('picbin').text)), filetype='.jpeg')
-        except BaseException:
-            pass
-
-        return recipe
-
-    def get_file_from_recipe(self, recipe):
-        raise NotImplementedError('Method not implemented in storage integration')

cookbook/integration/rezkonv.py

@@ -38,7 +38,7 @@ class RezKonv(Integration):
             recipe.keywords.add(keyword)
 
         step = Step.objects.create(
-            instruction='  \n'.join(directions) + '\n\n', space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients,
+            instruction='  \n'.join(directions) + '\n\n', space=self.request.space,
         )
 
         ingredient_parser = IngredientParser(self.request, True)
@@ -60,8 +60,8 @@ class RezKonv(Integration):
     def split_recipe_file(self, file):
         recipe_list = []
         current_recipe = ''
-        # TODO build algorithm to try trough encodings and fail if none work, use for all importers
-        # encoding_list = ['windows-1250', 'latin-1']
+        encoding_list = ['windows-1250',
+                         'latin-1']  # TODO build algorithm to try trough encodings and fail if none work, use for all importers
         encoding = 'windows-1250'
         for fl in file.readlines():
             try:

cookbook/integration/saffron.py

@@ -43,7 +43,7 @@ class Saffron(Integration):
 
         recipe = Recipe.objects.create(name=title, description=description, created_by=self.request.user, internal=True, space=self.request.space, )
 
-        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, show_ingredients_table=self.request.user.userpreference.show_step_ingredients, )
+        step = Step.objects.create(instruction='\n'.join(directions), space=self.request.space, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in ingredients:
@@ -59,11 +59,11 @@ class Saffron(Integration):
 
     def get_file_from_recipe(self, recipe):
 
-        data = "Title: " + recipe.name if recipe.name else "" + "\n"
-        data += "Description: " + recipe.description if recipe.description else "" + "\n"
+        data = "Title: "+recipe.name if recipe.name else ""+"\n"
+        data += "Description: "+recipe.description if recipe.description else ""+"\n"
         data += "Source: \n"
         data += "Original URL: \n"
-        data += "Yield: " + str(recipe.servings) + "\n"
+        data += "Yield: "+str(recipe.servings)+"\n"
         data += "Cookbook: \n"
         data += "Section: \n"
         data += "Image: \n"
@@ -78,13 +78,13 @@ class Saffron(Integration):
 
         data += "Ingredients: \n"
         for ingredient in recipeIngredient:
-            data += ingredient + "\n"
+            data += ingredient+"\n"
 
         data += "Instructions: \n"
         for instruction in recipeInstructions:
-            data += instruction + "\n"
+            data += instruction+"\n"
 
-        return recipe.name + '.txt', data
+        return recipe.name+'.txt', data
 
     def get_files_from_recipes(self, recipes, el, cookie):
         files = []

cookbook/locale/bg/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-29 18:42+0200\n"
-"PO-Revision-Date: 2023-04-12 11:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
+"PO-Revision-Date: 2022-05-10 15:32+0000\n"
+"Last-Translator: zeon <zeonbg@gmail.com>\n"
 "Language-Team: Bulgarian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/bg/>\n"
 "Language: bg\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:49 .\cookbook\templates\stats.html:28
@@ -1433,7 +1433,7 @@ msgstr ""
 
 #: .\cookbook\templates\index.html:29
 msgid "Search recipe ..."
-msgstr "Търсете рецепта ..."
+msgstr "Търсете рецепта..."
 
 #: .\cookbook\templates\index.html:44
 msgid "New Recipe"
@@ -1818,7 +1818,7 @@ msgid ""
 msgstr ""
 " \n"
 "            Пълнотекстови търсения се опитват да нормализират предоставените "
-"думи, за да съответстват на често срещани варианти.  Например: 'вили, "
+"думи, за да съответстват на често срещани варианти. Например: 'вили, "
 "'вилица', 'вилици' всички ще се нормализират до 'вилиц'.\n"
 "             Има няколко налични метода, описани по-долу, които ще "
 "контролират как поведението при търсене трябва да реагира, когато се търсят "

cookbook/locale/cs/LC_MESSAGES/django.po

@@ -6,22 +6,20 @@
 # Translators:
 # Pavel Solař <pavelsolar86@gmail.com>, 2021
 # 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2023-07-31 14:19+0000\n"
-"Last-Translator: Mára Štěpánek <stepanekm7@gmail.com>\n"
-"Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
-"recipes-backend/cs/>\n"
-"Language: cs\n"
+"PO-Revision-Date: 2020-06-02 19:28+0000\n"
+"Last-Translator: Pavel Solař <pavelsolar86@gmail.com>, 2021\n"
+"Language-Team: Czech (https://www.transifex.com/django-recipes/teams/110507/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
-"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-"X-Generator: Weblate 4.15\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -36,7 +34,7 @@ msgid ""
 "try them out!"
 msgstr ""
 "Barva horního navigačního menu. Některé barvy neladí se všemi tématy a je "
-"třeba je vyzkoušet!"
+"třeba je vyzkoušet."
 
 #: .\cookbook\forms.py:45
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
@@ -50,7 +48,7 @@ msgid ""
 "to fractions automatically)"
 msgstr ""
 "Povolit podporu zlomků u množství ingrediencí (desetinná čísla budou "
-"automaticky převedena na zlomky)"
+"automaticky převedena na zlomky)."
 
 #: .\cookbook\forms.py:47
 msgid ""
@@ -175,7 +173,7 @@ msgstr "Potravina, která by měla být nahrazena."
 
 #: .\cookbook\forms.py:198
 msgid "Add your comment: "
-msgstr "Přidat vlastní komentář: "
+msgstr "Přidat  vlastní komentář:"
 
 #: .\cookbook\forms.py:229
 msgid "Leave empty for dropbox and enter app password for nextcloud."
@@ -553,7 +551,7 @@ msgstr "Cesta musí být v následujícím formátu"
 
 #: .\cookbook\templates\batch\monitor.html:27
 msgid "Sync Now!"
-msgstr "Zahájit synchronizaci!"
+msgstr "Zahájit synchronizaci"
 
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
@@ -1036,7 +1034,7 @@ msgstr "Tento text je kurzívou"
 #: .\cookbook\templates\markdown_info.html:61
 #: .\cookbook\templates\markdown_info.html:77
 msgid "Blockquotes are also possible"
-msgstr "Lze použít i kvotace"
+msgstr "Lze použít i kvotace "
 
 #: .\cookbook\templates\markdown_info.html:84
 msgid "Lists"
@@ -1106,8 +1104,8 @@ msgid ""
 "rel=\"noreferrer noopener\" target=\"_blank\">this one.</a>"
 msgstr ""
 "Ruční vytváření tabulek pomocí značek je složité. Doporučujeme použít "
-"například <a href=\"https://www.tablesgenerator.com/markdown_tables\" rel="
-"\"noreferrer noopener\" target=\"_blank\">tento tabulkový editor.</a>"
+"například <a href=\"https://www.tablesgenerator.com/markdown_tables\" "
+"rel=\"noreferrer noopener\" target=\"_blank\">tento tabulkový editor</a>."
 
 #: .\cookbook\templates\markdown_info.html:155
 #: .\cookbook\templates\markdown_info.html:157
@@ -1256,36 +1254,22 @@ msgid ""
 "                        "
 msgstr ""
 "\n"
-"                            <p>Modul jídelníčku umožňuje plánovat jídlo "
-"pomocí receptů i poznámek.</p>\n"
-"                            <p>Jednoduše vyberte recept ze seznamu naposledy "
-"navštívených receptů, nebo ho vyhledejte\n"
-"                                s přetáhněte na požadovaný den v rozvrhu. "
-"Můžete také přidat poznámku s popiskem\n"
-"                                a poté přetáhnout recept pro vytvoření plánu "
-"s vlatními popisky. Vytvořením samotné poznámky\n"
-"                                je možné přetažením pole poznámky do "
-"rozvrhu.</p>\n"
-"                            <p>Kliknutím na recept zobrazíte detailní "
-"náhled. Odtud lze také přidat položky\n"
-"                                do nákupního seznamu. Do nákupního seznamu "
-"můžete také přidat všechny recepty na daný den\n"
-"                                kliknutím na ikonu nákupního košíku na horní "
-"straně tabulky.</p>\n"
-"                            <p>V běžném případě se jídelníček plánuje "
-"hromadně, proto můžete v nastavení definovat\n"
-"                                se kterými uživateli si přejete jídelníčky "
-"sdílet.\n"
+"                            <p>Modul jídelníčku umožňuje plánovat jídlo pomocí receptů i poznámek.</p>\n"
+"                            <p>Jednoduše vyberte recept ze seznamu naposledy navštívených receptů, nebo ho vyhledejte\n"
+"                                s přetáhněte na požadovaný den v rozvrhu. Můžete také přidat poznámku s popiskem\n"
+"                                a poté přetáhnout recept pro vytvoření plánu s vlatními popisky. Vytvořením samotné poznámky\n"
+"                                je možné přetažením pole poznámky do rozvrhu.</p>\n"
+"                            <p>Kliknutím na recept zobrazíte detailní náhled. Odtud lze také přidat položky\n"
+"                                do nákupního seznamu. Do nákupního seznamu můžete také přidat všechny recepty na daný den\n"
+"                                kliknutím na ikonu nákupního košíku na horní straně tabulky.</p>\n"
+"                            <p>V běžném případě se jídelníček plánuje hromadně, proto můžete v nastavení definovat\n"
+"                                se kterými uživateli si přejete jídelníčky sdílet.\n"
 "                            </p>\n"
-"                            <p>Můžete také upravovat typy jídel, které si "
-"přejete naplánovat. Pokud budete sdílet jídelníček \n"
+"                            <p>Můžete také upravovat typy jídel, které si přejete naplánovat. Pokud budete sdílet jídelníček \n"
 "                                s někým, kdo\n"
-"                                má přidána jiná jídla, jeho typy jídel se "
-"objeví i ve vašem seznamu. Pro předcházení\n"
+"                                má přidána jiná jídla, jeho typy jídel se objeví i ve vašem seznamu. Pro předcházení\n"
 "                                duplicitám (např. Ostatní, Jiná)\n"
-"                                pojmenujte váš typ jídla stejně, jako "
-"uživatel se kterým své seznamy sdílíte. Tím budou seznamy\n"
-"                                sloučeny.</p>\n"
+"                                pojmenujte váš typ jídla stejně, jako uživatel se kterým své seznamy sdílíte. Tím budou seznamy sloučeny.</p>\n"
 "                        "
 
 #: .\cookbook\templates\meal_plan_entry.html:6
@@ -1347,12 +1331,12 @@ msgstr "Obrázek receptu"
 #: .\cookbook\templates\recipes_table.html:46
 #: .\cookbook\templates\url_import.html:55
 msgid "Preparation time ca."
-msgstr "Doba přípravy cca."
+msgstr "Doba přípravy cca"
 
 #: .\cookbook\templates\recipes_table.html:52
 #: .\cookbook\templates\url_import.html:60
 msgid "Waiting time ca."
-msgstr "Doba čekání cca."
+msgstr "Doba čekání cca"
 
 #: .\cookbook\templates\recipes_table.html:55
 msgid "External"
@@ -1400,7 +1384,7 @@ msgid ""
 " in the following examples:"
 msgstr ""
 "Použijte tajný klíč jako autorizační hlavičku definovanou slovním klíčem, "
-"jak je uvedeno v následujících příkladech:"
+"jak je uvedeno v následujících příkladech."
 
 #: .\cookbook\templates\settings.html:94
 msgid "or"
@@ -1822,7 +1806,7 @@ msgstr "Import není pro tohoto poskytovatele implementován!"
 
 #: .\cookbook\views\import_export.py:58
 msgid "Exporting is not implemented for this provider"
-msgstr "Export není pro tohoto poskytovatele implementován!"
+msgstr "Eport není pro tohoto poskytovatele implementován!"
 
 #: .\cookbook\views\lists.py:42
 msgid "Import Log"
@@ -1854,7 +1838,7 @@ msgstr "Komentář uložen!"
 
 #: .\cookbook\views\views.py:152
 msgid "This recipe is already linked to the book!"
-msgstr "Tento recept už v kuchařce existuje!"
+msgstr "Tento recept už v kuchařce existuje."
 
 #: .\cookbook\views\views.py:158
 msgid "Bookmark saved!"

cookbook/locale/da/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-29 18:42+0200\n"
-"PO-Revision-Date: 2023-04-12 11:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
+"PO-Revision-Date: 2022-08-18 14:32+0000\n"
+"Last-Translator: Mathias Rasmussen <math625f@gmail.com>\n"
 "Language-Team: Danish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/da/>\n"
 "Language: da\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15\n"
+"X-Generator: Weblate 4.10.1\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:49 .\cookbook\templates\stats.html:28
@@ -1806,7 +1806,7 @@ msgid ""
 msgstr ""
 " \n"
 "            Heltekstsøgning forsøger at normalisere de givne ord så de "
-"matcher stammevarianter.  F.eks: 'skeen', 'skeer' og 'sket' vil alt "
+"matcher stammevarianter. F.eks: 'skeen', 'skeer' og 'sket' vil alt "
 "normaliseres til 'ske'.\n"
 "        Der er flere metoder tilgængelige, beskrevet herunder, som vil "
 "bestemme hvordan søgningen skal opfører sig når flere søgeord er angivet.\n"
@@ -2122,9 +2122,9 @@ msgid ""
 "return more results than needed to make sure you find what you are looking "
 "for."
 msgstr ""
-"Find hvad du har brug for, selvom opskriften har stavefejl. Kan måske "
-"returnere flere resultater end du har brug for, for at være sikker på, at du "
-"finder, hvad du leder efter."
+"Find hvad du har brug for selvom opskriften har stavefejl. Kan måske "
+"returnere flere resultater end du har brug for, for at være sikker på at du "
+"finder hvad du leder efter."
 
 #: .\cookbook\templates\settings.html:182
 msgid "This is the default behavior"
@@ -2196,7 +2196,8 @@ msgid ""
 "You can sign in to your account using any of the following third party\n"
 "            accounts:"
 msgstr ""
-"Du kan logge ind på din konto med enhver af de følgende tredjepartskontoer:"
+"Du kan logge ind på din konto med enhver af de følgende tredjepartsapps\n"
+"        kontoer:"
 
 #: .\cookbook\templates\socialaccount\connections.html:52
 msgid ""
@@ -2211,7 +2212,7 @@ msgstr "Tilføj en tredjepartskonto"
 
 #: .\cookbook\templates\socialaccount\signup.html:5
 msgid "Signup"
-msgstr "Registrer"
+msgstr "Registrering"
 
 #: .\cookbook\templates\socialaccount\signup.html:10
 #, python-format

cookbook/locale/hy/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2023-01-08 17:55+0000\n"
-"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\n"
+"PO-Revision-Date: 2021-10-13 12:50+0000\n"
+"Last-Translator: Hrachya Kocharyan <hkocharyan@ctemplar.com>\n"
 "Language-Team: Armenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/hy/>\n"
 "Language: hy\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.15\n"
+"X-Generator: Weblate 4.8\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -410,7 +410,7 @@ msgstr "Դուրս գալ"
 
 #: .\cookbook\templates\account\logout.html:11
 msgid "Are you sure you want to sign out?"
-msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ՞"
+msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ:"
 
 #: .\cookbook\templates\account\password_reset.html:5
 #: .\cookbook\templates\account\password_reset_done.html:5

cookbook/locale/id/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-07-12 19:20+0200\n"
-"PO-Revision-Date: 2022-10-12 08:33+0000\n"
+"PO-Revision-Date: 2022-10-01 16:38+0000\n"
 "Last-Translator: wella <wella.design@gmail.com>\n"
 "Language-Team: Indonesian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/id/>\n"
@@ -155,180 +155,154 @@ msgstr "Kecualikan bahan-bahan yang ada."
 
 #: .\cookbook\forms.py:90
 msgid "Will optimize the UI for use with your left hand."
-msgstr "Akan mengoptimalkan UI untuk digunakan dengan tangan kiri Anda."
+msgstr ""
 
 #: .\cookbook\forms.py:107
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
-"Kedua bidang ini opsional. Jika tidak ada yang diberikan nama pengguna akan "
-"ditampilkan sebagai gantinya"
 
 #: .\cookbook\forms.py:128 .\cookbook\forms.py:301
 msgid "Name"
-msgstr "Nama"
+msgstr ""
 
 #: .\cookbook\forms.py:129 .\cookbook\forms.py:302
 #: .\cookbook\templates\stats.html:24 .\cookbook\views\lists.py:88
 msgid "Keywords"
-msgstr "Kata Kunci"
+msgstr ""
 
 #: .\cookbook\forms.py:130
 msgid "Preparation time in minutes"
-msgstr "Waktu persiapan dalam hitungan menit"
+msgstr ""
 
 #: .\cookbook\forms.py:131
 msgid "Waiting time (cooking/baking) in minutes"
-msgstr "Waktu tunggu (memasak/memanggang) dalam hitungan menit"
+msgstr ""
 
 #: .\cookbook\forms.py:132 .\cookbook\forms.py:270 .\cookbook\forms.py:303
 msgid "Path"
-msgstr "Jalur"
+msgstr ""
 
 #: .\cookbook\forms.py:133
 msgid "Storage UID"
-msgstr "UID penyimpanan"
+msgstr ""
 
 #: .\cookbook\forms.py:165
 msgid "Default"
-msgstr "Bawaan"
+msgstr ""
 
 #: .\cookbook\forms.py:177
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
-"Untuk mencegah duplikat resep dengan nama yang sama dengan yang sudah ada "
-"diabaikan. Centang kotak ini untuk mengimpor semuanya."
 
 #: .\cookbook\forms.py:200
 msgid "Add your comment: "
-msgstr "Tambahkan komentar Anda: "
+msgstr ""
 
 #: .\cookbook\forms.py:215
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
-"Biarkan kosong untuk dropbox dan masukkan kata sandi aplikasi untuk "
-"nextcloud."
 
 #: .\cookbook\forms.py:222
 msgid "Leave empty for nextcloud and enter api token for dropbox."
-msgstr "Biarkan kosong untuk nextcloud dan masukkan token api untuk dropbox."
+msgstr ""
 
 #: .\cookbook\forms.py:231
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
-"Biarkan kosong untuk dropbox dan masukkan hanya url dasar untuk cloud "
-"berikutnya (<code>/remote.php/webdav/</code> ditambahkan secara otomatis)"
 
 #: .\cookbook\forms.py:269 .\cookbook\views\edit.py:157
 msgid "Storage"
-msgstr "Penyimpanan"
+msgstr ""
 
 #: .\cookbook\forms.py:271
 msgid "Active"
-msgstr "Aktif"
+msgstr ""
 
 #: .\cookbook\forms.py:277
 msgid "Search String"
-msgstr "Cari String"
+msgstr ""
 
 #: .\cookbook\forms.py:304
 msgid "File ID"
-msgstr "ID Berkas"
+msgstr ""
 
 #: .\cookbook\forms.py:326
 msgid "You must provide at least a recipe or a title."
-msgstr "Anda harus memberikan setidaknya resep atau judul."
+msgstr ""
 
 #: .\cookbook\forms.py:339
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
-"Anda dapat membuat daftar pengguna default untuk berbagi resep di pengaturan."
 
 #: .\cookbook\forms.py:340
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
-"Anda dapat menggunakan penurunan harga untuk memformat bidang ini. Lihat <a "
-"href=\"/docs/markdown/\">dokumen di sini</a>"
 
 #: .\cookbook\forms.py:366
 msgid "Maximum number of users for this space reached."
-msgstr "Jumlah maksimum pengguna untuk ruang ini tercapai."
+msgstr ""
 
 #: .\cookbook\forms.py:372
 msgid "Email address already taken!"
-msgstr "Alamat email sudah terpakai!"
+msgstr ""
 
 #: .\cookbook\forms.py:380
 msgid ""
 "An email address is not required but if present the invite link will be sent "
 "to the user."
 msgstr ""
-"Alamat email tidak diperlukan tetapi jika ada, tautan undangan akan dikirim "
-"ke pengguna."
 
 #: .\cookbook\forms.py:395
 msgid "Name already taken."
-msgstr "Nama sudah terpakai."
+msgstr ""
 
 #: .\cookbook\forms.py:406
 msgid "Accept Terms and Privacy"
-msgstr "Terima Persyaratan dan Privasi"
+msgstr ""
 
 #: .\cookbook\forms.py:438
 msgid ""
 "Determines how fuzzy a search is if it uses trigram similarity matching (e."
 "g. low values mean more typos are ignored)."
 msgstr ""
-"Menentukan seberapa kabur pencarian jika menggunakan pencocokan kesamaan "
-"trigram (misalnya nilai rendah berarti lebih banyak kesalahan ketik yang "
-"diabaikan)."
 
 #: .\cookbook\forms.py:448
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
 msgstr ""
-"Pilih jenis metode pencarian. Klik <a href=\"/docs/search/\">di sini</a> "
-"untuk deskripsi lengkap pilihan."
 
 #: .\cookbook\forms.py:449
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
-"Gunakan fuzzy pencocokan pada unit, kata kunci, dan bahan saat mengedit dan "
-"mengimpor resep."
 
 #: .\cookbook\forms.py:451
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
-"Bidang untuk mencari mengabaikan aksen. Memilih opsi ini dapat meningkatkan "
-"atau menurunkan kualitas pencarian tergantung pada bahasa"
 
 #: .\cookbook\forms.py:453
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
-"Bidang untuk mencari kecocokan sebagian. (mis. mencari 'Pie' akan "
-"mengembalikan 'pie' dan 'piece' dan 'soapie')"
 
 #: .\cookbook\forms.py:455
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
-"Bidang untuk mencari awal kata yang cocok. (misalnya mencari 'sa' akan "
-"mengembalikan 'salad' dan 'sandwich')"
 
 #: .\cookbook\forms.py:457
 msgid ""