git-fit 0.5.9 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77927cc9d568e7f7b76c291e79a40144a6973a1ec959b53684156bc32e801fd4
-  data.tar.gz: 6b740fd8f0e3877a6f22d5a287478fcb7983e3e82886d5a24a3035051e6ef73d
+  metadata.gz: 75362a4faf88f3ca8497484ba835358eb06d82e36d81ad3e53d7dc4ec877f478
+  data.tar.gz: 6cd85cd677977d84670daa160235ff65b5a7ebad55b8cd51ea59cd5661a6bd8a
 SHA512:
-  metadata.gz: 682ab1bf78d273e5814603ee7f1fafcfe16bd0020a6703b275f12fe0a23dbe624f198fd94ef47ce9e8f8a05541cf33bd45d7583019708a7e664d650207707be3
-  data.tar.gz: 208d7e4dd44ea7cfb04b3f343619963597a86da2d86830b7ffa82b06397bb2a9970e8b10d18ce26c1e790dac26a29c5fb6e5e2d12803417c47d09d823ee33a28
+  metadata.gz: 3aba69713ec7ba93ead186be8b58fbe577186b83a47ccded9c0f872abe492f15ee5337577e7c4aa36c07f7e6d33588d50231001e85e083156f79324bcf5daca1
+  data.tar.gz: 0d8e9e012c911e5609d00be8324995acef30f3a3ff2ba44d9e15380881c1c7882226074d70c5723953b42a0535bf4ec21b329d26fc78d4a9b0f51ca45766a820

data/lib/git-fit.rb

@@ -57,6 +57,11 @@ require_relative "git_fit/privacy/polyline_filter"
 require_relative "git_fit/import"
 require_relative "git_fit/sync/base"
 require_relative "git_fit/sync/strava"
+require_relative "git_fit/util"
+require_relative "git_fit/sync/base"
+require_relative "git_fit/sync/strava"
+require_relative "git_fit/sync/lorem"
+require_relative "git_fit/cli/sync"
 require_relative "git_fit/db/rebuild"
 require_relative "git_fit/db/connection"
 require_relative "git_fit/db/activity"

data/lib/git_fit/cli/sync.rb

@@ -0,0 +1,50 @@
+module GitFit
+  module Cli
+    module Sync
+      def sync
+        db = connect_db
+        source = options[:source]
+        unless source
+          say_status :error, "Use --source to specify a source (e.g. lorem)", :red
+          return
+        end
+
+        filter = options[:activity]&.flat_map { |v| v.split(",") }&.map(&:strip)&.map(&:downcase)
+        privacy = GitFit::Privacy::PolylineFilter.new(config: git_fit_config.privacy_config)
+        adapter = build_sync_adapter(source, db, filter, privacy: privacy)
+        unless adapter
+          say_status :error, "Unknown source: #{source}", :red
+          return
+        end
+
+        say_status :syncing, source, :green
+        count = adapter.call
+        if count > 0
+          say_status :done, "#{source}: #{count} activities synced", :green
+        else
+          say_status :warn, "#{source}: 0 activities", :yellow
+        end
+      rescue => e
+        say_status :error, "#{source}: #{e.message}", :red
+      end
+
+      private
+
+      def source_configured?(source)
+        return true if GitFit::Sync.const_defined?(source.capitalize)
+        config = git_fit_config
+        cfg = config.sync_config(source)
+        cfg && !cfg.empty?
+      end
+
+      def build_sync_adapter(source, db, filter, privacy: nil)
+        case source
+        when "lorem"
+          GitFit::Sync::Lorem.new(config: git_fit_config.sync_config(source), db: db, activity_filter: filter, privacy: privacy)
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/git_fit/cli.rb

@@ -3,6 +3,7 @@ require "thor"
 module GitFit
   class CLI < Thor
     package_name "git-fit"
+    include Cli::Sync
 
     class_option :config, type: :string, desc: "Config file path", aliases: "-c"
 
