git-fit 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e88e21cd60e366ac83ce9f0dac135a5532d6c8953dc9557873a39b55de07174
-  data.tar.gz: 38d23b0f68e6e15ecbe9413d3ac0992fdab84faaa7b2977c6b4284a1f1a223ca
+  metadata.gz: 7e56c52b84377fa13e79c341ee252e84ce3664a448de70ceb690609c55f6d659
+  data.tar.gz: 5eee032b2293d18b5775a1250b15c723f794c02aedf27b0198d975c5fd1f27d5
 SHA512:
-  metadata.gz: 77e28b8840ad990c41c82585de950af40761f52cfddba38f9b7d6d64386fdc5a9e87191e33d4be9d5a945da950a13e0e3f5182a92a1eaeb0f38ecc481dcb6917
-  data.tar.gz: f6fcee3ebc58afdcbaeb849cb2eca576de1039ed13783424abda28da6f6fccc80cc9fd5690efdf492e533039b22adcfb16b8a98b28cbc5e5494165dd05b88328
+  metadata.gz: ba9969a0f3a82a4b255e41e41739cafd75554a1a36e499322610d50cd0fba75ebec6e46a8936418ca58dcd4763e167f72467036b4ff778d6f92a142d53ba6e7b
+  data.tar.gz: 470017ec4828dcae793778c26732234b9c27b6aeac561d774a152734adc2a2ab27cc362feb586b40862cc7ddb45c16924026ae3ac99c181ed20d7b3b5b3f2fa3

data/lib/git_fit/elevation/backfill.rb

@@ -3,7 +3,7 @@
 module GitFit
   module Elevation
     class Backfill
-      SOURCES = %w[igpsport xoss strava garmin garmin_cn].freeze
+      SOURCES = %w[igpsport xoss strava garmin garmin_cn xingzhe].freeze
       BATCH_SIZE = 100
 
       def initialize(db, force: false)
@@ -61,6 +61,7 @@ module GitFit
                when 'garmin' then compute_from_fit(source, natural_id)
                when 'garmin_cn' then compute_from_fit(source, natural_id)
                when 'strava' then compute_from_l2(source, natural_id)
+               when 'xingzhe' then compute_from_xingzhe(natural_id)
                else return
                end
 
@@ -118,6 +119,25 @@ module GitFit
         nil
       end
 
+      def compute_from_xingzhe(natural_id)
+        raw_path = File.join('data', 'raw', 'xingzhe', "#{natural_id}.json")
+        return nil unless File.exist?(raw_path)
+
+        raw = JSON.parse(File.read(raw_path))
+        alts = raw.dig('stream', 'altitude') || []
+        return nil if alts.size < 2
+
+        {
+          elevation_gain: elevation_gain_from_alts(alts)&.round(1),
+          elevation_loss: elevation_loss_from_alts(alts)&.round(1),
+          elevation_min: alts.min&.round(1),
+          elevation_max: alts.max&.round(1),
+        }
+      rescue StandardError => e
+        warn "Elevation backfill [xingzhe][#{natural_id}]: #{e.message}"
+        nil
+      end
+
       def fit_path_for(source, natural_id)
         case source
         when 'garmin', 'garmin_cn'

data/lib/git_fit/sync/xingzhe.rb

@@ -14,6 +14,7 @@ module GitFit
       WORKOUTS_PATH = '/api/v1/pgworkout/'
       STREAM_PATH = '/api/v1/pgworkout/'
       DETAIL_PATH = '/api/v1/pgworkout/'
+      EXPORT_BASE = '/api/v1/workout/'
       RSA_PUBKEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmuQkBbijudDAJgfffDeeIButqWHZvUwcRuvWdg89393FSdz3IJUHc0rgI/S3WuU8N0VePJLmVAZtCOK4qe4FY/eKmWpJmn7JfXB4HTMWjPVoyRZmSYjW4L8GrWmh51Qj7DwpTADadF3aq04o+s1b8LXJa8r6+TIqqL5WUHtRqmQIDAQAB'
 
       SPORT_MAP = {
@@ -21,8 +22,6 @@ module GitFit
         5 => 'swim', 6 => 'walk', 11 => 'ski', 13 => 'workout'
       }.freeze
 
-      RAW_EXT = 'json'
-
       SESSION_TTL = 30 * 24 * 60 * 60
 
       register_adapter
@@ -85,6 +84,49 @@ module GitFit
         @last_http_code
       end
 
