git-fit 0.10.11 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ad8e07b35c5dc5be5cd8e9067fdaa21dc1684a6d5d5bb14ed873243c926de5
-  data.tar.gz: 1b4057796536c438ce997cccf15268fa121f5ad28f19f7ba0af30922c374d2c5
+  metadata.gz: 6128a0ade228a52d4521a69f4cf036c2edd0507db418bdab7a27439c7675463e
+  data.tar.gz: 889d4c1a82660bd67a5e00344e66bd05ce36071926cde030dda1a88f6272008c
 SHA512:
-  metadata.gz: c835f47ca63aebfb8e7493fc522dca3f77768469d8b1b73d5293d882c1ccada07e03db64fae6063c5d2628ee579563e4842e75c6c5d1d2a4163a20801c337ec4
-  data.tar.gz: d0858df7943c64dd1ca22089be6eb8bfb09194fe3a2b8124c4b95051315edc095518388e6d76fe9a8d3f5c75b357a0f02cf0a7a9e075b6c9d68bf83a1bf27650
+  metadata.gz: ca1456122456538768205397ff39ac128f1cdec115dcbeacd9c37874fa62bae20011ed4b98560c68d762f1a2fb80ab8ec5e42e8a5539713ed66f73a6f7eec079
+  data.tar.gz: 0edbddf20214183b02caa9dab86d17c20ae7f87a5cdfdf450e939c45a32bd23acc5c5a30209293b53c1def43e85ed090920804123aa21e5cdce9e604e6d54777

data/lib/git-fit.rb

@@ -72,6 +72,7 @@ require_relative 'git_fit/sync/xoss'
 require_relative 'git_fit/sync/xingzhe'
 require_relative 'git_fit/sync/runner'
 require_relative 'git_fit/cli/sync'
+require_relative 'git_fit/cli/checkpointable'
 require_relative 'git_fit/db/rebuild'
 require_relative 'git_fit/db/connection'
 require_relative 'git_fit/db/activity'

data/lib/git_fit/cli/checkpointable.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Cli
+    module Checkpointable
+      def checkpoint_db(db)
+        result = db.fetch('PRAGMA wal_checkpoint(TRUNCATE)').first
+        say_status :checkpoint, "WAL checkpoint: #{result[:checkpointed]} pages", :green
+        result
+      rescue StandardError => e
+        say_status :error, "Checkpoint failed: #{e.message}", :red
+        nil
+      end
+    end
+  end
+end

data/lib/git_fit/cli/geo_cli.rb

@@ -4,6 +4,8 @@ require 'thor'
 
 module GitFit
   class GeoCLI < Thor
+    include Cli::Checkpointable
+
     desc 'detect', 'Detect administrative divisions for activities with GPS data'
     option :limit,    type: :numeric, aliases: '-l', desc: 'Max activities to process'
     option :batch,    type: :numeric, aliases: '-b', desc: 'Batch size', default: 20

data/lib/git_fit/cli/import_cli.rb

@@ -4,6 +4,7 @@ require 'thor'
 
 module GitFit
   class ImportCLI < Thor
+    include Cli::Checkpointable
     FILE_SOURCES = %w[gpx fit tcx].freeze
 
     desc 'all', 'Import from all sources (gpx, fit, tcx)'

data/lib/git_fit/cli.rb

@@ -6,6 +6,7 @@ module GitFit
   class CLI < Thor
     package_name 'git-fit'
     include Cli::Sync
+    include Cli::Checkpointable
 
     class_option :config, type: :string, desc: 'Config file path', aliases: '-c'
 
@@ -162,15 +163,6 @@ module GitFit
         conn.db
       end
 
-      def checkpoint_db(db)
-        result = db.fetch('PRAGMA wal_checkpoint(TRUNCATE)').first
-        say_status :checkpoint, "WAL checkpoint: #{result[:checkpointed]} pages", :green
-        result
-      rescue StandardError => e
-        say_status :error, "Checkpoint failed: #{e.message}", :red
-        nil
-      end
-
       def deep_dup(obj)
         case obj
         when Hash then obj.each_with_object({}) { |(k, v), h| h[k] = deep_dup(v) }

data/lib/git_fit/config_template.rb

@@ -48,6 +48,8 @@ module GitFit
           # xingzhe:                                     # env: GIT_FIT_XINGZHE_EMAIL
           #   email: ""                                  # env: GIT_FIT_XINGZHE_PASSWORD
           #   password: ""
+          #   session_path: ""                           # env: GIT_FIT_XINGZHE_SESSION_PATH
+          #                                              # default data/cache/xingzhe_session.json
 
         export:
           json:

data/lib/git_fit/sync/xingzhe.rb

@@ -22,14 +22,17 @@ module GitFit
 
       RAW_EXT = 'json'
 
+      SESSION_TTL = 30 * 24 * 60 * 60
+
       register_adapter
       config_key 'xingzhe'
-      register_config :email, :password
+      register_config :email, :password, :session_path
 
       def initialize(...)
         super
         @email = @config['email']
         @password = @config['password']
+        @session_path = @config['session_path'] || File.join('data', 'cache', 'xingzhe_session.json')
       end
 
       def before_call
@@ -38,9 +41,15 @@ module GitFit
       end
 
       def authenticate
-        result = login
-        @auth_method = 'login' if result
-        result
+        if load_session && session_valid?
+          @auth_method = 'cached'
+          return true
+        end
+        if login
+          @auth_method = 'login'
+          return true
+        end
+        false
       end
 
       def pending_ids