@@ -61,6 +62,13 @@ module GitFit
       say_status :error, "Parse failed: #{e.message}", :red
     end
 
+    desc "sync", "Sync workout data from a source"
+    option :source, type: :string, desc: "Source name (e.g. lorem)"
+    option :activity, type: :array, desc: "Filter by sport type", aliases: "--act"
+    def sync
+      super
+    end
+
     desc "gh SUBCOMMAND", "Manage GitHub secrets and variables"
     subcommand "gh", GhCLI
 

data/lib/git_fit/config_template.rb

@@ -23,6 +23,9 @@ module GitFit
           #   phone: ""                                # env: GIT_FIT_IGPSPORT_PASSWORD
           #   password: ""
 
+          # lorem:                                     # env: GIT_FIT_LOREM_COUNT
+          #   count: 5
+
         export:
           json:
             path: site/activities.json

data/lib/git_fit/db/rebuild.rb

@@ -8,6 +8,10 @@ module GitFit
       def self.call(db, db_path, migrations_path)
         backup = "#{db_path}.rebuild_bak"
         FileUtils.cp(db_path, backup)
+        %w[-wal -shm].each do |ext|
+          src = "#{db_path}#{ext}"
+          FileUtils.cp(src, "#{backup}#{ext}") if File.exist?(src)
+        end
 
         tables = db.tables - [:schema_migrations]
         data = {}
@@ -29,8 +33,16 @@ module GitFit
       rescue => e
         if backup && File.exist?(backup)
           FileUtils.cp(backup, db_path)
+          %w[-wal -shm].each do |ext|
+            src = "#{backup}#{ext}"
+            FileUtils.cp(src, "#{db_path}#{ext}") if File.exist?(src)
+          end
         end
         raise RebuildError, "Rebuild failed: #{e.message}"
+      ensure
+        [backup, "#{backup}-wal", "#{backup}-shm"].each do |f|
+          FileUtils.rm_f(f)
+        end
       end
 
       def self.export_table(db, table)

data/lib/git_fit/source.rb

@@ -3,5 +3,7 @@ module GitFit
   end
 end
 
-require_relative "source/tally"
+require_relative "util/tally"
 require_relative "source/base"
+
+GitFit::Source::Tally = GitFit::Util::Tally

data/lib/git_fit/sync/base.rb

@@ -1,9 +1,78 @@
+require "fileutils"
+require "time"
+
 module GitFit
   module Sync
     class Base
+      def initialize(config:, db:, activity_filter: nil, privacy: nil, time_budget: nil)
+        @config = config
+        @db = db
+        @activity_filter = activity_filter
+        @privacy = privacy
+        @time_budget = time_budget
+        @start_time = nil
+        @progress_reported = false
+      end
+
+      attr_reader :progress_reported
+
+      def call
+        return 0 unless before_call
+        return 0 unless respond_to?(:authenticate) ? authenticate : true
+        ids = pending_ids
+        return 0 if ids.nil? || ids.empty?
+        total = ids.size
+        count = 0
+        ids.filter_map do |p|
+          next if skip_type?(p[:type])
+          r = process_one(p)
+          count += 1
+          report_progress(count, total, build_progress_info(r)) if r
+          r
+        end.size
+      end
+
+      def before_call
+        @start_time = Time.now
+        true
+      end
+
+      def pending_ids
+        raise NotImplementedError, "#{self.class} must implement #pending_ids"
+      end
+
+      def process_one(pending)
+        raise NotImplementedError, "#{self.class} must implement #process_one"
+      end
+
+      def build_progress_info(attrs)
+        parts = []
+        sd = attrs["start_date"] || attrs[:start_date]
+        if sd
+          d = Date.parse(sd.to_s) rescue nil
+          if d
+            date_str = d.year == Date.today.year ? d.strftime("%m-%d") : d.strftime("%Y-%m-%d")
+            parts << date_str
+          end
+        end
+        type = attrs["sport_category"] || attrs[:sport_category]
+        parts << type if type
+        dist = attrs["distance"] || attrs[:distance]
+        if dist && dist.to_f > 0
+          parts << "#{format("%.1f", dist.to_f / 1000)}km"
+        end
+        source = attrs["source"] || attrs[:source] || source_label
+        name = attrs["name"] || attrs[:name]
+        display_name = name.to_s.strip
+        display_name = "#{source} Activity" if display_name.empty?
+        chars = display_name.chars
+        display_name = chars.first(30).join + "…" if chars.size > 30
+        parts << display_name
+        parts.join(" | ") unless parts.empty?
+      end
+
       def self.register_config(*keys)
         return if keys.empty?
