From 498208f083c0d15e4591230b8503dc96e6193c86 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 17 Apr 2023 12:33:27 +0000 Subject: [PATCH] test(backups): implement get_folders() for bitwarden --- .../services/bitwarden/__init__.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/selfprivacy_api/services/bitwarden/__init__.py b/selfprivacy_api/services/bitwarden/__init__.py index 702eca6..a3ed94e 100644 --- a/selfprivacy_api/services/bitwarden/__init__.py +++ b/selfprivacy_api/services/bitwarden/__init__.py @@ -113,10 +113,14 @@ class Bitwarden(Service): @staticmethod def get_storage_usage() -> int: storage_usage = 0 - storage_usage += get_storage_usage("/var/lib/bitwarden") - storage_usage += get_storage_usage("/var/lib/bitwarden_rs") + for folder in Bitwarden.get_folders(): + storage_usage += get_storage_usage(folder) return storage_usage + @staticmethod + def get_folders() -> typing.List[str]: + return ["/var/lib/bitwarden", "/var/lib/bitwarden_rs"] + @staticmethod def get_drive() -> str: with ReadUserData() as user_data: @@ -157,16 +161,11 @@ class Bitwarden(Service): [ FolderMoveNames( name="bitwarden", - bind_location="/var/lib/bitwarden", + bind_location=folder, group="vaultwarden", owner="vaultwarden", - ), - FolderMoveNames( - name="bitwarden_rs", - bind_location="/var/lib/bitwarden_rs", - group="vaultwarden", - owner="vaultwarden", - ), + ) + for folder in Bitwarden.get_folders() ], "bitwarden", )