diff --git a/selfprivacy_api/backup/providers/backblaze.py b/selfprivacy_api/backup/providers/backblaze.py index b826bdd..349c5c7 100644 --- a/selfprivacy_api/backup/providers/backblaze.py +++ b/selfprivacy_api/backup/providers/backblaze.py @@ -6,8 +6,6 @@ from selfprivacy_api.graphql.queries.providers import ( class Backblaze(AbstractBackupProvider): - @property - def backuper(self): - return ResticBackuper("--b2-account", "--b2-key", ":b2:") + backuper = ResticBackuper("--b2-account", "--b2-key", ":b2:") name = BackupProviderEnum.BACKBLAZE diff --git a/selfprivacy_api/backup/providers/local_file.py b/selfprivacy_api/backup/providers/local_file.py index f4fda29..9afc61a 100644 --- a/selfprivacy_api/backup/providers/local_file.py +++ b/selfprivacy_api/backup/providers/local_file.py @@ -6,8 +6,6 @@ from selfprivacy_api.graphql.queries.providers import ( class LocalFileBackup(AbstractBackupProvider): - @property - def backuper(self): - return ResticBackuper("", "", ":local:") + backuper = ResticBackuper("", "", ":local:") name = BackupProviderEnum.FILE diff --git a/selfprivacy_api/backup/providers/memory.py b/selfprivacy_api/backup/providers/memory.py index 6d1ba48..31a4cbb 100644 --- a/selfprivacy_api/backup/providers/memory.py +++ b/selfprivacy_api/backup/providers/memory.py @@ -6,8 +6,6 @@ from selfprivacy_api.graphql.queries.providers import ( class InMemoryBackup(AbstractBackupProvider): - @property - def backuper(self): - return ResticBackuper("", "", ":memory:") + backuper = ResticBackuper("", "", ":memory:") name = BackupProviderEnum.MEMORY diff --git a/selfprivacy_api/backup/providers/none.py b/selfprivacy_api/backup/providers/none.py index 8c8bfba..f190324 100644 --- a/selfprivacy_api/backup/providers/none.py +++ b/selfprivacy_api/backup/providers/none.py @@ -6,8 +6,6 @@ from selfprivacy_api.graphql.queries.providers import ( class NoBackups(AbstractBackupProvider): - @property - def backuper(self): - return NoneBackupper() + backuper = NoneBackupper() name = BackupProviderEnum.NONE diff --git a/selfprivacy_api/backup/providers/provider.py b/selfprivacy_api/backup/providers/provider.py index 8ee1ced..3c4fc43 100644 --- a/selfprivacy_api/backup/providers/provider.py +++ b/selfprivacy_api/backup/providers/provider.py @@ -11,10 +11,7 @@ from selfprivacy_api.graphql.queries.providers import ( class AbstractBackupProvider(ABC): - @property - @abstractmethod - def backuper(self) -> AbstractBackuper: - raise NotImplementedError + backuper: AbstractBackuper name: BackupProviderEnum diff --git a/selfprivacy_api/graphql/mutations/backup_mutations.py b/selfprivacy_api/graphql/mutations/backup_mutations.py index 6ab3e1a..b7720c5 100644 --- a/selfprivacy_api/graphql/mutations/backup_mutations.py +++ b/selfprivacy_api/graphql/mutations/backup_mutations.py @@ -59,7 +59,7 @@ class BackupMutations: return GenericBackupConfigReturn( success=True, message="", - code="200", + code=200, configuration=Backup().configuration(), ) @@ -70,7 +70,7 @@ class BackupMutations: return GenericBackupConfigReturn( success=True, message="", - code="200", + code=200, configuration=Backup().configuration(), ) @@ -87,7 +87,7 @@ class BackupMutations: return GenericBackupConfigReturn( success=True, message="", - code="200", + code=200, configuration=Backup().configuration(), ) diff --git a/selfprivacy_api/graphql/queries/backup.py b/selfprivacy_api/graphql/queries/backup.py index 9858543..322dab0 100644 --- a/selfprivacy_api/graphql/queries/backup.py +++ b/selfprivacy_api/graphql/queries/backup.py @@ -36,7 +36,7 @@ class Backup: @strawberry.field def configuration(self) -> BackupConfiguration: return BackupConfiguration( - provider=BackupProvider[Backups.provider().name], + provider=Backups.provider().name, encryption_key=LocalBackupSecret.get(), is_initialized=Backups.is_initted(), autobackup_period=Backups.autobackup_period_minutes(),