nicolabelluti/r701
nicolabelluti/r701
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return a None if the name is an empty String

Browse Source
This commit is contained in:
Nicola Belluti 2024-05-13 13:05:27 +02:00
parent 85e07886e9
commit 4d9361e383
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/r701.rs
View File

@ -65,26 +65,28 @@ impl R701 {
// If the response length is right but the header is `01 00 00 00 00 00 // If the response length is right but the header is `01 00 00 00 00 00
// 00 00` then the request is been succesful but the name was not found // 00 00` then the request is been succesful but the name was not found
if response[..12] == [0xaa, 0x55, 0x01, 0, 0, 0, 0, 0, 0, 0, 0x55, 0xaa] if response.len() == 34
&& response.len() == 34 && response[..12] == [0xaa, 0x55, 0x01, 0, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
{ {
return Ok(None); return Ok(None);
} }
// If one between the response length or the response header is wrong // If one between the response length or the response header is wrong
// return an error // return an error
if response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa] if response.len() != 34
|| response.len() != 34 || response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
{ {
return Err(Error::new(InvalidData, "Malformed response")); return Err(Error::new(InvalidData, "Malformed response"));
} }
// Get the name as a UTF-8 string and delete the `\0` at the end // Get the name as a UTF-8 string and delete the `\0` at the end
Ok(Some( let name = String::from_utf8_lossy(&response[12..22])
String::from_utf8_lossy(&response[12..22]) .trim_end_matches('\0')
.trim_end_matches(char::from(0)) .to_string();
.to_string(),
)) // Return None if the name is empty, else return the name wrapped into a
// Some
Ok(Some(name).filter(|name| !name.is_empty()))
} }
pub fn get_total_record_count(&mut self) -> Result<u16> { pub fn get_total_record_count(&mut self) -> Result<u16> {
@ -94,9 +96,9 @@ impl R701 {
// If one between the response length or the response header is wrong // If one between the response length or the response header is wrong
// return an error // return an error
if response[..4] != [0xaa, 0x55, 0x01, 0x01] if response.len() != 10
|| response[..4] != [0xaa, 0x55, 0x01, 0x01]
|| response[6..] != [0u8; 4] || response[6..] != [0u8; 4]
|| response.len() != 10
{ {
return Err(Error::new(InvalidData, "Malformed response")); return Err(Error::new(InvalidData, "Malformed response"));
} }
@ -133,15 +135,15 @@ impl R701 {
// If one between the response length, the response header or the last // If one between the response length, the response header or the last
// two bits is wrong return an error // two bits is wrong return an error
if response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa] if response.len() != 1038
|| response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
|| response[1036..] != [0, 0] || response[1036..] != [0, 0]
|| response.len() != 1038
{ {
return Err(Error::new(InvalidData, "Malformed response")); return Err(Error::new(InvalidData, "Malformed response"));
} }
// Return only the payload bits as a vector // Return only the payload bits as a vector
Ok(response[12..response.len() - 2].to_vec()) Ok(response[12..1036].to_vec())
} }
pub fn iter(&mut self) -> Result<RecordIterator> { pub fn iter(&mut self) -> Result<RecordIterator> {