fixup! perf: apply details/changes only on the relevant events

Author: EdJoPaTo

src/apply_changes.rs

@@ -16,7 +16,7 @@ pub fn apply_change(
         if change.remove {
             match removed_events {
                 RemovedEvents::Cancelled => event.status = EventStatus::Cancelled,
-                RemovedEvents::Emoji => event.pretty_name.insert_str(0, "🚫 "),
+                RemovedEvents::Emoji => event.name.insert_str(0, "🚫 "),
                 RemovedEvents::Removed => {
                     events.remove(i);
                     return;
@@ -25,8 +25,8 @@ pub fn apply_change(
         }
 
         if let Some(namesuffix) = &change.namesuffix {
-            event.pretty_name += " ";
-            event.pretty_name += namesuffix;
+            event.name += " ";
+            event.name += namesuffix;
         }
 
         if let Some(room) = change.room {
@@ -51,7 +51,6 @@ fn generate_events() -> Vec<SoonToBeIcsEvent> {
     vec![
         SoonToBeIcsEvent {
             name: "BTI5-VSP/01".to_owned(),
-            pretty_name: "BTI5-VSP/01".to_owned(),
             status: EventStatus::Confirmed,
             start_time: chrono::NaiveDate::from_ymd_opt(2020, 4, 2)
                 .unwrap()
@@ -67,7 +66,6 @@ fn generate_events() -> Vec<SoonToBeIcsEvent> {
         },
         SoonToBeIcsEvent {
             name: "BTI5-VSP/01".to_owned(),
-            pretty_name: "BTI5-VSP/01".to_owned(),
             status: EventStatus::Confirmed,
             start_time: chrono::NaiveDate::from_ymd_opt(2020, 5, 14)
                 .unwrap()
@@ -159,7 +157,7 @@ fn remove_event_gets_emoji_prefix() {
     };
     apply_change(&mut events, date, change, RemovedEvents::Emoji);
     assert_eq!(events.len(), 2);
-    assert_eq!(events[1].pretty_name, "🚫 BTI5-VSP/01");
+    assert_eq!(events[1].name, "🚫 BTI5-VSP/01");
 }
 
 #[test]
@@ -177,7 +175,7 @@ fn namesuffix_is_added() {
         room: None,
     };
     apply_change(&mut events, date, change, RemovedEvents::Cancelled);
-    assert_eq!(events[1].pretty_name, "BTI5-VSP/01 whatever");
+    assert_eq!(events[1].name, "BTI5-VSP/01 whatever");
 }
 
 #[test]

src/apply_details.rs

@@ -19,7 +19,6 @@ pub fn apply_details(event: &mut SoonToBeIcsEvent, details: &EventDetails) {
 fn create_event(description: &str) -> SoonToBeIcsEvent {
     SoonToBeIcsEvent {
         name: "BTI5-VSP/01".to_owned(),
-        pretty_name: "BTI5-VSP/01".to_owned(),
         status: crate::generate_ics::EventStatus::Confirmed,
         start_time: chrono::NaiveDate::from_ymd_opt(2020, 4, 2)
             .unwrap()

src/events.rs

@@ -35,8 +35,7 @@ impl From<EventEntry> for SoonToBeIcsEvent {
         Self {
             start_time: event.start_time,
             end_time: event.end_time,
-            name: event.name.clone(),
-            pretty_name: event.name,
+            name: event.name,
             status: EventStatus::Confirmed,
             alert_minutes_before: None,
             description: event.description,

src/generate_ics.rs

@@ -13,7 +13,6 @@ pub enum EventStatus {
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub struct SoonToBeIcsEvent {
     pub name: String,
-    pub pretty_name: String,
     pub status: EventStatus,
     pub start_time: NaiveDateTime,
     pub end_time: NaiveDateTime,
@@ -82,7 +81,7 @@ fn event_as_ics_vevent_string(output: &mut String, event: &SoonToBeIcsEvent) {
     _ = writeln!(
         output,
         "SUMMARY:{}",
-        string_to_ical_escaped_text(&event.pretty_name)
+        string_to_ical_escaped_text(&event.name)
     );
     _ = writeln!(
         output,
@@ -183,7 +182,6 @@ fn parse_ics_date() {
 fn create_minimal_event_vevent() {
     let event = SoonToBeIcsEvent {
         name: "BTI5-VS".to_owned(),
-        pretty_name: "BTI5-VS".to_owned(),
         status: EventStatus::Cancelled,
         start_time: chrono::NaiveDate::from_ymd_opt(2020, 8, 22)
             .unwrap()
@@ -202,7 +200,7 @@ fn create_minimal_event_vevent() {
     event_as_ics_vevent_string(&mut result, &event);
     assert_eq!(
         result,
-        "BEGIN:VEVENT\nTRANSP:OPAQUE\nSTATUS:CANCELLED\nSUMMARY:BTI5-VS\nDTSTART;TZID=Europe/Berlin:20200822T083000\nDTEND;TZID=Europe/Berlin:20200822T113000\nURL;VALUE=URI:https://telegram.me/HAWHHCalendarBot\nUID:dbbd48a01ce77b8c@calendarbot.hawhh.de\nEND:VEVENT\n"
+        "BEGIN:VEVENT\nTRANSP:OPAQUE\nSTATUS:CANCELLED\nSUMMARY:BTI5-VS\nDTSTART;TZID=Europe/Berlin:20200822T083000\nDTEND;TZID=Europe/Berlin:20200822T113000\nURL;VALUE=URI:https://telegram.me/HAWHHCalendarBot\nUID:c2238d8b06ddebc8@calendarbot.hawhh.de\nEND:VEVENT\n"
     );
 }