From 6a8b0f1bb40f1210ed309363f0d1287d584216d9 Mon Sep 17 00:00:00 2001 From: mtoohey31 Date: Sun, 3 Jan 2021 15:52:38 -0500 Subject: [PATCH] Changed backup snackbar to display the absolute path of the backup file --- mealie/routes/backup_routes.py | 4 ++-- mealie/services/backup_services.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py index 25111811cc94..9d5c966fdd3d 100644 --- a/mealie/routes/backup_routes.py +++ b/mealie/routes/backup_routes.py @@ -26,14 +26,14 @@ async def export_database(data: BackupJob): """ Returns this weeks meal plan """ try: - export_db(data.tag, data.template) + export_path = export_db(data.tag, data.template) except: HTTPException( status_code=400, detail=SnackResponse.error("Error Creating Backup. See Log File"), ) - return SnackResponse.success("Backup Created in /data/backups") + return SnackResponse.success("Backup Created at " + export_path) @router.post( diff --git a/mealie/services/backup_services.py b/mealie/services/backup_services.py index 61e6faa97f64..39db0299982c 100644 --- a/mealie/services/backup_services.py +++ b/mealie/services/backup_services.py @@ -56,7 +56,7 @@ def import_from_archive(file_name: str) -> list: return successful_imports -def export_db(tag=None, template=None): +def export_db(tag=None, template=None) -> str: if tag: export_tag = tag + "_" + datetime.now().strftime("%Y-%b-%d") else: @@ -80,6 +80,8 @@ def export_db(tag=None, template=None): shutil.rmtree(backup_folder) shutil.rmtree(TEMP_DIR) + return str(zip_path.absolute()) + ".zip" + def export_images(dest_dir) -> Path: