X-Git-Url: https://git.r.bdr.sh/rbdr/blog/blobdiff_plain/6f72ad0f8b1d147a3d2e27db539a0e17ca2ac917..9eac24780006862171b85858b40db0f29f494e76:/lib/blog.js?ds=inline

diff --git a/lib/blog.js b/lib/blog.js
index 6b3397f..6923a10 100644
--- a/lib/blog.js
+++ b/lib/blog.js
@@ -1,33 +1,45 @@
 'use strict';
 
+const { access, cp, mkdir, readdir, readFile, writeFile } = require('fs/promises');
 const { exec } = require('child_process');
-const { access, mkdir, readdir, readFile, rmdir, writeFile } = require('fs/promises');
-const { template } = require('dot');
-const { ncp } = require('ncp');
-const { join } = require('path');
-const Marked = require('marked');
+const { basename, resolve, join } = require('path');
+const ParseGemini = require('gemini-to-html/parse');
+const RenderGemini = require('gemini-to-html/render');
 const { debuglog, promisify } = require('util');
+const { ensureDirectoryExists, rmIfExists } = require('./utils');
+const { kFileNotFoundError } = require('./constants');
+
+// Generators for the Blog
+
+const StaticGenerator = require('./generators/static');
+const HTMLGenerator = require('./generators/html');
+const RSSGenerator = require('./generators/rss');
+const TXTGenerator = require('./generators/txt');
+
+// Archiving Methods
+
+const GemlogArchiver = require('./archivers/gemlog');
+
+// Remote Handler
+
+const Remote = require('./remote');
 
 const internals = {
 
   // Promisified functions
-  ncp: promisify(ncp),
-
   exec: promisify(exec),
+
   debuglog: debuglog('blog'),
 
   // constants
 
-  kAssetsDirectoryName: 'assets',
-  kIndexName: 'index.html',
-  kFileNotFoundError: 'ENOENT',
-  kMarkdownRe: /\.md$/i,
+  kGeminiRe: /\.gmi$/i,
   kMetadataFilename: 'metadata.json',
 
   // Strings
 
   strings: {
-    markdownNotFound: 'Markdown file was not found in blog directory. Please update.'
+    geminiNotFound: 'Gemini file was not found in blog directory. Please update.'
   }
 };
 
