git-fit 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db2fe0e8eb96a0b6a46c47b968b8037a84f8399ba27bd576c12d48102799d16
-  data.tar.gz: ae48818fb5e43f752a96b502ca85f3bcd172debae1ed3e505d637786b3a5929c
+  metadata.gz: 529a74a588a51b0b04ba1a0e15e629425dec93dd79986c6e6f45a0eda35d5914
+  data.tar.gz: 37a81d2e9285b8917c13b36eb343d3b97de27709cf1d71a094216c7a645b3168
 SHA512:
-  metadata.gz: 573c1f58ec6d6011d7ab5c46432ded4856d33a243aa8f762d20b426fa82390d30d0485a52116904577c944e48ec217d6c6be3ca67662fdc22972c61226ab35e9
-  data.tar.gz: 5ef2080ae250c38d14459e6ac313be8a7dc9023e248829a3f090a32e3c8cbddd82f3c52340427211089b80228aac71ed44cc78d1e3d152b34874d445df84c1cf
+  metadata.gz: 8ecb103ba98d635affa43058a695811d061d8be767754e3012efb23aa3a7eb4a85b5ab6041c371da1371fab1afc31100f94f8cf77e11a21ec900b38be29a3dcf
+  data.tar.gz: 27610f67729cf037ac1a05772103abcc0899de47a484b929d4d62a4f34184c23921245c84f62ea308861ffa62c4e520e0d39223ecb8908e0c36966e0f6825d6c

data/lib/git-fit.rb

@@ -58,6 +58,7 @@ 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/std/resolver'
 require_relative 'git_fit/util'
 require_relative 'git_fit/sync/lorem'
 require_relative 'git_fit/sync/garmin_base'

data/lib/git_fit/dedup/trajectory.rb

@@ -168,13 +168,8 @@ module GitFit
       end
 
       def load_std_points(run_id)
-        source = source_from_run_id(run_id)
-        return nil unless source
-
-        std_dir = File.join('data', 'std', source)
-        id = run_id.sub("#{source}_", '')
-        path = Dir.glob(File.join(std_dir, "#{id}.*")).first
-        return nil unless path && File.exist?(path)
+        path = GitFit::Std::Resolver.find(run_id)
+        return nil unless path
 
         data = JSON.parse(File.read(path))
         return data if data.is_a?(Array) && data.first.is_a?(Hash)
@@ -191,13 +186,6 @@ module GitFit
         polyline
       end
 
-      def source_from_run_id(run_id)
-        %w[garmin_cn garmin strava keep igpsport xoss xingzhe].each do |s|
-          return s if run_id.start_with?("#{s}_")
-        end
-        nil
-      end
-
       def near(pt, candidates)
         lat = pt['latitude'] || pt['positionLat'] || pt[:latitude] || pt[:positionLat]
         lng = pt['longitude'] || pt['positionLong'] || pt[:longitude] || pt[:positionLong]

data/lib/git_fit/export/gpx.rb

@@ -79,8 +79,8 @@ module GitFit
       def l2_points(activity)
         return nil unless activity[:source]
 
-        path = File.join('data', 'std', activity[:source].to_s, "#{activity[:run_id]}.json")
-        return nil unless File.exist?(path)
+        path = GitFit::Std::Resolver.find(activity[:run_id].to_s)
+        return nil unless path
 
         records = ::JSON.parse(File.read(path))
         return nil if records.empty?

data/lib/git_fit/import/local_file.rb

@@ -124,8 +124,9 @@ module GitFit
               h[:heart_rate] = pt[4] if pt[4]
               h
             }
-            std_tmp = File.join(std_source_dir, ".#{activity[:run_id]}.json.tmp")
-            std_final = File.join(std_source_dir, "#{activity[:run_id]}.json")
+            natural_id = activity[:run_id].sub("#{source}_", '')
+            std_tmp = File.join(std_source_dir, ".#{natural_id}.json.tmp")
+            std_final = File.join(std_source_dir, "#{natural_id}.json")
             File.write(std_tmp, JSON.generate(std_data))
             File.rename(std_tmp, std_final)
 

data/lib/git_fit/std/resolver.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module GitFit
+  module Std
+    module Resolver
+      # garmin_cn 必须排在 garmin 前面："garmin_cn_7".start_with?("garmin_") == true
+      SOURCE_PREFIXES = %w[
+        garmin_cn garmin strava keep igpsport xoss xingzhe
+        apple_health gpx fit tcx
+      ].freeze
+
+      # 从 run_id 解构出 [source, natural_id]
+      # natural_id = platform_id（sync）或内容哈希（local）
+      def self.decompose(run_id)
+        SOURCE_PREFIXES.each do |s|
+          prefix = "#{s}_"
+          return [s, run_id.sub(prefix, '')] if run_id.start_with?(prefix)
+        end
+        [nil, nil]
+      end
+
+      # @return [String, nil] std 文件路径（相对 cwd），找不到返回 nil
+      def self.find(run_id)
+        source, natural_id = decompose(run_id)
+        return nil unless source
+
+        path = File.join('data', 'std', source, "#{natural_id}.json")
+        path if File.exist?(path)
+      end
+    end
+  end
+end

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Lax
@@ -288,6 +288,7 @@ files:
 - 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
 - lib/git_fit/sync/base.rb
 - lib/git_fit/sync/garmin.rb