Merge remote-tracking branch 'origin/develop' into Auto-Planner

# Conflicts:
#	vue/src/apps/MealPlanView/MealPlanView.vue

.env.template

@@ -2,6 +2,7 @@
 # when unset: 1 (true) - dont unset this, just for development
 DEBUG=0
 SQL_DEBUG=0
+DEBUG_TOOLBAR=0
 
 # HTTP port to bind to
 # TANDOOR_PORT=8080
@@ -97,7 +98,7 @@ GUNICORN_MEDIA=0
 # ACCOUNT_EMAIL_SUBJECT_PREFIX=
 
 # 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/
+# see docs for more information https://docs.tandoor.dev/features/authentication/
 # when unset: 0 (false)
 REVERSE_PROXY_AUTH=0
 
@@ -126,7 +127,7 @@ REVERSE_PROXY_AUTH=0
 # ENABLE_METRICS=0
 
 # allows you to setup OAuth providers
-# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
+# see docs for more information https://docs.tandoor.dev/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 ?
@@ -157,6 +158,7 @@ REVERSE_PROXY_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,3 +14,8 @@ updates:
     directory: "/vue/"
     schedule:
       interval: "monthly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/build-docker.yml

@@ -0,0 +1,142 @@
+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
+            suffix: ""
+            continue-on-error: false
+          # Raspi build config
+          - name: Raspi
+            dockerfile: Dockerfile-raspi
+            platforms: linux/arm/v7
+            suffix: "-raspi"
+            continue-on-error: true
+    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
+
+      # Update Version number
+      - name: Update version file
+        uses: DamianReeves/write-file-action@v1.2
+        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@v3
+        with:
+          node-version: '14'
+          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@v2
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        if: github.secret_source == 'Actions'
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        if: github.secret_source == 'Actions'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        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@v4
+        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]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -12,7 +12,7 @@ jobs:
         python-version: ['3.10']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python 3.10
       uses: actions/setup-python@v4
       with:

.github/workflows/codeql-analysis.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         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@v1
+        uses: github/codeql-action/init@v2
         # 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@v1
+        uses: github/codeql-action/analyze@v2
         with:
           languages: javascript, python

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

@@ -1,48 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

@@ -1,53 +0,0 @@
-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@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-include-markdown-plugin

.gitignore

@@ -78,6 +78,7 @@ postgresql/
 
 /docker-compose.override.yml
 vue/node_modules
+plugins
 .vscode/
 vetur.config.js
 cookbook/static/vue

.idea/dictionaries/vaben.xml

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

.idea/recipes.iml

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

cookbook/admin.py

@@ -32,11 +32,11 @@ 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.save()
+        space.safe_delete()
 
 
 class SpaceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing', 'use_plural')
+    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     search_fields = ('name', 'created_by__username')
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'

cookbook/forms.py

@@ -154,6 +154,7 @@ class ImportExportBase(forms.Form):
     COOKBOOKAPP = 'COOKBOOKAPP'
     COPYMETHAT = 'COPYMETHAT'
     COOKMATE = 'COOKMATE'
+    REZEPTSUITEDE = 'REZEPTSUITEDE'
     PDF = 'PDF'
 
     type = forms.ChoiceField(choices=(
@@ -162,7 +163,7 @@ 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')
+        (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')
     ))
 
 

cookbook/helper/ingredient_parser.py

@@ -28,7 +28,7 @@ class IngredientParser:
                 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():
+                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] = a.param_2
                 caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
 
@@ -37,7 +37,7 @@ class IngredientParser:
                 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():
+                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] = a.param_2
                 caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
         else:
@@ -59,7 +59,7 @@ class IngredientParser:
                 except KeyError:
                     return food
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).order_by('order').first():
                     return automation.param_2
         return food
 
@@ -78,7 +78,7 @@ class IngredientParser:
                 except KeyError:
                     return unit
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).order_by('order').first():
                     return automation.param_2
         return unit
 
@@ -126,6 +126,8 @@ class IngredientParser:
         amount = 0
         unit = None
         note = ''
+        if x.strip() == '':
+            return amount, unit, note
 
         did_check_frac = False
         end = 0
@@ -235,6 +237,10 @@ class IngredientParser:
         # 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)

cookbook/helper/permission_helper.py

@@ -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:
+            if 0 < settings.SHARING_LIMIT < link.request_count and not link.space.no_sharing_limit:
                 return False
             link.request_count += 1
             link.save()

cookbook/helper/recipe_search.py

@@ -3,9 +3,9 @@ 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.core.cache import caches
-from django.db.models import (Avg, Case, Count, Exists, F, Func, Max, OuterRef, Q, Subquery, Value, When, FilteredRelation)
+from django.core.cache import cache, caches
+from django.db.models import (Avg, Case, Count, Exists, F, Func, Max, OuterRef, Q, Subquery, Value,
+                              When)
 from django.db.models.functions import Coalesce, Lower, Substr
 from django.utils import timezone, translation
 from django.utils.translation import gettext as _
@@ -20,7 +20,8 @@ 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'] in ['django.db.backends.postgresql_psycopg2', '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
@@ -45,7 +46,8 @@ 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),
@@ -74,7 +76,8 @@ 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)
@@ -95,18 +98,24 @@ class RecipeSearch():
         self._search_type = self._search_prefs.search or 'plain'
         if self._string:
             if self._postgres:
-                self._unaccent_include = self._search_prefs.unaccent.values_list('field', flat=True)
+                self._unaccent_include = self._search_prefs.unaccent.values_list(
+                    'field', flat=True)
             else:
                 self._unaccent_include = []
-            self._icontains_include = [x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.icontains.values_list('field', flat=True)]
-            self._istartswith_include = [x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.istartswith.values_list('field', flat=True)]
+            self._icontains_include = [
+                x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.icontains.values_list('field', flat=True)]
+            self._istartswith_include = [
+                x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.istartswith.values_list('field', flat=True)]
             self._trigram_include = None
             self._fulltext_include = None
         self._trigram = False
         if self._postgres and self._string:
-            self._language = DICTIONARY.get(translation.get_language(), 'simple')
-            self._trigram_include = [x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.trigram.values_list('field', flat=True)]
-            self._fulltext_include = self._search_prefs.fulltext.values_list('field', flat=True) or None
+            self._language = DICTIONARY.get(
+                translation.get_language(), 'simple')
+            self._trigram_include = [
+                x + '__unaccent' if x in self._unaccent_include else x for x in self._search_prefs.trigram.values_list('field', flat=True)]
+            self._fulltext_include = self._search_prefs.fulltext.values_list(
+                'field', flat=True) or None
 
             if self._search_type not in ['websearch', 'raw'] and self._trigram_include:
                 self._trigram = True
@@ -182,8 +191,10 @@ 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):
@@ -200,21 +211,28 @@ class RecipeSearch():
             for f in self._filters:
                 query_filter |= f
 
-            self._queryset = self._queryset.filter(query_filter).distinct()  # this creates duplicate records which can screw up other aggregates, see makenow for workaround
+            # this creates duplicate records which can screw up other aggregates, see makenow for workaround
+            self._queryset = self._queryset.filter(query_filter).distinct()
             if self._fulltext_include:
                 if self._fuzzy_match is None:
-                    self._queryset = self._queryset.annotate(score=Coalesce(Max(self.search_rank), 0.0))
+                    self._queryset = self._queryset.annotate(
+                        score=Coalesce(Max(self.search_rank), 0.0))
                 else:
-                    self._queryset = self._queryset.annotate(rank=Coalesce(Max(self.search_rank), 0.0))
+                    self._queryset = self._queryset.annotate(
+                        rank=Coalesce(Max(self.search_rank), 0.0))
 
             if self._fuzzy_match is not None:
-                simularity = self._fuzzy_match.filter(pk=OuterRef('pk')).values('simularity')
+                simularity = self._fuzzy_match.filter(
+                    pk=OuterRef('pk')).values('simularity')
                 if not self._fulltext_include:
-                    self._queryset = self._queryset.annotate(score=Coalesce(Subquery(simularity), 0.0))
+                    self._queryset = self._queryset.annotate(
+                        score=Coalesce(Subquery(simularity), 0.0))
                 else:
-                    self._queryset = self._queryset.annotate(simularity=Coalesce(Subquery(simularity), 0.0))
+                    self._queryset = self._queryset.annotate(
+                        simularity=Coalesce(Subquery(simularity), 0.0))
             if self._sort_includes('score') and self._fulltext_include and self._fuzzy_match is not None:
-                self._queryset = self._queryset.annotate(score=F('rank') + F('simularity'))
+                self._queryset = self._queryset.annotate(
+                    score=F('rank') + F('simularity'))
         else:
             query_filter = Q()
             for f in [x + '__unaccent__iexact' if x in self._unaccent_include else x + '__iexact' for x in SearchFields.objects.all().values_list('field', flat=True)]:
@@ -223,7 +241,8 @@ class RecipeSearch():
 
     def _cooked_on_filter(self, cooked_date=None):
         if self._sort_includes('lastcooked') or cooked_date:
-            lessthan = self._sort_includes('-lastcooked') or '-' in (cooked_date or [])[:1]
+            lessthan = self._sort_includes(
+                '-lastcooked') or '-' in (cooked_date or [])[:1]
             if lessthan:
                 default = timezone.now() - timedelta(days=100000)
             else:
@@ -233,32 +252,41 @@ class RecipeSearch():
         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)
+            self._queryset = self._queryset.filter(
+                lastcooked__date__lte=cooked_date).exclude(lastcooked=default)
         else:
-            self._queryset = self._queryset.filter(lastcooked__date__gte=cooked_date).exclude(lastcooked=default)
+            self._queryset = self._queryset.filter(
+                lastcooked__date__gte=cooked_date).exclude(lastcooked=default)
 
     def _created_on_filter(self, created_date=None):
         if created_date is None:
             return
         lessthan = '-' in created_date[:1]
-        created_date = date(*[int(x) for x in created_date.split('-') if x != ''])
+        created_date = date(*[int(x)
+                            for x in created_date.split('-') if x != ''])
         if lessthan:
-            self._queryset = self._queryset.filter(created_at__date__lte=created_date)
+            self._queryset = self._queryset.filter(
+                created_at__date__lte=created_date)
         else:
-            self._queryset = self._queryset.filter(created_at__date__gte=created_date)
+            self._queryset = self._queryset.filter(
+                created_at__date__gte=created_date)
 
     def _updated_on_filter(self, updated_date=None):
         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)
+            self._queryset = self._queryset.filter(
+                updated_at__date__lte=updated_date)
         else:
-            self._queryset = self._queryset.filter(updated_at__date__gte=updated_date)
+            self._queryset = self._queryset.filter(
+                updated_at__date__gte=updated_date)
 
     def _viewed_on_filter(self, viewed_date=None):
         if self._sort_includes('lastviewed') or viewed_date:
@@ -268,12 +296,15 @@ class RecipeSearch():
         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)
+            self._queryset = self._queryset.filter(
+                lastviewed__date__lte=viewed_date).exclude(lastviewed=longTimeAgo)
         else:
-            self._queryset = self._queryset.filter(lastviewed__date__gte=viewed_date).exclude(lastviewed=longTimeAgo)
+            self._queryset = self._queryset.filter(
+                lastviewed__date__gte=viewed_date).exclude(lastviewed=longTimeAgo)
 
     def _new_recipes(self, new_days=7):
         # TODO make new days a user-setting
@@ -293,27 +324,32 @@ class RecipeSearch():
 
         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)))
+        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 []) or not self._sort_includes('-favorite')
+            less_than = '-' in (times_cooked or []
+                                ) and 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')
-            self._queryset = self._queryset.annotate(favorite=Coalesce(Subquery(favorite_recipes), default))
+            self._queryset = self._queryset.annotate(
+                favorite=Coalesce(Subquery(favorite_recipes), default))
         if times_cooked is None:
             return
 
         if times_cooked == '0':
             self._queryset = self._queryset.filter(favorite=0)
         elif less_than:
-            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked[1:])).exclude(favorite=0)
+            self._queryset = self._queryset.filter(favorite__lte=int(
+                times_cooked.replace('-', ''))).exclude(favorite=0)
         else:
-            self._queryset = self._queryset.filter(favorite__gte=int(times_cooked))
+            self._queryset = self._queryset.filter(
+                favorite__gte=int(times_cooked))
 
     def keyword_filters(self, **kwargs):
         if all([kwargs[x] is None for x in kwargs]):
@@ -346,7 +382,8 @@ class RecipeSearch():
                     else:
                         self._queryset = self._queryset.filter(f_and)
                 if 'not' in kw_filter:
-                    self._queryset = self._queryset.exclude(id__in=recipes.values('id'))
+                    self._queryset = self._queryset.exclude(
+                        id__in=recipes.values('id'))
 
     def food_filters(self, **kwargs):
         if all([kwargs[x] is None for x in kwargs]):
@@ -360,7 +397,8 @@ class RecipeSearch():
             foods = Food.objects.filter(pk__in=kwargs[fd_filter])
             if 'or' in fd_filter:
                 if self._include_children:
-                    f_or = Q(steps__ingredients__food__in=Food.include_descendants(foods))
+                    f_or = Q(
+                        steps__ingredients__food__in=Food.include_descendants(foods))
                 else:
                     f_or = Q(steps__ingredients__food__in=foods)
 
@@ -372,7 +410,8 @@ class RecipeSearch():
                 recipes = Recipe.objects.all()
                 for food in foods:
                     if self._include_children:
-                        f_and = Q(steps__ingredients__food__in=food.get_descendants_and_self())
+                        f_and = Q(
+                            steps__ingredients__food__in=food.get_descendants_and_self())
                     else:
                         f_and = Q(steps__ingredients__food=food)
                     if 'not' in fd_filter:
@@ -380,7 +419,8 @@ class RecipeSearch():
                     else:
                         self._queryset = self._queryset.filter(f_and)
                 if 'not' in fd_filter:
-                    self._queryset = self._queryset.exclude(id__in=recipes.values('id'))
+                    self._queryset = self._queryset.exclude(
+                        id__in=recipes.values('id'))
 
     def unit_filters(self, units=None, operator=True):
         if operator != True:
@@ -389,7 +429,8 @@ class RecipeSearch():
             return
         if not isinstance(units, list):
             units = [units]
-        self._queryset = self._queryset.filter(steps__ingredients__unit__in=units)
+        self._queryset = self._queryset.filter(
+            steps__ingredients__unit__in=units)
 
     def rating_filter(self, rating=None):
         if rating or self._sort_includes('rating'):
@@ -399,14 +440,16 @@ class RecipeSearch():
             else:
                 default = 0
             # TODO make ratings a settings user-only vs all-users
-            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=default))))
+            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(
+                cooklog__created_by=self._request.user, then='cooklog__rating'), default=default))))
         if rating is None:
             return
 
         if rating == '0':
             self._queryset = self._queryset.filter(rating=0)
         elif lessthan:
-            self._queryset = self._queryset.filter(rating__lte=int(rating[1:])).exclude(rating=0)
+            self._queryset = self._queryset.filter(
+                rating__lte=int(rating[1:])).exclude(rating=0)
         else:
             self._queryset = self._queryset.filter(rating__gte=int(rating))
 
@@ -434,11 +477,14 @@ class RecipeSearch():
                 recipes = Recipe.objects.all()
                 for book in kwargs[bk_filter]:
                     if 'not' in bk_filter:
-                        recipes = recipes.filter(recipebookentry__book__id=book)
+                        recipes = recipes.filter(
+                            recipebookentry__book__id=book)
                     else:
-                        self._queryset = self._queryset.filter(recipebookentry__book__id=book)
+                        self._queryset = self._queryset.filter(
+                            recipebookentry__book__id=book)
                 if 'not' in bk_filter:
-                    self._queryset = self._queryset.exclude(id__in=recipes.values('id'))
+                    self._queryset = self._queryset.exclude(
+                        id__in=recipes.values('id'))
 
     def step_filters(self, steps=None, operator=True):
         if operator != True:
@@ -446,7 +492,7 @@ class RecipeSearch():
         if not steps:
             return
         if not isinstance(steps, list):
-            steps = [unistepsts]
+            steps = [steps]
         self._queryset = self._queryset.filter(steps__id__in=steps)
 
     def build_fulltext_filters(self, string=None):
@@ -457,20 +503,25 @@ class RecipeSearch():
             rank = []
             if 'name' in self._fulltext_include:
                 vectors.append('name_search_vector')
-                rank.append(SearchRank('name_search_vector', self.search_query, cover_density=True))
+                rank.append(SearchRank('name_search_vector',
+                            self.search_query, cover_density=True))
             if 'description' in self._fulltext_include:
                 vectors.append('desc_search_vector')
-                rank.append(SearchRank('desc_search_vector', self.search_query, cover_density=True))
+                rank.append(SearchRank('desc_search_vector',
+                            self.search_query, cover_density=True))
             if 'steps__instruction' in self._fulltext_include:
                 vectors.append('steps__search_vector')
-                rank.append(SearchRank('steps__search_vector', self.search_query, cover_density=True))
+                rank.append(SearchRank('steps__search_vector',
+                            self.search_query, cover_density=True))
             if 'keywords__name' in self._fulltext_include:
                 # explicitly settings unaccent on keywords and foods so that they behave the same as search_vector fields
                 vectors.append('keywords__name__unaccent')
-                rank.append(SearchRank('keywords__name__unaccent', self.search_query, cover_density=True))
+                rank.append(SearchRank('keywords__name__unaccent',
+                            self.search_query, cover_density=True))
             if 'steps__ingredients__food__name' in self._fulltext_include:
                 vectors.append('steps__ingredients__food__name__unaccent')
-                rank.append(SearchRank('steps__ingredients__food__name', self.search_query, cover_density=True))
+                rank.append(SearchRank('steps__ingredients__food__name',
+                            self.search_query, cover_density=True))
 
             for r in rank:
                 if self.search_rank is None:
@@ -478,7 +529,8 @@ class RecipeSearch():
                 else:
                     self.search_rank += r
             # modifying queryset will annotation creates duplicate results
-            self._filters.append(Q(id__in=Recipe.objects.annotate(vector=SearchVector(*vectors)).filter(Q(vector=self.search_query))))
+            self._filters.append(Q(id__in=Recipe.objects.annotate(
+                vector=SearchVector(*vectors)).filter(Q(vector=self.search_query))))
 
     def build_text_filters(self, string=None):
         if not string:
@@ -510,23 +562,30 @@ class RecipeSearch():
     def _makenow_filter(self, missing=None):
         if missing is None or (type(missing) == bool and missing == False):
             return
-        shopping_users = [*self._request.user.get_shopping_share(), self._request.user]
+        shopping_users = [
+            *self._request.user.get_shopping_share(), self._request.user]
 
         onhand_filter = (
             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
+            # 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))
         )
         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_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),
-            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))
+            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=missing)
-        self._queryset = self._queryset.distinct().filter(id__in=makenow_recipes.values('id'))
+        self._queryset = self._queryset.distinct().filter(
+            id__in=makenow_recipes.values('id'))
 
     @staticmethod
     def __children_substitute_filter(shopping_users=None):
@@ -547,7 +606,8 @@ class RecipeSearch():
     @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)),
+            path__startswith=Substr(
+                OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)),
             depth=OuterRef('depth'),
             onhand_users__in=shopping_users
         )
@@ -586,7 +646,8 @@ class RecipeFacet():
         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._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', []),
@@ -618,7 +679,8 @@ class RecipeFacet():
             'Books': self.Books
 
         }
