diff --git a/mealie/services/migrations/nextcloud.py b/mealie/services/migrations/nextcloud.py index f4a924b9c..5e356cd03 100644 --- a/mealie/services/migrations/nextcloud.py +++ b/mealie/services/migrations/nextcloud.py @@ -28,7 +28,8 @@ def import_recipes(recipe_dir: Path) -> Recipe: for file in recipe_dir.glob("full.*"): image = file - recipe_file = recipe_dir.joinpath("recipe.json") + for file in recipe_dir.glob("*.json"): + recipe_file = file with open(recipe_file, "r") as f: recipe_dict = json.loads(f.read()) @@ -81,6 +82,7 @@ def migrate(session, selection: str): successful_imports.append(recipe.name) except: logging.error(f"Failed Nextcloud Import: {dir.name}") + logging.exception('') failed_imports.append(dir.name) cleanup() diff --git a/mealie/services/scrape_services.py b/mealie/services/scrape_services.py index f2a6856e6..f5d644c4d 100644 --- a/mealie/services/scrape_services.py +++ b/mealie/services/scrape_services.py @@ -35,6 +35,9 @@ def normalize_image_url(image) -> str: def normalize_instructions(instructions) -> List[dict]: + if not instructions: + return [] + # One long string split by (possibly multiple) new lines if type(instructions) == str: return [