git-fit 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0547b3cc3e8f1c34bbcb472bde62fcb97a24a8f9d7923021e3d7c1acea6072b8
-  data.tar.gz: 077211f324433c5e720d1bb57d5a9836805e349baaa0572278e43709fc345722
+  metadata.gz: 0f2c48812a658488f860a9e483756ecd635b078b8f94deaf0cc20e31ab5caef9
+  data.tar.gz: 3a1b15b292e344df1a5a503fd3f2160e0e66ca5f3293c7449144164ca84ce53a
 SHA512:
-  metadata.gz: 11c4a47b9faa967b2b6e9c0c393a9f43220e3c1bf01a949951087355ad45d770bcc15f7af8700ee8c5a24ca244b6b150738ac8b752933b3b6e8016c53e6bd222
-  data.tar.gz: 269d0e18280295248204b860366f8d8213a5b549a09e5c39a224ddd54c4123715d1adada1b84ddbad56e694bc07c84a196b50232738e3123908e4f41684f7552
+  metadata.gz: 0a6e1dec451ae23ddfc9333258f25c528db2d467dcd2b4dfd8f04ada2decaaa9d81c9d3094010c264c82a51c9e001bac7d33a761c75865dafadcc4207ddbe003
+  data.tar.gz: 4157de7684b83443b6b825af613e2ed0e74b8e4c2bac9378fe0edf0f3329a465ca0e1e80c540fed437d1f88825232b96a480e2fd8bbd6c210e6bad5d0319e7c4

data/lib/git_fit/cli/geo_cli.rb

@@ -11,6 +11,7 @@ module GitFit
     option :time,     type: :numeric, aliases: '-t', desc: 'Time budget in seconds'
     option :"dry-run", type: :boolean, desc: "Don't write to DB"
     option :checkpoint, type: :boolean, desc: 'Run WAL checkpoint after detect'
+    option :"cache-dir", type: :string, desc: "Geo cache directory (empty = no cache)", default: "data/cache"
     def detect
       config = GitFit::Config.new
         conn = GitFit::DB::Connection.new(config.db_path)
@@ -25,6 +26,7 @@ module GitFit
         strategy: options[:strategy],
         time_budget: options[:time],
         dry_run: options[:"dry-run"],
+        cache_dir: options[:"cache-dir"],
       )
       detector.run
       checkpoint_db(db) if options[:checkpoint]

data/lib/git_fit/cli/import_cli.rb

@@ -82,7 +82,6 @@ module GitFit
         else
           say_status :done, "gpx: #{count} activities", :green
         end
-        count
         checkpoint_db(db) if options[:checkpoint]
       rescue StandardError => e
         say_status :error, "gpx: #{e.message}", :red
@@ -115,7 +114,6 @@ module GitFit
         else
           say_status :done, "tcx: #{count} activities", :green
         end
-        count
         checkpoint_db(db) if options[:checkpoint]
       rescue StandardError => e
         say_status :error, "tcx: #{e.message}", :red
@@ -148,7 +146,6 @@ module GitFit
         else
           say_status :done, "fit: #{count} activities", :green
         end
-        count
         checkpoint_db(db) if options[:checkpoint]
       rescue StandardError => e
         say_status :error, "fit: #{e.message}", :red
@@ -180,7 +177,6 @@ module GitFit
         else
           say_status :done, "apple_health: #{count} activities", :green
         end
-        count
         checkpoint_db(db) if options[:checkpoint]
       rescue StandardError => e
         say_status :error, "apple_health: #{e.message}", :red

data/lib/git_fit/cli/sync.rb

@@ -22,21 +22,21 @@ module GitFit
           (builtin + configured).uniq
         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
-      checkpoint_db(db) if options[:checkpoint]
-    rescue StandardError => e
+        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
+        checkpoint_db(db) if options[:checkpoint]
+      rescue StandardError => e
       say_status :error, e.message, :red
-    end
+      end
     end
   end
 end

data/lib/git_fit/geo/division_detector.rb

