Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI flags, start setting up goreleaser, add build scripts

Browse Source 
Copied and fixed the build scripts from jf-accounts, added them to the
.goreleaser.yml. Also:
data directory now stored in user's config folder
Handle timeouts in jfapi
Maybe more i forgot about.
This commit is contained in:
Harvey Tindall
2020-08-01 21:20:02 +01:00
parent c4d4b395d5
commit 62621dabb9
31 changed files with 3241 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jfapi.go
+17 -3
View File
@@ -7,6 +7,7 @@ import (
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"time"
)
@@ -34,10 +35,16 @@ type Jellyfin struct {
authenticated bool
accessToken string
userId string
httpClient http.Client
httpClient *http.Client
loginParams map[string]string
}
func (jf *Jellyfin) timeoutHandler() {
if r := recover(); r != nil {
log.Fatalf("Failed to authenticate with Jellyfin @ %s: Timed out", jf.server)
}
}
func (jf *Jellyfin) init(server, client, version, device, deviceId string) error {
jf.server = server
jf.client = client
@@ -55,12 +62,13 @@ func (jf *Jellyfin) init(server, client, version, device, deviceId string) error
"User-Agent": jf.useragent,
"X-Emby-Authorization": jf.auth,
}
jf.httpClient = http.Client{
jf.httpClient = &http.Client{
Timeout: 10 * time.Second,
}
infoUrl := fmt.Sprintf("%s/System/Info/Public", server)
req, _ := http.NewRequest("GET", infoUrl, nil)
resp, err := jf.httpClient.Do(req)
defer jf.timeoutHandler()
if err == nil {
data, _ := ioutil.ReadAll(resp.Body)
json.Unmarshal(data, &jf.serverInfo)
@@ -77,7 +85,11 @@ func (jf *Jellyfin) authenticate(username, password string) (map[string]interfac
}
loginParams, _ := json.Marshal(jf.loginParams)
url := fmt.Sprintf("%s/emby/Users/AuthenticateByName", jf.server)
req, _ := http.NewRequest("POST", url, bytes.NewBuffer(loginParams))
req, err := http.NewRequest("POST", url, bytes.NewBuffer(loginParams))
defer jf.timeoutHandler()
if err != nil {
return nil, 0, err
}
for name, value := range jf.header {
req.Header.Add(name, value)
}
@@ -116,6 +128,7 @@ func (jf *Jellyfin) _getReader(url string, params map[string]string) (io.Reader,
req.Header.Add(name, value)
}
resp, err := jf.httpClient.Do(req)
defer jf.timeoutHandler()
if err != nil || resp.StatusCode != 200 {
if resp.StatusCode == 401 && jf.authenticated {
jf.authenticated = false
@@ -147,6 +160,7 @@ func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool
req.Header.Add(name, value)
}
resp, err := jf.httpClient.Do(req)
defer jf.timeoutHandler()
if err != nil || resp.StatusCode != 200 {
if resp.StatusCode == 401 && jf.authenticated {
jf.authenticated = false