Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Homematic: return errors to caller (#6560)

Browse source
This commit is contained in:
andig 2023-03-01 20:52:26 +01:00 • committed by GitHub
parent 0828acf030
commit 004f078ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
meter/homematic/connection.go
View file

@ -68,26 +68,30 @@ func (c *Connection) XmlCmd(method, channel string, values ...Param) (MethodResp
return hmr, err
}
headers := map[string]string{
req, err := request.New(http.MethodPost, c.URI, strings.NewReader(xml.Header+string(body)), map[string]string{
"Content-Type": "text/xml",
})
if err != nil {
return hmr, err
}
if req, err := request.New(http.MethodPost, c.URI, strings.NewReader(xml.Header+string(body)), headers); err == nil {
if res, err := c.DoBody(req); err == nil {
if strings.Contains(string(res), "faultCode") {
return hmr, fmt.Errorf("ccu: %s", string(res))
}
res, err := c.DoBody(req)
if err != nil {
return hmr, err
}
// correct Homematic IP Legacy API (CCU port 2010) method response encoding value
res = []byte(strings.Replace(string(res), "ISO-8859-1", "UTF-8", 1))
if strings.Contains(string(res), "faultCode") {
return hmr, fmt.Errorf("ccu: %s", string(res))
}
// correct XML-RPC-Schnittstelle (CCU port 2001) method response encoding value
res = []byte(strings.Replace(string(res), "iso-8859-1", "UTF-8", 1))
// correct Homematic IP Legacy API (CCU port 2010) method response encoding value
res = []byte(strings.Replace(string(res), "ISO-8859-1", "UTF-8", 1))
if err := xml.Unmarshal(res, &hmr); err != nil {
return hmr, err
}
}
// correct XML-RPC-Schnittstelle (CCU port 2001) method response encoding value
res = []byte(strings.Replace(string(res), "iso-8859-1", "UTF-8", 1))
if err := xml.Unmarshal(res, &hmr); err != nil {
return hmr, err
}
return hmr, err