git-fit 0.7.8 → 0.8.0

data/lib/git_fit/sync/strava.rb

@@ -1,20 +1,22 @@
-require_relative "base"
-require "faraday"
+# frozen_string_literal: true
+
+require_relative 'base'
+require 'faraday'
 
 module GitFit
   module Sync
     class SyncError < RuntimeError; end unless const_defined?(:SyncError)
 
     class Strava < Base
-      BASE_URL = "https://www.strava.com/api/v3"
+      BASE_URL = 'https://www.strava.com/api/v3'
 
       register_adapter
       register_config :client_id, :client_secret, :refresh_token
 
       def authenticate
-        return false unless @config["client_id"].to_s != "" &&
-                            @config["client_secret"].to_s != "" &&
-                            @config["refresh_token"].to_s != ""
+        return false unless @config['client_id'].to_s != '' &&
+                            @config['client_secret'].to_s != '' &&
+                            @config['refresh_token'].to_s != ''
         @access_token = refresh_access_token
         @access_token ? true : false
       end
@@ -27,9 +29,9 @@ module GitFit
           activities = fetch_activities(@access_token, page)
           break if activities.empty?
           activities.each do |act|
-            act_id = act["id"].to_s
+            act_id = act['id'].to_s
             next if existing.include?(act_id) && raw_file_exists?(act_id)
-            type = map_sport_type(act["type"], act["sport_type"])
+            type = map_sport_type(act['type'], act['sport_type'])
             next if skip_type?(type)
             ids << { id: act_id, type: type, summary: act }
           end
@@ -46,35 +48,41 @@ module GitFit
       private
 
       def refresh_access_token
-        resp = Faraday.post("https://www.strava.com/oauth/token") do |req|
+        resp = Faraday.post('https://www.strava.com/oauth/token') do |req|
           req.body = {
-            client_id: @config["client_id"],
-            client_secret: @config["client_secret"],
-            refresh_token: @config["refresh_token"],
-            grant_type: "refresh_token"
+            client_id: @config['client_id'],
+            client_secret: @config['client_secret'],
+            refresh_token: @config['refresh_token'],
+            grant_type: 'refresh_token',
           }
         end
         raise SyncError, "Strava token refresh failed: #{resp.status}" unless resp.success?
-        JSON.parse(resp.body)["access_token"]
+        JSON.parse(resp.body)['access_token']
       end
 
       def sync_activity(act, act_id, token)
-        type = map_sport_type(act["type"], act["sport_type"])
+        type = map_sport_type(act['type'], act['sport_type'])
         return false if skip_type?(type)
 
         detail = fetch_detail(act_id, token)
         return false unless detail
 
-        external_id = detail["external_id"]
+        external_id = detail['external_id']
 
         streams = fetch_streams(act_id, token)
 
-        write_source_archive({ source: "strava", detail: detail, streams: streams }, act_id)
+        write_source_archive({ source: 'strava', detail: detail, streams: streams }, act_id)
 
         l2 = streams_to_l2(detail, streams)
         write_standardized_json(l2, act_id) if l2
 
-        polyline = l2 ? Geo::Polyline.encode(l2.map { |pt| [pt[:positionLat], pt[:positionLong]] }) : act.dig("map", "summary_polyline")
+        polyline = if l2
+                     Geo::Polyline.encode(l2.map do |pt|
+                       [pt[:positionLat], pt[:positionLong]]
+                     end)
+                   else
+                     act.dig('map', 'summary_polyline')
+                   end
 
         attrs = build_attrs(act, type, polyline, external_id: external_id)
         upsert_activity(attrs)
@@ -83,7 +91,7 @@ module GitFit
 
       def fetch_activities(token, page)
         resp = Faraday.get("#{BASE_URL}/athlete/activities") do |req|
-          req.headers["Authorization"] = "Bearer #{token}"
+          req.headers['Authorization'] = "Bearer #{token}"
           req.params = { page: page, per_page: 100 }
         end
         return [] unless resp.success?
@@ -92,7 +100,7 @@ module GitFit
 
       def fetch_detail(act_id, token)
         resp = Faraday.get("#{BASE_URL}/activities/#{act_id}") do |req|
-          req.headers["Authorization"] = "Bearer #{token}"
+          req.headers['Authorization'] = "Bearer #{token}"
         end
         return nil unless resp.success?
         JSON.parse(resp.body)
