From: Paul Hänsch <paul@plutz.net>
Date: Fri, 7 Nov 2025 00:21:14 +0000 (+0100)
Subject: Feature: allow globbing in `attachment` macro
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=8f35578b8a964c15f1f3c86eefd01c57e2a5b53a;p=shellwiki

Feature: allow globbing in `attachment` macro
---

diff --git a/macros/attachments b/macros/attachments
index 3a75f86..4af3c09 100755
--- a/macros/attachments
+++ b/macros/attachments
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2022 Paul Hänsch
+# Copyright 2022, 2025 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
@@ -18,26 +18,35 @@
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
-page="$1"
-
-if [ "${page#/}" = "$page" ]; then
-  page="$(PATH "${PATH_INFO}/$page")"
-fi
-
-acl_read "$page" || exit 0
+[ $# = 0 ] && set -- "./*"
 
 printf %s\\n '<ul class="macro attachment list">'
-
-for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
-  [ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \
-        -a -f "$_DATA/pages/$page/#attachments/${file##*/}" ] && continue
-  stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue
+for glob in "$@"; do
+  page="${glob%/*}"
+  [ "$page" = "$glob" ] && page=./
+  [ ! "$page" ]         && page=/
+
+  acl_read "$(page_abs "${page}")" \
+  && attachment_glob "$glob"
+done \
+| while read attachment; do
+  case $attachment in
+    /*)
+      stat="$( stat -c '%s %Y' -- "$_DATA/pages/${attachment%/*}/#attachments/${attachment##*/}" \
+            || stat -c '%s %Y' -- "$_EXEC/pages/${attachment%/*}/#attachments/${attachment##*/}" \
+           2>&-)" || continue
+      ;;
+    *)
+      stat="$( stat -c '%s %Y' -- "$_DATA/pages/${PATH_INFO}/${attachment%/*}/#attachments/${attachment##*/}" \
+            || stat -c '%s %Y' -- "$_EXEC/pages/${PATH_INFO}/${attachment%/*}/#attachments/${attachment##*/}" \
+           2>&-)" || continue
+      ;;
+  esac
   size="${stat% *}" date="${stat#* }"
-
-  printf '<li><a class=name href="[attachment]/%s">%s</a>
+  printf '<li><a class=name href="%s">%s</a>
           <span class=size>%s</span><span class=date>%s</span></li>' \
-    "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" \
-    "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+         "$(HTML "${attachment%/*}/[attachment]/${attachment##*/}")" \
+         "$(HTML "${attachment#./}")" \
+         "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
 done
-
 printf %s\\n '</ul>'