Merge branch 'develop'

.coveragerc

@@ -1,11 +0,0 @@
-[run]
-omit =
-  */apps.py,
-  */migrations/*,
-  */settings*,
-  */test*,
-  */tests/*,
-  *urls.py,
-  */wsgi*,
-  manage.py,
-  *__init__*

.devcontainer/Dockerfile

@@ -1,26 +0,0 @@
-FROM python:3.10-alpine3.18
-
-#Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git yarn
-
-#Print all logs without buffering it.
-ENV PYTHONUNBUFFERED 1
-
-#This port will be used by gunicorn.
-EXPOSE 8000
-
-#This port will be used by vue
-EXPOSE 8080
-
-#Install all python dependencies to the image
-COPY requirements.txt /tmp/pip-tmp/
-
-RUN \
-    if [ `apk --print-arch` = "armv7" ]; then \
-    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
-    fi
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
-    echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
-    pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt && \
-    rm -rf /tmp/pip-tmp && \
-    apk --purge del .build-deps

.devcontainer/devcontainer.json

@@ -1,27 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json.
-{
-	"name": "Tandoor Dev Container",
-	"build": { "context": "..", "dockerfile": "Dockerfile" },
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [8000, 8080],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pip3 install --user -r requirements.txt"
-
-	// Configure tool-specific properties.
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-python.debugpy",
-				"ms-python.python"
-			]
-		}
-	}
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}

.github/dependabot.yml

@@ -1,15 +1,10 @@
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
 version: 2
 updates:
-  - package-ecosystem: "devcontainers"
-    directory: "/"
-    schedule:
-      interval: weekly
-
   - package-ecosystem: "pip"
     directory: "/"
     schedule:

.github/workflows/ci.yml

@@ -3,79 +3,38 @@ name: Continuous Integration
 on: [push, pull_request]
 
 jobs:
-    build:
-        if: github.repository_owner == 'TandoorRecipes'
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 4
-            matrix:
-                python-version: ["3.10"]
-                node-version: ["18"]
+  build:
+    if: github.repository_owner == 'TandoorRecipes'
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ['3.10']
 
