forked from ryanmwangi/CalMerger
update the 'updateMergedCalendar function to include override feature
This commit is contained in:
parent
df9276c8a9
commit
3543489c3a
23
server.js
23
server.js
|
@ -114,6 +114,7 @@ async function updateMergedCalendar(){
|
||||||
return {
|
return {
|
||||||
data: response.data,
|
data: response.data,
|
||||||
prefix: calendar.prefix,
|
prefix: calendar.prefix,
|
||||||
|
override: calendar.override,
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
@ -132,11 +133,19 @@ async function updateMergedCalendar(){
|
||||||
const calendar = ical.parseICS(result.data);
|
const calendar = ical.parseICS(result.data);
|
||||||
Object.keys(calendar).forEach((key) => {
|
Object.keys(calendar).forEach((key) => {
|
||||||
const event = calendar[key];
|
const event = calendar[key];
|
||||||
mergedCal.push({
|
if (result.override) {
|
||||||
start: event.start,
|
mergedCal.push({
|
||||||
end: event.end,
|
start: event.start,
|
||||||
summary: `${result.prefix} ${event.summary}`,
|
end: event.end,
|
||||||
});
|
summary: result.prefix,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
mergedCal.push({
|
||||||
|
start: event.start,
|
||||||
|
end: event.end,
|
||||||
|
summary: `${result.prefix} ${event.summary}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -158,8 +167,8 @@ END:VEVENT
|
||||||
icalString += `END:VCALENDAR`;
|
icalString += `END:VCALENDAR`;
|
||||||
fs.writeFileSync(filename, icalString);
|
fs.writeFileSync(filename, icalString);
|
||||||
|
|
||||||
// Generate a unique URL for the merged calendar
|
// Generate a unique URL for the merged calendar
|
||||||
const mergedCalendarUrl = `http://localhost:3000/${filename}`;
|
const mergedCalendarUrl = `${req.protocol}://${req.get('host')}/${filename}`;
|
||||||
console.log(`Merged calendar updated: ${mergedCalendarUrl}`);
|
console.log(`Merged calendar updated: ${mergedCalendarUrl}`);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue