Remove unnecessary logging

[rbdr/blog] / lib / blog.js

diff --git a/lib/blog.js b/lib/blog.js
index 8ae3e21a28884f1b091b1f3e4d221d0543481cf8..0b291dfa71b8c00dd40438c30e5728459f38ae52 100644 (file)
--- a/lib/blog.js
+++ b/lib/blog.js
@@ -1,9 +1,8 @@
 'use strict';
 
 'use strict';
 

-const { access, mkdir, readdir, readFile, rm, writeFile } = require('fs/promises');
+const { access, cp, mkdir, readdir, readFile, rm, writeFile } = require('fs/promises');

 const { exec } = require('child_process');
 const { exec } = require('child_process');

-const { ncp } = require('ncp');
-const { join } = require('path');
+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 ParseGemini = require('gemini-to-html/parse');
 const RenderGemini = require('gemini-to-html/render');
 const { debuglog, promisify } = require('util');


@@ -19,11 +18,14 @@ const TXTGenerator = require('./generators/txt');
 
 const GemlogArchiver = require('./archivers/gemlog');
 
 
 const GemlogArchiver = require('./archivers/gemlog');
 

+// Remote Handler
+
+const Remote = require('./remote');
+

 const internals = {
 
   // Promisified functions
   exec: promisify(exec),
 const internals = {
 
   // Promisified functions
   exec: promisify(exec),

-  ncp: promisify(ncp),

 
   debuglog: debuglog('blog'),
 
 
   debuglog: debuglog('blog'),
 


@@ -69,9 +71,15 @@ module.exports = class Blog {
   async add(postLocation) {
 
     await this._ensurePostsDirectoryExists();
   async add(postLocation) {
 
     await this._ensurePostsDirectoryExists();

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

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

-    await mkdir(join(this.postsDirectory, '0'));
-    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);

   }
 
   /**
   }
 
   /**


@@ -86,14 +94,11 @@ module.exports = class Blog {
    */
   async update(postLocation) {
 
    */
   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.syncDown();
+    }
+    catch {};
+    const metadata = await this._update();

   }
 
   /**
   }
 
   /**


@@ -126,6 +131,110 @@ module.exports = class Blog {
     internals.debuglog('Finished publishing');
   }
 
     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 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() {
   // Parses Gemini for each page, copies assets and generates index.
 
   async generate() {


@@ -196,18 +305,17 @@ module.exports = class Blog {
   async _shift() {
 
 
   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(`Archiving ${targetPath}`);
       const targetPath = join(this.postsDirectory, `${i}`);
       const sourcePath = join(this.postsDirectory, `${i - 1}`);
 
       try {
         internals.debuglog(`Archiving ${targetPath}`);

-        await rm(targetPath, { recursive: true });
-
+        await rm(targetPath, { recursive: true, force: true });

         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) {
         if (error.code === internals.kFileNotFoundError) {
       }
       catch (error) {
         if (error.code === internals.kFileNotFoundError) {


@@ -229,15 +337,12 @@ module.exports = class Blog {
 
     const targetPath = join(this.archiveDirectory, post.id);
 
 
     const targetPath = join(this.archiveDirectory, post.id);
 

-    try {
-      internals.debuglog(`Removing ${targetPath}`);
-      await rm(targetPath, { recursive: true });
-    } 
-    finally {
-      internals.debuglog(`Adding ${post.location} to ${targetPath}`);
-      await internals.ncp(post.location, targetPath);
-      internals.debuglog(`Added ${post.location} to ${targetPath}`);
-    }
+    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.
   }
 
   // Attempts to read existing metadata. Otherwise generates new set.


@@ -277,12 +382,15 @@ module.exports = class Blog {
   async _copyPost(postLocation) {
 
     const targetPath = join(this.postsDirectory, '0');
   async _copyPost(postLocation) {
 
     const targetPath = join(this.postsDirectory, '0');

+    const postName = basename(postLocation);
+    const targetPost = join(targetPath, postName);

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

-    await rm(targetPath, { recursive: true });
-
-    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 a directory exists.
   }
 
   // Ensures a directory exists.


@@ -295,8 +403,8 @@ module.exports = class Blog {
     }
     catch (error) {
       if (error.code === internals.kFileNotFoundError) {
     }
     catch (error) {
       if (error.code === internals.kFileNotFoundError) {

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

         return;
       }
 
         return;
       }
 


@@ -309,19 +417,6 @@ module.exports = class Blog {
   async _ensurePostsDirectoryExists() {
 
     return this._ensureDirectoryExists(this.postsDirectory);
   async _ensurePostsDirectoryExists() {
 
     return this._ensureDirectoryExists(this.postsDirectory);

-    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;
-    }

   }
 
   // Looks for a `.gmi` file in the blog directory, and returns the path
   }
 
   // Looks for a `.gmi` file in the blog directory, and returns the path