tidy(bulk_download): don't store events service separately

Using the invoker object directly leaves no ambiguity as to what `_events_bus` actually is.
This commit is contained in:
psychedelicious 2024-02-20 18:05:52 +11:00 committed by Brandon Rising
parent dabb5e2cf4
commit fff5d12648

View File

@ -21,7 +21,6 @@ from .bulk_download_base import BulkDownloadBase
class BulkDownloadService(BulkDownloadBase): class BulkDownloadService(BulkDownloadBase):
def start(self, invoker: Invoker) -> None: def start(self, invoker: Invoker) -> None:
self._invoker = invoker self._invoker = invoker
self._event_bus = invoker.services.events
def __init__(self): def __init__(self):
self._temp_directory = TemporaryDirectory() self._temp_directory = TemporaryDirectory()
@ -104,9 +103,9 @@ class BulkDownloadService(BulkDownloadBase):
self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str
) -> None: ) -> None:
"""Signal that a bulk download job has started.""" """Signal that a bulk download job has started."""
if self._event_bus: if self._invoker:
assert bulk_download_id is not None assert bulk_download_id is not None
self._event_bus.emit_bulk_download_started( self._invoker.services.events.emit_bulk_download_started(
bulk_download_id=bulk_download_id, bulk_download_id=bulk_download_id,
bulk_download_item_id=bulk_download_item_id, bulk_download_item_id=bulk_download_item_id,
bulk_download_item_name=bulk_download_item_name, bulk_download_item_name=bulk_download_item_name,
@ -116,10 +115,10 @@ class BulkDownloadService(BulkDownloadBase):
self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str
) -> None: ) -> None:
"""Signal that a bulk download job has completed.""" """Signal that a bulk download job has completed."""
if self._event_bus: if self._invoker:
assert bulk_download_id is not None assert bulk_download_id is not None
assert bulk_download_item_name is not None assert bulk_download_item_name is not None
self._event_bus.emit_bulk_download_completed( self._invoker.services.events.emit_bulk_download_completed(
bulk_download_id=bulk_download_id, bulk_download_id=bulk_download_id,
bulk_download_item_id=bulk_download_item_id, bulk_download_item_id=bulk_download_item_id,
bulk_download_item_name=bulk_download_item_name, bulk_download_item_name=bulk_download_item_name,
@ -129,10 +128,10 @@ class BulkDownloadService(BulkDownloadBase):
self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str, exception: Exception self, bulk_download_id: str, bulk_download_item_id: str, bulk_download_item_name: str, exception: Exception
) -> None: ) -> None:
"""Signal that a bulk download job has failed.""" """Signal that a bulk download job has failed."""
if self._event_bus: if self._invoker:
assert bulk_download_id is not None assert bulk_download_id is not None
assert exception is not None assert exception is not None
self._event_bus.emit_bulk_download_failed( self._invoker.services.events.emit_bulk_download_failed(
bulk_download_id=bulk_download_id, bulk_download_id=bulk_download_id,
bulk_download_item_id=bulk_download_item_id, bulk_download_item_id=bulk_download_item_id,
bulk_download_item_name=bulk_download_item_name, bulk_download_item_name=bulk_download_item_name,