-        caches['default'].set(self._SEARCH_CACHE_KEY, self._cache, self._cache_timeout)
+        caches['default'].set(self._SEARCH_CACHE_KEY,
+                              self._cache, self._cache_timeout)
 
     def get_facets(self, from_cache=False):
         if from_cache:
@@ -655,13 +717,16 @@ class RecipeFacet():
     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()
+                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()
+                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.Keywords = [{**x, 'children': None}
+                             if x['numchild'] > 0 else x for x in list(keywords)]
             self.set_cache('Keywords', self.Keywords)
         return self.Keywords
 
@@ -669,28 +734,28 @@ class RecipeFacet():
         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()
+                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()
+                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.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._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 = {}
@@ -715,10 +780,13 @@ class RecipeFacet():
         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)
+            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)]
+        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()
 
@@ -731,10 +799,13 @@ class RecipeFacet():
         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)
+            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)]
+        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()
 

cookbook/helper/recipe_url_import.py

@@ -1,8 +1,8 @@
-import random
+# import random
 import re
 from html import unescape
-from unicodedata import decomposition
 
+from django.core.cache import caches
 from django.utils.dateparse import parse_duration
 from django.utils.translation import gettext as _
 from isodate import parse_duration as iso_parse_duration
@@ -10,9 +10,12 @@ from isodate.isoerror import ISO8601Error
 from pytube import YouTube
 from recipe_scrapers._utils import get_host_name, get_minutes
 
-from cookbook.helper import recipe_url_import as helper
+# from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.models import Keyword
+from cookbook.models import Automation, Keyword
+
+# from unicodedata import decomposition
+
 
 # from recipe_scrapers._utils import get_minutes  ## temporary until/unless upstream incorporates get_minutes() PR
 
@@ -120,6 +123,12 @@ def get_from_scraper(scrape, request):
         recipe_json['source_url'] = source_url
         try:
             keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
+        except Exception:
+            recipe_json['source_url'] = ''
+
+    try:
+        if scrape.author():
+            keywords.append(scrape.author())
     except Exception:
         pass
 
@@ -139,13 +148,22 @@ def get_from_scraper(scrape, request):
     if len(recipe_json['steps']) == 0:
         recipe_json['steps'].append({'instruction': '', 'ingredients': [], })
 
-    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']
+    parsed_description = parse_description(description)
+    # TODO notify user about limit if reached
+    # limits exist to limit the attack surface for dos style attacks
+    automations = Automation.objects.filter(type=Automation.DESCRIPTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').all().order_by('order')[:512]
+    for a in automations:
+        if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+            parsed_description = re.sub(a.param_2, a.param_3, parsed_description, count=1)
+
+    if len(parsed_description) > 256:  # split at 256 as long descriptions don't look good on recipe cards
+        recipe_json['steps'][0]['instruction'] = f'*{parsed_description}*  \n\n' + recipe_json['steps'][0]['instruction']
     else:
-        recipe_json['description'] = parse_description(description)[:512]
+        recipe_json['description'] = parsed_description[:512]
 
     try:
         for x in scrape.ingredients():
+            if x.strip() != '':
                 try:
                     amount, unit, ingredient, note = ingredient_parser.parse(x)
                     ingredient = {
@@ -175,6 +193,13 @@ def get_from_scraper(scrape, request):
     except Exception:
         pass
 
+    if recipe_json['source_url']:
+        automations = Automation.objects.filter(type=Automation.INSTRUCTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').order_by('order').all()[:512]
+        for a in automations:
+            if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+                for s in recipe_json['steps']:
+                    s['instruction'] = re.sub(a.param_2, a.param_3, s['instruction'])
+
     return recipe_json
 
 
@@ -224,10 +249,27 @@ def parse_description(description):
 
 
 def clean_instruction_string(instruction):
-    normalized_string = normalize_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 = normalized_string.replace('\n', '  \n')
     normalized_string = normalized_string.replace('  \n  \n', '\n\n')
-    return normalized_string
+
+    # 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"))
 
 
 def parse_instructions(instructions):
@@ -299,6 +341,11 @@ def parse_servings_text(servings):
             servings = re.sub("\d+", '', servings).strip()
         except Exception:
             servings = ''
+    if type(servings) == list:
+        try:
+            servings = parse_servings_text(servings[1])
+        except Exception:
+            pass
     return str(servings)[:32]
 
 
@@ -322,10 +369,28 @@ def parse_time(recipe_time):
 
 def parse_keywords(keyword_json, space):
     keywords = []
+    keyword_aliases = {}
+    # retrieve keyword automation cache if it exists, otherwise build from database
+    KEYWORD_CACHE_KEY = f'automation_keyword_alias_{space.pk}'
+    if c := caches['default'].get(KEYWORD_CACHE_KEY, None):
+        self.food_aliases = c
+        caches['default'].touch(KEYWORD_CACHE_KEY, 30)
+    else:
+        for a in Automation.objects.filter(space=space, disabled=False, type=Automation.KEYWORD_ALIAS).only('param_1', 'param_2').order_by('order').all():
+            keyword_aliases[a.param_1] = a.param_2
+        caches['default'].set(KEYWORD_CACHE_KEY, keyword_aliases, 30)
+
     # keywords as list
     for kw in keyword_json:
         kw = normalize_string(kw)
+        # if alias exists use that instead
+
         if len(kw) != 0:
+            if keyword_aliases:
+                try:
+                    kw = keyword_aliases[kw]
+                except KeyError:
+                    pass
             if k := Keyword.objects.filter(name=kw, space=space).first():
                 keywords.append({'label': str(k), 'name': k.name, 'id': k.id})
             else:
@@ -396,3 +461,18 @@ def get_images_from_soup(soup, url):
             if 'http' in u:
                 images.append(u)
     return images
+
+
+def clean_dict(input_dict, key):
+    if type(input_dict) == dict:
+        for x in list(input_dict):
+            if x == key:
+                del input_dict[x]
+            elif type(input_dict[x]) == dict:
+                input_dict[x] = clean_dict(input_dict[x], key)
+            elif type(input_dict[x]) == list:
+                temp_list = []
+                for e in input_dict[x]:
+                    temp_list.append(clean_dict(e, key))
+
+    return input_dict

cookbook/helper/shopping_helper.py

@@ -47,6 +47,8 @@ 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 type(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)
@@ -107,6 +109,9 @@ class RecipeShoppingEditor():
             self.servings = float(servings)
 
         if mealplan := kwargs.get('mealplan', None):
+            if type(mealplan) == dict:
+                self.mealplan = MealPlan.objects.filter(id=mealplan['id'], space=self.space).first()
+            else:
                 self.mealplan = mealplan
             self.recipe = mealplan.recipe
         elif recipe := kwargs.get('recipe', None):

cookbook/integration/integration.py

@@ -1,16 +1,12 @@
-import time
+import traceback
 import datetime
-import json
 import traceback
 import uuid
-from io import BytesIO, StringIO
+from io import BytesIO
 from zipfile import BadZipFile, ZipFile
 
-import lxml
-from django.core.cache import cache
-import datetime
-
 from bs4 import Tag
+from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.db import IntegrityError
@@ -20,8 +16,7 @@ from django.utils.translation import gettext as _
 from django_scopes import scope
 from lxml import etree
 
-from cookbook.forms import ImportExportBase
-from cookbook.helper.image_processing import get_filetype, handle_image
+from cookbook.helper.image_processing import handle_image
 from cookbook.models import Keyword, Recipe
 from recipes.settings import DEBUG
 from recipes.settings import EXPORT_FILE_CACHE_DURATION
@@ -182,7 +177,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 '.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 '.xml' 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:

cookbook/integration/mealie.py

@@ -5,6 +5,7 @@ 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, Recipe, Step
 
@@ -23,16 +24,14 @@ 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,
-            )
-            if not ingredients_added:
-                ingredients_added = True
+            step = Step.objects.create(instruction=s['text'], space=self.request.space, )
+            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
@@ -56,8 +55,29 @@ class Mealie(Integration):
                 ))
             except Exception:
                 pass
+
+        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,
+            )
             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/openeats.py

@@ -2,24 +2,54 @@ import json
 
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Recipe, Step
-
+from cookbook.models import Ingredient, Recipe, Step, Keyword, Comment, CookLog
+from django.utils.translation import gettext as _
 
 class OpenEats(Integration):
 
     def get_recipe_from_file(self, file):
-        recipe = Recipe.objects.create(name=file['name'].strip(), created_by=self.request.user, internal=True,
+
+        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,
                                        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 += file["source"]
+            instructions += '\n' + _('Recipe source:') + f'[{file["source"]}]({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,)
 
@@ -38,6 +68,9 @@ 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':
@@ -50,11 +83,27 @@ 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'],
@@ -63,6 +112,15 @@ 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,6 +5,9 @@ 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
@@ -81,6 +84,13 @@ 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:
                 if recipe_json.get("photo_data", None):
                     self.import_recipe_image(recipe, BytesIO(base64.b64decode(recipe_json['photo_data'])), filetype='.jpeg')
 

cookbook/integration/rezeptsuitede.py

@@ -0,0 +1,72 @@
+import base64
+from io import BytesIO
+from xml import etree
+
+from lxml import etree
+
+from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import parse_time, parse_servings, parse_servings_text
+from cookbook.integration.integration import Integration
+from cookbook.models import Ingredient, Recipe, Step, Keyword
+
+
+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)
+
+        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())
+
+        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,
+                    )
+                    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, 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 as e:
+            pass
+
+        recipe.save()
+
+        try:
+            self.import_recipe_image(recipe, BytesIO(base64.b64decode(recipe_xml.find('head').find('picbin').text)), filetype='.jpeg')
+        except:
+            pass
+
+        return recipe
+
+    def get_file_from_recipe(self, recipe):
+        raise NotImplementedError('Method not implemented in storage integration')

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: 2022-05-10 15:32+0000\n"
-"Last-Translator: zeon <zeonbg@gmail.com>\n"
+"PO-Revision-Date: 2023-04-12 11:55+0000\n"
+"Last-Translator: noxonad <noxonad@proton.me>\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.10.1\n"
+"X-Generator: Weblate 4.15\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"

cookbook/locale/cs/LC_MESSAGES/django.po

@@ -6,20 +6,22 @@
 # 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: 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"
+"PO-Revision-Date: 2023-03-25 11:32+0000\n"
+"Last-Translator: Matěj Kubla <matykubla@gmail.com>\n"
+"Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/cs/>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -173,7 +175,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."
@@ -551,7 +553,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
@@ -1034,7 +1036,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"
@@ -1104,8 +1106,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
@@ -1254,22 +1256,36 @@ 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 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\n"
+"                                sloučeny.</p>\n"
 "                        "
 
 #: .\cookbook\templates\meal_plan_entry.html:6
@@ -1331,12 +1347,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"
@@ -1384,7 +1400,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"
@@ -1806,7 +1822,7 @@ msgstr "Import není pro tohoto poskytovatele implementován!"
 
 #: .\cookbook\views\import_export.py:58
 msgid "Exporting is not implemented for this provider"
-msgstr "Eport není pro tohoto poskytovatele implementován!"
+msgstr "Export není pro tohoto poskytovatele implementován!"
 
 #: .\cookbook\views\lists.py:42
 msgid "Import Log"
@@ -1838,7 +1854,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: 2022-08-18 14:32+0000\n"
-"Last-Translator: Mathias Rasmussen <math625f@gmail.com>\n"
+"PO-Revision-Date: 2023-04-12 11:55+0000\n"
+"Last-Translator: noxonad <noxonad@proton.me>\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.10.1\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:49 .\cookbook\templates\stats.html:28
@@ -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,8 +2196,7 @@ 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 tredjepartsapps\n"
-"        kontoer:"
+"Du kan logge ind på din konto med enhver af de følgende tredjepartskontoer:"
 
 #: .\cookbook\templates\socialaccount\connections.html:52
 msgid ""
@@ -2212,7 +2211,7 @@ msgstr "Tilføj en tredjepartskonto"
 
 #: .\cookbook\templates\socialaccount\signup.html:5
 msgid "Signup"
-msgstr "Registrering"
+msgstr "Registrer"
 
 #: .\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: 2021-10-13 12:50+0000\n"
-"Last-Translator: Hrachya Kocharyan <hkocharyan@ctemplar.com>\n"
+"PO-Revision-Date: 2023-01-08 17:55+0000\n"
+"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\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.8\n"
+"X-Generator: Weblate 4.15\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/nb_NO/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-11 15:09+0200\n"
-"PO-Revision-Date: 2021-04-11 15:23+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"PO-Revision-Date: 2023-04-17 20:55+0000\n"
+"Last-Translator: Espen Sellevåg <buskmenn.drammer03@icloud.com>\n"
 "Language-Team: Norwegian Bokmål <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/nb_NO/>\n"
 "Language: nb_NO\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.5.3\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:91
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -34,19 +34,23 @@ msgstr ""
 
 #: .\cookbook\forms.py:46
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
-msgstr ""
+msgstr "Standard enhet når ny ingrediens legges til en oppskrift."
 
 #: .\cookbook\forms.py:47
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
+"Aktiverer støtte for deler av ingrediensmengde (konverterer feks. desimaler "
+"til deler automatisk)"
 
 #: .\cookbook\forms.py:48
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
+"Brukere som oppretter nye måltidsplaner/handlelister, deler disse "
+"oppføringene som standard."
 
 #: .\cookbook\forms.py:49
 msgid "Show recently viewed recipes on search page."
@@ -58,7 +62,7 @@ msgstr "Antall desimaler ingredienser skal avrundes til."
 
 #: .\cookbook\forms.py:51
 msgid "If you want to be able to create and see comments underneath recipes."
-msgstr ""
+msgstr "Hvis du ønsker å opprette og se kommentarer under oppskrifter."
 
 #: .\cookbook\forms.py:53
 msgid ""
@@ -67,6 +71,11 @@ msgid ""
 "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."
 msgstr ""
+"0 vil deaktivere automatisk synkronisering. Når en handleliste vises, "
+"oppdateres listen med oppgitt antall sekunders mellomrom for å synkronisere "
+"endringer fra andre brukere. Nyttig dersom flere brukere handler samtidig. "
+"Datatrafikk oppstår når aktiv. Hvis verdien er lavere enn grensen, "
+"tilbakestilles den ved lagring."
 
 #: .\cookbook\forms.py:56
 msgid "Makes the navbar stick to the top of the page."
@@ -100,11 +109,11 @@ msgstr ""
 
 #: .\cookbook\forms.py:97 .\cookbook\forms.py:317
 msgid "Path"
-msgstr ""
+msgstr "Sti"
 
 #: .\cookbook\forms.py:98
 msgid "Storage UID"
-msgstr ""
+msgstr "Lagring UID"
 
 #: .\cookbook\forms.py:121
 msgid "Default"
@@ -129,7 +138,6 @@ msgid "Old Unit"
 msgstr "Gammel enhet"
 
 #: .\cookbook\forms.py:156
-#, fuzzy
 msgid "Unit that should be replaced."
 msgstr "Enhet som skal erstattes."
 
@@ -204,12 +212,11 @@ msgstr ""
 #: .\cookbook\views\views.py:112 .\cookbook\views\views.py:116
 #: .\cookbook\views\views.py:184
 msgid "You do not have the required permissions to view this page!"
-msgstr "Du har ikke påkrevd tilgang for å vise denne siden."
+msgstr "Du har ikke påkrevd tilgang for å vise denne siden!"
 
 #: .\cookbook\helper\permission_helper.py:141
-#, fuzzy
 msgid "You are not logged in and therefore cannot view this page!"
-msgstr "Du er ikke innlogget og kan derfor ikke vise siden."
+msgstr "Du er ikke innlogget og kan derfor ikke vise siden!"
 
 #: .\cookbook\helper\permission_helper.py:145
 #: .\cookbook\helper\permission_helper.py:167
@@ -379,7 +386,7 @@ msgstr "Finner ikke siden du leter etter."
 
 #: .\cookbook\templates\404.html:33
 msgid "Take me Home"
-msgstr ""
+msgstr "Tilbake til Startsiden"
 
 #: .\cookbook\templates\404.html:35
 msgid "Report a Bug"
@@ -388,12 +395,12 @@ msgstr "Rapporter en feil"
 #: .\cookbook\templates\account\login.html:7
 #: .\cookbook\templates\base.html:170
 msgid "Login"
-msgstr ""
+msgstr "Logg inn"
 
 #: .\cookbook\templates\account\login.html:13
 #: .\cookbook\templates\account\login.html:28
 msgid "Sign In"
-msgstr ""
+msgstr "Opprett bruker"
 
 #: .\cookbook\templates\account\login.html:38
 msgid "Social Login"
@@ -401,7 +408,7 @@ msgstr "Sosial innlogging"
 
 #: .\cookbook\templates\account\login.html:39
 msgid "You can use any of the following providers to sign in."
-msgstr ""
+msgstr "Velg en av følgende leverandører for å logge på."
 
 #: .\cookbook\templates\account\logout.html:5
 #: .\cookbook\templates\account\logout.html:9
@@ -416,20 +423,20 @@ msgstr "Er du sikker på at du vil logge ut?"
 #: .\cookbook\templates\account\password_reset.html:5
 #: .\cookbook\templates\account\password_reset_done.html:5
 msgid "Password Reset"
-msgstr ""
+msgstr "Nullstill passord"
 
 #: .\cookbook\templates\account\password_reset.html:9
 #: .\cookbook\templates\account\password_reset_done.html:9
 msgid "Password reset is not implemented for the time being!"
-msgstr ""
+msgstr "Det er foreløpig ikke implementert funksjon for å nullstille passord!"
 
 #: .\cookbook\templates\account\signup.html:5
 msgid "Register"
-msgstr ""
+msgstr "Registrer"
 
 #: .\cookbook\templates\account\signup.html:9
 msgid "Create your Account"
-msgstr "Opprett din konto"
+msgstr "Opprett konto"
 
 #: .\cookbook\templates\account\signup.html:14
 msgid "Create User"
@@ -442,11 +449,11 @@ msgstr "API-dokumentasjon"
 
 #: .\cookbook\templates\base.html:78
 msgid "Utensils"
-msgstr ""
+msgstr "Redskaper"
 
 #: .\cookbook\templates\base.html:88
 msgid "Shopping"
-msgstr ""
+msgstr "Handle"
 
 #: .\cookbook\templates\base.html:102 .\cookbook\views\delete.py:84
 #: .\cookbook\views\edit.py:93 .\cookbook\views\lists.py:26
@@ -456,27 +463,27 @@ msgstr "Nøkkelord"
 
 #: .\cookbook\templates\base.html:104
 msgid "Batch Edit"
-msgstr ""
+msgstr "Oppdatere flere"
 
 #: .\cookbook\templates\base.html:109
 msgid "Storage Data"
-msgstr ""
+msgstr "Datalagring"
 
 #: .\cookbook\templates\base.html:113
 msgid "Storage Backends"
-msgstr ""
+msgstr "Lagringsplasser"
 
 #: .\cookbook\templates\base.html:115
 msgid "Configure Sync"
-msgstr ""
+msgstr "Konfigurer synkronisering"
 
 #: .\cookbook\templates\base.html:117
 msgid "Discovered Recipes"
-msgstr ""
+msgstr "Oppdagede oppskrifter"
 
 #: .\cookbook\templates\base.html:119
 msgid "Discovery Log"
-msgstr ""
+msgstr "Logg Oppdagelser"
 
 #: .\cookbook\templates\base.html:121 .\cookbook\templates\stats.html:10
 msgid "Statistics"
