drop page_children() function and join it into page_glob(), hide [system] pages from...

[shellwiki] / tools.sh

diff --git a/tools.sh b/tools.sh
index 6388e3f3219b53c36fadf39511c9d88990fefd87..d147b73e6355b0d2ead11eb5097f4adc80724acc 100755 (executable)
--- 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
@@ -107,40 +107,27 @@ page_glob(){
   | 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
-}
-
-page_children(){
-  local page="${1:-${PATH_INFO}}" depth="${2:-1}"
-  local glob pagedir IFS=''
-  page="${page%/}/"
-
-  [ "$depth" -eq 0 ] && return 0
-
-  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;;
+      \#*|*/\#*)  # Not a page directory (just a metadata dir)
+        continue
+        ;;
+      \[*\]/*|*/\[*\]/*)  # Omit "system" pages unless explicitly wanted
+        [ "$glob_system_pages" != true ] \
+        && continue \
+        || pagedir="$(page_abs "$page")"
+        ;;
+      \:*|*/\:*)  # Omit translation pages if translations are enabled
+        [ "$LANGUAGE_DEFAULT" ] \
+        && continue \
+        || pagedir="$(page_abs "$page")"
+        ;;
       *) 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
 }