Align synology_dsm with changes in BackupAgent (#139770)

This commit is contained in:
Erik Montnemery 2025-03-04 19:22:18 +01:00 committed by GitHub
parent c0d882e305
commit 344cfedd6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -120,8 +120,7 @@ class SynologyDSMBackupAgent(BackupAgent):
:param backup_id: The ID of the backup that was returned in async_list_backups. :param backup_id: The ID of the backup that was returned in async_list_backups.
:return: A tuple of tar_filename and meta_filename :return: A tuple of tar_filename and meta_filename
""" """
if await self.async_get_backup(backup_id) is None: await self.async_get_backup(backup_id)
raise BackupNotFound
base_name = self.backup_base_names[backup_id] base_name = self.backup_base_names[backup_id]
return (f"{base_name}.tar", f"{base_name}_meta.json") return (f"{base_name}.tar", f"{base_name}_meta.json")
@ -195,13 +194,7 @@ class SynologyDSMBackupAgent(BackupAgent):
:param backup_id: The ID of the backup that was returned in async_list_backups. :param backup_id: The ID of the backup that was returned in async_list_backups.
""" """
try: (filename_tar, filename_meta) = await self._async_backup_filenames(backup_id)
(filename_tar, filename_meta) = await self._async_backup_filenames(
backup_id
)
except BackupAgentError:
# backup meta data could not be found, so we can't delete the backup
return
for filename in (filename_tar, filename_meta): for filename in (filename_tar, filename_meta):
try: try:
@ -269,7 +262,9 @@ class SynologyDSMBackupAgent(BackupAgent):
self, self,
backup_id: str, backup_id: str,
**kwargs: Any, **kwargs: Any,
) -> AgentBackup | None: ) -> AgentBackup:
"""Return a backup.""" """Return a backup."""
backups = await self._async_list_backups() backups = await self._async_list_backups()
return backups.get(backup_id) if backup_id not in backups:
raise BackupNotFound(f"Backup {backup_id} not found")
return backups[backup_id]