@@ -484,7 +491,7 @@ msgstr "Statistikk"
 
 #: .\cookbook\templates\base.html:123
 msgid "Units & Ingredients"
-msgstr ""
+msgstr "Enheter & Ingredienser"
 
 #: .\cookbook\templates\base.html:125
 msgid "Import Recipe"
@@ -521,58 +528,61 @@ msgid "API Browser"
 msgstr "API-utforsker"
 
 #: .\cookbook\templates\base.html:165
-#, fuzzy
 msgid "Logout"
 msgstr "Logg ut"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
-msgstr ""
+msgstr "Oppdater flere kategorier"
 
 #: .\cookbook\templates\batch\edit.html:15
 msgid "Batch edit Recipes"
-msgstr ""
+msgstr "Oppdater flere oppskrifter"
 
 #: .\cookbook\templates\batch\edit.html:20
 msgid "Add the specified keywords to all recipes containing a word"
-msgstr ""
+msgstr "Legg til spesifikt nøkkelord til alle oppskrifter som inneholder et ord"
 
 #: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:76
 msgid "Sync"
-msgstr ""
+msgstr "Synkronisering"
 
 #: .\cookbook\templates\batch\monitor.html:10
 msgid "Manage watched Folders"
-msgstr ""
+msgstr "Behandle overvåkede mapper"
 
 #: .\cookbook\templates\batch\monitor.html:14
 msgid ""
 "On this Page you can manage all storage folder locations that should be "
 "monitored and synced."
 msgstr ""
+"Her kan du behandle alle lagringsmapper og plasseringer for monitorering og "
+"synkronisering."
 
 #: .\cookbook\templates\batch\monitor.html:16
 msgid "The path must be in the following format"
-msgstr ""
+msgstr "Stien må være i følgende format"
 
 #: .\cookbook\templates\batch\monitor.html:27
 msgid "Sync Now!"
-msgstr ""
+msgstr "Synkroniser nå!"
 
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
-msgstr ""
+msgstr "Importerer oppskrifter"
 
 #: .\cookbook\templates\batch\waiting.html:23
 msgid ""
 "This can take a few minutes, depending on the number of recipes in sync, "
 "please wait."
 msgstr ""
+"Dette kan ta noen minutter, avhenging av antall oppskrifter som skal "
+"synkroniseres. Vennligst vent."
 
 #: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
 msgid "Recipe Books"
-msgstr ""
+msgstr "Oppskriftsbøker"
 
 #: .\cookbook\templates\books.html:15
 msgid "New Book"
@@ -584,32 +594,32 @@ msgstr "av"
 
 #: .\cookbook\templates\books.html:34
 msgid "Toggle Recipes"
-msgstr ""
+msgstr "Veksle oppskrifter"
 
 #: .\cookbook\templates\books.html:54
 #: .\cookbook\templates\meal_plan_entry.html:48
 #: .\cookbook\templates\recipes_table.html:64
 msgid "Last cooked"
-msgstr ""
+msgstr "Forrige tilbereding"
 
 #: .\cookbook\templates\books.html:71
 msgid "There are no recipes in this book yet."
-msgstr ""
+msgstr "Det er foreløpig ingen oppskrifter i denne boken."
 
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
-msgstr ""
+msgstr "Eksporter oppskrifter"
 
 #: .\cookbook\templates\export.html:14 .\cookbook\templates\export.html:20
 #: .\cookbook\templates\shopping_list.html:347
 #: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
 msgid "Export"
-msgstr ""
+msgstr "Eksporter"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
-msgstr ""
+msgstr "Importer ny oppskrift"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
 #: .\cookbook\templates\forms\edit_internal_recipe.html:389
@@ -635,29 +645,29 @@ msgstr "Beskrivelse"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:72
 msgid "Waiting Time"
-msgstr ""
+msgstr "Ventetid"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:78
 msgid "Servings Text"
-msgstr ""
+msgstr "Porsjon beskrivelse"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:89
 msgid "Select Keywords"
-msgstr ""
+msgstr "Velg nøkkelord"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:90
 #: .\cookbook\templates\url_import.html:212
 msgid "Add Keyword"
-msgstr ""
+msgstr "Legg til nøkkelord"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:108
 msgid "Nutrition"
-msgstr ""
+msgstr "Næringsinnhold"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:112
 #: .\cookbook\templates\forms\edit_internal_recipe.html:162
 msgid "Delete Step"
-msgstr ""
+msgstr "Fjern trinn"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:116
 msgid "Calories"
@@ -678,15 +688,15 @@ msgstr "Proteiner"
 #: .\cookbook\templates\forms\edit_internal_recipe.html:146
 #: .\cookbook\templates\forms\edit_internal_recipe.html:454
 msgid "Step"
-msgstr ""
+msgstr "Trinn"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:167
 msgid "Show as header"
-msgstr ""
+msgstr "Vis som overskrift"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:173
 msgid "Hide as header"
-msgstr ""
+msgstr "Skjul overskrift"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:178
 msgid "Move Up"
@@ -698,15 +708,15 @@ msgstr "Flytt nedover"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:192
 msgid "Step Name"
-msgstr ""
+msgstr "Trinn navn"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:196
 msgid "Step Type"
-msgstr ""
+msgstr "Trinn type"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:207
 msgid "Step time in Minutes"
-msgstr ""
+msgstr "Trinn tid i minutter"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:261
 #: .\cookbook\templates\shopping_list.html:183
@@ -740,7 +750,7 @@ msgstr "Velg mat"
 #: .\cookbook\templates\meal_plan.html:256
 #: .\cookbook\templates\url_import.html:171
 msgid "Note"
-msgstr ""
+msgstr "Notis"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:319
 msgid "Delete Ingredient"
@@ -748,7 +758,7 @@ msgstr "Slett ingrediens"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:325
 msgid "Make Header"
-msgstr ""
+msgstr "Bruk som overskrift"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:331
 msgid "Make Ingredient"
@@ -756,15 +766,15 @@ msgstr "Opprett ingrediens"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:337
 msgid "Disable Amount"
-msgstr ""
+msgstr "Deaktiver mengde"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:343
 msgid "Enable Amount"
-msgstr ""
+msgstr "Aktiver mengde"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:348
 msgid "Copy Template Reference"
-msgstr ""
+msgstr "Kopier mal-referanse"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:374
 #: .\cookbook\templates\url_import.html:196
@@ -773,29 +783,28 @@ msgstr "Instruksjoner"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:387
 #: .\cookbook\templates\forms\edit_internal_recipe.html:418
-#, fuzzy
 msgid "Save & View"
 msgstr "Lagre og vis"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:391
 #: .\cookbook\templates\forms\edit_internal_recipe.html:424
 msgid "Add Step"
-msgstr ""
+msgstr "Legg til trinn"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:394
 #: .\cookbook\templates\forms\edit_internal_recipe.html:428
 msgid "Add Nutrition"
-msgstr ""
+msgstr "Legg til næringsinnhold"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:396
 #: .\cookbook\templates\forms\edit_internal_recipe.html:430
 msgid "Remove Nutrition"
-msgstr ""
+msgstr "Fjern næringsinnhold"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:398
 #: .\cookbook\templates\forms\edit_internal_recipe.html:433
 msgid "View Recipe"
-msgstr ""
+msgstr "Vis oppskrift"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:400
 #: .\cookbook\templates\forms\edit_internal_recipe.html:435
@@ -804,11 +813,11 @@ msgstr "Slett oppskrift"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:441
 msgid "Steps"
-msgstr ""
+msgstr "Trinn"
 
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
-msgstr ""
+msgstr "Rediger ingrediens"
 
 #: .\cookbook\templates\forms\ingredients.html:16
 msgid ""
@@ -820,54 +829,61 @@ msgid ""
 "them.\n"
 "    "
 msgstr ""
+"\n"
+"        Følgende skjema kan brukes dersom, tilfeldigvis, to eller flere "
+"enheter eller ingredienser er opprettet,\n"
+"        og burde være identiske.\n"
+"        Det slår sammen to enheter eller ingredienser og oppdaterer alle "
+"oppskrifter som inneholder disse.\n"
+"    "
 
 #: .\cookbook\templates\forms\ingredients.html:24
 #: .\cookbook\templates\stats.html:26
 msgid "Units"
-msgstr ""
+msgstr "Enheter"
 
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
-msgstr ""
+msgstr "Er du sikker på at du vil slå sammen disse enhetene?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
 #: .\cookbook\templates\forms\ingredients.html:40
 msgid "Merge"
-msgstr "Flett"
+msgstr "Slå sammen"
 
 #: .\cookbook\templates\forms\ingredients.html:36
 msgid "Are you sure that you want to merge these two ingredients?"
-msgstr ""
+msgstr "Er du sikker på at du vil slå sammen disse ingrediensene?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
-msgstr ""
+msgstr "Er du sikker på at du vil slette %(title)s: <b>%(object)s</b> "
 
 #: .\cookbook\templates\generic\delete_template.html:21
 msgid "Confirm"
-msgstr ""
+msgstr "Bekreft"
 
 #: .\cookbook\templates\generic\edit_template.html:30
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
 #: .\cookbook\templates\generic\edit_template.html:34
 msgid "Delete original file"
-msgstr ""
+msgstr "Slett opprinnelig fil"
 
 #: .\cookbook\templates\generic\list_template.html:6
 #: .\cookbook\templates\generic\list_template.html:12
 msgid "List"
-msgstr ""
+msgstr "Liste"
 
 #: .\cookbook\templates\generic\list_template.html:25
 msgid "Filter"
-msgstr ""
+msgstr "Filtrer"
 
 #: .\cookbook\templates\generic\list_template.html:30
 msgid "Import all"
-msgstr ""
+msgstr "Importer alle"
 
 #: .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
@@ -891,19 +907,19 @@ msgstr "Vis logg"
 
 #: .\cookbook\templates\history.html:24
 msgid "Cook Log"
-msgstr ""
+msgstr "Tilberedingslogg"
 
 #: .\cookbook\templates\import.html:6 .\cookbook\templates\test.html:6
 msgid "Import Recipes"
-msgstr ""
+msgstr "Importer oppskrifter"
 
 #: .\cookbook\templates\include\log_cooking.html:7
 msgid "Log Recipe Cooking"
-msgstr ""
+msgstr "Loggfør tilberedt oppskrift"
 
 #: .\cookbook\templates\include\log_cooking.html:13
 msgid "All fields are optional and can be left empty."
-msgstr ""
+msgstr "Alle felt er valgfri og kan stå tomme."
 
 #: .\cookbook\templates\include\log_cooking.html:19
 msgid "Rating"
@@ -943,44 +959,53 @@ msgid ""
 "can be used.\n"
 "    "
 msgstr ""
+"\n"
+"        <b>Passord og nøkkelfeltene</b> er lagret som <b>ren tekst</b> i "
+"databasen.\n"
+"        Dette er nødvendig for å kunne utføre API-forespørsler, men det øker "
+"samtidig risiko for\n"
+"        uønsket tilgang til dem.<br/>\n"
+"        For å begrense kosekvensene av uønsket tilgang, kan nøkler eller "
+"kontoer med begrenset tilgang benyttes.\n"
+"    "
 
 #: .\cookbook\templates\index.html:29
 msgid "Search recipe ..."
-msgstr ""
+msgstr "Søk etter oppskrift..."
 
 #: .\cookbook\templates\index.html:44
 msgid "New Recipe"
-msgstr ""
+msgstr "Ny oppskrift"
 
 #: .\cookbook\templates\index.html:47
 msgid "Website Import"
-msgstr ""
+msgstr "Importer fra nettside"
 
 #: .\cookbook\templates\index.html:53
 msgid "Advanced Search"
-msgstr ""
+msgstr "Avansert søk"
 
 #: .\cookbook\templates\index.html:57
 msgid "Reset Search"
-msgstr ""
+msgstr "Nullstill søk"
 
 #: .\cookbook\templates\index.html:85
 msgid "Last viewed"
-msgstr ""
+msgstr "Sist sett"
 
 #: .\cookbook\templates\index.html:87 .\cookbook\templates\meal_plan.html:178
 #: .\cookbook\templates\stats.html:22
 msgid "Recipes"
-msgstr ""
+msgstr "Oppskrifter"
 
 #: .\cookbook\templates\index.html:94
 msgid "Log in to view recipes"
-msgstr ""
+msgstr "Logg inn for å se oppskrifter"
 
 #: .\cookbook\templates\markdown_info.html:5
 #: .\cookbook\templates\markdown_info.html:13
 msgid "Markdown Info"
-msgstr ""
+msgstr "Markdown informasjon"
 
 #: .\cookbook\templates\markdown_info.html:14
 msgid ""
@@ -997,43 +1022,56 @@ msgid ""
 "below.\n"
 "    "
 msgstr ""
+"\n"
+"        Markdown er et lettvekts markup språk som benyttes for å formatere "
+"ren tekst.\n"
+"        Denne siden bruker biblioteket <a href=\"https://python-markdown."
+"github.io/\" target=\"_blank\">Python Markdown</a> for\n"
+"        å konvertere teksten din til velformatert HTML. Fullstendig "
+"dokumentasjon for markdown finner du\n"
+"        <a href=\"https://daringfireball.net/projects/markdown/syntax\" "
+"target=\"_blank\">her</a>.\n"
+"        En ufullstendig, men sannsynligvis tilstrekkelig dokumentasjon "
+"finner du under her.\n"
+"    "
 
 #: .\cookbook\templates\markdown_info.html:25
 msgid "Headers"
-msgstr ""
+msgstr "Overskrifter"
 
 #: .\cookbook\templates\markdown_info.html:54
 msgid "Formatting"
-msgstr ""
+msgstr "Formatering"
 
 #: .\cookbook\templates\markdown_info.html:56
 #: .\cookbook\templates\markdown_info.html:72
 msgid "Line breaks are inserted by adding two spaces after the end of a line"
 msgstr ""
+"Linjeskift er satt inn ved å sette inn to mellomrom på slutten av en linje"
 
 #: .\cookbook\templates\markdown_info.html:57
 #: .\cookbook\templates\markdown_info.html:73
 msgid "or by leaving a blank line inbetween."
-msgstr ""
+msgstr "eller ved å sette inn en tom linje mellom."
 
 #: .\cookbook\templates\markdown_info.html:59
 #: .\cookbook\templates\markdown_info.html:74
 msgid "This text is bold"
-msgstr ""
+msgstr "Denne teksten er Fet"
 
 #: .\cookbook\templates\markdown_info.html:60
 #: .\cookbook\templates\markdown_info.html:75
 msgid "This text is italic"
-msgstr ""
+msgstr "Denne teksten er Kursiv"
 
 #: .\cookbook\templates\markdown_info.html:61
 #: .\cookbook\templates\markdown_info.html:77
 msgid "Blockquotes are also possible"
-msgstr ""
+msgstr "Det er også mulig å sitere avsnitt"
 
 #: .\cookbook\templates\markdown_info.html:84
 msgid "Lists"
-msgstr ""
+msgstr "Lister"
 
 #: .\cookbook\templates\markdown_info.html:85
 msgid ""
@@ -1264,7 +1302,7 @@ msgstr ""
 #: .\cookbook\templates\no_groups_info.html:5
 #: .\cookbook\templates\no_groups_info.html:12
 msgid "No Permissions"
-msgstr "Ingen tilganger."
+msgstr "Ingen tilgang"
 
 #: .\cookbook\templates\no_groups_info.html:17
 msgid "You do not have any groups and therefor cannot use this application."
@@ -1298,12 +1336,11 @@ msgstr ""
 
 #: .\cookbook\templates\offline.html:6
 msgid "Offline"
-msgstr "Frakoblet."
+msgstr "Frakoblet"
 
 #: .\cookbook\templates\offline.html:19
-#, fuzzy
 msgid "You are currently offline!"
-msgstr "Du er ikke tilkoblet Internett."
+msgstr "Du er ikke tilkoblet!"
 
 #: .\cookbook\templates\offline.html:20
 msgid ""
@@ -1366,7 +1403,7 @@ msgstr "Stil"
 
 #: .\cookbook\templates\settings.html:79
 msgid "API Token"
-msgstr "API-symbol"
+msgstr "API nøkkel"
 
 #: .\cookbook\templates\settings.html:80
 msgid ""
@@ -1389,9 +1426,8 @@ msgid "Cookbook Setup"
 msgstr "Kokeboksoppsett"
 
 #: .\cookbook\templates\setup.html:14
-#, fuzzy
 msgid "Setup"
-msgstr "Sett opp"
+msgstr "Installering"
 
 #: .\cookbook\templates\setup.html:15
 msgid ""
@@ -1424,11 +1460,11 @@ msgstr "Mengde"
 
 #: .\cookbook\templates\shopping_list.html:226
 msgid "Supermarket"
-msgstr "Matbutikk"
+msgstr "Butikk"
 
 #: .\cookbook\templates\shopping_list.html:236
 msgid "Select Supermarket"
-msgstr "Velg matbutikk"
+msgstr "Velg butikk"
 
 #: .\cookbook\templates\shopping_list.html:260
 msgid "Select User"
@@ -1540,7 +1576,6 @@ msgstr ""
 
 #: .\cookbook\templates\system.html:49 .\cookbook\templates\system.html:64
 #: .\cookbook\templates\system.html:80 .\cookbook\templates\system.html:95
-#, fuzzy
 msgid "Ok"
 msgstr "OK"
 

cookbook/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-11 08:52+0100\n"
-"PO-Revision-Date: 2022-03-08 01:31+0000\n"
-"Last-Translator: Felipe Castro <felipefcastro@gmail.com>\n"
+"PO-Revision-Date: 2023-04-12 11:55+0000\n"
+"Last-Translator: noxonad <noxonad@proton.me>\n"
 "Language-Team: Portuguese (Brazil) <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/pt_BR/>\n"
 "Language: pt_BR\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.10.1\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:50 .\cookbook\templates\stats.html:28
@@ -158,7 +158,7 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:195
 #: .\cookbook\templates\url_import.html:585 .\cookbook\views\lists.py:97
 msgid "Keywords"
-msgstr ""
+msgstr "Palavras-chave"
 
 #: .\cookbook\forms.py:131
 msgid "Preparation time in minutes"
@@ -513,7 +513,7 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:231
 #: .\cookbook\templates\url_import.html:462
 msgid "Servings"
-msgstr ""
+msgstr "Porções"
 
 #: .\cookbook\integration\saffron.py:25
 msgid "Waiting time"
@@ -585,7 +585,7 @@ msgstr ""
 
 #: .\cookbook\models.py:302 .\cookbook\templates\base.html:90
 msgid "Books"
-msgstr ""
+msgstr "Livros"
 
 #: .\cookbook\models.py:310
 msgid "Small"
@@ -598,7 +598,7 @@ msgstr ""
 #: .\cookbook\models.py:310 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: .\cookbook\models.py:513
 msgid " is part of a recipe step and cannot be deleted"
@@ -677,7 +677,7 @@ msgstr ""
 #: .\cookbook\templates\shopping_list.html:37
 #: .\cookbook\templates\space.html:109
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: .\cookbook\tables.py:115 .\cookbook\tables.py:138
 #: .\cookbook\templates\generic\delete_template.html:7
@@ -715,7 +715,7 @@ msgstr ""
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
-msgstr ""
+msgstr "Configurações"
 
 #: .\cookbook\templates\account\email.html:13
 msgid "Email"
