post: retry 3 times before cancel

internal/piwigo/post.go

@@ -1,10 +1,9 @@
 package piwigo
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -36,6 +35,13 @@ func (p *Piwigo) Post(method string, form *url.Values, resp interface{}) error {
 		encodedForm = form.Encode()
 	}
 
+	Result := PiwigoResult{
+		Result: resp,
+	}
+
+	var raw []byte
+
+	for i := 0; i < 3; i++ {
 		req, err := http.NewRequest("POST", Url, strings.NewReader(encodedForm))
 		if err != nil {
 			return err
@@ -48,40 +54,18 @@ func (p *Piwigo) Post(method string, form *url.Values, resp interface{}) error {
 
 		r, err := http.DefaultClient.Do(req)
 		if err != nil {
-		return err
+			continue
 		}
 
-	defer r.Body.Close()
+		raw, err := ioutil.ReadAll(r.Body)
-
+		r.Body.Close()
-	Result := PiwigoResult{
-		Result: resp,
-	}
-
-	if os.Getenv("DEBUG") == "1" {
-		newBody := &bytes.Buffer{}
-		tee := io.TeeReader(r.Body, newBody)
-
-		var RawResult interface{}
-		err = json.NewDecoder(tee).Decode(&RawResult)
 		if err != nil {
-			return err
+			continue
 		}
 
-		DumpResponse(RawResult)
+		err = json.Unmarshal(raw, &Result)
-
-		err = json.NewDecoder(newBody).Decode(&Result)
 		if err != nil {
-			return err
+			continue
-		}
-	} else {
-		err = json.NewDecoder(r.Body).Decode(&Result)
-		if err != nil {
-			return err
-		}
-	}
-
-	if Result.Stat != "ok" {
-		return fmt.Errorf("[Error %d] %s", Result.Err, Result.ErrMessage)
 		}
 
 		for _, c := range r.Cookies() {
@@ -91,5 +75,26 @@ func (p *Piwigo) Post(method string, form *url.Values, resp interface{}) error {
 			}
 		}
 
+		break
+	}
+
+	if err != nil {
+		return err
+	}
+
+	if os.Getenv("DEBUG") == "1" {
+		var RawResult interface{}
+		err = json.Unmarshal(raw, RawResult)
+		if err != nil {
+			return err
+		}
+
+		DumpResponse(RawResult)
+	}
+
+	if Result.Stat != "ok" {
+		return fmt.Errorf("[Error %d] %s", Result.Err, Result.ErrMessage)
+	}
+
 	return nil
 }