0 Votes

Changes for page AutoGallery

Last modified by Ryan C on 2025/06/17 16:30

From version 3.4
edited by Ryan C
on 2025/06/17 16:11
Change comment: There is no comment for this version
To version 3.2
edited by Ryan C
on 2025/06/17 16:10
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,29 +1,25 @@
1 -import java.util.stream.Collectors
2 -import org.xwiki.rendering.block.XDOM
1 +{{groovy}}
2 +def attachments = doc.getAttachmentList()
3 +def imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp']
3 3  
4 -def attachments = doc.getAttachmentList().findAll {
5 - it.filename.toLowerCase().matches('.*\\.(jpg|jpeg|png|gif)$')
5 +def images = attachments.findAll { att ->
6 + def ext = att.filename.toLowerCase().tokenize('.').last()
7 + imageExtensions.contains(ext)
6 6  }
7 7  
8 -if (attachments.isEmpty()) {
9 - def fallback = "{{html}}<div><em>No images available.</em></div>{{/html}}"
10 - def fallbackRendered = services.rendering.parse(fallback, xcontext.syntax).xdom
11 - wikimacro.result = fallbackRendered.children
12 - return
13 -}
10 +if (images) {
11 + def html = new StringBuilder()
12 + html << "<div style='display:flex; flex-wrap:wrap; gap:10px;'>"
13 + images.each { att ->
14 + def url = "${xwiki.getURL(doc.fullName, 'download', "filename=${att.filename}")}"
15 + html << "<img src='${url}' style='max-width:200px; height:auto; border:1px solid #ccc;'>"
16 + }
17 + html << "</div>"
14 14  
15 -def html = new StringBuilder()
16 -html << "{{html}}"
17 -html << "<div style='display:flex; flex-wrap:wrap; gap:10px;'>"
18 -
19 -attachments.each { attachment ->
20 - def url = "${doc.getExternalURL('download')}/${attachment.filename.encodeAsURL()}"
21 - html << "<img src='${url}' style='max-width:200px; height:auto; border:1px solid #ccc;'/>"
19 + def rendered = services.rendering.parse(html.toString(), xcontext.syntax)
20 + wikimacro.result = rendered.children
21 +} else {
22 + wikimacro.result = services.rendering.parse("<em>No images found.</em>", xcontext.syntax).children
22 22  }
24 +{{/groovy}}
23 23  
24 -html << "</div>"
25 -html << "{{/html}}"
26 -
27 -def rendered = services.rendering.parse(html.toString(), xcontext.syntax).xdom
28 -wikimacro.result = rendered.children
29 -