git-fit 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79cc74453027121864f89091916030e85740e51843fc01fec0653e1d81d56b73
-  data.tar.gz: e4ac69b5d96ca061484445242435bb2f3b36ca112c1cf7ef0ca0031862914b0a
+  metadata.gz: 1288abd3413532666d8f9582a8a2934dade01fc0dc81258f2903029d42129887
+  data.tar.gz: 5a6b72a2be75a4eef7f5136a8ac3d631b967f40fc0e6fff615279531ff160e0c
 SHA512:
-  metadata.gz: bf5d3a7c4341b75039170cbae3f5ccd6f423ea7ac1e297a1c4a4ba72b9e22eb66ca3c6a4d3f293f3079e5d38fe1d9c03985871cf859194bd7ddfe1e9b860b9f1
-  data.tar.gz: 15009f7d14e7625cde88cffab15a126f732a756ba29d41b75a610e0498a8d33df371a3cd07c79285a2ede47edcc9942398c28b48194453de48b8226ef5ea0ed8
+  metadata.gz: a488380bc74c1ae7baceb6686a98c38325fa8be5ccac2c32b6b09d9c715b25edc20cce66aeb1f5cb7342962e6240e95f48f0583c5be32d739824aa9c19bf9a95
+  data.tar.gz: 57b4d882f162663cf5b69c2eb024ed511bf7829dba0d99f6ac391508b315df9196c9bfd9b927c648a5f5b4a256f162c74ddc302e79b373b400895738d7f7df97

data/lib/git_fit/sync/garmin_base.rb

@@ -130,10 +130,12 @@ module GitFit
         details = fetch_activity_detail(act_id)
         return nil unless details
 
-        polyline = fetch_summary_polyline(act_id)
-
-        unless raw_file_exists?(act_id)
+        if raw_file_exists?(act_id)
+          polyline = fetch_summary_polyline(act_id)
+        else
+          write_raw_file(details, 'detail.json', act_id)
           download_fit_raw(act_id)
+          polyline = download_and_save_polyline(act_id)
           l2 = fit_to_l2(act_id)
           write_standardized_json(l2, act_id) if l2
         end
@@ -658,11 +660,22 @@ module GitFit
         File.join(raw_dir, platform_id, 'activity.fit')
       end
 
+      def raw_file_exists?(platform_id)
+        dir = File.join(raw_dir, platform_id)
+        %w[activity.fit detail.json polyline.json].all? do |f|
+          File.exist?(File.join(dir, f))
+        end
+      end
+
       def write_source_archive(data, platform_id, ext = 'json')
+        write_raw_file(data, "activity.#{ext}", platform_id)
+      end
+
+      def write_raw_file(data, filename, platform_id)
         dir = File.join(raw_dir, platform_id)
         FileUtils.mkdir_p(dir)
-        tmp = File.join(dir, ".activity.#{ext}.tmp")
-        dest = File.join(dir, "activity.#{ext}")
+        tmp = File.join(dir, ".#{filename}.tmp")
+        dest = File.join(dir, filename)
         case data
         when String then File.write(tmp, data)
         when Hash, Array then File.write(tmp, JSON.generate(data))
@@ -670,22 +683,37 @@ module GitFit
         File.rename(tmp, dest)
       end
 
-      def fetch_summary_polyline(activity_id)
-        gps = api_get("/activity-service/activity/#{activity_id}/details")
-        polyline = gps&.dig('geoPolylineDTO', 'polyline')
-
+      def encode_polyline(polyline_data, activity_id = nil)
+        return nil unless polyline_data
+        polyline = polyline_data['polyline']
         if polyline.is_a?(Array)
           points = polyline.map { |pt| [pt['lat'], pt['lon']] }
-          GitFit::Geo::Polyline.encode(points) if points.size >= 2
-        else
-          polyline
+          return GitFit::Geo::Polyline.encode(points) if points.size >= 2
         end
+        polyline
       rescue StandardError => e
-        puts "Warning: failed to encode polyline for #{activity_id}: #{e.message}"
+        context = activity_id ? " for #{activity_id}" : ''
+        puts "Warning: failed to encode polyline#{context}: #{e.message}"
         nil
       end
 
+      def fetch_summary_polyline(activity_id)
+        gps = api_get("/activity-service/activity/#{activity_id}/details")
+        encode_polyline(gps&.dig('geoPolylineDTO'), activity_id)
+      end
+
+      def download_and_save_polyline(activity_id)
+        gps = api_get("/activity-service/activity/#{activity_id}/details")
+        return nil unless gps
+        polyline_data = gps['geoPolylineDTO']
+        return nil unless polyline_data
+        write_raw_file(polyline_data, 'polyline.json', activity_id)
+        encode_polyline(polyline_data, activity_id)
+      end
+
       def download_fit_raw(activity_id)
+        return true if File.exist?(raw_path(activity_id))
+
         uri = URI("#{connectapi_base}/download-service/files/activity/#{activity_id}")
         req = Net::HTTP::Get.new(uri)
         req['Authorization'] = "Bearer #{@access_token.fetch('access_token')}"

data/lib/git_fit/version.rb

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

metadata

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