X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fpagelist;h=08764aabe4d91c4924557557c609f5037d9d489d;hb=f17f2a98e2387cf9c2e68005c420b9a34ade17c9;hp=7c800418c41c02a259caab7bc7eeb79c14963e42;hpb=e80c289e4e82f70c9e7426c6c1d3c71c8a42046e;p=shellwiki

diff --git a/macros/pagelist b/macros/pagelist
index 7c80041..08764aa 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -1,27 +1,74 @@
 #!/bin/sh
 
+# Copyright 2022 - 2023 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
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 . "$_EXEC/cgilite/cgilite.sh"
-. "$_EXEC/cgilite/users.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
-dir="${1:-./}"
-depth="${2:-1}"
-
-printf '<ul class="pagelist">\n'
-  page_glob "$dir" \
-  | while read -r glob; do
-    printf %s\\n "$glob"
-    page_children "$glob" "$((depth - 1))"
-  done \
-  | while read -r page; do
-    case $page in
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
-    esac
-    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
-      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
-    && acl_read "$pagedir" \
-    && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+tags='' dir='' depth='' glob_system_pages=false
+label='' labeltype='' altlabel='' cnt=0
+
+set -- "$@" --
+while [ $# -gt 0 ]; do case $1 in
+  --system) glob_system_pages=true; shift 1;;
+  --depth)  depth="$2" shift 2;;
+  \#*) tags="${tags}${tags:+ }${1###}"; shift 1;;
+  --h1|--h2|--h3|--h4|--h5|--h6|--label)
+    labeltype="${1#--}" label="$2"; shift 2;;
+  --alt-label)
+    altlabel="$2"; shift 2;;
+  --) shift 1; break;;
+  *) if [ ! "$dir" ]; then
+      dir="$1"
+      set -- "$@" "$1"; shift 1;
+    elif [ ! "$depth" ]; then
+      depth="$1"; shift 1;
+    else
+      set -- "$@" "$1"; shift 1;
+    fi;;
+esac; done
+
+[ "$*" ] || set -- "*"
+[ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&- || depth=0
+
+for dir in "$@"; do
+  page_glob "$dir" "$depth"
+done \
+| sort -u \
+| {
+  while read -r page; do
+    pagedir="$(page_abs "$page")"
+    if [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+         -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+       && acl_read "$pagedir" \
+       && has_tags "$pagedir" $tags
+    then
+      [ "$cnt" -eq 0 -a "$label" ] \
+      && printf '<%s class="macro pagelist label">%s</%s>' \
+         "$labeltype" "$(HTML "$label")" "$labeltype"
+      [ "$cnt" -eq 0 ] && printf '<ul class="macro pagelist">\n'
+
+      printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+      cnt="$((cnt + 1))"
+    fi
   done
-printf '</ul>\n'
+
+  if [ "$cnt" -gt 0 ]; then
+    printf '</ul>\n'
+  elif [ "$altlabel" ]; then
+    printf '<label class="macro pagelist altlabel">%s</label>' "$(HTML "$altlabel")"
+  fi
+}