Frontend Refactor + Bug Fixes

* merge category and tag selector

* unifiy category selector

* add hint

* spacing

* fix nextcloud migration

* simplify email validator #261

* formatting

* cleanup

* auto-gen

* format

* update run script

* unified category/tag selector

* rename component

* Add advanced search link

* remove old code

* convert keywords to tags

* add proper behavior on rename

* proper image name association on rename

* fix test cleanup

* changelog

* set docker comppand

* minify on migration

Co-authored-by: hay-kot <hay-kot@pm.me>

mealie/services/image/image.py

@@ -29,7 +29,6 @@ def read_image(recipe_slug: str, image_type: str = "original") -> Path:
     Returns:
         Path: [description]
     """
-    print(image_type)
     recipe_slug = recipe_slug.split(".")[0]  # Incase of File Name
     recipe_image_dir = app_dirs.IMG_DIR.joinpath(recipe_slug)
 
@@ -39,6 +38,18 @@ def read_image(recipe_slug: str, image_type: str = "original") -> Path:
     return None
 
 
+def rename_image(original_slug, new_slug) -> Path:
+    current_path = app_dirs.IMG_DIR.joinpath(original_slug)
+    new_path = app_dirs.IMG_DIR.joinpath(new_slug)
+
+    try:
+        new_path = current_path.rename(new_path)
+    except FileNotFoundError:
+        logger.error(f"Image Directory {original_slug} Doesn't Exist")
+
+    return new_path
+
+
 def write_image(recipe_slug: str, file_data: bytes, extension: str) -> Path.name:
     try:
         delete_image(recipe_slug)

mealie/services/image/minify.py

@@ -1,8 +1,12 @@
 import shutil
 from pathlib import Path
 
+from fastapi.logger import logger
 from mealie.core.config import app_dirs
-from PIL import Image, UnidentifiedImageError
+from mealie.db.database import db
+from mealie.db.db_setup import create_session
+from PIL import Image
+from sqlalchemy.orm.session import Session
 
 
 def minify_image(image_file: Path, min_dest: Path, tiny_dest: Path):
@@ -24,7 +28,7 @@ def minify_image(image_file: Path, min_dest: Path, tiny_dest: Path):
         tiny_image = crop_center(img)
         tiny_image.save(tiny_dest, quality=70)
 
-    except:
+    except Exception:
         shutil.copy(image_file, min_dest)
         shutil.copy(image_file, tiny_dest)
 
@@ -59,6 +63,28 @@ def move_all_images():
             image_file.rename(new_folder.joinpath(f"original{image_file.suffix}"))
 
 
+def validate_slugs_in_database(session: Session = None):
+    def check_image_path(image_name: str, slug_path: str) -> bool:
+        existing_path: Path = app_dirs.IMG_DIR.joinpath(image_name)
+        slug_path: Path = app_dirs.IMG_DIR.joinpath(slug_path)
+
+        if existing_path.is_dir():
+            slug_path.rename(existing_path)
+        else:
+            logger.info("No Image Found")
+
+    session = session or create_session()
+    all_recipes = db.recipes.get_all(session)
+
+    slugs_and_images = [(x.slug, x.image) for x in all_recipes]
+
+    for slug, image in slugs_and_images:
+        image_slug = image.split(".")[0]  # Remove Extension
+        if slug != image_slug:
+            logger.info(f"{slug}, Doesn't Match '{image_slug}'")
+            check_image_path(image, slug)
+
+
 def migrate_images():
     print("Checking for Images to Minify...")
 
@@ -77,10 +103,11 @@ def migrate_images():
         org_size = sizeof_fmt(image.stat().st_size)
         dest_size = sizeof_fmt(min_dest.stat().st_size)
         tiny_size = sizeof_fmt(tiny_dest.stat().st_size)
-        print(f"{image.name} Minified: {org_size} -> {dest_size} -> {tiny_size}")
+        logger.info(f"{image.name} Minified: {org_size} -> {dest_size} -> {tiny_size}")
 
-    print("Finished Minification Check")
+    logger.info("Finished Minification Check")
 
 
 if __name__ == "__main__":
     migrate_images()
+    validate_slugs_in_database()

mealie/services/migrations/chowdown.py

@@ -6,6 +6,7 @@ from fastapi.logger import logger
 from mealie.core.config import app_dirs
 from mealie.db.database import db
 from mealie.schema.recipe import Recipe
+from mealie.services.image.minify import migrate_images
 from mealie.utils.unzip import unpack_zip
 from sqlalchemy.orm.session import Session
 
@@ -89,4 +90,5 @@ def chowdown_migrate(session: Session, zip_file: Path):
                 failed_images.append(image.name)
         report = {"successful": successful_recipes, "failed": failed_recipes}
 
+    migrate_images()
     return report

mealie/services/migrations/nextcloud.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from mealie.core.config import app_dirs
 from mealie.db.database import db
 from mealie.schema.recipe import Recipe
+from mealie.services.image import minify
 from mealie.services.scraper.cleaner import Cleaner
 
 
@@ -23,39 +24,43 @@ def process_selection(selection: Path) -> Path:
         return None
 
 
+def clean_nextcloud_tags(nextcloud_tags: str):
+    if not isinstance(nextcloud_tags, str):
+        return None
+
+    return [x.title().lstrip() for x in nextcloud_tags.split(",") if x != ""]
+
+
 def import_recipes(recipe_dir: Path) -> Recipe:
     image = False
+
     for file in recipe_dir.glob("full.*"):
         image = file
+        break
 
     for file in recipe_dir.glob("*.json"):
         recipe_file = file
+        break
 
     with open(recipe_file, "r") as f:
         recipe_dict = json.loads(f.read())
 
     recipe_data = Cleaner.clean(recipe_dict)
 
-    image_name = None
-    if image:
-        image_name = recipe_data["slug"] + image.suffix
-        recipe_data["image"] = image_name
-    else:
-        recipe_data["image"] = "none"
+    image_name = recipe_data["slug"]
+    recipe_data["image"] = recipe_data["slug"]
+    recipe_data["tags"] = clean_nextcloud_tags(recipe_data.get("keywords"))
 
     recipe = Recipe(**recipe_data)
 
     if image:
-        shutil.copy(image, app_dirs.IMG_DIR.joinpath(image_name))
+        shutil.copy(image, app_dirs.IMG_DIR.joinpath(image_name + image.suffix))
 
     return recipe
 
 
 def prep():
-    try:
-        shutil.rmtree(app_dirs.TEMP_DIR)
-    except:
-        pass
+    shutil.rmtree(app_dirs.TEMP_DIR, ignore_errors=True)
     app_dirs.TEMP_DIR.mkdir(exist_ok=True, parents=True)
 
 
@@ -80,11 +85,13 @@ def migrate(session, selection: str):
                 db.recipes.create(session, recipe.dict())
 
                 successful_imports.append(recipe.name)
-            except:
+            except Exception:
+                session.rollback()
                 logging.error(f"Failed Nextcloud Import: {dir.name}")
                 logging.exception("")
                 failed_imports.append(dir.name)
 
     cleanup()
+    minify.migrate_images()
 
     return {"successful": successful_imports, "failed": failed_imports}