Fixes #3

Garmin Connect treats activity type as case sensitive, so I had to change first letter to uppercase. Also, Runtastic has dozens of activity types, but none of them are recognized by either Garmin or Strava, so now I only support Running, Walking, Biking and Swimming.
Metalnem · Apr 29, 2017 · a2b6847 · a2b6847
1 parent 7dafcd9
commit a2b6847
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 99 deletions.
diff --git a/api/api.go b/api/api.go
@@ -69,7 +69,7 @@ type Session struct {
 // Metadata represents high-level overview of the single activity.
 type Metadata struct {
 	ID            ActivityID
-	Type          ActivityType
+	Type          string
 	StartTime     time.Time
 	EndTime       time.Time
 	Calories      int32
@@ -269,6 +269,21 @@ func Login(ctx context.Context, email, password string) (*Session, error) {
 	return &session, nil
 }
 
+func getActivityType(id int64) string {
+	switch id {
+	case 1, 14:
+		return "Running"
+	case 3, 4, 15, 22:
+		return "Biking"
+	case 18:
+		return "Swimming"
+	case 2, 7, 19:
+		return "Walking"
+	default:
+		return "Other"
+	}
+}
+
 func convert(m metadata) (Metadata, error) {
 	t, err := m.Type.Int64()
 
@@ -284,7 +299,7 @@ func convert(m metadata) (Metadata, error) {
 
 	metadata := Metadata{
 		ID:            m.ID,
-		Type:          types[t],
+		Type:          getActivityType(t),
 		StartTime:     time.Time(m.StartTime),
 		EndTime:       time.Time(m.EndTime),
 		Calories:      int32(calories),
@@ -621,10 +636,6 @@ func (session *Session) GetActivity(ctx context.Context, id ActivityID) (*Activi
 		Data:     merge(ctx, gpsData, heartRateData, session.Options.Tolerance),
 	}
 
-	if activity.Type.ID == 0 {
-		activity.Type = types[5] // Default to "Other"
-	}
-
 	return &activity, nil
 }
 

diff --git a/api/api_test.go b/api/api_test.go
@@ -115,7 +115,7 @@ func TestGetActivityGPS(t *testing.T) {
 	expected := &Activity{
 		Metadata: Metadata{
 			ID:        id,
-			Type:      ActivityType{1, "Running", "running"},
+			Type:      "Running",
 			StartTime: time.Unix(1480085018, 0).UTC(),
 			EndTime:   time.Unix(1480085041, 0).UTC(),
 		},
@@ -143,7 +143,7 @@ func TestGetActivityHeartRate(t *testing.T) {
 	expected := &Activity{
 		Metadata: Metadata{
 			ID:            id,
-			Type:          ActivityType{3, "Cycling", "cycling"},
+			Type:          "Biking",
 			StartTime:     time.Unix(1482135300, 0).UTC(),
 			EndTime:       time.Unix(1482135324, 0).UTC(),
 			AvgHeartRate:  76,
@@ -166,7 +166,7 @@ func TestGetActivityManual(t *testing.T) {
 	expected := &Activity{
 		Metadata: Metadata{
 			ID:            id,
-			Type:          ActivityType{5, "Other", "other"},
+			Type:          "Other",
 			StartTime:     time.Unix(1483025750, 0).UTC(),
 			EndTime:       time.Unix(1483031015, 0).UTC(),
 			Calories:      1183,

diff --git a/api/types.go b/api/types.go
diff --git a/main.go b/main.go
@@ -81,7 +81,7 @@ func export(activities []api.Activity, exp func(io.Writer) exporter, ext string)
 	defer checkedClose(zw, &err)
 
 	for _, activity := range activities {
-		filename := fmt.Sprintf("Runtastic %s %s.%s", formatTime(activity.EndTime), activity.Type.DisplayName, ext)
+		filename := fmt.Sprintf("Runtastic %s %s.%s", formatTime(activity.EndTime), activity.Type, ext)
 
 		header := zip.FileHeader{
 			Name:   filename,

diff --git a/static/tcx/empty.tcx b/static/tcx/empty.tcx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" version="1.0" creator="Runtastic Archiver, https://github.com/Metalnem/runtastic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ns2="http://www.garmin.com/xmlschemas/UserProfile/v2" xmlns:ns3="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:ns4="http://www.garmin.com/xmlschemas/ProfileExtension/v1" xmlns:ns5="http://www.garmin.com/xmlschemas/ActivityGoals/v1">
   <Activities>
-    <Activity Sport="other">
+    <Activity Sport="Other">
       <Id>2010-11-25T18:35:20Z</Id>
       <Lap StartTime="2010-11-25T18:35:20Z">
         <TotalTimeSeconds>0</TotalTimeSeconds>

diff --git a/static/tcx/gps.tcx b/static/tcx/gps.tcx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" version="1.0" creator="Runtastic Archiver, https://github.com/Metalnem/runtastic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ns2="http://www.garmin.com/xmlschemas/UserProfile/v2" xmlns:ns3="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:ns4="http://www.garmin.com/xmlschemas/ProfileExtension/v1" xmlns:ns5="http://www.garmin.com/xmlschemas/ActivityGoals/v1">
   <Activities>
-    <Activity Sport="other">
+    <Activity Sport="Other">
       <Id>2012-10-15T09:30:45Z</Id>
       <Lap StartTime="2012-10-15T09:30:45Z">
         <TotalTimeSeconds>10</TotalTimeSeconds>

diff --git a/static/tcx/heartRate.tcx b/static/tcx/heartRate.tcx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" version="1.0" creator="Runtastic Archiver, https://github.com/Metalnem/runtastic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ns2="http://www.garmin.com/xmlschemas/UserProfile/v2" xmlns:ns3="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:ns4="http://www.garmin.com/xmlschemas/ProfileExtension/v1" xmlns:ns5="http://www.garmin.com/xmlschemas/ActivityGoals/v1">
   <Activities>
-    <Activity Sport="other">
+    <Activity Sport="Other">
       <Id>2012-10-15T09:30:45Z</Id>
       <Lap StartTime="2012-10-15T09:30:45Z">
         <TotalTimeSeconds>1234</TotalTimeSeconds>

diff --git a/static/tcx/manual.tcx b/static/tcx/manual.tcx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TrainingCenterDatabase xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" version="1.0" creator="Runtastic Archiver, https://github.com/Metalnem/runtastic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd" xmlns:ns2="http://www.garmin.com/xmlschemas/UserProfile/v2" xmlns:ns3="http://www.garmin.com/xmlschemas/ActivityExtension/v2" xmlns:ns4="http://www.garmin.com/xmlschemas/ProfileExtension/v1" xmlns:ns5="http://www.garmin.com/xmlschemas/ActivityGoals/v1">
   <Activities>
-    <Activity Sport="running">
+    <Activity Sport="Running">
       <Id>2016-12-10T17:32:40Z</Id>
       <Lap StartTime="2016-12-10T17:32:40Z">
         <TotalTimeSeconds>4250</TotalTimeSeconds>

diff --git a/tcx/tcx.go b/tcx/tcx.go
@@ -116,10 +116,10 @@ func (exp *Exporter) Export(a api.Activity) error {
 		lap.MaxHeartReate = &a.MaxHeartReate
 	}
 
-	activity := activity{Sport: a.Type.ExportName, ID: startTime, Lap: lap}
+	activity := activity{Sport: a.Type, ID: startTime, Lap: lap}
 
 	if activity.Sport == "" {
-		activity.Sport = "other"
+		activity.Sport = "Other"
 	}
 
 	data := tcx{

diff --git a/tcx/tcx_test.go b/tcx/tcx_test.go
@@ -56,7 +56,7 @@ func TestManual(t *testing.T) {
 	activity := api.Activity{
 		Metadata: api.Metadata{
 			ID:            "1485608013",
-			Type:          api.ActivityType{ID: 1, DisplayName: "Running", ExportName: "running"},
+			Type:          "Running",
 			StartTime:     mustParse("2016-12-10T17:32:40Z"),
 			Calories:      1250,
 			Distance:      9458,