@@ -100,8 +108,9 @@ module GitFit
 
       def fetch_streams(act_id, token)
         resp = Faraday.get("#{BASE_URL}/activities/#{act_id}/streams") do |req|
-          req.headers["Authorization"] = "Bearer #{token}"
-          req.params = { keys: "lat_lng,altitude,time,heartrate,cadence,watts,temp,velocity_smooth,distance", key_by_type: true }
+          req.headers['Authorization'] = "Bearer #{token}"
+          req.params = { keys: 'lat_lng,altitude,time,heartrate,cadence,watts,temp,velocity_smooth,distance',
+                         key_by_type: true }
         end
         return {} unless resp.success?
         JSON.parse(resp.body)
@@ -117,20 +126,20 @@ module GitFit
       end
 
       def streams_to_l2(detail, streams)
-        polyline = detail.dig("map", "polyline")
+        polyline = detail.dig('map', 'polyline')
         return nil unless polyline
 
         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")
+        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')
 
         coords.each_with_index.map do |latlng, i|
           pt = { positionLat: latlng[0], positionLong: latlng[1] }
@@ -147,33 +156,33 @@ module GitFit
       end
 
       def build_attrs(act, category, polyline = nil, external_id: nil)
-        start_t = Time.parse(act["start_date"]) rescue nil
-        local_t = Time.parse(act["start_date_local"]) rescue nil
+        start_t = Time.parse(act['start_date']) rescue nil
+        local_t = Time.parse(act['start_date_local']) rescue nil
 
         {
           run_id: "strava_#{act["id"]}",
-          name: act["name"],
-          distance: act["distance"],
-          moving_time: act["moving_time"],
-          elapsed_time: act["elapsed_time"],
+          name: act['name'],
+          distance: act['distance'],
+          moving_time: act['moving_time'],
+          elapsed_time: act['elapsed_time'],
           sport_category: category,
-          sport_type: (act["sport_type"] || act["type"])&.downcase,
+          sport_type: (act['sport_type'] || act['type'])&.downcase,
           start_date: start_t&.iso8601,
           start_date_local: local_t&.iso8601,
-          location_country: act["location_country"],
+          location_country: act['location_country'],
           summary_polyline: polyline,
-          average_heartrate: act["average_heartrate"],
-          max_heartrate: act["max_heartrate"],
-          average_cadence: act["average_cadence"],
+          average_heartrate: act['average_heartrate'],
+          max_heartrate: act['max_heartrate'],
+          average_cadence: act['average_cadence'],
           max_cadence: nil,
-          average_power: act["average_watts"],
-          max_power: act["max_watts"],
-          calories: act["calories"],
-          average_temperature: act["average_temp"],
-          average_speed: act["average_speed"],
-          elevation_gain: act["total_elevation_gain"],
-          source: "strava",
-          external_id: external_id
+          average_power: act['average_watts'],
+          max_power: act['max_watts'],
+          calories: act['calories'],
+          average_temperature: act['average_temp'],
+          average_speed: act['average_speed'],
+          elevation_gain: act['total_elevation_gain'],
+          source: 'strava',
+          external_id: external_id,
         }
       end
 
@@ -186,8 +195,8 @@ module GitFit
       end
 
       def existing_run_ids
-        @db[:activities].where(source: "strava").select_map(:run_id)
-          .map { |id| id.sub("strava_", "") }
+        @db[:activities].where(source: 'strava').select_map(:run_id)
+          .map { |id| id.sub('strava_', '') }
       end
     end
   end

data/lib/git_fit/sync/xingzhe.rb

@@ -1,32 +1,35 @@
-require_relative "base"
-require "fileutils"
-require "openssl"
-require "tzinfo"
+# frozen_string_literal: true
+
+require_relative 'base'
+require 'fileutils'
+require 'openssl'
+require 'tzinfo'
 
 module GitFit
   module Sync
     class XingZhe < Base
