Remove unnecessary logging

[rbdr/blog] / lib / blog.js

diff --git a/lib/blog.js b/lib/blog.js
index 483577ff3f147b30b02d818970d6ceb38e7ef514..0b291dfa71b8c00dd40438c30e5728459f38ae52 100644 (file)
--- a/lib/blog.js
+++ b/lib/blog.js
@@ -1,39 +1,44 @@
 'use strict';
 
 'use strict';
 

-const Fs = require('fs');
-const Markdown = require('markdown');
-const Mustache = require('mustache');
-const Ncp = require('ncp');
-const Path = require('path');
-const Rimraf = require('rimraf');
-const Util = require('util');
+const { access, cp, mkdir, readdir, readFile, rm, 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');
+
+// 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
 
 const internals = {
 
   // Promisified functions

+  exec: promisify(exec),

 
 

-  fs: {
-    access: Util.promisify(Fs.access),
-    mkdir: Util.promisify(Fs.mkdir),
-    readdir: Util.promisify(Fs.readdir),
-    readFile: Util.promisify(Fs.readFile),
-    writeFile: Util.promisify(Fs.writeFile)
-  },
-  ncp: Util.promisify(Ncp.ncp),
-  rimraf: Util.promisify(Rimraf),
-  debuglog: Util.debuglog('blog'),
+  debuglog: debuglog('blog'),

 
   // constants
 
 
   // constants
 

-  kAssetsDirectoryName: 'assets',
-  kIndexName: 'index.html',

   kFileNotFoundError: 'ENOENT',
   kFileNotFoundError: 'ENOENT',

-  kMarkdownRe: /\.md$/i,
+  kGeminiRe: /\.gmi$/i,
+  kMetadataFilename: 'metadata.json',

 
   // Strings
 
   strings: {
 
   // Strings
 
   strings: {

-    markdownNotFound: 'Markdown file was not found in blog directory. Please update.'
+    geminiNotFound: 'Gemini file was not found in blog directory. Please update.'

   }
 };
 
   }
 };
 


