use LRU cache package

Thumbnailer.go

@@ -2,53 +2,49 @@ package thumbnail
 
 import (
 	"fmt"
-	"image"
 	"image/jpeg"
 	"image/png"
 	"os"
 	"strings"
-	"sync"
+
+	lru "github.com/hashicorp/golang-lru"
 )
 
 type Thumbnailer struct {
-	Width        int
+	Width  int
-	Height       int
+	Height int
-	MaxCacheSize int
 
-	cacheMtx   sync.RWMutex
+	thumbCache *lru.Cache // threadsafe
-	thumbCache map[string][]byte
 }
 
-func NewThumbnailer() *Thumbnailer {
+func NewThumbnailer(Width, Height, MaxCacheSize int) *Thumbnailer {
+	thumbCache, err := lru.New(MaxCacheSize)
+	if err != nil {
+		panic(err)
+	}
+
 	return &Thumbnailer{
-		Width:        100,
+		Width:      Width,
-		Height:       100,
+		Height:     Height,
-		MaxCacheSize: 10,
+		thumbCache: thumbCache,
-		thumbCache:   make(map[string][]byte, 0),
 	}
 }
 
 func (this *Thumbnailer) RenderFile(absPath string) ([]byte, error) {
-	this.cacheMtx.RLock()
-	tcache, ok := this.thumbCache[absPath]
-	this.cacheMtx.RUnlock()
 
+	thumb, ok := this.thumbCache.Get(absPath)
 	if ok {
-		return tcache, nil
+		return thumb.([]byte), nil
 	}
 
 	// Add to cache
-	tcache, err := this.RenderFile_NoCache(absPath)
+	thumb, err := this.RenderFile_NoCache(absPath)
 	if err != nil {
 		return nil, err
 	}
 
-	this.cacheMtx.Lock()
+	this.thumbCache.Add(absPath, thumb)
-	// FIXME prune old cached thumbnails
+	return thumb.([]byte), nil
-	this.thumbCache[absPath] = tcache
-	this.cacheMtx.Unlock()
-
-	return tcache, nil
 }
 
 func (this *Thumbnailer) RenderFile_NoCache(absPath string) ([]byte, error) {