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

Fix fetchInterval for sample calendar (#3139)

Browse Source 
fixes #3138 just in case #3137 doesnt get worked on until the next
release

- inc fetchInterval for sample calender
- add fetchInterval config per calendar
This commit is contained in:
Veeck 2023-06-30 20:13:07 +02:00 committed by GitHub
parent 0e00e64493
commit ea818bf899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -17,6 +17,7 @@ _This release is scheduled to be released on 2023-07-01._
- Added no-param-reassign eslint rule and fix warnings - Added no-param-reassign eslint rule and fix warnings
- updatenotification: Added `sendUpdatesNotifications` feature. Broadcast update with `UPDATES` notification to other modules - updatenotification: Added `sendUpdatesNotifications` feature. Broadcast update with `UPDATES` notification to other modules
- updatenotification: allow force scanning with `SCAN_UPDATES` notification from other modules - updatenotification: allow force scanning with `SCAN_UPDATES` notification from other modules
- Added per-calendar fetchInterval
### Removed ### Removed
@ -30,6 +31,9 @@ _This release is scheduled to be released on 2023-07-01._
- Refactor formatTime into common util function for default modules - Refactor formatTime into common util function for default modules
- Refactor some calendar methods into own class and added tests for them - Refactor some calendar methods into own class and added tests for them
- Split install and run commands in github actions - Split install and run commands in github actions
- Changed `fetchInterval` of calendar in `config.js.sample` to 7 days so we not to request example calendar too frequently
- Changed default calendar fetchInterval to one hour
- Changed calendar url in sample config
### Fixed ### Fixed

3
config/config.js.sample
View File

@ -55,8 +55,9 @@ let config = {
config: { config: {
calendars: [ calendars: [
{ {
fetchInterval: 7 * 24 * 60 * 60 * 1000,
symbol: "calendar-check", symbol: "calendar-check",
url: "webcal://www.calendarlabs.com/ical-calendar/ics/76/US_Holidays.ics" url: "https://ics.calendarlabs.com/76/mm3137/US_Holidays.ics"
} }
] ]
} }

6
modules/default/calendar/calendar.js
View File

@ -21,11 +21,11 @@ Module.register("calendar", {
defaultRepeatingCountTitle: "", defaultRepeatingCountTitle: "",
maxTitleLength: 25, maxTitleLength: 25,
maxLocationTitleLength: 25, maxLocationTitleLength: 25,
wrapEvents: false, // wrap events to multiple lines breaking at maxTitleLength wrapEvents: false, // Wrap events to multiple lines breaking at maxTitleLength
wrapLocationEvents: false, wrapLocationEvents: false,
maxTitleLines: 3, maxTitleLines: 3,
maxEventTitleLines: 3, maxEventTitleLines: 3,
fetchInterval: 5 * 60 * 1000, // Update every 5 minutes. fetchInterval: 60 * 60 * 1000, // Update every hour
animationSpeed: 2000, animationSpeed: 2000,
fade: true, fade: true,
urgency: 7, urgency: 7,
@ -683,7 +683,7 @@ Module.register("calendar", {
maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries, maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays, maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
pastDaysCount: calendarConfig.pastDaysCount || this.config.pastDaysCount, pastDaysCount: calendarConfig.pastDaysCount || this.config.pastDaysCount,
fetchInterval: this.config.fetchInterval, fetchInterval: calendarConfig.fetchInterval || this.config.fetchInterval,
symbolClass: calendarConfig.symbolClass, symbolClass: calendarConfig.symbolClass,
titleClass: calendarConfig.titleClass, titleClass: calendarConfig.titleClass,
timeClass: calendarConfig.timeClass, timeClass: calendarConfig.timeClass,