git-fit 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84b35d1ebca428d183a3d0e212839944bc9f28a4fdcfd290b6e97fc09ea85d9
-  data.tar.gz: dabc0729177f29c09c24f28e427e15eee398ec578b46fc6d223d85fe8b1404b4
+  metadata.gz: 3cea1445cb1e525a1be8c8b814b7b3f69a27aac4e4e42411b5eb993227fef373
+  data.tar.gz: f672f8bfbded7feb9484dc8a214b945338c1a7c3136c1e80f539afe66bb1db0e
 SHA512:
-  metadata.gz: df18eb00f817854d8d8f0a3bf3355282024f9a7b721b35c88da2a911a7e7597daa63830eb12556386f46fb805230639b783da5a3fed44f690503b97e9cb01053
-  data.tar.gz: 9d0a7997697ee9ba932975d3765768b1078321c4f80109f469cb1482f8404a2c48f484ec391536cd6c9573f74aa514656aea1ebf864ae8b9b04f0333b7e3f7dc
+  metadata.gz: e051bd7d24a99544a65b6f537bfb5483980cc399a1977310383f5f3a6ed8c4381bfe3a6811b0de3dc359571f9128b093379b4cc8d4ad923b8252190c7a738fce
+  data.tar.gz: 493fa21dffeb7d8aed1039e3aad0eaee0c3a4c4774129fbedf4293962923fcd456715b900b21dd64e1eee8e9167660bddffc968bb99aa0d8628c637215ed4a14

data/lib/git_fit/sync/garmin_base.rb

@@ -160,6 +160,21 @@ module GitFit
         self.class.source_prefix
       end
 
+      # device_info messages → label of the recording device. Lookup order:
+      # GARMIN_PRODUCT_SUPPLEMENT (full display name) → garminProduct token
+      # ("Garmin Edge 540") → "Garmin <pk>" fallback (workouts#38/#59)
+      def self.device_label(infos)
+        info = infos.find { |d| d['deviceIndex'] == 'creator' } || infos.first
+        return nil unless info
+
+        supplement = GARMIN_PRODUCT_SUPPLEMENT[info['product']]
+        return supplement if supplement
+
+        return nil unless info['garminProduct']
+
+        format_garmin_device(info['garminProduct'])
+      end
+
       def self.format_garmin_device(token)
         # garminProduct token (e.g. "edge540") or unresolved numeric pk →
         # human label ("Garmin Edge 540" / "Garmin 3307")
@@ -690,6 +705,11 @@ module GitFit
       # Garmin FIT garminProduct token prefix → display prefix (unlisted → capitalize)
       GARMIN_DEVICE_PREFIXES = { 'fr' => 'Forerunner', 'hrm' => 'HRM' }.freeze
 
+      # Product pk → full display name for co-branded hardware missing from the
+      # bundled garminProduct profile; no "Garmin " prefix (Cannondale wheel
+      # sensor is Garmin-made but Cannondale-branded, workouts#59)
+      GARMIN_PRODUCT_SUPPLEMENT = { 3307 => 'Cannondale Wheel Sensor' }.freeze
+
       def raw_path(platform_id)
         File.join(raw_dir, platform_id, 'activity.fit')
       end
@@ -774,18 +794,14 @@ 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)
+      # FIT device_info → recording-device label (via self.class.device_label);
+      # product ids missing everywhere 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'])
+        self.class.device_label(FIT::Decoder.device_info(fit_path))
       rescue StandardError => e
         warn "Garmin: device_info decode failed for #{activity_id}: #{e.message}"
         nil

data/lib/git_fit/sync/igpsport.rb

@@ -18,6 +18,11 @@ module GitFit
 
       RAW_EXT = 'fit'
 
+      # FIT product id → 码表型号名。本库观测仅 104（serialNumber 2148868369 单机）；
+      # 型号名经 Strava device_name 交叉佐证：本源 85 条 ↔ strava detail.device_name
+      # 'iGPSPORT BSC100Max' 85 条完全对应（workouts#59）。
+      FIT_PRODUCT_MODELS = { 104 => 'BSC100Max' }.freeze
+
       register_adapter
       register_config :phone, :password
 
@@ -106,12 +111,25 @@ module GitFit
         elevation_stats = elevation_stats_from_records(wgs_points, fit_path)
 
         attrs = build_attrs(act, ride_id, polyline, sensor_summary, elevation_stats)
+        attrs[:device] = extract_device(fit_path)
         return false unless attrs
 
         upsert_activity(attrs)
         attrs
       end
 
+      # FIT device_info creator → "iGPSPORT <model>"；未收录 product 返回 nil
+      # （workouts#59 — 型号名仅 Strava device_name 有）
+      def extract_device(fit_path)
+        infos = FIT::Decoder.device_info(fit_path)
+        info = infos.find { |d| d['deviceIndex'] == 'creator' } || infos.first
+        model = info && FIT_PRODUCT_MODELS[info['product']]
+        model ? "iGPSPORT #{model}" : nil
+      rescue StandardError => e
+        warn "IGPSPORT: device_info decode failed for #{fit_path}: #{e.message}"
+        nil
+      end
+
       def get_download_url(ride_id)
         resp = Faraday.get("#{DOWNLOAD_URL}/#{ride_id}", {}, @auth_headers)
         return nil unless resp.status == 200

data/lib/git_fit/version.rb

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

metadata

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