git-fit 0.7.9 → 0.8.0

data/lib/git_fit/sync/xoss.rb

@@ -1,26 +1,28 @@
-require_relative "base"
-require "fileutils"
-require "tzinfo"
+# frozen_string_literal: true
+
+require_relative 'base'
+require 'fileutils'
+require 'tzinfo'
 
 module GitFit
   module Sync
     class SyncError < RuntimeError; end unless const_defined?(:SyncError)
 
     class XOSS < Base
-      FIT_FILE_PATH = "/api/v3/activity/%<id>s/fit_file/"
-      BASE_URL = "https://backend.xoss.co"
-      LOGIN_PATH = "/api/v1/jwt-token/"
-      REFRESH_PATH = "/api/v1/jwt-token/refresh/"
-      ACTIVITIES_PATH = "/api/v3/activity/"
+      FIT_FILE_PATH = '/api/v3/activity/%<id>s/fit_file/'
+      BASE_URL = 'https://backend.xoss.co'
+      LOGIN_PATH = '/api/v1/jwt-token/'
+      REFRESH_PATH = '/api/v1/jwt-token/refresh/'
+      ACTIVITIES_PATH = '/api/v3/activity/'
       ACCESS_TOKEN_TTL = 86400
 
       SPORT_MAP = {
-        1 => "run",
-        2 => "ride",
-        3 => "other",
-        4 => "workout",
-        5 => "swim",
-        11 => "walk"
+        1 => 'run',
+        2 => 'ride',
+        3 => 'other',
+        4 => 'workout',
+        5 => 'swim',
+        11 => 'walk',
       }.freeze
 
       register_adapter
@@ -28,9 +30,9 @@ module GitFit
 
       def initialize(...)
         super
-        @email = @config["email"]
-        @password = @config["password"]
-        @token_path = @config["token_path"] || File.join("data", "cache", "xoss_tokens.json")
+        @email = @config['email']
+        @password = @config['password']
+        @token_path = @config['token_path'] || File.join('data', 'cache', 'xoss_tokens.json')
       end
 
       def before_call
@@ -54,9 +56,9 @@ module GitFit
           acts = fetch_page(offset, limit)
           break if acts.nil? || acts.empty?
           acts.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(act["sport"])
+            type = map_sport(act['sport'])
             next if skip_type?(type)
             ids << { id: act_id, type: type, summary: act }
           end
@@ -96,7 +98,7 @@ module GitFit
       end
 
       def proxy_uri
-        uri = URI(ENV["http_proxy"] || ENV["HTTP_PROXY"] || ENV["https_proxy"] || ENV["HTTPS_PROXY"] || "")
+        uri = URI(ENV['http_proxy'] || ENV['HTTP_PROXY'] || ENV['https_proxy'] || ENV['HTTPS_PROXY'] || '')
         uri.host ? uri : nil
       end
 
@@ -104,21 +106,21 @@ module GitFit
         retries ||= 0
         resp = http_request(:post, LOGIN_PATH,
           body: JSON.generate({ email: @email, password: @password }),
-          headers: { "Content-Type" => "application/json", "Origin" => "xoss" }
+          headers: { 'Content-Type' => 'application/json', 'Origin' => 'xoss' }
         )
         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
 
-        @access_token = data.dig("data", "access")
-        @refresh_token = data.dig("data", "refresh")
+        @access_token = data.dig('data', 'access')
+        @refresh_token = data.dig('data', 'refresh')
         unless @access_token
           remove_stale_tokens
           return false
         end
 
-        @auth_headers = { "Authorization" => "Bearer #{@access_token}", "Origin" => "xoss" }
+        @auth_headers = { 'Authorization' => "Bearer #{@access_token}", 'Origin' => 'xoss' }
         save_tokens
         true
       rescue Net::OpenTimeout, Net::ReadTimeout => e
@@ -137,12 +139,12 @@ module GitFit
         return false unless File.exist?(token_path)
 
         data = JSON.parse(File.read(token_path))
-        @access_token = data["access"]
-        @refresh_token = data["refresh"]
-        @expires_at = data["expires_at"]
-        @auth_headers = { "Authorization" => "Bearer #{@access_token}", "Origin" => "xoss" } if @access_token
+        @access_token = data['access']
+        @refresh_token = data['refresh']
+        @expires_at = data['expires_at']
+        @auth_headers = { 'Authorization' => "Bearer #{@access_token}", 'Origin' => 'xoss' } if @access_token
         true
-      rescue => e
+      rescue StandardError => e
         warn "XOSS: failed to load cached tokens: #{e.message}"
         false
       end
@@ -154,15 +156,15 @@ module GitFit
         File.write(token_path, JSON.generate({
           access: @access_token,
           refresh: @refresh_token,
-          expires_at: @expires_at || Time.now.to_i + ACCESS_TOKEN_TTL
+          expires_at: @expires_at || Time.now.to_i + ACCESS_TOKEN_TTL,
         }))
