kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-28 00:55:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixcaldates2 fix calendar module date processing, using node-ical@0.20.1 (#3587)

Browse Source 
here is an updated test version of the fixes for all kinds of calendar
date problems.

NOTE: the changed branch name
NOTE: this used the node-cal@0.19.0 library UNCHANGED

best to make a new folder and git clone there

git clone https://github.com/sdetweil/MagicMirror
cd MagicMirror
git checkout fixcaldates2 // <------ note this is a changed branch name
npm run install-mm
copy your config.js and custom.css from the prior folder
and the non-default modules you have installed…

this ONLY changes the default calendar
but DOES ship an updated node-ical library too

if you need to fall back, just rename the folders around again so that
your original is called MagicMirror

all the testcases for node-ical and MagicMirror execute successfully.

the ‘BIG’ change here is to get the local NON-TZ dates for the
rrule.between()

all the checking and conversion code is commented out or not used
the node-ical fixes are for excluded dates (exdate) values being
adjusted for DST/STD time… waiting to submit that PR

one fix in calendar.js for checking if a past date was too far back,
but it never checked to see IF the event date was in the past… (before
today) so it chopped off too many

and one change in calendarfetcher.js to put out a better diagnostic
message of the parsed data… (exdate was excluded cause JSON stringify
couldn’t convert the complex structure)

I added the tests you all have documented

please re-pull and checkout the new branch (I deleted the old branch)
and npm run install-mm again

---------

Co-authored-by: Veeck <github@veeck.de>
This commit is contained in:
sam detweiler
2024-12-07 02:51:11 -06:00
committed by GitHub
parent 291ae8546c
commit 19bd76ab93
33 changed files with 1182 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/mocks/3_move_first_allday_repeating_event.ics Normal file
View File

@@ -0,0 +1,35 @@
BEGIN:VCALENDAR
PRODID:-//Google Inc//Google Calendar 70.9054//EN
VERSION:2.0
CALSCALE:GREGORIAN
METHOD:PUBLISH
X-WR-CALNAME:TestCal
X-WR-TIMEZONE:Europe/Berlin
X-WR-CALDESC:Calendar for testing purposes
BEGIN:VEVENT
DTSTART;VALUE=DATE:20241011
DTEND;VALUE=DATE:20241012
RRULE:FREQ=WEEKLY;WKST=MO;COUNT=5;BYDAY=FR
DTSTAMP:20241009T153220Z
UID:2m6mt1p89l2anl74915ur3hsgm@google.com
CREATED:20241009T153058Z
LAST-MODIFIED:20241009T153205Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:TestCal_AllDayRepeatingEvent
TRANSP:TRANSPARENT
END:VEVENT
BEGIN:VEVENT
DTSTART;VALUE=DATE:20241012
DTEND;VALUE=DATE:20241013
DTSTAMP:20241009T153220Z
UID:2m6mt1p89l2anl74915ur3hsgm@google.com
RECURRENCE-ID;VALUE=DATE:20241011
CREATED:20241009T153058Z
LAST-MODIFIED:20241009T153205Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:TestCal_AllDayRepeatingEvent
TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR

28
tests/mocks/RepeatingEvent.Oct21.ics Normal file
View File

@@ -0,0 +1,28 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART;TZID=Europe/Berlin:20241028T000000
DTEND;TZID=Europe/Berlin:20241028T010000
RRULE:FREQ=DAILY;COUNT=3
DTSTAMP:20241020T093758Z
UID:053fdshnnibo92lu97rsoeqoti@google.com
CREATED:20241020T093230Z
LAST-MODIFIED:20241020T093230Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:RepeatingEventWeekAfterToday
TRANSP:OPAQUE
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=Europe/Berlin:20241021T000000
DTEND;TZID=Europe/Berlin:20241021T010000
RRULE:FREQ=DAILY;COUNT=3
DTSTAMP:20241020T093758Z
UID:1a6kk47pp61k4td2h9rlf0lv69@google.com
CREATED:20241020T093255Z
LAST-MODIFIED:20241020T093437Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:RepeatingEventDayAfterToday
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR

15
tests/mocks/chicago_late_in_timezone.ics Normal file
View File

@@ -0,0 +1,15 @@
BEGIN:VEVENT
CREATED:20240904T053053Z
DTEND;TZID=America/Chicago:20240910T211500
DTSTAMP:20240925T005517Z
DTSTART;TZID=America/Chicago:20240910T201500
LAST-MODIFIED:20240925T005515Z
LOCATION:Dance Class
RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:2D48CA37-FCE5-4E16-871
9-1F47160BDBA3
RRULE:FREQ=WEEKLY;UNTIL=20250601T011500Z
SEQUENCE:3
SUMMARY:Wife Barre Class
UID:39669340-7AFD-4685-9BD6-6CE4B715486E
X-APPLE-CREATOR-IDENTITY:com.apple.mobilecal
END:VEVENT

4
tests/mocks/compliments_file.json
View File

@@ -1,5 +1,3 @@
{
"morning": ["test in morning"],
"afternoon": ["test in afternoon"],
"evening": ["test in evening"]
"anytime": ["test in morning"]
}

14
tests/mocks/diff_tz_start_end.ics Normal file
View File

@@ -0,0 +1,14 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART:20241029T100000Z
DTEND:20241030T230000Z
DTSTAMP:20241022T203806Z
UID:04ivnntdi20rqsk0iesabsdhmj@google.com
CREATED:20241022T203738Z
LAST-MODIFIED:20241022T203738Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:start/end on diff tz
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR

54
tests/mocks/end_of_day_berlin_moved.ics Normal file
View File

@@ -0,0 +1,54 @@
BEGIN:VCALENDAR
PRODID:-//Google Inc//Google Calendar 70.9054//EN
VERSION:2.0
CALSCALE:GREGORIAN
METHOD:PUBLISH
X-WR-CALNAME:test for mirror
X-WR-TIMEZONE:America/Chicago
X-WR-CALDESC:used to test mirror
BEGIN:VTIMEZONE
TZID:Europe/Berlin
X-LIC-LOCATION:Europe/Berlin
BEGIN:DAYLIGHT
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
TZNAME:GMT+2
DTSTART:19700329T020000
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
END:DAYLIGHT
BEGIN:STANDARD
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
TZNAME:GMT+1
DTSTART:19701025T030000
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTART;TZID=Europe/Berlin:20241021T230000
DTEND;TZID=Europe/Berlin:20241022T000000
RRULE:FREQ=DAILY;WKST=SU;COUNT=3
DTSTAMP:20241019T133432Z
UID:0kj3dtvgskhhpli1392n111145@google.com
CREATED:20241018T213040Z
LAST-MODIFIED:20241018T213126Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:test
TRANSP:OPAQUE
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=Europe/Berlin:20241024T230000
DTEND;TZID=Europe/Berlin:20241025T000000
DTSTAMP:20241019T133432Z
UID:0kj3dtvgskhhpli1392n111145@google.com
RECURRENCE-ID;TZID=Europe/Berlin:20241021T230000
CREATED:20241018T213040Z
LAST-MODIFIED:20241018T213126Z
SEQUENCE:2
STATUS:CONFIRMED
SUMMARY:test
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR

14
tests/mocks/event_with_time_over_multiple_days_non_repeating.ics Normal file
View File

@@ -0,0 +1,14 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART:20241026T010000Z
DTEND:20241026T110000Z
DTSTAMP:20241024T153358Z
UID:4maud6s79m41a99pj2g7j5km0a@google.com
CREATED:20241024T153313Z
LAST-MODIFIED:20241024T153330Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:Sleep over at Bobs
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR

48
tests/mocks/exdate_and_recurrence_together.ics Normal file
View File

@@ -0,0 +1,48 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART;TZID=America/Los_Angeles:20241023T143000
DTEND;TZID=America/Los_Angeles:20241023T153000
RRULE:FREQ=DAILY;COUNT=4
EXDATE;TZID=America/Los_Angeles:20241025T143000
DTSTAMP:20241021T193426Z
UID:18rd721lfqpue2o08icsqek198@google.com
CREATED:20241021T192450Z
DESCRIPTION:we will move one entry and delete another  ending w 3 of the 4 
start/end\, middle moved after end and 3rd deleted
LAST-MODIFIED:20241021T193419Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:recurrence and exclusion together
TRANSP:OPAQUE
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=America/Los_Angeles:20241022T143000
DTEND;TZID=America/Los_Angeles:20241022T153000
DTSTAMP:20241021T193426Z
UID:18rd721lfqpue2o08icsqek198@google.com
RECURRENCE-ID;TZID=America/Los_Angeles:20241023T143000
CREATED:20241021T192450Z
DESCRIPTION:we will move one entry and delete another  ending w 3 of the 4 
start/end\, middle moved after end and 3rd deleted
LAST-MODIFIED:20241021T193419Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:recurrence and exclusion together
TRANSP:OPAQUE
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=America/Los_Angeles:20241027T143000
DTEND;TZID=America/Los_Angeles:20241027T153000
DTSTAMP:20241021T193426Z
UID:18rd721lfqpue2o08icsqek198@google.com
RECURRENCE-ID;TZID=America/Los_Angeles:20241024T143000
CREATED:20241021T192450Z
DESCRIPTION:we will move one entry and delete another  ending w 3 of the 4 
start/end\, middle moved after end and 3rd deleted
LAST-MODIFIED:20241021T193419Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:recurrence and exclusion together
TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR

15
tests/mocks/fullday_event_over_multiple_days_nonrepeating.ics Normal file
View File

@@ -0,0 +1,15 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART;VALUE=DATE:20241025
DTEND;VALUE=DATE:20241031
DTSTAMP:20241023T141110Z
UID:60nobfcu0ct96jgsh5nhcia24b@google.com
CREATED:20241023T141019Z
DESCRIPTION:test for all day end viewing
LAST-MODIFIED:20241023T141019Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:simple all day event over many days (not repeating)
TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR

15
tests/mocks/germany_at_end_of_day_repeating.ics Normal file
View File

@@ -0,0 +1,15 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART;TZID=Europe/Berlin:20241022T230000
DTEND;TZID=Europe/Berlin:20241023T000000
RRULE:FREQ=DAILY;WKST=MO;COUNT=4
DTSTAMP:20241009T153220Z
UID:2m6mt1p89l2anl74915ur3hsgm@google.com
CREATED:20241009T153058Z
LAST-MODIFIED:20241009T153205Z
SEQUENCE:0
STATUS:CONFIRMED
SUMMARY:TestCal_AllDayRepeatingEvent
TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR

28
tests/mocks/whole_day_moved_over_dst_change_berlin.ics Normal file
View File

@@ -0,0 +1,28 @@
BEGIN:VCALENDAR
BEGIN:VEVENT
DTSTART;VALUE=DATE:20241027
DTEND;VALUE=DATE:20241028
RRULE:FREQ=DAILY;WKST=SU;COUNT=3
DTSTAMP:20241020T152634Z
UID:14nv8jl8d6dvdbl477lod4fftf@google.com
CREATED:20241020T152434Z
LAST-MODIFIED:20241020T152536Z
SEQUENCE:1
STATUS:CONFIRMED
SUMMARY:test whole day moved
TRANSP:TRANSPARENT
END:VEVENT
BEGIN:VEVENT
DTSTART;VALUE=DATE:20241030
DTEND;VALUE=DATE:20241031
DTSTAMP:20241020T152634Z
UID:14nv8jl8d6dvdbl477lod4fftf@google.com
RECURRENCE-ID;VALUE=DATE:20241028
CREATED:20241020T152434Z
LAST-MODIFIED:20241020T152536Z
SEQUENCE:2
STATUS:CONFIRMED
SUMMARY:test whole day moved
TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR