git-fit 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75362a4faf88f3ca8497484ba835358eb06d82e36d81ad3e53d7dc4ec877f478
-  data.tar.gz: 6cd85cd677977d84670daa160235ff65b5a7ebad55b8cd51ea59cd5661a6bd8a
+  metadata.gz: 726e06c730a1309c59072df3f52e3261f5bf0e9d3b931e7a7016a8756c3190fa
+  data.tar.gz: 314a50f4b64054fe984e022421e464f22ae0a5469c9e7d369c5ef775ccdc0f14
 SHA512:
-  metadata.gz: 3aba69713ec7ba93ead186be8b58fbe577186b83a47ccded9c0f872abe492f15ee5337577e7c4aa36c07f7e6d33588d50231001e85e083156f79324bcf5daca1
-  data.tar.gz: 0d8e9e012c911e5609d00be8324995acef30f3a3ff2ba44d9e15380881c1c7882226074d70c5723953b42a0535bf4ec21b329d26fc78d4a9b0f51ca45766a820
+  metadata.gz: 2e36dcd8e78e57bbec0a451f1ce8d98fe4a3ab83dbbce334c0b528f08b5a2cc3d050a3b5da1092dbbc808d3afb6fb48b4d8052030f7d3301ac557027c97072d4
+  data.tar.gz: '00767969c5771dac29763dad5a65f4d1fd0c348ea127cfa36165dc46497000eb0db93ccff83aa13f5fc2c051d35ea618163ba1046e0abbb4c7cac315aac9f386'

data/lib/git-fit.rb

@@ -56,11 +56,18 @@ require_relative "git_fit/timezone/resolver"
 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/sync/garmin_base"
+require_relative "git_fit/sync/garmin_base_di"
+require_relative "git_fit/sync/garmin"
+require_relative "git_fit/sync/garmin_cn"
+require_relative "git_fit/sync/strava"
+require_relative "git_fit/sync/keep"
+require_relative "git_fit/sync/igpsport"
+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/db/rebuild"
 require_relative "git_fit/db/connection"

data/lib/git_fit/cli/sync.rb

@@ -4,46 +4,35 @@ module GitFit
       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
+        sources = if source
+          [source]
         else
-          say_status :warn, "#{source}: 0 activities", :yellow
+          configured = (git_fit_config["sync"] || {}).keys
+          builtin = GitFit::Sync::Base.adapters
+                      .map { |c| c.config_key }
+          if ENV["GIT_FIT_ENVIRONMENT"] == "testing"
+            builtin += GitFit::Sync::Base.test_adapters
+                         .map { |c| c.config_key }
+          end
+          (builtin + configured).uniq
         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
+        runner = GitFit::Sync::Runner.new(
+          sources: sources,
+          db: db,
+          config: git_fit_config,
+          activity_filter: filter,
+          privacy: privacy,
+          num_workers: git_fit_config.dig("sync", "workers") || 3,
+          time_budget: git_fit_config.dig("sync", "time_budget"),
+          total_timeout: git_fit_config.dig("sync", "total_timeout")
+        )
+        runner.run
+      rescue => e
+        say_status :error, e.message, :red
       end
     end
   end

data/lib/git_fit/config.rb