@@ -937,7 +937,7 @@ msgstr ""
 #: .\cookbook\templates\account\signup.html:48
 #: .\cookbook\templates\socialaccount\signup.html:39
 msgid "and"
-msgstr ""
+msgstr "e"
 
 #: .\cookbook\templates\account\signup.html:52
 #: .\cookbook\templates\socialaccount\signup.html:43
@@ -989,7 +989,7 @@ msgstr ""
 #: .\cookbook\templates\shopping_list.html:208
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
-msgstr ""
+msgstr "Supermercado"
 
 #: .\cookbook\templates\base.html:163
 msgid "Supermarket Category"
@@ -1027,7 +1027,7 @@ msgstr ""
 #: .\cookbook\templates\shopping_list.html:165
 #: .\cookbook\templates\shopping_list.html:188
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
 #: .\cookbook\templates\base.html:259
 #: .\cookbook\templates\generic\list_template.html:14
@@ -1190,7 +1190,7 @@ msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:26
 msgid "Protected"
-msgstr ""
+msgstr "Protegido"
 
 #: .\cookbook\templates\generic\delete_template.html:41
 msgid "Cascade"
@@ -1268,7 +1268,7 @@ msgstr ""
 
 #: .\cookbook\templates\include\recipe_open_modal.html:18
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #: .\cookbook\templates\include\recipe_open_modal.html:32
 msgid "Open Recipe"
@@ -1821,7 +1821,7 @@ msgstr ""
 
 #: .\cookbook\templates\settings.html:162
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #: .\cookbook\templates\settings.html:173
 msgid ""
@@ -2062,7 +2062,7 @@ msgstr ""
 
 #: .\cookbook\templates\space.html:120
 msgid "user"
-msgstr ""
+msgstr "usuário"
 
 #: .\cookbook\templates\space.html:121
 msgid "guest"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: .\cookbook\templates\url_import.html:38
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: .\cookbook\templates\url_import.html:40
 msgid "App"
@@ -2273,7 +2273,7 @@ msgstr ""
 
 #: .\cookbook\templates\url_import.html:214
 msgid "Image"
-msgstr ""
+msgstr "Imagem"
 
 #: .\cookbook\templates\url_import.html:246
 msgid "Prep Time"
@@ -2359,7 +2359,7 @@ msgstr ""
 
 #: .\cookbook\templates\url_import.html:640
 msgid "Information"
-msgstr ""
+msgstr "Informação"
 
 #: .\cookbook\templates\url_import.html:642
 msgid ""

cookbook/locale/ru/LC_MESSAGES/django.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-13 22:40+0200\n"
-"PO-Revision-Date: 2022-11-30 19:09+0000\n"
-"Last-Translator: Alex <kovsharoff@gmail.com>\n"
+"PO-Revision-Date: 2023-05-01 07:55+0000\n"
+"Last-Translator: axeron2036 <admin@axeron2036.ru>\n"
 "Language-Team: Russian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.14.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
@@ -286,7 +286,7 @@ msgstr ""
 
 #: .\cookbook\forms.py:497
 msgid "Search Method"
-msgstr ""
+msgstr "Способ поиска"
 
 #: .\cookbook\forms.py:498
 msgid "Fuzzy Lookups"
@@ -861,7 +861,7 @@ msgstr ""
 
 #: .\cookbook\templates\base.html:220
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
 #: .\cookbook\templates\base.html:224
 msgid "API Browser"
@@ -1937,7 +1937,7 @@ msgstr ""
 
 #: .\cookbook\templates\space.html:106
 msgid "user"
-msgstr ""
+msgstr "пользователь"
 
 #: .\cookbook\templates\space.html:107
 msgid "guest"

cookbook/locale/sl/LC_MESSAGES/django.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-08 16:27+0100\n"
-"PO-Revision-Date: 2022-02-02 15:31+0000\n"
-"Last-Translator: Mario Dvorsek <mario.dvorsek@gmail.com>\n"
+"PO-Revision-Date: 2023-04-12 11:55+0000\n"
+"Last-Translator: noxonad <noxonad@proton.me>\n"
 "Language-Team: Slovenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/sl/>\n"
 "Language: sl\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%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
@@ -2107,7 +2107,7 @@ msgstr ""
 
 #: .\cookbook\templates\url_import.html:36
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: .\cookbook\templates\url_import.html:38
 msgid "App"

cookbook/locale/uk/LC_MESSAGES/django.po

@@ -8,15 +8,17 @@ 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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2023-04-12 11:55+0000\n"
+"Last-Translator: noxonad <noxonad@proton.me>\n"
+"Language-Team: Ukrainian <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34
 #: .\cookbook\templates\space.html:49 .\cookbook\templates\stats.html:28
@@ -1089,7 +1091,7 @@ msgstr ""
 
 #: .\cookbook\templates\base.html:311
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
 #: .\cookbook\templates\base.html:313
 msgid "Translate Tandoor"
@@ -2026,7 +2028,7 @@ msgstr ""
 
 #: .\cookbook\templates\space.html:118
 msgid "user"
-msgstr ""
+msgstr "користувач"
 
 #: .\cookbook\templates\space.html:119
 msgid "guest"

cookbook/locale/zh_Hant/LC_MESSAGES/django.po

@@ -8,14 +8,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-12 20:30+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2023-03-12 02:55+0000\n"
+"Last-Translator: Feng Zhong <fewoodse@gmail.com>\n"
+"Language-Team: Chinese (Traditional) <http://translate.tandoor.dev/projects/"
+"tandoor/recipes-backend/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
 #: .\cookbook\templates\forms\edit_internal_recipe.html:246
@@ -23,41 +25,41 @@ msgstr ""
 #: .\cookbook\templates\space.html:37 .\cookbook\templates\stats.html:28
 #: .\cookbook\templates\url_import.html:270 .\cookbook\views\lists.py:67
 msgid "Ingredients"
-msgstr ""
+msgstr "食材"
 
 #: .\cookbook\forms.py:49
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
-msgstr ""
+msgstr "頂部導航欄的顏色。並非所有的顏色都適用於所有的主題，只要試一試就可以了!"
 
 #: .\cookbook\forms.py:51
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
-msgstr ""
+msgstr "在菜譜中插入新食材時使用的默認單位。"
 
 #: .\cookbook\forms.py:53
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
-msgstr ""
+msgstr "啟用對食材數量的分數支持（例如自動將小數轉換為分數）"
 
 #: .\cookbook\forms.py:56
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
-msgstr ""
+msgstr "默認情況下，將自動與用戶共享新創建的膳食計劃。"
 
 #: .\cookbook\forms.py:58
 msgid "Show recently viewed recipes on search page."
-msgstr ""
+msgstr "在搜索頁面上查看最近看過的食譜。"
 
 #: .\cookbook\forms.py:59
 msgid "Number of decimals to round ingredients."
-msgstr ""
+msgstr "四舍五入食材的小數點數量。"
 
 #: .\cookbook\forms.py:60
 msgid "If you want to be able to create and see comments underneath recipes."
-msgstr ""
+msgstr "如果你希望能夠在菜譜下面創建並看到評論。"
 
 #: .\cookbook\forms.py:62
 msgid ""
@@ -66,22 +68,25 @@ msgid ""
 "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."
 msgstr ""
+"設置為0將禁用自動同步。當查看購物清單時，清單會每隔幾秒鐘更新一次，以同步其他"
+"人可能做出的改變。在與多人一起購物時很有用，但可能會消耗一點移動數據。如果低"
+"於實例限制，它將在保存時被重置。"
 
 #: .\cookbook\forms.py:65
 msgid "Makes the navbar stick to the top of the page."
-msgstr ""
+msgstr "使導航欄保持在頁面的頂部。"
 
 #: .\cookbook\forms.py:81
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
-msgstr ""
+msgstr "這兩個字段都是可選的。如果沒有輸入,將顯示用戶名"
 
 #: .\cookbook\forms.py:102 .\cookbook\forms.py:331
 #: .\cookbook\templates\forms\edit_internal_recipe.html:49
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
-msgstr ""
+msgstr "名字"
 
 #: .\cookbook\forms.py:103 .\cookbook\forms.py:332
 #: .\cookbook\templates\base.html:105
@@ -90,37 +95,37 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:188
 #: .\cookbook\templates\url_import.html:573
 msgid "Keywords"
-msgstr ""
+msgstr "關鍵詞"
 
 #: .\cookbook\forms.py:104
 msgid "Preparation time in minutes"
-msgstr ""
+msgstr "準備時間（分鐘）"
 
 #: .\cookbook\forms.py:105
 msgid "Waiting time (cooking/baking) in minutes"
-msgstr ""
+msgstr "等候（烹飪、烘焙等）時間（分鐘）"
 
 #: .\cookbook\forms.py:106 .\cookbook\forms.py:333
 msgid "Path"
-msgstr ""
+msgstr "路徑"
 
 #: .\cookbook\forms.py:107
 msgid "Storage UID"
-msgstr ""
+msgstr "存儲ID"
 
 #: .\cookbook\forms.py:133
 msgid "Default"
-msgstr ""
+msgstr "默認"
 
 #: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
-msgstr ""
+msgstr "為防止重復，忽略與現有同名的菜譜。選中此框可導入所有內容（包括同名菜譜）。"
 
 #: .\cookbook\forms.py:164
 msgid "New Unit"
-msgstr ""
+msgstr "新單位"
 
 #: .\cookbook\forms.py:165
 msgid "New unit that other gets replaced by."
@@ -128,15 +133,15 @@ msgstr ""
 
 #: .\cookbook\forms.py:170
 msgid "Old Unit"
-msgstr ""
+msgstr "舊單位"
 
 #: .\cookbook\forms.py:171
 msgid "Unit that should be replaced."
-msgstr ""
+msgstr "該被替換的單位。"
 
 #: .\cookbook\forms.py:187
 msgid "New Food"
-msgstr ""
+msgstr "新食物"
 
 #: .\cookbook\forms.py:188
 msgid "New food that other gets replaced by."
@@ -144,85 +149,86 @@ msgstr ""
 
 #: .\cookbook\forms.py:193
 msgid "Old Food"
-msgstr ""
+msgstr "舊食物"
 
 #: .\cookbook\forms.py:194
 msgid "Food that should be replaced."
-msgstr ""
+msgstr "該被替換的食物。"
 
 #: .\cookbook\forms.py:212
 msgid "Add your comment: "
-msgstr ""
+msgstr "發表評論。 "
 
 #: .\cookbook\forms.py:253
 msgid "Leave empty for dropbox and enter app password for nextcloud."
-msgstr ""
+msgstr "Dropbox 留空並輸入 Nextcloud 應用密碼。"
 
 #: .\cookbook\forms.py:260
 msgid "Leave empty for nextcloud and enter api token for dropbox."
-msgstr ""
+msgstr "Nextcloud 留空並輸入 Dropbox API 令牌。"
 
 #: .\cookbook\forms.py:269
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
-msgstr ""
+msgstr "Dropbox 留空並輸入基礎 Nextcloud 網址（<code>/remote.php/webdav/</code> "
+"會自動添加）"
 
 #: .\cookbook\forms.py:307
 msgid "Search String"
-msgstr ""
+msgstr "搜索字符串"
 
 #: .\cookbook\forms.py:334
 msgid "File ID"
-msgstr ""
+msgstr "文件編號"
 
 #: .\cookbook\forms.py:370
 msgid "You must provide at least a recipe or a title."
-msgstr ""
+msgstr "你必須至少提供一份菜譜或一個標題。"
 
 #: .\cookbook\forms.py:383
 msgid "You can list default users to share recipes with in the settings."
-msgstr ""
+msgstr "你可以在設置中列出默認用戶來分享菜譜。"
 
 #: .\cookbook\forms.py:384
 #: .\cookbook\templates\forms\edit_internal_recipe.html:404
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
-msgstr ""
+msgstr "可以使用 Markdown 設置此字段格式。<a href=\"/docs/markdown/\">查看文檔</a>"
 
 #: .\cookbook\forms.py:409
 msgid "Maximum number of users for this space reached."
-msgstr ""
+msgstr "已達到該空間的最大用戶數。"
 
 #: .\cookbook\forms.py:415
 msgid "Email address already taken!"
-msgstr ""
+msgstr "電子郵件地址已被註冊！"
 
 #: .\cookbook\forms.py:423
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
-msgstr ""
+msgstr "電子郵件地址不是必需的，但如果存在，邀請鏈接將被發送給用戶。"
 
 #: .\cookbook\forms.py:438
 msgid "Name already taken."
-msgstr ""
+msgstr "名字已被占用。"
 
 #: .\cookbook\forms.py:449
 msgid "Accept Terms and Privacy"
-msgstr ""
+msgstr "接受條款及隱私政策"
 
 #: .\cookbook\helper\AllAuthCustomAdapter.py:30
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
-msgstr ""
+msgstr "為了防止垃圾郵件，所要求的電子郵件沒有被發送。請等待幾分鐘後再試。"
 
 #: .\cookbook\helper\permission_helper.py:124
 #: .\cookbook\helper\permission_helper.py:144 .\cookbook\views\views.py:147
 msgid "You are not logged in and therefore cannot view this page!"
-msgstr ""
+msgstr "你还沒有登錄，因此不能查看這個頁面！"
 
 #: .\cookbook\helper\permission_helper.py:127
 #: .\cookbook\helper\permission_helper.py:132
@@ -234,18 +240,18 @@ msgstr ""
 #: .\cookbook\views\views.py:158 .\cookbook\views\views.py:165
 #: .\cookbook\views\views.py:253
 msgid "You do not have the required permissions to view this page!"
-msgstr ""
+msgstr "你沒有必要的權限來查看這個頁面！"
 
 #: .\cookbook\helper\permission_helper.py:148
 #: .\cookbook\helper\permission_helper.py:170
 #: .\cookbook\helper\permission_helper.py:185
 msgid "You cannot interact with this object as it is not owned by you!"
-msgstr ""
+msgstr "你不能與此對象交互，因為它不屬於你！"
 
 #: .\cookbook\helper\template_helper.py:60
 #: .\cookbook\helper\template_helper.py:62
 msgid "Could not parse template code."
-msgstr ""
+msgstr "無法解析模板代碼。"
 
 #: .\cookbook\integration\integration.py:102
 #: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20
@@ -258,40 +264,40 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
 #: .\cookbook\views\edit.py:199
 msgid "Import"
-msgstr ""
+msgstr "導入"
 
 #: .\cookbook\integration\integration.py:162
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
-msgstr ""
+msgstr "導入需要一個 .zip 文件。你是否為數據選擇了正確的導入器類型？"
 
 #: .\cookbook\integration\integration.py:165
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
-msgstr ""
+msgstr "在導入過程中發生了一個意外的錯誤。請確認你上傳的文件是否有效。"
 
 #: .\cookbook\integration\integration.py:169
 msgid "The following recipes were ignored because they already existed:"
-msgstr ""
+msgstr "以下菜譜被忽略了，因為它們已經存在了："
 
 #: .\cookbook\integration\integration.py:173
 #, python-format
 msgid "Imported %s recipes."
-msgstr ""
+msgstr "導入了%s菜譜。"
 
 #: .\cookbook\integration\paprika.py:46
 msgid "Notes"
-msgstr ""
+msgstr "說明"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Nutritional Information"
-msgstr ""
+msgstr "營養信息"
 
 #: .\cookbook\integration\paprika.py:53
 msgid "Source"
-msgstr ""
+msgstr "來源"
 
 #: .\cookbook\integration\safron.py:23
 #: .\cookbook\templates\forms\edit_internal_recipe.html:79
@@ -299,101 +305,101 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
 msgid "Servings"
-msgstr ""
+msgstr "份量"
 
 #: .\cookbook\integration\safron.py:25
 msgid "Waiting time"
-msgstr ""
+msgstr "等待時間"
 
 #: .\cookbook\integration\safron.py:27
 #: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
-msgstr ""
+msgstr "準備時間"
 
 #: .\cookbook\integration\safron.py:29 .\cookbook\templates\base.html:78
 #: .\cookbook\templates\forms\ingredients.html:7
 #: .\cookbook\templates\index.html:7
 msgid "Cookbook"
-msgstr ""
+msgstr "菜譜"
 
 #: .\cookbook\integration\safron.py:31
 msgid "Section"
-msgstr ""
+msgstr "部分"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
-msgstr ""
+msgstr "早餐"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:19
 msgid "Lunch"
-msgstr ""
+msgstr "午餐"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:24
 msgid "Dinner"
-msgstr ""
+msgstr "晚餐"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:29
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
 #: .\cookbook\models.py:71
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
-msgstr ""
+msgstr "空間的最大文件存儲量，單位為 MB。0表示無限製，-1表示禁止上傳文件。"
 
 #: .\cookbook\models.py:121 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
 #: .\cookbook\models.py:122 .\cookbook\templates\base.html:92
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
 #: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
 msgid "Meal-Plan"
-msgstr ""
+msgstr "膳食計劃"
 
 #: .\cookbook\models.py:123 .\cookbook\templates\base.html:89
 msgid "Books"
-msgstr ""
+msgstr "書籍"
 
 #: .\cookbook\models.py:131
 msgid "Small"
-msgstr ""
+msgstr "小"
 
 #: .\cookbook\models.py:131
 msgid "Large"
-msgstr ""
+msgstr "大"
 
 #: .\cookbook\models.py:131 .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
 #: .\cookbook\templates\meal_plan.html:323
 msgid "New"
-msgstr ""
+msgstr "新"
 
 #: .\cookbook\models.py:340
 #: .\cookbook\templates\forms\edit_internal_recipe.html:202
 msgid "Text"
-msgstr ""
+msgstr "文本"
 
 #: .\cookbook\models.py:340
 #: .\cookbook\templates\forms\edit_internal_recipe.html:203
 msgid "Time"
-msgstr ""
+msgstr "時間"
 
 #: .\cookbook\models.py:340
 #: .\cookbook\templates\forms\edit_internal_recipe.html:204
 #: .\cookbook\templates\forms\edit_internal_recipe.html:218
 msgid "File"
-msgstr ""
+msgstr "文件"
 
 #: .\cookbook\serializer.py:109
 msgid "File uploads are not enabled for this Space."
-msgstr ""
+msgstr "未為此空間啟用文件上傳。"
 
 #: .\cookbook\serializer.py:117
 msgid "You have reached your file upload limit."
-msgstr ""
+msgstr "你已達到文件上傳的限製。"
 
 #: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
 #: .\cookbook\templates\generic\edit_template.html:6
@@ -403,7 +409,7 @@ msgstr ""
 #: .\cookbook\templates\shopping_list.html:33
 #: .\cookbook\templates\space.html:84
 msgid "Edit"
-msgstr ""
+msgstr "編輯"
 
 #: .\cookbook\tables.py:124 .\cookbook\tables.py:147
 #: .\cookbook\templates\books.html:38
@@ -413,28 +419,28 @@ msgstr ""
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
-msgstr ""
+msgstr "刪除"
 
 #: .\cookbook\templates\404.html:5
 msgid "404 Error"
-msgstr ""
+msgstr "404錯誤"
 
 #: .\cookbook\templates\404.html:18
 msgid "The page you are looking for could not be found."
-msgstr ""
+msgstr "找不到你要找的頁面。"
 
 #: .\cookbook\templates\404.html:33
 msgid "Take me Home"
-msgstr ""
+msgstr "回到主頁"
 
 #: .\cookbook\templates\404.html:35
 msgid "Report a Bug"
