From 7c9abacf956c0e135c1094e38087e018dd572965 Mon Sep 17 00:00:00 2001
From: Leonardo Bishop <me@leonardobishop.com>
Date: Mon, 28 Aug 2023 22:02:57 +0100
Subject: Rename files to more descriptive names

---
 app/webserver/fileWatcher.ts | 125 +++++++++++++++++++++++++++++++++++++++++++
 app/webserver/watcher.ts     | 125 -------------------------------------------
 app/webserver/webserver.ts   |   4 +-
 3 files changed, 127 insertions(+), 127 deletions(-)
 create mode 100644 app/webserver/fileWatcher.ts
 delete mode 100644 app/webserver/watcher.ts

(limited to 'app/webserver')

diff --git a/app/webserver/fileWatcher.ts b/app/webserver/fileWatcher.ts
new file mode 100644
index 0000000..772ac1b
--- /dev/null
+++ b/app/webserver/fileWatcher.ts
@@ -0,0 +1,125 @@
+import chokidar, { FSWatcher } from 'chokidar';
+import { logger } from '../logger.js';
+import { PageDirectory } from '../builder/pageDirectory.js';
+import { rebuildSinglePage } from '../builder/buildProject.js';
+import path from 'path';
+import fs from 'fs';
+
+function attachPageEvents(watcher: FSWatcher, pages: PageDirectory) {
+    const onPageChange = async (file: string) => {
+        logger.info(`File ${file} has been modified, rebuilding...`);
+        if (await rebuildSinglePage(file, pages)) {
+            logger.info(`...done`);
+        }
+        logger.info(``);
+    }
+
+    const onPageRemoval = (file: string) => {
+        logger.info(`File ${file} has been removed, deleting...`);
+        const page = pages.get(file.replace(/\.[^.]*$/,''));
+        if (!page) {
+            logger.error(`Failed to find page for ${file}`);
+            return;
+        }
+        const joinedPath = path.join(process.env.OUTPUT_DIR, `${page.route}.html`);
+        try {
+            fs.rmSync(joinedPath)
+        } catch (e) {
+            logger.error(`Failed to remove ${joinedPath}: ${e.message}`);
+        }
+        logger.info(`...done`);
+        logger.info(``);
+    }
+
+    watcher.on('add', onPageChange);
+    watcher.on('change', onPageChange);
+    watcher.on('unlink', onPageRemoval);
+}
+
+function attachStaticEvents(watcher: FSWatcher) {
+    const onStaticChange = async (file: string) => {
+        logger.info(`Static file ${file} has been modified, copying...`);
+        const joinedPath = path.join(process.env.STATIC_DIR, file);
+        const joinedOutputPath = path.join(process.env.OUTPUT_DIR, 'static', file);
+        try {
+            fs.copyFileSync(joinedPath, joinedOutputPath);
+            logger.info(`...done`);
+        } catch (e) {
+            logger.error(`Failed to copy ${joinedPath} to ${joinedOutputPath}: ${e.message}`);
+        }
+        logger.info(``);
+    }
+
+    const onStaticRemoval = (file: string) => {
+        logger.info(`Static file ${file} has been removed, deleting...`);
+        const joinedOutputPath = path.join(process.env.OUTPUT_DIR, 'static', file);
+        try {
+            fs.rmSync(joinedOutputPath)
+            logger.info(`...done`);
+        } catch (e) {
+            logger.error(`Failed to remove ${joinedOutputPath}: ${e.message}`);
+        }
+        logger.info(``);
+    }
+
+    watcher.on('add', onStaticChange);
+    watcher.on('change', onStaticChange);
+    watcher.on('unlink', onStaticRemoval);
+}
+
+function attachViewEvents(watcher: FSWatcher, pages: PageDirectory) {
+    const onViewChange = async (file: string) => {
+        logger.info(`View ${file} has been modified, rebuilding pages with view...`);
+        let pagesWithView = pages.getPages().filter(page => `${page.view}.ejs` === file);
+        logger.info(`Found ${pagesWithView.length} pages with view ${file}`);
+        for (const page of pagesWithView) {
+            logger.info(`Rebuilding page ${page.route}...`);
+            if (await rebuildSinglePage(page.originalPath, pages)) {
+                logger.info(`...done`);
+            }
+        }
+        logger.info(``);
+    }
+
+    const onViewRemoval = (file: string) => {
+        logger.info(``);
+        logger.info(`View ${file} has been removed`);
+        logger.info(``);
+    }
+
+    watcher.on('add', onViewChange);
+    watcher.on('change', onViewChange);
+    watcher.on('unlink', onViewRemoval);
+}
+
+export const start = (pages: PageDirectory) => {
+    const pagesWatcher = chokidar.watch('.', {
+        persistent: true,
+        cwd: process.env.PAGES_DIR,
+        ignoreInitial: true,
+    });
+    const staticWatcher = chokidar.watch('.', {
+        persistent: true,
+        cwd: process.env.STATIC_DIR,
+        ignoreInitial: true,
+    });
+    const viewsWatcher = chokidar.watch('.', {
+        persistent: true,
+        cwd: process.env.VIEWS_DIR,
+        ignoreInitial: true,
+    });
+
+    attachPageEvents(pagesWatcher, pages);
+    attachStaticEvents(staticWatcher);
+    attachViewEvents(viewsWatcher, pages);
+    
+    const exitHandler = () => {
+        logger.info(`Stopping file watcher...`);
+        viewsWatcher.close();
+        staticWatcher.close();
+        pagesWatcher.close();
+    }
+
+    process.on('SIGINT', exitHandler);
+    process.on('SIGTERM', exitHandler);
+}
diff --git a/app/webserver/watcher.ts b/app/webserver/watcher.ts
deleted file mode 100644
index a792473..0000000
--- a/app/webserver/watcher.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import chokidar, { FSWatcher } from 'chokidar';
-import { logger } from '../logger.js';
-import { PageDirectory } from '../builder/pages.js';
-import { rebuildSinglePage } from '../builder/build.js';
-import path from 'path';
-import fs from 'fs';
-
-function attachPageEvents(watcher: FSWatcher, pages: PageDirectory) {
-    const onPageChange = async (file: string) => {
-        logger.info(`File ${file} has been modified, rebuilding...`);
-        if (await rebuildSinglePage(file, pages)) {
-            logger.info(`...done`);
-        }
-        logger.info(``);
-    }
-
-    const onPageRemoval = (file: string) => {
-        logger.info(`File ${file} has been removed, deleting...`);
-        const page = pages.get(file.replace(/\.[^.]*$/,''));
-        if (!page) {
-            logger.error(`Failed to find page for ${file}`);
-            return;
-        }
-        const joinedPath = path.join(process.env.OUTPUT_DIR, `${page.route}.html`);
-        try {
-            fs.rmSync(joinedPath)
-        } catch (e) {
-            logger.error(`Failed to remove ${joinedPath}: ${e.message}`);
-        }
-        logger.info(`...done`);
-        logger.info(``);
-    }
-
-    watcher.on('add', onPageChange);
-    watcher.on('change', onPageChange);
-    watcher.on('unlink', onPageRemoval);
-}
-
-function attachStaticEvents(watcher: FSWatcher) {
-    const onStaticChange = async (file: string) => {
-        logger.info(`Static file ${file} has been modified, copying...`);
-        const joinedPath = path.join(process.env.STATIC_DIR, file);
-        const joinedOutputPath = path.join(process.env.OUTPUT_DIR, 'static', file);
-        try {
-            fs.copyFileSync(joinedPath, joinedOutputPath);
-            logger.info(`...done`);
-        } catch (e) {
-            logger.error(`Failed to copy ${joinedPath} to ${joinedOutputPath}: ${e.message}`);
-        }
-        logger.info(``);
-    }
-
-    const onStaticRemoval = (file: string) => {
-        logger.info(`Static file ${file} has been removed, deleting...`);
-        const joinedOutputPath = path.join(process.env.OUTPUT_DIR, 'static', file);
-        try {
-            fs.rmSync(joinedOutputPath)
-            logger.info(`...done`);
-        } catch (e) {
-            logger.error(`Failed to remove ${joinedOutputPath}: ${e.message}`);
-        }
-        logger.info(``);
-    }
-
-    watcher.on('add', onStaticChange);
-    watcher.on('change', onStaticChange);
-    watcher.on('unlink', onStaticRemoval);
-}
-
-function attachViewEvents(watcher: FSWatcher, pages: PageDirectory) {
-    const onViewChange = async (file: string) => {
-        logger.info(`View ${file} has been modified, rebuilding pages with view...`);
-        let pagesWithView = pages.getPages().filter(page => `${page.view}.ejs` === file);
-        logger.info(`Found ${pagesWithView.length} pages with view ${file}`);
-        for (const page of pagesWithView) {
-            logger.info(`Rebuilding page ${page.route}...`);
-            if (await rebuildSinglePage(page.originalPath, pages)) {
-                logger.info(`...done`);
-            }
-        }
-        logger.info(``);
-    }
-
-    const onViewRemoval = (file: string) => {
-        logger.info(``);
-        logger.info(`View ${file} has been removed`);
-        logger.info(``);
-    }
-
-    watcher.on('add', onViewChange);
-    watcher.on('change', onViewChange);
-    watcher.on('unlink', onViewRemoval);
-}
-
-export const start = (pages: PageDirectory) => {
-    const pagesWatcher = chokidar.watch('.', {
-        persistent: true,
-        cwd: process.env.PAGES_DIR,
-        ignoreInitial: true,
-    });
-    const staticWatcher = chokidar.watch('.', {
-        persistent: true,
-        cwd: process.env.STATIC_DIR,
-        ignoreInitial: true,
-    });
-    const viewsWatcher = chokidar.watch('.', {
-        persistent: true,
-        cwd: process.env.VIEWS_DIR,
-        ignoreInitial: true,
-    });
-
-    attachPageEvents(pagesWatcher, pages);
-    attachStaticEvents(staticWatcher);
-    attachViewEvents(viewsWatcher, pages);
-    
-    const exitHandler = () => {
-        logger.info(`Stopping file watcher...`);
-        viewsWatcher.close();
-        staticWatcher.close();
-        pagesWatcher.close();
-    }
-
-    process.on('SIGINT', exitHandler);
-    process.on('SIGTERM', exitHandler);
-}
diff --git a/app/webserver/webserver.ts b/app/webserver/webserver.ts
index 82caa06..8e99b07 100644
--- a/app/webserver/webserver.ts
+++ b/app/webserver/webserver.ts
@@ -1,7 +1,7 @@
 import express from 'express';
 import { logger } from '../logger.js';
 import { AddressInfo } from 'net';
-import { PageDirectory } from '../builder/pages.js';
+import { PageDirectory } from '../builder/pageDirectory.js';
 
 const app = express();
 
@@ -16,7 +16,7 @@ export const start = (pages: PageDirectory) => {
         logger.info('')
         
         if (process.env.WEBSERVER_AUTOREBUILD === 'true') {
-            import('./watcher.js').then((watcher) => {
+            import('./fileWatcher.js').then((watcher) => {
                 watcher.start(pages);
             });
         }
-- 
cgit v1.2.3-70-g09d2