dhalucario/badgemagic-rs
1
0
Fork 0
mirror of https://github.com/fossasia/badgemagic-rs synced 2025-06-24 07:43:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify error handling of BLE writing

Browse source
This commit is contained in:
Lilian 2024-07-31 23:48:30 +02:00
parent de6a1c50e8
commit 4290b57c47
No known key found for this signature in database
GPG key ID: 1650987A001CB2CB
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/ble.rs
View file

@ -122,20 +122,28 @@ impl Device {
/// # Panics /// # Panics
/// This functions panics if the BLE device does not have the expected badge characteristic. /// This functions panics if the BLE device does not have the expected badge characteristic.
pub async fn write(&self, payload: PayloadBuffer) -> Result<()> { pub async fn write(&self, payload: PayloadBuffer) -> Result<()> {
// Connect and discover services
self.peripheral self.peripheral
.connect() .connect()
.await .await
.context("bluetooth device connect")?; .context("bluetooth device connect")?;
if let Err(error) = self.peripheral.discover_services().await {
let result = self.write_connected(payload).await;
if result.is_ok() {
self.peripheral self.peripheral
.disconnect() .disconnect()
.await .await
.context("bluetooth device disconnect")?; .context("bluetooth device disconnect")?;
return Err(error.into());
} }
// Get characteristics result
}
async fn write_connected(&self, payload: PayloadBuffer) -> Result<()> {
// Get characteristic
self.peripheral
.discover_services()
.await
.context("discovering services")?;
let characteristics = self.peripheral.characteristics(); let characteristics = self.peripheral.characteristics();
let badge_char = characteristics.iter().find(|c| c.uuid == BADGE_CHAR_UUID); let badge_char = characteristics.iter().find(|c| c.uuid == BADGE_CHAR_UUID);
@ -160,24 +168,12 @@ impl Device {
anyhow::ensure!(data.len() <= 8192, "payload too long (max 8192 bytes)"); anyhow::ensure!(data.len() <= 8192, "payload too long (max 8192 bytes)");
for chunk in data.chunks(BLE_CHAR_CHUNK_SIZE) { for chunk in data.chunks(BLE_CHAR_CHUNK_SIZE) {
let write_result = self self.peripheral
.peripheral
.write(badge_char, chunk, WriteType::WithoutResponse) .write(badge_char, chunk, WriteType::WithoutResponse)
.await; .await
.context("writing payload chunk")?;
if let Err(error) = write_result {
self.peripheral
.disconnect()
.await
.context("bluetooth device disconnect")?;
return Err(anyhow::anyhow!("Error writing payload chunk: {:?}", error));
}
} }
self.peripheral
.disconnect()
.await
.context("bluetooth device disconnect")?;
Ok(()) Ok(())
} }
} }