Skip to content

Commit

Permalink
Merge pull request #101 from cloud-atlas-ai/muness/issue99
Browse files Browse the repository at this point in the history 
WIP: Adding guests and their responses
  • Loading branch information
@muness
muness authored Jan 13, 2024
2 parents 68cc5da + f1ceb69 commit 7335540
Show file tree
Hide file tree
Showing 5 changed files with 581 additions and 547 deletions.
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/IEvent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,12 @@ export interface IEvent {
location: string; // Physical location where the event takes place, if applicable
callUrl: string; // URL for joining online meetings/calls associated with the event
callType: string; // Type of online meeting (e.g., Zoom, Skype, etc.)
attendees: IAttendee[]; // Array of attendees
}

export interface IAttendee {
email: string;
name: string;
role: string;
status: string; // Participation status (accepted, declined, etc.)
}
296 changes: 155 additions & 141 deletions src/main.ts
View file
Original file line number Diff line number Diff line change
@@ -1,160 +1,174 @@
import {
Editor, moment,
MarkdownView, Notice
Editor, moment,
MarkdownView, Notice
} from 'obsidian';

import {
Calendar,
ICSSettings,
DEFAULT_SETTINGS,
Calendar,
ICSSettings,
DEFAULT_SETTINGS,
} from "./settings/ICSSettings";

import ICSSettingsTab from "./settings/ICSSettingsTab";

import {
getDateFromFile
getDateFromFile
} from "obsidian-daily-notes-interface";

import {
Plugin,
request
Plugin,
request
} from 'obsidian';
import { parseIcs, filterMatchingEvents, extractMeetingInfo } from './icalUtils';
import { IEvent } from './IEvent';
import { IEvent, IAttendee } from './IEvent';