+      # ── Raw directory layout (Phase 1, mirrors garmin Phase 1) ──────────
+      #   data/raw/xingzhe/{id}/stream.json   — stream envelope
+      #   data/raw/xingzhe/{id}/detail.json   — full detail response (workout+user+...)
+      #   data/raw/xingzhe/{id}/{id}.gpx      — GPX export (when available)
+      #   data/raw/xingzhe/{id}/{id}.fit      — FIT export (when is_fit)
+      def raw_path(platform_id)
+        File.join(raw_dir, platform_id, 'stream.json')
+      end
+
+      def raw_detail_path(platform_id)
+        File.join(raw_dir, platform_id, 'detail.json')
+      end
+
+      def raw_gpx_path(platform_id)
+        File.join(raw_dir, platform_id, "#{platform_id}.gpx")
+      end
+
+      def raw_fit_path(platform_id)
+        File.join(raw_dir, platform_id, "#{platform_id}.fit")
+      end
+
+      def raw_file_exists?(platform_id)
+        dir = File.join(raw_dir, platform_id)
+        %w[stream.json detail.json].all? { |f| File.exist?(File.join(dir, f)) }
+      end
+
+      def write_source_archive(data, platform_id, _ext = 'json')
+        # Back-compat entry point — now writes stream.json into per-id dir
+        write_raw_file(data, 'stream.json', platform_id)
+      end
+
+      def write_raw_file(data, filename, platform_id)
+        dir = File.join(raw_dir, platform_id)
+        FileUtils.mkdir_p(dir)
+        tmp = File.join(dir, ".#{filename}.tmp")
+        dest = File.join(dir, filename)
+        case data
+        when String then File.write(tmp, data)
+        when Hash, Array then File.write(tmp, JSON.generate(data))
+        end
+        File.rename(tmp, dest)
+      end
+
       private
 
       def http_request(method, path, body: nil, params: nil, headers: {})
@@ -252,9 +294,28 @@ module GitFit
           average_speed: (act['avg_speed'].to_f / 3.6).round(2).nonzero?,
           elevation_gain: act['elevation_gain'].to_f.nonzero?,
           elevation_loss: act['elevation_loss'].to_f.nonzero?,
+          elevation_max: act['max_altitude']&.to_f&.nonzero?,
           source: 'xingzhe',
         }
 
+        # Phase 1: fetch and persist detail + stream; Phase 2: exports
+        detail_workout = nil
+        full_detail = nil
+
+        # Fetch full detail (public, with segments/slopes/pois/laps) for raw archive
+        fetched_full, fetched_workout = fetch_full_detail(aid)
+        if fetched_full
+          full_detail = fetched_full
+          detail_workout = fetched_workout
+          # Persist full detail response (code/data/msg) as detail.json
+          write_raw_file(full_detail, 'detail.json', aid)
+          # 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?
+            # equipment_info / power / grade etc. are archived in detail.json for downstream use
+          end
+        end
+
         pts = nil
         stream = fetch_stream(aid)
         if stream
@@ -270,19 +331,36 @@ module GitFit
           end
         end
 
-        if attrs[:summary_polyline].nil? && (detail = fetch_activity_detail(aid)) && (segments = detail['segments_km'])
-          pts = segments.map { |s| [s['latitude'], s['longitude']] }
-          attrs[:summary_polyline] = Geo::Polyline.encode(pts) if pts.size >= 2
+        if attrs[:summary_polyline].nil?
+          fallback_workout = detail_workout || fetch_activity_detail(aid)
+          if fallback_workout && (segments = fallback_workout['segments_km'])
+            pts = segments.map { |s| [s['latitude'], s['longitude']] }
+            attrs[:summary_polyline] = Geo::Polyline.encode(pts) if pts.size >= 2
+          end
         end
 
+        # Elevation min: prefer stream altitude min, fallback to segments_km altitude min (see wiki)
+        attrs[:elevation_min] = derive_elevation_min(stream, detail_workout || act)
+
+        # Exports (best-effort, per-record format probing — see issue #86)
+        try_download_exports(aid, detail_workout || act) if stream || full_detail
+
         attrs[:start_date_local] = resolve_local_time(start_t, pts)
 
         upsert_activity(attrs)
         attrs
       end
 
-      def raw_path(platform_id)
-        File.join(raw_dir, "#{platform_id}.#{RAW_EXT}")
+      def derive_elevation_min(stream, detail_workout)
+        if stream && (alt = stream['altitude']) && alt.is_a?(Array) && alt.any?
+          v = alt.compact.min
+          return v.to_f if v
+        end
+        if detail_workout && (segs = detail_workout['segments_km']) && segs.is_a?(Array) && segs.any?
+          v = segs.filter_map { |s| s['altitude'] }.min
+          return v.to_f if v
+        end
+        nil
       end
 
       def fetch_stream(id)
