X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gfit%2Fgfit.go;h=b6e9bc0632c807e8338fd9b09d9017e64356cd08;hb=4c298110b1564f337cd0ceaad8e94fd4d4f7741f;hp=8f3fbacbc452e0a9c40d0c54a131cdce6d0dbe36;hpb=95db19974a6809fc619b70146b6ec3372938412a;p=kraftakt.git diff --git a/gfit/gfit.go b/gfit/gfit.go index 8f3fbac..b6e9bc0 100644 --- a/gfit/gfit.go +++ b/gfit/gfit.go @@ -21,10 +21,11 @@ const ( csrfToken = "@CSRFTOKEN@" userID = "me" - dataTypeNameCalories = "com.google.calories.expended" - dataTypeNameDistance = "com.google.distance.delta" - dataTypeNameSteps = "com.google.step_count.delta" - dataTypeNameHeartrate = "com.google.heart_rate.summary" + dataTypeNameCalories = "com.google.calories.expended" + dataTypeNameDistance = "com.google.distance.delta" + dataTypeNameSteps = "com.google.step_count.delta" + dataTypeNameHeartrate = "com.google.heart_rate.summary" + dataTypeNameActivitySegment = "com.google.activity.segment" ) var oauthConfig = &oauth2.Config{ @@ -119,7 +120,7 @@ func (c *Client) DataSourceCreate(ctx context.Context, dataSource *fitness.DataS } 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 @@ -218,6 +219,78 @@ func (c *Client) SetCalories(ctx context.Context, totalCalories float64, startOf startOfDay) } +type Activity struct { + Start time.Time + End time.Time + Type int64 +} + +func (a Activity) String() string { + return fmt.Sprintf("%s-%s %d", a.Start.Format("15:04:05"), a.End.Format("15:04:05"), a.Type) +} + +func (c *Client) SetActivities(ctx context.Context, activities []Activity, startOfDay time.Time) error { + if len(activities) == 0 { + return nil + } + + dataStreamID, err := c.DataSourceCreate(ctx, &fitness.DataSource{ + Application: Application(ctx), + DataType: &fitness.DataType{ + Field: []*fitness.DataTypeField{ + &fitness.DataTypeField{ + Name: "activity", + Format: "integer", + }, + }, + Name: dataTypeNameActivitySegment, + }, + Type: "raw", + }) + if err != nil { + return err + } + + endOfDay := startOfDay.Add(24 * time.Hour).Add(-1 * time.Nanosecond) + + datasetID := fmt.Sprintf("%d-%d", startOfDay.UnixNano(), endOfDay.UnixNano()) + res, err := c.Service.Users.DataSources.Datasets.Get(userID, dataStreamID, datasetID).Context(ctx).Do() + if err != nil { + log.Errorf(ctx, "c.Service.Users.DataSources.Datasets.Get(%q, %q) = %v", dataStreamID, datasetID, err) + return err + } + + var dataPoints []*fitness.DataPoint +Next: + for _, a := range activities { + startTimeNanos := a.Start.UnixNano() + endTimeNanos := a.End.UnixNano() + + for _, p := range res.Point { + if p.StartTimeNanos == startTimeNanos && p.EndTimeNanos == endTimeNanos && p.Value[0].IntVal == a.Type { + log.Debugf(ctx, "activity %s already stored in Google Fit", a) + continue Next + } + } + + log.Debugf(ctx, "activity %s will be added to Google Fit", a) + dataPoints = append(dataPoints, &fitness.DataPoint{ + DataTypeName: dataTypeNameActivitySegment, + StartTimeNanos: startTimeNanos, + EndTimeNanos: endTimeNanos, + Value: []*fitness.Value{ + &fitness.Value{IntVal: a.Type}, + }, + }) + } + + if len(dataPoints) == 0 { + return nil + } + + return c.DataSetPatch(ctx, dataStreamID, dataPoints) +} + func (c *Client) updateCumulative(ctx context.Context, dataSource *fitness.DataSource, rawValue *fitness.Value, startOfDay time.Time) error { switch f := dataSource.DataType.Field[0].Format; f { case "integer": @@ -269,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 } - log.Debugf(ctx, "adding 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{ @@ -291,6 +364,7 @@ func (c *Client) readCumulative(ctx context.Context, dataSource *fitness.DataSou } if len(res.Point) == 0 { + log.Debugf(ctx, "read cumulative data %s until %v: []", dataSource.DataStreamId, endTime) return &fitness.Value{}, startTime, nil }