-      BASE_HOST = "www.imxingzhe.com"
-      LOGIN_PATH = "/api/v1/user/login/"
-      WORKOUTS_PATH = "/api/v1/pgworkout/"
-      STREAM_PATH = "/api/v1/pgworkout/"
-      DETAIL_PATH = "/api/v1/pgworkout/"
-      RSA_PUBKEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmuQkBbijudDAJgfffDeeIButqWHZvUwcRuvWdg89393FSdz3IJUHc0rgI/S3WuU8N0VePJLmVAZtCOK4qe4FY/eKmWpJmn7JfXB4HTMWjPVoyRZmSYjW4L8GrWmh51Qj7DwpTADadF3aq04o+s1b8LXJa8r6+TIqqL5WUHtRqmQIDAQAB"
+      BASE_HOST = 'www.imxingzhe.com'
+      LOGIN_PATH = '/api/v1/user/login/'
+      WORKOUTS_PATH = '/api/v1/pgworkout/'
+      STREAM_PATH = '/api/v1/pgworkout/'
+      DETAIL_PATH = '/api/v1/pgworkout/'
+      RSA_PUBKEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmuQkBbijudDAJgfffDeeIButqWHZvUwcRuvWdg89393FSdz3IJUHc0rgI/S3WuU8N0VePJLmVAZtCOK4qe4FY/eKmWpJmn7JfXB4HTMWjPVoyRZmSYjW4L8GrWmh51Qj7DwpTADadF3aq04o+s1b8LXJa8r6+TIqqL5WUHtRqmQIDAQAB'
 
       SPORT_MAP = {
-        3 => "ride", 1 => "run", 2 => "hike",
-        5 => "swim", 6 => "walk", 11 => "ski", 13 => "workout"
+        3 => 'ride', 1 => 'run', 2 => 'hike',
+        5 => 'swim', 6 => 'walk', 11 => 'ski', 13 => 'workout'
       }.freeze
 
-      RAW_EXT = "json"
+      RAW_EXT = 'json'
 
       register_adapter
+      config_key 'xingzhe'
       register_config :email, :password
 
       def initialize(...)
         super
-        @email = @config["email"]
-        @password = @config["password"]
+        @email = @config['email']
+        @password = @config['password']
       end
 
       def before_call
@@ -47,9 +50,9 @@ module GitFit
           acts = fetch_page(offset, limit)
           break if acts.nil? || acts.empty?
           acts.each do |act|
-            aid = act["id"].to_s
+            aid = act['id'].to_s
             next if existing.include?(aid) && raw_file_exists?(aid)
-            type = map_sport(act["sport"])
+            type = map_sport(act['sport'])
             next if skip_type?(type)
             ids << { id: aid, type: type, summary: act }
           end
@@ -87,17 +90,17 @@ module GitFit
         encrypted = rsa_encrypt(@password)
         resp = http_request(:post, LOGIN_PATH,
           body: JSON.generate({ account: @email, password: encrypted }),
-          headers: { "Content-Type" => "application/json" }
+          headers: { 'Content-Type' => 'application/json' }
         )
         return false unless resp.code.to_i == 200
 
         data = JSON.parse(resp.body)
-        return false unless data["code"] == 0
+        return false unless data['code'] == 0
 
         cookie = extract_cookie(resp)
         return false unless cookie
 
-        @headers = { "Cookie" => cookie, "Accept" => "application/json" }
+        @headers = { 'Cookie' => cookie, 'Accept' => 'application/json' }
         true
       end
 
@@ -108,7 +111,7 @@ module GitFit
       end
 
       def extract_cookie(resp)
-        set_cookie = resp["set-cookie"]
+        set_cookie = resp['set-cookie']
         return nil unless set_cookie
         m = set_cookie.match(/sessionid=([^;]+)/)
         m ? "sessionid=#{m[1]}" : nil
@@ -125,7 +128,7 @@ module GitFit
         )
         return nil unless resp.code.to_i == 200
 
-        JSON.parse(resp.body).dig("data", "data")
+        JSON.parse(resp.body).dig('data', 'data')
       end
 
       def tz_resolver
@@ -141,48 +144,48 @@ module GitFit
         tz_string = tz_resolver.resolve(lat, lng)
         tz = TZInfo::Timezone.get(tz_string)
         tz.utc_to_local(start_utc).iso8601
-      rescue => e
+      rescue StandardError => e
         warn "XingZhe: timezone resolution failed: #{e.message}"
         start_utc.iso8601
       end
 
       def process_activity(act, type)
