git-fit 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7cac4c94c7c256f2385670c9b386a73edf9d25c54cd0a2b4def3e69e93be273
-  data.tar.gz: dcf8048d51b7249ec2dd8097058cf4cbc1b592c19d71bb75eb1d283eaf22f6b1
+  metadata.gz: d61225229494679f4d293ddcfe384f79d9b6a2b7ea4007728fe45a2b47464506
+  data.tar.gz: 9e5934dc3360b9bf9a3dd925006379647f59140b3e2efb852b048ca3704d6fa8
 SHA512:
-  metadata.gz: 2e5dbe464f60f71675e256e639a0515acec48b69e1a92d9b64170b8de22d90a6727a2cc6692f273f8742a5164ae279dc94dacce5ea4d6c30ed71a82311c4f597
-  data.tar.gz: f6af70eda9113085f911f2126eef03e112b578994327ef9f825239be36e91ac329eb4f4c03bc49dee21b2445c6a671b1f33e00a81731560972f9ed4a40bdcf25
+  metadata.gz: 4c1637ae4f4ac30c144703f4e9043b92278e7a30d6972c47c579740a7838207c1bedfd781724cfa74baaa4d40ecd5db4a22876f9e428e3492411bd85e18abb58
+  data.tar.gz: f51296343450139ecb8d8446a697648464c307902e05e25d76621af17cd3af2554b8e5b5eb324a5a5e005d05e681007684ced428e1513aeb1c2a508a96a21870

data/db/migrations/002_add_device_app_lineage.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Issue workouts#37: device / app / lineage columns
+#   device  — physical hardware that produced the track file (e.g. "XOSS SPRINT")
+#   app     — software the user directly interacted with (e.g. "Garmin Connect")
+#   lineage — denormalized "device → app → source" chain for query/display
+Sequel.migration do
+  up do
+    alter_table(:activities) do
+      add_column :device, String
+      add_column :app, String
+      add_column :lineage, String
+      add_index :device
+      add_index :app
+      add_index :lineage
+    end
+  end
+
+  down do
+    alter_table(:activities) do
+      drop_index :lineage
+      drop_index :app
+      drop_index :device
+      drop_column :lineage
+      drop_column :app
+      drop_column :device
+    end
+  end
+end

data/lib/git-fit.rb

@@ -7,6 +7,22 @@ require 'fileutils'
 module GitFit
   SPORT_CATEGORIES = %w[run ride hike walk swim ski workout other].freeze
 
+  # Per-source default app label (used when an adapter doesn't set `app` itself).
+  # Dynamic sources (strava per-device, apple_health per sourceName) set `app` explicitly.
+  DEFAULT_APPS = {
+    'garmin' => 'Garmin Connect',
+    'garmin_cn' => 'Garmin Connect',
+    'keep' => 'Keep',
+    'igpsport' => 'iGPSPORT',
+    'xoss' => 'XOSS',
+    'codoon' => 'Codoon',
+    'joyrun' => 'Joyrun',
+    'xingzhe' => 'XingZhe',
+    'strava' => 'Strava',
+    '2bulu' => '2bulu',
+    'apple_health' => 'Apple Health',
+  }.freeze
+
   @registered_configs = []
 
   class << self
@@ -37,6 +53,24 @@ module GitFit
       }
     end
 
+    # Resolved `app` label for an activity: explicit value wins, else DEFAULT_APPS, else raw source.
+    def default_app(app, source)
+      return app unless app.nil? || app.to_s.empty?
+      DEFAULT_APPS.fetch(source, source)
+    end
+
+    # Lineage chain "device → app → source"; blank parts dropped, case-insensitive
+    # dedup so app==source collapses (Keep + keep → "Keep"). Display-only, never
+    # used for dedup decisions (workouts#37).
+    def build_lineage(device, app, source)
+      seen = []
+      [device, app, source].each do |part|
+        next if part.nil? || part.to_s.empty?
+        seen << part unless seen.any? { |s| s.casecmp?(part) }
+      end
+      seen.join(' → ')
+    end
+
     def format_time(seconds)
       return nil unless seconds
       hours = seconds / 3600

data/lib/git_fit/export/json.rb

@@ -85,6 +85,9 @@ module GitFit
           elevation_max: a[:elevation_max_terrain] || a[:elevation_max],
           steps: a[:steps],
           source: a[:source],
+          device: a[:device],
+          app: a[:app],
+          lineage: a[:lineage],
         }
         if a[:divisions]
           base[:divisions] = ::JSON.parse(a[:divisions])