-      rescue => e
+      rescue StandardError => e
         warn "XOSS: failed to save tokens: #{e.message}"
       end
 
       def remove_stale_tokens
         File.delete(token_path) if File.exist?(token_path)
-      rescue => e
+      rescue StandardError => e
         warn "XOSS: failed to remove stale tokens: #{e.message}"
       end
 
@@ -178,7 +180,7 @@ module GitFit
         retries ||= 0
         resp = http_request(:post, REFRESH_PATH,
           body: JSON.generate({ refresh: @refresh_token }),
-          headers: { "Content-Type" => "application/json", "Origin" => "xoss" }
+          headers: { 'Content-Type' => 'application/json', 'Origin' => 'xoss' }
         )
         unless resp.code.to_i == 200
           remove_stale_tokens
@@ -186,17 +188,17 @@ module GitFit
         end
 
         data = JSON.parse(resp.body)
-        unless data["code"] == 0
+        unless data['code'] == 0
           remove_stale_tokens
           return false
         end
 
-        @access_token = data.dig("data", "access")
-        @refresh_token = data.dig("data", "refresh")
+        @access_token = data.dig('data', 'access')
+        @refresh_token = data.dig('data', 'refresh')
         return false unless @access_token
 
         @expires_at = Time.now.to_i + ACCESS_TOKEN_TTL
-        @auth_headers = { "Authorization" => "Bearer #{@access_token}", "Origin" => "xoss" }
+        @auth_headers = { 'Authorization' => "Bearer #{@access_token}", 'Origin' => 'xoss' }
         save_tokens
         true
       rescue Net::OpenTimeout, Net::ReadTimeout => e
@@ -223,7 +225,7 @@ module GitFit
         )
         return nil unless resp.code.to_i == 200
 
-        JSON.parse(resp.body).dig("data", "results")
+        JSON.parse(resp.body).dig('data', 'results')
       rescue Net::OpenTimeout, Net::ReadTimeout => e
         if (retries += 1) <= 2
           sleep 2
@@ -245,60 +247,60 @@ module GitFit
       def resolve_local_time(start_utc, wgs_points)
         return start_utc.iso8601 unless wgs_points&.any?
 
-        lat = wgs_points.first["positionLat"]
-        lng = wgs_points.first["positionLong"]
+        lat = wgs_points.first['positionLat']
+        lng = wgs_points.first['positionLong']
         return start_utc.iso8601 unless lat && lng
 
         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 "XOSS: timezone resolution failed: #{e.message}"
         start_utc.iso8601
       end
 
       def process_activity(act)
-        act_id = act["id"].to_s
-        type = map_sport(act["sport"])
+        act_id = act['id'].to_s
+        type = map_sport(act['sport'])
 
-        start_t = Time.at(act["start_timestamp"]).utc rescue nil
+        start_t = Time.at(act['start_timestamp']).utc rescue nil
         return false unless start_t
 
-        distance = act["distance"].to_f
-        moving_time = act["duration"].to_i
+        distance = act['distance'].to_f
+        moving_time = act['duration'].to_i
         avg_speed = distance > 0 && moving_time > 0 ? (distance / moving_time).round(2) : nil
 
         attrs = {
           run_id: "xoss_#{act_id}",
-          name: act["title"] || "XOSS Activity",
+          name: act['title'] || 'XOSS Activity',
           distance: distance,
           moving_time: moving_time > 0 ? moving_time : nil,
           elapsed_time: moving_time > 0 ? moving_time : nil,
           sport_category: type,
-          sport_type: act["sub_sport"].to_s,
+          sport_type: act['sub_sport'].to_s,
           start_date: start_t.iso8601,
           start_date_local: start_t.iso8601,
           location_country: nil,
           average_speed: avg_speed,
-          elevation_gain: act["elevation_gain"].to_f.nonzero?,
-          calories: act["total_calories"]&.to_i&.nonzero?,
-          source: "xoss"
+          elevation_gain: act['elevation_gain'].to_f.nonzero?,
+          calories: act['total_calories']&.to_i&.nonzero?,
+          source: 'xoss',
         }
 
         wgs_points = []
-        if act["fit_file_hash"].to_s != ""
+        if act['fit_file_hash'].to_s != ''
           fit_data = download_fit(act_id)
           if fit_data
-            write_source_archive(fit_data, act_id, "fit")
+            write_source_archive(fit_data, act_id, 'fit')
             begin
               wgs_points = FIT::Decoder.decode(raw_path(act_id))
-            rescue => e
+            rescue StandardError => e
               warn "XOSS: FIT decode failed for #{act_id}: #{e.message}"
               wgs_points = []
             end
             if wgs_points.any?
               write_std(wgs_points, act_id)
