hdoc-tools 0.7.13 → 0.7.15

package/hdoc-build.js

@@ -123,7 +123,7 @@
         console.log(`             Failed to convert: ${conversion_failed}`);
 
         console.log(`\r\nValidating paths in generated HTML files`);
-        const validation_success = validate.run(work_path, verbose);
+        const validation_success = validate.run(work_path, docId, verbose);
         if (!validation_success) {
             process.exit(1);
         }

package/hdoc-serve.js

@@ -112,6 +112,7 @@
 
       function expand_variables(text) {
          // For debug mode our base path is our root??
+         text = text.replaceAll('{{BASE_PATH}}', '/' + docId);
          text = text.replaceAll('{{DOC_ID}}', docId);
          text = text.replaceAll('{{BUILD_NUMBER}}', '0');
 
@@ -324,14 +325,31 @@
 
          // Return a 404 error here
          send_content_resource_404(req, res);
-      });
+      });    
 
       // Catch all
       app.get('/*', function (req, res) {
 
-         let ui_file_path = path.join(ui_path, req.url);
+         let segs = req.url.split('/');
+         if (segs.length > 2 && segs[1] === docId) {
+            // In this case we are looking for static content within the book
+            // Create the file path
+            let url = req.url.replace('/content/', '/');
+            console.log('URL Requested:', url);
+            let file_path = path.join(source_path, url);
+
+            // If the file exists, send it.
+            if (fs.existsSync(file_path) == true) {
+               send_file(req, res, file_path);
+               return;
+            }
 
-         console.log('URL Root:', req.url);
+            // All else fails, we have not file to return, so return a 404 error here
+            send_content_resource_404(req, res);
+            return;
+         }
+
+         let ui_file_path = path.join(ui_path, req.url);
 
          // To support the SPA application behavior, if there is no file extension present, then
          // we simply return the /index.html file content to the client

package/hdoc-validate.js

@@ -12,7 +12,8 @@ const parseLinkDestination = require('markdown-it/lib/helpers/parse_link_destina
     let errors = {},
         messages = {},
         errorcount = 0,
-        filecount = 0;
+        filecount = 0,
+        htmlFiles = [];
 
     const stringIsAValidUrl = (s) => {
         try {
@@ -52,8 +53,6 @@ const parseLinkDestination = require('markdown-it/lib/helpers/parse_link_destina
         symbolicLinks: false
     };
 
-    let htmlFiles = [];
-
     // File callbacks for html file scan
     const fileCallback = function (element) {
         filecount++;
@@ -91,10 +90,11 @@ const parseLinkDestination = require('markdown-it/lib/helpers/parse_link_destina
     };
 
 
-    exports.run = function (source_path, verbose) {
+    exports.run = function (source_path, doc_id, verbose) {
         // Get a list of HTML files in source_path
         dree.scan(source_path, dreeOptions, fileCallback);
 
+        let listContent = '';
         for (let i = 0; i < htmlFiles.length; i++) {
 
             // Initiate maps for errors and verbose messages for HTML file
@@ -108,6 +108,19 @@ const parseLinkDestination = require('markdown-it/lib/helpers/parse_link_destina
                 checkLinks(source_path, htmlFiles[i], links);
             }
 
+            // Build list content for Google 
+            listContent += `/${htmlFiles[i].relativePath}`;
+            if (i < htmlFiles.length - 1) {
+                listContent += '\r\n';
+            }
+        }
+        try {
+            // Write list
+            const listFile = path.join(source_path, doc_id, 'list.txt');
+            fs.writeFileSync(listFile, listContent);
+            console.log(`${listFile} created successfully`);
+        } catch (err) {
+            console.error(err);
         }
         if (errorcount === 0) {
             console.log('\r\n---------------');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.7.13",
+  "version": "0.7.15",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {