mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpl/data: Move cache logic to separate file

Browse Source
This commit is contained in:
Cameron Moore
2017-05-01 14:08:46 -05:00
committed by Bjørn Erik Pedersen
parent 5f095c27ea
commit 1cf2f3dc4f
2 changed files with 83 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
tpl/data/resources.go
View File

@@ -20,7 +20,6 @@ import (
"errors"
"io/ioutil"
"net/http"
"net/url"
"path/filepath"
"strings"
"sync"
@@ -36,7 +35,6 @@ var (
remoteURLLock = &remoteLock{m: make(map[string]*sync.Mutex)}
resSleep = time.Second * 2 // if JSON decoding failed sleep for n seconds before retrying
resRetries = 1 // number of retries to load the JSON from URL or local file system
resCacheMu sync.RWMutex
)
type remoteLock struct {
@@ -68,63 +66,6 @@ func (l *remoteLock) URLUnlock(url string) {
}
}
// getCacheFileID returns the cache ID for a string.
func getCacheFileID(cfg config.Provider, id string) string {
return cfg.GetString("cacheDir") + url.QueryEscape(id)
}
// getCache returns the content for an ID from the file cache or an error.
// If the ID is not found, return nil,nil.
func getCache(id string, fs afero.Fs, cfg config.Provider, ignoreCache bool) ([]byte, error) {
if ignoreCache {
return nil, nil
}
resCacheMu.RLock()
defer resCacheMu.RUnlock()
fID := getCacheFileID(cfg, id)
isExists, err := helpers.Exists(fID, fs)
if err != nil {
return nil, err
}
if !isExists {
return nil, nil
}
return afero.ReadFile(fs, fID)
}
// writeCache writes bytes associated with an ID into the file cache.
func writeCache(id string, c []byte, fs afero.Fs, cfg config.Provider, ignoreCache bool) error {
if ignoreCache {
return nil
}
resCacheMu.Lock()
defer resCacheMu.Unlock()
fID := getCacheFileID(cfg, id)
f, err := fs.Create(fID)
if err != nil {
return errors.New("Error: " + err.Error() + ". Failed to create file: " + fID)
}
defer f.Close()
n, err := f.Write(c)
if err != nil {
return errors.New("Error: " + err.Error() + ". Failed to write to file: " + fID)
}
if n == 0 {
return errors.New("No bytes written to file: " + fID)
}
return nil
}
func deleteCache(id string, fs afero.Fs, cfg config.Provider) error {
return fs.Remove(getCacheFileID(cfg, id))
}
// getRemote loads the content of a remote file. This method is thread safe.
func getRemote(url string, fs afero.Fs, cfg config.Provider, hc *http.Client) ([]byte, error) {
c, err := getCache(url, fs, cfg, cfg.GetBool("ignoreCache"))