mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
Update ical_parser to parse in UTC and convert to local time.
Using j08lue's fork from https://github.com/j08lue/JavaScript-Ical-Parser
This commit is contained in:
parent
eb7350fb52
commit
24ab382bb2
60
js/ical_parser.js
Executable file → Normal file
60
js/ical_parser.js
Executable file → Normal file
@ -40,7 +40,7 @@ function ical_parser(feed_url, callback){
|
|||||||
*/
|
*/
|
||||||
this.makeDate = function(ical_date){
|
this.makeDate = function(ical_date){
|
||||||
//break date apart
|
//break date apart
|
||||||
var dt = {
|
var dtutc = {
|
||||||
year: ical_date.substr(0,4),
|
year: ical_date.substr(0,4),
|
||||||
month: ical_date.substr(4,2),
|
month: ical_date.substr(4,2),
|
||||||
day: ical_date.substr(6,2),
|
day: ical_date.substr(6,2),
|
||||||
@ -48,9 +48,19 @@ function ical_parser(feed_url, callback){
|
|||||||
minute: ical_date.substr(11,2)
|
minute: ical_date.substr(11,2)
|
||||||
}
|
}
|
||||||
//Create JS date (months start at 0 in JS - don't ask)
|
//Create JS date (months start at 0 in JS - don't ask)
|
||||||
dt.date = new Date(dt.year, (dt.month-1), dt.day, dt.hour, dt.minute);
|
var utcdatems = Date.UTC(dtutc.year, (dtutc.month-1), dtutc.day, dtutc.hour, dtutc.minute);
|
||||||
|
var dt = {};
|
||||||
|
dt.date = new Date(utcdatems);
|
||||||
|
|
||||||
|
dt.year = dt.date.getFullYear();
|
||||||
|
dt.month = ('0' + (dt.date.getMonth()+1)).slice(-2);
|
||||||
|
dt.day = ('0' + dt.date.getDate()).slice(-2);
|
||||||
|
dt.hour = ('0' + dt.date.getHours()).slice(-2);
|
||||||
|
dt.minute = ('0' + dt.date.getMinutes()).slice(-2);
|
||||||
|
|
||||||
//Get the full name of the given day
|
//Get the full name of the given day
|
||||||
dt.dayname =["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"][dt.date.getDay()];
|
dt.dayname =["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"][dt.date.getDay()];
|
||||||
|
dt.monthname = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ][dt.date.getMonth()] ;
|
||||||
|
|
||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
@ -66,7 +76,7 @@ function ical_parser(feed_url, callback){
|
|||||||
this.events = [];
|
this.events = [];
|
||||||
|
|
||||||
//Clean string and split the file so we can handle it (line by line)
|
//Clean string and split the file so we can handle it (line by line)
|
||||||
cal_array = data.replace(new RegExp( "\\r", "g" ), "").split("\n");
|
cal_array = data.replace(new RegExp( "\\r", "g" ), "").replace(/\n /g,"").split("\n");
|
||||||
|
|
||||||
//Keep track of when we are activly parsing an event
|
//Keep track of when we are activly parsing an event
|
||||||
var in_event = false;
|
var in_event = false;
|
||||||
@ -80,18 +90,23 @@ function ical_parser(feed_url, callback){
|
|||||||
cur_event = {};
|
cur_event = {};
|
||||||
}
|
}
|
||||||
//If we encounter end event, complete the object and add it to our events array then clear it for reuse.
|
//If we encounter end event, complete the object and add it to our events array then clear it for reuse.
|
||||||
if(in_event && ln == 'END:VEVENT'){
|
if(in_event && ln == 'END:VEVENT'){
|
||||||
in_event = false;
|
in_event = false;
|
||||||
this.events.push(cur_event);
|
this.events.push(cur_event);
|
||||||
cur_event = null;
|
cur_event = null;
|
||||||
}
|
}
|
||||||
//If we are in an event
|
//If we are in an event
|
||||||
if(in_event){
|
else if(in_event){
|
||||||
|
//var lntrim = ln.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
|
||||||
|
//var lnsplit = lntrim.split(':');
|
||||||
|
//type = lnsplit[0];
|
||||||
|
//val = lnsplit[1];
|
||||||
|
|
||||||
//Split the item based on the first ":"
|
//Split the item based on the first ":"
|
||||||
idx = ln.indexOf(':');
|
idx = ln.indexOf(':');
|
||||||
//Apply trimming to values to reduce risks of badly formatted ical files.
|
//Apply trimming to values to reduce risks of badly formatted ical files.
|
||||||
type = ln.substr(0,idx).replace(/^\s\s*/, '').replace(/\s\s*$/, '');//Trim
|
type = ln.substr(0,idx).replace(/^\s\s*/, '').replace(/\s\s*$/, '');//Trim
|
||||||
val = ln.substr(idx+1,ln.length-(idx+1)).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
|
val = ln.substr(idx+1).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
|
||||||
|
|
||||||
//If the type is a start date, proccess it and store details
|
//If the type is a start date, proccess it and store details
|
||||||
if(type =='DTSTART'){
|
if(type =='DTSTART'){
|
||||||
@ -101,9 +116,10 @@ function ical_parser(feed_url, callback){
|
|||||||
cur_event.start_time = dt.hour+':'+dt.minute;
|
cur_event.start_time = dt.hour+':'+dt.minute;
|
||||||
cur_event.start_date = dt.day+'/'+dt.month+'/'+dt.year;
|
cur_event.start_date = dt.day+'/'+dt.month+'/'+dt.year;
|
||||||
cur_event.day = dt.dayname;
|
cur_event.day = dt.dayname;
|
||||||
|
cur_event.start_date_long = dt.day+'. '+dt.monthname+' '+dt.year ;
|
||||||
}
|
}
|
||||||
//If the type is an end date, do the same as above
|
//If the type is an end date, do the same as above
|
||||||
if(type =='DTEND'){
|
else if(type =='DTEND'){
|
||||||
dt = this.makeDate(val);
|
dt = this.makeDate(val);
|
||||||
val = dt.date;
|
val = dt.date;
|
||||||
//These are helpful for display
|
//These are helpful for display
|
||||||
@ -112,7 +128,15 @@ function ical_parser(feed_url, callback){
|
|||||||
cur_event.day = dt.dayname;
|
cur_event.day = dt.dayname;
|
||||||
}
|
}
|
||||||
//Convert timestamp
|
//Convert timestamp
|
||||||
if(type =='DTSTAMP') val = this.makeDate(val).date;
|
else if(type =='DTSTAMP'){
|
||||||
|
val = this.makeDate(val).date;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
val = val
|
||||||
|
.replace(/\\r\\n/g,'<br />')
|
||||||
|
.replace(/\\n/g,'<br />')
|
||||||
|
.replace(/\\,/g,',');
|
||||||
|
}
|
||||||
|
|
||||||
//Add the value to our event object.
|
//Add the value to our event object.
|
||||||
cur_event[type] = val;
|
cur_event[type] = val;
|
||||||
@ -153,12 +177,28 @@ function ical_parser(feed_url, callback){
|
|||||||
var future_events = [], current_date = new Date();
|
var future_events = [], current_date = new Date();
|
||||||
|
|
||||||
this.events.forEach(function(itm){
|
this.events.forEach(function(itm){
|
||||||
//If the event starts after the current time, add it to the array to return.
|
//If the event ends after the current time, add it to the array to return.
|
||||||
if(itm.DTSTART > current_date) future_events.push(itm);
|
if(itm.DTEND > current_date) future_events.push(itm);
|
||||||
});
|
});
|
||||||
return future_events;
|
return future_events;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* getPastEvents
|
||||||
|
* return all events sheduled to take place before the current date.
|
||||||
|
*
|
||||||
|
* @return list of events objects
|
||||||
|
*/
|
||||||
|
this.getPastEvents = function(){
|
||||||
|
var past_events = [], current_date = new Date();
|
||||||
|
|
||||||
|
this.events.forEach(function(itm){
|
||||||
|
//If the event ended before the current time, add it to the array to return.
|
||||||
|
if(itm.DTEND <= current_date) past_events.push(itm);
|
||||||
|
});
|
||||||
|
return past_events.reverse();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* load
|
* load
|
||||||
* load a new ICAL file.
|
* load a new ICAL file.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user