From 9055af219d71f916efc8fcca3fa68a1564b6084e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig-=C3=98rjan=20Smelror?= <smelror@gmail.com>
Date: Fri, 2 Feb 2024 16:09:11 +0100
Subject: [PATCH] New function: _add_blog_list_to_index

---
 qsgen2 | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/qsgen2 b/qsgen2
index e0613c2..a578249 100755
--- a/qsgen2
+++ b/qsgen2
@@ -418,39 +418,25 @@ function _pages() {
         if (${debug}) _msg debug "_pages: Running engine on ${pages_in_array}"
           if [[ ${file_ext} == "tpl" ]]; then
             local page_content=$( ${engine} "$page_content" )
-        
+            
         # Look for links, images and videos and convert them if present.
         if (${debug}) _msg debug "_pages: Checking for #link, #showimg and #ytvideo in page_content"
-        if [[ $( echo ${page_content} | grep \#link ) ]]; then
+          if [[ $( echo ${page_content} | grep \#link ) ]]; then
             if (${debug}) _msg debug "_pages: #link is present, run _link: page_content"
             local page_content=$( _link "${page_content}" )
-        fi
-        if [[ $( echo ${page_content} | grep \#showimg ) ]]; then
+            fi
+          if [[ $( echo ${page_content} | grep \#showimg ) ]]; then
             if (${debug}) _msg debug "_pages: #showimg is present, run _image: page_content"
             local page_content=$( _image "${page_content}" )
-        fi
-        if [[ $( echo ${page_content} | grep \#ytvideo ) ]]; then
+          fi
+          if [[ $( echo ${page_content} | grep \#ytvideo ) ]]; then
             if (${debug}) _msg debug "_pages: #ytvideo is present, run _youtube: page_content"
             local page_content=$( _youtube "${page_content}" )
-        fi
+          fi
         elif [[ ${file_ext} == "md" ]]; then
             local page_content=$(echo "$page_content" | ${engine})
-            #echo "$page_content"
-            #exit
-          fi
-        #new_updated_blogs=true
-        # Let's find the file 'index.tpl' and add the blog if blog_in_index is true
-        if [[ ${pages_in_array} == "index.${file_ext}" ]] && [[ ${blog_in_index} == "true" ]]; then
-            if (${debug}) _msg debug "_pages: Inserting blog list to index.html"
-            local blog_index_list=$(<${project_dir}/blog/index.tmp.html)
-            page_content=$( echo ${blog_index_list} >> ${page_content} )
         fi
         
-        # Insert page_content into pages_tpl by replacing the BODY tag present there
-        if (${debug}) _msg debug "_pages: Replacing BODY with page_content in pages_tpl using Perl"
-        # Use Perl for multi-line and special character handling
-        local pages_tpl=$( awk -v new_body="$page_content" '{sub(/BODY/, new_body)} 1' <(echo "${pages_tpl}") )
-        
         # Replace every #pagetitle in pages_tpl
         if (${debug}) _msg debug "_pages: Replacing #pagetitle in pages_tpl"
         local pages_tpl=$( echo ${pages_tpl} | perl -pe "s|#pagetitle|${page_title}|gs" )
@@ -480,10 +466,10 @@ function _pages() {
       export new_updated_pages=true
       
     else
-
+        
         _msg info "No new or updated Pages"
         export new_updated_pages=false
-
+      
     fi
     
 }
@@ -679,6 +665,20 @@ function _blog_index() {
 
 }
 
+function _add_blog_list_to_index() {
+  
+  local debug=true
+  
+  # Let's find the file 'index.tpl' and add the blog if blog_in_index is true
+  if [[ ${new_updated_blogs} == "true" ]] && [[ ${blog_in_index} == "true" ]]; then
+    if (${debug}) _msg debug "_pages: Inserting blog list to index.html"
+    local blog_index_list=$(<${project_dir}/blog/index.tmp.html)
+    local site_index_file=$(<${www_root}/index.tmp.html)
+    awk -v new_body="$site_index_file" '{sub(/BLOGINDEX/, new_body)} 1' <(echo "${blog_index_list}")
+  fi
+
+}
+
 function _sitemap() {
     
 # Check if sitemap is set to true and if there are updated Blogs or Pages before updating the sitemap.xml file.
@@ -900,4 +900,5 @@ _html() {
 # Time to test the first function
 _blogs
 _pages
+_add_blog_list_to_index
 _sitemap
\ No newline at end of file