-        aid = act["id"].to_s
-        start_t = Time.at(act["start_time"] / 1000.0).utc rescue nil
+        aid = act['id'].to_s
+        start_t = Time.at(act['start_time'] / 1000.0).utc rescue nil
         return false unless start_t
 
         attrs = {
           run_id: "xingzhe_#{aid}",
-          name: act["title"] || "XingZhe Activity",
-          distance: act["distance"].to_f,
-          moving_time: (t = act["duration"].to_i) > 0 ? t : nil,
+          name: act['title'] || 'XingZhe Activity',
+          distance: act['distance'].to_f,
+          moving_time: (t = act['duration'].to_i) > 0 ? t : nil,
           elapsed_time: t > 0 ? t : nil,
           sport_category: type,
-          sport_type: act["sport"].to_s,
+          sport_type: act['sport'].to_s,
           start_date: start_t.iso8601,
           start_date_local: start_t.iso8601,
-          average_speed: (act["avg_speed"].to_f / 3.6).round(2).nonzero?,
-          elevation_gain: act["elevation_gain"].to_f.nonzero?,
-          source: "xingzhe"
+          average_speed: (act['avg_speed'].to_f / 3.6).round(2).nonzero?,
+          elevation_gain: act['elevation_gain'].to_f.nonzero?,
+          source: 'xingzhe',
         }
 
         pts = nil
         stream = fetch_stream(aid)
         if stream
           write_source_archive({
-            source: "xingzhe",
-            fetchedAt: Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-            stream: stream
+            source: 'xingzhe',
+            fetchedAt: Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ'),
+            stream: stream,
           }, aid)
-          if (locs = stream["location"]) && locs.size >= 2
+          if (locs = stream['location']) && locs.size >= 2
             pts = locs.map { |lng, lat| [lat, lng] }
             write_std(pts, stream, aid)
             attrs[:summary_polyline] = stream_to_polyline(aid)
           end
         end
 
-        if attrs[:summary_polyline].nil? && (detail = fetch_activity_detail(aid)) && (segments = detail["segments_km"])
-          pts = segments.map { |s| [s["latitude"], s["longitude"]] }
+        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
         end
 
@@ -200,7 +203,7 @@ module GitFit
         resp = http_request(:get, "#{STREAM_PATH}#{id}/stream/", headers: @headers || {})
         return nil unless resp.code.to_i == 200
 
-        JSON.parse(resp.body).dig("data")
+        JSON.parse(resp.body).dig('data')
       rescue JSON::ParserError
         nil
       end
@@ -208,17 +211,17 @@ module GitFit
       def write_std(pts, stream, id)
         dir = std_dir
         FileUtils.mkdir_p(dir)
-        ts_arr = stream["timestamp"] || []
-        alt_arr = stream["altitude"] || []
-        spd_arr = stream["speed"] || []
-        dst_arr = stream["distance"] || []
+        ts_arr = stream['timestamp'] || []
+        alt_arr = stream['altitude'] || []
+        spd_arr = stream['speed'] || []
+        dst_arr = stream['distance'] || []
 
         extended = pts.each_with_index.map do |(lat, lng), i|
           ts_val = ts_arr[i]
           {
             latitude: lat, longitude: lng,
             altitude: alt_arr[i],
-            timestamp: ts_val ? Time.at(ts_val).utc.strftime("%Y-%m-%dT%H:%M:%SZ") : nil,
+            timestamp: ts_val ? Time.at(ts_val).utc.strftime('%Y-%m-%dT%H:%M:%SZ') : nil,
             speed: spd_arr[i],
             distance: dst_arr[i]
           }
@@ -232,7 +235,7 @@ module GitFit
 
       def stream_to_polyline(id)
         raw = JSON.parse(File.read(raw_path(id)))
-        locs = raw.dig("stream", "location") || []
+        locs = raw.dig('stream', 'location') || []
         return nil if locs.size < 2
 
         pts = locs.map { |lng, lat| [lat, lng] }
@@ -246,16 +249,16 @@ module GitFit
         return nil unless resp.code.to_i == 200
 
         data = JSON.parse(resp.body)
-        data.dig("data", "workout")
+        data.dig('data', 'workout')
       end
 
       def map_sport(sport)
-        SPORT_MAP[sport] || "other"
+        SPORT_MAP[sport] || 'other'
       end
 
       def existing_run_ids
-        @db[:activities].where(source: "xingzhe").select_map(:run_id)
-          .map { |id| id.sub("xingzhe_", "") }
+        @db[:activities].where(source: 'xingzhe').select_map(:run_id)
+          .map { |id| id.sub('xingzhe_', '') }
       end
     end
   end