From 9d928cd58f80392acc15b39e18d87a8298181b1e Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Fri, 10 May 2024 21:29:53 +0200 Subject: [PATCH] add date prefix to backup download name --- cbpi/__init__.py | 2 +- cbpi/controller/system_controller.py | 10 ++++++++-- cbpi/http_endpoints/http_system.py | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index afa5ebb..3dfba54 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.4.1.a8" +__version__ = "4.4.1.a9" __codename__ = "Yeast Starter" diff --git a/cbpi/controller/system_controller.py b/cbpi/controller/system_controller.py index 61b7c75..3ba5fc6 100644 --- a/cbpi/controller/system_controller.py +++ b/cbpi/controller/system_controller.py @@ -15,7 +15,7 @@ import zipfile import socket import importlib from tabulate import tabulate -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date try: from systemd import journal @@ -48,9 +48,15 @@ class SystemController: pass async def backupConfig(self): - output_filename = "cbpi4_config" + try: + current_date = date.today() + current_date=str(current_date).replace("-","_") + output_filename = current_date+"_cbpi4_config" + except: + output_filename = "cbpi4_config" dir_name = pathlib.Path(self.cbpi.config_folder.get_file_path('')) shutil.make_archive(output_filename, 'zip', dir_name) + return output_filename+".zip" async def plugins_list(self): result = [] diff --git a/cbpi/http_endpoints/http_system.py b/cbpi/http_endpoints/http_system.py index 39b43b0..1827449 100644 --- a/cbpi/http_endpoints/http_system.py +++ b/cbpi/http_endpoints/http_system.py @@ -140,9 +140,10 @@ class SystemHttpEndpoints: content: # Response body application/zip: # Media type """ - await self.controller.backupConfig() - filename = "cbpi4_config.zip" + filename = await self.controller.backupConfig() + #filename = "cbpi4_config.zip" file_name = pathlib.Path(os.path.join(".", filename)) + logging.error(file_name) response = web.StreamResponse( status=200,