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

chore: fix response body leak on 404 and hoist LoadLocation (#28612)

Browse source
This commit is contained in:
Rishabh Vaish 2026-04-08 03:36:38 -07:00 • committed by GitHub
parent dec0e7d5b2
commit 80900fd648
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tariff/pun.go
View file

@ -4,6 +4,7 @@ import (
"archive/zip"
"bytes"
"encoding/xml"
"errors"
"fmt"
"net/http"
"net/http/cookiejar"
@ -19,6 +20,12 @@ import (
"github.com/evcc-io/evcc/util/request"
)
// ErrPunDataNotAvailable indicates that GME has not yet published prices for the requested day.
var ErrPunDataNotAvailable = errors.New("PUN data not available")
// romeLocation is resolved once at package init to avoid repeated filesystem lookups.
var romeLocation *time.Location
type Pun struct {
*embed
log *util.Logger
@ -46,6 +53,7 @@ var _ api.Tariff = (*Pun)(nil)
func init() {
registry.Add("pun", NewPunFromConfig)
romeLocation, _ = time.LoadLocation("Europe/Rome")
}
func NewPunFromConfig(other map[string]any) (api.Tariff, error) {
@ -137,9 +145,14 @@ func (t *Pun) getData(day time.Time) (api.Rates, error) {
}
resp, err := client.Do(req)
if err != nil || resp.StatusCode == http.StatusNotFound {
if err != nil {
return nil, err
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound {
return nil, fmt.Errorf("%w: %s", ErrPunDataNotAvailable, day.Format("2006-01-02"))
}
body, err := request.ReadBody(resp)
if err != nil {
@ -193,17 +206,12 @@ func (t *Pun) getData(day time.Time) (api.Rates, error) {
date = date.AddDate(0, 0, -1)
}
location, err := time.LoadLocation("Europe/Rome")
if err != nil {
return nil, fmt.Errorf("load location: %w", err)
}
price, err := strconv.ParseFloat(strings.ReplaceAll(p.PUN, ",", "."), 64)
if err != nil {
return nil, fmt.Errorf("parse price: %w", err)
}
ts := time.Date(date.Year(), date.Month(), date.Day(), hour-1, 0, 0, 0, location)
ts := time.Date(date.Year(), date.Month(), date.Day(), hour-1, 0, 0, 0, romeLocation)
ar := api.Rate{
Start: ts,
End: ts.Add(time.Hour),