Partial work - need to load config from somewhere

Author: megoth

default-templates/server/index.html

@@ -30,6 +30,15 @@ <h1>Welcome to the Solid Prototype</h1>
 
     If you have not already done so, please create an account.
   </p>
+
+
+  <section>
+    <h2>Server info</h2>
+    <dl>
+      <dt>Server name</dt>
+      <dd>{{serverName}}</dd>
+    </dl>
+  </section>
 </div>
 </body>
 </html>

lib/models/account-template.js

@@ -1,5 +1,7 @@
 'use strict'
 
+import { processHandlebarFile } from '../utils'
+
 const fs = require('fs-extra')
 const path = require('path')
 const mime = require('mime-types')
@@ -130,58 +132,7 @@ class AccountTemplate {
    */
   processAccount (accountPath) {
     return this.readTemplateFiles(accountPath)
-      .then(files => {
-        return Promise.all(
-          files.map((path) => { return this.processFile(path) })
-        )
-      })
-  }
-
-  /**
-   * Reads a file, processes it (performing template substitution), and saves
-   * back the processed result.
-   *
-   * @param filePath {string}
-   *
-   * @return {Promise}
-   */
-  processFile (filePath) {
-    return new Promise((resolve, reject) => {
-      fs.readFile(filePath, 'utf8', (error, rawSource) => {
-        if (error) { return reject(error) }
-
-        let output = this.processTemplate(rawSource)
-
-        fs.writeFile(filePath, output, (error) => {
-          if (error) { return reject(error) }
-          resolve()
-        })
-      })
-    })
-  }
-
-  /**
-   * Performs a Handlebars string template substitution, and returns the
-   * resulting string.
-   *
-   * @see https://www.npmjs.com/package/handlebars
-   *
-   * @param source {string} e.g. 'Hello, {{name}}'
-   *
-   * @return {string} Result, e.g. 'Hello, Alice'
-   */
-  processTemplate (source) {
-    let template, result
-
-    try {
-      template = Handlebars.compile(source)
-      result = template(this.substitutions)
-    } catch (error) {
-      console.log('Error processing template: ', error)
-      return source
-    }
-
-    return result
+      .then(files => Promise.all(files.map(path => processHandlebarFile(path, this.substitutions))))
   }
 
   /**

lib/server-config.js

@@ -1,4 +1,6 @@
 'use strict'
+import { processHandlebarFile } from './utils'
+
 /**
  * Server config initialization utilities
  */
@@ -36,7 +38,7 @@ function ensureDirCopyExists (fromDir, toDir) {
  *
  * @param argv {Function} Express.js app object
  */
-function ensureWelcomePage (argv) {
+async function ensureWelcomePage (argv) {
   let { multiuser, templates } = argv
   let rootDir = path.resolve(argv.root)
   let serverRootDir
@@ -55,6 +57,9 @@ function ensureWelcomePage (argv) {
   if (!fs.existsSync(existingIndexPage)) {
     fs.mkdirp(serverRootDir)
     fs.copySync(defaultIndexPage, existingIndexPage)
+    await processHandlebarFile(existingIndexPage, {
+      // Need to load config from somewhere
+    })
     fs.copySync(defaultIndexPageAcl, existingIndexPageAcl)
   }
 }

lib/utils.js

@@ -5,6 +5,7 @@ module.exports.pathBasename = pathBasename
 module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
 module.exports.parse = parse
+module.exports.processHandlebarFile = processHandlebarFile
 module.exports.serialize = serialize
 module.exports.translate = translate
 module.exports.stringToStream = stringToStream
@@ -19,6 +20,8 @@ const path = require('path')
 const $rdf = require('rdflib')
 const from = require('from2')
 const url = require('url')
+const Handlebars = require('handlebars')
+const debug = require('./debug').errors
 
 /**
  * Returns a fully qualified URL from an Express.js Request object.
@@ -147,6 +150,54 @@ function parse (data, baseUri, contentType, callback) {
   }
 }
 
+/**
+ * Reads a file, processes it (performing template substitution), and saves
+ * back the processed result.
+ *
+ * @param filePath {string}
+ * @param substitutions {Object}
+ *
+ * @return {Promise}
+ */
+async function processHandlebarFile (filePath, substitutions) {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filePath, 'utf8', (error, rawSource) => {
+      if (error) {
+        return reject(error)
+      }
+
+      const output = processHandlebarTemplate(rawSource, substitutions)
+
+      fs.writeFile(filePath, output, (error) => {
+        if (error) {
+          return reject(error)
+        }
+        resolve()
+      })
+    })
+  })
+}
+
+/**
+ * Performs a Handlebars string template substitution, and returns the
+ * resulting string.
+ *
+ * @see https://www.npmjs.com/package/handlebars
+ *
+ * @param source {string} e.g. 'Hello, {{name}}'
+ *
+ * @return {string} Result, e.g. 'Hello, Alice'
+ */
+function processHandlebarTemplate (source, substitutions) {
+  try {
+    const template = Handlebars.compile(source)
+    return template(substitutions)
+  } catch (error) {
+    debug(`Error processing template: ${error}`)
+    return source
+  }
+}
+
 function serialize (graph, baseUri, contentType, callback) {
   try {
                 // target, kb, base, contentType, callback