From 8475ae33756319598aa13568a1e2984ac3db0639 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Wed, 14 Jun 2023 14:07:51 +0000 Subject: [PATCH] refactor(backups): make localfile repos normal --- selfprivacy_api/backup/__init__.py | 7 +------ selfprivacy_api/backup/providers/local_file.py | 11 ++--------- tests/test_graphql/test_backup.py | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/selfprivacy_api/backup/__init__.py b/selfprivacy_api/backup/__init__.py index d496758..f6e2bfc 100644 --- a/selfprivacy_api/backup/__init__.py +++ b/selfprivacy_api/backup/__init__.py @@ -31,8 +31,7 @@ class Backups: @staticmethod def set_localfile_repo(file_path: str): ProviderClass = get_provider(BackupProvider.FILE) - provider = ProviderClass(file_path) - Storage.store_testrepo_path(file_path) + provider = ProviderClass(login="", key="", location=file_path, repo_id="") Storage.store_provider(provider) def set_provider(provider: AbstractBackupProvider): @@ -145,10 +144,6 @@ class Backups: ): provider_class = get_provider(BackupProvider[kind]) - if kind == "FILE": - path = Storage.get_testrepo_path() - return provider_class(path) - return provider_class(login=login, key=key, location=location, repo_id=repo_id) @staticmethod diff --git a/selfprivacy_api/backup/providers/local_file.py b/selfprivacy_api/backup/providers/local_file.py index 95075dd..77b0c92 100644 --- a/selfprivacy_api/backup/providers/local_file.py +++ b/selfprivacy_api/backup/providers/local_file.py @@ -3,12 +3,5 @@ from selfprivacy_api.backup.restic_backuper import ResticBackuper class LocalFileBackup(AbstractBackupProvider): - backuper = ResticBackuper("", "", "memory") - - name = "FILE" - - # login and key args are for compatibility with generic provider methods. They are ignored. - def __init__(self, filename: str, login: str = "", key: str = ""): - super().__init__() - self.backuper = ResticBackuper("", "", ":local:") - self.backuper.set_creds("", "", filename) + backuper = ResticBackuper("", "", ":local:") + name = "FILE" \ No newline at end of file diff --git a/tests/test_graphql/test_backup.py b/tests/test_graphql/test_backup.py index 5ac024f..f0462c8 100644 --- a/tests/test_graphql/test_backup.py +++ b/tests/test_graphql/test_backup.py @@ -95,7 +95,7 @@ def file_backup(tmpdir) -> AbstractBackupProvider: test_repo_path = path.join(tmpdir, "test_repo") ProviderClass = providers.get_provider(BackupProvider.FILE) assert ProviderClass is not None - provider = ProviderClass(test_repo_path) + provider = ProviderClass(location=test_repo_path) assert provider is not None return provider