X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gfitsync.go;h=3bd416f578fe73e24503faa49340fd6565c8b4d7;hb=1830c80233b16dea15b5d07ddc6156ac1088887d;hp=29f98aee4c4e7601f6ef383bff3dee2def11fb7b;hpb=2eac6c527c6997568372a3f3e3d7c09d86aec78e;p=kraftakt.git

diff --git a/gfitsync.go b/gfitsync.go
index 29f98ae..3bd416f 100644
--- a/gfitsync.go
+++ b/gfitsync.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/octo/gfitsync/app"
@@ -228,40 +229,95 @@ func handleNotification(ctx context.Context, s *fitbit.Subscription) error {
 		return err
 	}
 
-	profile, err := fitbitClient.Profile(ctx)
-	if err != nil {
-		return err
+	var (
+		wg      = &sync.WaitGroup{}
+		errs    appengine.MultiError
+		summary *fitbit.ActivitySummary
+		profile *fitbit.Profile
+	)
+
+	wg.Add(1)
+	go func() {
+		var err error
+		summary, err = fitbitClient.ActivitySummary(ctx, s.Date)
+		if err != nil {
+			errs = append(errs, fmt.Errorf("fitbitClient.ActivitySummary(%q) = %v", s.Date, err))
+		}
+		wg.Done()
+	}()
+
+	wg.Add(1)
+	go func() {
+		var err error
+		profile, err = fitbitClient.Profile(ctx)
+		if err != nil {
+			errs = append(errs, fmt.Errorf("fitbitClient.Profile(%q) = %v", s.Date, err))
+		}
+		wg.Done()
+	}()
+
+	wg.Wait()
+	if len(errs) != 0 {
+		return errs
 	}
-	log.Debugf(ctx, "profile = %+v", profile)
 
 	tm, err := time.ParseInLocation("2006-01-02", s.Date, profile.Timezone)
 	if err != nil {
 		return err
 	}
 
-	summary, err := fitbitClient.ActivitySummary(tm)
-	if err != nil {
-		return err
-	}
 	log.Debugf(ctx, "%s (%s) took %d steps on %s",
-		profile.Name, u.Email, summary.Summary.Steps, s.Date)
+		profile.Name, u.Email, summary.Summary.Steps, tm)
 
 	gfitClient, err := gfit.NewClient(ctx, u)
 	if err != nil {
 		return err
 	}
 
-	if err := gfitClient.SetSteps(ctx, summary.Summary.Steps, tm); err != nil {
-		return fmt.Errorf("gfitClient.SetSteps(%d) = %v", summary.Summary.Steps, err)
-	}
+	wg.Add(1)
+	go func() {
+		if err := gfitClient.SetSteps(ctx, summary.Summary.Steps, tm); err != nil {
+			errs = append(errs, fmt.Errorf("gfitClient.SetSteps(%d) = %v", summary.Summary.Steps, err))
+		}
+		wg.Done()
+	}()
 
-	if err := gfitClient.SetCalories(ctx, summary.Summary.CaloriesOut, tm); err != nil {
-		return fmt.Errorf("gfitClient.SetCalories(%d) = %v", summary.Summary.CaloriesOut, err)
-	}
+	wg.Add(1)
+	go func() {
+		if err := gfitClient.SetCalories(ctx, summary.Summary.CaloriesOut, tm); err != nil {
+			errs = append(errs, fmt.Errorf("gfitClient.SetCalories(%d) = %v", summary.Summary.CaloriesOut, err))
+		}
+		wg.Done()
+	}()
+
+	wg.Add(1)
+	go func() {
+		var distanceMeters float64
+		for _, d := range summary.Summary.Distances {
+			if d.Activity != "total" {
+				continue
+			}
+			distanceMeters = 1000.0 * d.Distance
+			break
+		}
+		if err := gfitClient.SetDistance(ctx, distanceMeters, tm); err != nil {
+			errs = append(errs, fmt.Errorf("gfitClient.SetDistance(%d) = %v", distanceMeters, err))
+		}
+		wg.Done()
+	}()
 
-	if err := gfitClient.SetHeartRate(ctx, summary.Summary.HeartRateZones, tm); err != nil {
-		return fmt.Errorf("gfitClient.SetHeartRate() = %v", err)
-	}
+	wg.Add(1)
+	go func() {
+		if err := gfitClient.SetHeartRate(ctx, summary.Summary.HeartRateZones, summary.Summary.RestingHeartRate, tm); err != nil {
+			errs = append(errs, fmt.Errorf("gfitClient.SetHeartRate() = %v", err))
+		}
+		wg.Done()
+	}()
 
+	wg.Wait()
+
+	if len(errs) != 0 {
+		return errs
+	}
 	return nil
 }