cli: fitactivity auto determine protocol version (#380)

* cli: fitactivity combine fix error format

* cli: fitactivity auto determine protocol version

cmd/fitactivity/combiner/combiner.go

@@ -30,12 +30,12 @@ const (
 	ErrSportMismatch  = errorString("sport mismatch")
 )
 
-func Combine(fits ...proto.FIT) (*proto.FIT, error) {
+func Combine(fits ...*proto.FIT) (*proto.FIT, error) {
 	if len(fits) < 2 {
 		return nil, fmt.Errorf("provide at least 2 fits to combine: %w", ErrMinimalCombine)
 	}
 
-	slices.SortStableFunc(fits, func(f1, f2 proto.FIT) int {
+	slices.SortStableFunc(fits, func(f1, f2 *proto.FIT) int {
 		if len(f1.Messages) == 0 || len(f2.Messages) == 0 {
 			return 0
 		}
@@ -53,7 +53,7 @@ func Combine(fits ...proto.FIT) (*proto.FIT, error) {
 
 	sessionsByFIT := make([][]proto.Message, len(fits))
 	for i := range fits {
-		fit := &fits[i]
+		fit := fits[i]
 		for j := 0; j < len(fit.Messages); j++ {
 			mesg := fit.Messages[j]
 			switch mesg.Num {
@@ -84,11 +84,11 @@ func Combine(fits ...proto.FIT) (*proto.FIT, error) {
 		}
 	}
 
-	fitResult := &fits[0]
+	fitResult := fits[0]
 
 	for i := range sessionsByFIT {
 		if len(sessionsByFIT[i]) == 0 {
-			return nil, fmt.Errorf("fits[i]: %w", ErrNoSessionFound)
+			return nil, fmt.Errorf("fits[%d]: %w", i, ErrNoSessionFound)
 		}
 	}
 

cmd/fitactivity/main.go

@@ -134,6 +134,8 @@ func combineAndConcealPosition(paths []string, opts *options) error {
 		return fmt.Errorf("could not combine: %v", err)
 	}
 
+	protocolVersion := latestProtocolVersion(fits)
+
 	if err := concealer.ConcealPosition(fit, opts.concealStart, opts.concealEnd); err != nil {
 		return fmt.Errorf("could not conceal: %v", err)
 	}
@@ -150,7 +152,7 @@ func combineAndConcealPosition(paths []string, opts *options) error {
 	}
 
 	enc := encoder.New(fout,
-		encoder.WithProtocolVersion(proto.V2),
+		encoder.WithProtocolVersion(protocolVersion),
 		opts.encoderHeaderOption,
 	)
 
@@ -161,6 +163,16 @@ func combineAndConcealPosition(paths []string, opts *options) error {
 	return nil
 }
 
+func latestProtocolVersion(fits []*proto.FIT) proto.Version {
+	var version = byte(proto.V1)
+	for i := range fits {
+		if fits[i].FileHeader.ProtocolVersion > version {
+			version = fits[i].FileHeader.ProtocolVersion
+		}
+	}
+	return proto.Version(version)
+}
+
 func openAndConcealPosition(path string, opts *options) error {
 	f, err := os.Open(path)
 	if err != nil {
@@ -196,7 +208,7 @@ func openAndConcealPosition(path string, opts *options) error {
 	defer fout.Close()
 
 	enc := encoder.New(fout,
-		encoder.WithProtocolVersion(proto.V2),
+		encoder.WithProtocolVersion(latestProtocolVersion(fits)),
 		opts.encoderHeaderOption,
 	)
 

cmd/fitactivity/opener/opener.go

@@ -15,7 +15,7 @@ import (
 )
 
 // Open opens all given paths concurrently.
-func Open(paths ...string) ([]proto.FIT, error) {
+func Open(paths ...string) ([]*proto.FIT, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -33,12 +33,12 @@ func Open(paths ...string) ([]proto.FIT, error) {
 		close(resultc)
 	}()
 
-	fits := make([]proto.FIT, 0, len(paths))
+	fits := make([]*proto.FIT, 0, len(paths))
 	for res := range resultc {
 		if res.err != nil {
 			return nil, res.err
 		}
-		fits = append(fits, *res.fit)
+		fits = append(fits, res.fit)
 	}
 
 	return fits, nil