From 545fbf253ece16328025149d76ab590649f59d1b Mon Sep 17 00:00:00 2001 From: hay-kot Date: Fri, 4 Jun 2021 18:03:34 -0800 Subject: [PATCH] fix meal-image not return on API call --- mealie/routes/mealplans/crud.py | 39 +++++++++++++++++---------------- mealie/services/image/image.py | 6 ++--- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mealie/routes/mealplans/crud.py b/mealie/routes/mealplans/crud.py index fff5d78f0..9c770b5fb 100644 --- a/mealie/routes/mealplans/crud.py +++ b/mealie/routes/mealplans/crud.py @@ -45,6 +45,26 @@ def get_today(session: Session = Depends(generate_session), current_user: UserIn return recipe +@router.get("/today/image", tags=["Meal Plan"]) +def get_todays_image(session: Session = Depends(generate_session), group_name: str = "Home"): + """ + Returns the image for todays meal-plan. + """ + + group_in_db: GroupInDB = db.groups.get(session, group_name, "name") + recipe = get_todays_meal(session, group_in_db) + + if recipe: + recipe_image = recipe.image_dir.joinpath(image.ImageOptions.ORIGINAL_IMAGE) + print(recipe_image) + else: + raise HTTPException(status.HTTP_404_NOT_FOUND) + if recipe_image: + return FileResponse(recipe_image) + else: + raise HTTPException(status.HTTP_404_NOT_FOUND) + + @router.get("/{id}", response_model=MealPlanOut) def get_meal_plan( id, @@ -106,22 +126,3 @@ def delete_meal_plan( ) except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) - - -@router.get("/today/image", tags=["Meal Plan"]) -def get_todays_image(session: Session = Depends(generate_session), group_name: str = "Home"): - """ - Returns the image for todays meal-plan. - """ - - group_in_db: GroupInDB = db.groups.get(session, group_name, "name") - recipe = get_todays_meal(session, group_in_db) - - if recipe: - recipe_image = recipe.image_dir.joinpath(image.ImageOptions.ORIGINAL_IMAGE) - else: - raise HTTPException(status.HTTP_404_NOT_FOUND) - if recipe_image: - return FileResponse(recipe_image) - else: - raise HTTPException(status.HTTP_404_NOT_FOUND) diff --git a/mealie/services/image/image.py b/mealie/services/image/image.py index 3b429fbaa..9bcee6e7b 100644 --- a/mealie/services/image/image.py +++ b/mealie/services/image/image.py @@ -12,9 +12,9 @@ logger = root_logger.get_logger() @dataclass class ImageOptions: - ORIGINAL_IMAGE: str = "original*" - MINIFIED_IMAGE: str = "min-original*" - TINY_IMAGE: str = "tiny-original*" + ORIGINAL_IMAGE: str = "original.webp" + MINIFIED_IMAGE: str = "min-original.webp" + TINY_IMAGE: str = "tiny-original.webp" IMG_OPTIONS = ImageOptions()