Add cache for initial unsplash collection
This commit is contained in:
parent
250c45d1b9
commit
ad67154e26
1 changed files with 23 additions and 0 deletions
|
@ -28,6 +28,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Provider represents an unsplash image provider
|
// Provider represents an unsplash image provider
|
||||||
|
@ -71,6 +72,15 @@ type Photo struct {
|
||||||
// FIXME: Should use a proper cache
|
// FIXME: Should use a proper cache
|
||||||
var photos map[string]*Photo
|
var photos map[string]*Photo
|
||||||
|
|
||||||
|
// We're caching the initial collection to save a few api requests as this is retrieved every time a
|
||||||
|
// user opens the settings page.
|
||||||
|
type initialCollection struct {
|
||||||
|
lastCached time.Time
|
||||||
|
images []*background.Image
|
||||||
|
}
|
||||||
|
|
||||||
|
var emptySearchResult *initialCollection
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
photos = make(map[string]*Photo)
|
photos = make(map[string]*Photo)
|
||||||
}
|
}
|
||||||
|
@ -119,6 +129,14 @@ func (p *Provider) Search(search string, page int64) (result []*background.Image
|
||||||
|
|
||||||
// If we don't have a search query, return results from the unsplash featured collection
|
// If we don't have a search query, return results from the unsplash featured collection
|
||||||
if search == "" {
|
if search == "" {
|
||||||
|
|
||||||
|
if emptySearchResult != nil && time.Since(emptySearchResult.lastCached) < time.Minute {
|
||||||
|
log.Debugf("Serving intial unsplash collection from cache, last updated at %v", emptySearchResult.lastCached)
|
||||||
|
return emptySearchResult.images, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debug("Retrieving initial unsplash collection from unsplash api")
|
||||||
|
|
||||||
collectionResult := []*Photo{}
|
collectionResult := []*Photo{}
|
||||||
err = doGet("collections/317099/photos?page="+strconv.FormatInt(page, 10)+"&per_page=25&order_by=latest", &collectionResult)
|
err = doGet("collections/317099/photos?page="+strconv.FormatInt(page, 10)+"&per_page=25&order_by=latest", &collectionResult)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -138,6 +156,11 @@ func (p *Provider) Search(search string, page int64) (result []*background.Image
|
||||||
})
|
})
|
||||||
photos[p.ID] = p
|
photos[p.ID] = p
|
||||||
}
|
}
|
||||||
|
|
||||||
|
emptySearchResult = &initialCollection{
|
||||||
|
lastCached: time.Now(),
|
||||||
|
images: result,
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue