Update version, ditch changelog

[rbdr/blog] / lib / blog.js

diff --git a/lib/blog.js b/lib/blog.js
index 27a440e651bbb485c4091a4e8de5ef5100e930f7..6923a10b3b649c845e0ae8386fa690fff498f57b 100644 (file)
--- a/lib/blog.js
+++ b/lib/blog.js
@@ -1,33 +1,45 @@
 'use strict';
 
 'use strict';
 

-const { access, mkdir, readdir, readFile, rmdir, writeFile } = require('fs/promises');
-const { ncp } = require('ncp');
-const { join } = require('path');
-const Marked = require('marked');
+const { access, cp, mkdir, readdir, readFile, writeFile } = require('fs/promises');
+const { exec } = require('child_process');
+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 { 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');
 
 
 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
 const internals = {
 
   // Promisified functions

-  ncp: promisify(ncp),
+  exec: promisify(exec),

 
   debuglog: debuglog('blog'),
 
   // constants
 
 
   debuglog: debuglog('blog'),
 
   // constants
 

-  kFileNotFoundError: 'ENOENT',
-  kMarkdownRe: /\.md$/i,
+  kGeminiRe: /\.gmi$/i,

   kMetadataFilename: 'metadata.json',
 
   // Strings
 
   strings: {
   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.'

   }
 };
 
   }
 };
 


@@ -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
    * 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) {
 
    * @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._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
    *
    * @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) {
 
    * @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,57 +108,163 @@ module.exports = class Blog {
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */
    * @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.');
+    }
+
+    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');
+  }
+
+  /**
+   * 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.');
+    }
+
+    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);
+    }
+
+    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)
+  }
+
+  /**
+   * Removes a remote
+   *
+   * @function removeRemote
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async removeRemote() {
+    await Remote.remove(this.remoteConfig)
+  }
+
+
+  /**
+   * 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');
+  }

 
 

-    console.error('Publishing not yet implemented');
-    return Promise.resolve();
+  // 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 markdown for each page, copies assets and generates index.
+
+  // Parses Gemini for each page, copies assets and generates index.

 
   async generate() {
 
     internals.debuglog('Generating output');
 
 
   async generate() {
 
     internals.debuglog('Generating output');
 

-    const posts = await this._readPosts(this.postsDirectory);
+    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 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);

   }
 
   // Reads the posts into an array
 
   }
 
   // Reads the posts into an array
 

-  async _readPosts(source) {
+  async _readPosts() {

 
     internals.debuglog('Reading posts');
     const posts = [];
 
     for (let i = 0; i < this.maxPosts; ++i) {
 
     internals.debuglog('Reading posts');
     const posts = [];
 
     for (let i = 0; i < this.maxPosts; ++i) {

-      const postSourcePath = join(source, `${i}`);
-
-      internals.debuglog(`Reading ${postSourcePath} into posts array`);
-

       try {
       try {

-        await access(postSourcePath);
-
-        const metadata = await this._getMetadata(i);
-
-        const postContentPath = await this._findBlogContent(postSourcePath);
-        internals.debuglog(`Reading ${postContentPath}`);
-        const postContent = await readFile(postContentPath, { encoding: 'utf8' });
-
-        internals.debuglog('Parsing markdown');
-        posts.push({
-          ...metadata,
-          index: i,
-          html: Marked(postContent),
-          raw: postContent
-        });
+        posts.push(await this._readPost(i));

       }
       catch (error) {
       }
       catch (error) {

-        if (error.code === internals.kFileNotFoundError) {
+        if (error.code === kFileNotFoundError) {

           internals.debuglog(`Skipping ${i}`);
           continue;
         }
           internals.debuglog(`Skipping ${i}`);
           continue;
         }


@@ -154,26 +276,50 @@ module.exports = class Blog {
     return posts;
   }
 
     return posts;
   }
 

+  // Reads an individual post
+
+  async _readPost(index=0) {
+      const postSourcePath = join(this.postsDirectory, `${index}`);
+
+      internals.debuglog(`Reading ${postSourcePath}`);
+
+      await access(postSourcePath);
+
+      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.
 
   async _shift() {
 
 
   // Shift the posts, delete any remainder.
 
   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 {
       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 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) {
       }
       catch (error) {

-        if (error.code === internals.kFileNotFoundError) {
+        if (error.code === kFileNotFoundError) {

           internals.debuglog(`Skipping ${sourcePath}: Does not exist.`);
           continue;
         }
           internals.debuglog(`Skipping ${sourcePath}: Does not exist.`);
           continue;
         }


@@ -183,6 +329,23 @@ 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(index = 0) {
   // Attempts to read existing metadata. Otherwise generates new set.
 
   async _getMetadata(index = 0) {


@@ -215,53 +378,36 @@ module.exports = class Blog {
     await writeFile(metadataTarget, JSON.stringify(metadata, null, 2));
   }
 
     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) {
 
 
   async _copyPost(postLocation) {
 

+    internals.debuglog(`Copying ${postLocation}`);

     const targetPath = join(this.postsDirectory, '0');
     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);
 
 
   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));
 
       .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);

   }
 };
   }
 };