From 436e12381dd79e419dce755718be17b66d73e17f Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 9 Jun 2026 00:09:08 +0900 Subject: feat(event-dispatcher): unify event dispatch via EventInterface trait Extract a superclass-trait EventInterface from the base Event. pool_builder's PrePoolCreateEvent stays deferred: its constructor needs owned, non-cloneable Request and repository boxes the builder only holds by reference (owned-payload blocker). The event is plugin-only, so its construction is re-tagged TODO(plugin). Co-Authored-By: Claude Opus 4.8 (1M context) --- .../shirabe/src/repository/composer_repository.rs | 43 ++++++++++++++-------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/repository') diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 3dbca7d..f634e23 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -2757,10 +2757,12 @@ impl ComposerRepository { .map(|(k, v)| (k, Box::new(v))) .collect(), ); - // TODO(phase-b): dispatcher.dispatch expects Option, not concrete event types; - // need a way to pass PreFileDownloadEvent through EventDispatcher's API. - let _ = &mut pre_file_download_event; - dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + let pre_file_download_event_name = + pre_file_download_event.get_name().to_string(); + dispatcher.dispatch( + Some(&pre_file_download_event_name), + Some(&mut pre_file_download_event), + )?; filename = pre_file_download_event.get_processed_url().to_string(); options = pre_file_download_event .get_transport_options() @@ -2815,9 +2817,12 @@ impl ComposerRepository { m.into() }, ); - // TODO(phase-b): dispatcher.dispatch expects Option, not concrete event types - let _ = &mut post_file_download_event; - dispatcher.dispatch(Some(post_file_download_event.get_name()), None)?; + let post_file_download_event_name = + post_file_download_event.get_name().to_string(); + dispatcher.dispatch( + Some(&post_file_download_event_name), + Some(&mut post_file_download_event), + )?; } let decoded = response.decode_json()?; @@ -2954,9 +2959,11 @@ impl ComposerRepository { .map(|(k, v)| (k, Box::new(v))) .collect(), ); - // TODO(phase-b): dispatcher.dispatch expects Option, not concrete event types - let _ = &mut pre_file_download_event; - dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + let pre_file_download_event_name = pre_file_download_event.get_name().to_string(); + dispatcher.dispatch( + Some(&pre_file_download_event_name), + Some(&mut pre_file_download_event), + )?; filename = pre_file_download_event.get_processed_url().to_string(); options = pre_file_download_event .get_transport_options() @@ -3015,9 +3022,11 @@ impl ComposerRepository { m.into() }, ); - // TODO(phase-b): dispatcher.dispatch expects Option, not concrete event types - let _ = &mut post_file_download_event; - dispatcher.dispatch(Some(post_file_download_event.get_name()), None)?; + let post_file_download_event_name = post_file_download_event.get_name().to_string(); + dispatcher.dispatch( + Some(&post_file_download_event_name), + Some(&mut post_file_download_event), + )?; } let decoded = response.decode_json()?; @@ -3120,9 +3129,11 @@ impl ComposerRepository { .map(|(k, v)| (k, Box::new(v))) .collect(), ); - // TODO(phase-b): dispatcher.dispatch expects Option, not concrete event types - let _ = &mut pre_file_download_event; - dispatcher.dispatch(Some(pre_file_download_event.get_name()), None)?; + let pre_file_download_event_name = pre_file_download_event.get_name().to_string(); + dispatcher.dispatch( + Some(&pre_file_download_event_name), + Some(&mut pre_file_download_event), + )?; filename = pre_file_download_event.get_processed_url().to_string(); options = pre_file_download_event .get_transport_options() -- cgit v1.3.1