Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/buttplug_client/src/client_event_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ where
let device = self.create_client_device(device);
self.send_client_event(ButtplugClientEvent::DeviceAdded(device));
}
self.send_client_event(ButtplugClientEvent::DeviceListReceived);
true
}
}
Expand Down
3 changes: 3 additions & 0 deletions crates/buttplug_client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ pub enum ButtplugClientEvent {
/// Emitted when a scanning session (started via a StartScanning call on
/// [ButtplugClient]) has finished.
ScanningFinished,
/// Emitted when the device list is received as a response to a
/// DeviceListRequest call, which is sent during the handshake.
DeviceListReceived,
/// Emitted when a device has been added to the server. Includes a
/// [ButtplugClientDevice] object representing the device.
DeviceAdded(ButtplugClientDevice),
Expand Down
4 changes: 4 additions & 0 deletions crates/buttplug_tests/tests/test_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ async fn test_client_scanning_finished() {
let (client, _) = test_client_with_device().await;
let mut recv = client.event_stream();
assert!(client.start_scanning().await.is_ok());
assert!(matches!(
recv.next().await.expect("Test, assuming infallible."),
ButtplugClientEvent::DeviceListReceived
));
assert!(matches!(
recv.next().await.expect("Test, assuming infallible."),
ButtplugClientEvent::ScanningFinished
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ pub enum ButtplugClientEvent {
/// Emitted when a device has been removed from the server. Includes a
/// [ButtplugClientDevice] object representing the device.
DeviceRemoved(Arc<ButtplugClientDevice>),
/// Emitted when the device list is received as a response to a
/// DeviceListRequest call, which is sent during the handshake.
DeviceListReceived,
/// Emitted when a client has not pinged the server in a sufficient amount of
/// time.
PingTimeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ where
let device = self.create_client_device(d);
self.send_client_event(ButtplugClientEvent::DeviceAdded(device));
}
self.send_client_event(ButtplugClientEvent::DeviceListReceived);
true
}
}
Expand Down