@@ -10,10 +10,9 @@ module GitFit
       KEEP_PLACEHOLDER = 'gqqrFurkeU??'
       SAMPLE_INTERVAL_DEG = 0.01
       CACHE_DIR = 'data/cache'
-      POINT_CACHE_FILE = File.join(CACHE_DIR, 'geo-point.jsonl')
 
       def initialize(db:, amap_key: nil, batch: 20, limit: nil, strategy: 'proportional', time_budget: nil,
-                     dry_run: false)
+                     dry_run: false, cache_dir: CACHE_DIR)
         @db = db
         @geocoder = ReverseGeocode.new(amap_key: amap_key)
         @amap_key = amap_key
@@ -23,6 +22,7 @@ module GitFit
         @time_budget = time_budget
         @start_time = Time.now
         @dry_run = dry_run
+        @cache_dir = cache_dir
         @processed = 0
         @skipped_placeholder    = 0
         @skipped_empty_polyline = 0
@@ -32,7 +32,7 @@ module GitFit
         @errors = 0
         @attempted = 0
         @total = 0
-        FileUtils.mkdir_p(CACHE_DIR)
+        FileUtils.mkdir_p(@cache_dir) if @cache_dir && !@cache_dir.empty?
         load_caches
       end
 
@@ -159,10 +159,11 @@ module GitFit
         key_counts = Hash.new(0)
         samples.each do |lat, lng|
           coord_key = "#{lat},#{lng}"
-          raw = lookup_point_cache(coord_key)
+          provider = provider_for(lat, lng)
+          raw = lookup_point_cache(coord_key, provider)
           unless raw
             raw = @geocoder.lookup(lat, lng)
-            save_point_cache(coord_key, raw) if raw[:province]
+            save_point_cache(coord_key, raw, provider) if raw[:province]
           end
           result = normalize_entry(raw)
           next unless result
@@ -218,9 +219,19 @@ module GitFit
         { divisions: division_list, total_sampled: total_points, source: 'amap', processed_at: Time.now.utc.iso8601 }
       end
 
-      def lookup_point_cache(coord_key)
-        return nil unless File.exist?(POINT_CACHE_FILE)
-        File.open(POINT_CACHE_FILE, 'r') do |f|
+      def cache_path_for(provider)
+        return nil unless @cache_dir && !@cache_dir.empty?
+        File.join(@cache_dir, "#{provider}-points.jsonl")
+      end
+
+      def provider_for(lat, lng)
+        @geocoder.provider_name(lat, lng)
+      end
+
+      def lookup_point_cache(coord_key, provider)
+        path = cache_path_for(provider)
+        return nil unless path && File.exist?(path)
+        File.open(path, 'r') do |f|
           f.each_line do |line|
             entry = JSON.parse(line) rescue next
             return entry if entry['ck'] == coord_key
@@ -229,12 +240,14 @@ module GitFit
         nil
       end
 
-      def save_point_cache(coord_key, result)
+      def save_point_cache(coord_key, result, provider)
+        path = cache_path_for(provider)
+        return unless path
         entry = { ck: coord_key, p: result[:province], source: result[:source] }
         entry[:city] = result[:city] if result[:city]
         entry[:dist] = result[:district] if result[:district]
         entry[:town] = result[:township] if result[:township]
-        File.open(POINT_CACHE_FILE, 'a') { |f| f.puts(JSON.generate(entry)) }
+        File.open(path, 'a') { |f| f.puts(JSON.generate(entry)) }
       end
 
       def update_db(run_id, summary)

data/lib/git_fit/geo/reverse_geocode.rb

@@ -25,6 +25,10 @@ module GitFit
         in_china?(lat, lng) ? lookup_china(lat, lng) : lookup_intl(lat, lng)
       end
 
+      def provider_name(lat, lng)
+        in_china?(lat, lng) ? :amap : :nominatim
+      end
+
       private
 
       def in_china?(lat, lng)

data/lib/git_fit/version.rb

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

metadata

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