-
         source = name.split("::").last.downcase
         GitFit.register_config_source(
           prefix: "GIT_FIT_#{source.upcase}",
@@ -11,6 +80,84 @@ module GitFit
           config_path: ["sync", source]
         )
       end
+
+      protected
+
+      def raw_dir
+        src = self.class.name.split("::").last.downcase
+        File.join("data", "raw", src)
+      end
+
+      def std_dir
+        src = self.class.name.split("::").last.downcase
+        File.join("data", "std", src)
+      end
+
+      def std_path(platform_id, ext = "json")
+        File.join(std_dir, "#{platform_id}.#{ext}")
+      end
+
+      def upsert_activity(attrs)
+        attrs = attrs.transform_keys(&:to_s)
+        now = Time.now.utc
+
+        if @privacy && !@privacy.before_saving?
+          attrs["summary_polyline"] = @privacy.filter(attrs["summary_polyline"])
+        end
+
+        existing = @db[:activities].where(run_id: attrs["run_id"]).first
+        if existing
+          attrs.delete("created_at")
+          attrs["updated_at"] = now
+          @db[:activities].where(run_id: attrs["run_id"]).update(attrs)
+        else
+          attrs["created_at"] ||= now
+          attrs["updated_at"] ||= now
+          @db[:activities].insert(attrs)
+        end
+      end
+
+      def skip_type?(sport_type)
+        return false unless @activity_filter
+        !@activity_filter.include?(sport_type.to_s.downcase)
+      end
+
+      def report_progress(count, total = nil, info = nil)
+        return unless show_progress?(count, total)
+        @progress_reported = true
+        line = "#{source_label}: #{count}"
+        line += "/#{total}" if total
+        line += " #{info}" if info
+        line += " "
+        print "\r#{line}"
+        $stdout.flush
+      end
+
+      def source_label
+        name = self.class.name
+        name ? name.split("::").last : "Adapter"
+      end
+
+      def time_expired?
+        return false unless @time_budget.is_a?(Numeric) && @time_budget > 0 && @start_time
+        (Time.now - @start_time) > @time_budget
+      end
+
+      def raw_file_exists?(platform_id)
+        File.exist?(raw_path(platform_id))
+      end
+
+      def show_progress?(count, total)
+        return true if count == 1
+        return true if total && (total - count) <= 50
+        step = progress_step(total)
+        step <= 1 || count % step == 0
+      end
+
+      def progress_step(total)
+        return 1 unless total && total > 0
+        [1, (1.5 * (total ** 0.4)).to_i].max
+      end
     end
   end
 end

data/lib/git_fit/sync/lorem.rb