@@ -5,7 +5,11 @@ module GitFit
   class Config
     DEFAULTS = {
       "database" => { "path" => "db/fit.sqlite3" },
-      "sync" => {},
+      "sync" => {
+        "workers" => 3,
+        "time_budget" => nil,
+        "total_timeout" => nil
+      },
       "export" => {
         "json" => { "path" => "site/activities.json" },
         "svg" => { "dir" => "site/svg" },
@@ -60,7 +64,10 @@ module GitFit
     private
 
     def load_env
-      @data["database"]["path"] = ENV["GIT_FIT_DATABASE_PATH"] if ENV["GIT_FIT_DATABASE_PATH"]
+      @data["database"]["path"] = ENV["GIT_FIT_DATABASE_PATH"] if ENV["GIT_FIT_DATABASE_PATH"] && !ENV["GIT_FIT_DATABASE_PATH"].empty?
+      @data["sync"]["workers"] = ENV["GIT_FIT_SYNC_WORKERS"].to_i if ENV["GIT_FIT_SYNC_WORKERS"] && !ENV["GIT_FIT_SYNC_WORKERS"].empty?
+      @data["sync"]["time_budget"] = ENV["GIT_FIT_SYNC_TIME_BUDGET"].to_f if ENV["GIT_FIT_SYNC_TIME_BUDGET"] && !ENV["GIT_FIT_SYNC_TIME_BUDGET"].empty?
+      @data["sync"]["total_timeout"] = ENV["GIT_FIT_SYNC_TOTAL_TIMEOUT"].to_f if ENV["GIT_FIT_SYNC_TOTAL_TIMEOUT"] && !ENV["GIT_FIT_SYNC_TOTAL_TIMEOUT"].empty?
 
       GitFit.registered_configs.each do |reg|
         reg[:keys].each do |key|

data/lib/git_fit/config_template.rb

@@ -7,6 +7,10 @@ module GitFit
           path: db/fit.sqlite3
 
         sync:
+          # workers: 3                                 # env: GIT_FIT_SYNC_WORKERS
+          # time_budget: 300                           # env: GIT_FIT_SYNC_TIME_BUDGET (seconds)
+          # total_timeout: 600                         # env: GIT_FIT_SYNC_TOTAL_TIMEOUT (seconds)
+
           # strava:                                    # env: GIT_FIT_STRAVA_CLIENT_ID
           #   client_id: ""                            # env: GIT_FIT_STRAVA_CLIENT_SECRET
           #   refresh_token: ""                        # env: GIT_FIT_STRAVA_REFRESH_TOKEN
@@ -26,6 +30,14 @@ module GitFit
           # lorem:                                     # env: GIT_FIT_LOREM_COUNT
           #   count: 5
 
+          # xoss:                                        # env: GIT_FIT_XOSS_PHONE
+          #   phone: ""                                  # env: GIT_FIT_XOSS_PASSWORD
+          #   password: ""
+
+          # xingzhe:                                     # env: GIT_FIT_XINGZHE_EMAIL
+          #   email: ""                                  # env: GIT_FIT_XINGZHE_PASSWORD
+          #   password: ""
+
         export:
           json:
             path: site/activities.json

data/lib/git_fit/sync/base.rb

@@ -1,4 +1,5 @@
 require "fileutils"
+require "json"
 require "time"
 
 module GitFit
@@ -81,6 +82,32 @@ module GitFit
         )
       end
 
+      class << self
+        def adapters
+          @adapters ||= []
+        end
+
+        def test_adapters
+          @test_adapters ||= []
+        end
+
+        def register_adapter
+          Base.adapters << self unless Base.adapters.include?(self)
+        end
+
+        def register_test_adapter
+          Base.test_adapters << self unless Base.test_adapters.include?(self)
+        end
+
+        def config_key(source = nil)
+          if source
+            @config_key = source
+          else
+            @config_key ||= name.split("::").last.downcase
+          end
+        end
+      end
+
       protected
 
       def raw_dir
@@ -144,7 +171,11 @@ module GitFit
       end
 
       def raw_file_exists?(platform_id)
-        File.exist?(raw_path(platform_id))
+        return false unless respond_to?(:raw_path, true)
+        path = raw_path(platform_id)
+        File.exist?(path)
+      rescue NotImplementedError
+        false
       end
 
       def show_progress?(count, total)
@@ -158,6 +189,38 @@ module GitFit
         return 1 unless total && total > 0
         [1, (1.5 * (total ** 0.4)).to_i].max
       end
+
+      def raw_path(platform_id)
+        raise NotImplementedError, "#{self.class} must implement #raw_path"
+      end
+
+      def write_source_archive(data, platform_id, ext = "json")
+        dir = raw_dir
+        FileUtils.mkdir_p(dir)
+        tmp = File.join(dir, ".#{platform_id}.#{ext}.tmp")
+        dest = File.join(dir, "#{platform_id}.#{ext}")
+        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
+
+      def write_standardized_json(attrs, platform_id)
+        dir = std_dir
+        FileUtils.mkdir_p(dir)
+        tmp = File.join(dir, ".#{platform_id}.json.tmp")
+        dest = File.join(dir, "#{platform_id}.json")
+        File.write(tmp, JSON.generate(attrs.transform_keys(&:to_s)))
+        File.rename(tmp, dest)
+      end
+
+      def existing_run_ids
+        prefix = "#{self.class.config_key}_"
+        @db[:activities].where(Sequel.like(:run_id, "#{prefix}%"))
+          .select_map(:run_id)
+          .map { |rid| rid.sub(/\A#{Regexp.escape(prefix)}/, "") }
+      end
     end
   end
 end

data/lib/git_fit/sync/garmin.rb

@@ -0,0 +1,16 @@
+require_relative "garmin_base_di"
+
+module GitFit
+  module Sync
+    class Garmin < GarminBaseDI
+      register_adapter
+      register_config :email, :password, :secret, :auth_seed
+      config_key "garmin"
+
+      def initialize(config:, db:, activity_filter: nil, privacy: nil, time_budget: nil)
+        super
+        @domain = "garmin.com"
+      end
+    end
+  end
+end