github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 22:43:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

delete assets when removed

Browse source
This commit is contained in:
hay-kot 2021-05-03 19:08:03 -08:00
commit 64ca58de61
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mealie/routes/recipe/recipe_crud_routes.py
View file

@ -62,7 +62,6 @@ def update_recipe(
recipe: Recipe = db.recipes.update(session, recipe_slug, data.dict()) recipe: Recipe = db.recipes.update(session, recipe_slug, data.dict())
print(recipe.assets) print(recipe.assets)
if recipe_slug != recipe.slug:
check_assets(original_slug=recipe_slug, recipe=recipe) check_assets(original_slug=recipe_slug, recipe=recipe)
return recipe return recipe
@ -80,7 +79,7 @@ def patch_recipe(
recipe: Recipe = db.recipes.patch( recipe: Recipe = db.recipes.patch(
session, recipe_slug, new_data=data.dict(exclude_unset=True, exclude_defaults=True) session, recipe_slug, new_data=data.dict(exclude_unset=True, exclude_defaults=True)
) )
if recipe_slug != recipe.slug:
check_assets(original_slug=recipe_slug, recipe=recipe) check_assets(original_slug=recipe_slug, recipe=recipe)
return recipe return recipe

14
mealie/services/recipe/media.py
View file

@ -8,10 +8,8 @@ from mealie.schema.recipe import Recipe
logger = get_logger() logger = get_logger()
def check_assets(original_slug, recipe: Recipe) -> Path: def check_assets(original_slug, recipe: Recipe) -> None:
if original_slug == recipe.slug: if original_slug != recipe.slug:
return recipe.assets
current_dir = app_dirs.RECIPE_DATA_DIR.joinpath(original_slug) current_dir = app_dirs.RECIPE_DATA_DIR.joinpath(original_slug)
try: try:
@ -21,7 +19,13 @@ def check_assets(original_slug, recipe: Recipe) -> Path:
logger.error(f"Recipe Directory not Found: {original_slug}") logger.error(f"Recipe Directory not Found: {original_slug}")
logger.info(f"Renaming Recipe Directory: {original_slug} -> {recipe.slug}") logger.info(f"Renaming Recipe Directory: {original_slug} -> {recipe.slug}")
return current_dir.absolute() all_asset_files = [x.file_name for x in recipe.assets]
for file in recipe.asset_dir.iterdir():
file: Path
if file.is_dir():
continue
if file.name not in all_asset_files:
file.unlink()
def delete_assets(recipe_slug): def delete_assets(recipe_slug):