version 0.8.1

Cargo.lock

@@ -1598,9 +1598,12 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.11.0"
-source = "git+https://github.com/lennart-k/ical-rs#c5fa2217af23ba27ba80295a2c0eb922f08f6c97"
+source = "git+https://github.com/lennart-k/ical-rs#cee8e09a907ce336ac7e03397c5d81d0fb0d9faf"
 dependencies = [
+ "chrono",
  "chrono-tz",
+ "lazy_static",
+ "regex",
  "serde",
  "thiserror 2.0.12",
 ]
@@ -2727,9 +2730,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
+checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
 dependencies = [
  "bitflags",
 ]
@@ -3023,7 +3026,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -3066,7 +3069,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-std",
  "async-trait",
@@ -3105,7 +3108,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "axum",
@@ -3137,7 +3140,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "axum",
@@ -3162,7 +3165,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "axum",
@@ -3187,7 +3190,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "askama",
  "askama_web",
@@ -3220,7 +3223,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "axum",
  "chrono",
@@ -3238,7 +3241,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "axum",
@@ -3253,7 +3256,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3287,7 +3290,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3308,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.12",
@@ -4065,9 +4068,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4078,10 +4081,10 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "tokio-macros",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.8.0"
+version = "0.8.1"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"

crates/ical/src/duration.rs

@@ -1,53 +0,0 @@
-use crate::CalDateTimeError;
-use chrono::Duration;
-use lazy_static::lazy_static;
-
-lazy_static! {
-    static ref RE_DURATION: regex::Regex = regex::Regex::new(r"^(?<sign>[+-])?P((?P<W>\d+)W)?((?P<D>\d+)D)?(T((?P<H>\d+)H)?((?P<M>\d+)M)?((?P<S>\d+)S)?)?$").unwrap();
-}
-
-pub fn parse_duration(string: &str) -> Result<Duration, CalDateTimeError> {
-    let captures = RE_DURATION
-        .captures(string)
-        .ok_or(CalDateTimeError::InvalidDurationFormat(string.to_string()))?;
-
-    let mut duration = Duration::zero();
-    if let Some(weeks) = captures.name("W") {
-        duration += Duration::weeks(weeks.as_str().parse().unwrap());
-    }
-    if let Some(days) = captures.name("D") {
-        duration += Duration::days(days.as_str().parse().unwrap());
-    }
-    if let Some(hours) = captures.name("H") {
-        duration += Duration::hours(hours.as_str().parse().unwrap());
-    }
-    if let Some(minutes) = captures.name("M") {
-        duration += Duration::minutes(minutes.as_str().parse().unwrap());
-    }
-    if let Some(seconds) = captures.name("S") {
-        duration += Duration::seconds(seconds.as_str().parse().unwrap());
-    }
-    if let Some(sign) = captures.name("sign") {
-        if sign.as_str() == "-" {
-            duration = -duration;
-        }
-    }
-
-    Ok(duration)
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::Duration;
-
-    use crate::parse_duration;
-
-    #[test]
-    fn test_parse_duration() {
-        assert_eq!(parse_duration("P12W").unwrap(), Duration::weeks(12));
-        assert_eq!(parse_duration("P12D").unwrap(), Duration::days(12));
-        assert_eq!(parse_duration("PT12H").unwrap(), Duration::hours(12));
-        assert_eq!(parse_duration("PT12M").unwrap(), Duration::minutes(12));
-        assert_eq!(parse_duration("PT12S").unwrap(), Duration::seconds(12));
-    }
-}

crates/ical/src/icalendar/event.rs

@@ -1,5 +1,5 @@
+use crate::CalDateTime;
 use crate::Error;
-use crate::{CalDateTime, parse_duration};
 use chrono::{DateTime, Duration, Utc};
 use ical::parser::ComponentMut;
 use ical::{generator::IcalEvent, parser::Component, property::Property};