@@ -0,0 +1,124 @@
+require "json"
+require "fileutils"
+require "time"
+
+module GitFit
+  module Sync
+    class Lorem < Base
+      register_config :count
+
+      DEMO_ACTIVITIES = [
+        { id: "alpha_001", name: "Lorem Morning Run", sport_category: "run",
+          distance: 5200.0, moving_time: 1800, elapsed_time: 2000,
+          start_date: "2025-01-15T06:30:00Z", start_date_local: "2025-01-15T14:30:00+08:00",
+          location_country: "CN", average_heartrate: 148.0, max_heartrate: 165.0,
+          average_cadence: 172.0, max_cadence: 185.0, average_power: nil, max_power: nil,
+          average_temperature: 22.0, calories: 380,
+          average_speed: 5200.0 / 1800, elevation_gain: 125.0, external_id: "lorem_001" },
+        { id: "beta_002", name: "Ipsum Cycling Session", sport_category: "ride",
+          distance: 35000.0, moving_time: 5400, elapsed_time: 6000,
+          start_date: "2025-01-14T08:00:00Z", start_date_local: "2025-01-14T16:00:00+08:00",
+          location_country: "CN", average_heartrate: 138.0, max_heartrate: 155.0,
+          average_cadence: 85.0, max_cadence: 105.0, average_power: 185.0, max_power: 420.0,
+          average_temperature: 18.0, calories: 850,
+          average_speed: 35000.0 / 5400, elevation_gain: 450.0, external_id: "lorem_002" },
+        { id: "gamma_003", name: "Dolor Hike", sport_category: "hike",
+          distance: 12000.0, moving_time: 7200, elapsed_time: 8100,
+          start_date: "2025-01-13T09:00:00Z", start_date_local: "2025-01-13T17:00:00+08:00",
+          location_country: "CN", average_heartrate: 122.0, max_heartrate: 142.0,
+          average_cadence: 110.0, max_cadence: 135.0, average_power: nil, max_power: nil,
+          average_temperature: 15.0, calories: 620,
+          average_speed: 12000.0 / 7200, elevation_gain: 820.0, external_id: "lorem_003" },
+        { id: "delta_004", name: "Sit Amet Walk", sport_category: "walk",
+          distance: 5000.0, moving_time: 3600, elapsed_time: 3900,
+          start_date: "2025-01-12T18:00:00Z", start_date_local: "2025-01-12T18:00:00+08:00",
+          location_country: "CN", average_heartrate: 108.0, max_heartrate: 125.0,
+          average_cadence: 105.0, max_cadence: 118.0, average_power: nil, max_power: nil,
+          average_temperature: 20.0, calories: 280,
+          average_speed: 5000.0 / 3600, elevation_gain: 35.0, external_id: "lorem_004" },
+        { id: "epsilon_005", name: "Consectetur Swim", sport_category: "swim",
+          distance: 2000.0, moving_time: 2400, elapsed_time: 2700,
+          start_date: "2025-01-11T07:00:00Z", start_date_local: "2025-01-11T15:00:00+08:00",
+          location_country: "CN", average_heartrate: 135.0, max_heartrate: 150.0,
+          average_cadence: 28.0, max_cadence: 32.0, average_power: nil, max_power: nil,
+          average_temperature: 26.0, calories: 520,
+          average_speed: 2000.0 / 2400, elevation_gain: 0.0, external_id: "lorem_005" }
+      ].freeze
+
+      def authenticate
+        true
+      end
+
+      def pending_ids
+        DEMO_ACTIVITIES.map { |act| { id: act[:id], type: act[:sport_category], summary: act } }
+      end
+
+      def process_one(pending)
+        attrs = build_attrs(pending[:summary])
+
+        dir = raw_dir
+        FileUtils.mkdir_p(dir)
+        File.write(File.join(dir, "#{pending[:id]}.json"), JSON.generate(pending[:summary]))
+
+        upsert_activity(attrs)
+        attrs
+      end
+
+      def raw_path(platform_id)
+        File.join(raw_dir, "#{platform_id}.json")
+      end
+
+      private
+
+      def build_attrs(act)
+        coords = generate_route_coords(act[:sport_category], act[:distance])
+        polyline = Geo::Polyline.encode(coords)
+
+        {
+          run_id: "lorem_#{act[:id]}",
+          name: act[:name],
+          distance: act[:distance],
+          moving_time: act[:moving_time],
+          elapsed_time: act[:elapsed_time],
+          sport_category: act[:sport_category],
+          sport_type: act[:sport_category],
+          start_date: Time.parse(act[:start_date])&.iso8601,
+          start_date_local: act[:start_date_local],
+          location_country: act[:location_country],
+          summary_polyline: polyline,
+          average_heartrate: act[:average_heartrate],
+          max_heartrate: act[:max_heartrate],
+          average_cadence: act[:average_cadence],
+          max_cadence: act[:max_cadence],
+          average_power: act[:average_power],
+          max_power: act[:max_power],
+          average_temperature: act[:average_temperature],
+          calories: act[:calories],
+          average_speed: act[:average_speed],
+          elevation_gain: act[:elevation_gain],
+          source: "lorem",
+          external_id: act[:external_id]
+        }
+      end
+
+      def generate_route_coords(category, distance)
+        base_lat = 31.2304
+        base_lng = 121.4737
+        num_points = [(distance / 500.0).ceil, 20].max
+
+        case category
+        when "run"
+          (0...num_points).map { |i| [base_lat + i * 0.0002, base_lng + i * 0.0003] }
+        when "ride"
+          (0...num_points).map { |i| [base_lat + i * 0.0005, base_lng + i * 0.0008] }
+        when "hike"
+          (0...num_points).map { |i| [base_lat + i * 0.0003 + Math.sin(i * 0.5) * 0.0001, base_lng + i * 0.0004] }
+        when "swim"
+          [[base_lat, base_lng]]
+        else
+          (0...num_points).map { |i| [base_lat + i * 0.0002, base_lng + i * 0.0002] }
+        end
+      end
+    end
+  end
+end

