Compare commits

..

No commits in common. "c3397ab98287f015d53e79b725bcdfa9536c615f" and "8cf5f7e46541e433503d0d99bf2a240fd62f73d3" have entirely different histories.

2 changed files with 7 additions and 15 deletions

View File

@ -14,12 +14,9 @@ class BackupService:
db_path = DirectoryManager.get_database_path()
if not db_path.exists():
raise FileNotFoundError("No Database Found")
with self.session.connection() as conn:
raw_conn = conn.connection
dump = "\n".join(line for line in raw_conn.iterdump())
filename = DirectoryManager.get_config_directory() / "backup.zip"
conn = self.session.connection().connection
dump = "\n".join(line for line in conn.iterdump())
filename = str(DirectoryManager.get_config_directory()) + "/backup.zip"
diaries_root_path = DirectoryManager.get_diaries_root()
try:
@ -30,7 +27,7 @@ class BackupService:
if file_path.is_file():
arcname = file_path.relative_to(diaries_root_path.parent)
zipf.write(file_path, arcname=arcname)
return True, filename
return True, None
except Exception as e:
return False, str(e)

View File

@ -306,12 +306,7 @@ class DiaryListScreen(Screen):
session = self.app.service_manager.get_session()
if session:
backup_service = BackupService(session)
result_operation, result_data = backup_service.create_backup()
if result_operation:
self.notify(f"Backup result: {result_data}")
else:
self.notify(f"Error performing backup: {result_data}")
result = backup_service.create_backup()
else:
self.notify("Error: Session not found",severity="error")
self.app.exit()
self.notify("You must be logged in to perform this action")
self.notify(f"Backup result: {result}")