nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-29 10:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make CalendarObject id an extrinsic property

Browse Source
This commit is contained in:
Lennart K
2025-12-28 14:14:04 +01:00
parent 2e89b63cd2
commit 968a5e931c
20 changed files with 317 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/ical/src/address_object.rs
View File

@@ -7,7 +7,7 @@ use ical::parser::{
};
use ical::types::CalDate;
use sha2::{Digest, Sha256};
use std::{collections::HashMap, io::BufReader};
use std::io::BufReader;
#[derive(Debug, Clone)]
pub struct AddressObject {
@@ -93,9 +93,8 @@ impl AddressObject {
let uid = format!("{}-anniversary", self.get_id());
let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
Some(CalendarObject::from_ics(
format!(
r"BEGIN:VCALENDAR
Some(CalendarObject::from_ics(format!(
r"BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -113,9 +112,7 @@ DESCRIPTION:💍 {fullname}{year_suffix}
END:VALARM
END:VEVENT
END:VCALENDAR",
),
None,
)?)
))?)
} else {
None
},
@@ -134,9 +131,8 @@ END:VCALENDAR",
let uid = format!("{}-birthday", self.get_id());
let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
Some(CalendarObject::from_ics(
format!(
r"BEGIN:VCALENDAR
Some(CalendarObject::from_ics(format!(
r"BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -154,9 +150,7 @@ DESCRIPTION:🎂 {fullname}{year_suffix}
END:VALARM
END:VEVENT
END:VCALENDAR",
),
None,
)?)
))?)
} else {
None
},
@@ -164,13 +158,13 @@ END:VCALENDAR",
}
/// Get significant dates associated with this address object
pub fn get_significant_dates(&self) -> Result<HashMap<&'static str, CalendarObject>, Error> {
let mut out = HashMap::new();
pub fn get_significant_dates(&self) -> Result<Vec<(String, CalendarObject)>, Error> {
let mut out = vec![];
if let Some(birthday) = self.get_birthday_object()? {
out.insert("birthday", birthday);
out.push((birthday.get_inner().get_uid().to_owned(), birthday));
}
if let Some(anniversary) = self.get_anniversary_object()? {
out.insert("anniversary", anniversary);
out.push((anniversary.get_inner().get_uid().to_owned(), anniversary));
}
Ok(out)
}

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

@@ -8,13 +8,12 @@ use std::io::BufReader;
#[derive(Debug, Clone)]
pub struct CalendarObject {
id: String,
ics: String,
inner: IcalCalendarObject,
}
impl CalendarObject {
pub fn from_ics(ics: String, id: Option<String>) -> Result<Self, Error> {
pub fn from_ics(ics: String) -> Result<Self, Error> {
let mut parser = ical::IcalObjectParser::new(BufReader::new(ics.as_bytes()));
let cal = parser.next().ok_or(Error::MissingCalendar)??;
if parser.next().is_some() {
@@ -23,11 +22,7 @@ impl CalendarObject {
));
}
Ok(Self {
id: id.unwrap_or_else(|| cal.get_uid().to_owned()),
ics,
inner: cal,
})
Ok(Self { ics, inner: cal })
}
#[must_use]
@@ -35,11 +30,6 @@ impl CalendarObject {
&self.inner
}
#[must_use]
pub fn get_id(&self) -> &str {
&self.id
}
#[must_use]
pub fn get_etag(&self) -> String {
let mut hasher = Sha256::new();

2
crates/ical/tests/test_cal_object.rs
View File

@@ -25,6 +25,6 @@ END:VCALENDAR
#[test]
fn parse_calendar_object() {
let object = CalendarObject::from_ics(MULTI_VEVENT.to_string(), None).unwrap();
let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
object.get_inner().expand_recurrence(None, None).unwrap();
}