@@ -338,6 +416,114 @@ module GitFit
         data.dig('data', 'workout')
       end
 
+      # Full detail with segments/slopes/pois/laps — returns [full_json, workout_hash]
+      def fetch_full_detail(id)
+        resp = http_request(:get, "#{DETAIL_PATH}#{id}/",
+          params: { segments: 'true', slopes: 'true', pois: 'true', laps: 'true' })
+        return [nil, nil] unless resp.code.to_i == 200
+
+        data = JSON.parse(resp.body)
+        return [nil, nil] unless data['code'] == 200 || data.dig('data', 'workout')
+
+        workout = data.dig('data', 'workout')
+        [data, workout]
+      rescue JSON::ParserError
+        [nil, nil]
+      end
+
+      def try_download_exports(activity_id, detail_workout)
+        # GPX: generally available — probe via authed GET
+        download_and_save_gpx(activity_id)
+        # FIT: only when is_fit truthy (per detail), else probe still but expect 404/302 empty
+        is_fit = detail_workout && detail_workout['is_fit']
+        # Always attempt FIT when summary suggests ride with device; but gate on is_fit to avoid noise
+        download_and_save_fit(activity_id) if is_fit
+      rescue StandardError => e
+        warn "XingZhe: export download failed for #{activity_id}: #{e.message}"
+      end
+
+      def download_and_save_gpx(activity_id)
+        resp = authed_get("#{EXPORT_BASE}#{activity_id}/gpx/")
+        return false unless resp && resp.code.to_i == 200
+        body = resp.body
+        return false if body.nil? || body.empty?
+        # GPX endpoint returns XML but Content-Type may be application/json — validate by prefix
+        stripped = body.lstrip
+        unless stripped.start_with?('<?xml', '<gpx')
+          # Some error responses are JSON with code/msg
+          begin
+            j = JSON.parse(body)
+            return false if j['code'] && j['code'] != 200
+          rescue JSON::ParserError
+            return false
+          end
+          return false unless stripped.include?('<gpx') || stripped.include?('<trk')
+        end
+        write_raw_file(body, "#{activity_id}.gpx", activity_id)
+        true
+      rescue StandardError => e
+        warn "XingZhe: failed to download gpx for #{activity_id}: #{e.message}"
+        false
+      end
+
+      def download_and_save_fit(activity_id)
+        # FIT export: 302 → presigned OSS URL (see issue #86 verification)
+        resp = http_request(:get, "#{EXPORT_BASE}#{activity_id}/fit/", headers: @headers || {})
+        code = resp.code.to_i
+        # 302/301 redirect to OSS is the expected success path — handle before auth check
+        if [301, 302, 303, 307, 308].include?(code)
+          location = resp['location'] || resp['Location']
+          if location && !location.empty?
+            uri = URI(location)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = uri.scheme == 'https'
+            http.open_timeout = 30
+            http.read_timeout = 60
+            req = Net::HTTP::Get.new(uri)
+            oss_resp = http.start { |h| h.request(req) }
+            return false unless oss_resp.code.to_i == 200
+
+            # Binary FIT — write as String (Ruby handles binary)
+            write_raw_file(oss_resp.body, "#{activity_id}.fit", activity_id)
+            return true
+          end
+        end
+        if auth_failure?(resp)
+          remove_stale_session
+          return false unless login
+
+          resp = http_request(:get, "#{EXPORT_BASE}#{activity_id}/fit/", headers: @headers)
+          code = resp.code.to_i
+          if [301, 302, 303, 307, 308].include?(code)
+            location = resp['location'] || resp['Location']
+            return false unless location && !location.empty?
+
+            uri = URI(location)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = uri.scheme == 'https'
+            http.open_timeout = 30
+            http.read_timeout = 60
+            req = Net::HTTP::Get.new(uri)
+            oss_resp = http.start { |h| h.request(req) }
+            return false unless oss_resp.code.to_i == 200
+
+            write_raw_file(oss_resp.body, "#{activity_id}.fit", activity_id)
+            return true
+          end
+        end
+        if code == 200
+          # Direct FIT (rare)
+          return false if resp.body.nil? || resp.body.empty?
+          write_raw_file(resp.body, "#{activity_id}.fit", activity_id)
+          true
+        else
+          false
+        end
+      rescue StandardError => e
+        warn "XingZhe: failed to download fit for #{activity_id}: #{e.message}"
+        false
+      end
+
       def map_sport(sport)
         SPORT_MAP[sport] || 'other'
       end

data/lib/git_fit/version.rb

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

metadata

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