git-fit 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d4addd08029f44a569bf1e7caebc7f890f6ef31a2acc4a0a4de7c9ff74dff4c
-  data.tar.gz: 3eedd8d3727f7e9bea165f347fcd30ac430b37518a1c3b36ce7a91d14d2dc15c
+  metadata.gz: 4aa9561c8dd3c3f589c8c0680f96b779a1d07b415cde954ed4f6787a4a5d3d28
+  data.tar.gz: 263aa4c476ab2b8a656d6a8aefcf6c6df7046042a42b362ccaf653a8201a6e0a
 SHA512:
-  metadata.gz: 416c3f458713d03a648d723d05b48af609f5165d9d09ae3f22646089825a2fc058974c34210f5553fe9e28ee52f108932d20a69b1bf8b8aee3fa682e45cc18ad
-  data.tar.gz: 6fce4b173ae5d10000a2b3e0035cb81e6c2c1c656357f4373d5532a51977acdae5610d8ecba42888fddf3f846094b6653c96ebdc438e72b23422300ec2e7592e
+  metadata.gz: cffae3928c4efa2f3a1be2d329fbf74b23808ccd3baa0e6fb9524c029c3b8a261eff0fc1c9f26c742eb6bd2f1b053ba38d9b8a806c20085ddbca54c52c21c689
+  data.tar.gz: cef76be1158588e238686c931329613db7bde3a8ffe5453b61d1e3415aa53532ac10a5133c6e831e1b5ac7f3a04f9a194f0f18abfa522d3fcde459885850e93f

data/lib/git_fit/sync/garmin_base.rb

@@ -138,7 +138,7 @@ module GitFit
           write_standardized_json(l2, act_id) if l2
         end
 
-        attrs = build_attrs(details, act_id, type, polyline)
+        attrs = build_attrs(details, act_id, type, polyline, l2_data: l2)
 
         if (start_t = parse_garmin_time(details.dig('summaryDTO', 'startTimeGMT')))
           local_t = resolve_local_time(start_t, act_id, polyline)
@@ -480,13 +480,18 @@ module GitFit
         "Re-auth: set sync.#{source_prefix}.secret in #{GitFit::Config.default_path}"
       end
 
-      def build_attrs(detail, activity_id, type, polyline = nil)
+      def build_attrs(detail, activity_id, type, polyline = nil, l2_data: nil)
         summary = detail['summaryDTO'] || {}
 
         start_t = parse_garmin_time(summary['startTimeGMT'])
         moving_time = summary['movingDuration']&.to_i || summary['duration']&.to_i
         elapsed_time = summary['elapsedDuration']&.to_i || summary['duration']&.to_i
 
+        average_power = summary['avgPower']&.to_f
+        average_power ||= fallback_avg_power(activity_id, l2_data)
+
+        max_power = summary['maxPower']&.to_f
+
         {
           run_id: "#{source_prefix}_#{activity_id}",
           name: detail['activityName'] || 'Garmin Activity',
@@ -503,8 +508,8 @@ module GitFit
           max_heartrate: summary['maxHR']&.to_f,
           average_cadence: summary['avgCadence']&.to_f,
           max_cadence: summary['maxCadence']&.to_f,
-          average_power: summary['avgPower']&.to_f,
-          max_power: summary['maxPower']&.to_f,
+          average_power: average_power,
+          max_power: max_power,
           calories: summary['calories']&.to_i,
           average_temperature: summary['avgTemperature']&.to_f,
           average_speed: summary['averageSpeed']&.to_f,
@@ -530,6 +535,26 @@ module GitFit
         val.is_a?(Hash) ? (val['typeKey'] || '').downcase : val.to_s.downcase
       end
 
+      def fallback_avg_power(activity_id, l2_data)
+        records = l2_data || load_l2_from_disk(activity_id)
+        return nil unless records.is_a?(Array) && records.any?
+
+        power_values = records.filter_map { |r| r['power']&.to_f }
+        power_values.select! { |p| p > 0 }
+        return nil if power_values.empty?
+
+        (power_values.sum.to_f / power_values.size).round(1)
+      end
+
+      def load_l2_from_disk(activity_id)
+        l2_path = std_path(activity_id)
+        return nil unless File.exist?(l2_path)
+
+        JSON.parse(File.read(l2_path))
+      rescue StandardError
+        nil
+      end
+
       def map_type(activity_type)
         ts = type_str(activity_type)
         return 'other' if ts.empty?

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Lax