gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-30 08:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

factor out repetitive else-if chain into macro

Browse Source
This commit is contained in:
Charles Hall
2025-07-30 18:21:33 -07:00
parent 13f67b6cd8
commit 66faef9fb6
1 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/s3/multipart.rs
+23 -40
View File
@@ -606,6 +606,20 @@ struct CompleteMultipartUploadPart {
checksum: Option<ChecksumValue>, checksum: Option<ChecksumValue>,
} }
macro_rules! extract_checksum_from {
($node:ident { $($name:expr => $variant:ident),* $(,)? }) => {
if false { None }
$(
else if let Some(node) = $node.children().find(|e| e.has_tag_name($name)) {
Some(ChecksumValue::$variant(
BASE64_STANDARD.decode(node.text()?).ok()?[..].try_into().ok()?
))
}
)*
else { None }
}
}
fn parse_complete_multipart_upload_body( fn parse_complete_multipart_upload_body(
xml: &roxmltree::Document, xml: &roxmltree::Document,
) -> Option<Vec<CompleteMultipartUploadPart>> { ) -> Option<Vec<CompleteMultipartUploadPart>> {
@@ -629,46 +643,15 @@ fn parse_complete_multipart_upload_body(
.children() .children()
.find(|e| e.has_tag_name("PartNumber"))? .find(|e| e.has_tag_name("PartNumber"))?
.text()?; .text()?;
let checksum = if let Some(crc32) =
item.children().find(|e| e.has_tag_name("ChecksumCRC32")) let checksum = extract_checksum_from!(item {
{ "ChecksumCRC32" => Crc32,
Some(ChecksumValue::Crc32( "ChecksumCRC32C" => Crc32c,
BASE64_STANDARD.decode(crc32.text()?).ok()?[..] "ChecksumCRC64NVME" => Crc64Nvme,
.try_into() "ChecksumSHA1" => Sha1,
.ok()?, "ChecksumSHA256" => Sha256,
)) });
} else if let Some(crc32c) = item.children().find(|e| e.has_tag_name("ChecksumCRC32C"))
{
Some(ChecksumValue::Crc32c(
BASE64_STANDARD.decode(crc32c.text()?).ok()?[..]
.try_into()
.ok()?,
))
} else if let Some(crc64nvme) = item
.children()
.find(|e| e.has_tag_name("ChecksumCRC64NVME"))
{
Some(ChecksumValue::Crc64Nvme(
BASE64_STANDARD.decode(crc64nvme.text()?).ok()?[..]
.try_into()
.ok()?,
))
} else if let Some(sha1) = item.children().find(|e| e.has_tag_name("ChecksumSHA1")) {
Some(ChecksumValue::Sha1(
BASE64_STANDARD.decode(sha1.text()?).ok()?[..]
.try_into()
.ok()?,
))
} else if let Some(sha256) = item.children().find(|e| e.has_tag_name("ChecksumSHA256"))
{
Some(ChecksumValue::Sha256(
BASE64_STANDARD.decode(sha256.text()?).ok()?[..]
.try_into()
.ok()?,
))
} else {
None
};
parts.push(CompleteMultipartUploadPart { parts.push(CompleteMultipartUploadPart {
etag: etag.trim_matches('"').to_string(), etag: etag.trim_matches('"').to_string(),
part_number: part_number.parse().ok()?, part_number: part_number.parse().ok()?,