export default class ICSPlugin extends Plugin {
data: ICSSettings;

async addCalendar(calendar: Calendar): Promise<void> {
this.data.calendars = {
...this.data.calendars,
[calendar.icsName]: calendar
};
await this.saveSettings();
}

async removeCalendar(calendar: Calendar) {
if (this.data.calendars[calendar.icsName]) {
delete this.data.calendars[calendar.icsName];
}
await this.saveSettings();
}

formatEvent(e: IEvent): string {
const callLinkOrLocation = e.callType ? `[${e.callType}](${e.callUrl})` : e.location;

// Conditionally format start and end time based on dataViewSyntax setting
const startTimeFormatted = this.data.format.dataViewSyntax ? `[startTime:: ${e.time}]` : `${e.time}`;
const endTimeFormatted = e.format.includeEventEndTime ? (this.data.format.dataViewSyntax ? `[endTime:: ${e.endTime}]` : `- ${e.endTime}`) : '';

// Combine all parts of the formatted event string
return [
`- ${e.format.checkbox ? '[ ]' : ''}`,
startTimeFormatted,
endTimeFormatted,
e.format.icsName ? e.icsName : '',
e.format.summary ? e.summary : '',
e.format.location ? callLinkOrLocation : '',
e.format.description && e.description ? `\n\t- ${e.description}` : '',
].filter(Boolean).join(' ').trim();
}

async getEvents(date: string) : Promise<IEvent[]> {
let events: IEvent[] = [];
let errorMessages: string[] = []; // To store error messages

for (const calendar in this.data.calendars) {
const calendarSetting = this.data.calendars[calendar];
let icsArray: any[] = [];

try {
if (calendarSetting.calendarType === 'vdir') {
// Assuming you have a method to list files in a directory
const icsFiles = app.vault.getFiles().filter(f => f.extension == "ics" && f.path.startsWith(calendarSetting.icsUrl));
for (const icsFile of icsFiles) {
const fileContent = await this.app.vault.read(icsFile);
icsArray = icsArray.concat(parseIcs(fileContent));
}
} else {
// Existing logic for remote URLs
icsArray = parseIcs(await request({ url: calendarSetting.icsUrl }));
}
} catch (error) {
console.error(`Error processing calendar ${calendarSetting.icsName}: ${error}`);
errorMessages.push(`Error processing calendar "${calendarSetting.icsName}"`);
}

var dateEvents;

// Exception handling for parsing and filtering
try {
dateEvents = filterMatchingEvents(icsArray, date);

} catch (filterError) {
console.error(`Error filtering events for calendar ${calendarSetting.icsName}: ${filterError}`);
errorMessages.push(`Error filtering events in calendar "${calendarSetting.icsName}"`);
}

try {
dateEvents.forEach((e) => {
const { callUrl, callType } = extractMeetingInfo(e);

let event: IEvent = {
utime: moment(e.start).format('X'),
time: moment(e.start).format(this.data.format.timeFormat),
endTime: moment(e.end).format(this.data.format.timeFormat),
icsName: calendarSetting.icsName,
summary: e.summary,
description: e.description,
format: calendarSetting.format,
location: e.location? e.location : null,
callUrl: callUrl,
callType: callType
};
events.push(event);
});
} catch (parseError) {
console.error(`Error parsing events for calendar ${calendarSetting.icsName}: ${parseError}`);
errorMessages.push(`Error parsing events in calendar "${calendarSetting.icsName}"`);
}
}

// Notify the user if any errors were encountered
if (errorMessages.length > 0) {
const message = `Encountered ${errorMessages.length} error(s) while processing calendars:\n\n${errorMessages.join('\n')}\nSee console for details.`;
new Notice(message);
}

return events;
}

async onload() {
await this.loadSettings();
this.addSettingTab(new ICSSettingsTab(this.app, this));
this.addCommand({
id: "import_events",
name: "import events",
editorCallback: async (editor: Editor, view: MarkdownView) => {
const fileDate = getDateFromFile(view.file, "day").format("YYYY-MM-DD");
var events: any[] = await this.getEvents(fileDate);

const mdArray = events.sort((a,b) => a.utime - b.utime).map(this.formatEvent, this);
editor.replaceRange(mdArray.join("\n"), editor.getCursor());
}
});
}

onunload() {
return;
}

async loadSettings() {
this.data = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
}

async saveSettings() {
await this.saveData(this.data);
}
data: ICSSettings;

async addCalendar(calendar: Calendar): Promise<void> {
this.data.calendars = {
...this.data.calendars,
[calendar.icsName]: calendar
};
await this.saveSettings();
}

async removeCalendar(calendar: Calendar) {
if (this.data.calendars[calendar.icsName]) {
delete this.data.calendars[calendar.icsName];
}
await this.saveSettings();
}

formatEvent(e: IEvent): string {
const callLinkOrLocation = e.callType ? `[${e.callType}](${e.callUrl})` : e.location;
const attendeeList = e.attendees.map(attendee => {
// Check if the name and the email are identical
const displayName = attendee.name === attendee.email
? attendee.name // If identical, use only one of them
: `${attendee.name} (${attendee.email})`; // If not, use both
return `\t\t- ${displayName}: ${attendee.status}`;
}).join('\n');

// Conditionally format start and end time based on dataViewSyntax setting
const startTimeFormatted = this.data.format.dataViewSyntax ? `[startTime:: ${e.time}]` : `${e.time}`;
const endTimeFormatted = e.format.includeEventEndTime ? (this.data.format.dataViewSyntax ? `[endTime:: ${e.endTime}]` : `- ${e.endTime}`) : '';

// Combine all parts of the formatted event string
return [
`- ${e.format.checkbox ? '[ ]' : ''}`,
startTimeFormatted,
endTimeFormatted,
e.format.icsName ? e.icsName : '',
e.format.summary ? e.summary : '',
e.format.location ? callLinkOrLocation : '',
e.format.description && e.description ? `\n\t- ${e.description}` : '',
e.format.showAttendees && e.attendees.length > 0 ? `\n\t- Attendees:\n${attendeeList}` : ''
].filter(Boolean).join(' ').trim();
}

async getEvents(date: string): Promise<IEvent[]> {
let events: IEvent[] = [];
let errorMessages: string[] = []; // To store error messages

for (const calendar in this.data.calendars) {
const calendarSetting = this.data.calendars[calendar];
let icsArray: any[] = [];

try {
if (calendarSetting.calendarType === 'vdir') {
// Assuming you have a method to list files in a directory
const icsFiles = app.vault.getFiles().filter(f => f.extension == "ics" && f.path.startsWith(calendarSetting.icsUrl));
for (const icsFile of icsFiles) {
const fileContent = await this.app.vault.read(icsFile);
icsArray = icsArray.concat(parseIcs(fileContent));
}
} else {
// Existing logic for remote URLs
icsArray = parseIcs(await request({ url: calendarSetting.icsUrl }));
}
} catch (error) {
console.error(`Error processing calendar ${calendarSetting.icsName}: ${error}`);
errorMessages.push(`Error processing calendar "${calendarSetting.icsName}"`);
}

var dateEvents;

// Exception handling for parsing and filtering
try {
dateEvents = filterMatchingEvents(icsArray, date);

} catch (filterError) {
console.error(`Error filtering events for calendar ${calendarSetting.icsName}: ${filterError}`);
errorMessages.push(`Error filtering events in calendar "${calendarSetting.icsName}"`);
}

try {
dateEvents.forEach((e) => {
const { callUrl, callType } = extractMeetingInfo(e);

const event: IEvent = {
utime: moment(e.start).format('X'),
time: moment(e.start).format(this.data.format.timeFormat),
endTime: moment(e.end).format(this.data.format.timeFormat),
icsName: calendarSetting.icsName,
summary: e.summary,
description: e.description,
format: calendarSetting.format,
location: e.location ? e.location : null,
callUrl: callUrl,
callType: callType,
attendees: e.attendee ? (Array.isArray(e.attendee) ? e.attendee : [e.attendee]).map(attendee => ({
name: attendee.params.CN,
email: attendee.val.substring(7),
status: attendee.params.PARTSTAT,
role: attendee.params.ROLE
})) : []
};
events.push(event);
});
} catch (parseError) {
console.error(`Error parsing events for calendar ${calendarSetting.icsName}: ${parseError}`);
errorMessages.push(`Error parsing events in calendar "${calendarSetting.icsName}"`);
}
}

// Notify the user if any errors were encountered
if (errorMessages.length > 0) {
const message = `Encountered ${errorMessages.length} error(s) while processing calendars:\n\n${errorMessages.join('\n')}\nSee console for details.`;
new Notice(message);
}

return events;
}

async onload() {
await this.loadSettings();
this.addSettingTab(new ICSSettingsTab(this.app, this));
this.addCommand({
id: "import_events",
name: "import events",
editorCallback: async (editor: Editor, view: MarkdownView) => {
const fileDate = getDateFromFile(view.file, "day").format("YYYY-MM-DD");
var events: any[] = await this.getEvents(fileDate);

const mdArray = events.sort((a, b) => a.utime - b.utime).map(this.formatEvent, this);
editor.replaceRange(mdArray.join("\n"), editor.getCursor());
}
});
}

onunload() {
return;
}

async loadSettings() {
this.data = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
}

async saveSettings() {
await this.saveData(this.data);
}
}


2 changes: 2 additions & 0 deletions src/settings/ICSSettings.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface Calendar {
summary: boolean;
location: boolean;
description: boolean;
showAttendees: boolean;
}
}

Expand All @@ -28,6 +29,7 @@ export const DEFAULT_CALENDAR_FORMAT = {
location: true,
description: false,
calendarType: 'remote', // Set the default type to 'remote'
showAttendees: false,
};

export const DEFAULT_SETTINGS: ICSSettings = {
Expand Down
Loading

0 comments on commit 7335540

Please sign in to comment.