@@ -42,7 +47,7 @@ const internals = {
  * updating posts, and handling the publishing.
  *
  * @class Blog
  * 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 {
  * extend the instance
  */
 module.exports = class Blog {


@@ -65,8 +70,16 @@ module.exports = class Blog {
    */
   async add(postLocation) {
 
    */
   async add(postLocation) {
 

+    await this._ensurePostsDirectoryExists();
+    try {
+      await this.syncDown();
+    }
+    catch {};

     await this._shift();
     await this._shift();

-    await this.update(postLocation);
+    const firstDirectory = join(this.postsDirectory, '0'); 
+    await rm(firstDirectory, { recursive: true, force: true });
+    await this._ensurePostsDirectoryExists(firstDirectory);
+    await this._update(postLocation);

   }
 
   /**
   }
 
   /**


@@ -81,8 +94,11 @@ module.exports = class Blog {
    */
   async update(postLocation) {
 
    */
   async update(postLocation) {
 

-    await this._copyPost(postLocation);
-    await this._generate();
+    try {
+      await this.syncDown();
+    }
+    catch {};
+    const metadata = await this._update();

   }
 
   /**
   }
 
   /**


@@ -93,67 +109,213 @@ module.exports = class Blog {
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */
    * @return {Promise<undefined>} empty promise, returns no value
    * @instance
    */

-  async 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);
+    }

 
 

-    console.error('Publishing not yet implemented');
+    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) {

 
 

-  async _generate() {
+    internals.debuglog(`Publishing archive to ${host}`);
+    try {
+      await internals.exec('which rsync');
+    }
+    catch (err) {
+      console.error('Please install rsync to publish the archive.');
+    }

 
 

-    const assetsTarget = Path.join(this.staticDirectory, internals.kAssetsDirectoryName);
-    const indexTarget = Path.join(this.staticDirectory, internals.kIndexName);
-    const indexLocation = Path.join(this.templatesDirectory, internals.kIndexName);
-    const posts = [];
+    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(`Removing ${assetsTarget}`);
-    await internals.rimraf(assetsTarget);
+    internals.debuglog('Finished publishing');
+  }

 
 

-    for (let i = 0; i < this.maxPosts; ++i) {
-      const sourcePath = Path.join(this.postsDirectory, `${i}`);
-      const assetsSource = Path.join(sourcePath, internals.kAssetsDirectoryName);
-      const postContentPath = await this._findBlogContent(sourcePath);
+  /**
+   * 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(`Copying ${assetsSource} to ${assetsTarget}`);
-      await internals.ncp(assetsSource, assetsTarget);
+  /**
+   * Removes a remote
+   *
+   * @function removeRemote
+   * @memberof Blog
+   * @return {Promise<undefined>} empty promise, returns no value
+   * @instance
+   */
+  async removeRemote() {
+    await Remote.remove(this.remoteConfig)
+  }

 
 

-      internals.debuglog(`Reading ${postContentPath}`);
-      const postContent = await internals.fs.readFile(postContentPath, { encoding: 'utf8' });

 
 

-      internals.debuglog('Parsing markdown');
-      posts.push({
-        html: Markdown.markdown.toHTML(postContent),
-        id: i + 1
-      });
+  /**
+   * 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 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 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 this._ensurePostsDirectoryExists();
+    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);
+  }
+
+  // Reads the posts into an array
+
+  async _readPosts() {

 
 

-    internals.debuglog(`Reading ${indexLocation}`);
-    const indexTemplate = await internals.fs.readFile(indexLocation, { encoding: 'utf8' });
+    internals.debuglog('Reading posts');
+    const posts = [];
+
+    for (let i = 0; i < this.maxPosts; ++i) {
+      try {
+        posts.push(await this._readPost(i));
+      }
+      catch (error) {
+        if (error.code === internals.kFileNotFoundError) {
+          internals.debuglog(`Skipping ${i}`);
+          continue;
+        }

 
 

-    internals.debuglog('Generating HTML');
-    const indexHtml = Mustache.render(indexTemplate, { posts });
-    await internals.fs.writeFile(indexTarget, indexHtml);
+        throw error;
+      }
+    }
+
+    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() {
 

-    await this._ensurePostsDirectoryExists();

 
 

-    for (let i = this.maxPosts - 1; i > 0; --i) {
-      const targetPath = Path.join(this.postsDirectory, `${i}`);
-      const sourcePath = Path.join(this.postsDirectory, `${i - 1}`);
+    for (let i = this.maxPosts - 1; i >= 1; --i) {
+      const targetPath = join(this.postsDirectory, `${i}`);
+      const sourcePath = join(this.postsDirectory, `${i - 1}`);

 
       try {
 
       try {

-        await internals.fs.access(sourcePath);
-
-        internals.debuglog(`Removing ${targetPath}`);
-        await internals.rimraf(targetPath);
+        internals.debuglog(`Archiving ${targetPath}`);
+        await rm(targetPath, { recursive: true, force: true });
+        await access(sourcePath); // check the source path

 
         internals.debuglog(`Shifting blog post ${sourcePath} to ${targetPath}`);
 
         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) {
       }
       catch (error) {
         if (error.code === internals.kFileNotFoundError) {


@@ -166,33 +328,83 @@ module.exports = class Blog {
     }
   }
 
     }
   }
 

+  // Moves older posts to the archive
+
+  async _archive() {
+    internals.debuglog('Archiving post');
+    const post = await this._readPost(0);
+    await this._ensureDirectoryExists(this.archiveDirectory);
+
+    const targetPath = join(this.archiveDirectory, post.id);
+
+    internals.debuglog(`Removing ${targetPath}`);
+    await rm(targetPath, { recursive: true, force: true });
+    internals.debuglog(`Adding ${post.location} to ${targetPath}`);
+    await this._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) {
+
+    const metadataTarget = join(this.postsDirectory, String(index), internals.kMetadataFilename);
+
+    try {
+      internals.debuglog(`Looking for metadata at ${metadataTarget}`);
+      return JSON.parse(await readFile(metadataTarget, { encoding: 'utf8' }));
+    }
+    catch (e) {
+      internals.debuglog(`Metadata not found or unreadable. Generating new set.`);
+      const createdOn = Date.now();
+      const metadata = {
+        id: String(createdOn),
+        createdOn
+      };
+
+      return metadata;
+    }
+  }
+
+  // Writes metadata. Assumes post 0 since it only gets written
+  // on create
+
+  async _writeMetadata(metadata) {
+
+    const metadataTarget = join(this.postsDirectory, '0', internals.kMetadataFilename);
+    internals.debuglog(`Writing ${metadataTarget}`);
+    await writeFile(metadataTarget, JSON.stringify(metadata, null, 2));
+  }
+

   // Copies a post directory to the latest slot.
 
   async _copyPost(postLocation) {
 
   // Copies a post directory to the latest slot.
 
   async _copyPost(postLocation) {
 

-    await this._ensurePostsDirectoryExists();
-
-    const targetPath = Path.join(this.postsDirectory, '0');
+    const targetPath = join(this.postsDirectory, '0');
+    const postName = basename(postLocation);
+    const targetPost = join(targetPath, postName);

 
     internals.debuglog(`Removing ${targetPath}`);
 
     internals.debuglog(`Removing ${targetPath}`);

-    await internals.rimraf(targetPath);
-
-    internals.debuglog(`Adding ${postLocation} to ${targetPath}`);
-    await internals.ncp(postLocation, targetPath);
+    await rm(targetPath, { recursive: true, force: true });
+    await this._ensureDirectoryExists(targetPath);
+    internals.debuglog(`Adding ${postLocation} to ${targetPost}`);
+    await cp(postLocation, targetPost, { recursive: true });
+    internals.debuglog(`Added ${postLocation} to ${targetPath}`);

   }
 
   }
 

-  // Ensures the posts directory exists.
+  // Ensures a directory exists.

 
 

-  async _ensurePostsDirectoryExists() {
+  async _ensureDirectoryExists(directory) {

 
 

-    internals.debuglog(`Checking if ${this.postsDirectory} exists.`);
+    internals.debuglog(`Checking if ${directory} exists.`);

     try {
     try {

-      await internals.fs.access(this.postsDirectory);
+      await access(directory);

     }
     catch (error) {
       if (error.code === internals.kFileNotFoundError) {
     }
     catch (error) {
       if (error.code === internals.kFileNotFoundError) {

-        internals.debuglog('Creating posts directory');
-        await internals.fs.mkdir(this.postsDirectory);
+        internals.debuglog(`Creating ${directory}`);
+        await mkdir(directory, { recursive: true });

         return;
       }
 
         return;
       }
 


@@ -200,21 +412,28 @@ module.exports = class Blog {
     }
   }
 
     }
   }
 

-  // Looks for a `.md` file in the blog directory, and returns the path
+  // Ensures posts directory exists
+
+  async _ensurePostsDirectoryExists() {
+
+    return this._ensureDirectoryExists(this.postsDirectory);
+  }
+
+  // Looks for a `.gmi` file in the blog directory, and returns the path

 
   async _findBlogContent(directory) {
 
 
   async _findBlogContent(directory) {
 

-    const entries = await internals.fs.readdir(directory);
+    const entries = await readdir(directory);

 
 

-    const markdownEntries = entries
-      .filter((entry) => internals.kMarkdownRe.test(entry))
-      .map((entry) => Path.join(directory, 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);

   }
 };
   }
 };