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

qsgen2: New function _run_engine

Browse Source
This commit is contained in:
Stig-Ørjan Smelror 2024-02-14 18:50:48 +01:00
parent c76ffc2056
commit d4bbf0c8ca
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qsgen2
View File

@ -159,6 +159,20 @@ else
exit exit
fi fi
function _run_engine() {
# Usage: _run_engine <input>
local debug=false
if [[ ${generator} == "native" ]]; then
${engine} ${1}
elif [[ ${generator} == "markdown" ]]; then
echo ${1} | ${engine} ${engine_opts}
else
echo "Usage: _run_engine <input>"
exit
fi
}
if (${globaldebug}); then _msg debug "_qsgen2_msg_6"; fi if (${globaldebug}); then _msg debug "_qsgen2_msg_6"; fi
builtin cd ${project_dir} builtin cd ${project_dir}
@ -465,8 +479,7 @@ function _pages() {
# HTML'ify the page content # HTML'ify the page content
if (${debug}) _msg debug "${0:t}_msg_13" " ${pages_in_array}" if (${debug}) _msg debug "${0:t}_msg_13" " ${pages_in_array}"
if [[ ${generator} == "native" ]]; then page_content=$( _run_engine "$page_content" )
page_content=$( ${engine} "$page_content" )
# Look for links, images and videos and convert them if present. # Look for links, images and videos and convert them if present.
if (${debug}) _msg debug "${0:t}_msg_14" if (${debug}) _msg debug "${0:t}_msg_14"
if [[ $( echo ${page_content} | grep \#link ) ]]; then if [[ $( echo ${page_content} | grep \#link ) ]]; then
@ -481,9 +494,6 @@ function _pages() {
if (${debug}) _msg debug "${0:t}_msg_17" if (${debug}) _msg debug "${0:t}_msg_17"
page_content=$( _youtube "${page_content}" ) page_content=$( _youtube "${page_content}" )
fi fi
elif [[ ${generator} == "markdown" ]]; then
page_content=$(echo "$page_content" | ${engine} ${engine_opts})
fi
# Replace every #pagetitle in pages_tpl # Replace every #pagetitle in pages_tpl
if (${debug}) _msg debug "${0:t}_msg_18" if (${debug}) _msg debug "${0:t}_msg_18"
@ -670,8 +680,7 @@ function _blogs() {
blog_content="${blog_content//CALADAY/${sdate[1]}}" blog_content="${blog_content//CALADAY/${sdate[1]}}"
if (${debug}) _msg debug "${0:t}_msg_15" " ${blog}" if (${debug}) _msg debug "${0:t}_msg_15" " ${blog}"
if [[ ${generator} == "native" ]]; then blog_content=$( _run_engine "${blog_content}" )
blog_content=$( ${engine} "${blog_content}" )
# Look for links, images and videos and convert them if present. # Look for links, images and videos and convert them if present.
if (${debug}) _msg debug "${0:t}_msg_16" if (${debug}) _msg debug "${0:t}_msg_16"
if [[ $( echo ${blog_content} | grep \#link ) ]]; then if [[ $( echo ${blog_content} | grep \#link ) ]]; then
@ -686,9 +695,6 @@ function _blogs() {
if (${debug}) _msg debug "${0:t}_msg_19" if (${debug}) _msg debug "${0:t}_msg_19"
blog_content=$(_youtube "${blog_content}") blog_content=$(_youtube "${blog_content}")
fi fi
elif [[ ${generator} == "markdown" ]]; then
blog_content=$(echo "$blog_content" | ${engine} ${engine_opts})
fi
# Replace every #tagline in blog_content # Replace every #tagline in blog_content
if (${debug}) _msg debug "${0:t}_msg_20" if (${debug}) _msg debug "${0:t}_msg_20"
@ -793,9 +799,12 @@ function _blog_idx_for_index() {
done done
if (${debug}) _msg debug "${0:t}_msg_7" " ${engine} " "${0:t}_msg_7.1" if (${debug}) _msg debug "${0:t}_msg_7" " ${engine} " "${0:t}_msg_7.1"
blog_list_content=$( ${engine} ${blog_list_content} ) # Catch any QStags or Markdown in the Ingress
# Got to rework how the engine works. Create a new function to take the blunt of the work.
# function _run_engine() <input>
blog_list_content=$( _run_engine ${blog_list_content} )
if (${debug}) _msg debug "${0:t}_msg_8" " ${project_dir}/blog/index.tmp.html" if (${debug}) _msg debug "${0:t}_msg_8" " ${project_dir}/blog/index.tmp.html"
if (${debug}) _msg debug "${0:t}_msg_9" " ${blog_list_content}" #if (${debug}) _msg debug "${0:t}_msg_9" " ${blog_list_content}"
echo ${blog_list_content} > ${project_dir}/blog/index.tmp.html echo ${blog_list_content} > ${project_dir}/blog/index.tmp.html
} }