nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 11:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate UTC implementation from CalTimezone

Browse Source
This commit is contained in:
Lennart
2025-07-25 19:06:23 +02:00
parent c22469dea6
commit 9910e4ee31
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ical/src/timestamp.rs
View File

@@ -108,7 +108,7 @@ impl From<DateTime<Local>> for CalDateTime {
impl From<DateTime<Utc>> for CalDateTime { impl From<DateTime<Utc>> for CalDateTime {
fn from(value: DateTime<Utc>) -> Self { fn from(value: DateTime<Utc>) -> Self {
CalDateTime::DateTime(value.with_timezone(&CalTimezone::Utc)) CalDateTime::DateTime(value.with_timezone(&CalTimezone::Olson(chrono_tz::UTC)))
} }
} }
@@ -160,7 +160,7 @@ impl CalDateTime {
pub fn format(&self) -> String { pub fn format(&self) -> String {
match self { match self {
Self::DateTime(datetime) => match datetime.timezone() { Self::DateTime(datetime) => match datetime.timezone() {
CalTimezone::Utc => datetime.format(UTC_DATE_TIME).to_string(), CalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
_ => datetime.format(LOCAL_DATE_TIME).to_string(), _ => datetime.format(LOCAL_DATE_TIME).to_string(),
}, },
Self::Date(date, _) => date.format(LOCAL_DATE).to_string(), Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),

16
crates/ical/src/timezone.rs
View File

@@ -1,11 +1,10 @@
use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone, Utc}; use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone};
use chrono_tz::Tz; use chrono_tz::Tz;
use derive_more::{Display, From}; use derive_more::{Display, From};
#[derive(Debug, Clone, From, PartialEq, Eq)] #[derive(Debug, Clone, From, PartialEq, Eq)]
pub enum CalTimezone { pub enum CalTimezone {
Local, Local,
Utc,
Olson(Tz), Olson(Tz),
} }
@@ -13,7 +12,6 @@ impl From<CalTimezone> for rrule::Tz {
fn from(value: CalTimezone) -> Self { fn from(value: CalTimezone) -> Self {
match value { match value {
CalTimezone::Local => Self::LOCAL, CalTimezone::Local => Self::LOCAL,
CalTimezone::Utc => Self::UTC,
CalTimezone::Olson(tz) => Self::Tz(tz), CalTimezone::Olson(tz) => Self::Tz(tz),
} }
} }
@@ -23,7 +21,6 @@ impl From<rrule::Tz> for CalTimezone {
fn from(value: rrule::Tz) -> Self { fn from(value: rrule::Tz) -> Self {
match value { match value {
rrule::Tz::Local(_) => Self::Local, rrule::Tz::Local(_) => Self::Local,
rrule::Tz::Tz(chrono_tz::UTC) => Self::Utc,
rrule::Tz::Tz(tz) => Self::Olson(tz), rrule::Tz::Tz(tz) => Self::Olson(tz),
} }
} }
@@ -32,7 +29,6 @@ impl From<rrule::Tz> for CalTimezone {
#[derive(Debug, Clone, PartialEq, Display)] #[derive(Debug, Clone, PartialEq, Display)]
pub enum CalTimezoneOffset { pub enum CalTimezoneOffset {
Local(chrono::FixedOffset), Local(chrono::FixedOffset),
Utc(chrono::Utc),
Olson(chrono_tz::TzOffset), Olson(chrono_tz::TzOffset),
} }
@@ -40,7 +36,6 @@ impl chrono::Offset for CalTimezoneOffset {
fn fix(&self) -> chrono::FixedOffset { fn fix(&self) -> chrono::FixedOffset {
match self { match self {
Self::Local(local) => local.fix(), Self::Local(local) => local.fix(),
Self::Utc(utc) => utc.fix(),
Self::Olson(olson) => olson.fix(), Self::Olson(olson) => olson.fix(),
} }
} }
@@ -52,7 +47,6 @@ impl TimeZone for CalTimezone {
fn from_offset(offset: &Self::Offset) -> Self { fn from_offset(offset: &Self::Offset) -> Self {
match offset { match offset {
CalTimezoneOffset::Local(_) => Self::Local, CalTimezoneOffset::Local(_) => Self::Local,
CalTimezoneOffset::Utc(_) => Self::Utc,
CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)), CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)),
} }
} }
@@ -62,9 +56,6 @@ impl TimeZone for CalTimezone {
Self::Local => Local Self::Local => Local
.offset_from_local_date(local) .offset_from_local_date(local)
.map(CalTimezoneOffset::Local), .map(CalTimezoneOffset::Local),
Self::Utc => Utc
.offset_from_local_date(local)
.map(CalTimezoneOffset::Utc),
Self::Olson(tz) => tz Self::Olson(tz) => tz
.offset_from_local_date(local) .offset_from_local_date(local)
.map(CalTimezoneOffset::Olson), .map(CalTimezoneOffset::Olson),
@@ -79,9 +70,6 @@ impl TimeZone for CalTimezone {
Self::Local => Local Self::Local => Local
.offset_from_local_datetime(local) .offset_from_local_datetime(local)
.map(CalTimezoneOffset::Local), .map(CalTimezoneOffset::Local),
Self::Utc => Utc
.offset_from_local_datetime(local)
.map(CalTimezoneOffset::Utc),
Self::Olson(tz) => tz Self::Olson(tz) => tz
.offset_from_local_datetime(local) .offset_from_local_datetime(local)
.map(CalTimezoneOffset::Olson), .map(CalTimezoneOffset::Olson),
@@ -91,7 +79,6 @@ impl TimeZone for CalTimezone {
fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset { fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset {
match self { match self {
Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)), Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)),
Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_datetime(utc)),
Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)), Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)),
} }
} }
@@ -99,7 +86,6 @@ impl TimeZone for CalTimezone {
fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset { fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset {
match self { match self {
Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)), Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)),
Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_date(utc)),
Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)), Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)),
} }
} }