-        steps:
-            - uses: actions/checkout@v4
-            - uses: awalsh128/cache-apt-pkgs-action@v1.4.2
-              with:
-                  packages: libsasl2-dev python3-dev libldap2-dev libssl-dev
-                  version: 1.0
-
-            # Setup python & dependencies
-            - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v5
-              with:
-                  python-version: ${{ matrix.python-version }}
-                  cache: "pip"
-
-            - name: Install Python Dependencies
-              run: |
-                  python -m pip install --upgrade pip
-                  pip install -r requirements.txt
-
-            - name: Cache StaticFiles
-              uses: actions/cache@v4
-              id: django_cache
-              with:
-                  path: |
-                      ./cookbook/static
-                      ./vue/webpack-stats.json
-                      ./staticfiles
-                  key: |
-                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue/src/*') }}
-
-            # Build Vue frontend & Dependencies
-            - name: Set up Node ${{ matrix.node-version }}
-              if: steps.django_cache.outputs.cache-hit != 'true'
-              uses: actions/setup-node@v4
-              with:
-                  node-version: ${{ matrix.node-version }}
-                  cache: "yarn"
-                  cache-dependency-path: ./vue/yarn.lock
-
-            - name: Install Vue dependencies
-              if: steps.django_cache.outputs.cache-hit != 'true'
-              working-directory: ./vue
-              run: yarn install
-
-            - name: Build Vue dependencies
-              if: steps.django_cache.outputs.cache-hit != 'true'
-              working-directory: ./vue
-              run: yarn build
-
-            - name: Compile Django StaticFiles
-              if: steps.django_cache.outputs.cache-hit != 'true'
-              run: |
-                  python3 manage.py collectstatic --noinput
-                  python3 manage.py collectstatic_js_reverse
-
-            - uses: actions/cache/save@v4
-              if: steps.django_cache.outputs.cache-hit != 'true'
-              with:
-                  path: |
-                      ./cookbook/static
-                      ./vue/webpack-stats.json
-                      ./staticfiles
-                  key: |
-                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue/src/*') }}
-
-            - name: Django Testing project
-              run: pytest --junitxml=junit/test-results-${{ matrix.python-version }}.xml
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+    # Build Vue frontend
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+    - name: Install Vue dependencies
+      working-directory: ./vue
+      run: yarn install
+    - name: Build Vue dependencies
+      working-directory: ./vue
+      run: yarn build
+    - name: Install Django dependencies
+      run: |
+        sudo apt-get -y update
+        sudo apt-get install -y libsasl2-dev python3-dev libldap2-dev libssl-dev
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        python3 manage.py collectstatic --noinput
+        python3 manage.py collectstatic_js_reverse
+    - name: Django Testing project
+      run: |
+        pytest

.github/workflows/docs.yml

@@ -1,15 +1,12 @@
 name: Make Docs
 on:
-  # the 1st condition
-  workflow_run:
-    workflows: ["Continuous Integration"]
-    branches: [master]
-    types:
-      - completed
+  push:
+    branches:
+      - master
 
 jobs:
   deploy:
-    if: github.repository_owner == 'TandoorRecipes' && ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,4 +14,4 @@ jobs:
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-include-markdown-plugin
-      - run: mkdocs gh-deploy --force
+      - run: mkdocs gh-deploy --force

.gitignore

@@ -43,7 +43,6 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
-docs/reports/**
 
 # Django stuff:
 *.log
@@ -55,6 +54,7 @@ docs/_build/
 target/
 
 \.idea/dataSources/
+
 \.idea/dataSources\.xml
 
 \.idea/dataSources\.local\.xml
@@ -80,11 +80,10 @@ data/
 /docker-compose.override.yml
 vue/node_modules
 plugins
+.vscode/
 vetur.config.js
 cookbook/static/vue
 vue/webpack-stats.json
 cookbook/templates/sw.js
 .prettierignore
 vue/.yarn
-vue3/.vite
-vue3/node_modules

.idea/dictionaries/vaben.xml

@@ -1,7 +1,6 @@
 <component name="ProjectDictionaryState">
   <dictionary name="vaben">
     <words>
-      <w>mealplan</w>
       <w>pinia</w>
       <w>selfhosted</w>
       <w>unapplied</w>

.vscode/launch.json

@@ -1,33 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "name": "Python Debugger: Django",
-        "type": "debugpy",
-        "request": "launch",
-        "program": "${workspaceFolder}/manage.py",
-        "args": ["runserver"],
-        "django": true,
-        "justMyCode": true
-      },
-    {
-      "name": "Python: Debug Tests",
-      "type": "debugpy",
-      "request": "launch",
-      "program": "${file}",
-      "purpose": [
-        "debug-test"
-      ],
-      "console": "integratedTerminal",
-      "env": {
-        // coverage and pytest can't both be running at the same time
-        "PYTEST_ADDOPTS": "--no-cov"
-      },
-      "django": true,
-      "justMyCode": true
-    },
-    ]
-  }

.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "python.testing.pytestArgs": [
-        "cookbook/tests"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
-}

.vscode/tasks.json

@@ -1,75 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "Run Migrations",
-        "type": "shell",
-        "command": "python3 manage.py migrate",
-      },
-      {
-        "label": "Collect Static Files",
-        "type": "shell",
-        "command": "python3 manage.py collectstatic",
-        "dependsOn": ["Yarn Build"],
-      },
-      {
-        "label": "Setup Dev Server",
-        "dependsOn": ["Run Migrations", "Yarn Build"],
-      },
-      {
-        "label": "Run Dev Server",
-        "type": "shell",
-        "dependsOn": ["Setup Dev Server"],
-        "command": "python3 manage.py runserver",
-      },
-      {
-        "label": "Yarn Install",
-        "type": "shell",
-        "command": "yarn install",
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        }
-      },
-      {
-        "label": "Yarn Serve",
-        "type": "shell",
-        "command": "yarn serve",
-        "dependsOn": ["Yarn Install"],
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        }
-      },
-      {
-        "label": "Yarn Build",
-        "type": "shell",
-        "command": "yarn build",
-        "dependsOn": ["Yarn Install"],
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        },
-        "group": "build",
-      },
-      {
-        "label": "Setup Tests",
-        "dependsOn": ["Run Migrations", "Collect Static Files"],
-      },
-      {
-        "label": "Run all pytests",
-        "type": "shell",
-        "command": "python3 -m pytest cookbook/tests",
-        "dependsOn": ["Setup Tests"],
-        "group": "test",
-      },
-      {
-        "label": "Setup Documentation Dependencies",
-        "type": "shell",
-        "command": "pip install mkdocs-material mkdocs-include-markdown-plugin",
-      },
-      {
-        "label": "Serve Documentation",
-        "type": "shell",
-        "command": "mkdocs serve",
-        "dependsOn": ["Setup Documentation Dependencies"],
-      }
-    ]
-}

CONTRIBUTERS.md

@@ -20,7 +20,6 @@ Below are some of the larger contributions made yet.
 - [murphy83] added support for IPv6 #1490
 - [TheHaf] added custom serving size component #1411
 - [lostlont] added LDAP support #960
-- [c0mputerguru] added devcontainers for ease of development
 
 ## Translations
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine3.19
+FROM python:3.10-alpine3.18
 
 #Install all dependencies.
 RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git
@@ -19,14 +19,12 @@ RUN \
     if [ `apk --print-arch` = "armv7" ]; then \
     printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
     fi
-# remove Development dependencies from requirements.txt
-RUN sed -i '/# Development/,$d' requirements.txt
 RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
-    venv/bin/pip install wheel==0.42.0 && \
-    venv/bin/pip install setuptools_rust==1.9.0 && \
+    venv/bin/pip install wheel==0.37.1 && \
+    venv/bin/pip install setuptools_rust==1.1.2 && \
     venv/bin/pip install -r requirements.txt --no-cache-dir &&\
     apk --purge del .build-deps
 

README.md

@@ -39,13 +39,13 @@
 
 - 🔍 Powerful & customizable **search** with fulltext support and [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
 - 🏷️ Create and search for **tags**, assign them in batch to all files matching certain filters
-- ↔️ Quickly merge and rename ingredients, tags and units
+- ↔️ Quickly merge and rename ingredients, tags and units 
 - 📥️ **Import recipes** from thousands of websites supporting [ld+json or microdata](https://schema.org/Recipe)
 - ➗ Support for **fractions** or decimals
 - 🐳 Easy setup with **Docker** and included examples for **Kubernetes**, **Unraid** and **Synology**
 - 🎨 Customize your interface with **themes**
 - 📦 **Sync** files with Dropbox and Nextcloud
-
+  
 ## All the must haves
 
 - 📱Optimized for use on **mobile** devices
@@ -54,7 +54,7 @@
 - ➕ Many more like recipe scaling, image compression, printing views and supermarkets
 
 This application is meant for people with a collection of recipes they want to share with family and friends or simply
-store them in a nicely organized way. A basic permission system exists but this application is not meant to be run as
+store them in a nicely organized way. A basic permission system exists but this application is not meant to be run as 
 a public page.
 
 ## Docs
@@ -62,13 +62,13 @@ a public page.
 Documentation can be found [here](https://docs.tandoor.dev/).
 
 ## Support our work
-Tandoor is developed by volunteers in their free time just because its fun. That said earning
+Tandoor is developed by volunteers in their free time just because its fun. That said earning 
 some money with the project allows us to spend more time on it and thus make improvements we otherwise couldn't.
 Because of that there are several ways you can support us
 
 - **GitHub Sponsors** You can sponsor contributors of this project on GitHub: [vabene1111](https://github.com/sponsors/vabene1111)
 - **Host at Hetzner** We have been very happy customers of Hetzner for multiple years for all of our projects. If you want to get into self-hosting or are tired of the expensive big providers, their cloud servers are a great place to get started. When you sign up via our [referral link](https://hetzner.cloud/?ref=ISdlrLmr9kGj) you will get 20€ worth of cloud credits and we get a small kickback too.
-- **Let us host for you** We are offering a [hosted version](https://app.tandoor.dev) where all profits support us and the development of tandoor (currently only available in germany).
+- **Let us host for you** We are offering a [hosted version](https://app.tandoor.dev) where all profits support us and the development of tandoor (currently only available in germany).  
 
 ## Contributing
 Contributions are welcome but please read [this](https://docs.tandoor.dev/contribute/#contributing-code) **BEFORE** contributing anything!
@@ -100,7 +100,7 @@ Beginning with version 0.10.0 the code in this repository is licensed under the
 > I am in the process of getting some professional legal advice to sort out these issues. 
 > Please also see [Issue 238](https://github.com/vabene1111/recipes/issues/238) for some discussion and **reasoning** regarding the topic.
 
-**Reasoning**
+**Reasoning**  
 **This software and *all* its features are and will always be free for everyone to use and enjoy.**
 
 The reason for the selling exception is that a significant amount of time was spend over multiple years to develop this software.

boot.sh

@@ -76,11 +76,4 @@ echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles
 
-ipv6_disable=$(cat /sys/module/ipv6/parameters/disable)
-
-# Check if IPv6 is enabled, only then run gunicorn with ipv6 support
-if [ "$ipv6_disable" -eq 0 ]; then
-    exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
-else
-    exec gunicorn -b ":$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
-fi
+exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi

cookbook/admin.py

@@ -13,10 +13,10 @@ from cookbook.managers import DICTIONARY
 from .models import (BookmarkletImport, Comment, CookLog, Food, ImportLog, Ingredient, InviteLink,
                      Keyword, MealPlan, MealType, NutritionInformation, Property, PropertyType,
                      Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
-                     ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
+                     ShoppingList, ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                      Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog,
                      TelegramBot, Unit, UnitConversion, UserFile, UserPreference, UserSpace,
-                     ViewLog, ConnectorConfig)
+                     ViewLog)
 
 
 class CustomUserAdmin(UserAdmin):
@@ -95,14 +95,6 @@ class StorageAdmin(admin.ModelAdmin):
 admin.site.register(Storage, StorageAdmin)
 
 
-class ConnectorConfigAdmin(admin.ModelAdmin):
-    list_display = ('id', 'name', 'type', 'enabled', 'url')
-    search_fields = ('name', 'url')
-
-
-admin.site.register(ConnectorConfig, ConnectorConfigAdmin)
-
-
 class SyncAdmin(admin.ModelAdmin):
     list_display = ('storage', 'path', 'active', 'last_checked')
     search_fields = ('storage__name', 'path')
@@ -323,8 +315,8 @@ admin.site.register(MealPlan, MealPlanAdmin)
 
 
 class MealTypeAdmin(admin.ModelAdmin):
-    list_display = ('name', 'space', 'created_by', 'order')
-    search_fields = ('name', 'space', 'created_by__username')
+    list_display = ('name', 'created_by', 'order')
+    search_fields = ('name', 'created_by__username')
 
 
 admin.site.register(MealType, MealTypeAdmin)
@@ -369,6 +361,13 @@ class ShoppingListEntryAdmin(admin.ModelAdmin):
 admin.site.register(ShoppingListEntry, ShoppingListEntryAdmin)
 
 
+# class ShoppingListAdmin(admin.ModelAdmin):
+#     list_display = ('id', 'created_by', 'created_at')
+
+
+# admin.site.register(ShoppingList, ShoppingListAdmin)
+
+
 class ShareLinkAdmin(admin.ModelAdmin):
     list_display = ('recipe', 'created_by', 'uuid', 'created_at',)
 

cookbook/apps.py

@@ -3,7 +3,6 @@ import traceback
 from django.apps import AppConfig
 from django.conf import settings
 from django.db import OperationalError, ProgrammingError
-from django.db.models.signals import post_save, post_delete
 from django_scopes import scopes_disabled
 
 from recipes.settings import DEBUG
@@ -15,16 +14,6 @@ class CookbookConfig(AppConfig):
     def ready(self):
         import cookbook.signals  # noqa
 
-        if not settings.DISABLE_EXTERNAL_CONNECTORS:
-            try:
-                from cookbook.connectors.connector_manager import ConnectorManager  # Needs to be here to prevent loading race condition of oauth2 modules in models.py
-                handler = ConnectorManager()
-                post_save.connect(handler, dispatch_uid="connector_manager")
-                post_delete.connect(handler, dispatch_uid="connector_manager")
-            except Exception as e:
-                traceback.print_exc()
-                print('Failed to initialize connectors')
-                pass
         # if not settings.DISABLE_TREE_FIX_STARTUP:
         #     # when starting up run fix_tree to:
         #     #   a) make sure that nodes are sorted when switching between sort modes

cookbook/connectors/connector.py

@@ -1,29 +0,0 @@
-from abc import ABC, abstractmethod
-
-from cookbook.models import ShoppingListEntry, Space, ConnectorConfig
-
-
-# A Connector is 'destroyed' & recreated each time 'any' ConnectorConfig in a space changes.
-class Connector(ABC):
-    @abstractmethod
-    def __init__(self, config: ConnectorConfig):
-        pass
-
-    @abstractmethod
-    async def on_shopping_list_entry_created(self, space: Space, instance: ShoppingListEntry) -> None:
-        pass
-
-    # This method might not trigger on 'direct' entry updates: https://stackoverflow.com/a/35238823
-    @abstractmethod
-    async def on_shopping_list_entry_updated(self, space: Space, instance: ShoppingListEntry) -> None:
-        pass
-
-    @abstractmethod
-    async def on_shopping_list_entry_deleted(self, space: Space, instance: ShoppingListEntry) -> None:
-        pass
-
-    @abstractmethod
-    async def close(self) -> None:
-        pass
-
-    # TODO: Add Recipes & possibly Meal Place listeners/hooks (And maybe more?)

cookbook/connectors/connector_manager.py

@@ -1,179 +0,0 @@
-import asyncio
-import logging
-import queue
-import threading
-from asyncio import Task
-from dataclasses import dataclass
-from enum import Enum
-from types import UnionType
-from typing import List, Any, Dict, Optional, Type
-
-from django.conf import settings
-from django_scopes import scope
-
-from cookbook.connectors.connector import Connector
-from cookbook.connectors.homeassistant import HomeAssistant
-from cookbook.models import ShoppingListEntry, Space, ConnectorConfig
-
-REGISTERED_CLASSES: UnionType | Type = ShoppingListEntry
-
-
-class ActionType(Enum):
-    CREATED = 1
-    UPDATED = 2
-    DELETED = 3
-
-
-@dataclass
-class Work:
-    instance: REGISTERED_CLASSES | ConnectorConfig
-    actionType: ActionType
-
-
-# The way ConnectionManager works is as follows:
-# 1. On init, it starts a worker & creates a queue for 'Work'
-# 2. Then any time its called, it verifies the type of action (create/update/delete) and if the item is of interest, pushes the Work (non-blocking) to the queue.
-# 3. The worker consumes said work from the queue.
-# 3.1 If the work is of type ConnectorConfig, it flushes its cache of known connectors (per space.id)
-# 3.2 If work is of type REGISTERED_CLASSES, it asynchronously fires of all connectors and wait for them to finish (runtime should depend on the 'slowest' connector)
-# 4. Work is marked as consumed, and next entry of the queue is consumed.
-# Each 'Work' is processed in sequential by the worker, so the throughput is about [workers * the slowest connector]
-class ConnectorManager:
-    _queue: queue.Queue
-    _listening_to_classes = REGISTERED_CLASSES | ConnectorConfig
-
-    def __init__(self):
-        self._queue = queue.Queue(maxsize=settings.EXTERNAL_CONNECTORS_QUEUE_SIZE)
-        self._worker = threading.Thread(target=self.worker, args=(0, self._queue,), daemon=True)
-        self._worker.start()
-
-    # Called by post save & post delete signals
-    def __call__(self, instance: Any, **kwargs) -> None:
-        if not isinstance(instance, self._listening_to_classes) or not hasattr(instance, "space"):
-            return
-
-        action_type: ActionType
-        if "created" in kwargs and kwargs["created"]:
-            action_type = ActionType.CREATED
-        elif "created" in kwargs and not kwargs["created"]:
-            action_type = ActionType.UPDATED
-        elif "origin" in kwargs:
-            action_type = ActionType.DELETED
-        else:
-            return
-
-        try:
-            self._queue.put_nowait(Work(instance, action_type))
-        except queue.Full:
-            logging.info(f"queue was full, so skipping {action_type} of type {type(instance)}")
-            return
-
-    def stop(self):
-        self._queue.join()
-        self._worker.join()
-
-    @staticmethod
-    def worker(worker_id: int, worker_queue: queue.Queue):
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-
-        logging.info(f"started ConnectionManager worker {worker_id}")
-
-        # When multiple workers are used, please make sure the cache is shared across all threads, otherwise it might lead to un-expected behavior.
-        _connectors_cache: Dict[int, List[Connector]] = dict()
-
-        while True:
-            try:
-                item: Optional[Work] = worker_queue.get()
-            except KeyboardInterrupt:
-                break
-
-            if item is None:
-                break
-
-            # If a Connector was changed/updated, refresh connector from the database for said space
-            refresh_connector_cache = isinstance(item.instance, ConnectorConfig)
-
-            space: Space = item.instance.space
-            connectors: Optional[List[Connector]] = _connectors_cache.get(space.id)
-
-            if connectors is None or refresh_connector_cache:
-                if connectors is not None:
-                    loop.run_until_complete(close_connectors(connectors))
-
-                with scope(space=space):
-                    connectors: List[Connector] = list()
-                    for config in space.connectorconfig_set.all():
-                        config: ConnectorConfig = config
-                        if not config.enabled:
-                            continue
-
-                        try:
-                            connector: Optional[Connector] = ConnectorManager.get_connected_for_config(config)
-                        except BaseException:
-                            logging.exception(f"failed to initialize {config.name}")
-                            continue
-
-                        if connector is not None:
-                            connectors.append(connector)
-
-                    _connectors_cache[space.id] = connectors
-
-            if len(connectors) == 0 or refresh_connector_cache:
-                worker_queue.task_done()
-                continue
-
-            loop.run_until_complete(run_connectors(connectors, space, item.instance, item.actionType))
-            worker_queue.task_done()
-
-        logging.info(f"terminating ConnectionManager worker {worker_id}")
-
-        asyncio.set_event_loop(None)
-        loop.close()
-
-    @staticmethod
-    def get_connected_for_config(config: ConnectorConfig) -> Optional[Connector]:
-        match config.type:
-            case ConnectorConfig.HOMEASSISTANT:
-                return HomeAssistant(config)
-            case _:
-                return None
-
-
-async def close_connectors(connectors: List[Connector]):
-    tasks: List[Task] = [asyncio.create_task(connector.close()) for connector in connectors]
-
-    if len(tasks) == 0:
-        return
-
-    try:
-        await asyncio.gather(*tasks, return_exceptions=False)
-    except BaseException:
-        logging.exception("received an exception while closing one of the connectors")
-
-
-async def run_connectors(connectors: List[Connector], space: Space, instance: REGISTERED_CLASSES, action_type: ActionType):
-    tasks: List[Task] = list()
-
-    if isinstance(instance, ShoppingListEntry):
-        shopping_list_entry: ShoppingListEntry = instance
-
-        match action_type:
-            case ActionType.CREATED:
-                for connector in connectors:
-                    tasks.append(asyncio.create_task(connector.on_shopping_list_entry_created(space, shopping_list_entry)))
-            case ActionType.UPDATED:
-                for connector in connectors:
-                    tasks.append(asyncio.create_task(connector.on_shopping_list_entry_updated(space, shopping_list_entry)))
-            case ActionType.DELETED:
-                for connector in connectors:
-                    tasks.append(asyncio.create_task(connector.on_shopping_list_entry_deleted(space, shopping_list_entry)))
-
-    if len(tasks) == 0:
-        return
-
-    try:
-        # Wait for all async tasks to finish, if one fails, the others still continue.
-        await asyncio.gather(*tasks, return_exceptions=False)
-    except BaseException:
-        logging.exception("received an exception from one of the connectors")

cookbook/connectors/homeassistant.py

@@ -1,103 +0,0 @@
-import logging
-from logging import Logger
-from typing import Dict, Tuple
-from urllib.parse import urljoin
-
-from aiohttp import ClientError, request
-
-from cookbook.connectors.connector import Connector
-from cookbook.models import ShoppingListEntry, ConnectorConfig, Space
-
-
-class HomeAssistant(Connector):
-    _config: ConnectorConfig
-    _logger: Logger
-
-    def __init__(self, config: ConnectorConfig):
-        if not config.token or not config.url or not config.todo_entity:
-            raise ValueError("config for HomeAssistantConnector in incomplete")
-
-        if config.url[-1] != "/":
-            config.url += "/"
-        self._config = config
-        self._logger = logging.getLogger("connector.HomeAssistant")
-
-    async def homeassistant_api_call(self, method: str, path: str, data: Dict) -> str:
-        headers = {
-            "Authorization": f"Bearer {self._config.token}",
-            "Content-Type": "application/json"
-        }
-        async with request(method, urljoin(self._config.url, path), headers=headers, json=data) as response:
-            response.raise_for_status()
-            return await response.json()
-
-    async def on_shopping_list_entry_created(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
-        if not self._config.on_shopping_list_entry_created_enabled:
-            return
-
-        item, description = _format_shopping_list_entry(shopping_list_entry)
-
-        logging.debug(f"adding {item=} to {self._config.name}")
-
-        data = {
-            "entity_id": self._config.todo_entity,
-            "item": item,
-            "description": description,
-        }
-
-        try:
-            await self.homeassistant_api_call("POST", "services/todo/add_item", data)
-        except ClientError as err:
-            self._logger.warning(f"[HomeAssistant {self._config.name}] Received an exception from the api: {err=}, {type(err)=}")
-
-    async def on_shopping_list_entry_updated(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
-        if not self._config.on_shopping_list_entry_updated_enabled:
-            return
-        pass
-
-    async def on_shopping_list_entry_deleted(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
-        if not self._config.on_shopping_list_entry_deleted_enabled:
-            return
-
-        if not hasattr(shopping_list_entry._state.fields_cache, "food"):
-            # Sometimes the food foreign key is not loaded, and we cant load it from an async process
-            self._logger.debug("required property was not present in ShoppingListEntry")
-            return
-
-        item, _ = _format_shopping_list_entry(shopping_list_entry)
-
-        logging.debug(f"removing {item=} from {self._config.name}")
-
-        data = {
-            "entity_id": self._config.todo_entity,
-            "item": item,
-        }
-
-        try:
-            await self.homeassistant_api_call("POST", "services/todo/remove_item", data)
-        except ClientError as err:
-            # This error will always trigger if the item is not present/found
-            self._logger.debug(f"[HomeAssistant {self._config.name}] Received an exception from the api: {err=}, {type(err)=}")
-
-    async def close(self) -> None:
-        pass
-
-
-def _format_shopping_list_entry(shopping_list_entry: ShoppingListEntry) -> Tuple[str, str]:
-    item = shopping_list_entry.food.name
-    if shopping_list_entry.amount > 0:
-        item += f" ({shopping_list_entry.amount:.2f}".rstrip('0').rstrip('.')
-        if shopping_list_entry.unit and shopping_list_entry.unit.base_unit and len(shopping_list_entry.unit.base_unit) > 0:
-            item += f" {shopping_list_entry.unit.base_unit})"
-        elif shopping_list_entry.unit and shopping_list_entry.unit.name and len(shopping_list_entry.unit.name) > 0:
-            item += f" {shopping_list_entry.unit.name})"
-        else:
-            item += ")"
-
-    description = "From TandoorRecipes"
-    if shopping_list_entry.created_by.first_name and len(shopping_list_entry.created_by.first_name) > 0:
-        description += f", by {shopping_list_entry.created_by.first_name}"
-    else:
-        description += f", by {shopping_list_entry.created_by.username}"
-
-    return item, description

cookbook/forms.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 
-from allauth.account.forms import ResetPasswordForm, SignupForm
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -10,19 +9,18 @@ from django_scopes import scopes_disabled
 from django_scopes.forms import SafeModelChoiceField, SafeModelMultipleChoiceField
 from hcaptcha.fields import hCaptchaField
 
-from .models import Comment, InviteLink, Keyword, Recipe, SearchPreference, Space, Storage, Sync, User, UserPreference, ConnectorConfig
+from .models import (Comment, Food, InviteLink, Keyword, Recipe, RecipeBook, RecipeBookEntry,
+                     SearchPreference, Space, Storage, Sync, User, UserPreference)
 
 
 class SelectWidget(widgets.Select):
-
     class Media:
-        js = ('custom/js/form_select.js', )
+        js = ('custom/js/form_select.js',)
 
 
 class MultiSelectWidget(widgets.SelectMultiple):
-
     class Media:
-        js = ('custom/js/form_multiselect.js', )
+        js = ('custom/js/form_multiselect.js',)
 
 
 # Yes there are some stupid browsers that still dont support this but
@@ -42,7 +40,9 @@ class UserNameForm(forms.ModelForm):
         model = User
         fields = ('first_name', 'last_name')
 
-        help_texts = {'first_name': _('Both fields are optional. If none are given the username will be displayed instead')}
+        help_texts = {
+            'first_name': _('Both fields are optional. If none are given the username will be displayed instead')
+        }
 
 
 class ExternalRecipeForm(forms.ModelForm):
@@ -56,14 +56,23 @@ class ExternalRecipeForm(forms.ModelForm):
 
     class Meta:
         model = Recipe
-        fields = ('name', 'description', 'servings', 'working_time', 'waiting_time', 'file_path', 'file_uid', 'keywords')
+        fields = (
+            'name', 'description', 'servings', 'working_time', 'waiting_time',
+            'file_path', 'file_uid', 'keywords'
+        )
 
         labels = {
-            'name': _('Name'), 'keywords': _('Keywords'), 'working_time': _('Preparation time in minutes'), 'waiting_time': _('Waiting time (cooking/baking) in minutes'),
-            'file_path': _('Path'), 'file_uid': _('Storage UID'),
+            'name': _('Name'),
+            'keywords': _('Keywords'),
+            'working_time': _('Preparation time in minutes'),
+            'waiting_time': _('Waiting time (cooking/baking) in minutes'),
+            'file_path': _('Path'),
+            'file_uid': _('Storage UID'),
         }
         widgets = {'keywords': MultiSelectWidget}
-        field_classes = {'keywords': SafeModelMultipleChoiceField, }
+        field_classes = {
+            'keywords': SafeModelMultipleChoiceField,
+        }
 
 
 class ImportExportBase(forms.Form):
@@ -90,11 +99,14 @@ class ImportExportBase(forms.Form):
     REZEPTSUITEDE = 'REZEPTSUITEDE'
     PDF = 'PDF'
 
-    type = forms.ChoiceField(choices=((DEFAULT, _('Default')), (PAPRIKA, 'Paprika'), (NEXTCLOUD, 'Nextcloud Cookbook'), (MEALIE, 'Mealie'), (CHOWDOWN, 'Chowdown'),
-                                      (SAFFRON, 'Saffron'), (CHEFTAP, 'ChefTap'), (PEPPERPLATE, 'Pepperplate'), (RECETTETEK, 'RecetteTek'), (RECIPESAGE, 'Recipe Sage'),
-                                      (DOMESTICA, 'Domestica'), (MEALMASTER, 'MealMaster'), (REZKONV, 'RezKonv'), (OPENEATS, 'Openeats'), (RECIPEKEEPER, 'Recipe Keeper'),
-                                      (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
-                                      (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')))
+    type = forms.ChoiceField(choices=(
+        (DEFAULT, _('Default')), (PAPRIKA, 'Paprika'), (NEXTCLOUD, 'Nextcloud Cookbook'),
+        (MEALIE, 'Mealie'), (CHOWDOWN, 'Chowdown'), (SAFFRON, 'Saffron'), (CHEFTAP, 'ChefTap'),
+        (PEPPERPLATE, 'Pepperplate'), (RECETTETEK, 'RecetteTek'), (RECIPESAGE, 'Recipe Sage'), (DOMESTICA, 'Domestica'),
+        (MEALMASTER, 'MealMaster'), (REZKONV, 'RezKonv'), (OPENEATS, 'Openeats'), (RECIPEKEEPER, 'Recipe Keeper'),
+        (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
+        (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')
+    ))
 
 
 class MultipleFileInput(forms.ClearableFileInput):
@@ -102,7 +114,6 @@ class MultipleFileInput(forms.ClearableFileInput):
 
 
 class MultipleFileField(forms.FileField):
-
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("widget", MultipleFileInput())
         super().__init__(*args, **kwargs)
@@ -118,8 +129,9 @@ class MultipleFileField(forms.FileField):
 
 class ImportForm(ImportExportBase):
     files = MultipleFileField(required=True)
-    duplicates = forms.BooleanField(help_text=_('To prevent duplicates recipes with the same name as existing ones are ignored. Check this box to import everything.'),
-                                    required=False)
+    duplicates = forms.BooleanField(help_text=_(
+        'To prevent duplicates recipes with the same name as existing ones are ignored. Check this box to import everything.'),
+        required=False)
 
 
 class ExportForm(ImportExportBase):
@@ -138,71 +150,59 @@ class CommentForm(forms.ModelForm):
 
     class Meta:
         model = Comment
-        fields = ('text', )
+        fields = ('text',)
 
-        labels = {'text': _('Add your comment: '), }
-        widgets = {'text': forms.Textarea(attrs={'rows': 2, 'cols': 15}), }
+        labels = {
+            'text': _('Add your comment: '),
+        }
+        widgets = {
+            'text': forms.Textarea(attrs={'rows': 2, 'cols': 15}),
+        }
 
 
 class StorageForm(forms.ModelForm):
-    username = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password'}), required=False)
-    password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
-                               required=False,
-                               help_text=_('Leave empty for dropbox and enter app password for nextcloud.'))
-    token = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
-                            required=False,
-                            help_text=_('Leave empty for nextcloud and enter api token for dropbox.'))
+    username = forms.CharField(
+        widget=forms.TextInput(attrs={'autocomplete': 'new-password'}),
+        required=False
+    )
+    password = forms.CharField(
+        widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
+        required=False,
+        help_text=_('Leave empty for dropbox and enter app password for nextcloud.')
+    )
+    token = forms.CharField(
+        widget=forms.TextInput(
+            attrs={'autocomplete': 'new-password', 'type': 'password'}
+        ),
+        required=False,
+        help_text=_('Leave empty for nextcloud and enter api token for dropbox.')
+    )
 
     class Meta:
         model = Storage
         fields = ('name', 'method', 'username', 'password', 'token', 'url', 'path')
 
-        help_texts = {'url': _('Leave empty for dropbox and enter only base url for nextcloud (<code>/remote.php/webdav/</code> is added automatically)'), }
+        help_texts = {
+            'url': _(
+                'Leave empty for dropbox and enter only base url for nextcloud (<code>/remote.php/webdav/</code> is added automatically)'),
+        }
 
 
+# TODO: Deprecate
+class RecipeBookEntryForm(forms.ModelForm):
+    prefix = 'bookmark'
 
-class ConnectorConfigForm(forms.ModelForm):
-    enabled = forms.BooleanField(
-        help_text="Is the connector enabled",
-        required=False,
-    )
-
-    on_shopping_list_entry_created_enabled = forms.BooleanField(
-        help_text="Enable action for ShoppingListEntry created events",
-        required=False,
-    )
-
-    on_shopping_list_entry_updated_enabled = forms.BooleanField(
-        help_text="Enable action for ShoppingListEntry updated events",
-        required=False,
-    )
-
-    on_shopping_list_entry_deleted_enabled = forms.BooleanField(
-        help_text="Enable action for ShoppingListEntry deleted events",
-        required=False,
-    )
-
-    update_token = forms.CharField(
-        widget=forms.TextInput(attrs={'autocomplete': 'update-token', 'type': 'password'}),
-        required=False,
-        help_text=_('<a href="https://www.home-assistant.io/docs/authentication/#your-account-profile">Long Lived Access Token</a> for your HomeAssistant instance')
-    )
-
-    url = forms.URLField(
-        required=False,
-        help_text=_('Something like http://homeassistant.local:8123/api'),
-    )
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['book'].queryset = RecipeBook.objects.filter(space=space).all()
 
     class Meta:
-        model = ConnectorConfig
+        model = RecipeBookEntry
+        fields = ('book',)
 
-        fields = (
-            'name', 'type', 'enabled', 'on_shopping_list_entry_created_enabled', 'on_shopping_list_entry_updated_enabled',
-            'on_shopping_list_entry_deleted_enabled', 'url', 'todo_entity',
-        )
-
-        help_texts = {
-            'url': _('http://homeassistant.local:8123/api for example'),
+        field_classes = {
+            'book': SafeModelChoiceField,
         }
 
 
@@ -217,14 +217,25 @@ class SyncForm(forms.ModelForm):
         model = Sync
         fields = ('storage', 'path', 'active')
 
-        field_classes = {'storage': SafeModelChoiceField, }
+        field_classes = {
+            'storage': SafeModelChoiceField,
+        }
 
-        labels = {'storage': _('Storage'), 'path': _('Path'), 'active': _('Active')}
+        labels = {
+            'storage': _('Storage'),
+            'path': _('Path'),
+            'active': _('Active')
+        }
 
 
+# TODO deprecate
 class BatchEditForm(forms.Form):
     search = forms.CharField(label=_('Search String'))
-    keywords = forms.ModelMultipleChoiceField(queryset=Keyword.objects.none(), required=False, widget=MultiSelectWidget)
+    keywords = forms.ModelMultipleChoiceField(
+        queryset=Keyword.objects.none(),
+        required=False,
+        widget=MultiSelectWidget
+    )
 
     def __init__(self, *args, **kwargs):
         space = kwargs.pop('space')
@@ -233,7 +244,6 @@ class BatchEditForm(forms.Form):
 
 
 class ImportRecipeForm(forms.ModelForm):
-
     def __init__(self, *args, **kwargs):
         space = kwargs.pop('space')
         super().__init__(*args, **kwargs)
@@ -243,13 +253,19 @@ class ImportRecipeForm(forms.ModelForm):
         model = Recipe
         fields = ('name', 'keywords', 'file_path', 'file_uid')
 
-        labels = {'name': _('Name'), 'keywords': _('Keywords'), 'file_path': _('Path'), 'file_uid': _('File ID'), }
+        labels = {
+            'name': _('Name'),
+            'keywords': _('Keywords'),
+            'file_path': _('Path'),
+            'file_uid': _('File ID'),
+        }
         widgets = {'keywords': MultiSelectWidget}
-        field_classes = {'keywords': SafeModelChoiceField, }
+        field_classes = {
+            'keywords': SafeModelChoiceField,
+        }
 
 
 class InviteLinkForm(forms.ModelForm):
-
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
         super().__init__(*args, **kwargs)
@@ -257,8 +273,8 @@ class InviteLinkForm(forms.ModelForm):
 
     def clean(self):
         space = self.cleaned_data['space']
-        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count()
-                                     + InviteLink.objects.filter(valid_until__gte=datetime.today(), used_by=None, space=space).count()) >= space.max_users:
+        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count() +
+                                     InviteLink.objects.filter(valid_until__gte=datetime.today(), used_by=None, space=space).count()) >= space.max_users:
             raise ValidationError(_('Maximum number of users for this space reached.'))
 
     def clean_email(self):
@@ -272,8 +288,12 @@ class InviteLinkForm(forms.ModelForm):
     class Meta:
         model = InviteLink
         fields = ('email', 'group', 'valid_until', 'space')
-        help_texts = {'email': _('An email address is not required but if present the invite link will be sent to the user.'), }
-        field_classes = {'space': SafeModelChoiceField, }
+        help_texts = {
+            'email': _('An email address is not required but if present the invite link will be sent to the user.'),
+        }
+        field_classes = {
+            'space': SafeModelChoiceField,
+        }
 
 
 class SpaceCreateForm(forms.Form):
@@ -293,12 +313,12 @@ class SpaceJoinForm(forms.Form):
     token = forms.CharField()
 
 
-class AllAuthSignupForm(SignupForm):
+class AllAuthSignupForm(forms.Form):
     captcha = hCaptchaField()
     terms = forms.BooleanField(label=_('Accept Terms and Privacy'))
 
     def __init__(self, **kwargs):
-        super().__init__(**kwargs)
+        super(AllAuthSignupForm, self).__init__(**kwargs)
         if settings.PRIVACY_URL == '' and settings.TERMS_URL == '':
             self.fields.pop('terms')
         if settings.HCAPTCHA_SECRET == '':
@@ -308,50 +328,135 @@ class AllAuthSignupForm(SignupForm):
         pass
 
 
-class CustomPasswordResetForm(ResetPasswordForm):
-    captcha = hCaptchaField()
-
-    def __init__(self, **kwargs):
-        super(CustomPasswordResetForm, self).__init__(**kwargs)
-        if settings.HCAPTCHA_SECRET == '':
-            self.fields.pop('captcha')
-
-
 class UserCreateForm(forms.Form):
     name = forms.CharField(label='Username')
-    password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))
-    password_confirm = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))
+    password = forms.CharField(
+        widget=forms.TextInput(
+            attrs={'autocomplete': 'new-password', 'type': 'password'}
+        )
+    )
+    password_confirm = forms.CharField(
+        widget=forms.TextInput(
+            attrs={'autocomplete': 'new-password', 'type': 'password'}
+        )
+    )
 
 
 class SearchPreferenceForm(forms.ModelForm):
     prefix = 'search'
-    trigram_threshold = forms.DecimalField(min_value=0.01,
-                                           max_value=1,
-                                           decimal_places=2,
+    trigram_threshold = forms.DecimalField(min_value=0.01, max_value=1, decimal_places=2,
                                            widget=NumberInput(attrs={'class': "form-control-range", 'type': 'range'}),
-                                           help_text=_('Determines how fuzzy a search is if it uses trigram similarity matching (e.g. low values mean more typos are ignored).'))
+                                           help_text=_(
+                                               'Determines how fuzzy a search is if it uses trigram similarity matching (e.g. low values mean more typos are ignored).'))
     preset = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = SearchPreference
-        fields = ('search', 'lookup', 'unaccent', 'icontains', 'istartswith', 'trigram', 'fulltext', 'trigram_threshold')
+        fields = (
+            'search', 'lookup', 'unaccent', 'icontains', 'istartswith', 'trigram', 'fulltext', 'trigram_threshold')
 
         help_texts = {
-            'search': _('Select type method of search.  Click <a href="/docs/search/">here</a> for full description of choices.'), 'lookup':
-            _('Use fuzzy matching on units, keywords and ingredients when editing and importing recipes.'), 'unaccent':
-            _('Fields to search ignoring accents.  Selecting this option can improve or degrade search quality depending on language'), 'icontains':
-            _("Fields to search for partial matches.  (e.g. searching for 'Pie' will return 'pie' and 'piece' and 'soapie')"), 'istartswith':
-            _("Fields to search for beginning of word matches. (e.g. searching for 'sa' will return 'salad' and 'sandwich')"), 'trigram':
-            _("Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  Note: this option will conflict with 'web' and 'raw' methods of search."), 'fulltext':
-            _("Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods only function with fulltext fields."),
+            'search': _(
+                'Select type method of search.  Click <a href="/docs/search/">here</a> for full description of choices.'),
+            'lookup': _('Use fuzzy matching on units, keywords and ingredients when editing and importing recipes.'),
+            'unaccent': _(
+                'Fields to search ignoring accents.  Selecting this option can improve or degrade search quality depending on language'),
+            'icontains': _(
+                "Fields to search for partial matches.  (e.g. searching for 'Pie' will return 'pie' and 'piece' and 'soapie')"),
+            'istartswith': _(
+                "Fields to search for beginning of word matches. (e.g. searching for 'sa' will return 'salad' and 'sandwich')"),
+            'trigram': _(
+                "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  Note: this option will conflict with 'web' and 'raw' methods of search."),
+            'fulltext': _(
+                "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods only function with fulltext fields."),
         }
 
         labels = {
-            'search': _('Search Method'), 'lookup': _('Fuzzy Lookups'), 'unaccent': _('Ignore Accent'), 'icontains': _("Partial Match"), 'istartswith': _("Starts With"),
-            'trigram': _("Fuzzy Search"), 'fulltext': _("Full Text")
+            'search': _('Search Method'),
+            'lookup': _('Fuzzy Lookups'),
+            'unaccent': _('Ignore Accent'),
+            'icontains': _("Partial Match"),
+            'istartswith': _("Starts With"),
+            'trigram': _("Fuzzy Search"),
+            'fulltext': _("Full Text")
         }
 
         widgets = {
-            'search': SelectWidget, 'unaccent': MultiSelectWidget, 'icontains': MultiSelectWidget, 'istartswith': MultiSelectWidget, 'trigram': MultiSelectWidget, 'fulltext':
-            MultiSelectWidget,
+            'search': SelectWidget,
+            'unaccent': MultiSelectWidget,
+            'icontains': MultiSelectWidget,
+            'istartswith': MultiSelectWidget,
+            'trigram': MultiSelectWidget,
+            'fulltext': MultiSelectWidget,
+        }
+
+
+class ShoppingPreferenceForm(forms.ModelForm):
+    prefix = 'shopping'
+
+    class Meta:
+        model = UserPreference
+
+        fields = (
+            'shopping_share', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'mealplan_autoexclude_onhand',
+            'mealplan_autoinclude_related', 'shopping_add_onhand', 'default_delay', 'filter_to_supermarket', 'shopping_recent_days', 'csv_delim', 'csv_prefix'
+        )
+
+        help_texts = {
+            'shopping_share': _('Users will see all items you add to your shopping list.  They must add you to see items on their list.'),
+            'shopping_auto_sync': _(
+                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '
+                'of mobile data. If lower than instance limit it is reset when saving.'
+            ),
+            'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
+            'mealplan_autoinclude_related': _('When adding a meal plan to the shopping list (manually or automatically), include all related recipes.'),
+            'mealplan_autoexclude_onhand': _('When adding a meal plan to the shopping list (manually or automatically), exclude ingredients that are on hand.'),
+            'default_delay': _('Default number of hours to delay a shopping list entry.'),
+            'filter_to_supermarket': _('Filter shopping list to only include supermarket categories.'),
+            'shopping_recent_days': _('Days of recent shopping list entries to display.'),
+            'shopping_add_onhand': _("Mark food 'On Hand' when checked off shopping list."),
+            'csv_delim': _('Delimiter to use for CSV exports.'),
+            'csv_prefix': _('Prefix to add when copying list to the clipboard.'),
+
+        }
+        labels = {
+            'shopping_share': _('Share Shopping List'),
+            'shopping_auto_sync': _('Autosync'),
+            'mealplan_autoadd_shopping': _('Auto Add Meal Plan'),
+            'mealplan_autoexclude_onhand': _('Exclude On Hand'),
+            'mealplan_autoinclude_related': _('Include Related'),
+            'default_delay': _('Default Delay Hours'),
+            'filter_to_supermarket': _('Filter to Supermarket'),
+            'shopping_recent_days': _('Recent Days'),
+            'csv_delim': _('CSV Delimiter'),
+            "csv_prefix_label": _("List Prefix"),
+            'shopping_add_onhand': _("Auto On Hand"),
+        }
+
+        widgets = {
+            'shopping_share': MultiSelectWidget
+        }
+
+
+class SpacePreferenceForm(forms.ModelForm):
+    prefix = 'space'
+    reset_food_inherit = forms.BooleanField(label=_("Reset Food Inheritance"), initial=False, required=False,
+                                            help_text=_("Reset all food to inherit the fields configured."))
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)  # populates the post
+        self.fields['food_inherit'].queryset = Food.inheritable_fields
+
+    class Meta:
+        model = Space
+
+        fields = ('food_inherit', 'reset_food_inherit',)
+
+        help_texts = {
+            'food_inherit': _('Fields on food that should be inherited by default.'),
+            'use_plural': _('Use the plural form for units and food inside this space.'),
+        }
+
+        widgets = {
+            'food_inherit': MultiSelectWidget
         }

cookbook/helper/CustomTestRunner.py

@@ -0,0 +1,8 @@
+from django.test.runner import DiscoverRunner
+from django_scopes import scopes_disabled
+
+
+class CustomTestRunner(DiscoverRunner):
+    def run_tests(self, *args, **kwargs):
+        with scopes_disabled():
+            return super().run_tests(*args, **kwargs)

cookbook/helper/__init__.py

@@ -1,4 +1,6 @@
+import cookbook.helper.dal
 from cookbook.helper.AllAuthCustomAdapter import AllAuthCustomAdapter
 
 __all__ = [
+    'dal',
 ]

cookbook/helper/automation_helper.py

@@ -98,7 +98,7 @@ class AutomationEngine:
             try:
                 return self.food_aliases[food.lower()]
             except KeyError:
-                return self.apply_regex_replace_automation(food, Automation.FOOD_REPLACE)
+                return food
         else:
             if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1__iexact=food, disabled=False).order_by('order').first():
                 return automation.param_2

cookbook/helper/context_processors.py

@@ -11,5 +11,4 @@ def context_settings(request):
         'PRIVACY_URL': settings.PRIVACY_URL,
         'IMPRINT_URL': settings.IMPRINT_URL,
         'SHOPPING_MIN_AUTOSYNC_INTERVAL': settings.SHOPPING_MIN_AUTOSYNC_INTERVAL,
-        'DISABLE_EXTERNAL_CONNECTORS': settings.DISABLE_EXTERNAL_CONNECTORS,
     }

cookbook/helper/dal.py

@@ -0,0 +1,34 @@
+from cookbook.models import Food, Keyword, Recipe, Unit
+
+from dal import autocomplete
+
+
+class BaseAutocomplete(autocomplete.Select2QuerySetView):
+    model = None
+
+    def get_queryset(self):
+        if not self.request.user.is_authenticated:
+            return self.model.objects.none()
+
+        qs = self.model.objects.filter(space=self.request.space).all()
+
+        if self.q:
+            qs = qs.filter(name__icontains=self.q)
+
+        return qs
+
+
+class KeywordAutocomplete(BaseAutocomplete):
+    model = Keyword
+
+
+class IngredientsAutocomplete(BaseAutocomplete):
+    model = Food
+
+
+class RecipeAutocomplete(BaseAutocomplete):
+    model = Recipe
+
+
+class UnitAutocomplete(BaseAutocomplete):
+    model = Unit

cookbook/helper/open_data_importer.py

@@ -1,20 +1,5 @@
-import traceback
-from collections import defaultdict
-from decimal import Decimal
-
 from cookbook.models import (Food, FoodProperty, Property, PropertyType, Supermarket,
                              SupermarketCategory, SupermarketCategoryRelation, Unit, UnitConversion)
-import re
-
-
-class OpenDataImportResponse:
-    total_created = 0
-    total_updated = 0
-    total_untouched = 0
-    total_errored = 0
-
-    def to_dict(self):
-        return {'total_created': self.total_created, 'total_updated': self.total_updated, 'total_untouched': self.total_untouched, 'total_errored': self.total_errored}
 
 
 class OpenDataImporter:
@@ -33,269 +18,69 @@ class OpenDataImporter:
     def _update_slug_cache(self, object_class, datatype):
         self.slug_id_cache[datatype] = dict(object_class.objects.filter(space=self.request.space, open_data_slug__isnull=False).values_list('open_data_slug', 'id', ))
 
-    @staticmethod
-    def _is_obj_identical(field_list, obj, existing_obj):
-        """
-        checks if the obj meant for import is identical to an already existing one
-        :param field_list: list of field names to check
-        :type field_list: list[str]
-        :param obj: object meant for import
-        :type obj: Object
-        :param existing_obj: object already in DB
-        :type existing_obj: Object
-        :return: if objects are identical
-        :rtype: bool
-        """
-        for field in field_list:
-            if isinstance(getattr(obj, field), float) or isinstance(getattr(obj, field), Decimal):
-                if abs(float(getattr(obj, field)) - float(existing_obj[field])) > 0.001:  # convert both to float and check if basically equal
-                    print(f'comparing FLOAT {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
-                    return False
-            elif getattr(obj, field) != existing_obj[field]:
-                print(f'comparing {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
-                return False
-        return True
-
-    @staticmethod
-    def _merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-        """
-        sometimes there might be two objects conflicting for open data import (one has the slug, the other the name)
-        this function checks if that is the case and merges the two objects if possible
-        :param model_type: type of model to check/merge
-        :type model_type: Model
-        :param obj: object that should be created/updated
-        :type obj: Model
-        :param existing_data_slugs: dict of open data slugs mapped to objects
-        :type existing_data_slugs: dict
-        :param existing_data_names: dict of names mapped to objects
-        :type existing_data_names: dict
-        :return: true if merge was successful or not necessary else false
-        :rtype: bool
-        """
-        if obj.open_data_slug in existing_data_slugs and obj.name in existing_data_names and existing_data_slugs[obj.open_data_slug]['pk'] != existing_data_names[obj.name]['pk']:
-            try:
-                source_obj = model_type.objects.get(pk=existing_data_slugs[obj.open_data_slug]['pk'])
-                del existing_data_slugs[obj.open_data_slug]
-                source_obj.merge_into(model_type.objects.get(pk=existing_data_names[obj.name]['pk']))
-                return True
-            except RuntimeError:
-                return False  # in the edge case (e.g. parent/child) that an object cannot be merged don't update it for now
-        else:
-            return True
-
-    @staticmethod
-    def _get_existing_obj(obj, existing_data_slugs, existing_data_names):
-        """
-        gets the existing object from slug or name cache
-        :param obj: object that should be found
-        :type obj: Model
-        :param existing_data_slugs: dict of open data slugs mapped to objects
-        :type existing_data_slugs: dict
-        :param existing_data_names: dict of names mapped to objects
-        :type existing_data_names: dict
-        :return: existing object
-        :rtype: dict
-        """
-        existing_obj = None
-        if obj.open_data_slug in existing_data_slugs:
-            existing_obj = existing_data_slugs[obj.open_data_slug]
-        elif obj.name in existing_data_names:
-            existing_obj = existing_data_names[obj.name]
-
-        return existing_obj
-
     def import_units(self):
-        od_response = OpenDataImportResponse()
         datatype = 'unit'
-        model_type = Unit
-        field_list = ['name', 'plural_name', 'base_unit', 'open_data_slug']
-
-        existing_data_slugs = {}
-        existing_data_names = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_names[obj['name']] = obj
-
-        update_list = []
-        create_list = []
 
+        insert_list = []
         for u in list(self.data[datatype].keys()):
-            obj = model_type(
+            insert_list.append(Unit(
                 name=self.data[datatype][u]['name'],
                 plural_name=self.data[datatype][u]['plural_name'],
-                base_unit=self.data[datatype][u]['base_unit'].lower() if self.data[datatype][u]['base_unit'] != '' else None,
+                base_unit=self.data[datatype][u]['base_unit'] if self.data[datatype][u]['base_unit'] != '' else None,
                 open_data_slug=u,
                 space=self.request.space
-            )
-            if obj.open_data_slug in existing_data_slugs or obj.name in existing_data_names:
-                if not self._merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-                    od_response.total_errored += 1
-                    continue  # if conflicting objects exist and cannot be merged skip object
+            ))
 
-                existing_obj = self._get_existing_obj(obj, existing_data_slugs, existing_data_names)
-
-                if not self._is_obj_identical(field_list, obj, existing_obj):
-                    obj.pk = existing_obj['pk']
-                    update_list.append(obj)
-                else:
-                    od_response.total_untouched += 1
-            else:
-                create_list.append(obj)
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
-
-        if len(create_list) > 0:
-            model_type.objects.bulk_create(create_list, update_conflicts=True, update_fields=field_list, unique_fields=('space', 'name',))
-            od_response.total_created += len(create_list)
-
-        return od_response
+        if self.update_existing:
+            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=(
+                'name', 'plural_name', 'base_unit', 'open_data_slug'), unique_fields=('space', 'name',))
+        else:
+            return Unit.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
 
     def import_category(self):
-        od_response = OpenDataImportResponse()
         datatype = 'category'
-        model_type = SupermarketCategory
-        field_list = ['name', 'open_data_slug']
-
-        existing_data_slugs = {}
-        existing_data_names = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_names[obj['name']] = obj
-
-        update_list = []
-        create_list = []
 
+        insert_list = []
         for k in list(self.data[datatype].keys()):
-            obj = model_type(
+            insert_list.append(SupermarketCategory(
                 name=self.data[datatype][k]['name'],
                 open_data_slug=k,
                 space=self.request.space
-            )
+            ))
 
-            if obj.open_data_slug in existing_data_slugs or obj.name in existing_data_names:
-                if not self._merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-                    od_response.total_errored += 1
-                    continue  # if conflicting objects exist and cannot be merged skip object
-
-                existing_obj = self._get_existing_obj(obj, existing_data_slugs, existing_data_names)
-
-                if not self._is_obj_identical(field_list, obj, existing_obj):
-                    obj.pk = existing_obj['pk']
-                    update_list.append(obj)
-                else:
-                    od_response.total_untouched += 1
-            else:
-                create_list.append(obj)
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
-
-        if len(create_list) > 0:
-            model_type.objects.bulk_create(create_list, update_conflicts=True, update_fields=field_list, unique_fields=('space', 'name',))
-            od_response.total_created += len(create_list)
-
-        return od_response
+        return SupermarketCategory.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
 
     def import_property(self):
-        od_response = OpenDataImportResponse()
         datatype = 'property'
-        model_type = PropertyType
-        field_list = ['name', 'unit', 'fdc_id', 'open_data_slug']
-
-        existing_data_slugs = {}
-        existing_data_names = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_names[obj['name']] = obj
-
-        update_list = []
-        create_list = []
 
+        insert_list = []
         for k in list(self.data[datatype].keys()):
-            obj = model_type(
+            insert_list.append(PropertyType(
                 name=self.data[datatype][k]['name'],
                 unit=self.data[datatype][k]['unit'],
-                fdc_id=self.data[datatype][k]['fdc_id'],
                 open_data_slug=k,
                 space=self.request.space
-            )
+            ))
 
-            if obj.open_data_slug in existing_data_slugs or obj.name in existing_data_names:
-                if not self._merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-                    od_response.total_errored += 1
-                    continue  # if conflicting objects exist and cannot be merged skip object
-
-                existing_obj = self._get_existing_obj(obj, existing_data_slugs, existing_data_names)
-
-                if not self._is_obj_identical(field_list, obj, existing_obj):
-                    obj.pk = existing_obj['pk']
-                    update_list.append(obj)
-                else:
-                    od_response.total_untouched += 1
-            else:
-                create_list.append(obj)
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
-
-        if len(create_list) > 0:
-            model_type.objects.bulk_create(create_list, update_conflicts=True, update_fields=field_list, unique_fields=('space', 'name',))
-            od_response.total_created += len(create_list)
-
-        return od_response
+        return PropertyType.objects.bulk_create(insert_list, update_conflicts=True, update_fields=('open_data_slug',), unique_fields=('space', 'name',))
 
     def import_supermarket(self):
-        od_response = OpenDataImportResponse()
         datatype = 'store'
-        model_type = Supermarket
-        field_list = ['name', 'open_data_slug']
-
-        existing_data_slugs = {}
-        existing_data_names = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_names[obj['name']] = obj
-
-        update_list = []
-        create_list = []
 
         self._update_slug_cache(SupermarketCategory, 'category')
+        insert_list = []
         for k in list(self.data[datatype].keys()):
-            obj = model_type(
+            insert_list.append(Supermarket(
                 name=self.data[datatype][k]['name'],
                 open_data_slug=k,
                 space=self.request.space
-            )
-            if obj.open_data_slug in existing_data_slugs or obj.name in existing_data_names:
-                if not self._merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-                    od_response.total_errored += 1
-                    continue  # if conflicting objects exist and cannot be merged skip object
-
-                existing_obj = self._get_existing_obj(obj, existing_data_slugs, existing_data_names)
-
-                if not self._is_obj_identical(field_list, obj, existing_obj):
-                    obj.pk = existing_obj['pk']
-                    update_list.append(obj)
-                else:
-                    od_response.total_untouched += 1
-            else:
-                create_list.append(obj)
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
-
-        if len(create_list) > 0:
-            model_type.objects.bulk_create(create_list, update_conflicts=True, update_fields=field_list, unique_fields=('space', 'name',))
-            od_response.total_created += len(create_list)
+            ))
 
         # always add open data slug if matching supermarket is found, otherwise relation might fail
+        supermarkets = Supermarket.objects.bulk_create(insert_list, unique_fields=('space', 'name',), update_conflicts=True, update_fields=('open_data_slug',))
         self._update_slug_cache(Supermarket, 'store')
 
+        insert_list = []
         for k in list(self.data[datatype].keys()):
             relations = []
             order = 0
@@ -311,186 +96,115 @@ class OpenDataImporter:
 
             SupermarketCategoryRelation.objects.bulk_create(relations, ignore_conflicts=True, unique_fields=('supermarket', 'category',))
 
-        return od_response
+        return supermarkets
 
     def import_food(self):
-        od_response = OpenDataImportResponse()
+        identifier_list = []
         datatype = 'food'
-        model_type = Food
-        field_list = ['name', 'open_data_slug']
+        for k in list(self.data[datatype].keys()):
+            identifier_list.append(self.data[datatype][k]['name'])
+            identifier_list.append(self.data[datatype][k]['plural_name'])
 
-        existing_data_slugs = {}
-        existing_data_names = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_names[obj['name']] = obj
-
-        update_list = []
-        create_list = []
+        existing_objects_flat = []
+        existing_objects = {}
+        for f in Food.objects.filter(space=self.request.space).filter(name__in=identifier_list).values_list('id', 'name', 'plural_name'):
+            existing_objects_flat.append(f[1])
+            existing_objects_flat.append(f[2])
+            existing_objects[f[1]] = f
+            existing_objects[f[2]] = f
 
         self._update_slug_cache(Unit, 'unit')
         self._update_slug_cache(PropertyType, 'property')
-        self._update_slug_cache(SupermarketCategory, 'category')
-
-        unit_g = Unit.objects.filter(space=self.request.space, base_unit__iexact='g').first()
-
-        for k in list(self.data[datatype].keys()):
-
-            obj_dict = {
-                'name': self.data[datatype][k]['name'],
-                'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
-                'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
-                'fdc_id': re.sub(r'\D', '', self.data[datatype][k]['fdc_id']) if self.data[datatype][k]['fdc_id'] != '' else None,
-                'open_data_slug': k,
-                'properties_food_unit_id': None,
-                'space_id': self.request.space.id,
-            }
-
-            if unit_g:
-                obj_dict['properties_food_unit_id'] = unit_g.id
-
-            obj = model_type(**obj_dict)
-
-            if obj.open_data_slug in existing_data_slugs or obj.name in existing_data_names:
-                if not self._merge_if_conflicting(model_type, obj, existing_data_slugs, existing_data_names):
-                    od_response.total_errored += 1
-                    continue  # if conflicting objects exist and cannot be merged skip object
-
-                existing_obj = self._get_existing_obj(obj, existing_data_slugs, existing_data_names)
-
-                if not self._is_obj_identical(field_list, obj, existing_obj):
-                    obj.pk = existing_obj['pk']
-                    update_list.append(obj)
-                else:
-                    od_response.total_untouched += 1
-            else:
-                create_list.append({'data': obj_dict})
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
-
-        if len(create_list) > 0:
-            Food.load_bulk(create_list, None)
-            od_response.total_created += len(create_list)
-
-        # --------------- PROPERTY STUFF -----------------------
-        model_type = Property
-        field_list = ['property_type_id', 'property_amount', 'open_data_food_slug']
-
-        existing_data_slugs = {}
-        existing_data_property_types = {}
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_food_slug']] = obj
-            existing_data_property_types[obj['property_type_id']] = obj
 
+        insert_list = []
+        insert_list_flat = []
         update_list = []
-        create_list = []
+        update_field_list = []
+        for k in list(self.data[datatype].keys()):
+            if not (self.data[datatype][k]['name'] in existing_objects_flat or self.data[datatype][k]['plural_name'] in existing_objects_flat):
+                if not (self.data[datatype][k]['name'] in insert_list_flat or self.data[datatype][k]['plural_name'] in insert_list_flat):
+                    insert_list.append({'data': {
+                        'name': self.data[datatype][k]['name'],
+                        'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
+                        'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
+                        'fdc_id': self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
+                        'open_data_slug': k,
+                        'space': self.request.space.id,
+                    }})
+                    # build a fake second flat array to prevent duplicate foods from being inserted.
+                    # trying to insert a duplicate would throw a db error :(
+                    insert_list_flat.append(self.data[datatype][k]['name'])
+                    insert_list_flat.append(self.data[datatype][k]['plural_name'])
+            else:
+                if self.data[datatype][k]['name'] in existing_objects:
+                    existing_food_id = existing_objects[self.data[datatype][k]['name']][0]
+                else:
+                    existing_food_id = existing_objects[self.data[datatype][k]['plural_name']][0]
+
+                if self.update_existing:
+                    update_field_list = ['name', 'plural_name', 'preferred_unit_id', 'preferred_shopping_unit_id', 'supermarket_category_id', 'fdc_id', 'open_data_slug', ]
+                    update_list.append(Food(
+                        id=existing_food_id,
+                        name=self.data[datatype][k]['name'],
+                        plural_name=self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
+                        supermarket_category_id=self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
+                        fdc_id=self.data[datatype][k]['fdc_id'] if self.data[datatype][k]['fdc_id'] != '' else None,
+                        open_data_slug=k,
+                    ))
+                else:
+                    update_field_list = ['open_data_slug', ]
+                    update_list.append(Food(id=existing_food_id, open_data_slug=k, ))
+
+        Food.load_bulk(insert_list, None)
+        if len(update_list) > 0:
+            Food.objects.bulk_update(update_list, update_field_list)
 
         self._update_slug_cache(Food, 'food')
 
-        for k in list(self.data['food'].keys()):
-            for fp in self.data['food'][k]['properties']['type_values']:
-                obj = model_type(
-                    property_type_id=self.slug_id_cache['property'][fp['property_type']],
-                    property_amount=fp['property_value'],
-                    open_data_food_slug=k,
-                    space=self.request.space,
-                )
+        food_property_list = []
+        # alias_list = []
 
-                if obj.open_data_food_slug in existing_data_slugs and obj.property_type_id in existing_data_property_types and existing_data_slugs[obj.open_data_food_slug] == existing_data_property_types[obj.property_type_id]:
-                    existing_obj = existing_data_slugs[obj.open_data_food_slug]
+        for k in list(self.data[datatype].keys()):
+            for fp in self.data[datatype][k]['properties']['type_values']:
+                # try catch here because somettimes key "k" is not set for he food cache
+                try:
+                    food_property_list.append(Property(
+                        property_type_id=self.slug_id_cache['property'][fp['property_type']],
+                        property_amount=fp['property_value'],
+                        import_food_id=self.slug_id_cache['food'][k],
+                        space=self.request.space,
+                    ))
+                except KeyError:
+                    print(str(k) + ' is not in self.slug_id_cache["food"]')
 
-                    if not self._is_obj_identical(field_list, obj, existing_obj):
-                        obj.pk = existing_obj['pk']
-                        update_list.append(obj)
-                else:
-                    create_list.append(obj)
-
-        if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-
-        if len(create_list) > 0:
-            model_type.objects.bulk_create(create_list, ignore_conflicts=True, unique_fields=('space', 'open_data_food_slug', 'property_type',))
-
-        linked_properties = list(FoodProperty.objects.filter(food__space=self.request.space).values_list('property_id', flat=True).all())
+        Property.objects.bulk_create(food_property_list, ignore_conflicts=True, unique_fields=('space', 'import_food_id', 'property_type',))
 
         property_food_relation_list = []
-        for p in model_type.objects.filter(space=self.request.space, open_data_food_slug__isnull=False).values_list('open_data_food_slug', 'id', ):
-            if p[1] == 147:
-                pass
-            # slug_id_cache should always exist, don't create relations for already linked properties (ignore_conflicts would do that as well but this is more performant)
-            if p[0] in self.slug_id_cache['food'] and p[1] not in linked_properties:
-                property_food_relation_list.append(Food.properties.through(food_id=self.slug_id_cache['food'][p[0]], property_id=p[1]))
+        for p in Property.objects.filter(space=self.request.space, import_food_id__isnull=False).values_list('import_food_id', 'id', ):
+            property_food_relation_list.append(Food.properties.through(food_id=p[0], property_id=p[1]))
 
-        FoodProperty.objects.bulk_create(property_food_relation_list, unique_fields=('food_id', 'property_id',))
+        FoodProperty.objects.bulk_create(property_food_relation_list, ignore_conflicts=True, unique_fields=('food_id', 'property_id',))
 
-        return od_response
+        return insert_list + update_list
 
     def import_conversion(self):
-        od_response = OpenDataImportResponse()
         datatype = 'conversion'
-        model_type = UnitConversion
-        field_list = ['base_amount', 'base_unit_id', 'converted_amount', 'converted_unit_id', 'food_id', 'open_data_slug']
-
-        self._update_slug_cache(Food, 'food')
-        self._update_slug_cache(Unit, 'unit')
-
-        existing_data_slugs = {}
-        existing_data_foods = defaultdict(list)
-        for obj in model_type.objects.filter(space=self.request.space).values('pk', *field_list):
-            existing_data_slugs[obj['open_data_slug']] = obj
-            existing_data_foods[obj['food_id']].append(obj)
-
-        update_list = []
-        create_list = []
 
+        insert_list = []
         for k in list(self.data[datatype].keys()):
-            # try catch here because sometimes key "k" is not set for the food cache
+            # try catch here because sometimes key "k" is not set for he food cache
             try:
-                obj = model_type(
-                    base_amount=Decimal(self.data[datatype][k]['base_amount']),
+                insert_list.append(UnitConversion(
+                    base_amount=self.data[datatype][k]['base_amount'],
                     base_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['base_unit']],
-                    converted_amount=Decimal(self.data[datatype][k]['converted_amount']),
+                    converted_amount=self.data[datatype][k]['converted_amount'],
                     converted_unit_id=self.slug_id_cache['unit'][self.data[datatype][k]['converted_unit']],
                     food_id=self.slug_id_cache['food'][self.data[datatype][k]['food']],
                     open_data_slug=k,
                     space=self.request.space,
-                    created_by_id=self.request.user.id,
-                )
+                    created_by=self.request.user,
+                ))
+            except KeyError:
+                print(str(k) + ' is not in self.slug_id_cache["food"]')
 
-                if obj.open_data_slug in existing_data_slugs:
-                    existing_obj = existing_data_slugs[obj.open_data_slug]
-                    if not self._is_obj_identical(field_list, obj, existing_obj):
-                        obj.pk = existing_obj['pk']
-                        update_list.append(obj)
-                    else:
-                        od_response.total_untouched += 1
-                else:
-                    matching_existing_found = False
-                    if obj.food_id in existing_data_foods:
-                        for edf in existing_data_foods[obj.food_id]:
-                            if obj.base_unit_id == edf['base_unit_id'] and obj.converted_unit_id == edf['converted_unit_id']:
-                                matching_existing_found = True
-                                if not self._is_obj_identical(field_list, obj, edf):
-                                    obj.pk = edf['pk']
-                                    update_list.append(obj)
-                                else:
-                                    od_response.total_untouched += 1
-                    if not matching_existing_found:
-                        create_list.append(obj)
-            except KeyError as e:
-                traceback.print_exc()
-                od_response.total_errored += 1
-                print(self.data[datatype][k]['food'] + ' is not in self.slug_id_cache["food"]')
-
-        if self.update_existing and len(update_list) > 0:
-            od_response.total_updated = model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_errored += len(update_list) - od_response.total_updated
-
-        if len(create_list) > 0:
-            objs_created = model_type.objects.bulk_create(create_list, ignore_conflicts=True, unique_fields=('space', 'base_unit', 'converted_unit', 'food', 'open_data_slug'))
-            od_response.total_created = len(objs_created)
-            od_response.total_errored += len(create_list) - od_response.total_created
-
-        return od_response
+        return UnitConversion.objects.bulk_create(insert_list, ignore_conflicts=True, unique_fields=('space', 'base_unit', 'converted_unit', 'food', 'open_data_slug'))

cookbook/helper/permission_helper.py

@@ -75,7 +75,7 @@ def is_object_owner(user, obj):
     if not user.is_authenticated:
         return False
     try:
-        return obj.get_owner() == 'orphan' or obj.get_owner() == user
+        return obj.get_owner() == user
     except Exception:
         return False
 

cookbook/helper/property_helper.py

@@ -45,12 +45,12 @@ class FoodPropertyHelper:
                 conversions = uch.get_conversions(i)
                 for pt in property_types:
                     found_property = False
-                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:  # if food is configured incorrectly
-                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
-                        computed_properties[pt.id]['missing_value'] = True
+                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
+                        computed_properties[pt.id]['missing_value'] = i.food.properties_food_unit is None
                     else:
                         for p in i.food.properties.all():
-                            if p.property_type == pt and p.property_amount is not None:
+                            if p.property_type == pt:
                                 for c in conversions:
                                     if c.unit == i.food.properties_food_unit:
                                         found_property = True
@@ -58,20 +58,16 @@ class FoodPropertyHelper:
                                         computed_properties[pt.id]['food_values'] = self.add_or_create(
                                             computed_properties[p.property_type.id]['food_values'], c.food.id, (c.amount / i.food.properties_food_amount) * p.property_amount, c.food)
                     if not found_property:
-                        if i.amount == 0:  # don't count ingredients without an amount as missing
-                            computed_properties[pt.id]['missing_value'] = computed_properties[pt.id]['missing_value'] or False  # don't override if another food was already missing
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
-                        else:
-                            computed_properties[pt.id]['missing_value'] = True
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
+                        computed_properties[pt.id]['missing_value'] = True
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
 
         return computed_properties
 
     # small dict helper to add to existing key or create new, probably a better way of doing this
-    # TODO move to central helper ? --> use defaultdict
+    # TODO move to central helper ?
     @staticmethod
     def add_or_create(d, key, value, food):
-        if key in d and d[key]['value']:
+        if key in d:
             d[key]['value'] += value
         else:
             d[key] = {'id': food.id, 'food': food.name, 'value': value}

cookbook/helper/recipe_url_import.py

@@ -231,7 +231,7 @@ def get_recipe_properties(space, property_data):
                             'id': pt.id,
                             'name': pt.name,
                         },
-                        'property_amount': parse_servings(property_data[properties[p]]) / parse_servings(property_data['servingSize']),
+                        'property_amount': parse_servings(property_data[properties[p]]) / float(property_data['servingSize']),
                     })
 
     return recipe_properties

cookbook/helper/shopping_helper.py

@@ -1,8 +1,9 @@
-
+from datetime import timedelta
 from decimal import Decimal
 
 from django.db.models import F, OuterRef, Q, Subquery, Value
 from django.db.models.functions import Coalesce
+from django.utils import timezone
 from django.utils.translation import gettext as _
 
 from cookbook.models import (Ingredient, MealPlan, Recipe, ShoppingListEntry, ShoppingListRecipe,
@@ -26,6 +27,9 @@ def shopping_helper(qs, request):
     elif checked in ['true', 1, '1']:
         qs = qs.filter(checked=True)
     elif checked in ['recent']:
+        today_start = timezone.now().replace(hour=0, minute=0, second=0)
+        week_ago = today_start - timedelta(days=user.userpreference.shopping_recent_days)
+        qs = qs.filter(Q(checked=False) | Q(completed_at__gte=week_ago))
         supermarket_order = ['checked'] + supermarket_order
 
     return qs.distinct().order_by(*supermarket_order).select_related('unit', 'food', 'ingredient', 'created_by', 'list_recipe', 'list_recipe__mealplan', 'list_recipe__recipe')
@@ -75,8 +79,10 @@ class RecipeShoppingEditor():
 
     @staticmethod
     def get_shopping_list_recipe(id, user, space):
-        return ShoppingListRecipe.objects.filter(id=id).filter(entries__space=space).filter(
-            Q(entries__created_by=user)
+        return ShoppingListRecipe.objects.filter(id=id).filter(Q(shoppinglist__space=space) | Q(entries__space=space)).filter(
+            Q(shoppinglist__created_by=user)
+            | Q(shoppinglist__shared=user)
+            | Q(entries__created_by=user)
             | Q(entries__created_by__in=list(user.get_shopping_share()))
         ).prefetch_related('entries').first()
 

cookbook/integration/mealmaster.py

@@ -22,7 +22,7 @@ class MealMaster(Integration):
                         if 'Yield:' in line:
                             servings_text = line.replace('Yield:', '').strip()
                         else:
-                            if re.match(r'\s{2,}([0-9])+', line):
+                            if re.match('\s{2,}([0-9])+', line):
                                 ingredients.append(line.strip())
                             else:
                                 directions.append(line.strip())

cookbook/integration/rezeptsuitede.py

@@ -1,6 +1,6 @@
 import base64
 from io import BytesIO
-from lxml import etree
+from xml import etree
 
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import parse_servings, parse_servings_text
@@ -53,10 +53,7 @@ class Rezeptsuitede(Integration):
                 u = ingredient_parser.get_unit(ingredient.attrib['unit'])
                 amount = 0
                 if ingredient.attrib['qty'].strip() != '':
-                    try:
-                        amount, unit, note = ingredient_parser.parse_amount(ingredient.attrib['qty'])
-                    except ValueError:  # sometimes quantities contain words which cant be parsed
-                        pass
+                    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:

cookbook/management/commands/fix_duplicate_properties.py

@@ -1,34 +0,0 @@
-from django.conf import settings
-from django.contrib.postgres.search import SearchVector
-from django.core.management.base import BaseCommand
-from django.db.models import Count
-from django.utils import translation
-from django.utils.translation import gettext_lazy as _
-from django_scopes import scopes_disabled
-
-from cookbook.managers import DICTIONARY
-from cookbook.models import Recipe, Step, FoodProperty, Food
-
-
-# can be executed at the command line with 'python manage.py rebuildindex'
-class Command(BaseCommand):
-    help = _('Fixes foods with ')
-
-    def add_arguments(self, parser):
-        parser.add_argument('-d', '--dry-run', help='does not delete properties but instead prints them', action='store_true')
-
-    def handle(self, *args, **options):
-        with scopes_disabled():
-            foods_with_duplicate_properties = Food.objects.annotate(property_type_count=Count('foodproperty__property__property_type') - Count('foodproperty__property__property_type', distinct=True)).filter(property_type_count__gt=0).all()
-            for f in foods_with_duplicate_properties:
-                found_property_types = []
-                for fp in f.properties.all():
-                    if fp.property_type.id in found_property_types:
-                        if options['dry_run']:
-                            print(f'Property id {fp.id} duplicate type {fp.property_type}({fp.property_type.id}) for food {f}({f.id})')
-                        else:
-                            print(f'DELETING property id {fp.id} duplicate type {fp.property_type}({fp.property_type.id}) for food {f}({f.id})')
-                            fp.delete()
-
-                    else:
-                        found_property_types.append(fp.property_type.id)

cookbook/management/commands/seed_basic_data.py

@@ -1,25 +0,0 @@
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.postgres.search import SearchVector
-from django.core.management.base import BaseCommand
-from django.utils import translation
-from django.utils.translation import gettext_lazy as _
-from django_scopes import scopes_disabled
-
-from cookbook.managers import DICTIONARY
-from cookbook.models import Recipe, Step, Space
-
-
-class Command(BaseCommand):
-    help = 'Seeds some basic data (space, account, food)'
-
-    def handle(self, *args, **options):
-        with scopes_disabled():
-            user = User.objects.get_or_create(username='test')[0]
-            user.set_password('test')
-            user.save()
-
-            space = Space.objects.get_or_create(
-                name='Test Space',
-                created_by=user
-            )[0]

cookbook/migrations/0159_add_shoppinglistentry_fields.py

@@ -6,12 +6,11 @@ from django.conf import settings
 from django.db import migrations, models
 from django_scopes import scopes_disabled
 
-from cookbook.models import PermissionModelMixin
+from cookbook.models import PermissionModelMixin, ShoppingListEntry
 
 
 def copy_values_to_sle(apps, schema_editor):
     with scopes_disabled():
-        ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
         entries = ShoppingListEntry.objects.all()
         for entry in entries:
             if entry.shoppinglist_set.first():

cookbook/migrations/0160_delete_shoppinglist_orphans.py

@@ -1,22 +1,25 @@
 # Generated by Django 3.2.7 on 2021-10-01 22:34
 
+import datetime
 from datetime import timedelta
 
+import django.db.models.deletion
 from django.conf import settings
-from django.db import migrations
+from django.db import migrations, models
 from django.utils import timezone
+from django.utils.timezone import utc
 from django_scopes import scopes_disabled
 
+from cookbook.models import FoodInheritField, ShoppingListEntry
+
 
 def delete_orphaned_sle(apps, schema_editor):
-    ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
     with scopes_disabled():
         # shopping list entry is orphaned - delete it
         ShoppingListEntry.objects.filter(shoppinglist=None).delete()
 
 
 def create_inheritfields(apps, schema_editor):
-    FoodInheritField = apps.get_model('cookbook', 'FoodInheritField')
     FoodInheritField.objects.create(name='Supermarket Category', field='supermarket_category')
     FoodInheritField.objects.create(name='On Hand', field='food_onhand')
     FoodInheritField.objects.create(name='Diet', field='diet')
@@ -26,7 +29,6 @@ def create_inheritfields(apps, schema_editor):
 
 
 def set_completed_at(apps, schema_editor):
-    ShoppingListEntry = apps.get_model('cookbook', 'ShoppingListEntry')
     today_start = timezone.now().replace(hour=0, minute=0, second=0)
     # arbitrary - keeping all of the closed shopping list items out of the 'recent' view
     month_ago = today_start - timedelta(days=30)