1 files changed, 23 insertions, 12 deletions
diff --git a/internal/lightgallery/parser.go b/internal/lightgallery/parser.go
index 0ce209c..daec797 100644
--- a/internal/lightgallery/parser.go
+++ b/internal/lightgallery/parser.go
@@ -2,7 +2,9 @@ package lightgallery
 
 import (
 	"bytes"
-	"strings"
+	"log/slog"
+	"regexp"
+	"time"
 
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/parser"
@@ -22,43 +24,52 @@ func (p *LightGalleryParser) Trigger() []byte {
 func (p *LightGalleryParser) Open(parent ast.Node, reader text.Reader, pc parser.Context) (ast.Node, parser.State) {
 	line, _ := reader.PeekLine()
 
-	if !bytes.HasPrefix(line, []byte("{Gallery}")) {
+	if !bytes.HasPrefix(line, []byte("{Gallery:")) {
 		return nil, parser.NoChildren
 	}
 
+	r := regexp.MustCompile(`^\{Gallery:([A-Za-z0-9\+\-/]+)\}$`)
+
 	trimmed := bytes.TrimSpace(line)
-	if !bytes.Equal(trimmed, []byte("{Gallery}")) {
+	parts := r.FindSubmatch(trimmed)
+	if len(parts) < 2 {
+		slog.Warn("invalid gallery header format", slog.String("line", string(trimmed)), slog.Int("submatch_count", len(parts)))
 		return nil, parser.NoChildren
 	}
 
-	return &LightGalleryBlock{}, parser.NoChildren
+	loc, err := time.LoadLocation(string(parts[1]))
+	if err != nil {
+		slog.Warn("invalid location specified for a gallery", slog.String("error", err.Error()), slog.String("line", string(trimmed)), slog.String("location", string(parts[1])))
+		return nil, parser.NoChildren
+	}
+
+	return &LightGalleryBlock{Location: loc}, parser.NoChildren
 }
 
 func (p *LightGalleryParser) Continue(node ast.Node, reader text.Reader, pc parser.Context) parser.State {
 	line, segment := reader.PeekLine()
 	if len(line) == 0 || segment.Len() == 0 {
-		return parser.Close
+		return parser.Continue | parser.NoChildren
 	}
 
 	trimmed := bytes.TrimSpace(line)
-	if bytes.Equal(trimmed, []byte("{Gallery}")) {
+	if bytes.Equal(trimmed, []byte("{Gallery}")) || bytes.Equal(trimmed, []byte("{/Gallery}")) {
 		reader.AdvanceLine()
 		return parser.Close
 	}
 
 	gallery := node.(*LightGalleryBlock)
-	lineStr := string(trimmed)
 
-	parts := strings.SplitN(lineStr, "|", 2)
-	url := strings.TrimSpace(parts[0])
-	caption := ""
+	parts := bytes.SplitN(trimmed, []byte{'|'}, 2)
+	url := bytes.TrimSpace(parts[0])
 
+	caption := make([]byte, 0)
 	if len(parts) > 1 {
-		caption = strings.TrimSpace(parts[1])
+		caption = bytes.TrimSpace(parts[1])
 	}
 
 	gallery.Images = append(gallery.Images, LightGalleryImage{
-		URL:     url,
+		URL:     string(url),
 		Caption: caption,
 	})