diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py index f357be508..864a1380a 100644 --- a/mealie/routes/backup_routes.py +++ b/mealie/routes/backup_routes.py @@ -44,7 +44,7 @@ def export_database(data: BackupJob, session: Session = Depends(generate_session export_groups=data.options.groups, ) return {"export_path": export_path} - except: + except Exception: raise HTTPException(status.HTTP_500_INTERNAL_SERVER_ERROR) @@ -95,5 +95,5 @@ def delete_backup(file_name: str): raise HTTPException(status.HTTP_400_BAD_REQUEST) try: file_path.unlink() - except: + except Exception: raise HTTPException(status.HTTP_500_INTERNAL_SERVER_ERROR) diff --git a/mealie/routes/groups/crud.py b/mealie/routes/groups/crud.py index 622675535..81262697d 100644 --- a/mealie/routes/groups/crud.py +++ b/mealie/routes/groups/crud.py @@ -39,7 +39,7 @@ async def create_group( try: db.groups.create(session, group_data.dict()) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/mealplans/crud.py b/mealie/routes/mealplans/crud.py index c331099c5..7b58853d7 100644 --- a/mealie/routes/mealplans/crud.py +++ b/mealie/routes/mealplans/crud.py @@ -43,7 +43,7 @@ def update_meal_plan( processed_plan = MealPlanInDB(uid=plan_id, **processed_plan.dict()) try: db.meals.update(session, plan_id, processed_plan.dict()) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) @@ -53,7 +53,7 @@ def delete_meal_plan(plan_id, session: Session = Depends(generate_session), curr try: db.meals.delete(session, plan_id) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/recipe/category_routes.py b/mealie/routes/recipe/category_routes.py index aca736c54..c358a69af 100644 --- a/mealie/routes/recipe/category_routes.py +++ b/mealie/routes/recipe/category_routes.py @@ -37,7 +37,7 @@ async def create_recipe_category( try: return db.categories.create(session, category.dict()) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) @@ -52,7 +52,7 @@ async def update_recipe_category( try: return db.categories.update(session, category, new_category.dict()) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) @@ -66,5 +66,5 @@ async def delete_recipe_category( try: db.categories.delete(session, category) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/recipe/recipe_crud_routes.py b/mealie/routes/recipe/recipe_crud_routes.py index 00ecb2e4a..2794370e8 100644 --- a/mealie/routes/recipe/recipe_crud_routes.py +++ b/mealie/routes/recipe/recipe_crud_routes.py @@ -97,7 +97,7 @@ def delete_recipe( try: db.recipes.delete(session, recipe_slug) delete_image(recipe_slug) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/recipe/tag_routes.py b/mealie/routes/recipe/tag_routes.py index b3f0d1126..57f6ba4b7 100644 --- a/mealie/routes/recipe/tag_routes.py +++ b/mealie/routes/recipe/tag_routes.py @@ -56,5 +56,5 @@ async def delete_recipe_tag( try: db.tags.delete(session, tag) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/theme_routes.py b/mealie/routes/theme_routes.py index 9b43c8dae..9f25c8eae 100644 --- a/mealie/routes/theme_routes.py +++ b/mealie/routes/theme_routes.py @@ -43,5 +43,5 @@ def delete_theme(theme_name: str, session: Session = Depends(generate_session), """ Deletes theme from the database """ try: db.themes.delete(session, theme_name) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/routes/users/crud.py b/mealie/routes/users/crud.py index 390149a88..bd8101de5 100644 --- a/mealie/routes/users/crud.py +++ b/mealie/routes/users/crud.py @@ -107,7 +107,7 @@ async def update_user_image( try: [x.unlink() for x in app_dirs.USER_DIR.join(id).glob("profile_image.*")] - except: + except Exception: pass dest = app_dirs.USER_DIR.joinpath(id, f"profile_image.{extension}") @@ -152,5 +152,5 @@ async def delete_user( if current_user.id == id or current_user.admin: try: db.users.delete(session, id) - except: + except Exception: raise HTTPException(status.HTTP_400_BAD_REQUEST) diff --git a/mealie/services/backups/exports.py b/mealie/services/backups/exports.py index cbbc0a853..afd9a735e 100644 --- a/mealie/services/backups/exports.py +++ b/mealie/services/backups/exports.py @@ -37,7 +37,7 @@ class ExportDatabase: try: self.templates = [app_dirs.TEMPLATE_DIR.joinpath(x) for x in templates] - except: + except Exception: self.templates = False logger.info("No Jinja2 Templates Registered for Export") diff --git a/mealie/services/backups/imports.py b/mealie/services/backups/imports.py index 3d35a843a..b561752bd 100644 --- a/mealie/services/backups/imports.py +++ b/mealie/services/backups/imports.py @@ -84,20 +84,20 @@ class ImportDatabase: try: del recipe_dict["_id"] del recipe_dict["date_added"] - except: + except Exception: pass # Migration from list to Object Type Data try: if "" in recipe_dict["tags"]: recipe_dict["tags"] = [tag for tag in recipe_dict["tags"] if tag != ""] - except: + except Exception: pass try: if "" in recipe_dict["categories"]: recipe_dict["categories"] = [cat for cat in recipe_dict["categories"] if cat != ""] - except: + except Exception: pass if type(recipe_dict["extras"]) == list: diff --git a/mealie/services/image/image.py b/mealie/services/image/image.py index 1353ac8a7..ed5f90ab0 100644 --- a/mealie/services/image/image.py +++ b/mealie/services/image/image.py @@ -54,7 +54,7 @@ def rename_image(original_slug, new_slug) -> Path: def write_image(recipe_slug: str, file_data: bytes, extension: str) -> Path: try: delete_image(recipe_slug) - except: + except Exception: pass image_dir = Path(app_dirs.IMG_DIR.joinpath(f"{recipe_slug}")) @@ -100,7 +100,7 @@ def scrape_image(image_url: str, slug: str) -> Path: try: r = requests.get(image_url, stream=True) - except: + except Exception: logger.exception("Fatal Image Request Exception") return None diff --git a/mealie/services/meal_services.py b/mealie/services/meal_services.py index 7f5aaefa5..9d6577608 100644 --- a/mealie/services/meal_services.py +++ b/mealie/services/meal_services.py @@ -24,7 +24,7 @@ def process_meals(session: Session, meal_plan_base: MealPlanIn) -> MealPlanProce description=recipe.description, ) - except: + except Exception: meal_data = MealOut( date=meal_plan_base.startDate + timedelta(days=x), diff --git a/mealie/services/scraper/cleaner.py b/mealie/services/scraper/cleaner.py index 0129f68f8..a24586bf4 100644 --- a/mealie/services/scraper/cleaner.py +++ b/mealie/services/scraper/cleaner.py @@ -115,7 +115,7 @@ class Cleaner: for step in instructions if step["type"].find("HowToStep") > -1 ] - except: + except Exception: pass else: diff --git a/mealie/services/scraper/open_graph.py b/mealie/services/scraper/open_graph.py index 7cd22e6c4..ed41f7598 100644 --- a/mealie/services/scraper/open_graph.py +++ b/mealie/services/scraper/open_graph.py @@ -21,7 +21,7 @@ def basic_recipe_from_opengraph(html: str, url: str) -> dict: data = extruct.extract(html, base_url=base_url) try: properties = data["opengraph"][0]["properties"] - except: + except Exception: return return { diff --git a/mealie/services/scraper/scraper.py b/mealie/services/scraper/scraper.py index 6dfb39653..bee5cc178 100644 --- a/mealie/services/scraper/scraper.py +++ b/mealie/services/scraper/scraper.py @@ -67,7 +67,7 @@ def download_image_for_recipe(recipe: dict) -> dict: try: img_path = scrape_image(recipe.get("image"), recipe.get("slug")) recipe["image"] = img_path.name - except: + except Exception: recipe["image"] = "no image" return recipe