projects
/
kraftakt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[kraftakt.git]
/
kraftakt.go
diff --git
a/kraftakt.go
b/kraftakt.go
index
e2318e7
..
40f0546
100644
(file)
--- a/
kraftakt.go
+++ b/
kraftakt.go
@@
-295,20
+295,20
@@
func handleNotifications(ctx context.Context, payload []byte) error {
switch s.CollectionType {
case "activities":
wg.Add(1)
switch s.CollectionType {
case "activities":
wg.Add(1)
- go func() {
+ go func(
s fitbit.Subscription
) {
defer wg.Done()
if err := activitiesNotification(ctx, &s); err != nil {
log.Warningf(ctx, "activitiesNotification() = %v", err)
}
defer wg.Done()
if err := activitiesNotification(ctx, &s); err != nil {
log.Warningf(ctx, "activitiesNotification() = %v", err)
}
- }(
)
+ }(
s) // copies s
case "sleep":
wg.Add(1)
case "sleep":
wg.Add(1)
- go func() {
+ go func(
s fitbit.Subscription
) {
defer wg.Done()
if err := sleepNotification(ctx, &s); err != nil {
log.Warningf(ctx, "sleepNotification() = %v", err)
}
defer wg.Done()
if err := sleepNotification(ctx, &s); err != nil {
log.Warningf(ctx, "sleepNotification() = %v", err)
}
- }(
)
+ }(
s) // copies s
default:
log.Warningf(ctx, "ignoring collection type %q", s.CollectionType)
default:
log.Warningf(ctx, "ignoring collection type %q", s.CollectionType)
@@
-437,7
+437,7
@@
func activitiesNotification(ctx context.Context, s *fitbit.Subscription) error {
activities = append(activities, gfit.Activity{
Start: startTime,
End: endTime,
activities = append(activities, gfit.Activity{
Start: startTime,
End: endTime,
- Type:
gfit.ParseFitbitActivity(a.Name)
,
+ Type:
a.Name
,
})
}
if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
})
}
if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
@@
-491,6
+491,7
@@
func sleepNotification(ctx context.Context, s *fitbit.Subscription) error {
if err != nil {
return err
}
if err != nil {
return err
}
+ log.Debugf(ctx, "fitbitClient.Sleep(%v) returned %d sleep stages", tm, len(sleep.Stages))
var activities []gfit.Activity
for _, stg := range sleep.Stages {
var activities []gfit.Activity
for _, stg := range sleep.Stages {
@@
-500,17
+501,19
@@
func sleepNotification(ctx context.Context, s *fitbit.Subscription) error {
}
switch stg.Level {
case fitbit.SleepLevelDeep:
}
switch stg.Level {
case fitbit.SleepLevelDeep:
- a.Type =
110 // Deep sleep
+ a.Type =
"Deep sleep"
case fitbit.SleepLevelLight:
case fitbit.SleepLevelLight:
- a.Type =
109 // Light sleep
+ a.Type =
"Light sleep"
case fitbit.SleepLevelREM:
case fitbit.SleepLevelREM:
- a.Type =
111 // REM sleep
+ a.Type =
"REM sleep"
case fitbit.SleepLevelWake:
case fitbit.SleepLevelWake:
- a.Type =
112 // Awake (during sleep cycle)
+ a.Type =
"Awake (during sleep cycle)"
default:
log.Warningf(ctx, "unexpected sleep level %v", stg.Level)
continue
}
default:
log.Warningf(ctx, "unexpected sleep level %v", stg.Level)
continue
}
+
+ activities = append(activities, a)
}
wg.Wait()
}
wg.Wait()
@@
-518,6
+521,7
@@
func sleepNotification(ctx context.Context, s *fitbit.Subscription) error {
return gfitErr
}
return gfitErr
}
+ log.Debugf(ctx, "passing %d activities to gfitClient.SetActivities()", len(activities))
if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
return fmt.Errorf("SetActivities() = %v", err)
}
if err := gfitClient.SetActivities(ctx, activities, tm); err != nil {
return fmt.Errorf("SetActivities() = %v", err)
}