data/lib/git_fit/util/tally.rb

@@ -0,0 +1,92 @@
+require "json"
+
+module GitFit
+  module Util
+    class Tally
+      DIGITS = %w[零 一 二 三 四 五 六 七 八 九 十].freeze
+
+      attr_reader :value
+
+      def initialize(count = 0)
+        @value = count
+      end
+
+      def add(n = 1)
+        @value += n
+        self
+      end
+
+      def reset(count = 0)
+        @value = count
+        self
+      end
+
+      def to_i
+        @value.to_i
+      end
+
+      def to_int
+        to_i
+      end
+
+      def ==(other)
+        to_i == other.to_i
+      end
+
+      def <(other)
+        to_i < other.to_i
+      end
+
+      def to_s(format: :chinese)
+        case format
+        when :arabic then @value.to_s
+        else to_chinese
+        end
+      rescue StandardError
+        @value.to_s
+      end
+
+      def inspect
+        "#<#{self.class.name} value=#{@value}>"
+      end
+
+      private
+
+      def to_chinese
+        return @value.to_s if @value > 9999
+        chinese_numeral
+      end
+
+      def chinese_numeral
+        n = @value
+        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

data/lib/git_fit/util.rb

@@ -0,0 +1,4 @@
+module GitFit
+  module Util
+  end
+end

data/lib/git_fit/version.rb

@@ -1,3 +1,3 @@
 module GitFit
-  VERSION = "0.5.9"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.1
 platform: ruby
 authors:
 - Lax
@@ -137,6 +137,7 @@ files:
 - lib/git_fit/cli/gh_cli.rb
 - lib/git_fit/cli/import_cli.rb
 - lib/git_fit/cli/install_cli.rb
+- lib/git_fit/cli/sync.rb
 - lib/git_fit/config.rb
 - lib/git_fit/config_template.rb
 - lib/git_fit/db/activity.rb
@@ -166,8 +167,11 @@ files:
 - lib/git_fit/source/tally.rb
 - lib/git_fit/sport_mapper.rb
 - lib/git_fit/sync/base.rb
+- lib/git_fit/sync/lorem.rb
 - lib/git_fit/sync/strava.rb
 - lib/git_fit/timezone/resolver.rb
+- lib/git_fit/util.rb
+- lib/git_fit/util/tally.rb
 - lib/git_fit/version.rb
 homepage: https://github.com/Lax/git-fit
 licenses: