git-fit 0.10.4 → 0.10.6

data/lib/git_fit/export/json.rb

@@ -7,10 +7,11 @@ module GitFit
     class JSON
       PLACEHOLDER_POLYLINE = 'gqqrFurkeU??'
 
-      def initialize(db:, output:, activity_filter: nil)
+      def initialize(db:, output:, activity_filter: nil, tracks_output: nil)
         @db = db
         @output = output
         @activity_filter = activity_filter
+        @tracks_output = tracks_output
       end
 
       def call
@@ -24,23 +25,40 @@ module GitFit
 
         group_members_cache = {}
 
+        tracks = @tracks_output ? {} : nil
+
         formatted = activities.map do |a|
           gid = run_id_to_group[a[:run_id]]
           if gid
             group_members_cache[gid] ||= @db[:dedup_group_members].where(group_id: gid).all
-            composite_activity(a, gid, group_members_cache[gid])
+            composite_activity(a, gid, group_members_cache[gid], tracks)
           else
-            format_activity(a)
+            format_activity(a, tracks)
           end
         end
 
         File.write(@output, ::JSON.pretty_generate(formatted))
+        File.write(@tracks_output, ::JSON.generate(tracks)) if @tracks_output
         formatted.size
       end
 
       private
 
-      def format_activity(a)
+      def extract_polyline(a)
+        return nil if a[:source] == 'keep' && a[:summary_polyline] == PLACEHOLDER_POLYLINE
+
+        a[:summary_polyline]
+      end
+
+      def pick_best_polyline(group_activities)
+        candidates = group_activities.filter_map { |a| extract_polyline(a) }
+        candidates.max_by { |p| p.to_s.length }
+      end
+
+      def format_activity(a, tracks = nil)
+        polyline = extract_polyline(a)
+        tracks[a[:run_id]] = polyline if tracks && polyline
+
         base = {
           run_id: a[:run_id],
           name: a[:name],
@@ -51,8 +69,7 @@ module GitFit
           start_date: a[:start_date],
           start_date_local: a[:start_date_local],
           location_country: a[:location_country],
-          summary_polyline: a[:source] == 'keep' && a[:summary_polyline] == PLACEHOLDER_POLYLINE ?
-            nil : a[:summary_polyline],
+          summary_polyline: tracks ? nil : polyline,
           average_heartrate: a[:average_heartrate] && a[:average_heartrate] != 0 ? a[:average_heartrate] : nil,
           max_heartrate: a[:max_heartrate],
           average_cadence: a[:average_cadence],
@@ -71,7 +88,7 @@ module GitFit
         base
       end
 
-      def composite_activity(activity, group_id, members)
+      def composite_activity(activity, group_id, members, tracks = nil)
         run_ids = members.map { |m| m[:run_id] }
         group_activities = @db[:activities].where(run_id: run_ids).all
 
@@ -85,11 +102,17 @@ module GitFit
           end
           result
         else
-          members.first&.slice(:run_id, :distance, :moving_time, :elapsed_time,
+          composite = members.first&.slice(:run_id, :distance, :moving_time, :elapsed_time,
             :average_heartrate, :max_heartrate, :elevation_gain,
             :average_speed, :average_cadence, :max_cadence) || {}
+          composite[:summary_polyline] = pick_best_polyline(group_activities)
+          composite
         end
 
+        polyline = composite[:summary_polyline]
+        tracks[activity[:run_id]] = polyline if tracks && polyline
+        composite[:summary_polyline] = tracks ? nil : polyline
+
         composite[:run_id] = activity[:run_id]
         composite[:source] = activity[:source]
         composite[:sport_type] = activity[:sport_type]

data/lib/git_fit/export.rb

@@ -8,5 +8,6 @@ end
 require_relative 'export/defaults'
 require_relative 'export/json'
 require_relative 'export/csv'
+require_relative 'export/gpx'
 require_relative 'export/calculator'
 require_relative 'export/stats'

data/lib/git_fit/fit.rb

@@ -1,3 +1,9 @@
 # frozen_string_literal: true
 
+module GitFit
+  module FIT
+    FIT_EPOCH = 631_065_600
+  end
+end
+
 require_relative 'fit/decoder'

data/lib/git_fit/import/local_file.rb

@@ -124,8 +124,9 @@ module GitFit
               h[:heart_rate] = pt[4] if pt[4]
               h
             }
-            std_tmp = File.join(std_source_dir, ".#{activity[:run_id]}.json.tmp")
-            std_final = File.join(std_source_dir, "#{activity[:run_id]}.json")
+            natural_id = activity[:run_id].sub("#{source}_", '')
+            std_tmp = File.join(std_source_dir, ".#{natural_id}.json.tmp")
+            std_final = File.join(std_source_dir, "#{natural_id}.json")
             File.write(std_tmp, JSON.generate(std_data))
             File.rename(std_tmp, std_final)
 

data/lib/git_fit/std/resolver.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Std
+    module Resolver
+      # garmin_cn 必须排在 garmin 前面："garmin_cn_7".start_with?("garmin_") == true
+      SOURCE_PREFIXES = %w[
+        garmin_cn garmin strava keep igpsport xoss xingzhe
+        apple_health gpx fit tcx
+      ].freeze
+
+      # 从 run_id 解构出 [source, natural_id]
+      # natural_id = platform_id（sync）或内容哈希（local）
+      def self.decompose(run_id)
+        SOURCE_PREFIXES.each do |s|
+          prefix = "#{s}_"
+          return [s, run_id.sub(prefix, '')] if run_id.start_with?(prefix)
+        end
+        [nil, nil]
+      end
+
+      # @return [String, nil] std 文件路径（相对 cwd），找不到返回 nil
+      def self.find(run_id)
+        source, natural_id = decompose(run_id)
+        return nil unless source
+
+        path = File.join('data', 'std', source, "#{natural_id}.json")
+        path if File.exist?(path)
+      end
+    end
+  end
+end

data/lib/git_fit/sync/base.rb

@@ -235,6 +235,17 @@ module GitFit
           .select_map(:run_id)
           .map { |rid| rid.sub(/\A#{Regexp.escape(prefix)}/, '') }
       end
+
+      def normalize_fit_timestamps(points)
+        points.map do |pt|
+          ts = pt['timestamp']
+          next pt unless ts.is_a?(Numeric)
+
+          pt = pt.dup
+          pt['timestamp'] = Time.at(FIT::FIT_EPOCH + ts).utc.iso8601
+          pt
+        end
+      end
     end
   end
 end

data/lib/git_fit/sync/igpsport.rb

@@ -140,7 +140,7 @@ module GitFit
         FileUtils.mkdir_p(dir)
         tmp = File.join(dir, ".#{ride_id}.json.tmp")
         final = File.join(dir, "#{ride_id}.json")
-        File.write(tmp, JSON.generate(wgs_points))
+        File.write(tmp, JSON.generate(normalize_fit_timestamps(wgs_points)))
         File.rename(tmp, final)
       end
 

data/lib/git_fit/sync/strava.rb

@@ -134,27 +134,40 @@ module GitFit
         coords = Geo::Polyline.decode(polyline)
         return nil if coords.empty?
 
-        alt_data = streams['altitude']&.dig('data')
-        time_data = streams['time']&.dig('data')
-        hr_data = streams['heartrate']&.dig('data')
-        cad_data = streams['cadence']&.dig('data')
-        watts_data = streams['watts']&.dig('data')
-        temp_data = streams['temp']&.dig('data')
-        speed_data = streams['velocity_smooth']&.dig('data')
-        dist_data = streams['distance']&.dig('data')
+        streams_data = %w[altitude time heartrate cadence watts temp velocity_smooth distance].to_h do |k|
+          [k, streams[k]&.dig('data')]
+        end
+
+        start_time = begin
+          Time.parse(detail['start_date'])
+        rescue StandardError
+          nil
+        end
 
         coords.each_with_index.map do |latlng, i|
-          pt = { positionLat: latlng[0], positionLong: latlng[1] }
-          pt[:altitude] = alt_data[i] if alt_data && i < alt_data.size
-          pt[:timestamp] = time_data[i] if time_data && i < time_data.size
-          pt[:heartRate] = hr_data[i] if hr_data && i < hr_data.size
-          pt[:cadence] = cad_data[i] if cad_data && i < cad_data.size
-          pt[:power] = watts_data[i] if watts_data && i < watts_data.size
-          pt[:temperature] = temp_data[i] if temp_data && i < temp_data.size
-          pt[:speed] = speed_data[i] if speed_data && i < speed_data.size
-          pt[:distance] = dist_data[i] if dist_data && i < dist_data.size
-          pt
+          build_l2_point(latlng, i, streams_data, start_time)
+        end
+      end
+
+      def build_l2_point(latlng, i, streams_data, start_time)
+        pt = { positionLat: latlng[0], positionLong: latlng[1] }
+        pt[:altitude] = stream_at(streams_data, 'altitude', i)
+        ts = stream_at(streams_data, 'time', i)
+        if ts
+          pt[:timestamp] = start_time ? (start_time + ts).utc.iso8601 : ts
         end
+        pt[:heartRate] = stream_at(streams_data, 'heartrate', i)
+        pt[:cadence] = stream_at(streams_data, 'cadence', i)
+        pt[:power] = stream_at(streams_data, 'watts', i)
+        pt[:temperature] = stream_at(streams_data, 'temp', i)
+        pt[:speed] = stream_at(streams_data, 'velocity_smooth', i)
+        pt[:distance] = stream_at(streams_data, 'distance', i)
+        pt
+      end
+
+      def stream_at(streams_data, key, i)
+        data = streams_data[key]
+        data && i < data.size ? data[i] : nil
       end
 
       def build_attrs(act, category, polyline = nil, external_id: nil)

data/lib/git_fit/sync/xoss.rb

@@ -348,7 +348,7 @@ module GitFit
         FileUtils.mkdir_p(dir)
         tmp = File.join(dir, ".#{act_id}.json.tmp")
         final = File.join(dir, "#{act_id}.json")
-        File.write(tmp, JSON.generate(points))
+        File.write(tmp, JSON.generate(normalize_fit_timestamps(points)))
         File.rename(tmp, final)
       end
 

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.6
 platform: ruby
 authors:
 - Lax
@@ -177,6 +177,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +232,8 @@ files:
 - db/migrations/002_iso8601_time_format.rb
 - exe/git-fit
 - lib/git-fit.rb
+- lib/git_fit/auth/garmin_token.rb
+- lib/git_fit/auth/strava.rb
 - lib/git_fit/cli.rb
 - lib/git_fit/cli/export.rb
 - lib/git_fit/cli/geo_cli.rb
@@ -232,10 +248,17 @@ files:
 - lib/git_fit/db/cli.rb
 - lib/git_fit/db/connection.rb
 - lib/git_fit/db/rebuild.rb
+- lib/git_fit/dedup/field_elector.rb
+- lib/git_fit/dedup/group_consolidator.rb
+- lib/git_fit/dedup/log_writer.rb
+- lib/git_fit/dedup/matcher.rb
+- lib/git_fit/dedup/service.rb
+- lib/git_fit/dedup/trajectory.rb
 - lib/git_fit/export.rb
 - lib/git_fit/export/calculator.rb
 - lib/git_fit/export/csv.rb
 - lib/git_fit/export/defaults.rb
+- lib/git_fit/export/gpx.rb
 - lib/git_fit/export/json.rb
 - lib/git_fit/export/stats.rb
 - lib/git_fit/fit.rb
@@ -265,6 +288,7 @@ files:
 - lib/git_fit/source/keep.rb
 - lib/git_fit/source/tally.rb
 - lib/git_fit/sport_mapper.rb
+- lib/git_fit/std/resolver.rb
 - lib/git_fit/strava_web/file_check.rb
 - lib/git_fit/sync/base.rb
 - lib/git_fit/sync/garmin.rb