X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fpagelist;h=2971515709fc03210abc3be1386797f6375adb45;hb=d6f2b884f3b9f094b08d2d4e66e666f5b04c46ad;hp=7c800418c41c02a259caab7bc7eeb79c14963e42;hpb=6b5c4236198e1438d6ca9d70a2893d8a2bfe0945;p=shellwiki

diff --git a/macros/pagelist b/macros/pagelist
index 7c80041..2971515 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -1,27 +1,55 @@
 #!/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}"
+tags='' dir='' depth='' glob_system_pages=false
+
+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;;
+  --) 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
 
-printf '<ul class="pagelist">\n'
-  page_glob "$dir" \
-  | while read -r glob; do
-    printf %s\\n "$glob"
-    page_children "$glob" "$((depth - 1))"
+printf '<ul class="macro pagelist">\n'
+  for dir in "$@"; do
+    page_glob "$dir" "$depth"
   done \
+  | sort -u \
   | while read -r page; do
-    case $page in
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
-    esac
+    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")"
   done
 printf '</ul>\n'