From 550f7fa620108bc891d3fac7ec8927d01765b65f Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 5 Jun 2023 11:28:53 +0000 Subject: [PATCH] refactor(backups): introduce get_all_snapshots() --- selfprivacy_api/backup/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/selfprivacy_api/backup/__init__.py b/selfprivacy_api/backup/__init__.py index 37b9517..7678258 100644 --- a/selfprivacy_api/backup/__init__.py +++ b/selfprivacy_api/backup/__init__.py @@ -247,16 +247,20 @@ class Backups: @staticmethod def get_snapshots(service: Service) -> List[Snapshot]: - service_id = service.get_id() - cached_snapshots = Backups.get_cached_snapshots_service(service_id) + snapshots = Backups.get_all_snapshots() + return [snap for snap in snapshots if snap.service_name == service.get_id()] + + @staticmethod + def get_all_snapshots() -> List[Snapshot]: + cached_snapshots = Storage.get_cached_snapshots() if cached_snapshots != []: return cached_snapshots # TODO: the oldest snapshots will get expired faster than the new ones. # How to detect that the end is missing? upstream_snapshots = Backups.provider().backuper.get_snapshots() - Backups.sync_service_snapshots(service_id, upstream_snapshots) - return [snap for snap in upstream_snapshots if snap.service_name == service_id] + Backups.sync_all_snapshots() + return upstream_snapshots @staticmethod def get_snapshot_by_id(id: str) -> Optional[Snapshot]: