SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-10 04:53:11 +00:00
Code Issues Projects Releases Wiki Activity

refactor(services): PARTIAL migrate get_all_services

Browse source
This commit is contained in:
Houkime 2024-07-24 11:41:32 +00:00
parent f6151ee451
commit 2ef674a037
4 changed files with 56 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
selfprivacy_api/backup/__init__.py
View file

@ -8,10 +8,8 @@ import os
from os import statvfs from os import statvfs
from typing import Callable, List, Optional from typing import Callable, List, Optional
from selfprivacy_api.services import ( from selfprivacy_api.services import ServiceManager
get_service_by_id,
get_all_services,
)
from selfprivacy_api.services.service import ( from selfprivacy_api.services.service import (
Service, Service,
ServiceStatus, ServiceStatus,
@ -376,7 +374,7 @@ class Backups:
@staticmethod @staticmethod
def prune_all_autosnaps() -> None: def prune_all_autosnaps() -> None:
for service in get_all_services(): for service in ServiceManager.get_all_services():
Backups._prune_auto_snaps(service) Backups._prune_auto_snaps(service)
# Restoring # Restoring
@ -431,7 +429,7 @@ class Backups:
snapshot: Snapshot, strategy=RestoreStrategy.DOWNLOAD_VERIFY_OVERWRITE snapshot: Snapshot, strategy=RestoreStrategy.DOWNLOAD_VERIFY_OVERWRITE
) -> None: ) -> None:
"""Restores a snapshot to its original service using the given strategy""" """Restores a snapshot to its original service using the given strategy"""
service = get_service_by_id(snapshot.service_name) service = ServiceManager.get_service_by_id(snapshot.service_name)
if service is None: if service is None:
raise ValueError( raise ValueError(
f"snapshot has a nonexistent service: {snapshot.service_name}" f"snapshot has a nonexistent service: {snapshot.service_name}"
@ -475,7 +473,7 @@ class Backups:
def _assert_restorable( def _assert_restorable(
snapshot: Snapshot, strategy=RestoreStrategy.DOWNLOAD_VERIFY_OVERWRITE snapshot: Snapshot, strategy=RestoreStrategy.DOWNLOAD_VERIFY_OVERWRITE
) -> None: ) -> None:
service = get_service_by_id(snapshot.service_name) service = ServiceManager.get_service_by_id(snapshot.service_name)
if service is None: if service is None:
raise ValueError( raise ValueError(
f"snapshot has a nonexistent service: {snapshot.service_name}" f"snapshot has a nonexistent service: {snapshot.service_name}"
@ -646,7 +644,7 @@ class Backups:
"""Returns a list of services that should be backed up at a given time""" """Returns a list of services that should be backed up at a given time"""
return [ return [
service service
for service in get_all_services() for service in ServiceManager.get_all_services()
if Backups.is_time_to_backup_service(service, time) if Backups.is_time_to_backup_service(service, time)
] ]

4
selfprivacy_api/graphql/queries/services.py
View file

@ -8,12 +8,12 @@ from selfprivacy_api.graphql.common_types.service import (
Service, Service,
service_to_graphql_service, service_to_graphql_service,
) )
from selfprivacy_api.services import get_all_services from selfprivacy_api.services import ServiceManager
@strawberry.type @strawberry.type
class Services: class Services:
@strawberry.field @strawberry.field
def all_services(self) -> typing.List[Service]: def all_services(self) -> typing.List[Service]:
services = get_all_services() services = ServiceManager.get_all_services()
return [service_to_graphql_service(service) for service in services] return [service_to_graphql_service(service) for service in services]

12
selfprivacy_api/services/__init__.py
View file

@ -26,29 +26,31 @@ services: list[Service] = [
] ]
class ServiceManager(Service):
@staticmethod
def get_all_services() -> list[Service]: def get_all_services() -> list[Service]:
return services return services
@staticmethod
def get_service_by_id(service_id: str) -> typing.Optional[Service]: def get_service_by_id(service_id: str) -> typing.Optional[Service]:
for service in services: for service in services:
if service.get_id() == service_id: if service.get_id() == service_id:
return service return service
return None return None
@staticmethod
def get_enabled_services() -> list[Service]: def get_enabled_services() -> list[Service]:
return [service for service in services if service.is_enabled()] return [service for service in services if service.is_enabled()]
@staticmethod
def get_disabled_services() -> list[Service]: def get_disabled_services() -> list[Service]:
return [service for service in services if not service.is_enabled()] return [service for service in services if not service.is_enabled()]
@staticmethod
def get_services_by_location(location: str) -> list[Service]: def get_services_by_location(location: str) -> list[Service]:
return [service for service in services if service.get_drive() == location] return [service for service in services if service.get_drive() == location]
@staticmethod
def get_all_required_dns_records() -> list[ServiceDnsRecord]: def get_all_required_dns_records() -> list[ServiceDnsRecord]:
ip4 = network_utils.get_ip4() ip4 = network_utils.get_ip4()
ip6 = network_utils.get_ip6() ip6 = network_utils.get_ip6()

8
tests/test_autobackup.py
View file

@ -4,7 +4,7 @@ from copy import copy
from datetime import datetime, timezone, timedelta from datetime import datetime, timezone, timedelta
from selfprivacy_api.jobs import Jobs from selfprivacy_api.jobs import Jobs
from selfprivacy_api.services import Service, get_all_services from selfprivacy_api.services import Service, ServiceManager
from selfprivacy_api.graphql.common_types.backup import ( from selfprivacy_api.graphql.common_types.backup import (
BackupReason, BackupReason,
@ -23,7 +23,11 @@ from tests.test_graphql.test_services import only_dummy_service
def backuppable_services() -> list[Service]: def backuppable_services() -> list[Service]:
return [service for service in get_all_services() if service.can_be_backed_up()] return [
service
for service in ServiceManager.get_all_services()
if service.can_be_backed_up()
]
def dummy_snapshot(date: datetime): def dummy_snapshot(date: datetime):