hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-06-28 20:37:46 +02:00
Code Issues Projects Releases Wiki Activity

added user caching with 30m timeout

Browse Source
This commit is contained in:
Harvey Tindall 2020-08-16 16:08:37 +01:00
parent 252e13757b
commit 8750efe101
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jfapi.go
View File

@ -37,6 +37,9 @@ type Jellyfin struct {
userId string userId string
httpClient *http.Client httpClient *http.Client
loginParams map[string]string loginParams map[string]string
userCache []map[string]interface{}
cacheExpiry time.Time
cacheLength int
} }
func (jf *Jellyfin) timeoutHandler() { func (jf *Jellyfin) timeoutHandler() {
@ -73,6 +76,8 @@ func (jf *Jellyfin) init(server, client, version, device, deviceId string) error
data, _ := ioutil.ReadAll(resp.Body) data, _ := ioutil.ReadAll(resp.Body)
json.Unmarshal(data, &jf.serverInfo) json.Unmarshal(data, &jf.serverInfo)
} }
jf.cacheLength = 30
jf.cacheExpiry = time.Now()
return nil return nil
} }
@ -199,20 +204,24 @@ func (jf *Jellyfin) getUsers(public bool) ([]map[string]interface{}, int, error)
var data io.Reader var data io.Reader
var status int var status int
var err error var err error
if public { if time.Now().After(jf.cacheExpiry) {
url := fmt.Sprintf("%s/emby/Users/Public", jf.server) if public {
data, status, err = jf._getReader(url, nil) url := fmt.Sprintf("%s/emby/Users/Public", jf.server)
data, status, err = jf._getReader(url, nil)
} else { } else {
url := fmt.Sprintf("%s/emby/Users", jf.server) url := fmt.Sprintf("%s/emby/Users", jf.server)
data, status, err = jf._getReader(url, jf.loginParams) data, status, err = jf._getReader(url, jf.loginParams)
}
if err != nil || status != 200 {
return nil, status, err
}
json.NewDecoder(data).Decode(&result)
jf.userCache = result
jf.cacheExpiry = time.Now().Add(time.Minute * time.Duration(jf.cacheLength))
return result, status, nil
} }
if err != nil || status != 200 { return jf.userCache, 200, nil
return nil, status, err
}
json.NewDecoder(data).Decode(&result)
return result, status, nil
} }
func (jf *Jellyfin) userByName(username string, public bool) (map[string]interface{}, int, error) { func (jf *Jellyfin) userByName(username string, public bool) (map[string]interface{}, int, error) {
@ -229,6 +238,13 @@ func (jf *Jellyfin) userByName(username string, public bool) (map[string]interfa
} }
func (jf *Jellyfin) userById(userId string, public bool) (map[string]interface{}, int, error) { func (jf *Jellyfin) userById(userId string, public bool) (map[string]interface{}, int, error) {
if jf.cacheExpiry.After(time.Now()) {
for _, user := range jf.userCache {
if user["Id"].(string) == userId {
return user, 200, nil
}
}
}
if public { if public {
users, status, err := jf.getUsers(public) users, status, err := jf.getUsers(public)
if err != nil || status != 200 { if err != nil || status != 200 {