Modernize

[go-anidb.git] / anidb.go

diff --git a/anidb.go b/anidb.go
index bb0d65846ba51572601b8c0959afa3bab7a37179..aa30395f52f349b8c04a0fc50b63794170a474cd 100644 (file)
--- a/anidb.go
+++ b/anidb.go
@@ -2,6 +2,8 @@
 package anidb
 
 import (
+       "io/ioutil"
+       "log"
        "time"
 )
 
@@ -19,16 +21,19 @@ import (
 // by a previous Auth() call.
 type AniDB struct {
        Timeout time.Duration // Timeout for the various calls (default: 45s)
+       Logger  *log.Logger   // Logger where HTTP/UDP traffic is logged
 
        udp *udpWrap
 }
 
 // Initialises a new AniDB.
 func NewAniDB() *AniDB {
-       return &AniDB{
+       ret := &AniDB{
                Timeout: 45 * time.Second,
-               udp:     newUDPWrap(),
+               Logger:  log.New(ioutil.Discard, "", log.LstdFlags),
        }
+       ret.udp = newUDPWrap(ret)
+       return ret
 }
 
 func (adb *AniDB) User() *User {
@@ -36,8 +41,13 @@ func (adb *AniDB) User() *User {
                if adb.udp.user != nil {
                        return adb.udp.user
                } else if adb.udp.credentials != nil {
-                       // see if we can get it from the cache
+                       // see if we can get it from the cache (we don't care if it's stale)
                        adb.udp.user = UserByName(decrypt(adb.udp.credentials.username))
+                       if adb.udp.user != nil {
+                               return adb.udp.user
+                       }
+                       // we have to go through the slow path
+                       adb.udp.user = <-adb.GetUserByName(decrypt(adb.udp.credentials.username))
                        return adb.udp.user
                }
        }