git-fit 0.15.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee369bc92bf12108c44bc5a6b6e5381bdac1651fbb49ae3aa3c533a235d04690
-  data.tar.gz: 473704789d8acb38cee61e21f174cfa4e9f77e7402909469e384990dd550104f
+  metadata.gz: 96f07075fbc309422c6d22333b450da57b2027720bc5600ac4fe8f186bd0a02e
+  data.tar.gz: d4402443354e15c63139a209f8ab8dac1b8a14b4b06de2bcf591c305d077d946
 SHA512:
-  metadata.gz: d7d8e4820cfa107ef9fe7d8ea7398c4073164c82ebbe3f128bdb0067616e1ef51fa5b404cfe319f8a25b916322f7bd039910ad2a816ee8e36cc3727c694472b4
-  data.tar.gz: 16f3953e8155163d88862847c0dbd226ec33716b4c9957eddcb3f27a517fca3b8e8bbf93487b0525f7916359bf3f6115701bb2ac0c30030909eed093ba5d649c
+  metadata.gz: 3bed1beb9ac7ac48482acda16ebf7cc24aa79a75d4b66a94b291ae9ec30434de2a2f5d8aa535cb4cfc4f0685fe10f27be8c753e9f71c8159d18376efa612858a
+  data.tar.gz: 29503c3c03b0373dea84e6335a8abb8be0be846e46e6a77453132b692dfe85b70dd6ff8d12c69319caa4421ab7e9b55029fe89bad444a7788530da071ce24303

data/lib/git_fit/sync/keep.rb

@@ -205,17 +205,18 @@ module GitFit
         keep_id = extract_id(run_data['id'])
         return false unless keep_id
 
+        raw = run_data.dup
+        if raw['heartRate'].is_a?(Hash)
+          raw['heartRate'] = raw['heartRate'].dup
+          raw['heartRate'].delete('heartRates')
+        end
+        raw.delete('geoPoints')
+
         write_source_archive({
+          archiveVersion: 0,
           source: 'keep',
           decodedAt: Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ'),
-          meta: {
-            startTime: run_data['startTime'],
-            endTime: run_data['endTime'],
-            duration: run_data['duration'],
-            dataType: run_data['dataType'],
-            distance: run_data['distance'],
-            region: run_data['region'],
-          },
+          raw: raw,
           geoPoints: payload[:geo_points],
           heartRates: payload[:hr_data],
         }, keep_id)
@@ -236,13 +237,17 @@ module GitFit
         @last_http_code = nil
         keep_id = extract_id(compound_id) || compound_id
         raw = JSON.parse(File.read(raw_path(keep_id)))
-        run_data = raw['meta'].merge('id' => compound_id)
+        run_data = if raw['archiveVersion'] == 0
+                     raw['raw'].merge('id' => compound_id)
+                   else
+                     raw['meta'].merge('id' => compound_id)
+                   end
 
         wgs = load_wgs_points(keep_id, raw)
         return false unless wgs&.any?
 
         if raw['heartRates']&.any?
-          vals = raw['heartRates'].map { |h| h['value'] }.compact
+          vals = raw['heartRates'].map { |h| h['value'] || h['beatsPerMinute'] }.compact
           run_data['heartRate'] = { 'averageHeartRate' => vals.sum / vals.size } if vals.any?
         end
 
@@ -261,7 +266,11 @@ module GitFit
                           pt['timestamp'] ? Time.parse(pt['timestamp']) : nil, pt['heartrate']] }
         else
           payload = { geo_points: raw['geoPoints'], hr_data: raw['heartRates'] }
-          run_data = raw['meta']
+          run_data = if raw['archiveVersion'] == 0
+                       raw['raw']
+                     else
+                       raw['meta']
+                     end
           Source::Keep.compute_wgs_points(payload, run_data)
         end
       end
@@ -302,7 +311,7 @@ module GitFit
         data_type = run_data['dataType']
 
         avg_hr = run_data.dig('heartRate', 'averageHeartRate')
-        avg_hr = nil if avg_hr && avg_hr < 0
+        avg_hr = nil if avg_hr && avg_hr <= 0
 
         polyline_str = nil
         total_elevation = run_data['elevation']

data/lib/git_fit/version.rb

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

metadata

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