git-fit 0.25.1 → 0.26.0

data/lib/git_fit/fit/decoder.rb

@@ -30,6 +30,15 @@ module GitFit
         json = CTX.eval("FitDecoder.fitSession(#{bytes.inspect})")
         json ? JSON.parse(json) : nil
       end
+
+      # device_info messages (manufacturer/product/serial/sw-hw versions);
+      # `garminProduct` resolves to the model token (e.g. "edge540") when the
+      # bundled profile knows the product id, else stays numeric.
+      def self.device_info(path)
+        bytes = File.read(path, mode: 'rb').bytes
+        json = CTX.eval("FitDecoder.fitDeviceInfo(#{bytes.inspect})")
+        JSON.parse(json)
+      end
     end
   end
 end

data/lib/git_fit/import/apple_health.rb

@@ -433,7 +433,7 @@ module GitFit
         nil
       end
 
-      def build_attrs(_source_name, run_id, stats, meta, polyline,
+      def build_attrs(source_name, run_id, stats, meta, polyline,
                       workout_type, start_date, end_date, duration, duration_unit,
                       hr_avg: nil, hr_max: nil, elevation: {})
         distance = nil
@@ -477,6 +477,7 @@ module GitFit
           steps: steps_from_stats(stats),
           average_temperature: parse_temperature(meta['HKWeatherTemperature']),
           source: 'apple_health',
+          app: source_name,
           external_id: meta['HKExternalUUID'],
         }
       end

data/lib/git_fit/source/base.rb

@@ -136,6 +136,8 @@ module GitFit
           attrs['summary_polyline'] = @privacy.filter(attrs['summary_polyline'])
         end
 
+        apply_lineage!(attrs)
+
         existing = @db[:activities].where(run_id: attrs['run_id']).first
         if existing
           attrs.delete('created_at')
@@ -148,6 +150,12 @@ module GitFit
         end
       end
 
+      def apply_lineage!(attrs)
+        attrs['device'] = nil if attrs['device'].to_s.empty?
+        attrs['app'] = GitFit.default_app(attrs['app'], attrs['source'])
+        attrs['lineage'] = GitFit.build_lineage(attrs['device'], attrs['app'], attrs['source'])
+      end
+
       def skip_type?(sport_type)
         return false unless @activity_filter
         !@activity_filter.include?(sport_type.to_s.downcase)

data/lib/git_fit/sync/base.rb

@@ -201,6 +201,8 @@ module GitFit
           attrs['summary_polyline'] = @privacy.filter(attrs['summary_polyline'])
         end
 
+        apply_lineage!(attrs)
+
         existing = @db[:activities].where(run_id: attrs['run_id']).first
         if existing
           attrs.delete('created_at')
@@ -213,6 +215,12 @@ module GitFit
         end
       end
 
+      def apply_lineage!(attrs)
+        attrs['device'] = nil if attrs['device'].to_s.empty?
+        attrs['app'] = GitFit.default_app(attrs['app'], attrs['source'])
+        attrs['lineage'] = GitFit.build_lineage(attrs['device'], attrs['app'], attrs['source'])
+      end
+
       def skip_type?(sport_type)
         return false unless @activity_filter
         !@activity_filter.include?(sport_type.to_s.downcase)

data/lib/git_fit/sync/garmin_base.rb

@@ -141,6 +141,7 @@ module GitFit
         end
 
         attrs = build_attrs(details, act_id, type, polyline, l2_data: l2)
+        attrs[:device] = extract_device(act_id)
 
         if (start_t = parse_garmin_time(details.dig('summaryDTO', 'startTimeGMT')))
           local_t = resolve_local_time(start_t, act_id, polyline)
@@ -159,6 +160,22 @@ module GitFit
         self.class.source_prefix
       end
 
+      def self.format_garmin_device(token)
+        # garminProduct token (e.g. "edge540") or unresolved numeric pk →
+        # human label ("Garmin Edge 540" / "Garmin 3307")
+        return "Garmin #{token}" if token.is_a?(Integer)
+        body = token.to_s.tr('_', ' ').split.map { |w| format_garmin_word(w) }.join(' ')
+        body.empty? ? nil : "Garmin #{body}"
+      end
+
+      def self.format_garmin_word(word)
+        match = word.match(/\A(\D+?)(\d.*)\z/)
+        return GARMIN_DEVICE_PREFIXES.fetch(word, word.capitalize) unless match
+
+        prefix = GARMIN_DEVICE_PREFIXES.fetch(match[1], match[1].capitalize)
+        "#{prefix} #{match[2].sub(/x\z/, 'X')}"
+      end
+
       private
 
       def access_token_valid?
