flynx/photobook
1
0
Fork 0
mirror of https://github.com/flynx/photobook.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

better error checking...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-03-17 19:30:27 +03:00
parent 91932d3137
commit 5308600350
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
examples/spread generation/spreads/07-non-existing-template/some-template.tpl Normal file
View File

53
scripts/make-spreads.sh
View File

@ -91,7 +91,7 @@ IMAGE_PAGE=${IMAGE_PAGE:=imagepage}
# NOTE: the index here corresponds to the number of images found in a # NOTE: the index here corresponds to the number of images found in a
# spread directory... # spread directory...
if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then
if ! [ ${#CFG_IMAGE_SPREAD[@]} = 0 ] ; then if [ ${#CFG_IMAGE_SPREAD[@]} != 0 ] ; then
IMAGE_SPREAD=() IMAGE_SPREAD=()
for i in ${!CFG_IMAGE_SPREAD[@]} ; do for i in ${!CFG_IMAGE_SPREAD[@]} ; do
IMAGE_SPREAD[$i]=${CFG_IMAGE_SPREAD[$i]} IMAGE_SPREAD[$i]=${CFG_IMAGE_SPREAD[$i]}
@ -278,21 +278,23 @@ readCaption(){
# usage: # usage:
# getTemplate SPREAD TYPE # getTemplate SPREAD TYPE
# #
# XXX REVISE...
getTemplate(){ getTemplate(){
local spread=$1 local spread=$1
local type=$2 local name=$2
local template local template
# already an existing template... if [[ $name =~ .*\.tex ]] ; then
if [[ $type =~ .*\.tex ]] && [ -e "$type" ] ; then # already an existing template...
echo $type if [ -e "$name" ] ; then
return echo $name
return
fi
# normalize...
name=${name%.tex}
fi fi
# normalize template name... # normalize template name...
if [[ $type =~ .*\.tpl ]] ; then if [[ $name =~ .*\.tpl ]] ; then
type=$( echo $type \ name=$( echo $name \
| sed \ | sed \
-e 's/.tpl$//' \ -e 's/.tpl$//' \
-e "s%$spread/%%" \ -e "s%$spread/%%" \
@ -300,15 +302,16 @@ getTemplate(){
fi fi
# local template... # local template...
template=($spread/*-$type.tex) template=($spread/*-$name.tex)
if [ ${#template[@]} != 0 ] ; then if [ ${#template[@]} != 0 ] ; then
template=${template[0]} template=${template[0]}
else else
template=($spread/$type.tex) template=($spread/$name.tex)
fi fi
# global template... # global template...
if [ -z $template ] || ! [ -e "$template" ] ; then if [ -z $template ] \
template="$TEMPLATE_DIR/${type}.tex" || ! [ -e "$template" ] ; then
template="$TEMPLATE_DIR/${name}.tex"
fi fi
# check if the thing exists... # check if the thing exists...
if ! [ -e $template ] ; then if ! [ -e $template ] ; then
@ -378,7 +381,7 @@ populateTemplate(){
local i=0 local i=0
for var in ${slots[@]} ; do for var in ${slots[@]} ; do
name=${var//[0-9]/} name=${var//[0-9]/}
if ! [ ${name} = "IMAGE" ] ; then if [ ${name} != "IMAGE" ] ; then
continue continue
fi fi
@ -405,7 +408,7 @@ populateTemplate(){
# pass 2: captions... # pass 2: captions...
for var in ${slots[@]} ; do for var in ${slots[@]} ; do
name=${var//[0-9]/} name=${var//[0-9]/}
if ! [ ${name} = "CAPTION" ] ; then if [ ${name} != "CAPTION" ] ; then
continue continue
fi fi
@ -449,7 +452,7 @@ populateTemplate(){
# print out the filled template... # print out the filled template...
echo % template: $tpl echo % template: $tpl
echo "${text}" echo "${text}"
return 0 return
} }
@ -590,21 +593,29 @@ handleSpread(){
# ignore the rest of the items when we are done # ignore the rest of the items when we are done
# creating two pages... # creating two pages...
[ $C == 2 ] \ [ $C == 2 ] \
&& return 0 && return
done done
fi fi
fi fi
# formatting done... # formatting done...
[ -z $template ] \ [ -z $template ] \
&& return 0 && return
# XXX check for errors... # resolve the template path...
local p=$template
template=$(getTemplate "$spread" "$template") template=$(getTemplate "$spread" "$template")
# not found...
if [ -z $template ] ; then
echo "%"
echo "% ERROR: could not resolve template: $p" | tee >(cat >&2)
echo "%"
fi
fi fi
populateTemplate "$spread" "$template" "${img[@]}" "${txt[@]}" populateTemplate "$spread" "$template" "${img[@]}" "${txt[@]}"
return 0 return $?
} }