hdoc-tools 0.8.30 → 0.8.32

package/hdoc-build-db.js

@@ -7,7 +7,7 @@
 
     const db_schema = {
         hdoc_index: [
-            'relative_url UNINDEXED',
+            'resource_url UNINDEXED',
             'book_id',
             'book_audience UNINDEXED',
             'book_tags',
@@ -17,14 +17,15 @@
             'doc_family_id'
         ],
         hdoc_meta: [
-            'relative_url',
+            'resource_url',
             'book_id',
             'contributor_count INTEGER UNINDEXED',
             'edit_url UNINDEXED',
-            'last_commit UNINDEXED'
+            'last_commit UNINDEXED',
+            'pdf_size INTEGER UNINDEXED'
         ],
         hdoc_contributors: [
-            'relative_url',
+            'resource_url',
             'book_id',
             'login',
             'name',
@@ -78,8 +79,8 @@
         if (!book_config.tags) book_config.tags = [];
 
         for (let i = 0; i < index_records.length; i++) {
-            let index_path_name = index_records[i].relative_path.replace('\\', '/').replace(`${doc_id}/`, '');
-            index_path_name = index_path_name.replace(path.extname(index_records[i].relative_path), '');
+            let index_path_name = index_records[i].relative_path.replace('\\', '/');
+            index_path_name = '/' + index_path_name.replace(path.extname(index_records[i].relative_path), '');
             const index_vals = [
                 index_path_name,
                 doc_id,
@@ -102,7 +103,8 @@
                 doc_id,
                 index_records[i].metadata.contributor_count,
                 index_records[i].metadata.edit_url,
-                index_records[i].metadata.last_commit
+                index_records[i].metadata.last_commit,
+                index_records[i].pdf_size
             ];
             const meta_response = hdoc_index.insert_record(db, 'hdoc_meta', db_schema.hdoc_meta, meta_vals);
             if (!meta_response.success) {

package/hdoc-build-pdf.js

@@ -17,7 +17,6 @@
 
     let css_files = [],
         hb_logo = '',
-        header = '',
         footer = '';
 
     const file_callback = function (element) {
@@ -98,7 +97,7 @@
 
     exports.generate_pdf = async function (pdf_template_path, pdf_template_content, book_config, html_source, target_file, verbose = false) {
         if (verbose) console.log(`Generating PDF: ${target_file}`);
-
+        let pdf_size = 0;
         // Cache footer
         if (footer === '') footer = get_footer(pdf_template_path);
 
@@ -111,7 +110,7 @@
                 hb_logo = `data:image/svg+xml;base64,${hb_logo}`;
             } catch (err) {
                 console.log('Error reading logo from template:', err);
-                return;
+                return pdf_size;
             }
         }
 
@@ -143,7 +142,7 @@
         }
 
         try {
-            await page.pdf({
+            const pdf_gen = await page.pdf({
                 path: target_file,
                 margin: {
                     top: '30px',
@@ -159,11 +158,13 @@
             });
             if (verbose) console.log('PDF generation success.');
 
+            pdf_size = pdf_gen.byteLength;
         } catch (err) {
             console.log(`Error generating PDF ${target_file} - ${err}`);
         }
 
         // Close the browser instance
         await browser.close();
+        return pdf_size;
     };
 })();

package/hdoc-build.js

@@ -227,13 +227,14 @@
                 if (pdf_enable && !pdf_path_excluded(file_path.relativePath)) pdf_header = process_doc_header(fm_headers, file_path.relativePath, pdf_header_template_non_git);
             }
 
+            let pdf_size = 0;
             if (pdf_enable && !pdf_path_excluded(file_path.relativePath)) {
                 let pdf_txt = await hdoc_build_pdf.process_images(file_path, html_txt);
                 pdf_txt = `${pdf_header}\n${pdf_txt}`;
                 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
 
             html_txt = `${fm_header_content}\n${doc_header}\n${html_txt}`;
@@ -242,7 +243,8 @@
                 relative_path: file_path.relativePath,
                 index_html: hdoc_index.transform_html_for_index(html_txt),
                 metadata: metadata,
-                contributors: contribs
+                contributors: contribs,
+                pdf_size: pdf_size
             });
             // Save HTML into HTML file
             try {
@@ -425,14 +427,15 @@
                 doc_header = process_doc_header(fm_headers, file_path.relativePath, doc_header_template_non_git);
                 if (pdf_enable && !pdf_path_excluded(file_path.relativePath)) pdf_header = process_doc_header(fm_headers, file_path.relativePath, pdf_header_template_non_git);
             }
-
+            
+            let pdf_size = 0;
             if (pdf_enable && !pdf_path_excluded(file_path.relativePath)) {
                 let pdf_txt = await hdoc_build_pdf.process_images(file_path, html_txt);
                 pdf_txt = `${pdf_header}\n${pdf_txt}`;
                 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
             
             html_txt = `${fm_header}\n${doc_header}\n${html_txt}`;
@@ -452,7 +455,8 @@
                 relative_path: relative_path,
                 index_html: index_details,
                 metadata: metadata,
-                contributors: contribs
+                contributors: contribs,
+                pdf_size: pdf_size
             });
 
             // Delete MD file from _work path

package/package.json

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