@@ -670,6 +687,9 @@ module GitFit
 
       FIT_EPOCH = 631_065_600
 
+      # Garmin FIT garminProduct token prefix → display prefix (unlisted → capitalize)
+      GARMIN_DEVICE_PREFIXES = { 'fr' => 'Forerunner', 'hrm' => 'HRM' }.freeze
+
       def raw_path(platform_id)
         File.join(raw_dir, platform_id, 'activity.fit')
       end
@@ -754,6 +774,23 @@ module GitFit
         false
       end
 
+      # FIT device_info creator message → "Garmin Edge 540"-style device label;
+      # product ids missing from the bundled profile fall back to "Garmin <pk>"
+      # (workouts#38 — Connect deviceTypePk has no public lookup table)
+      def extract_device(activity_id)
+        fit_path = raw_path(activity_id)
+        return nil unless File.exist?(fit_path)
+
+        infos = FIT::Decoder.device_info(fit_path)
+        info = infos.find { |d| d['deviceIndex'] == 'creator' } || infos.first
+        return nil unless info && info['garminProduct']
+
+        self.class.format_garmin_device(info['garminProduct'])
+      rescue StandardError => e
+        warn "Garmin: device_info decode failed for #{activity_id}: #{e.message}"
+        nil
+      end
+
       def fit_to_l2(activity_id)
         fit_path = raw_path(activity_id)
         return nil unless File.exist?(fit_path)

data/lib/git_fit/sync/strava.rb

@@ -10,6 +10,14 @@ module GitFit
     class Strava < Base
       BASE_URL = 'https://www.strava.com/api/v3'
 
+      # device_name → app prefix rules (workouts#37); unmatched/absent → Strava mobile
+      DEVICE_APP_RULES = [
+        [/\AXOSS/i, 'XOSS'],
+        [/\AiGPSPORT/i, 'iGPSPORT'],
+        [/\AGarmin/i, 'Garmin Connect'],
+        [/Apple Watch/i, 'Apple Watch'],
+      ].freeze
+
       register_adapter
       register_config :client_id, :client_secret, :refresh_token,
                       %w[web_auth jwt], %w[web_auth auth_seed]
@@ -47,6 +55,11 @@ module GitFit
         result
       end
 
+      def self.app_for_device(name)
+        return 'Strava' if name.nil? || name.to_s.empty?
+        DEVICE_APP_RULES.find { |re, _| re.match?(name) }&.last || 'Strava'
+      end
+
       private
 
       def refresh_access_token
@@ -88,6 +101,8 @@ module GitFit
 
         attrs = build_attrs(act, type, polyline, external_id: external_id,
                                                  elevation_loss: l2 ? elevation_loss_from_stream(l2) : nil)
+        attrs[:device] = detail['device_name']
+        attrs[:app] = self.class.app_for_device(attrs[:device])
         upsert_activity(attrs)
         attrs
       end

data/lib/git_fit/sync/xingzhe.rb

@@ -312,6 +312,7 @@ module GitFit
           # Prefer workout from full_detail for attrs that benefit from richer data
           if detail_workout
             attrs[:elevation_max] ||= detail_workout['max_altitude']&.to_f&.nonzero?
+            attrs[:device] = device_from_workout(detail_workout)
             # equipment_info / power / grade etc. are archived in detail.json for downstream use
           end
         end
@@ -351,6 +352,13 @@ module GitFit
         attrs
       end
 
+      # workout.equipment_info[0].name — e.g. "行者小G(Gen.2)"; phone-recorded
+      # workouts have product=0 / empty equipment_info → nil (workouts#39)
+      def device_from_workout(workout)
+        name = workout&.[]('equipment_info')&.first&.[]('name')
+        name.to_s.empty? ? nil : name
+      end
+
       def derive_elevation_min(stream, detail_workout)
         if stream && (alt = stream['altitude']) && alt.is_a?(Array) && alt.size >= 2
           alts = alt.compact.map(&:to_f)

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Lax
@@ -271,6 +271,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - db/migrations/001_full_schema.rb
+- db/migrations/002_add_device_app_lineage.rb
 - exe/git-fit
 - lib/git-fit.rb
 - lib/git_fit/ability.rb