-msgstr ""
+msgstr "報告一個錯誤"
 
 #: .\cookbook\templates\account\email.html:6
 #: .\cookbook\templates\account\email.html:9
 msgid "E-mail Addresses"
-msgstr ""
+msgstr "電子郵件地址"
 
 #: .\cookbook\templates\account\email.html:11
 msgid "The following e-mail addresses are associated with your account:"
@@ -1769,7 +1775,7 @@ msgstr ""
 
 #: .\cookbook\templates\space.html:100
 msgid "user"
-msgstr ""
+msgstr "用戶"
 
 #: .\cookbook\templates\space.html:101
 msgid "guest"

cookbook/migrations/0186_automation_order_alter_automation_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.4 on 2023-01-03 21:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0185_food_plural_name_ingredient_always_use_plural_food_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='automation',
+            name='order',
+            field=models.IntegerField(default=1000),
+        ),
+        migrations.AlterField(
+            model_name='automation',
+            name='type',
+            field=models.CharField(choices=[('FOOD_ALIAS', 'Food Alias'), ('UNIT_ALIAS', 'Unit Alias'), ('KEYWORD_ALIAS', 'Keyword Alias'), ('DESCRIPTION_REPLACE', 'Description Replace'), ('INSTRUCTION_REPLACE', 'Instruction Replace')], max_length=128),
+        ),
+    ]

cookbook/migrations/0187_alter_space_use_plural.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-01-20 09:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0186_automation_order_alter_automation_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/migrations/0188_space_no_sharing_limit.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-02-12 16:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0187_alter_space_use_plural'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='no_sharing_limit',
+            field=models.BooleanField(default=False),
+        ),
+    ]

cookbook/models.py

@@ -260,8 +260,9 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     max_recipes = models.IntegerField(default=0)
     max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
     max_users = models.IntegerField(default=0)
-    use_plural = models.BooleanField(default=False)
+    use_plural = models.BooleanField(default=True)
     allow_sharing = models.BooleanField(default=True)
+    no_sharing_limit = models.BooleanField(default=False)
     demo = models.BooleanField(default=False)
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)
     show_facet_count = models.BooleanField(default=False)
@@ -367,7 +368,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     )
 
     user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True)
-    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True,blank=True, related_name='user_image')
+    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='user_image')
     theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR)
     nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
     default_unit = models.CharField(max_length=32, default='g')
@@ -680,7 +681,7 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
         if self.always_use_plural_unit and self.unit.plural_name not in (None, "") and not self.no_amount:
             unit = self.unit.plural_name
         else:
-            if self.amount > 1 and self.unit.plural_name not in (None, "") and not self.no_amount:
+            if self.amount > 1 and self.unit is not None and self.unit.plural_name not in (None, "") and not self.no_amount:
                 unit = self.unit.plural_name
             else:
                 unit = str(self.unit)
@@ -1223,9 +1224,12 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     FOOD_ALIAS = 'FOOD_ALIAS'
     UNIT_ALIAS = 'UNIT_ALIAS'
     KEYWORD_ALIAS = 'KEYWORD_ALIAS'
+    DESCRIPTION_REPLACE = 'DESCRIPTION_REPLACE'
+    INSTRUCTION_REPLACE = 'INSTRUCTION_REPLACE'
 
     type = models.CharField(max_length=128,
-                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),))
+                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),
+                                     (DESCRIPTION_REPLACE, _('Description Replace')), (INSTRUCTION_REPLACE, _('Instruction Replace')),))
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 
@@ -1233,6 +1237,8 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     param_2 = models.CharField(max_length=128, blank=True, null=True)
     param_3 = models.CharField(max_length=128, blank=True, null=True)
 
+    order = models.IntegerField(default=1000)
+
     disabled = models.BooleanField(default=False)
 
     updated_at = models.DateTimeField(auto_now=True)

cookbook/serializer.py

@@ -432,9 +432,13 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
-        plural_name = validated_data.pop('plural_name', None)
-        if plural_name:
+
+        if plural_name := validated_data.pop('plural_name', None):
             plural_name = plural_name.strip()
+
+        if unit := Unit.objects.filter(Q(name=name) | Q(plural_name=name)).first():
+            return unit
+
         space = validated_data.pop('space', self.context['request'].space)
         obj, created = Unit.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
         return obj
@@ -544,9 +548,13 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
-        plural_name = validated_data.pop('plural_name', None)
-        if plural_name:
+
+        if plural_name := validated_data.pop('plural_name', None):
             plural_name = plural_name.strip()
+
+        if food := Food.objects.filter(Q(name=name) | Q(plural_name=name)).first():
+            return food
+
         space = validated_data.pop('space', self.context['request'].space)
         # supermarket category needs to be handled manually as food.get or create does not create nested serializers unlike a super.create of serializer
         if 'supermarket_category' in validated_data and validated_data['supermarket_category']:
@@ -1067,7 +1075,7 @@ class AutomationSerializer(serializers.ModelSerializer):
     class Meta:
         model = Automation
         fields = (
-            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'disabled', 'created_by',)
+            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'order', 'disabled', 'created_by',)
         read_only_fields = ('created_by',)
 
 

cookbook/static/css/app.min.css

@@ -2,6 +2,16 @@
     height: 40px;
 }
 
+.two-row-text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2; /* number of lines to show */
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+
 @media (max-width: 991.98px) {
     .menu-dropdown-text {
         font-size: 14px;

cookbook/static/themes/tandoor.min.css

@@ -10438,8 +10438,6 @@ footer a:hover {
     padding: 5px 0 20px 39px
 }
 
-/*# sourceMappingURL=maps/style.min.css.map */
-
 .bg-header {
     background-color: rgb(221, 191, 134) !important;
 }

cookbook/templates/base.html

@@ -350,8 +350,8 @@
 
 {% message_of_the_day request as message_of_the_day %}
 {% if message_of_the_day %}
-    <div class="bg-success" style=" width: 100%; text-align: center!important; color: #ffffff; padding: 8px">
-        {{ message_of_the_day }}
+    <div class="bg-info" style=" width: 100%; text-align: center!important; color: #ffffff; padding: 8px">
+        {{ message_of_the_day | markdown |safe }}
     </div>
 {% endif %}
 

cookbook/templates/recipe_view.html

@@ -7,6 +7,21 @@
 
 {% block title %}{{ recipe.name }}{% endblock %}
 
+{% block extra_head %}
+    <meta property="og:title" content="{{ recipe.name }}"/>
+    <meta property="og:type" content="website"/>
+    <meta property="og:url" content="{% base_path request 'base' %}{% url 'view_recipe' recipe.pk share %}"/>
+    {% if recipe.image %}
+        <meta property="og:image" content="{% base_path request 'base' %}{{ recipe.image.url }}"/>
+        <meta property="og:image:url" content="{% base_path request 'base' %}{{ recipe.image.url }}"/>
+        <meta property="og:image:secure" content="{% base_path request 'base' %}{{ recipe.image.url }}"/>
+    {% endif %}
+    {% if recipe.description %}
+        <meta property="og:description" content="{{ recipe.description }}"/>
+    {% endif %}
+    <meta property="og:site_name" content="Tandoor Recipes"/>
+{% endblock %}
+
 {% block content %}
     {% recipe_rating recipe request.user as rating %}
 
@@ -33,7 +48,7 @@
         {% endfor %}
 
         {% if request.user.is_authenticated %}
-            <div class="d-print-none">
+            <div class="d-print-none" style="padding-bottom: 60px">
 
                 <form method="POST" class="post-form">
                     {% csrf_token %}

cookbook/templates/test.html

@@ -10,11 +10,24 @@
 
 {% block content_fluid %}
 
-    {{ data }}
+    <div id="app">
+        <test-view></test-view>
+    </div>
 
 {% endblock %}
 
 
 {% block script %}
+    {% if debug %}
+        <script src="{% url 'js_reverse' %}"></script>
+    {% else %}
+        <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
+    {% endif %}
 
+    <script type="application/javascript">
+
+        window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
+    </script>
+
+    {% render_bundle 'test_view' %}
 {% endblock %}

cookbook/templatetags/custom_tags.py

@@ -57,6 +57,8 @@ def markdown(value):
         ]
     )
     markdown_attrs['*'] = markdown_attrs['*'] + ['class']
+    parsed_md = parsed_md[3:] # remove outer paragraph
+    parsed_md = parsed_md[:len(parsed_md)-4]
     return bleach.clean(parsed_md, tags, markdown_attrs)
 
 
@@ -101,6 +103,7 @@ def page_help(page_name):
         'view_shopping': 'https://docs.tandoor.dev/features/shopping/',
         'view_import': 'https://docs.tandoor.dev/features/import_export/',
         'view_export': 'https://docs.tandoor.dev/features/import_export/',
+        'list_automation': 'https://docs.tandoor.dev/features/automation/',
     }
 
     link = help_pages.get(page_name, '')

cookbook/tests/api/test_api_food.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 from django_scopes import scope, scopes_disabled
 from pytest_factoryboy import LazyFixture, register
 
-from cookbook.models import Food, FoodInheritField, Ingredient, ShoppingList, ShoppingListEntry
+from cookbook.models import Food, Ingredient, ShoppingListEntry
 from cookbook.tests.factories import (FoodFactory, IngredientFactory, ShoppingListEntryFactory,
                                       SupermarketCategoryFactory)
 
@@ -56,23 +56,32 @@ def obj_tree_1(request, space_1):
         params = request.param  # request.param is a magic variable
     except AttributeError:
         params = {}
-    objs = []
     inherit = params.pop('inherit', False)
-    objs.extend(FoodFactory.create_batch(3, space=space_1, **params))
+    FoodFactory.create_batch(3, space=space_1, **params)
+    objs = Food.objects.values_list('id', flat=True)
+    obj_id = objs[1]
+    child_id = objs[0]
+    parent_id = objs[2]
 
     # set all foods to inherit everything
     if inherit:
         inherit = Food.inheritable_fields
-        Through = Food.objects.filter(space=space_1).first().inherit_fields.through
+        Through = Food.objects.filter(
+            space=space_1).first().inherit_fields.through
         for i in inherit:
             Through.objects.bulk_create([
                 Through(food_id=x, foodinheritfield_id=i.id)
                 for x in Food.objects.filter(space=space_1).values_list('id', flat=True)
             ])
 
-    objs[0].move(objs[1], node_location)
-    objs[1].move(objs[2], node_location)
-    return Food.objects.get(id=objs[1].id)  # whenever you move/merge a tree it's safest to re-get the object
+    Food.objects.get(id=child_id).move(
+        Food.objects.get(id=obj_id), node_location)
+
+    Food.objects.get(id=obj_id).move(
+        Food.objects.get(id=parent_id), node_location)
+
+    # whenever you move/merge a tree it's safest to re-get the object
+    return Food.objects.get(id=obj_id)
 
 
 @pytest.mark.parametrize("arg", [
@@ -90,6 +99,10 @@ def test_list_space(obj_1, obj_2, u1_s1, u1_s2, space_2):
     assert json.loads(u1_s1.get(reverse(LIST_URL)).content)['count'] == 2
     assert json.loads(u1_s2.get(reverse(LIST_URL)).content)['count'] == 0
 
+    with scopes_disabled():
+        # for some reason the 'path' attribute changes between the factory and the test
+        obj_1 = Food.objects.get(id=obj_1.id)
+        obj_2 = Food.objects.get(id=obj_2.id)
         obj_1.space = space_2
         obj_1.save()
 
@@ -107,19 +120,23 @@ def test_list_filter(obj_1, obj_2, u1_s1):
     assert obj_2.name in [x['name'] for x in response['results']]
     assert response['results'][0]['name'] < response['results'][1]['name']
 
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?page_size=1').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?page_size=1').content)
     assert len(response['results']) == 1
 
     response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?limit=1').content)
     assert len(response['results']) == 1
 
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?query=''&limit=1').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?query=''&limit=1').content)
     assert len(response['results']) == 1
 
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?query=chicken').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?query=chicken').content)
     assert response['count'] == 0
 
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?query={obj_1.name[:-4]}').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?query={obj_1.name[:-4]}').content)
     assert response['count'] == 1
 
 
@@ -262,8 +279,9 @@ def test_integrity(u1_s1, recipe_1_s1):
 
 def test_move(u1_s1, obj_tree_1, obj_2, obj_3, space_1):
     with scope(space=space_1):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
-        child = obj_tree_1.get_descendants()[0]
         assert parent.get_num_children() == 1
         assert parent.get_descendant_count() == 2
         assert Food.get_root_nodes().filter(space=space_1).count() == 2
@@ -295,8 +313,9 @@ def test_move(u1_s1, obj_tree_1, obj_2, obj_3, space_1):
 
 def test_move_errors(u1_s1, obj_tree_1, obj_3, space_1):
     with scope(space=space_1):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
-        child = obj_tree_1.get_descendants()[0]
     # move child to root
     r = u1_s1.put(reverse(MOVE_URL, args=[obj_tree_1.id, 0]))
     assert r.status_code == 200
@@ -373,6 +392,8 @@ def test_merge_shopping_entries(obj_tree_1, u1_s1, space_1):
 
 def test_merge(u1_s1, obj_tree_1, obj_1, obj_3, space_1):
     with scope(space=space_1):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
         child = obj_tree_1.get_descendants()[0]
         assert parent.get_num_children() == 1
@@ -416,8 +437,9 @@ def test_merge(u1_s1,  obj_tree_1, obj_1, obj_3, space_1):
 
 def test_merge_errors(u1_s1, obj_tree_1, obj_3, space_1):
     with scope(space=space_1):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
-        child = obj_tree_1.get_descendants()[0]
 
     # attempt to merge with non-existent parent
     r = u1_s1.put(
@@ -451,44 +473,63 @@ def test_merge_errors(u1_s1, obj_tree_1, obj_3, space_1):
 
 def test_root_filter(obj_tree_1, obj_2, obj_3, u1_s1):
     with scope(space=obj_tree_1.space):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
-        child = obj_tree_1.get_descendants()[0]
 
     # should return root objects in the space (obj_1, obj_2), ignoring query filters
     response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?root=0').content)
     assert len(response['results']) == 2
 
+    # django_tree bypasses ORM - best to retrieve all changed objects
     with scopes_disabled():
         obj_2.move(parent, node_location)
+        obj_2 = Food.objects.get(id=obj_2.id)
+        parent = Food.objects.get(id=parent.id)
     # should return direct children of parent (obj_tree_1, obj_2), ignoring query filters
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?root={parent.id}').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?root={parent.id}').content)
     assert response['count'] == 2
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?root={parent.id}&query={obj_2.name[4:]}').content)
+    response = json.loads(u1_s1.get(
+        f'{reverse(LIST_URL)}?root={parent.id}&query={obj_2.name[4:]}').content)
     assert response['count'] == 2
 
 
 def test_tree_filter(obj_tree_1, obj_2, obj_3, u1_s1):
     with scope(space=obj_tree_1.space):
+        # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj
+        obj_tree_1 = Food.objects.get(id=obj_tree_1.id)
         parent = obj_tree_1.get_parent()
-        child = obj_tree_1.get_descendants()[0]
         obj_2.move(parent, node_location)
+        obj_2 = Food.objects.get(id=obj_2.id)
+        parent = Food.objects.get(id=parent.id)
+
     # should return full tree starting at parent (obj_tree_1, obj_2), ignoring query filters
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}').content)
+    response = json.loads(
+        u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}').content)
     assert response['count'] == 4
-    response = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?tree={parent.id}&query={obj_2.name[4:]}').content)
+    response = json.loads(u1_s1.get(
+        f'{reverse(LIST_URL)}?tree={parent.id}&query={obj_2.name[4:]}').content)
     assert response['count'] == 4
 
 
 # This is more about the model than the API - should this be moved to a different test?
 @pytest.mark.parametrize("obj_tree_1, field, inherit, new_val", [
-    ({'has_category': True, 'inherit': True},  'supermarket_category', True, 'cat_1'),
-    ({'has_category': True, 'inherit': False}, 'supermarket_category', False, 'cat_1'),
+    ({'has_category': True, 'inherit': True},
+     'supermarket_category', True, 'cat_1'),
+    ({'has_category': True, 'inherit': False},
+     'supermarket_category', False, 'cat_1'),
     ({'ignore_shopping': True, 'inherit': True}, 'ignore_shopping', True, 'false'),
-    ({'ignore_shopping': True, 'inherit': False}, 'ignore_shopping', False, 'false'),
-    ({'substitute_children': True, 'inherit': True}, 'substitute_children',  True, 'false'),
-    ({'substitute_children': True, 'inherit': False}, 'substitute_children', False, 'false'),
-    ({'substitute_siblings': True, 'inherit': True}, 'substitute_siblings',  True, 'false'),
-    ({'substitute_siblings': True, 'inherit': False}, 'substitute_siblings', False, 'false'),
+    ({'ignore_shopping': True, 'inherit': False},
+     'ignore_shopping', False, 'false'),
+    ({'substitute_children': True, 'inherit': True},
+     'substitute_children', True, 'false'),
+    ({'substitute_children': True, 'inherit': False},
+     'substitute_children', False, 'false'),
+    ({'substitute_siblings': True, 'inherit': True},
+     'substitute_siblings', True, 'false'),
+    ({'substitute_siblings': True, 'inherit': False},
+     'substitute_siblings', False, 'false'),
 ], indirect=['obj_tree_1'])  # indirect=True populates magic variable request.param of obj_tree_1 with the parameter
 def test_inherit(request, obj_tree_1, field, inherit, new_val, u1_s1):
     with scope(space=obj_tree_1.space):
@@ -498,8 +539,10 @@ def test_inherit(request, obj_tree_1, field, inherit, new_val, u1_s1):
     new_val = request.getfixturevalue(new_val)
     # if this test passes it demonstrates that inheritance works
     #  when moving to a parent as each food is created with a different category
-    assert (getattr(parent, field) == getattr(obj_tree_1, field)) in [inherit, True]
-    assert (getattr(obj_tree_1, field) == getattr(child, field)) in [inherit, True]
+    assert (getattr(parent, field) == getattr(
+        obj_tree_1, field)) in [inherit, True]
+    assert (getattr(obj_tree_1, field) == getattr(
+        child, field)) in [inherit, True]
     # change parent to a new value
     setattr(parent, field, new_val)
     with scope(space=parent.space):
@@ -515,7 +558,8 @@ def test_inherit(request, obj_tree_1, field, inherit, new_val, u1_s1):
 
 
 @pytest.mark.parametrize("obj_tree_1", [
-    ({'has_category': True, 'inherit': False, 'ignore_shopping': True, 'substitute_children': True, 'substitute_siblings': True}),
+    ({'has_category': True, 'inherit': False, 'ignore_shopping': True,
+     'substitute_children': True, 'substitute_siblings': True}),
 ], indirect=['obj_tree_1'])
 @pytest.mark.parametrize("global_reset", [True, False])
 @pytest.mark.parametrize("field", ['ignore_shopping', 'substitute_children', 'substitute_siblings', 'supermarket_category'])
@@ -534,10 +578,13 @@ def test_reset_inherit_space_fields(obj_tree_1, space_1, global_reset, field):
             assert getattr(parent, field) != getattr(obj_tree_1, field)
 
         if global_reset:
-            space_1.food_inherit.add(*Food.inheritable_fields.values_list('id', flat=True))  # set default inherit fields
+            # set default inherit fields
+            space_1.food_inherit.add(
+                *Food.inheritable_fields.values_list('id', flat=True))
             parent.reset_inheritance(space=space_1)
         else:
