X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gfit%2Fgfit.go;h=fb668624e6b2e734b473333cb018cb685cae536d;hb=a2b86ab96b046d7cccd96b066121ffa71e0eaf46;hp=33e5a664f69855806353be662b509933c6a3e179;hpb=3313c545eece0a29c49e7e1621e491d88f2f957b;p=kraftakt.git

diff --git a/gfit/gfit.go b/gfit/gfit.go
index 33e5a66..fb66862 100644
--- a/gfit/gfit.go
+++ b/gfit/gfit.go
@@ -21,9 +21,11 @@ const (
 	csrfToken = "@CSRFTOKEN@"
 	userID    = "me"
 
-	dataTypeNameCalories  = "com.google.calories.expended"
-	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{
@@ -34,6 +36,7 @@ var oauthConfig = &oauth2.Config{
 	Scopes: []string{
 		fitness.FitnessActivityWriteScope,
 		fitness.FitnessBodyWriteScope,
+		fitness.FitnessLocationWriteScope,
 	},
 }
 
@@ -101,6 +104,10 @@ func DataStreamID(dataSource *fitness.DataSource) string {
 		}
 	}
 
+	if dataSource.DataStreamName != "" {
+		fields = append(fields, dataSource.DataStreamName)
+	}
+
 	return strings.Join(fields, ":")
 }
 
@@ -146,6 +153,28 @@ func (c *Client) DataSetPatch(ctx context.Context, dataSourceID string, points [
 	return nil
 }
 
+func (c *Client) SetDistance(ctx context.Context, meters float64, startOfDay time.Time) error {
+	return c.updateCumulative(ctx,
+		&fitness.DataSource{
+			Application: Application(ctx),
+			DataType: &fitness.DataType{
+				Field: []*fitness.DataTypeField{
+					&fitness.DataTypeField{
+						Name:   "distance",
+						Format: "floatPoint",
+					},
+				},
+				Name: dataTypeNameDistance,
+			},
+			Name: "Distance covered",
+			Type: "raw",
+		},
+		&fitness.Value{
+			FpVal: meters,
+		},
+		startOfDay)
+}
+
 func (c *Client) SetSteps(ctx context.Context, totalSteps int, startOfDay time.Time) error {
 	return c.updateCumulative(ctx,
 		&fitness.DataSource{
@@ -190,6 +219,64 @@ 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 {
+	dataStreamID := DataStreamID(&fitness.DataSource{
+		DataType: &fitness.DataType{
+			Name: dataTypeNameActivitySegment,
+		},
+		Type: "raw",
+	})
+
+	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":
@@ -212,6 +299,9 @@ func (c *Client) updateCumulative(ctx context.Context, dataSource *fitness.DataS
 
 	endOfDay := startOfDay.Add(24 * time.Hour).Add(-1 * time.Nanosecond)
 	currValue, startTime, err := c.readCumulative(ctx, dataSource, startOfDay, endOfDay)
+	if err != nil {
+		return err
+	}
 
 	var diffValue fitness.Value
 	if dataSource.DataType.Field[0].Format == "integer" {
@@ -343,7 +433,7 @@ func (c *Client) heartRate(ctx context.Context, dataSource *fitness.DataSource,
 	return results, maxEndTime, nil
 }
 
-func (c *Client) SetHeartRate(ctx context.Context, totalDurations []fitbit.HeartRateZone, startOfDay time.Time) error {
+func (c *Client) SetHeartRate(ctx context.Context, totalDurations []fitbit.HeartRateZone, restingHeartRate int, startOfDay time.Time) error {
 	dataSource := &fitness.DataSource{
 		Application: Application(ctx),
 		DataType: &fitness.DataType{