-              pts = wgs_points.map { |pt| [pt["positionLat"], pt["positionLong"]] }
+              pts = wgs_points.map { |pt| [pt['positionLat'], pt['positionLong']] }
               attrs[:summary_polyline] = Geo::Polyline.encode(pts)
               attrs.merge!(compute_sensor_summary(wgs_points))
             end
@@ -315,9 +317,9 @@ module GitFit
         resp = http_request(:get, format(FIT_FILE_PATH, id: act_id), headers: @auth_headers)
         return nil unless resp.code.to_i == 302
 
-        fit_uri = URI(resp["location"])
+        fit_uri = URI(resp['location'])
         fit_http = Net::HTTP.new(fit_uri.host, fit_uri.port)
-        fit_http.use_ssl = fit_uri.scheme == "https"
+        fit_http.use_ssl = fit_uri.scheme == 'https'
         fit_http.open_timeout = 60
         fit_http.read_timeout = 180
         fit_resp = fit_http.start { |h| h.request(Net::HTTP::Get.new(fit_uri)) }
@@ -341,10 +343,10 @@ module GitFit
       def compute_sensor_summary(records)
         return {} if records.empty?
 
-        cad = records.map { |r| r["cadence"] }.compact
-        pow = records.map { |r| r["power"] }.compact
-        tmp = records.map { |r| r["temperature"] }.compact
-        hr = records.map { |r| r["heart_rate"] }.compact
+        cad = records.map { |r| r['cadence'] }.compact
+        pow = records.map { |r| r['power'] }.compact
+        tmp = records.map { |r| r['temperature'] }.compact
+        hr = records.map { |r| r['heart_rate'] }.compact
 
         {
           average_cadence: cad.any? ? (cad.sum.to_f / cad.size).round(1) : nil,
@@ -352,17 +354,17 @@ module GitFit
           average_power: pow.any? ? (pow.sum.to_f / pow.size).round(1) : nil,
           max_power: pow.max,
           average_temperature: tmp.any? ? (tmp.sum.to_f / tmp.size).round(1) : nil,
-          average_heartrate: hr.any? ? (hr.sum.to_f / hr.size).round(1) : nil
+          average_heartrate: hr.any? ? (hr.sum.to_f / hr.size).round(1) : nil,
         }
       end
 
       def map_sport(sport)
-        SPORT_MAP[sport] || "other"
+        SPORT_MAP[sport] || 'other'
       end
 
       def existing_run_ids
-        @db[:activities].where(source: "xoss").select_map(:run_id)
-          .map { |id| id.sub("xoss_", "") }
+        @db[:activities].where(source: 'xoss').select_map(:run_id)
+          .map { |id| id.sub('xoss_', '') }
       end
     end
   end

data/lib/git_fit/timezone/resolver.rb

@@ -1,12 +1,14 @@
-require "timezone_finder"
+# frozen_string_literal: true
+
+require 'timezone_finder'
 
 module GitFit
   module Timezone
     class Resolver
       def initialize(config, finder: nil)
-        default = config.is_a?(Hash) ? config.dig("system", "timezone") : config
+        default = config.is_a?(Hash) ? config.dig('system', 'timezone') : config
         @finder = finder || TimezoneFinder.create
-        @default = default || "Asia/Shanghai"
+        @default = default || 'Asia/Shanghai'
       end
 
       def resolve(lat, lng)

data/lib/git_fit/util/tally.rb

@@ -1,4 +1,6 @@
-require "json"
+# frozen_string_literal: true
+
+require 'json'
 
 module GitFit
   module Util
@@ -62,26 +64,26 @@ module GitFit
         return DIGITS[0] if n == 0
         return DIGITS[n] if n <= 10
 
-        result = ""
+        result = ''
         thousands = n / 1000
         n %= 1000
-        result += DIGITS[thousands] + "千" if thousands > 0
+        result += DIGITS[thousands] + '千' if thousands > 0
 
         hundreds = n / 100
         n %= 100
         if hundreds > 0
-          result += DIGITS[hundreds] + "百"
+          result += DIGITS[hundreds] + '百'
         elsif thousands > 0 && n > 0
-          result += "零"
+          result += '零'
         end
 
         tens = n / 10
         ones = n % 10
         if tens > 0
           join_ten = tens > 1 || !result.empty?
-          result += (join_ten ? DIGITS[tens] : "") + "十"
-        elsif !result.empty? && tens == 0 && ones > 0 && !result.end_with?("零")
-          result += "零"
+          result += (join_ten ? DIGITS[tens] : '') + '十'
+        elsif !result.empty? && tens == 0 && ones > 0 && !result.end_with?('零')
+          result += '零'
         end
 
         result += DIGITS[ones] if ones > 0

data/lib/git_fit/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitFit
   module Util
   end

data/lib/git_fit/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitFit
-  VERSION = "0.7.9"
+  VERSION = '0.8.0'
 end

metadata

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