anidb: New caching mechanism

[go-anidb.git] / titlecache.go

diff --git a/titlecache.go b/titlecache.go
index 26a2fd48166467c7c2dcb053f3dfa398350c87c9..1100df085bc1eed4c4fa23863821e7529ce8dc7a 100644 (file)
--- a/titlecache.go
+++ b/titlecache.go
@@ -1,44 +1,30 @@
 package anidb
 
 import (
-       "bytes"
        "github.com/Kovensky/go-anidb/titles"
        "io"
        "net/http"
-       "sync"
        "time"
 )
 
-var titlesFileData []byte
-var titlesFileDataLock sync.Mutex
 var titlesDB = &titles.TitlesDatabase{}
 
-// Loads the anime-titles database from the given io.Reader.
-//
-// Caches the io.Reader's contents on memory, which gets saved
-// by DumpCaches.
-func LoadTitles(src io.Reader) error {
-       buf := bytes.Buffer{}
-       _, err := io.Copy(&buf, src)
-       if err != nil && err != io.EOF {
+// Reloads titles from the cache.
+func RefreshTitles() error {
+       flock := lockFile(cachePath("anime-titles.dat.gz"))
+       flock.Lock()
+       defer flock.Unlock()
+
+       fh, err := cache.Open("anime-titles.dat.gz")
+       if err != nil {
                return err
        }
+       defer fh.Close()
 
-       titlesFileDataLock.Lock()
-       defer titlesFileDataLock.Unlock()
-
-       titlesFileData = buf.Bytes()
-
-       titlesDB.LoadDB(bytes.NewReader(titlesFileData))
-
+       titlesDB.LoadDB(fh)
        return nil
 }
 
-// Saves the currently cached anime-titles database to the given io.Writer.
-func DumpTitles(dst io.Writer) (int64, error) {
-       return io.Copy(dst, bytes.NewReader(titlesFileData))
-}
-
 // Returns true if the titles database is up-to-date (newer than 24 hours).
 func TitlesUpToDate() (ok bool) {
        return time.Now().Sub(titlesDB.UpdateTime) < 24*time.Hour
@@ -53,11 +39,27 @@ func UpdateTitles() error {
                return nil
        }
 
-       resp, err := http.Get(titles.DataDumpURL)
+       flock := lockFile(cachePath("anime-titles.dat.gz"))
+       flock.Lock()
+       defer flock.Unlock()
+
+       c := &http.Client{Transport: &http.Transport{DisableCompression: true}}
+
+       resp, err := c.Get(titles.DataDumpURL)
        if err != nil {
                return err
        }
        defer resp.Body.Close()
 
-       return LoadTitles(resp.Body)
+       fh, err := cache.Create("anime-titles.dat.gz")
+       if err != nil {
+               return err
+       }
+
+       _, err = io.Copy(fh, resp.Body)
+       if err != nil {
+               return err
+       }
+
+       return RefreshTitles()
 }