@@ -16,7 +16,7 @@ pub struct EventObject {
 
 impl EventObject {
     pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtstart) = self.event.get_property("DTSTART") {
+        if let Some(dtstart) = self.event.get_dtstart() {
             Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
         } else {
             Ok(None)
@@ -24,7 +24,7 @@ impl EventObject {
     }
 
     pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_property("DTEND") {
+        if let Some(dtend) = self.event.get_dtend() {
             Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
         } else {
             Ok(None)
@@ -32,33 +32,21 @@ impl EventObject {
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(_rrule) = self.event.get_property("RRULE") {
+        if self.event.get_rrule().is_some() {
             // TODO: understand recurrence rules
             return Ok(None);
         }
 
-        if let Some(dtend) = self.event.get_property("DTEND") {
-            return Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?));
+        if let Some(dtend) = self.get_dtend()? {
+            return Ok(Some(dtend));
         };
 
-        let duration = self.get_duration()?.unwrap_or(Duration::days(1));
+        let duration = self.event.get_duration().unwrap_or(Duration::days(1));
 
         let first_occurence = self.get_dtstart()?;
         Ok(first_occurence.map(|first_occurence| first_occurence + duration))
     }
 
-    pub fn get_duration(&self) -> Result<Option<Duration>, Error> {
-        if let Some(Property {
-            value: Some(duration),
-            ..
-        }) = self.event.get_property("DURATION")
-        {
-            Ok(Some(parse_duration(duration)?))
-        } else {
-            Ok(None)
-        }
-    }
-
     pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
         let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_dtstart()? {
             if let Some(dtend) = self.get_dtend()? {

crates/ical/src/lib.rs

@@ -3,9 +3,6 @@ mod timezone;
 pub use timestamp::*;
 pub use timezone::*;
 
-mod duration;
-pub use duration::parse_duration;
-
 mod icalendar;
 pub use icalendar::*;
 

crates/ical/src/timestamp.rs

@@ -1,4 +1,4 @@
-use super::timezone::CalTimezone;
+use super::timezone::ICalTimezone;
 use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use chrono_tz::Tz;
 use derive_more::derive::Deref;
@@ -64,8 +64,8 @@ pub enum CalDateTime {
     // Form 2, example: 19980119T070000Z -> UTC
     // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
     // https://en.wikipedia.org/wiki/Tz_database
-    DateTime(DateTime<CalTimezone>),
-    Date(NaiveDate, CalTimezone),
+    DateTime(DateTime<ICalTimezone>),
+    Date(NaiveDate, ICalTimezone),
 }
 
 impl From<CalDateTime> for DateTime<rrule::Tz> {
@@ -102,13 +102,13 @@ impl Ord for CalDateTime {
 
 impl From<DateTime<Local>> for CalDateTime {
     fn from(value: DateTime<Local>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Local))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Local))
     }
 }
 
 impl From<DateTime<Utc>> for CalDateTime {
     fn from(value: DateTime<Utc>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Olson(chrono_tz::UTC)))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
     }
 }
 
@@ -160,7 +160,7 @@ impl CalDateTime {
     pub fn format(&self) -> String {
         match self {
             Self::DateTime(datetime) => match datetime.timezone() {
-                CalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
+                ICalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
                 _ => datetime.format(LOCAL_DATE_TIME).to_string(),
             },
             Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
@@ -185,7 +185,7 @@ impl CalDateTime {
         matches!(&self, Self::Date(_, _))
     }
 
-    pub fn as_datetime(&self) -> Cow<'_, DateTime<CalTimezone>> {
+    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
         match self {
             Self::DateTime(datetime) => Cow::Borrowed(datetime),
             Self::Date(date, tz) => Cow::Owned(
@@ -209,7 +209,7 @@ impl CalDateTime {
             }
             return Ok(CalDateTime::DateTime(
                 datetime
-                    .and_local_timezone(CalTimezone::Local)
+                    .and_local_timezone(ICalTimezone::Local)
                     .earliest()
                     .ok_or(CalDateTimeError::LocalTimeGap)?,
             ));
@@ -219,8 +219,8 @@ impl CalDateTime {
             return Ok(datetime.and_utc().into());
         }
         let timezone = timezone
-            .map(CalTimezone::Olson)
-            .unwrap_or(CalTimezone::Local);
+            .map(ICalTimezone::Olson)
+            .unwrap_or(ICalTimezone::Local);
         if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
             return Ok(CalDateTime::Date(date, timezone));
         }
@@ -252,7 +252,7 @@ impl CalDateTime {
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(year, month, day)
                         .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
-                    CalTimezone::Local,
+                    ICalTimezone::Local,
                 ),
                 false,
             ));
@@ -264,7 +264,7 @@ impl CalDateTime {
         self.as_datetime().to_utc()
     }
 
-    pub fn timezone(&self) -> CalTimezone {
+    pub fn timezone(&self) -> ICalTimezone {
         match &self {
             CalDateTime::DateTime(datetime) => datetime.timezone(),
             CalDateTime::Date(_, tz) => tz.to_owned(),
@@ -400,7 +400,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 true
             )
@@ -410,7 +410,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 true
             )
@@ -420,7 +420,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                 ),
                 false
             )

crates/ical/src/timezone.rs

@@ -3,21 +3,21 @@ use chrono_tz::Tz;
 use derive_more::{Display, From};
 
 #[derive(Debug, Clone, From, PartialEq, Eq)]
-pub enum CalTimezone {
+pub enum ICalTimezone {
     Local,
     Olson(Tz),
 }
 
-impl From<CalTimezone> for rrule::Tz {
-    fn from(value: CalTimezone) -> Self {
+impl From<ICalTimezone> for rrule::Tz {
+    fn from(value: ICalTimezone) -> Self {
         match value {
-            CalTimezone::Local => Self::LOCAL,
-            CalTimezone::Olson(tz) => Self::Tz(tz),
+            ICalTimezone::Local => Self::LOCAL,
+            ICalTimezone::Olson(tz) => Self::Tz(tz),
         }
     }
 }
 
-impl From<rrule::Tz> for CalTimezone {
+impl From<rrule::Tz> for ICalTimezone {
     fn from(value: rrule::Tz) -> Self {
         match value {
             rrule::Tz::Local(_) => Self::Local,
@@ -41,7 +41,7 @@ impl chrono::Offset for CalTimezoneOffset {
     }
 }
 
-impl TimeZone for CalTimezone {
+impl TimeZone for ICalTimezone {
     type Offset = CalTimezoneOffset;
 
     fn from_offset(offset: &Self::Offset) -> Self {