bugfix in --notitles option

[shellwiki] / macros / pagelist

diff --git a/macros/pagelist b/macros/pagelist
index 2971515709fc03210abc3be1386797f6375adb45..5a2a114448c290e984b4a641e6fde17ba0373bf5 100755 (executable)
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2022 - 2023 Paul Hänsch
+# Copyright 2022 - 2024 Paul Hänsch
 # 
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -17,14 +17,30 @@
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
+. "$_EXEC/cgilite/db23.sh"
 
-tags='' dir='' depth='' glob_system_pages=false
+tags='' ntags='' dir='' depth='' glob_system_pages=false
+label='' labeltype='' altlabel='' titles='' db3_data=''
+DB3 new  # Use DB3 for in-memory cache
+
+[ "$LANGUAGE_DEFAULT" ] && titles=true
 
 set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
-  --system) glob_system_pages=true; shift 1;;
-  --depth)  depth="$2" shift 2;;
+  --system|-system)
+    glob_system_pages=true; shift 1;;
+  --depth|-depth|-d)
+    depth="$2"; shift 2;;
+  --title|--titles|-titles|-title)
+    titles=true; shift 1;;
+  --no-title|--no-titles|--notitle|--notitles|-no-title|-no-titles|-notitle|-notitles)
+    titles=''; shift 1;;
   \#*) tags="${tags}${tags:+ }${1###}"; shift 1;;
+  \!*) ntags="${ntags}${ntags:+ }${1##!}"; shift 1;;
+  --h1|--h2|--h3|--h4|--h5|--h6|--label)
+    labeltype="${1#--}" label="$2"; shift 2;;
+  --alt-label|--altlabel)
+    altlabel="$2"; shift 2;;
   --) shift 1; break;;
   *) if [ ! "$dir" ]; then
       dir="$1"
@@ -39,17 +55,59 @@ esac; done
 [ "$*" ] || set -- "*"
 [ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&- || depth=0
 
-printf '<ul class="macro pagelist">\n'
+print_page() {
+  # print page URL and resolve page title (for use with --title flag)
+  # avoid calling this function via a subshell (i.e. $(print_page *))
+  # because it should be able to write its cache variable
+  local page="${1%/}/" title='' pfrag=''
+  pfrag="${page}"
+
+  # resolve name of each path element
+  while [ "${pfrag%/*}" -a "${pfrag%/*}" != "${pfrag}" ]; do
+    pfrag="${pfrag%/*}"
+    title="$(DB3 get "${pfrag}" || ! page_title "$(page_abs "${pfrag}")")/${title}" && break
+  done
+  # keep resolved names in cache
+  DB3 set "${page%/*}" "${title%/}"
+
+  [ "${page#/}" != "${page}" ] && title="/$title"
+  printf '%s   %s\n' "$(URL "$page")" "$(HTML "${title}")"
+}
+
+pagelist="$(
   for dir in "$@"; do
     page_glob "$dir" "$depth"
   done \
   | sort -u \
   | while read -r page; do
     pagedir="$(page_abs "$page")"
-    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
-      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
-    && acl_read "$pagedir" \
-    && has_tags "$pagedir" $tags \
-    && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+    if [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+         -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+       && acl_read "$pagedir" \
+       && has_tags "$pagedir" $tags \
+       && ! has_tag "$pagedir" $ntags
+    then
+      # Be careful, not to fork the print_page function into a subshell
+      # as it must be able to write its cache to the current context
+      [ "$titles" ] \
+      && print_page "$page" \
+      || printf '%s    %s\n' "$(URL "$page")" "$(HTML "$page")"
+    fi
   done
-printf '</ul>\n'
+)"
+
+if [ "$pagelist" ]; then
+  [ "$label" ] \
+  && printf '<%s class="macro pagelist label">%s</%s>' "$labeltype" "$(HTML "$label")" "$labeltype"
+
+  printf '<ul class="macro pagelist">\n'
+  printf %s\\n "$pagelist" \
+  | sort -k2 \
+  | while read -r url title; do
+    printf '<li><a href="%s">%s</a></li>\n' "${url}" "${title}"
+  done
+  printf '</ul>\n'
+
+elif [ "$altlabel" ]; then
+  printf '<label class="macro pagelist altlabel">%s</label>' "$(HTML "$altlabel")"
+fi