cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

style: cargo fmt --all

Browse Source
This commit is contained in:
Dionisio
2026-03-03 01:49:18 +01:00
parent 1df52fd702
commit efcf88c4d7
29 changed files with 2754 additions and 2732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/application/adapters/caldav_adapter.rs
+15 -29
View File
@@ -351,27 +351,23 @@ impl CalDavAdapter {
username
))))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:href")))?;
xml_writer
.write_event(Event::End(BytesEnd::new("D:current-user-principal")))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:current-user-principal")))?;
// calendar-home-set
xml_writer
.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("D:href")))?;
xml_writer.write_event(Event::Text(BytesText::new(&format!(
"/caldav/{}/",
username
))))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:href")))?;
xml_writer
.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
}
PropFindType::PropName => {
xml_writer.write_event(Event::Empty(BytesStart::new("D:resourcetype")))?;
xml_writer
.write_event(Event::Empty(BytesStart::new("D:current-user-principal")))?;
xml_writer
.write_event(Event::Empty(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Empty(BytesStart::new("C:calendar-home-set")))?;
}
PropFindType::Prop(props) => {
Self::write_root_requested_props(xml_writer, username, props)?;
@@ -404,9 +400,8 @@ impl CalDavAdapter {
xml_writer.write_event(Event::End(BytesEnd::new("D:resourcetype")))?;
}
("DAV:", "current-user-principal") => {
xml_writer.write_event(Event::Start(BytesStart::new(
"D:current-user-principal",
)))?;
xml_writer
.write_event(Event::Start(BytesStart::new("D:current-user-principal")))?;
xml_writer.write_event(Event::Start(BytesStart::new("D:href")))?;
xml_writer.write_event(Event::Text(BytesText::new(&format!(
"/caldav/principals/{}/",
@@ -417,16 +412,14 @@ impl CalDavAdapter {
.write_event(Event::End(BytesEnd::new("D:current-user-principal")))?;
}
("urn:ietf:params:xml:ns:caldav", "calendar-home-set") => {
xml_writer
.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("D:href")))?;
xml_writer.write_event(Event::Text(BytesText::new(&format!(
"/caldav/{}/",
username
))))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:href")))?;
xml_writer
.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
}
("DAV:", "displayname") => {
xml_writer.write_event(Event::Start(BytesStart::new("D:displayname")))?;
@@ -452,10 +445,7 @@ impl CalDavAdapter {
}
/// Write standard properties for a principal resource.
fn write_principal_props<W: Write>(
xml_writer: &mut Writer<W>,
username: &str,
) -> Result<()> {
fn write_principal_props<W: Write>(xml_writer: &mut Writer<W>, username: &str) -> Result<()> {
// resourcetype — principal
xml_writer.write_event(Event::Start(BytesStart::new("D:resourcetype")))?;
xml_writer.write_event(Event::Empty(BytesStart::new("D:collection")))?;
@@ -510,9 +500,8 @@ impl CalDavAdapter {
xml_writer.write_event(Event::End(BytesEnd::new("D:displayname")))?;
}
("DAV:", "current-user-principal") => {
xml_writer.write_event(Event::Start(BytesStart::new(
"D:current-user-principal",
)))?;
xml_writer
.write_event(Event::Start(BytesStart::new("D:current-user-principal")))?;
xml_writer.write_event(Event::Start(BytesStart::new("D:href")))?;
xml_writer.write_event(Event::Text(BytesText::new(&format!(
"/caldav/principals/{}/",
@@ -523,16 +512,14 @@ impl CalDavAdapter {
.write_event(Event::End(BytesEnd::new("D:current-user-principal")))?;
}
("urn:ietf:params:xml:ns:caldav", "calendar-home-set") => {
xml_writer
.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::Start(BytesStart::new("D:href")))?;
xml_writer.write_event(Event::Text(BytesText::new(&format!(
"/caldav/{}/",
username
))))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:href")))?;
xml_writer
.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
xml_writer.write_event(Event::End(BytesEnd::new("C:calendar-home-set")))?;
}
("urn:ietf:params:xml:ns:caldav", "calendar-user-address-set") => {
xml_writer.write_event(Event::Start(BytesStart::new(
@@ -544,9 +531,8 @@ impl CalDavAdapter {
username
))))?;
xml_writer.write_event(Event::End(BytesEnd::new("D:href")))?;
xml_writer.write_event(Event::End(BytesEnd::new(
"C:calendar-user-address-set",
)))?;
xml_writer
.write_event(Event::End(BytesEnd::new("C:calendar-user-address-set")))?;
}
_ => {
let prop_name = if prop.namespace == "http://calendarserver.org/ns/" {
src/application/adapters/caldav_adapter_test.rs
+13 -11
View File
@@ -356,7 +356,11 @@ mod tests {
</D:propfind>"#;
let result = WebDavAdapter::parse_propfind(Cursor::new(xml));
assert!(result.is_ok(), "Failed to parse PROPFIND: {:?}", result.err());
assert!(
result.is_ok(),
"Failed to parse PROPFIND: {:?}",
result.err()
);
let request = result.unwrap();
match request.prop_find_type {
@@ -431,7 +435,11 @@ mod tests {
"/caldav/",
"testuser",
);
assert!(result.is_ok(), "Failed to generate root propfind: {:?}", result.err());
assert!(
result.is_ok(),
"Failed to generate root propfind: {:?}",
result.err()
);
let xml_str = String::from_utf8(output).expect("Invalid UTF-8");
@@ -511,11 +519,8 @@ mod tests {
};
let mut output = Vec::new();
let result = CalDavAdapter::generate_principal_propfind_response(
&mut output,
&request,
"testuser",
);
let result =
CalDavAdapter::generate_principal_propfind_response(&mut output, &request, "testuser");
assert!(result.is_ok(), "Failed: {:?}", result.err());
let xml_str = String::from_utf8(output).expect("Invalid UTF-8");
@@ -576,10 +581,7 @@ mod tests {
);
// displayname should be populated
assert!(
xml_str.contains("Personal"),
"Should contain calendar name"
);
assert!(xml_str.contains("Personal"), "Should contain calendar name");
// supported-calendar-component-set should have VEVENT
assert!(