Bash functions: revamp moulti_process_lines.

Author: xavierog

examples/moulti-functions.bash

@@ -74,30 +74,42 @@ function moulti_type {
 MOULTI_NEW_STEP_PATTERN='^([-=#@]+)(\s*)(.+?)\2\1$'
 
 function moulti_process_lines {
-	# Optional user hooks:
-	command -v moulti_make_step > /dev/null && custom_make_step=1
-	command -v moulti_inspect_line > /dev/null && inspect_line=1
-	# Main loop:
 	local step_counter=0
+	IFS=''
 	while read -r line; do
 		if [[ "${line}" =~ ${MOULTI_NEW_STEP_PATTERN} ]]; then
 			((++step_counter))
 			local prev_id="${step_id}"
 			local next_id="$$_${step_counter}"
-			if [ "${custom_make_step}" ]; then
-				step_id=$(moulti_make_step "${prev_id}" "${next_id}" "${line}" "${BASH_REMATCH[@]}" < /dev/null)
-				[ "${step_id}" ] || step_id="${prev_id}"
+			step_id=$(moulti_make_step "${prev_id}" "${next_id}" "${line}" "${BASH_REMATCH[@]}" < /dev/null)
+			if [ "${step_id}" ] && [ "${step_id}" != "${prev_id}" ]; then
+				# Redirect stdout to `moulti pass our_new_step`
+				exec > >(moulti pass "${step_id}")
 			else
-				step_id="${next_id}"
-				moulti step add "${step_id}" --title="${line}" --bottom-text=' ' --scroll-on-activity=-1 < /dev/null
+				step_id="${prev_id}"
 			fi
-			# Redirect stdout to `moulti pass our_new_step`
-			exec > >(moulti pass "${step_id}")
-		fi
-		if [ "${inspect_line}" ]; then
-			moulti_inspect_line "${line}" "${step_id}" < /dev/null
-		else
-			printf '%s\n' "${line}"
 		fi
+		moulti_inspect_line "${line}" "${step_id}" < /dev/null
 	done
 }
+
+# Arguments:
+# 1: previous step id
+# 2: next step id (suggestion)
+# 3: current line (complete, no CR/LF)
+# 4: matched substring
+# 5: capture #1
+# 6: capture #2, etc.
+# This function MUST output the id of the created step.
+function moulti_make_step {
+	# Default implementation: use the complete line as title:
+	moulti step add "$2" --title="$3" --bottom-text=' ' --scroll-on-activity=-1 && echo "$2"
+}
+
+# Arguments:
+# 1: current line (complete, no CR/LF)
+# 2: current step id
+function moulti_inspect_line {
+	# Default implementation: systematically output the line:
+	printf '%s\n' "${line}"
+}