nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-30 15:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ical: Respect that calendar do not have to contain a main event

Browse Source
This commit is contained in:
Lennart
2025-12-31 17:55:58 +01:00
parent da718dd290
commit 6ccb5a67e4
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
crates/ical/src/icalendar/object.rs
View File

@@ -89,10 +89,19 @@ impl From<&CalendarObjectComponent> for CalendarObjectType {
impl CalendarObjectComponent { impl CalendarObjectComponent {
fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> { fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
let main_event = events // A calendar object does not necessarily have to contain a main VOBJECT
if events.is_empty() {
return Err(Error::MissingCalendar);
}
#[allow(clippy::option_if_let_else)]
let main_event = if let Some(main) = events
.extract_if(.., |event| event.event.get_recurrence_id().is_none()) .extract_if(.., |event| event.event.get_recurrence_id().is_none())
.next() .next()
.expect("there must be one main event"); {
main
} else {
events.remove(0)
};
let overrides = events; let overrides = events;
for event in &overrides { for event in &overrides {
if event.get_uid() != main_event.get_uid() { if event.get_uid() != main_event.get_uid() {
@@ -109,10 +118,19 @@ impl CalendarObjectComponent {
Ok(Self::Event(main_event, overrides)) Ok(Self::Event(main_event, overrides))
} }
fn from_todos(mut todos: Vec<IcalTodo>) -> Result<Self, Error> { fn from_todos(mut todos: Vec<IcalTodo>) -> Result<Self, Error> {
let main_todo = todos // A calendar object does not necessarily have to contain a main VOBJECT
if todos.is_empty() {
return Err(Error::MissingCalendar);
}
#[allow(clippy::option_if_let_else)]
let main_todo = if let Some(main) = todos
.extract_if(.., |todo| todo.get_recurrence_id().is_none()) .extract_if(.., |todo| todo.get_recurrence_id().is_none())
.next() .next()
.expect("there must be one main event"); {
main
} else {
todos.remove(0)
};
let overrides = todos; let overrides = todos;
for todo in &overrides { for todo in &overrides {
if todo.get_uid() != main_todo.get_uid() { if todo.get_uid() != main_todo.get_uid() {
@@ -129,10 +147,19 @@ impl CalendarObjectComponent {
Ok(Self::Todo(main_todo, overrides)) Ok(Self::Todo(main_todo, overrides))
} }
fn from_journals(mut journals: Vec<IcalJournal>) -> Result<Self, Error> { fn from_journals(mut journals: Vec<IcalJournal>) -> Result<Self, Error> {
let main_journal = journals // A calendar object does not necessarily have to contain a main VOBJECT
if journals.is_empty() {
return Err(Error::MissingCalendar);
}
#[allow(clippy::option_if_let_else)]
let main_journal = if let Some(main) = journals
.extract_if(.., |journal| journal.get_recurrence_id().is_none()) .extract_if(.., |journal| journal.get_recurrence_id().is_none())
.next() .next()
.expect("there must be one main event"); {
main
} else {
journals.remove(0)
};
let overrides = journals; let overrides = journals;
for journal in &overrides { for journal in &overrides {
if journal.get_uid() != main_journal.get_uid() { if journal.get_uid() != main_journal.get_uid() {