From 157af15a2ad8477ca1da4c3156b9bce98f122122 Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Sat, 18 Jan 2025 09:29:09 -0600
Subject: [PATCH 1/2] added (',', ';', ':') to notes tokenization in
 ingredient_parser.py

---
 cookbook/helper/ingredient_parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/helper/ingredient_parser.py b/cookbook/helper/ingredient_parser.py
index be53c21a2..b4bf0568b 100644
--- a/cookbook/helper/ingredient_parser.py
+++ b/cookbook/helper/ingredient_parser.py
@@ -118,7 +118,7 @@ class IngredientParser:
         note = ''
         start = 0
         # search for first occurrence of an argument ending in a comma
-        while start < len(tokens) and not tokens[start].endswith(','):
+        while start < len(tokens) and not tokens[start].endswith((',', ';', ':')):
             start += 1
         if start == len(tokens):
             # no token ending in a comma found -> use everything as food

From 03dd4370b91d9f56a15827c2eef61713b1fb1dda Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 19 Jan 2025 18:44:01 +0100
Subject: [PATCH 2/2] update nextcloud import docs

---
 docs/features/import_export.md | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/features/import_export.md b/docs/features/import_export.md
index 0d6143a6f..5639c27a6 100644
--- a/docs/features/import_export.md
+++ b/docs/features/import_export.md
@@ -75,24 +75,23 @@ structured information most of your recipe is going to be intact.
 Follow these steps to import your recipes
 
 1. Go to your Nextcloud Webinterface
-2. Open the `Recipes` folder where your recipes are stored
-3. Select the recipes you want to export or use the checkbox at the top of the list to select all of them
-4. Click on the three dot **Actions** and press Download
+2. Find the `Recipes` folder (usually located in the root directory of your account)
+3. Download that folder to get your `Recipes.zip` which includes the folder `Recipes` and in that a folder for each recipe
+4. Upload the `Recipes.zip` to Tandoor and import it
 
-You will get a `Recipes.zip` file. Simply upload the file and choose the Nextcloud Cookbook type.
 
 !!! WARNING "Folder Structure"
-Importing only works if the folder structure is correct. If you do not use the standard path or create the
-zip file in any other way make sure the structure is as follows
-`  Recipes.zip/
-    └── Recipes/
-        ├── Recipe1/
-        │   ├── recipe.json
-        │   └── full.jpg
-        └── Recipe2/
-            ├── recipe.json
-            └── full.jpg
- `
+    Importing only works if the folder structure is correct. If you do not use the standard path or create the
+    zip file in any other way make sure the structure is as follows
+    `  Recipes.zip/
+        └── Recipes/
+            ├── Recipe1/
+            │   ├── recipe.json
+            │   └── full.jpg
+            └── Recipe2/
+                ├── recipe.json
+                └── full.jpg
+    `
 
 ## Mealie
 
@@ -113,8 +112,7 @@ In order to import your Chowdown recipes simply create a `.zip` file from those
 The folder structure should look as follows
 
 !!! info "_recipes"
-For some reason chowdown uses `_`before the`recipes`folder. To avoid confusion the import supports both
-   `\_recipes`and`recipes`
+    For some reason chowdown uses `_`before the`recipes`folder. To avoid confusion the import supports both `\_recipes`and`recipes`
 
 ```
 Recipes.zip/