projects
/
kraftakt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the "gfitsync" package to "kraftakt".
[kraftakt.git]
/
gfit
/
gfit.go
diff --git
a/gfit/gfit.go
b/gfit/gfit.go
index
d1aacb6
..
69308a7
100644
(file)
--- a/
gfit/gfit.go
+++ b/
gfit/gfit.go
@@
-7,8
+7,8
@@
import (
"strings"
"time"
"strings"
"time"
- "github.com/octo/
gfitsync
/app"
- "github.com/octo/
gfitsync
/fitbit"
+ "github.com/octo/
kraftakt
/app"
+ "github.com/octo/
kraftakt
/fitbit"
"golang.org/x/oauth2"
oauth2google "golang.org/x/oauth2/google"
fitness "google.golang.org/api/fitness/v1"
"golang.org/x/oauth2"
oauth2google "golang.org/x/oauth2/google"
fitness "google.golang.org/api/fitness/v1"
@@
-120,7
+120,7
@@
func (c *Client) DataSourceCreate(ctx context.Context, dataSource *fitness.DataS
}
return DataStreamID(dataSource), nil
}
}
return DataStreamID(dataSource), nil
}
- log.Errorf(ctx, "c.Service.Users.DataSources.Create(
) = (%+v, %v)"
, res, err)
+ log.Errorf(ctx, "c.Service.Users.DataSources.Create(
%q) = (%+v, %v)", dataSource
, res, err)
return "", err
}
return res.DataStreamId, nil
return "", err
}
return res.DataStreamId, nil
@@
-234,12
+234,22
@@
func (c *Client) SetActivities(ctx context.Context, activities []Activity, start
return nil
}
return nil
}
- dataStreamID := DataStreamID(&fitness.DataSource{
+ dataStreamID, err := c.DataSourceCreate(ctx, &fitness.DataSource{
+ Application: Application(ctx),
DataType: &fitness.DataType{
DataType: &fitness.DataType{
+ Field: []*fitness.DataTypeField{
+ &fitness.DataTypeField{
+ Name: "activity",
+ Format: "integer",
+ },
+ },
Name: dataTypeNameActivitySegment,
},
Type: "raw",
})
Name: dataTypeNameActivitySegment,
},
Type: "raw",
})
+ if err != nil {
+ return err
+ }
endOfDay := startOfDay.Add(24 * time.Hour).Add(-1 * time.Nanosecond)
endOfDay := startOfDay.Add(24 * time.Hour).Add(-1 * time.Nanosecond)
@@
-332,7
+342,7
@@
func (c *Client) updateCumulative(ctx context.Context, dataSource *fitness.DataS
if now := time.Now().In(startOfDay.Location()); now.Before(endOfDay) {
endTime = now
}
if now := time.Now().In(startOfDay.Location()); now.Before(endOfDay) {
endTime = now
}
- log.Debugf(ctx, "add
ing cumulative data point: %v-%v %+v", startTime
, endTime, diffValue)
+ log.Debugf(ctx, "add
cumulative data %s until %v: %+v", dataSource.DataStreamId
, endTime, diffValue)
return c.DataSetPatch(ctx, dataSource.DataStreamId, []*fitness.DataPoint{
&fitness.DataPoint{
return c.DataSetPatch(ctx, dataSource.DataStreamId, []*fitness.DataPoint{
&fitness.DataPoint{
@@
-354,6
+364,7
@@
func (c *Client) readCumulative(ctx context.Context, dataSource *fitness.DataSou
}
if len(res.Point) == 0 {
}
if len(res.Point) == 0 {
+ log.Debugf(ctx, "read cumulative data %s until %v: []", dataSource.DataStreamId, endTime)
return &fitness.Value{}, startTime, nil
}
return &fitness.Value{}, startTime, nil
}