media/media.go

@@ -28,15 +28,6 @@ type MediaSource struct {
 	set Set
 }
 
-type Media struct {
-	Type     string
-	Name     string
-	Size     image.Rectangle
-	FullName string
-
-	metadata *metadata.Metadata
-}
-
 func (ms *MediaSource) LocationOrig(m Media) string {
 	return path.Join(ms.StorageDir, m.Name)
 }
@@ -79,6 +70,15 @@ func (ms *MediaSource) ReceiveNewMedia(name string, r io.Reader) error {
 	return f.Close()
 }
 
+type Media struct {
+	Type     string
+	Name     string
+	Size     image.Rectangle
+	FullName string
+
+	metadata *metadata.Metadata
+}
+
 func (m *Media) Date() time.Time {
 	m.getMetadata()
 
@@ -168,16 +168,18 @@ func (ms *MediaSource) ThumbMax(m Media, maxDim int) (string, image.Rectangle, e
 		return "", image.ZR, err
 	}
 
-	src, err := ms.thumbReader(f, m, size)
+	img, _, err := image.Decode(f)
+	if err != nil {
+		return "", image.ZR, err
+	}
+
+	src, err := ms.ThumbImage(img, m, size)
 	return src, size, err
 }
 
 func (ms *MediaSource) HasThumb(m Media, size image.Rectangle) bool {
-	fi, err := os.Stat(ms.ThumbFilename(m, size))
-	if err != nil {
-		return false
-	}
-	return m.Date().Before(fi.ModTime())
+	_, err := os.Stat(ms.ThumbFilename(m, size))
+	return err == nil
 }
 
 func (ms *MediaSource) ByName(name string) *Media {
@@ -202,11 +204,7 @@ func (ms *MediaSource) Thumb(m Media, size image.Rectangle) (string, error) {
 	}
 	defer f.Close()
 
-	return ms.thumbReader(f, m, size)
-}
-
-func (ms *MediaSource) thumbReader(r io.Reader, m Media, size image.Rectangle) (string, error) {
-	img, _, err := image.Decode(r)
+	img, _, err := image.Decode(f)
 	if err != nil {
 		return "", err
 	}
@@ -215,6 +213,7 @@ func (ms *MediaSource) thumbReader(r io.Reader, m Media, size image.Rectangle) (
 }
 
 func (ms *MediaSource) ThumbImage(img image.Image, m Media, size image.Rectangle) (string, error) {
+
 	thumbLoc := ms.ThumbFilename(m, size)
 	os.MkdirAll(path.Dir(thumbLoc), 0755)
 	fthumb, err := os.OpenFile(thumbLoc, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0655)

setup.go

@@ -3,6 +3,7 @@ package caddyhugo
 import (
 	"fmt"
 	"html/template"
+	"io/ioutil"
 	"os"
 	"path"
 
@@ -89,9 +90,14 @@ func (ch *CaddyHugo) Setup(dir string) error {
 		return fmt.Errorf("edit template invalid: %v", err)
 	}
 
+	thumbDir, err := ioutil.TempDir("", "thumbs")
+	if err != nil {
+		return fmt.Errorf("couldn't initialize media: %v", err)
+	}
+
 	ch.Media = &media.MediaSource{
 		StorageDir: path.Join(dir, "media"),
-		ThumbDir:   path.Join(dir, "thumbs"),
+		ThumbDir:   thumbDir,
 	}
 
 	err = os.MkdirAll(ch.Media.StorageDir, 0755)