Merge branch 'develop' into beta

Author: vabene1111

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
                       ./cookbook/static
                       ./staticfiles
                   key: |
-                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue/src/*') }}
+                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue3/src/*') }}
 
             # Build Vue frontend & Dependencies
             - name: Set up Node ${{ matrix.node-version }}

.gitignore

@@ -89,3 +89,5 @@ venv/
 .idea/easy-i18n.xml
 cookbook/static/vue3
 vue3/node_modules
+cookbook/tests/other/docs/reports/tests/tests.html
+cookbook/tests/other/docs/reports/tests/pytest.xml

Dockerfile

@@ -1,15 +1,15 @@
 FROM python:3.13-alpine3.21
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git libgcc libstdc++
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git libgcc libstdc++ nginx
 
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
 
 ENV DOCKER true
 
 #This port will be used by gunicorn.
-EXPOSE 8080
+EXPOSE 80 8080
 
 #Create app dir and install requirements.
 RUN mkdir /opt/recipes
@@ -40,6 +40,10 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 #Copy project and execute it.
 COPY . ./
 
+# delete default nginx config and link it to tandoors config
+RUN rm -rf /etc/nginx/http.d
+RUN ln -s /opt/recipes/http.d /etc/nginx/http.d
+
 # commented for now https://github.com/TandoorRecipes/recipes/issues/3478
 #HEALTHCHECK --interval=30s \
 #            --timeout=5s \

boot.sh

@@ -5,7 +5,6 @@ TANDOOR_PORT="${TANDOOR_PORT:-8080}"
 GUNICORN_WORKERS="${GUNICORN_WORKERS:-3}"
 GUNICORN_THREADS="${GUNICORN_THREADS:-2}"
 GUNICORN_LOG_LEVEL="${GUNICORN_LOG_LEVEL:-'info'}"
-NGINX_CONF_FILE=/opt/recipes/nginx/conf.d/Recipes.conf
 
 display_warning() {
     echo "[WARNING]"
@@ -14,11 +13,6 @@ display_warning() {
 
 echo "Checking configuration..."
 
-# Nginx config file must exist if gunicorn is not active
-if [ ! -f "$NGINX_CONF_FILE" ] && [ $GUNICORN_MEDIA -eq 0 ]; then
-    display_warning "Nginx configuration file could not be found at the default location!\nPath: ${NGINX_CONF_FILE}"
-fi
-
 # SECRET_KEY (or a valid file at SECRET_KEY_FILE) must be set in .env file
 
 if [ -f "${SECRET_KEY_FILE}" ]; then
@@ -92,6 +86,11 @@ chmod -R 755 /opt/recipes/mediafiles
 
 ipv6_disable=$(cat /sys/module/ipv6/parameters/disable)
 
+# start nginx
+echo "Starting nginx"
+nginx
+
+echo "Starting gunicorn"
 # 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

cookbook/helper/ingredient_parser.py

@@ -211,44 +211,46 @@ def parse(self, ingredient):
                 # three arguments if it already has a unit there can't be
                 # a fraction for the amount
                 if len(tokens) > 2:
+                    never_unit_applied = False
                     if not self.ignore_rules:
                         tokens, never_unit_applied = self.automation.apply_never_unit_automation(tokens)
-                        if never_unit_applied:
-                            unit = tokens[1]
-                            food, note = self.parse_food(tokens[2:])
-                        else:
-                            try:
-                                if unit is not None:
-                                    # a unit is already found, no need to try the second argument for a fraction
-                                    # probably not the best method to do it, but I didn't want to make an if check and paste the exact same thing in the else as already is in the except
-                                    raise ValueError
-                                # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'
-                                if tokens[1]:
-                                    amount += self.parse_fraction(tokens[1])
-                                # assume that units can't end with a comma
-                                if len(tokens) > 3 and not tokens[2].endswith(','):
-                                    # try to use third argument as unit and everything else as food, use everything as food if it fails
-                                    try:
-                                        food, note = self.parse_food(tokens[3:])
-                                        unit = tokens[2]
-                                    except ValueError:
-                                        food, note = self.parse_food(tokens[2:])
-                                else:
+
+                    if never_unit_applied:
+                        unit = tokens[1]
+                        food, note = self.parse_food(tokens[2:])
+                    else:
+                        try:
+                            if unit is not None:
+                                # a unit is already found, no need to try the second argument for a fraction
+                                # probably not the best method to do it, but I didn't want to make an if check and paste the exact same thing in the else as already is in the except
+                                raise ValueError
+                            # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'
+                            if tokens[1]:
+                                amount += self.parse_fraction(tokens[1])
+                            # assume that units can't end with a comma
+                            if len(tokens) > 3 and not tokens[2].endswith(','):
+                                # try to use third argument as unit and everything else as food, use everything as food if it fails
+                                try:
+                                    food, note = self.parse_food(tokens[3:])
+                                    unit = tokens[2]
+                                except ValueError:
+                                    food, note = self.parse_food(tokens[2:])
+                            else:
+                                food, note = self.parse_food(tokens[2:])
+                        except ValueError:
+                            # assume that units can't end with a comma
+                            if not tokens[1].endswith(','):
+                                # try to use second argument as unit and everything else as food, use everything as food if it fails
+                                try:
                                     food, note = self.parse_food(tokens[2:])
-                            except ValueError:
-                                # assume that units can't end with a comma
-                                if not tokens[1].endswith(','):
-                                    # try to use second argument as unit and everything else as food, use everything as food if it fails
-                                    try:
-                                        food, note = self.parse_food(tokens[2:])
-                                        if unit is None:
-                                            unit = tokens[1]
-                                        else:
-                                            note = tokens[1]
-                                    except ValueError:
-                                        food, note = self.parse_food(tokens[1:])
-                                else:
+                                    if unit is None:
+                                        unit = tokens[1]
+                                    else:
+                                        note = tokens[1]
+                                except ValueError:
                                     food, note = self.parse_food(tokens[1:])
+                            else:
+                                food, note = self.parse_food(tokens[1:])
                 else:
                     # only two arguments, first one is the amount
                     # which means this is the food
@@ -269,6 +271,7 @@ def parse(self, ingredient):
 
         if food and not self.ignore_rules:
             food = self.automation.apply_food_automation(food)
+
         if len(food) > Food._meta.get_field('name').max_length:  # test if food name is to long
             # try splitting it at a space and taking only the first arg
             if len(food.split()) > 1 and len(food.split()[0]) < Food._meta.get_field('name').max_length:

cookbook/helper/property_helper.py

@@ -62,9 +62,14 @@ def calculate_recipe_properties(self, recipe):
                                         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 or i.no_amount:  # 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
+                        # if no amount and food does not exist yet add it but don't count as missing
+                        if i.amount == 0 or i.no_amount and i.food.id not in computed_properties[pt.id]['food_values']:
                             computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': 0}
+                        # if amount is present but unit is missing indicate it in the result
+                        elif i.unit is None:
+                            if i.food.id not in computed_properties[pt.id]['food_values']:
+                                computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': 0}
+                            computed_properties[pt.id]['food_values'][i.food.id]['missing_unit'] = True
                         else:
                             computed_properties[pt.id]['missing_value'] = True
                             computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': None}

cookbook/locale/lv/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-11-05 10:58+0000\n"
+"PO-Revision-Date: 2025-07-21 09:43+0000\n"
 "Last-Translator: Aija Kozlovska <[email protected]>\n"
 "Language-Team: Latvian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/lv/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -83,8 +83,8 @@ msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
-"Atstājiet tukšu Dropbox un ievadiet tikai Nextcloud bāzes URL (<kods> /"
-"remote.php/webdav/ </code> tiek pievienots automātiski)"
+"Atstājiet tukšu Dropbox un ievadiet tikai Nextcloud bāzes URL (<code> /remote"
+".php/webdav/ </code> tiek pievienots automātiski)"
 
 #: .\cookbook\forms.py:188
 msgid ""
@@ -147,48 +147,65 @@ msgid ""
 "Determines how fuzzy a search is if it uses trigram similarity matching (e."
 "g. low values mean more typos are ignored)."
 msgstr ""
+"Nosaka cik precīza ir meklēšana gadījumā, ja tiek izmantota trigram līdzība ("
+"jo zemāka vērtība, jo vairāk rakstīšanas kļūdas tiek ignorētas)."
 
 #: .\cookbook\forms.py:340
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
 msgstr ""
+"Izvēlies meklēšanas veidu. Spied <a href=\"/docs/search/\">šeit</a>, lai "
+"apskatītu visas iespējas."
 
 #: .\cookbook\forms.py:341
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
+"Izmanto aptuveno meklēšanu vienībām, atslēgas vārdiem un sastāvdaļām "
+"importējot un labojot receptes."
 
 #: .\cookbook\forms.py:342
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
+"Lauki, kurus meklējot ignorēt akcentus.  Šī varianta izvēlēšanās var uzlabot "
+"vai pasliktināt meklēšanas kvalitāti atkarībā no valodas"
 
 #: .\cookbook\forms.py:343
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
+"Lauki, kuros meklēt aptuveno līdzību. (piem. meklējot vārdu 'Kūka' tiks "
+"atrasts arī 'kūka' un 'ābolkūka')"
 
 #: .\cookbook\forms.py:344
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
+"Lauki, kuros meklēt vārdu līdzības sākumu. (piem meklējot 'la' atradīt "
+"'lapas' un 'laims')"
 
 #: .\cookbook\forms.py:345
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
+"Lauki, kuriem izmantot aptuveno meklēšanu. (piem. meklējot 'recpte' tiks "
+"atrasts 'recepte'.)  Piezīme: šis variants konfliktēs ar 'web' un 'raw' "
+"meklēšanas metodēm."
 
 #: .\cookbook\forms.py:346
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
+"Lauki priekš pilnās teksta meklēšanas.  Piezīme: 'web', 'phrase' un 'raw' "
+"meklēšanas metodes darbojās tikai ar pilno teksta meklēšanu."
 
 #: .\cookbook\forms.py:350
 #, fuzzy
@@ -198,11 +215,11 @@ msgstr "Meklēt"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
-msgstr ""
+msgstr "Aptuvenā meklēšana"
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr ""
+msgstr "Ignorēt akcentus"
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
@@ -745,8 +762,8 @@ msgid ""
 "            ."
 msgstr ""
 "Lūdzu apstipriniet, ka\n"
-"            <a href=\"mailto:%(email)s\">%(email)s</a> ir lietotāja "
-"%(user_display) e-pasta adrese\n"
+"            <a href=\"mailto:%(email)s\">%(email)s</a> ir e-pasta adrese "
+"lietotājam %(user_display)\n"
 "            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
@@ -1331,7 +1348,7 @@ msgstr ""
 #: .\cookbook\templates\markdown_info.html:57
 #: .\cookbook\templates\markdown_info.html:73
 msgid "or by leaving a blank line in between."
-msgstr "vai atstājot tukšu rindu starp  ."
+msgstr "vai atstājot tukšu rindu starp."
 
 #: .\cookbook\templates\markdown_info.html:59
 #: .\cookbook\templates\markdown_info.html:74
@@ -1443,7 +1460,7 @@ msgstr "Nav Tiesību"
 
 #: .\cookbook\templates\no_groups_info.html:17
 msgid "You do not have any groups and therefor cannot use this application."
-msgstr "Jūs neesat nevienā grupā un tādēļ nevarat izmantot šo lietotni!"
+msgstr "Jūs neesat nevienā grupā un tādēļ nevarat izmantot šo lietotni."
 
 #: .\cookbook\templates\no_groups_info.html:18
 #: .\cookbook\templates\no_perm_info.html:15
@@ -1460,7 +1477,7 @@ msgid ""
 "You do not have the required permissions to view this page or perform this "
 "action."
 msgstr ""
-"Jums nav nepieciešamo atļauju, lai skatītu šo vietni vai veiktu šo darbību!"
+"Jums nav nepieciešamo atļauju, lai skatītu šo vietni vai veiktu šo darbību."
 
 #: .\cookbook\templates\offline.html:6
 msgid "Offline"
@@ -1548,6 +1565,16 @@ msgid ""
 "html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
 "            "
 msgstr ""
+" \n"
+"            Pilnā teksta meklēšanas mēģinājums vienkāršot dotos vārdus, lai "
+"tie sakristu ar tipiskajiem variantiem.  Piemēram: 'griezt', 'griezšana', "
+"'griezums' tiks vienkāršots uz 'griez'.\n"
+"            Lai kontrolētu meklētāja darbību ievadot vairākus meklējamos "
+"vārdus, ir pieejamas vairākas zemāk aprakstītās metodes.\n"
+"            Pilno tehnisko informāciju par tām var apskatīt <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls.html"
+"#TEXTSEARCH-PARSING-QUERIES>Postgresql mājas lapā.</a>\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:29
 msgid ""
@@ -2547,22 +2574,12 @@ msgid "Unable to determine PostgreSQL version."
 msgstr ""
 
 #: .\cookbook\views\views.py:317
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "            This application is not running with a Postgres database "
-#| "backend. This is ok but not recommended as some\n"
-#| "            features only work with postgres databases.\n"
-#| "        "
 msgid ""
 "This application is not running with a Postgres database backend. This is ok "
 "but not recommended as some features only work with postgres databases."
 msgstr ""
-"\n"
-"             Šī lietojumprogramma nedarbojas, izmantojot Postgres datubāzi. "
-"Tas ir labi, bet nav ieteicams, jo dažas\n"
-"             funkcijas darbojas tikai ar Postgres datu bāzēm.\n"
-"        "
+"Šī lietojumprogramma nedarbojas, izmantojot Postgres datubāzi. Tas ir labi, "
+"bet nav ieteicams, jo dažas funkcijas darbojas tikai ar Postgres datu bāzēm."
 
 #: .\cookbook\views\views.py:360
 #, fuzzy