anidb: Try to get (*AniDB).User() from the cache if it's unset

[go-anidb.git] / titlecache.go

diff --git a/titlecache.go b/titlecache.go
index d32175e7e29e98b16eb04c498e426205436d8a7b..a69a5e458ea92fc135b93b770f616ac8e641fd11 100644 (file)
--- a/titlecache.go
+++ b/titlecache.go
@@ -1,9 +1,12 @@
 package anidb
 
 import (
+       "bytes"
        "github.com/Kovensky/go-anidb/titles"
        "io"
+       "log"
        "net/http"
+       "os"
        "time"
 )
 
@@ -11,12 +14,13 @@ var titlesDB = &titles.TitlesDatabase{}
 
 // Loads the database from anime-titles.dat.gz in the cache dir.
 func RefreshTitles() error {
-       if flock := lockFile(cachePath("anime-titles.dat.gz")); flock != nil {
-               flock.Lock()
-               defer flock.Unlock()
+       if lock, err := Cache.Lock("anime-titles.dat.gz"); err != nil {
+               return err
+       } else {
+               defer lock.Unlock()
        }
 
-       fh, err := cache.Open("anime-titles.dat.gz")
+       fh, err := Cache.Open("anime-titles.dat.gz")
        if err != nil {
                return err
        }
@@ -40,28 +44,47 @@ func UpdateTitles() error {
                return nil
        }
 
-       if flock := lockFile(cachePath("anime-titles.dat.gz")); flock != nil {
-               flock.Lock()
-               defer flock.Unlock()
+       switch lock, err := Cache.Lock("anime-titles.dat.gz"); {
+       case os.IsNotExist(err):
+               // we're creating it now
+       case err == nil:
+               defer lock.Unlock()
+       default:
+               return err
        }
 
        c := &http.Client{Transport: &http.Transport{DisableCompression: true}}
 
+       log.Printf("HTTP>>> %s", titles.DataDumpURL)
+
        resp, err := c.Get(titles.DataDumpURL)
        if err != nil {
+               log.Printf("HTTP<<< %s", resp.Status)
                return err
        }
        defer resp.Body.Close()
 
-       fh, err := cache.Create("anime-titles.dat.gz")
+       buf := bytes.Buffer{}
+       log.Printf("HTTP--- %s", resp.Status)
+
+       _, err = io.Copy(&buf, resp.Body)
+       if err != nil {
+               log.Printf("HTTP--- %v", err)
+               return err
+       }
+
+       fh, err := Cache.Create("anime-titles.dat.gz")
        if err != nil {
                return err
        }
 
-       _, err = io.Copy(fh, resp.Body)
+       _, err = io.Copy(fh, &buf)
        if err != nil {
                return err
        }
 
+       defer func() {
+               log.Printf("HTTP<<< Titles version %s", titlesDB.UpdateTime)
+       }()
        return RefreshTitles()
 }