-            obj_tree_1.child_inherit_fields.set(Food.inheritable_fields.values_list('id', flat=True))
+            obj_tree_1.child_inherit_fields.set(
+                Food.inheritable_fields.values_list('id', flat=True))
             obj_tree_1.save()
             parent.reset_inheritance(space=space_1, food=obj_tree_1)
         # djangotree bypasses ORM and need to be retrieved again
@@ -545,12 +592,14 @@ def test_reset_inherit_space_fields(obj_tree_1, space_1, global_reset, field):
         parent = Food.objects.get(id=parent.id)
         child = Food.objects.get(id=child.id)
 
-        assert (getattr(parent, field) == getattr(obj_tree_1, field)) == global_reset
+        assert (getattr(parent, field) == getattr(
+            obj_tree_1, field)) == global_reset
         assert getattr(obj_tree_1, field) == getattr(child, field)
 
 
 @pytest.mark.parametrize("obj_tree_1", [
-    ({'has_category': True, 'inherit': False, 'ignore_shopping': True, 'substitute_children': True, 'substitute_siblings': True}),
+    ({'has_category': True, 'inherit': False, 'ignore_shopping': True,
+     'substitute_children': True, 'substitute_siblings': True}),
 ], indirect=['obj_tree_1'])
 @pytest.mark.parametrize("field", ['ignore_shopping', 'substitute_children', 'substitute_siblings', 'supermarket_category'])
 def test_reset_inherit_no_food_instances(obj_tree_1, space_1, field):
@@ -558,13 +607,17 @@ def test_reset_inherit_no_food_instances(obj_tree_1, space_1, field):
         parent = obj_tree_1.get_parent()
         Food.objects.all().delete()
 
-        space_1.food_inherit.add(*Food.inheritable_fields.values_list('id', flat=True))  # set default inherit fields
+        # set default inherit fields
+        space_1.food_inherit.add(
+            *Food.inheritable_fields.values_list('id', flat=True))
         parent.reset_inheritance(space=space_1)
 
 
 def test_onhand(obj_1, u1_s1, u2_s1):
-    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] == False
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] == False
+    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
+        'food_onhand'] == False
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
+        'food_onhand'] == False
 
     u1_s1.patch(
         reverse(
@@ -574,10 +627,13 @@ def test_onhand(obj_1, u1_s1, u2_s1):
         {'food_onhand': True},
         content_type='application/json'
     )
-    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] == True
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] == False
+    assert json.loads(u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
+        'food_onhand'] == True
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
+        'food_onhand'] == False
 
     user1 = auth.get_user(u1_s1)
     user2 = auth.get_user(u2_s1)
     user1.userpreference.shopping_share.add(user2)
-    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)['food_onhand'] == True
+    assert json.loads(u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).content)[
+        'food_onhand'] == True

cookbook/tests/api/test_api_shopping_recipe.py

@@ -1,20 +1,14 @@
 import json
-from datetime import timedelta
 
-import factory
 import pytest
 # work around for bug described here https://stackoverflow.com/a/70312265/15762829
 from django.conf import settings
 from django.contrib import auth
-from django.forms import model_to_dict
 from django.urls import reverse
-from django.utils import timezone
-from django_scopes import scope, scopes_disabled
-from pytest_factoryboy import LazyFixture, register
+from django_scopes import scopes_disabled
 
-from cookbook.models import Food, Ingredient, ShoppingListEntry, Step
-from cookbook.tests.factories import (IngredientFactory, MealPlanFactory, RecipeFactory,
-                                      StepFactory, UserFactory)
+from cookbook.models import Food, Ingredient
+from cookbook.tests.factories import MealPlanFactory, RecipeFactory, StepFactory, UserFactory
 
 if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
                                                'django.db.backends.postgresql']:
@@ -32,9 +26,12 @@ def user2(request, u1_s1):
     except AttributeError:
         params = {}
     user = auth.get_user(u1_s1)
-    user.userpreference.mealplan_autoadd_shopping = params.get('mealplan_autoadd_shopping', True)
-    user.userpreference.mealplan_autoinclude_related = params.get('mealplan_autoinclude_related', True)
-    user.userpreference.mealplan_autoexclude_onhand = params.get('mealplan_autoexclude_onhand', True)
+    user.userpreference.mealplan_autoadd_shopping = params.get(
+        'mealplan_autoadd_shopping', True)
+    user.userpreference.mealplan_autoinclude_related = params.get(
+        'mealplan_autoinclude_related', True)
+    user.userpreference.mealplan_autoexclude_onhand = params.get(
+        'mealplan_autoexclude_onhand', True)
     user.userpreference.save()
     return u1_s1
 
@@ -50,7 +47,6 @@ def recipe(request, space_1, u1_s1):
     return RecipeFactory(**params)
 
 
-
 @pytest.mark.parametrize("arg", [
     ['g1_s1', 204],
     ['u1_s1', 204],
@@ -59,9 +55,12 @@ def recipe(request, space_1, u1_s1):
 ])
 @pytest.mark.parametrize("recipe, sle_count", [
     ({}, 10),
-    ({'steps__recipe_count': 1}, 20),  # shopping list from recipe with StepRecipe
-    ({'steps__food_recipe_count': {'step': 0, 'count': 1}}, 19),  # shopping list from recipe with food recipe
-    ({'steps__food_recipe_count': {'step': 0, 'count': 1}, 'steps__recipe_count': 1}, 29),  # shopping list from recipe with StepRecipe and food recipe
+    # shopping list from recipe with StepRecipe
+    ({'steps__recipe_count': 1}, 20),
+    # shopping list from recipe with food recipe
+    ({'steps__food_recipe_count': {'step': 0, 'count': 1}}, 19),
+    # shopping list from recipe with StepRecipe and food recipe
+    ({'steps__food_recipe_count': {'step': 0, 'count': 1}, 'steps__recipe_count': 1}, 29),
 ], indirect=['recipe'])
 def test_shopping_recipe_method(request, arg, recipe, sle_count, u1_s1, u2_s1):
     c = request.getfixturevalue(arg[0])
@@ -78,16 +77,20 @@ def test_shopping_recipe_method(request, arg, recipe, sle_count,  u1_s1, u2_s1):
     if r.status_code == 204:  # skip anonymous user
 
         r = json.loads(c.get(reverse(SHOPPING_LIST_URL)).content)
-        assert len(r) == sle_count  # recipe factory creates 10 ingredients by default
+        # recipe factory creates 10 ingredients by default
+        assert len(r) == sle_count
         assert [x['created_by']['id'] for x in r].count(user.id) == sle_count
         # user in space can't see shopping list
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
         user.userpreference.shopping_share.add(auth.get_user(u2_s1))
         # after share, user in space can see shopping list
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
         # confirm that the author of the recipe doesn't have access to shopping list
         if c != u1_s1:
-            assert len(json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
+            assert len(json.loads(
+                u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
 
         r = c.get(url)
         assert r.status_code == 405
@@ -99,9 +102,12 @@ def test_shopping_recipe_method(request, arg, recipe, sle_count,  u1_s1, u2_s1):
 
 @pytest.mark.parametrize("recipe, sle_count", [
     ({}, 10),
-    ({'steps__recipe_count': 1}, 20),  # shopping list from recipe with StepRecipe
-    ({'steps__food_recipe_count': {'step': 0, 'count': 1}}, 19),  # shopping list from recipe with food recipe
-    ({'steps__food_recipe_count': {'step': 0, 'count': 1}, 'steps__recipe_count': 1}, 29),  # shopping list from recipe with StepRecipe and food recipe
+    # shopping list from recipe with StepRecipe
+    ({'steps__recipe_count': 1}, 20),
+    # shopping list from recipe with food recipe
+    ({'steps__food_recipe_count': {'step': 0, 'count': 1}}, 19),
+    # shopping list from recipe with StepRecipe and food recipe
+    ({'steps__food_recipe_count': {'step': 0, 'count': 1}, 'steps__recipe_count': 1}, 29),
 ], indirect=['recipe'])
 @pytest.mark.parametrize("use_mealplan", [(False), (True), ])
 def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u2_s1):
@@ -115,31 +121,33 @@ def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u
         user.userpreference.save()
 
         if use_mealplan:
-            mealplan = MealPlanFactory(space=recipe.space, created_by=user, servings=recipe.servings, recipe=recipe)
+            mealplan = MealPlanFactory(
+                space=recipe.space, created_by=user, servings=recipe.servings, recipe=recipe)
         else:
             u1_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}))
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert [x['created_by']['id'] for x in r].count(user.id) == sle_count
         all_ing = [x['ingredient'] for x in r]
         keep_ing = all_ing[1:-1]  # remove first and last element
-        del keep_ing[int(len(keep_ing)/2)]  # remove a middle element
+        del keep_ing[int(len(keep_ing) / 2)]  # remove a middle element
         list_recipe = r[0]['list_recipe']
         amount_sum = sum([x['amount'] for x in r])
 
         # test modifying shopping list as different user
         # test increasing servings size of recipe shopping list
         if use_mealplan:
-            mealplan.servings = 2*recipe.servings
+            mealplan.servings = 2 * recipe.servings
             mealplan.save()
         else:
             u2_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}),
-                      {'list_recipe': list_recipe, 'servings': 2*recipe.servings},
+                      {'list_recipe': list_recipe, 'servings': 2 * recipe.servings},
                       content_type='application/json'
                       )
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert sum([x['amount'] for x in r]) == amount_sum * 2
         assert len(r) == sle_count
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
 
         # testing decreasing servings size of recipe shopping list
         if use_mealplan:
@@ -153,7 +161,8 @@ def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert sum([x['amount'] for x in r]) == amount_sum * .5
         assert len(r) == sle_count
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
 
         # test removing 3 items from shopping list
         u2_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}),
@@ -162,7 +171,8 @@ def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u
                   )
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert len(r) == sle_count - 3
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count - 3
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count - 3
 
         # add all ingredients to existing shopping list - don't change serving size
         u2_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}),
