From 5d78da0f309d4a912d2300f3f8ff6a6840706b1b Mon Sep 17 00:00:00 2001 From: Stephen Searles Date: Tue, 20 Jun 2017 16:57:13 -0700 Subject: [PATCH] adding some niceties for images --- media.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/media.go b/media.go index f34bf20..06e29e0 100644 --- a/media.go +++ b/media.go @@ -29,16 +29,16 @@ type Media struct { Name string } -func (ms *MediaSource) ThumbMax(m Media, maxDim int) (string, error) { +func (ms *MediaSource) ThumbMax(m Media, maxDim int) (string, int, int, error) { f, err := os.Open(ms.LocationOrig(m)) if err != nil { - return "", err + return "", 0, 0, err } defer f.Close() img, _, err := image.Decode(f) if err != nil { - return "", err + return "", 0, 0, err } rect := img.Bounds() @@ -53,7 +53,8 @@ func (ms *MediaSource) ThumbMax(m Media, maxDim int) (string, error) { height = maxDim } - return ms.ThumbImage(img, m, width, height) + src, err := ms.ThumbImage(img, m, width, height) + return src, width, height, err } func (ms *MediaSource) ByName(name string) *Media { @@ -128,7 +129,7 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int } io.WriteString(w, ` - + `) if ch.Media != nil { @@ -139,12 +140,12 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int } for _, m := range media { - src, err := ch.Media.ThumbMax(*m, 100) + src, width, height, err := ch.Media.ThumbMax(*m, 100) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return 500, nil } - fmt.Fprintf(w, "\n", src) + fmt.Fprintf(w, `

`, width, height, src, src) } } io.WriteString(w, ``) @@ -174,7 +175,7 @@ func (ch *CaddyHugo) serveMedia(w http.ResponseWriter, r *http.Request) (int, er return 400, nil } - file, err = ch.Media.ThumbMax(*m, max) + file, _, _, err = ch.Media.ThumbMax(*m, max) case 5: var width, height int width, err = strconv.Atoi(segs[3])