Improve gallery rendering, make archive creation parallel
This commit is contained in:
+12
-21
@@ -33,24 +33,14 @@ class LGallery {
|
||||
}, params.lgConfig))
|
||||
this.items = params.items
|
||||
|
||||
let timeout
|
||||
window.addEventListener('scroll', () => {
|
||||
if (timeout) clearTimeout(timeout)
|
||||
timeout = setTimeout(lgallery.handleScroll, 100)
|
||||
})
|
||||
lgallery.handleScroll()
|
||||
}
|
||||
|
||||
/**
|
||||
* Listen for scroll events and load more gallery items
|
||||
*/
|
||||
handleScroll () {
|
||||
const rect = lgallery.element.getBoundingClientRect()
|
||||
const scrollPosition = Math.max(0, rect.bottom - window.innerHeight)
|
||||
const buffer = 200 // pixels before bottom to trigger load
|
||||
|
||||
if (scrollPosition <= buffer) {
|
||||
lgallery.loadMoreItems()
|
||||
const spinner = document.getElementById('loading-spinner')
|
||||
if (spinner) {
|
||||
const observer = new IntersectionObserver((entries) => {
|
||||
if (entries[0].isIntersecting) {
|
||||
lgallery.loadMoreItems(observer, spinner)
|
||||
}
|
||||
}, { rootMargin: '200px' })
|
||||
observer.observe(spinner)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +48,7 @@ class LGallery {
|
||||
* Load more gallery items as per lightGallery docs
|
||||
* https://www.lightgalleryjs.com/demos/infinite-scrolling/
|
||||
*/
|
||||
loadMoreItems () {
|
||||
loadMoreItems (observer, spinner) {
|
||||
if (this.index < this.items.length) {
|
||||
// Append new thumbnails
|
||||
this.items
|
||||
@@ -69,8 +59,9 @@ class LGallery {
|
||||
this.index += PER_PAGE
|
||||
this.lightGallery.refresh()
|
||||
} else {
|
||||
// Remove the loading spinner once all items are loaded
|
||||
document.getElementById('loading-spinner')?.remove()
|
||||
// Remove the loading spinner and stop observing once all items are loaded
|
||||
observer.disconnect()
|
||||
spinner.remove()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -142,7 +142,7 @@ class Render {
|
||||
video ? `<a data-video='${video}'` : `<a href="${previewUrl}"`,
|
||||
downloadUrl ? ` data-download-url="${downloadUrl}"` : '',
|
||||
description ? ` data-sub-html='<p>${description}</p>'` : '',
|
||||
` data-download="${this.getFilename(asset)}" data-slide-name="${asset.id}"><img alt="" src="${thumbnailUrl}"/>`,
|
||||
` data-download="${this.getFilename(asset)}" data-slide-name="${asset.id}"><img alt="${description}" loading="lazy" src="${thumbnailUrl}"/>`,
|
||||
video ? '<div class="play-icon"></div>' : '',
|
||||
'</a>'
|
||||
].join('')
|
||||
@@ -191,7 +191,7 @@ class Render {
|
||||
res.setHeader('Content-Disposition', `attachment; filename*=UTF-8''${filename}`)
|
||||
const archive = archiver('zip', { zlib: { level: 6 } })
|
||||
archive.pipe(res)
|
||||
for (const asset of share.assets) {
|
||||
await Promise.all(share.assets.map(async (asset) => {
|
||||
const url = immich.buildUrl(immich.apiUrl() + '/assets/' + encodeURIComponent(asset.id) + '/original', {
|
||||
key: asset.key,
|
||||
password: asset.password
|
||||
@@ -200,10 +200,10 @@ class Render {
|
||||
// Check the response for validity
|
||||
if (!data.ok) {
|
||||
console.warn(`Failed to fetch asset: ${asset.id}`)
|
||||
continue
|
||||
return
|
||||
}
|
||||
archive.append(Buffer.from(await data.arrayBuffer()), { name: this.getFilename(asset) })
|
||||
}
|
||||
}))
|
||||
await archive.finalize()
|
||||
archive.on('end', () => res.end())
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title><%= title %></title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<%
|
||||
// Add an og-image using the first image's thumbnail
|
||||
if (items?.[0]?.previewUrl) {
|
||||
@@ -44,7 +44,7 @@
|
||||
%><%- item.html %>
|
||||
<% }) %>
|
||||
</div>
|
||||
<div id="loading-spinner"><span class="loader"></span></div>
|
||||
<% if (items.length > 50) { %><div id="loading-spinner"><span class="loader"></span></div><% } %>
|
||||
<script src="/share/static/web.js"></script>
|
||||
<script src="/share/static/lg/lightgallery.min.js"></script>
|
||||
<script src="/share/static/lg/lg-fullscreen.min.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user