@@ -172,14 +182,16 @@ def test_shopping_recipe_edit(request, recipe, sle_count, use_mealplan, u1_s1, u
         r = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
         assert sum([x['amount'] for x in r]) == amount_sum * .5
         assert len(r) == sle_count
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count
 
 
 @pytest.mark.parametrize("user2, sle_count", [
     ({'mealplan_autoadd_shopping': False}, (0, 18)),
     ({'mealplan_autoinclude_related': False}, (9, 9)),
     ({'mealplan_autoexclude_onhand': False}, (20, 20)),
-    ({'mealplan_autoexclude_onhand': False, 'mealplan_autoinclude_related': False}, (10, 10)),
+    ({'mealplan_autoexclude_onhand': False,
+     'mealplan_autoinclude_related': False}, (10, 10)),
 ], indirect=['user2'])
 @pytest.mark.parametrize("use_mealplan", [(False), (True), ])
 @pytest.mark.parametrize("recipe", [({'steps__recipe_count': 1})], indirect=['recipe'])
@@ -191,20 +203,24 @@ def test_shopping_recipe_userpreference(recipe, sle_count, use_mealplan, user2):
         food = Food.objects.get(id=ingredients[2].food.id)
         food.onhand_users.add(user)
         food.save()
-        food = recipe.steps.exclude(step_recipe=None).first().step_recipe.steps.first().ingredients.first().food
+        food = recipe.steps.exclude(step_recipe=None).first(
+        ).step_recipe.steps.first().ingredients.first().food
         food = Food.objects.get(id=food.id)
         food.onhand_users.add(user)
         food.save()
 
         if use_mealplan:
-            mealplan = MealPlanFactory(space=recipe.space, created_by=user, servings=recipe.servings, recipe=recipe)
-            assert len(json.loads(user2.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count[0]
+            MealPlanFactory(
+                space=recipe.space, created_by=user, servings=recipe.servings, recipe=recipe)
+            assert len(json.loads(
+                user2.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count[0]
         else:
             user2.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}))
-            assert len(json.loads(user2.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count[1]
+            assert len(json.loads(
+                user2.get(reverse(SHOPPING_LIST_URL)).content)) == sle_count[1]
 
 
-def test_shopping_recipe_mixed_authors(u1_s1, u2_s1,space_1):
+def test_shopping_recipe_mixed_authors(u1_s1, u2_s1, space_1):
     with scopes_disabled():
         user1 = auth.get_user(u1_s1)
         user2 = auth.get_user(u2_s1)
@@ -213,15 +229,19 @@ def test_shopping_recipe_mixed_authors(u1_s1, u2_s1,space_1):
         recipe1 = RecipeFactory(created_by=user1, space=space)
         recipe2 = RecipeFactory(created_by=user2, space=space)
         recipe3 = RecipeFactory(created_by=user3, space=space)
-        food = Food.objects.get(id=recipe1.steps.first().ingredients.first().food.id)
+        food = Food.objects.get(
+            id=recipe1.steps.first().ingredients.first().food.id)
         food.recipe = recipe2
         food.save()
-        recipe1.steps.add(StepFactory(step_recipe=recipe3, ingredients__count=0,  space=space))
+        recipe1.steps.add(StepFactory(step_recipe=recipe3,
+                          ingredients__count=0, space=space))
         recipe1.save()
 
         u1_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe1.id}))
-        assert len(json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 29
-        assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
+        assert len(json.loads(
+            u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 29
+        assert len(json.loads(
+            u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 0
 
 
 @pytest.mark.parametrize("recipe", [{'steps__ingredients__header': 1}], indirect=['recipe'])
@@ -230,4 +250,5 @@ def test_shopping_with_header_ingredient(u1_s1, recipe):
     #     recipe.step_set.first().ingredient_set.add(IngredientFactory(ingredients__header=1))
     u1_s1.put(reverse(SHOPPING_RECIPE_URL, args={recipe.id}))
     assert len(json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 10
-    assert len(json.loads(u1_s1.get(reverse('api:ingredient-list')).content)['results']) == 11
+    assert len(json.loads(
+        u1_s1.get(reverse('api:ingredient-list')).content)['results']) == 11

cookbook/tests/conftest.py

@@ -5,12 +5,11 @@ import uuid
 
 import pytest
 from django.contrib import auth
-from django.contrib.auth.models import Group, User
 from django_scopes import scopes_disabled
-from pytest_factoryboy import LazyFixture, register
+from pytest_factoryboy import register
 
-from cookbook.models import Food, Ingredient, Recipe, Space, Step, Unit
-from cookbook.tests.factories import FoodFactory, SpaceFactory, UserFactory
+from cookbook.models import Food, Ingredient, Recipe, Step, Unit
+from cookbook.tests.factories import SpaceFactory, UserFactory
 
 register(SpaceFactory, 'space_1')
 register(SpaceFactory, 'space_2')
@@ -60,8 +59,10 @@ def get_random_recipe(space_1, u1_s1):
         internal=True,
     )
 
-    s1 = Step.objects.create(name=str(uuid.uuid4()), instruction=str(uuid.uuid4()), space=space_1, )
-    s2 = Step.objects.create(name=str(uuid.uuid4()), instruction=str(uuid.uuid4()), space=space_1, )
+    s1 = Step.objects.create(name=str(uuid.uuid4()),
+                             instruction=str(uuid.uuid4()), space=space_1, )
+    s2 = Step.objects.create(name=str(uuid.uuid4()),
+                             instruction=str(uuid.uuid4()), space=space_1, )
 
     r.steps.add(s1)
     r.steps.add(s2)
@@ -70,8 +71,10 @@ def get_random_recipe(space_1, u1_s1):
         s1.ingredients.add(
             Ingredient.objects.create(
                 amount=1,
-                food=Food.objects.get_or_create(name=str(uuid.uuid4()), space=space_1)[0],
-                unit=Unit.objects.create(name=str(uuid.uuid4()), space=space_1, ),
+                food=Food.objects.get_or_create(
+                    name=str(uuid.uuid4()), space=space_1)[0],
+                unit=Unit.objects.create(
+                    name=str(uuid.uuid4()), space=space_1, ),
                 note=str(uuid.uuid4()),
                 space=space_1,
             )
@@ -80,8 +83,10 @@ def get_random_recipe(space_1, u1_s1):
         s2.ingredients.add(
             Ingredient.objects.create(
                 amount=1,
-                food=Food.objects.get_or_create(name=str(uuid.uuid4()), space=space_1)[0],
-                unit=Unit.objects.create(name=str(uuid.uuid4()), space=space_1, ),
+                food=Food.objects.get_or_create(
+                    name=str(uuid.uuid4()), space=space_1)[0],
+                unit=Unit.objects.create(
+                    name=str(uuid.uuid4()), space=space_1, ),
                 note=str(uuid.uuid4()),
                 space=space_1,
             )
@@ -99,8 +104,10 @@ def get_random_json_recipe():
             {
                 "instruction": str(uuid.uuid4()),
                 "ingredients": [
-                    {"food": {"name": str(uuid.uuid4())}, "unit": {"name": str(uuid.uuid4())}, "amount": random.randint(0, 10)},
-                    {"food": {"name": str(uuid.uuid4())}, "unit": {"name": str(uuid.uuid4())}, "amount": random.randint(0, 10)},
+                    {"food": {"name": str(uuid.uuid4())}, "unit": {"name": str(
+                        uuid.uuid4())}, "amount": random.randint(0, 10)},
+                    {"food": {"name": str(uuid.uuid4())}, "unit": {"name": str(
+                        uuid.uuid4())}, "amount": random.randint(0, 10)},
                 ],
             }
         ],
@@ -133,7 +140,8 @@ def validate_recipe(expected, recipe):
     for key in expected_lists:
         for k in expected_lists[key]:
             try:
-                print('comparing ', any([dict_compare(k, i) for i in target_lists[key]]))
+                print('comparing ', any([dict_compare(k, i)
+                      for i in target_lists[key]]))
                 assert any([dict_compare(k, i) for i in target_lists[key]])
             except AssertionError:
                 for result in [dict_compare(k, i, details=True) for i in target_lists[key]]:
@@ -152,7 +160,8 @@ def dict_compare(d1, d2, details=False):
     added = d1_keys - d2_keys
     removed = d2_keys - d1_keys
     modified = {o: (d1[o], d2[o]) for o in not_dicts if d1[o] != d2[o]}
-    modified_dicts = {o: (d1[o], d2[o]) for o in sub_dicts if not d1[o].items() <= d2[o].items()}
+    modified_dicts = {o: (d1[o], d2[o])
+                      for o in sub_dicts if not d1[o].items() <= d2[o].items()}
     if details:
         return added, removed, modified, modified_dicts
     else:
@@ -173,12 +182,12 @@ def transpose(text, number=2):
         positions = random.sample(range(len(tokens[token_pos])), number)
 
         # swap the positions
-        l = list(tokens[token_pos])
+        lt = list(tokens[token_pos])
         for first, second in zip(positions[::2], positions[1::2]):
-            l[first], l[second] = l[second], l[first]
+            lt[first], lt[second] = lt[second], lt[first]
 
         # replace original tokens with swapped
-        tokens[token_pos] = ''.join(l)
+        tokens[token_pos] = ''.join(lt)
 
     # return text with the swapped token
     return ' '.join(tokens)

cookbook/tests/factories/__init__.py

@@ -4,13 +4,12 @@ from decimal import Decimal
 
 import factory
 import pytest
-from django.contrib import auth
 from django.contrib.auth.models import Group, User
 from django_scopes import scopes_disabled
 from faker import Factory as FakerFactory
 from pytest_factoryboy import register
 
-from cookbook.models import Recipe, Step, UserSpace
+from cookbook.models import UserSpace
 
 # this code will run immediately prior to creating the model object useful when you want a reverse relationship
 # log = factory.RelatedFactory(
@@ -53,7 +52,8 @@ class SpaceFactory(factory.django.DjangoModelFactory):
 class UserFactory(factory.django.DjangoModelFactory):
 
     """User factory."""
-    username = factory.LazyAttribute(lambda x: faker.simple_profile()['username'])
+    username = factory.LazyAttribute(
+        lambda x: faker.simple_profile()['username'])
     first_name = factory.LazyAttribute(lambda x: faker.first_name())
     last_name = factory.LazyAttribute(lambda x: faker.last_name())
     email = factory.LazyAttribute(lambda x: faker.email())
@@ -65,7 +65,8 @@ class UserFactory(factory.django.DjangoModelFactory):
             return
 
         if extracted:
-            us = UserSpace.objects.create(space=self.space, user=self, active=True)
+            us = UserSpace.objects.create(
+                space=self.space, user=self, active=True)
             us.groups.add(Group.objects.get(name=extracted))
 
     @factory.post_generation
@@ -75,10 +76,12 @@ class UserFactory(factory.django.DjangoModelFactory):
 
         if extracted:
             for prefs in extracted:
-                self.userpreference[prefs] = extracted[prefs]/0   # intentionally break so it can be debugged later
+                # intentionally break so it can be debugged later
+                self.userpreference[prefs] = extracted[prefs] / 0
 
     class Meta:
         model = User
+        django_get_or_create = ('username', 'space',)
 
 
 @register
@@ -97,19 +100,23 @@ class SupermarketCategoryFactory(factory.django.DjangoModelFactory):
 @register
 class FoodFactory(factory.django.DjangoModelFactory):
     """Food factory."""
-    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
-    plural_name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
+    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10)[:128])
+    plural_name = factory.LazyAttribute(
+        lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     supermarket_category = factory.Maybe(
         factory.LazyAttribute(lambda x: x.has_category),
-        yes_declaration=factory.SubFactory(SupermarketCategoryFactory, space=factory.SelfAttribute('..space')),
+        yes_declaration=factory.SubFactory(
+            SupermarketCategoryFactory, space=factory.SelfAttribute('..space')),
         no_declaration=None
     )
     recipe = factory.Maybe(
         factory.LazyAttribute(lambda x: x.has_recipe),
-        yes_declaration=factory.SubFactory('cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
+        yes_declaration=factory.SubFactory(
+            'cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
         no_declaration=None
     )
+    path = factory.LazyAttribute(lambda x: faker.numerify(text='%###'))
     space = factory.SubFactory(SpaceFactory)
 
     @factory.post_generation
@@ -127,17 +134,19 @@ class FoodFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = 'cookbook.Food'
-        django_get_or_create = ('name', 'plural_name', 'space',)
+        django_get_or_create = ('name', 'plural_name', 'path', 'space',)
 
 
 @register
 class RecipeBookFactory(factory.django.DjangoModelFactory):
     """RecipeBook factory."""
-    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
+    name = factory.LazyAttribute(lambda x: faker.sentence(
+        nb_words=3, variable_nb_words=False))
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     icon = None
     # shared = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
     filter = None
     space = factory.SubFactory(SpaceFactory)
 
@@ -149,7 +158,8 @@ class RecipeBookFactory(factory.django.DjangoModelFactory):
 @register
 class RecipeBookEntryFactory(factory.django.DjangoModelFactory):
     """RecipeBookEntry factory."""
-    book = factory.SubFactory(RecipeBookFactory, space=factory.SelfAttribute('..recipe.space'))
+    book = factory.SubFactory(
+        RecipeBookFactory, space=factory.SelfAttribute('..recipe.space'))
     recipe = None
 
     class Meta:
@@ -160,7 +170,7 @@ class RecipeBookEntryFactory(factory.django.DjangoModelFactory):
 @register
 class UnitFactory(factory.django.DjangoModelFactory):
     """Unit factory."""
-    name = factory.LazyAttribute(lambda x: faker.word())
+    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10)[:128])
     plural_name = factory.LazyAttribute(lambda x: faker.word())
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     space = factory.SubFactory(SpaceFactory)
@@ -173,7 +183,8 @@ class UnitFactory(factory.django.DjangoModelFactory):
 @register
 class KeywordFactory(factory.django.DjangoModelFactory):
     """Keyword factory."""
-    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=2, variable_nb_words=False))
+    name = factory.LazyAttribute(lambda x: faker.sentence(
+        nb_words=2, variable_nb_words=False))
     # icon = models.CharField(max_length=16, blank=True, null=True)
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     space = factory.SubFactory(SpaceFactory)
@@ -184,15 +195,17 @@ class KeywordFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = 'cookbook.Keyword'
-        django_get_or_create = ('name', 'space',)
+        django_get_or_create = ('name', 'space')
         exclude = ('num')
 
 
 @register
 class IngredientFactory(factory.django.DjangoModelFactory):
     """Ingredient factory."""
-    food = factory.SubFactory(FoodFactory, space=factory.SelfAttribute('..space'))
-    unit = factory.SubFactory(UnitFactory, space=factory.SelfAttribute('..space'))
+    food = factory.SubFactory(
+        FoodFactory, space=factory.SelfAttribute('..space'))
+    unit = factory.SubFactory(
+        UnitFactory, space=factory.SelfAttribute('..space'))
     amount = factory.LazyAttribute(lambda x: faker.random_int(min=1, max=10))
     note = factory.LazyAttribute(lambda x: faker.sentence(nb_words=8))
     is_header = False
@@ -210,7 +223,8 @@ class MealTypeFactory(factory.django.DjangoModelFactory):
     # icon =
     color = factory.LazyAttribute(lambda x: faker.safe_hex_color())
     default = False
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
     space = factory.SubFactory(SpaceFactory)
 
     class Meta:
@@ -221,13 +235,17 @@ class MealTypeFactory(factory.django.DjangoModelFactory):
 class MealPlanFactory(factory.django.DjangoModelFactory):
     recipe = factory.Maybe(
         factory.LazyAttribute(lambda x: x.has_recipe),
-        yes_declaration=factory.SubFactory('cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
+        yes_declaration=factory.SubFactory(
+            'cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
         no_declaration=None
     )
-    servings = factory.LazyAttribute(lambda x: Decimal(faker.random_int(min=1, max=1000)/100))
+    servings = factory.LazyAttribute(
+        lambda x: Decimal(faker.random_int(min=1, max=1000) / 100))
     title = factory.LazyAttribute(lambda x: faker.sentence(nb_words=5))
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
-    meal_type = factory.SubFactory(MealTypeFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
+    meal_type = factory.SubFactory(
+        MealTypeFactory, space=factory.SelfAttribute('..space'))
     note = factory.LazyAttribute(lambda x: faker.paragraph())
     date = factory.LazyAttribute(lambda x: faker.future_date())
     space = factory.SubFactory(SpaceFactory)
@@ -244,11 +262,13 @@ class ShoppingListRecipeFactory(factory.django.DjangoModelFactory):
     name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=5))
     recipe = factory.Maybe(
         factory.LazyAttribute(lambda x: x.has_recipe),
-        yes_declaration=factory.SubFactory('cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
+        yes_declaration=factory.SubFactory(
+            'cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')),
         no_declaration=None
     )
     servings = factory.LazyAttribute(lambda x: faker.random_int(min=1, max=10))
-    mealplan = factory.SubFactory(MealPlanFactory, space=factory.SelfAttribute('..space'))
+    mealplan = factory.SubFactory(
+        MealPlanFactory, space=factory.SelfAttribute('..space'))
     space = factory.SubFactory(SpaceFactory)
 
     class Params:
@@ -264,25 +284,32 @@ class ShoppingListEntryFactory(factory.django.DjangoModelFactory):
 
     list_recipe = factory.Maybe(
         factory.LazyAttribute(lambda x: x.has_mealplan),
-        yes_declaration=factory.SubFactory(ShoppingListRecipeFactory, space=factory.SelfAttribute('..space')),
+        yes_declaration=factory.SubFactory(
+            ShoppingListRecipeFactory, space=factory.SelfAttribute('..space')),
         no_declaration=None
     )
-    food = factory.SubFactory(FoodFactory, space=factory.SelfAttribute('..space'))
-    unit = factory.SubFactory(UnitFactory, space=factory.SelfAttribute('..space'))
+    food = factory.SubFactory(
+        FoodFactory, space=factory.SelfAttribute('..space'))
+    unit = factory.SubFactory(
+        UnitFactory, space=factory.SelfAttribute('..space'))
     # # ingredient = factory.SubFactory(IngredientFactory)
-    amount = factory.LazyAttribute(lambda x: Decimal(faker.random_int(min=1, max=100))/10)
+    amount = factory.LazyAttribute(
+        lambda x: Decimal(faker.random_int(min=1, max=100)) / 10)
     order = factory.Sequence(int)
     checked = False
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
     created_at = factory.LazyAttribute(lambda x: faker.past_date())
     completed_at = None
     delay_until = None
     space = factory.SubFactory(SpaceFactory)
 
     @classmethod
-    def _create(cls, target_class, *args, **kwargs):  # override create to prevent auto_add_now from changing the created_at date
+    # override create to prevent auto_add_now from changing the created_at date
+    def _create(cls, target_class, *args, **kwargs):
         created_at = kwargs.pop('created_at', None)
-        obj = super(ShoppingListEntryFactory, cls)._create(target_class, *args, **kwargs)
+        obj = super(ShoppingListEntryFactory, cls)._create(
+            target_class, *args, **kwargs)
         if created_at is not None:
             obj.created_at = created_at
             obj.save()
@@ -298,7 +325,8 @@ class ShoppingListEntryFactory(factory.django.DjangoModelFactory):
 @register
 class StepFactory(factory.django.DjangoModelFactory):
     name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=5))
-    instruction = factory.LazyAttribute(lambda x: ''.join(faker.paragraphs(nb=5)))
+    instruction = factory.LazyAttribute(
+        lambda x: ''.join(faker.paragraphs(nb=5)))
     # TODO add optional recipe food, make dependent on recipe, make number of recipes a Params
     ingredients__count = 10  # default number of ingredients to add
     ingredients__header = 0
@@ -330,14 +358,16 @@ class StepFactory(factory.django.DjangoModelFactory):
             for i in range(num_ing):
                 if num_food_recipe > 0:
                     has_recipe = True
-                    num_food_recipe = num_food_recipe-1
+                    num_food_recipe = num_food_recipe - 1
                 else:
                     has_recipe = False
-                self.ingredients.add(IngredientFactory(space=self.space, food__has_recipe=has_recipe))
+                self.ingredients.add(IngredientFactory(
+                    space=self.space, food__has_recipe=has_recipe))
         num_header = kwargs.get('header', 0)
         if num_header > 0:
             for i in range(num_header):
-                self.ingredients.add(IngredientFactory(food=None, unit=None, amount=0, is_header=True, space=self.space))
+                self.ingredients.add(IngredientFactory(
+                    food=None, unit=None, amount=0, is_header=True, space=self.space))
         elif extracted:
             for ing in extracted:
                 self.ingredients.add(ing)
@@ -351,20 +381,27 @@ class RecipeFactory(factory.django.DjangoModelFactory):
     name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=7))
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     servings = factory.LazyAttribute(lambda x: faker.random_int(min=1, max=20))
-    servings_text = factory.LazyAttribute(lambda x: faker.sentence(nb_words=1))  # TODO generate list of expected servings text that can be iterated through
+    # TODO generate list of expected servings text that can be iterated through
+    servings_text = factory.LazyAttribute(lambda x: faker.sentence(nb_words=1))
     keywords__count = 5  # default number of keywords to generate
     steps__count = 1  # default number of steps to create
     steps__recipe_count = 0  # default number of step recipes to create
-    steps__food_recipe_count = {}  # by default, don't create food recipes, to override {'steps__food_recipe_count': {'step': 0, 'count': 1}}
-    working_time = factory.LazyAttribute(lambda x: faker.random_int(min=0, max=360))
-    waiting_time = factory.LazyAttribute(lambda x: faker.random_int(min=0, max=360))
+    # by default, don't create food recipes, to override {'steps__food_recipe_count': {'step': 0, 'count': 1}}
+    steps__food_recipe_count = {}
+    working_time = factory.LazyAttribute(
+        lambda x: faker.random_int(min=0, max=360))
+    waiting_time = factory.LazyAttribute(
+        lambda x: faker.random_int(min=0, max=360))
     internal = False
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
-    created_at = factory.LazyAttribute(lambda x: faker.date_between_dates(date_start=date(2000, 1, 1), date_end=date(2020, 12, 31)))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
+    created_at = factory.LazyAttribute(lambda x: faker.date_between_dates(
+        date_start=date(2000, 1, 1), date_end=date(2020, 12, 31)))
     space = factory.SubFactory(SpaceFactory)
 
     @classmethod
-    def _create(cls, target_class, *args, **kwargs):  # override create to prevent auto_add_now from changing the created_at date
+    # override create to prevent auto_add_now from changing the created_at date
+    def _create(cls, target_class, *args, **kwargs):
         created_at = kwargs.pop('created_at', None)
         # updated_at = kwargs.pop('updated_at', None)
         obj = super(RecipeFactory, cls)._create(target_class, *args, **kwargs)
@@ -401,11 +438,13 @@ class RecipeFactory(factory.django.DjangoModelFactory):
                 ing_recipe_count = 0
                 if food_recipe_count.get('step', None) == i:
                     ing_recipe_count = food_recipe_count.get('count', 0)
-                self.steps.add(StepFactory(space=self.space, ingredients__food_recipe_count=ing_recipe_count, ingredients__header=num_ing_headers))
-                num_ing_headers+-1
+                self.steps.add(StepFactory(
+                    space=self.space, ingredients__food_recipe_count=ing_recipe_count, ingredients__header=num_ing_headers))
+                num_ing_headers + - 1
         if num_recipe_steps > 0:
             for j in range(num_recipe_steps):
-                self.steps.add(StepFactory(space=self.space, step_recipe__has_recipe=True, ingredients__count=0))
+                self.steps.add(StepFactory(
+                    space=self.space, step_recipe__has_recipe=True, ingredients__count=0))
         if extracted and (num_steps + num_recipe_steps == 0):
             for step in extracted:
                 self.steps.add(step)
@@ -428,15 +467,18 @@ class RecipeFactory(factory.django.DjangoModelFactory):
 @register
 class CookLogFactory(factory.django.DjangoModelFactory):
     """CookLog factory."""
-    recipe = factory.SubFactory(RecipeFactory, space=factory.SelfAttribute('..space'))
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
+    recipe = factory.SubFactory(
+        RecipeFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
     created_at = factory.LazyAttribute(lambda x: faker.date_this_decade())
     rating = factory.LazyAttribute(lambda x: faker.random_int(min=1, max=5))
     servings = factory.LazyAttribute(lambda x: faker.random_int(min=1, max=32))
     space = factory.SubFactory(SpaceFactory)
 
     @classmethod
-    def _create(cls, target_class, *args, **kwargs):  # override create to prevent auto_add_now from changing the created_at date
+    # override create to prevent auto_add_now from changing the created_at date
+    def _create(cls, target_class, *args, **kwargs):
         created_at = kwargs.pop('created_at', None)
         obj = super(CookLogFactory, cls)._create(target_class, *args, **kwargs)
         if created_at is not None:
@@ -451,13 +493,17 @@ class CookLogFactory(factory.django.DjangoModelFactory):
 @register
 class ViewLogFactory(factory.django.DjangoModelFactory):
     """ViewLog factory."""
-    recipe = factory.SubFactory(RecipeFactory, space=factory.SelfAttribute('..space'))
-    created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
-    created_at = factory.LazyAttribute(lambda x: faker.past_datetime(start_date='-365d'))
+    recipe = factory.SubFactory(
+        RecipeFactory, space=factory.SelfAttribute('..space'))
+    created_by = factory.SubFactory(
+        UserFactory, space=factory.SelfAttribute('..space'))
+    created_at = factory.LazyAttribute(
+        lambda x: faker.past_datetime(start_date='-365d'))
     space = factory.SubFactory(SpaceFactory)
 
     @classmethod
-    def _create(cls, target_class, *args, **kwargs):  # override create to prevent auto_add_now from changing the created_at date
+    # override create to prevent auto_add_now from changing the created_at date
+    def _create(cls, target_class, *args, **kwargs):
         created_at = kwargs.pop('created_at', None)
         obj = super(ViewLogFactory, cls)._create(target_class, *args, **kwargs)
         if created_at is not None:

cookbook/tests/other/test_automations.py

@@ -0,0 +1,50 @@
+import pytest
+from django.contrib import auth
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.forms import ImportExportBase
+from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.models import ExportLog, Automation
+import json
+import os
+
+import pytest
+from django.urls import reverse
+
+from cookbook.tests.conftest import validate_recipe
+
+IMPORT_SOURCE_URL = 'api_recipe_from_source'
+
+
+# for some reason this tests cant run due to some kind of encoding issue, needs to be fixed
+# def test_description_replace_automation(u1_s1, space_1):
+#     if 'cookbook' in os.getcwd():
+#         test_file = os.path.join(os.getcwd(), 'other', 'test_data', 'chefkoch2.html')
+#     else:
+#         test_file = os.path.join(os.getcwd(), 'cookbook', 'tests', 'other', 'test_data', 'chefkoch2.html')
+#
+#     # original description
+#     # Brokkoli - Bratlinge. Über 91 Bewertungen und für vorzüglich befunden. Mit ► Portionsrechner ► Kochbuch ► Video-Tipps! Jetzt entdecken und ausprobieren!
+#
+#     with scopes_disabled():
+#         Automation.objects.create(
+#             name='test1',
+#             created_by=auth.get_user(u1_s1),
+#             space=space_1,
+#             param_1='.*',
+#             param_2='.*',
+#             param_3='',
+#             order=1000,
+#         )
+#
+#     with open(test_file, 'r', encoding='UTF-8') as d:
+#         response = u1_s1.post(
+#             reverse(IMPORT_SOURCE_URL),
+#             {
+#                 'data': d.read(),
+#                 'url': 'https://www.chefkoch.de/rezepte/804871184310070/Brokkoli-Bratlinge.html',
+#             },
+#             content_type='application/json')
+#         recipe = json.loads(response.content)['recipe_json']
+#         assert recipe['description'] == ''

cookbook/tests/other/test_ingredient_parser.py

@@ -75,6 +75,8 @@ def test_ingredient_parser():
     # an amount # and it starts with a lowercase letter, then that
     # is a unit ("etwas", "evtl.") does not apply to English tho
 
+    # TODO maybe add/improve support for weired stuff like this https://www.rainbownourishments.com/vegan-lemon-tart/#recipe
+
     ingredient_parser = IngredientParser(None, False, ignore_automations=True)
 
     count = 0

cookbook/tests/other/test_makenow_filter.py

@@ -11,6 +11,11 @@ from cookbook.tests.factories import FoodFactory, RecipeFactory
 # TODO returns recipes with all ingredients via child substitute
 # TODO returns recipes with all ingredients via sibling substitute
 
+if (Food.node_order_by):
+    node_location = 'sorted-child'
+else:
+    node_location = 'last-child'
+
 
 @pytest.fixture
 def recipes(space_1):
@@ -19,7 +24,8 @@ def recipes(space_1):
 
 @pytest.fixture
 def makenow_recipe(request, space_1):
-    onhand_user = auth.get_user(request.getfixturevalue(request.param.get('onhand_users', 'u1_s1')))
+    onhand_user = auth.get_user(request.getfixturevalue(
+        request.param.get('onhand_users', 'u1_s1')))
 
     recipe = RecipeFactory.create(space=space_1)
     for food in Food.objects.filter(ingredient__step__recipe=recipe.id):
@@ -55,13 +61,16 @@ def test_makenow_ignoreshopping(recipes, makenow_recipe, user1, space_1):
     request = type('', (object,), {'space': space_1, 'user': user1})()
     search = RecipeSearch(request, makenow='true')
     with scope(space=space_1):
-        food = Food.objects.filter(ingredient__step__recipe=makenow_recipe.id).first()
+        food = Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id).first()
         food.onhand_users.clear()
         assert search.get_queryset(Recipe.objects.all()).count() == 0
         food.ignore_shopping = True
         food.save()
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, ignore_shopping=True).count() == 1
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, ignore_shopping=True).count() == 1
         search = search.get_queryset(Recipe.objects.all())
         assert search.count() == 1
         assert search.first().id == makenow_recipe.id
