mirror of
				https://github.com/flynx/photobook.git
				synced 2025-11-04 13:20:12 +00:00 
			
		
		
		
	better template indexing...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									7ae71693ec
								
							
						
					
					
						commit
						5d0a593026
					
				@ -223,20 +223,23 @@ getCaption(){
 | 
			
		||||
	echo ${C[*]}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# XXX EXPERIMENTAL...
 | 
			
		||||
# index ${VAR} variables in templates...
 | 
			
		||||
# XXX EXPERIMENTAL index template variables...
 | 
			
		||||
declare -A TEMPLATE_INDEX
 | 
			
		||||
templateVars(){
 | 
			
		||||
	if [ -z ${TEMPLATE_INDEX[$1]} ] ; then
 | 
			
		||||
		TEMPLATE_INDEX[$1]=$(cat "$1" \
 | 
			
		||||
			| grep -o '\${[A-Z0-9]\+}' \
 | 
			
		||||
			| sed 's/\${\(.*\)}/\1/g' \
 | 
			
		||||
			| sort)
 | 
			
		||||
	fi
 | 
			
		||||
	echo ${TEMPLATE_INDEX[$1]}
 | 
			
		||||
}
 | 
			
		||||
indexTemplates(){
 | 
			
		||||
	#echo indexing templates...
 | 
			
		||||
	local lst
 | 
			
		||||
	local tpl
 | 
			
		||||
	for tpl in "${TEMPLATE_PATH}"/* ; do
 | 
			
		||||
		#echo ${tpl}...
 | 
			
		||||
		lst=( $(cat "${tpl}" \
 | 
			
		||||
			| grep -o '\${[A-Z0-9]\+}' \
 | 
			
		||||
			| sed 's/\${\(.*\)}/\1/g' \
 | 
			
		||||
			| sort) )
 | 
			
		||||
		TEMPLATE_INDEX[$(basename "${tpl}")]=${lst[@]}
 | 
			
		||||
		templateVars "${tpl}" > /dev/null
 | 
			
		||||
	done
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -273,6 +276,8 @@ anotatePath(){
 | 
			
		||||
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
#indexTemplates
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
echo %----------------------------------------------------------------------
 | 
			
		||||
echo %
 | 
			
		||||
@ -431,6 +436,10 @@ for spread in "${IMAGE_DIR}"/* ; do
 | 
			
		||||
		# formatting done...
 | 
			
		||||
		[ -z $TEMPLATE ] && continue
 | 
			
		||||
 | 
			
		||||
		# XXX index the manual template...
 | 
			
		||||
		#if [ -z ${TEMPLATE_INDEX[$TEMPLATE]}] ; then
 | 
			
		||||
		#fi
 | 
			
		||||
 | 
			
		||||
		# format...
 | 
			
		||||
		TEMPLATE=${TEMPLATE/$spread\//}
 | 
			
		||||
		TEMPLATE=${TEMPLATE/[0-9]-/}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user