@@ -36,7 +48,7 @@ const internals = {
  * updating posts, and handling the publishing.
  *
  * @class Blog
- * @param {Potluck.tConfiguration} config the initialization options to
+ * @param {Blog.tConfiguration} config the initialization options to
  * extend the instance
  */
 module.exports = class Blog {
@@ -47,41 +59,45 @@ module.exports = class Blog {
   }
 
   /**
-   * Shifts the blog posts, adds the passed path to slot 0, and
+   * Shifts the blog posts, adds the passed file to slot 0, and
    * generates files.
    *
    * @function add
    * @memberof Blog
-   * @param {string} postLocation the path to the directory containing
-   * the post structure
+   * @param {string} postLocation the path to the blog post file
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */
   async add(postLocation) {
 
-    await this._ensurePostsDirectoryExists();
+    await ensureDirectoryExists(this.postsDirectory);
+    try {
+      await this.syncDown();
+    }
+    catch {};
     await this._shift();
-    await this.update(postLocation);
+    const firstDirectory = join(this.postsDirectory, '0'); 
+    await rmIfExists(firstDirectory);
+    await ensureDirectoryExists(firstDirectory);
+    await this._update(postLocation);
   }
 
   /**
-   * Adds the passed path to slot 0, and generates files.
+   * Update slot 0 with the passed gmi file, and generates files.
    *
    * @function update
    * @memberof Blog
-   * @param {string} postLocation the path to the directory containing
-   * the post structure
+   * @param {string} postLocation the path to the blog post file
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */
   async update(postLocation) {
 
-    const metadata = await this._getMetadata();
-    await this._ensurePostsDirectoryExists();
-    await this._copyPost(postLocation);
-    await this._writeMetadata(metadata);
-
-    await this._generate();
+    try {
+      await this.syncDown();
+    }
+    catch {};
+    const metadata = await this._update();
   }
 
   /**
@@ -92,47 +108,163 @@ module.exports = class Blog {
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */
-  publish() {
+  async publish(bucket) {
+
+    internals.debuglog(`Publishing to ${bucket}`);
+    try {
+      await internals.exec('which aws');
+    }
+    catch (err) {
+      console.error('Please install and configure AWS CLI to publish.');
+    }
 
-    console.error('Publishing not yet implemented');
-    return Promise.resolve();
+    try {
+      await internals.exec(`aws s3 sync --acl public-read --delete ${this.staticDirectory} s3://${bucket}`);
+      await internals.exec(`aws s3 cp --content-type 'text/plain; charset=utf-8 ' --acl public-read ${this.staticDirectory}/index.txt s3://${bucket}`);
+    }
+    catch (err) {
+      console.error('Failed to publish');
+      console.error(err.stderr);
+    }
+
+    internals.debuglog('Finished publishing');
   }
 
-  // Parses markdown for each page, copies assets and generates index.
+  /**
+   * Publishes the archive to a host using rsync. Currently assumes
+   * gemlog archive.
+   *
+   * @function publishArchive
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async publishArchive(host) {
+
+    internals.debuglog(`Publishing archive to ${host}`);
+    try {
+      await internals.exec('which rsync');
+    }
+    catch (err) {
+      console.error('Please install rsync to publish the archive.');
+    }
 
-  async _generate() {
+    try {
+      const gemlogPath = resolve(join(__dirname, '../', '.gemlog'));
+      internals.debuglog(`Reading archive from ${gemlogPath}`);
+      await internals.exec(`rsync -r ${gemlogPath}/ ${host}`);
+    }
+    catch (err) {
+      console.error('Failed to publish archive');
+      console.error(err.stderr);
+    }
 
-    const assetsTarget = join(this.staticDirectory, internals.kAssetsDirectoryName);
-    const indexTarget = join(this.staticDirectory, internals.kIndexName);
-    const indexLocation = join(this.templatesDirectory, internals.kIndexName);
-    const posts = [];
+    internals.debuglog('Finished publishing');
+  }
+
+  /**
+   * Adds a remote
+   *
+   * @function addRemote
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async addRemote(remote) {
+    await Remote.add(this.remoteConfig, remote)
+  }
 
-    internals.debuglog(`Removing ${assetsTarget}`);
-    await rmdir(assetsTarget, { recursive: true });
+  /**
+   * Removes a remote
+   *
+   * @function removeRemote
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async removeRemote() {
+    await Remote.remove(this.remoteConfig)
+  }
 
-    for (let i = 0; i < this.maxPosts; ++i) {
-      const sourcePath = join(this.postsDirectory, `${i}`);
 
-      try {
-        await access(this.postsDirectory);
+  /**
+   * Pulls the posts and archive from the remote
+   *
+   * @function syncDown
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async syncDown() {
+    internals.debuglog('Pulling remote state');
+    await ensureDirectoryExists(this.postsDirectory);
+    await Remote.syncDown(this.remoteConfig, this.blogDirectory)
+    internals.debuglog('Pulled remote state');
+  }
+
+  /**
+   * Pushes the posts and archive to the remote
+   *
+   * @function syncUp
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async syncUp() {
+    internals.debuglog('Pushing remote state');
+    await ensureDirectoryExists(this.postsDirectory);
+    await Remote.syncUp(this.remoteConfig, this.blogDirectory)
+    internals.debuglog('Pushed remote state');
+  }
+
+  // Adds the passed path to slot 0, and generates files.
+
+  async _update(postLocation) {
+
+    const metadata = await this._getMetadata();
+    await ensureDirectoryExists(this.postsDirectory);
+    await this._copyPost(postLocation);
+    await this._writeMetadata(metadata);
+
+    await this._archive(postLocation);
+
+    await this.generate();
+    try {
+      await this.syncUp();
+    }
+    catch {};
+  }
+
+
+  // Parses Gemini for each page, copies assets and generates index.
+
+  async generate() {
+
+    internals.debuglog('Generating output');
+
+    const posts = await this._readPosts();
+
+    await StaticGenerator(this.postsDirectory, this.staticDirectory, posts);
+    await HTMLGenerator(this.templatesDirectory, this.staticDirectory, posts);
+    await RSSGenerator(this.templatesDirectory, this.staticDirectory, posts);
+    await TXTGenerator(this.templatesDirectory, this.staticDirectory, posts);
+
+    await GemlogArchiver(this.archiveDirectory);
+  }
 
-        const assetsSource = join(sourcePath, internals.kAssetsDirectoryName);
-        const postContentPath = await this._findBlogContent(sourcePath);
+  // Reads the posts into an array
 
-        internals.debuglog(`Copying ${assetsSource} to ${assetsTarget}`);
-        await internals.ncp(assetsSource, assetsTarget);
+  async _readPosts() {
 
-        internals.debuglog(`Reading ${postContentPath}`);
-        const postContent = await readFile(postContentPath, { encoding: 'utf8' });
+    internals.debuglog('Reading posts');
+    const posts = [];
 
-        internals.debuglog('Parsing markdown');
-        posts.push({
-          html: Marked(postContent),
-          id: i + 1
-        });
+    for (let i = 0; i < this.maxPosts; ++i) {
+      try {
+        posts.push(await this._readPost(i));
       }
       catch (error) {
-        if (error.code === internals.kFileNotFoundError) {
+        if (error.code === kFileNotFoundError) {
           internals.debuglog(`Skipping ${i}`);
           continue;
         }
@@ -141,12 +273,32 @@ module.exports = class Blog {
       }
     }
 
-    internals.debuglog(`Reading ${indexLocation}`);
-    const indexTemplate = await readFile(indexLocation, { encoding: 'utf8' });
+    return posts;
+  }
+
+  // Reads an individual post
+
+  async _readPost(index=0) {
+      const postSourcePath = join(this.postsDirectory, `${index}`);
+
+      internals.debuglog(`Reading ${postSourcePath}`);
+
+      await access(postSourcePath);
 
-    internals.debuglog('Generating HTML');
-    const indexHtml = template(indexTemplate)({ posts });
-    await writeFile(indexTarget, indexHtml);
+      const metadata = await this._getMetadata(index);
+
+      const postContentPath = await this._findBlogContent(postSourcePath);
+      internals.debuglog(`Reading ${postContentPath}`);
+      const postContent = await readFile(postContentPath, { encoding: 'utf8' });
+
+      internals.debuglog('Parsing Gemini');
+      return {
+        ...metadata,
+        location: postSourcePath,
+        index,
+        html: RenderGemini(ParseGemini(postContent)),
+        raw: postContent
+      };
   }
 
   // Shift the posts, delete any remainder.
@@ -154,21 +306,20 @@ module.exports = class Blog {
   async _shift() {
 
 
-    for (let i = this.maxPosts - 1; i >= 0; --i) {
+    for (let i = this.maxPosts - 1; i >= 1; --i) {
       const targetPath = join(this.postsDirectory, `${i}`);
       const sourcePath = join(this.postsDirectory, `${i - 1}`);
 
       try {
-        internals.debuglog(`Removing ${targetPath}`);
-        await rmdir(targetPath, { recursive: true });
-
+        internals.debuglog(`Archiving ${targetPath}`);
+        await rmIfExists(targetPath);
         await access(sourcePath); // check the source path
 
         internals.debuglog(`Shifting blog post ${sourcePath} to ${targetPath}`);
-        await internals.ncp(sourcePath, targetPath);
+        await cp(sourcePath, targetPath, { recursive: true });
       }
       catch (error) {
-        if (error.code === internals.kFileNotFoundError) {
+        if (error.code === kFileNotFoundError) {
           internals.debuglog(`Skipping ${sourcePath}: Does not exist.`);
           continue;
         }
@@ -178,15 +329,32 @@ module.exports = class Blog {
     }
   }
 
+  // Moves older posts to the archive
+
+  async _archive() {
+    internals.debuglog('Archiving post');
+    const post = await this._readPost(0);
+    await ensureDirectoryExists(this.archiveDirectory);
+
+    const targetPath = join(this.archiveDirectory, post.id);
+
+    internals.debuglog(`Removing ${targetPath}`);
+    await rmIfExists(targetPath);
+    internals.debuglog(`Adding ${post.location} to ${targetPath}`);
+    await ensureDirectoryExists(targetPath);
+    await cp(post.location, targetPath, { recursive: true });
+    internals.debuglog(`Added ${post.location} to ${targetPath}`);
+  }
+
   // Attempts to read existing metadata. Otherwise generates new set.
 
-  async _getMetadata() {
+  async _getMetadata(index = 0) {
 
-    const metadataTarget = join(this.postsDirectory, '0', internals.kMetadataFilename);
+    const metadataTarget = join(this.postsDirectory, String(index), internals.kMetadataFilename);
 
     try {
       internals.debuglog(`Looking for metadata at ${metadataTarget}`);
-      return await readFile(metadataTarget);
+      return JSON.parse(await readFile(metadataTarget, { encoding: 'utf8' }));
     }
     catch (e) {
       internals.debuglog(`Metadata not found or unreadable. Generating new set.`);
@@ -196,7 +364,7 @@ module.exports = class Blog {
         createdOn
       };
 
-      return JSON.stringify(metadata, null, 2);
+      return metadata;
     }
   }
 
@@ -207,56 +375,39 @@ module.exports = class Blog {
 
     const metadataTarget = join(this.postsDirectory, '0', internals.kMetadataFilename);
     internals.debuglog(`Writing ${metadataTarget}`);
-    await writeFile(metadataTarget, metadata);
+    await writeFile(metadataTarget, JSON.stringify(metadata, null, 2));
   }
 
-  // Copies a post directory to the latest slot.
+  // Copies a post file to the latest slot.
 
   async _copyPost(postLocation) {
 
+    internals.debuglog(`Copying ${postLocation}`);
     const targetPath = join(this.postsDirectory, '0');
+    const postName = basename(postLocation);
+    const targetPost = join(targetPath, postName);
 
-    internals.debuglog(`Removing ${targetPath}`);
-    await rmdir(targetPath, { recursive: true });
-
-    internals.debuglog(`Adding ${postLocation} to ${targetPath}`);
-    await internals.ncp(postLocation, targetPath);
-  }
-
-  // Ensures the posts directory exists.
-
-  async _ensurePostsDirectoryExists() {
-
-    internals.debuglog(`Checking if ${this.postsDirectory} exists.`);
-    try {
-      await access(this.postsDirectory);
-    }
-    catch (error) {
-      if (error.code === internals.kFileNotFoundError) {
-        internals.debuglog('Creating posts directory');
-        await mkdir(this.postsDirectory);
-        return;
-      }
-
-      throw error;
-    }
+    await rmIfExists(targetPath);
+    await ensureDirectoryExists(targetPath);
+    await cp(postLocation, targetPost, { recursive: true });
+    internals.debuglog(`Added ${postLocation} to ${targetPath}`);
   }
 
-  // Looks for a `.md` file in the blog directory, and returns the path
+  // Looks for a `.gmi` file in the blog directory, and returns the path
 
   async _findBlogContent(directory) {
 
     const entries = await readdir(directory);
 
-    const markdownEntries = entries
-      .filter((entry) => internals.kMarkdownRe.test(entry))
+    const geminiEntries = entries
+      .filter((entry) => internals.kGeminiRe.test(entry))
       .map((entry) => join(directory, entry));
 
-    if (markdownEntries.length > 0) {
-      internals.debuglog(`Found markdown file: ${markdownEntries[0]}`);
-      return markdownEntries[0];
+    if (geminiEntries.length > 0) {
+      internals.debuglog(`Found gemini file: ${geminiEntries[0]}`);
+      return geminiEntries[0];
     }
 
-    throw new Error(internals.strings.markdownNotFound);
+    throw new Error(internals.strings.geminiNotFound);
   }
 };