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

Remove old variables. Rename _zhtml to _qstags. Debug _blogs to find the bottleneck.

Browse Source
This commit is contained in:
Stig-Ørjan Smelror 2024-02-24 19:03:58 +01:00
parent fe2867b3ed
commit 04d558c2d7
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qsgen2
View File

@ -46,19 +46,6 @@ else
exit exit
fi fi
# Let's define the new config values to the old names until
# I've had time to change everything in the script.
# site_name="${config[site_name]}"
# site_tagline="${config[site_tagline]}"
# site_url="${config[site_url]}"
# theme="${config[site_theme]}"
# sitemap="${config[site_sitemap]}"
# www_root="${config[site_root]}"
# blog_in_index="${config[site_blog]}"
# project_dir="${config[project_root]}"
# language="${config[project_lang]}"
# generator="${config[project_generator]}"
# Load language as defined in config # Load language as defined in config
typeset -A qsgenlang typeset -A qsgenlang
lang_found=false lang_found=false
@ -145,7 +132,7 @@ fi
# We define the variable 'engine' based on what's in the 'config' file. # We define the variable 'engine' based on what's in the 'config' file.
if [[ ${config[project_generator]} == "native" ]]; then if [[ ${config[project_generator]} == "native" ]]; then
# Usage: ${engine} ${1} - Where 1 is the file you want to convert # Usage: ${engine} ${1} - Where 1 is the file you want to convert
engine=_zhtml engine=_qstags
export file_ext="qst" export file_ext="qst"
elif [[ ${config[project_generator]} == "markdown" ]]; then elif [[ ${config[project_generator]} == "markdown" ]]; then
if [[ ! -f /usr/local/bin/pandoc ]]; then if [[ ! -f /usr/local/bin/pandoc ]]; then
@ -595,7 +582,7 @@ function _blogs() {
if [[ ${globaldebug} == "true" ]]; then if [[ ${globaldebug} == "true" ]]; then
local debug=true local debug=true
else else
local debug=false local debug=true
fi fi
# Running function _list_blogs # Running function _list_blogs
@ -670,6 +657,7 @@ function _blogs() {
# Extract blog information # Extract blog information
sdate=( $( echo ${content} | grep DATE | sed "s|DATE\ ||" | sed "s|\-|\ |g" ) ) sdate=( $( echo ${content} | grep DATE | sed "s|DATE\ ||" | sed "s|\-|\ |g" ) )
if [[ ${config[project_generator]} == "native" ]]; then if [[ ${config[project_generator]} == "native" ]]; then
_msg debug "* qstags: Fetching BLOG_TITLE"
while IFS= read -r line; do while IFS= read -r line; do
if [[ "$line" == "BLOG_TITLE "* ]]; then if [[ "$line" == "BLOG_TITLE "* ]]; then
btitle="${line#BLOG_TITLE }" btitle="${line#BLOG_TITLE }"
@ -677,6 +665,7 @@ function _blogs() {
fi fi
done <<< "$content" done <<< "$content"
elif [[ ${config[project_generator]} == "markdown" ]]; then elif [[ ${config[project_generator]} == "markdown" ]]; then
_msg debug "* markdown: Fetching BLOG_TITLE"
while IFS= read -r line; do while IFS= read -r line; do
if [[ "$line" == \#* ]]; then if [[ "$line" == \#* ]]; then
btitle="${line#\#}" # Remove the first '#' character btitle="${line#\#}" # Remove the first '#' character
@ -686,7 +675,9 @@ function _blogs() {
fi fi
done <<< "$content" done <<< "$content"
fi fi
_msg debug "* Fetching INGRESS"
ingress=$( echo ${content} | sed "s/'/\\\'/g" | xargs | grep -Po "#INGRESS_START\K(.*?)#INGRESS_STOP" | sed "s|\ \#INGRESS_STOP||" | sed "s|^\ ||" ) ingress=$( echo ${content} | sed "s/'/\\\'/g" | xargs | grep -Po "#INGRESS_START\K(.*?)#INGRESS_STOP" | sed "s|\ \#INGRESS_STOP||" | sed "s|^\ ||" )
_msg debug "* Fetching BODY"
body=$( echo ${content} | sed "s/'/\\\'/g" | xargs | grep -Po "#BODY_START\K(.*?)#BODY_STOP" | sed "s|\ \#BODY_STOP||" | sed "s|^\ ||" ) body=$( echo ${content} | sed "s/'/\\\'/g" | xargs | grep -Po "#BODY_START\K(.*?)#BODY_STOP" | sed "s|\ \#BODY_STOP||" | sed "s|^\ ||" )
blog_index=$(echo "${btitle:l}" | sed 's/ /_/g; s/,//g; s/\.//g; s/://g; s/[()]//g') blog_index=$(echo "${btitle:l}" | sed 's/ /_/g; s/,//g; s/\.//g; s/://g; s/[()]//g')
@ -740,8 +731,10 @@ function _blogs() {
# 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"
blog_content=$( echo ${blog_content} | perl -pe "s|#tagline|${config[site_tagline]}|gs; s|#sitename|${config[site_name]}|gs; s|#pagetitle|${page_title}|gs" ) blog_content=$( echo ${blog_content} | perl -pe "s|#tagline|${config[site_tagline]}|gs; s|#sitename|${config[site_name]}|gs; s|#pagetitle|${page_title}|gs" )
_msg debug "* Running _last_updated"
blog_content=$(_last_updated "${blog_content}") blog_content=$(_last_updated "${blog_content}")
_msg debug "* Running _cleanup"
blog_content=$(_cleanup "${blog_content}") blog_content=$(_cleanup "${blog_content}")
# Create directory if it doesn't exist # Create directory if it doesn't exist
@ -1173,7 +1166,7 @@ function _cleanup() {
} }
function _html() { function _p_qstags() {
if [[ ${globaldebug} == "true" ]]; then if [[ ${globaldebug} == "true" ]]; then
local debug=true local debug=true
@ -1235,7 +1228,7 @@ function _html() {
} }
function _zhtml() { function _qstags() {
# This function uses the regex module from Zsh to parse the QStags # This function uses the regex module from Zsh to parse the QStags