@@ -67,6 +76,14 @@ module GitFit
         process_activity(pending[:summary], pending[:type])
       end
 
+      def auth_error?
+        [302, 401, 403].include?(@last_http_code)
+      end
+
+      def last_auth_code
+        @last_http_code
+      end
+
       private
 
       def http_request(method, path, body: nil, params: nil, headers: {})
@@ -85,7 +102,26 @@ module GitFit
         http.use_ssl = true
         http.open_timeout = 30
         http.read_timeout = 60
-        http.start { |h| h.request(req) }
+        resp = http.start { |h| h.request(req) }
+        @last_http_code = resp.code.to_i
+        resp
+      end
+
+      def authed_get(path, params: nil)
+        resp = http_request(:get, path, params: params, headers: @headers || {})
+        return resp unless auth_failure?(resp)
+
+        remove_stale_session
+        return resp unless login
+
+        http_request(:get, path, params: params, headers: @headers)
+      end
+
+      def auth_failure?(resp)
+        return false unless resp
+        c = resp.code.to_i
+        (c == 400 && resp.body.to_s.include?('not allowed')) ||
+          [302, 401, 403].include?(c)
       end
 
       def login
@@ -102,10 +138,57 @@ module GitFit
         cookie = extract_cookie(resp)
         return false unless cookie
 
+        @session_expires_at = parse_max_age(resp)
+        @headers = { 'Cookie' => cookie, 'Accept' => 'application/json' }
+        save_session(cookie)
+        true
+      end
+
+      def load_session
+        return false unless File.exist?(@session_path)
+
+        data = JSON.parse(File.read(@session_path))
+        cookie = data['cookie']
+        @session_expires_at = data['expires_at']
+        return false unless cookie
+
         @headers = { 'Cookie' => cookie, 'Accept' => 'application/json' }
         true
+      rescue StandardError => e
+        warn "XingZhe: failed to load cached session: #{e.message}"
+        remove_stale_session
+        false
+      end
+
+      def session_valid?
+        return false unless @session_expires_at
+        Time.now.to_i < @session_expires_at - 60
+      end
+
+      def save_session(cookie)
+        FileUtils.mkdir_p(File.dirname(@session_path))
+        File.write(@session_path, JSON.generate({
+          cookie: cookie,
+          expires_at: @session_expires_at,
+        }))
+      rescue StandardError => e
+        warn "XingZhe: failed to save session: #{e.message}"
+      end
+
+      def remove_stale_session
+        File.delete(@session_path) if File.exist?(@session_path)
+      rescue StandardError => e
+        warn "XingZhe: failed to remove stale session: #{e.message}"
+      end
+
+      def parse_max_age(resp)
+        set_cookie = resp['set-cookie'].to_s
+        ma = set_cookie[/Max-Age=(\d+)/, 1]
+        ma ? Time.now.to_i + ma.to_i : Time.now.to_i + SESSION_TTL
       end
 
+      attr_reader :session_path
+
       def rsa_encrypt(password)
         pem = "-----BEGIN PUBLIC KEY-----\n#{RSA_PUBKEY}\n-----END PUBLIC KEY-----"
         key = OpenSSL::PKey::RSA.new(pem)
@@ -124,9 +207,8 @@ module GitFit
       end
 
       def fetch_page(offset, limit)
-        resp = http_request(:get, WORKOUTS_PATH,
+        resp = authed_get(WORKOUTS_PATH,
           params: { offset: offset, limit: limit },
-          headers: @headers
         )
         return nil unless resp.code.to_i == 200
 
@@ -202,7 +284,7 @@ module GitFit
       end
 
       def fetch_stream(id)
-        resp = http_request(:get, "#{STREAM_PATH}#{id}/stream/", headers: @headers || {})
+        resp = authed_get("#{STREAM_PATH}#{id}/stream/")
         return nil unless resp.code.to_i == 200
 
         JSON.parse(resp.body).dig('data')

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.11.2
 platform: ruby
 authors:
 - Lax
@@ -254,6 +254,7 @@ files:
 - lib/git_fit/auth/garmin_token.rb
 - lib/git_fit/auth/strava.rb
 - lib/git_fit/cli.rb
+- lib/git_fit/cli/checkpointable.rb
 - lib/git_fit/cli/export.rb
 - lib/git_fit/cli/geo_cli.rb
 - lib/git_fit/cli/gh_cli.rb
@@ -305,7 +306,6 @@ files:
 - lib/git_fit/source.rb
 - lib/git_fit/source/base.rb
 - 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

data/lib/git_fit/source/tally.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module GitFit
-  module Source
-    class Tally
-      DIGITS = %w[零 一 二 三 四 五 六 七 八 九 十]
-
-      def initialize(count = 0)
-        @count = count
-      end
-
-      def add(n = 1)
-        @count += n
-      end
-
-      def to_s
-        return @count.to_s if @count > 9999
-        chinese_numeral
-      rescue StandardError
-        @count.to_s
-      end
-
-      private
-
-      def chinese_numeral
-        n = @count
-        return DIGITS[0] if n == 0
-        return DIGITS[n] if n <= 10
-
-        result = ''
-        thousands = n / 1000
-        n %= 1000
-        result += DIGITS[thousands] + '千' if thousands > 0
-
-        hundreds = n / 100
-        n %= 100
-        if hundreds > 0
-          result += DIGITS[hundreds] + '百'
-        elsif thousands > 0 && n > 0
-          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 += '零'
-        end
-
-        result += DIGITS[ones] if ones > 0
-        result
-      end
-    end
-  end
-end