X-Git-Url: https://git.r.bdr.sh/rbdr/blog/blobdiff_plain/bd8c1fa2774b98b22939d60c06a06525691867ce..a5315f49f6b16c892f00509e2a27117ffd167936:/lib/blog.js?ds=sidebyside

diff --git a/lib/blog.js b/lib/blog.js
index 0b291df..fd5adaf 100644
--- a/lib/blog.js
+++ b/lib/blog.js
@@ -1,11 +1,13 @@
 'use strict';
 
-const { access, cp, mkdir, readdir, readFile, rm, writeFile } = require('fs/promises');
+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 { ensureDirectoryExists, rmIfExists } = require('./utils');
+const { kFileNotFoundError } = require('./constants');
 
 // Generators for the Blog
 
@@ -31,7 +33,6 @@ const internals = {
 
   // constants
 
-  kFileNotFoundError: 'ENOENT',
   kGeminiRe: /\.gmi$/i,
   kMetadataFilename: 'metadata.json',
 
@@ -70,15 +71,15 @@ module.exports = class Blog {
    */
   async add(postLocation) {
 
-    await this._ensurePostsDirectoryExists();
+    await ensureDirectoryExists(this.postsDirectory);
     try {
       await this.syncDown();
     }
     catch {};
     await this._shift();
     const firstDirectory = join(this.postsDirectory, '0'); 
-    await rm(firstDirectory, { recursive: true, force: true });
-    await this._ensurePostsDirectoryExists(firstDirectory);
+    await rmIfExists(firstDirectory);
+    await ensureDirectoryExists(firstDirectory);
     await this._update(postLocation);
   }
 
@@ -198,6 +199,7 @@ module.exports = class Blog {
    */
   async syncDown() {
     internals.debuglog('Pulling remote state');
+    await ensureDirectoryExists(this.postsDirectory);
     await Remote.syncDown(this.remoteConfig, this.blogDirectory)
     internals.debuglog('Pulled remote state');
   }
@@ -212,6 +214,7 @@ module.exports = class Blog {
    */
   async syncUp() {
     internals.debuglog('Pushing remote state');
+    await ensureDirectoryExists(this.postsDirectory);
     await Remote.syncUp(this.remoteConfig, this.blogDirectory)
     internals.debuglog('Pushed remote state');
   }
@@ -221,7 +224,7 @@ module.exports = class Blog {
   async _update(postLocation) {
 
     const metadata = await this._getMetadata();
-    await this._ensurePostsDirectoryExists();
+    await ensureDirectoryExists(this.postsDirectory);
     await this._copyPost(postLocation);
     await this._writeMetadata(metadata);
 
@@ -263,7 +266,7 @@ module.exports = class Blog {
         posts.push(await this._readPost(i));
       }
       catch (error) {
-        if (error.code === internals.kFileNotFoundError) {
+        if (error.code === kFileNotFoundError) {
           internals.debuglog(`Skipping ${i}`);
           continue;
         }
@@ -311,14 +314,14 @@ module.exports = class Blog {
 
       try {
         internals.debuglog(`Archiving ${targetPath}`);
-        await rm(targetPath, { recursive: true, force: true });
+        await rmIfExists(targetPath);
         await access(sourcePath); // check the source path
 
         internals.debuglog(`Shifting blog post ${sourcePath} to ${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;
         }
@@ -333,14 +336,14 @@ module.exports = class Blog {
   async _archive() {
     internals.debuglog('Archiving post');
     const post = await this._readPost(0);
-    await this._ensureDirectoryExists(this.archiveDirectory);
+    await ensureDirectoryExists(this.archiveDirectory);
 
     const targetPath = join(this.archiveDirectory, post.id);
 
     internals.debuglog(`Removing ${targetPath}`);
-    await rm(targetPath, { recursive: true, force: true });
+    await rmIfExists(targetPath);
     internals.debuglog(`Adding ${post.location} to ${targetPath}`);
-    await this._ensureDirectoryExists(targetPath);
+    await ensureDirectoryExists(targetPath);
     await cp(post.location, targetPath, { recursive: true });
     internals.debuglog(`Added ${post.location} to ${targetPath}`);
   }
@@ -386,39 +389,13 @@ module.exports = class Blog {
     const targetPost = join(targetPath, postName);
 
     internals.debuglog(`Removing ${targetPath}`);
-    await rm(targetPath, { recursive: true, force: true });
-    await this._ensureDirectoryExists(targetPath);
+    await rmIfExists(targetPath);
+    await ensureDirectoryExists(targetPath);
     internals.debuglog(`Adding ${postLocation} to ${targetPost}`);
     await cp(postLocation, targetPost, { recursive: true });
     internals.debuglog(`Added ${postLocation} to ${targetPath}`);
   }
 
-  // Ensures a directory exists.
-
-  async _ensureDirectoryExists(directory) {
-
-    internals.debuglog(`Checking if ${directory} exists.`);
-    try {
-      await access(directory);
-    }
-    catch (error) {
-      if (error.code === internals.kFileNotFoundError) {
-        internals.debuglog(`Creating ${directory}`);
-        await mkdir(directory, { recursive: true });
-        return;
-      }
-
-      throw error;
-    }
-  }
-
-  // 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) {