kekePower/qsgen2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor page generation in qsgen2

Browse Source 
This commit refactors the  function in  script. It updates the order of operations and improves code readability.

The changes include:
- Replacing  with  in  after replacing other placeholders.
- Updating debug messages for better logging.

Additionally, the commit generates the blog index file and updates the message accordingly.

These changes improve the page generation process and ensure that the blog index file is correctly generated.
This commit is contained in:
Stig-Ørjan Smelror 2024-02-12 18:42:29 +01:00
parent e5cb3cc087
commit bdc218a0a0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qsgen2
View File

@ -556,14 +556,14 @@ function _pages() {
page_content=$(echo "$page_content" | ${engine} ${engine_opts}) page_content=$(echo "$page_content" | ${engine} ${engine_opts})
fi fi
if (${debug}) _msg debug "_pages: Replacing BODY with page_content in pages_tpl"
# Use awk for multi-line and special character handling
pages_tpl=$( awk -v new_body="$page_content" '{sub(/BODY/, new_body)} 1' <(echo "${pages_tpl}") )
# Replace every #pagetitle in pages_tpl # Replace every #pagetitle in pages_tpl
if (${debug}) _msg debug "_pages: Replacing #pagetitle, #tagline and #sitename in pages_tpl" if (${debug}) _msg debug "_pages: Replacing #pagetitle, #tagline and #sitename in pages_tpl"
pages_tpl=$(echo "${pages_tpl}" | perl -pe "s|#pagetitle|${page_title}|gs; s|#tagline|${site_tagline}|gs; s|#sitename|${site_name}|gs") pages_tpl=$(echo "${pages_tpl}" | perl -pe "s|#pagetitle|${page_title}|gs; s|#tagline|${site_tagline}|gs; s|#sitename|${site_name}|gs")
if (${debug}) _msg debug "_pages: Replacing BODY with page_content in pages_tpl"
# Use awk for multi-line and special character handling
pages_tpl=$( awk -v new_body="$page_content" '{sub(/BODY/, new_body)} 1' <(echo "${pages_tpl}") )
# Replace #updated with today's date and #version with Name and Version to footer # Replace #updated with today's date and #version with Name and Version to footer
if (${debug}) _msg debug "_pages: _last_updated in pages_tpl" if (${debug}) _msg debug "_pages: _last_updated in pages_tpl"
pages_tpl=$( _last_updated ${pages_tpl} ) pages_tpl=$( _last_updated ${pages_tpl} )
@ -610,7 +610,7 @@ function _pages() {
export new_updated_pages=false export new_updated_pages=false
fi fi
} }
function _blogs() { function _blogs() {
@ -898,7 +898,7 @@ function _blog_index() {
if (${debug}) _msg debug "Running function _blog_index" if (${debug}) _msg debug "Running function _blog_index"
if (${debug}) _msg debug "_blog_index: blog_in_index = ${blog_in_index}" if (${debug}) _msg debug "_blog_index: blog_in_index = ${blog_in_index}"
_msg std "- Generating the Blog index file" _msg std "- Generating Page: blog/index.html"
local blog_index_tpl=$(<${project_dir}/themes/${theme}/blog_index.tpl) local blog_index_tpl=$(<${project_dir}/themes/${theme}/blog_index.tpl)
local blog_index_list=$(<${project_dir}/blog/index.tmp.html) local blog_index_list=$(<${project_dir}/blog/index.tmp.html)