refactor: move folder handling to their respective modules

Author: EdJoPaTo

source/lib/all-events.ts

@@ -1,7 +1,9 @@
 import {readFile} from 'node:fs/promises';
-import {EVENT_FILES_DIR, pullEventFiles} from './git.ts';
+import {pull} from './git.ts';
 import {typedEntries} from './javascript-helper.ts';
-import type {EventDirectory, EventId} from './types.ts';
+import type {EventDirectory, EventEntry, EventId} from './types.ts';
+
+const DIRECTORY = 'eventfiles';
 
 let directory: EventDirectory = {};
 let namesOfEvents: Readonly<Record<EventId, string>> = {};
@@ -11,11 +13,8 @@ await update();
 console.log(new Date(), 'eventfiles loaded');
 
 async function update() {
-	await pullEventFiles();
-	const directoryString = await readFile(
-		`${EVENT_FILES_DIR}/directory.json`,
-		'utf8',
-	);
+	await pull(DIRECTORY, 'https://github.com/HAWHHCalendarBot/eventfiles.git');
+	const directoryString = await readFile(`${DIRECTORY}/directory.json`, 'utf8');
 	directory = JSON.parse(directoryString) as EventDirectory;
 	namesOfEvents = await generateMapping();
 }
@@ -106,3 +105,8 @@ export function find(
 		events: Object.fromEntries(typedEntries(accumulator).sort((a, b) => a[1].localeCompare(b[1]))),
 	};
 }
+
+export async function loadEvents(eventId: EventId): Promise<EventEntry[]> {
+	const content = await readFile(`${DIRECTORY}/events/${eventId}.json`, 'utf8');
+	return JSON.parse(content) as EventEntry[];
+}

source/lib/change-helper.ts

@@ -1,10 +1,6 @@
-import {readFile} from 'node:fs/promises';
 import {html as format} from 'telegram-format';
-import type {
-	Change, EventEntry, EventId, NaiveDateTime,
-} from './types.ts';
 import {getEventName} from './all-events.ts';
-import {EVENT_FILES_DIR} from './git.ts';
+import type {Change, EventId, NaiveDateTime} from './types.ts';
 
 export function generateChangeDescription(change: Change): string {
 	let text = '';
@@ -68,16 +64,3 @@ export function generateShortChangeText(
 ): string {
 	return `${getEventName(eventId)} ${date}`;
 }
-
-export async function loadEvents(eventId: EventId): Promise<EventEntry[]> {
-	try {
-		const content = await readFile(
-			`${EVENT_FILES_DIR}/events/${eventId}.json`,
-			'utf8',
-		);
-		return JSON.parse(content) as EventEntry[];
-	} catch (error) {
-		console.error('ERROR while loading events for change date picker', error);
-		return [];
-	}
-}

source/lib/git.ts

@@ -2,26 +2,15 @@ import {exec} from 'node:child_process';
 import {existsSync} from 'node:fs';
 import {promisify} from 'node:util';
 
-export const EVENT_FILES_DIR = 'eventfiles';
-export const MENSA_DIR = 'mensa-data';
-
 const run = promisify(exec);
 
-async function pull(directory: string, remoteUrl: string): Promise<void> {
+export async function pull(
+	directory: string,
+	remoteUrl: string,
+): Promise<void> {
 	try {
 		await (existsSync(`${directory}/.git`)
 			? run(`git -C ${directory} pull`)
 			: run(`git clone -q --depth 1 ${remoteUrl} ${directory}`));
 	} catch {}
 }
-
-export async function pullEventFiles(): Promise<void> {
-	await pull(
-		EVENT_FILES_DIR,
-		'https://github.com/HAWHHCalendarBot/eventfiles.git',
-	);
-}
-
-export async function pullMensaData(): Promise<void> {
-	await pull(MENSA_DIR, 'https://github.com/HAWHHCalendarBot/mensa-data.git');
-}

source/lib/mensa-meals.ts

@@ -1,13 +1,19 @@
 import {readdir, readFile} from 'node:fs/promises';
-import {MENSA_DIR, pullMensaData} from './git.ts';
+import {pull} from './git.ts';
 import type {Meal} from './meal.ts';
 
+const DIRECTORY = 'mensa-data';
+
 setInterval(async () => pullMensaData(), 1000 * 60 * 30); // Every 30 minutes
 await pullMensaData();
 console.log(new Date(), 'mensa-data loaded');
 
+async function pullMensaData(): Promise<void> {
+	await pull(DIRECTORY, 'https://github.com/HAWHHCalendarBot/mensa-data.git');
+}
+
 export async function getCanteenList(): Promise<string[]> {
-	const found = await readdir(MENSA_DIR, {withFileTypes: true});
+	const found = await readdir(DIRECTORY, {withFileTypes: true});
 	const dirs = found
 		.filter(o => o.isDirectory())
 		.map(o => o.name)
@@ -27,7 +33,7 @@ function getFilename(
 	});
 	const m = month.toLocaleString(undefined, {minimumIntegerDigits: 2});
 	const d = day.toLocaleString(undefined, {minimumIntegerDigits: 2});
-	return `${MENSA_DIR}/${mensa}/${y}/${m}/${d}.json`;
+	return `${DIRECTORY}/${mensa}/${y}/${m}/${d}.json`;
 }
 
 export async function getMealsOfDay(

source/menu/events/changes/add/index.ts

@@ -7,10 +7,8 @@ import {
 	MenuTemplate,
 	replyMenuToContext,
 } from 'grammy-inline-menu';
-import {
-	generateChangeText,
-	loadEvents,
-} from '../../../../lib/change-helper.ts';
+import {loadEvents} from '../../../../lib/all-events.ts';
+import {generateChangeText} from '../../../../lib/change-helper.ts';
 import {typedKeys} from '../../../../lib/javascript-helper.ts';
 import type {
 	EventId,