X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=tools.sh;h=4e93d3f4229049ef70ed84adf81eb20d81da3ffa;hb=19dff502e8d78c56a1a8a09e9b9d27f304839a6e;hp=6388e3f3219b53c36fadf39511c9d88990fefd87;hpb=0d5786afa416aa19fc5c0bedd0dea93532abd34f;p=shellwiki

diff --git a/tools.sh b/tools.sh
index 6388e3f..4e93d3f 100755
--- a/tools.sh
+++ b/tools.sh
@@ -91,7 +91,7 @@ attachment_glob(){
 }
 
 page_glob(){
-  local pattern="${1%/}/" IFS=''
+  local pattern="${1%/}/" depth="${2:-0}" IFS=''
   local glob page pagedir
 
   case $pattern in
@@ -106,41 +106,23 @@ page_glob(){
   esac \
   | sort -u \
   | while read -r page; do
-    case $page in
-      \#*|*/\#*) continue;;
-      *) pagedir="$(page_abs "$page")";;
-    esac
-    [ -d "$_DATA/pages/$pagedir" -o -d "$_EXEC/pages/$pagedir" ] \
-    && printf '%s\n' "$page"
-  done
-}
+    # Not a page directory (just a metadata dir)
+    [ ! "${page%%#*}" -o ! "${page%%*/#*}" ] && continue
 
-page_children(){
-  local page="${1:-${PATH_INFO}}" depth="${2:-1}"
-  local glob pagedir IFS=''
-  page="${page%/}/"
+    # Omit "system" pages unless explicitly wanted
+    [ ! "${page%%\[*\]/*}" -o ! "${page%%*/\[*\]/*}" ] && [ "$glob_system_pages" != true ] && continue
 
-  [ "$depth" -eq 0 ] && return 0
+    # Omit translation pages if translations are enabled
+    [ ! "${page%%:*}" -o ! "${page%%*/:*}" ] && [ "$LANGUAGE_DEFAULT" ] && continue
+
+    pagedir="$(page_abs "$page")"
 
-  case $page in
-  /*)
-    for glob in "$_DATA/pages/${page}"*/; do printf '%s\n' "${glob#"$_DATA/pages/"}"; done
-    for glob in "$_EXEC/pages/${page}"*/; do printf '%s\n' "${glob#"$_EXEC/pages/"}"; done
-    ;;
-  *)
-    for glob in "$_DATA/pages/$PATH_INFO/${page}"*/; do printf '%s\n' "${glob#"$_DATA/pages/$PATH_INFO/"}"; done
-    for glob in "$_EXEC/pages/$PATH_INFO/${page}"*/; do printf '%s\n' "${glob#"$_EXEC/pages/$PATH_INFO/"}"; done
-    ;;
-  esac \
-  | sort -u \
-  | while read -r page; do
-    case $page in
-      \#*|*/\#*) continue;;
-      *) pagedir="$(page_abs "$page")";;
-    esac
     if [ -d "$_DATA/pages/$pagedir" -o -d "$_EXEC/pages/$pagedir" ]; then
-      printf %s\\n "$page"
-      page_children "$page" "$((depth - 1))"
+      printf '%s\n' "$page"
+      if ! [ "$depth" -eq 0 ]; then
+        PATH_INFO="$pagedir" page_glob "*" "$((depth - 1))" \
+        | while read -r glob; do printf %s%s\\n "$page" "$glob"; done
+      fi
     fi
   done
 }