Basic nutrition editor (#288)

* Basic nutrition editor

* fix no image on scrape

* nutrition display

* add recipe images

* update by url

* new upload options

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

mealie/routes/recipe/recipe_crud_routes.py

@@ -1,5 +1,7 @@
+import shutil
 from enum import Enum
 
+import requests
 from fastapi import APIRouter, Depends, File, Form, HTTPException
 from fastapi.responses import FileResponse
 from mealie.db.database import db
@@ -7,7 +9,7 @@ from mealie.db.db_setup import generate_session
 from mealie.routes.deps import get_current_user
 from mealie.schema.recipe import Recipe, RecipeURLIn
 from mealie.schema.snackbar import SnackResponse
-from mealie.services.image.image import IMG_OPTIONS, delete_image, read_image, rename_image, write_image
+from mealie.services.image.image import IMG_OPTIONS, delete_image, read_image, rename_image, scrape_image, write_image
 from mealie.services.scraper.scraper import create_from_url
 from sqlalchemy.orm.session import Session
 
@@ -120,3 +122,16 @@ def update_recipe_image(
     db.recipes.update_image(session, recipe_slug, extension)
 
     return response
+
+
+@router.post("/{recipe_slug}/image")
+def scrape_image_url(
+    recipe_slug: str,
+    url: RecipeURLIn,
+    current_user=Depends(get_current_user),
+):
+    """ Removes an existing image and replaces it with the incoming file. """
+
+    scrape_image(url.url, recipe_slug)
+
+    return SnackResponse.success("Recipe Image Updated")

mealie/services/image/image.py

@@ -62,12 +62,16 @@ def write_image(recipe_slug: str, file_data: bytes, extension: str) -> Path:
     extension = extension.replace(".", "")
     image_path = image_dir.joinpath(f"original.{extension}")
 
-    if isinstance(file_data, bytes):
+    if isinstance(file_data, Path):
+        shutil.copy2(file_data, image_path)
+    elif isinstance(file_data, bytes):
         with open(image_path, "ab") as f:
             f.write(file_data)
     else:
-        shutil.copy2(file_data, image_path)
+        with open(image_path, "ab") as f:
+            shutil.copyfileobj(file_data, f)
 
+    print(image_path)
     minify.minify_image(image_path)
 
     return image_path
@@ -105,7 +109,7 @@ def scrape_image(image_url: str, slug: str) -> Path:
 
         write_image(slug, r.raw, filename.suffix)
 
-        filename.unlink()
+        filename.unlink(missing_ok=True)
 
         return slug