@@ -74,13 +83,17 @@ def test_makenow_substitute(recipes, makenow_recipe, user1, space_1):
     request = type('', (object,), {'space': space_1, 'user': user1})()
     search = RecipeSearch(request, makenow='true')
     with scope(space=space_1):
-        food = Food.objects.filter(ingredient__step__recipe=makenow_recipe.id).first()
+        food = Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id).first()
         onhand_user = food.onhand_users.first()
         food.onhand_users.clear()
         assert search.get_queryset(Recipe.objects.all()).count() == 0
-        food.substitute.add(FoodFactory.create(space=space_1, onhand_users=[onhand_user]))
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, substitute__isnull=False).count() == 1
+        food.substitute.add(FoodFactory.create(
+            space=space_1, onhand_users=[onhand_user]))
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, substitute__isnull=False).count() == 1
 
         search = search.get_queryset(Recipe.objects.all())
         assert search.count() == 1
@@ -94,16 +107,20 @@ def test_makenow_child_substitute(recipes, makenow_recipe, user1, space_1):
     request = type('', (object,), {'space': space_1, 'user': user1})()
     search = RecipeSearch(request, makenow='true')
     with scope(space=space_1):
-        food = Food.objects.filter(ingredient__step__recipe=makenow_recipe.id).first()
+        food = Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id).first()
         onhand_user = food.onhand_users.first()
         food.onhand_users.clear()
         food.substitute_children = True
         food.save()
         assert search.get_queryset(Recipe.objects.all()).count() == 0
-        new_food = FoodFactory.create(space=space_1, onhand_users=[onhand_user])
-        new_food.move(food, 'first-child')
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, numchild__gt=0).count() == 1
+        new_food = FoodFactory.create(
+            space=space_1, onhand_users=[onhand_user])
+        new_food.move(food, node_location)
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, numchild__gt=0).count() == 1
         search = search.get_queryset(Recipe.objects.all())
         assert search.count() == 1
         assert search.first().id == makenow_recipe.id
@@ -116,18 +133,22 @@ def test_makenow_sibling_substitute(recipes, makenow_recipe, user1, space_1):
     request = type('', (object,), {'space': space_1, 'user': user1})()
     search = RecipeSearch(request, makenow='true')
     with scope(space=space_1):
-        food = Food.objects.filter(ingredient__step__recipe=makenow_recipe.id).first()
+        food = Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id).first()
         onhand_user = food.onhand_users.first()
         food.onhand_users.clear()
         food.substitute_siblings = True
         food.save()
         assert search.get_queryset(Recipe.objects.all()).count() == 0
         new_parent = FoodFactory.create(space=space_1)
-        new_sibling = FoodFactory.create(space=space_1, onhand_users=[onhand_user])
-        new_sibling.move(new_parent, 'first-child')
-        food.move(new_parent, 'first-child')
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
-        assert Food.objects.filter(ingredient__step__recipe=makenow_recipe.id, depth=2).count() == 1
+        new_sibling = FoodFactory.create(
+            space=space_1, onhand_users=[onhand_user])
+        new_sibling.move(new_parent, node_location)
+        food.move(new_parent, node_location)
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, onhand_users__isnull=False).count() == 9
+        assert Food.objects.filter(
+            ingredient__step__recipe=makenow_recipe.id, depth=2).count() == 1
         search = search.get_queryset(Recipe.objects.all())
         assert search.count() == 1
         assert search.first().id == makenow_recipe.id

cookbook/tests/other/test_recipe_full_text_search.py

@@ -7,9 +7,9 @@ from django.conf import settings
 from django.contrib import auth
 from django.urls import reverse
 from django.utils import timezone
-from django_scopes import scope, scopes_disabled
+from django_scopes import scope
 
-from cookbook.models import Food, Recipe, SearchFields
+from cookbook.models import Recipe, SearchFields
 from cookbook.tests.conftest import transpose
 from cookbook.tests.factories import (CookLogFactory, FoodFactory, IngredientFactory,
                                       KeywordFactory, RecipeBookEntryFactory, RecipeFactory,
@@ -23,7 +23,8 @@ from cookbook.tests.factories import (CookLogFactory, FoodFactory, IngredientFac
 # TODO makenow with above filters
 # TODO test search food/keywords including/excluding children
 LIST_URL = 'api:recipe-list'
-sqlite = settings.DATABASES['default']['ENGINE'] not in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']
+sqlite = settings.DATABASES['default']['ENGINE'] not in [
+    'django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']
 
 
 @pytest.fixture
@@ -50,26 +51,43 @@ def user1(request, space_1, u1_s1, unaccent):
     if params.get('fuzzy_lookups', False):
         user.searchpreference.lookup = True
         misspelled_result = 1
+    else:
+        user.searchpreference.lookup = False
+
     if params.get('fuzzy_search', False):
         user.searchpreference.trigram.set(SearchFields.objects.all())
         misspelled_result = 1
+    else:
+        user.searchpreference.trigram.set([])
 
     if params.get('icontains', False):
         user.searchpreference.icontains.set(SearchFields.objects.all())
         search_term = 'ghijklmn'
+    else:
+        user.searchpreference.icontains.set([])
+
     if params.get('istartswith', False):
         user.searchpreference.istartswith.set(SearchFields.objects.all())
         search_term = 'abcdef'
+    else:
+        user.searchpreference.istartswith.set([])
+
     if params.get('unaccent', False):
         user.searchpreference.unaccent.set(SearchFields.objects.all())
         misspelled_result *= 2
         result *= 2
+    else:
+        user.searchpreference.unaccent.set([])
+
     # full text vectors are hard coded to use unaccent - put this after unaccent to override result
     if params.get('fulltext', False):
         user.searchpreference.fulltext.set(SearchFields.objects.all())
         # user.searchpreference.search = 'websearch'
         search_term = 'ghijklmn uvwxyz'
         result = 2
+    else:
+        user.searchpreference.fulltext.set([])
+
     user.searchpreference.save()
     misspelled_term = transpose(search_term, number=3)
     return (u1_s1, result, misspelled_result, search_term, misspelled_term, params)
@@ -104,7 +122,8 @@ def found_recipe(request, space_1, accent, unaccent, u1_s1, u2_s1):
         obj2 = FoodFactory.create(name=accent, space=space_1)
         recipe1.steps.first().ingredients.add(IngredientFactory.create(food=obj1))
         recipe2.steps.first().ingredients.add(IngredientFactory.create(food=obj2))
-        recipe3.steps.first().ingredients.add(IngredientFactory.create(food=obj1), IngredientFactory.create(food=obj2))
+        recipe3.steps.first().ingredients.add(IngredientFactory.create(
+            food=obj1), IngredientFactory.create(food=obj2))
     if request.param.get('keyword', None):
         obj1 = KeywordFactory.create(name=unaccent, space=space_1)
         obj2 = KeywordFactory.create(name=accent, space=space_1)
@@ -125,7 +144,8 @@ def found_recipe(request, space_1, accent, unaccent, u1_s1, u2_s1):
         obj2 = UnitFactory.create(name=accent, space=space_1)
         recipe1.steps.first().ingredients.add(IngredientFactory.create(unit=obj1))
         recipe2.steps.first().ingredients.add(IngredientFactory.create(unit=obj2))
-        recipe3.steps.first().ingredients.add(IngredientFactory.create(unit=obj1), IngredientFactory.create(unit=obj2))
+        recipe3.steps.first().ingredients.add(IngredientFactory.create(
+            unit=obj1), IngredientFactory.create(unit=obj2))
     if request.param.get('name', None):
         recipe1.name = unaccent
         recipe2.name = accent
@@ -145,21 +165,32 @@ def found_recipe(request, space_1, accent, unaccent, u1_s1, u2_s1):
         i2.save()
 
     if request.param.get('viewedon', None):
-        ViewLogFactory.create(recipe=recipe1, created_by=user1, created_at=days_3, space=space_1)
-        ViewLogFactory.create(recipe=recipe2, created_by=user1, created_at=days_30, space=space_1)
-        ViewLogFactory.create(recipe=recipe3, created_by=user2, created_at=days_15, space=space_1)
+        ViewLogFactory.create(recipe=recipe1, created_by=user1,
+                              created_at=days_3, space=space_1)
+        ViewLogFactory.create(recipe=recipe2, created_by=user1,
+                              created_at=days_30, space=space_1)
+        ViewLogFactory.create(recipe=recipe3, created_by=user2,
+                              created_at=days_15, space=space_1)
     if request.param.get('cookedon', None):
-        CookLogFactory.create(recipe=recipe1, created_by=user1, created_at=days_3, space=space_1)
-        CookLogFactory.create(recipe=recipe2, created_by=user1, created_at=days_30, space=space_1)
-        CookLogFactory.create(recipe=recipe3, created_by=user2, created_at=days_15, space=space_1)
+        CookLogFactory.create(recipe=recipe1, created_by=user1,
+                              created_at=days_3, space=space_1)
+        CookLogFactory.create(recipe=recipe2, created_by=user1,
+                              created_at=days_30, space=space_1)
+        CookLogFactory.create(recipe=recipe3, created_by=user2,
+                              created_at=days_15, space=space_1)
     if request.param.get('timescooked', None):
-        CookLogFactory.create_batch(5, recipe=recipe1, created_by=user1,  space=space_1)
+        CookLogFactory.create_batch(
+            5, recipe=recipe1, created_by=user1, space=space_1)
         CookLogFactory.create(recipe=recipe2, created_by=user1, space=space_1)
-        CookLogFactory.create_batch(3, recipe=recipe3, created_by=user2, space=space_1)
+        CookLogFactory.create_batch(
+            3, recipe=recipe3, created_by=user2, space=space_1)
     if request.param.get('rating', None):
-        CookLogFactory.create(recipe=recipe1, created_by=user1, rating=5.0, space=space_1)
-        CookLogFactory.create(recipe=recipe2, created_by=user1, rating=1.0, space=space_1)
-        CookLogFactory.create(recipe=recipe3, created_by=user2, rating=3.0, space=space_1)
+        CookLogFactory.create(
+            recipe=recipe1, created_by=user1, rating=5.0, space=space_1)
+        CookLogFactory.create(
+            recipe=recipe2, created_by=user1, rating=1.0, space=space_1)
+        CookLogFactory.create(
+            recipe=recipe3, created_by=user2, rating=3.0, space=space_1)
 
     return (recipe1, recipe2, recipe3, obj1, obj2, request.param)
 
@@ -188,7 +219,8 @@ def test_search_or_and_not(found_recipe, param_type, operator, recipes, u1_s1, s
         assert found_recipe[1].id in [x['id'] for x in r['results']]
         assert found_recipe[2].id in [x['id'] for x in r['results']]
 
-        r = json.loads(u1_s1.get(reverse(LIST_URL) + f'?{param1}&{param2}').content)
+        r = json.loads(u1_s1.get(reverse(LIST_URL) +
+                       f'?{param1}&{param2}').content)
         assert r['count'] == operator[1]
         assert found_recipe[2].id in [x['id'] for x in r['results']]
 
@@ -203,7 +235,8 @@ def test_search_or_and_not(found_recipe, param_type, operator, recipes, u1_s1, s
         assert found_recipe[1].id not in [x['id'] for x in r['results']]
         assert found_recipe[2].id not in [x['id'] for x in r['results']]
 
-        r = json.loads(u1_s1.get(reverse(LIST_URL) + f'?{param1_not}&{param2_not}').content)
+        r = json.loads(u1_s1.get(reverse(LIST_URL) +
+                       f'?{param1_not}&{param2_not}').content)
         assert r['count'] == 10 + operator[2]
         assert found_recipe[2].id not in [x['id'] for x in r['results']]
 
@@ -227,7 +260,8 @@ def test_search_units(found_recipe, recipes, u1_s1, space_1):
         assert found_recipe[1].id in [x['id'] for x in r['results']]
         assert found_recipe[2].id in [x['id'] for x in r['results']]
 
-        r = json.loads(u1_s1.get(reverse(LIST_URL) + f'?{param1}&{param2}').content)
+        r = json.loads(u1_s1.get(reverse(LIST_URL) +
+                       f'?{param1}&{param2}').content)
         assert r['count'] == 3
         assert found_recipe[2].id in [x['id'] for x in r['results']]
 
@@ -251,11 +285,15 @@ def test_fuzzy_lookup(found_recipe, recipes, param_type, user1,  space_1):
         param1 = f"query={user1[3]}"
         param2 = f"query={user1[4]}"
 
-        r = json.loads(user1[0].get(reverse(list_url) + f'?{param1}&limit=2').content)
-        assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[3].id, found_recipe[4].id]]) == user1[1]
+        r = json.loads(user1[0].get(reverse(list_url) +
+                       f'?{param1}&limit=2').content)
+        assert len([x['id'] for x in r['results'] if x['id'] in [
+                   found_recipe[3].id, found_recipe[4].id]]) == user1[1]
 
-        r = json.loads(user1[0].get(reverse(list_url) + f'?{param2}&limit=10').content)
-        assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[3].id, found_recipe[4].id]]) == user1[2]
+        r = json.loads(user1[0].get(reverse(list_url) +
+                       f'?{param2}&limit=10').content)
+        assert len([x['id'] for x in r['results'] if x['id'] in [
+                   found_recipe[3].id, found_recipe[4].id]]) == user1[2]
 
 # commenting this out for general use - it is really slow
 # it should be run on occasion to ensure everything still works
@@ -276,29 +314,35 @@ def test_fuzzy_lookup(found_recipe, recipes, param_type, user1,  space_1):
 #     ({'keyword': True}),
 #     ({'food': True}),
 # ], indirect=['found_recipe'])
+# # user array contains: user client, expected count of search, expected count of mispelled search, search string, mispelled search string, user search preferences
 # def test_search_string(found_recipe, recipes, user1, space_1):
 #     with scope(space=space_1):
 #         param1 = f"query={user1[3]}"
 #         param2 = f"query={user1[4]}"
 
 #         r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param1}').content)
-#         assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[1]
+#         assert len([x['id'] for x in r['results'] if x['id'] in [
+#                    found_recipe[0].id, found_recipe[1].id]]) == user1[1]
 
 #         r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param2}').content)
-#         assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[2]
+#         assert len([x['id'] for x in r['results'] if x['id'] in [
+#                    found_recipe[0].id, found_recipe[1].id]]) == user1[2]
 
 
 @pytest.mark.parametrize("found_recipe, param_type, result", [
     ({'viewedon': True}, 'viewedon', (1, 1)),
     ({'cookedon': True}, 'cookedon', (1, 1)),
-    ({'createdon': True}, 'createdon', (2, 12)),  # created dates are not filtered by user
-    ({'createdon': True}, 'updatedon', (2, 12)),  # updated dates are not filtered by user
+    # created dates are not filtered by user
+    ({'createdon': True}, 'createdon', (2, 12)),
+    # updated dates are not filtered by user
+    ({'createdon': True}, 'updatedon', (2, 12)),
 ], indirect=['found_recipe'])
 def test_search_date(found_recipe, recipes, param_type, result, u1_s1, u2_s1, space_1):
     # force updated_at to equal created_at datetime
     with scope(space=space_1):
         for recipe in Recipe.objects.all():
-            Recipe.objects.filter(id=recipe.id).update(updated_at=recipe.created_at)
+            Recipe.objects.filter(id=recipe.id).update(
+                updated_at=recipe.created_at)
 
     date = (timezone.now() - timedelta(days=15)).strftime("%Y-%m-%d")
     param1 = f"?{param_type}={date}"
@@ -321,34 +365,34 @@ def test_search_date(found_recipe, recipes, param_type, result, u1_s1, u2_s1, sp
     assert found_recipe[2].id in [x['id'] for x in r['results']]
 
 
-# TODO this is somehow screwed, probably the search itself, dont want to fix it for now
-# @pytest.mark.parametrize("found_recipe, param_type", [
-#     ({'rating': True}, 'rating'),
-#     ({'timescooked': True}, 'timescooked'),
-# ], indirect=['found_recipe'])
-# def test_search_count(found_recipe, recipes, param_type, u1_s1, u2_s1, space_1):
-#     param1 = f'?{param_type}=3'
-#     param2 = f'?{param_type}=-3'
-#     param3 = f'?{param_type}=0'
-#
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param1).content)
-#     assert r['count'] == 1
-#     assert found_recipe[0].id in [x['id'] for x in r['results']]
-#
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param2).content)
-#     assert r['count'] == 1
-#     assert found_recipe[1].id in [x['id'] for x in r['results']]
-#
-#     # test search for not rated/cooked
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param3).content)
-#     assert r['count'] == 11
-#     assert (found_recipe[0].id or found_recipe[1].id) not in [x['id'] for x in r['results']]
-#
-#     # test matched returns for lte and gte searches
-#     r = json.loads(u2_s1.get(reverse(LIST_URL) + param1).content)
-#     assert r['count'] == 1
-#     assert found_recipe[2].id in [x['id'] for x in r['results']]
-#
-#     r = json.loads(u2_s1.get(reverse(LIST_URL) + param2).content)
-#     assert r['count'] == 1
-#     assert found_recipe[2].id in [x['id'] for x in r['results']]
+@pytest.mark.parametrize("found_recipe, param_type", [
+    ({'rating': True}, 'rating'),
+    ({'timescooked': True}, 'timescooked'),
+], indirect=['found_recipe'])
+def test_search_count(found_recipe, recipes, param_type, u1_s1, u2_s1, space_1):
+    param1 = f'?{param_type}=3'
+    param2 = f'?{param_type}=-3'
+    param3 = f'?{param_type}=0'
+
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param1).content)
+    assert r['count'] == 1
+    assert found_recipe[0].id in [x['id'] for x in r['results']]
+
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param2).content)
+    assert r['count'] == 1
+    assert found_recipe[1].id in [x['id'] for x in r['results']]
+
+    # test search for not rated/cooked
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param3).content)
+    assert r['count'] == 11
+    assert (found_recipe[0].id or found_recipe[1].id) not in [
+        x['id'] for x in r['results']]
+
+    # test matched returns for lte and gte searches
+    r = json.loads(u2_s1.get(reverse(LIST_URL) + param1).content)
+    assert r['count'] == 1
+    assert found_recipe[2].id in [x['id'] for x in r['results']]
+
+    r = json.loads(u2_s1.get(reverse(LIST_URL) + param2).content)
+    assert r['count'] == 1
+    assert found_recipe[2].id in [x['id'] for x in r['results']]