From a85fa3fc54535b7dd6f40774ff85fbeca4e48dd8 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 21 May 2022 11:50:01 -0800 Subject: [PATCH] add null check for source directory (#1248) --- mealie/services/migrations/mealie_alpha.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mealie/services/migrations/mealie_alpha.py b/mealie/services/migrations/mealie_alpha.py index 3d3980734f43..59812600ad57 100644 --- a/mealie/services/migrations/mealie_alpha.py +++ b/mealie/services/migrations/mealie_alpha.py @@ -1,3 +1,4 @@ +import contextlib import shutil import tempfile import zipfile @@ -27,25 +28,17 @@ class MealieAlphaMigrator(BaseMigrator): if recipe.get("categories", False): recipe["recipeCategory"] = recipe.get("categories") del recipe["categories"] - try: + + with contextlib.suppress(KeyError): del recipe["_id"] del recipe["date_added"] - except Exception: - pass - # Migration from list to Object Type Data - try: + with contextlib.suppress(KeyError): if "" in recipe["tags"]: recipe["tags"] = [tag for tag in recipe["tags"] if tag != ""] - except Exception: - pass - - try: + with contextlib.suppress(KeyError): if "" in recipe["categories"]: recipe["categories"] = [cat for cat in recipe["categories"] if cat != ""] - except Exception: - pass - if type(recipe["extras"]) == list: recipe["extras"] = {} @@ -86,6 +79,9 @@ class MealieAlphaMigrator(BaseMigrator): if dest_dir.exists(): shutil.rmtree(dest_dir) + if source_dir is None: + continue + for dir in source_dir.iterdir(): if dir.is_dir(): shutil.copytree(dir, dest_dir / dir.name)