post: retry 3 times before cancel

This commit is contained in:
Celogeek 2021-12-28 17:21:04 +01:00
parent f60d6f843f
commit 62ffdc83ef
Signed by: celogeek
GPG Key ID: E6B7BDCFC446233A

View File

@ -1,10 +1,9 @@
package piwigo package piwigo
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -36,60 +35,66 @@ func (p *Piwigo) Post(method string, form *url.Values, resp interface{}) error {
encodedForm = form.Encode() encodedForm = form.Encode()
} }
req, err := http.NewRequest("POST", Url, strings.NewReader(encodedForm))
if err != nil {
return err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
if p.Token != "" {
req.AddCookie(&http.Cookie{Name: "pwg_id", Value: p.Token, HttpOnly: true})
}
r, err := http.DefaultClient.Do(req)
if err != nil {
return err
}
defer r.Body.Close()
Result := PiwigoResult{ Result := PiwigoResult{
Result: resp, Result: resp,
} }
if os.Getenv("DEBUG") == "1" { var raw []byte
newBody := &bytes.Buffer{}
tee := io.TeeReader(r.Body, newBody)
for i := 0; i < 3; i++ {
req, err := http.NewRequest("POST", Url, strings.NewReader(encodedForm))
if err != nil {
return err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
if p.Token != "" {
req.AddCookie(&http.Cookie{Name: "pwg_id", Value: p.Token, HttpOnly: true})
}
r, err := http.DefaultClient.Do(req)
if err != nil {
continue
}
raw, err := ioutil.ReadAll(r.Body)
r.Body.Close()
if err != nil {
continue
}
err = json.Unmarshal(raw, &Result)
if err != nil {
continue
}
for _, c := range r.Cookies() {
if c.Name == "pwg_id" {
p.Token = c.Value
break
}
}
break
}
if err != nil {
return err
}
if os.Getenv("DEBUG") == "1" {
var RawResult interface{} var RawResult interface{}
err = json.NewDecoder(tee).Decode(&RawResult) err = json.Unmarshal(raw, RawResult)
if err != nil { if err != nil {
return err return err
} }
DumpResponse(RawResult) DumpResponse(RawResult)
err = json.NewDecoder(newBody).Decode(&Result)
if err != nil {
return err
}
} else {
err = json.NewDecoder(r.Body).Decode(&Result)
if err != nil {
return err
}
} }
if Result.Stat != "ok" { if Result.Stat != "ok" {
return fmt.Errorf("[Error %d] %s", Result.Err, Result.ErrMessage) return fmt.Errorf("[Error %d] %s", Result.Err, Result.ErrMessage)
} }
for _, c := range r.Cookies() {
if c.Name == "pwg_id" {
p.Token = c.Value
break
}
}
return nil return nil
} }