Diffstat (limited to 'internal/glightbox/html_renderer.go')
| -rw-r--r-- | internal/glightbox/html_renderer.go | 91 |
1 files changed, 37 insertions, 54 deletions
diff --git a/internal/glightbox/html_renderer.go b/internal/glightbox/html_renderer.go index 1bb606b..b7b256a 100644 --- a/internal/glightbox/html_renderer.go +++ b/internal/glightbox/html_renderer.go @@ -8,7 +8,6 @@ import ( "strings" "time" - "github.com/SayaAndy/saya-today-web/config" "github.com/SayaAndy/saya-today-web/internal/tailwind" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" @@ -22,10 +21,9 @@ type GLightboxHTMLRenderer struct { html.Config md goldmark.Markdown anchorMatchRe *regexp.Regexp - photoStorage config.PhotoStorageConfig } -func NewGLightboxHTMLRenderer(photoStorage config.PhotoStorageConfig, opts ...html.Option) renderer.NodeRenderer { +func NewGLightboxHTMLRenderer(opts ...html.Option) renderer.NodeRenderer { r := &GLightboxHTMLRenderer{ Config: html.NewConfig(), md: goldmark.New( @@ -46,12 +44,11 @@ func NewGLightboxHTMLRenderer(photoStorage config.PhotoStorageConfig, opts ...ht ), ), ), - anchorMatchRe: regexp.MustCompile(`(?s)<\s*a(\s+[^<]*)(href\s*=\s*["'].*?["'])\s*([^<]*)>(.*?)<\s*\/\s*a\s*>`), - photoStorage: photoStorage, } for _, opt := range opts { opt.SetHTMLOption(&r.Config) } + r.anchorMatchRe = regexp.MustCompile(`(?s)<\s*a(\s+[^<]*)(href\s*=\s*["'].*?["'])\s*([^<]*)>(.*?)<\s*\/\s*a\s*>`) return r } @@ -71,8 +68,7 @@ func (r *GLightboxHTMLRenderer) renderGLightbox(w util.BufWriter, source []byte, var elements []string for i, img := range gallery.Images { - fullImageUrl := gallery.Namespace + img.URL - imageUrlSegments := strings.Split(fullImageUrl, ".") + imageUrlSegments := strings.Split(img.URL, ".") imageUrlWithoutExt := strings.Join(imageUrlSegments[:len(imageUrlSegments)-1], ".") imageUrlParts := strings.Split(imageUrlWithoutExt, "/") imageNameParts := strings.Split(imageUrlParts[len(imageUrlParts)-1], "-") @@ -114,32 +110,19 @@ func (r *GLightboxHTMLRenderer) renderGLightbox(w util.BufWriter, source []byte, anchorlessCaptionHTML := r.anchorMatchRe.ReplaceAll(captionHTML, []byte("<span class=\"linklike\" $1 $3>$4</span>")) elements = append(elements, fmt.Sprintf(` - <a href="%[7]s" class="glightbox grid-item %[1]s grid-item-%[2]s p-1" - data-gallery="gallery" data-title="%[3]s" %[4]s> + <a href="https://f003.backblazeb2.com/file/sayana-photos/full/%s" class="glightbox grid-item %s grid-item-%s p-1" + data-gallery="gallery" data-title="%s" %s> <picture> - <source media="(width < 800px)" srcset="%[8]s" /> - <source media="(width < 2400px)" srcset="%[9]s" /> - <source media="(width < 3200px)" srcset="%[10]s" /> - <source media="(width < 4000px)" srcset="%[11]s" /> - <source media="(width >= 4000px)" srcset="%[12]s" /> - <img src="%[9]s" /> + <source media="(width < 800px)" srcset="https://f003.backblazeb2.com/file/sayana-photos/webp-320p/%s.webp" /> + <source media="(width < 2400px)" srcset="https://f003.backblazeb2.com/file/sayana-photos/webp-560p/%s.webp" /> + <source media="(width < 3200px)" srcset="https://f003.backblazeb2.com/file/sayana-photos/webp-800p/%s.webp" /> + <source media="(width < 4000px)" srcset="https://f003.backblazeb2.com/file/sayana-photos/webp-1200p/%s.webp" /> + <source media="(width >= 4000px)" srcset="https://f003.backblazeb2.com/file/sayana-photos/webp-1600p/%s.webp" /> + <img src="https://f003.backblazeb2.com/file/sayana-photos/webp-560p/%s.webp" /> </picture> - <span class="grid-tooltip-text"><p>%[5]s</p></span> - <span class="grid-item-index">%[6]d</span> - </a>`, - strings.Join(tagClassList, " "), - galleryID, - dayDate.Format("2006-01-02 15:04:05 -07:00"), - dataDescriptionAttribute, - anchorlessCaptionHTML, - i+1, - fmt.Sprintf(r.photoStorage.Full.BaseUrl, fullImageUrl), - fmt.Sprintf(r.photoStorage.Thumbnail1600p.BaseUrl, imageUrlWithoutExt), - fmt.Sprintf(r.photoStorage.Thumbnail1200p.BaseUrl, imageUrlWithoutExt), - fmt.Sprintf(r.photoStorage.Thumbnail800p.BaseUrl, imageUrlWithoutExt), - fmt.Sprintf(r.photoStorage.Thumbnail560p.BaseUrl, imageUrlWithoutExt), - fmt.Sprintf(r.photoStorage.Thumbnail320p.BaseUrl, imageUrlWithoutExt), - )) + <span class="grid-tooltip-text"><p>%s</p></span> + <span class="grid-item-index">%d</span> + </a>`, img.URL, strings.Join(tagClassList, " "), galleryID, dayDate.Format("2006-01-02 15:04:05 -07:00"), dataDescriptionAttribute, imageUrlWithoutExt, imageUrlWithoutExt, imageUrlWithoutExt, imageUrlWithoutExt, imageUrlWithoutExt, imageUrlWithoutExt, anchorlessCaptionHTML, i+1)) if glightboxDescId != "" { elements = append(elements, fmt.Sprintf(` @@ -149,43 +132,43 @@ func (r *GLightboxHTMLRenderer) renderGLightbox(w util.BufWriter, source []byte, } } - w.WriteString(strings.ReplaceAll(` + w.WriteString(fmt.Sprintf(` <div class="items-center flex flex-col"> - <hr class="border-t-[0.375rem] border-dotted border-main-hard my-2 w-24 ml-auto mr-auto"> - <div class="grid masonry-grid-{id}"> - <div class="grid-sizer grid-sizer-{id}"></div> - `+strings.Join(elements, "\n")+` + <hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%%] ml-auto mr-auto"> + <div class="grid masonry-grid-%s"> + <div class="grid-sizer grid-sizer-%s"></div> + %s </div> - <hr class="border-t-[0.375rem] border-dotted border-main-hard my-2 w-24 ml-auto mr-auto"> -</div> + <hr class="border-t-3 border-dotted border-main-hard mt-1 mb-2 w-[80%%] ml-auto mr-auto"> +</div>`, galleryID, galleryID, strings.Join(elements, "\n"))) + w.WriteString(fmt.Sprintf(` <script> - var pckry_{id} = new Packery('.masonry-grid-{id}', { - itemSelector: '.grid-item-{id}', - columnWidth: '.grid-sizer-{id}', + var pckry_%s = new Packery('.masonry-grid-%s', { + itemSelector: '.grid-item-%s', + columnWidth: '.grid-sizer-%s', percentPosition: false }); - var imgLoad_{id}_timer; - var imgLoad_{id} = imagesLoaded('.masonry-grid-{id}'); + var imgLoad_%s_timer; + var imgLoad_%s = imagesLoaded('.masonry-grid-%s'); - function initMasonryLayout_{id}(tm) { - clearTimeout(imgLoad_{id}_timer); - imgLoad_{id}_timer = setTimeout(() => pckry_{id}.layout(), 100); + function initMasonryLayout_%s(tm) { + clearTimeout(imgLoad_%s_timer); + imgLoad_%s_timer = setTimeout(() => pckry_%s.layout(), 100); } - imgLoad_{id}.on('progress', initMasonryLayout_{id}); + imgLoad_%s.on('progress', initMasonryLayout_%s); - window.addEventListener('resize', initMasonryLayout_{id}); + window.addEventListener('resize', initMasonryLayout_%s); document.addEventListener('popout', (e) => { - window.removeEventListener('resize', initMasonryLayout_{id}); - imgLoad_{id}.off('progress', initMasonryLayout_{id}); - initMasonryLayout_{id} = null; - imgLoad_{id} = null; + window.removeEventListener('resize', initMasonryLayout_%s); + imgLoad_%s.off('progress', initMasonryLayout_%s); + initMasonryLayout_%s = null; + imgLoad_%s = null; }, {once: true}); -</script> -`, "{id}", galleryID)) +</script>`, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID, galleryID)) } return ast.WalkContinue, nil |