git-fit 0.17.0 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb01a16a1c3ffd8bc69b1c7941dcbd5d08e472d4e726ffac27f4147ed268a5de
-  data.tar.gz: e32f30371d9e2c9e9879e78e749fb649372c8a0cd644dbdb70042139e60dabd6
+  metadata.gz: 472d41138e7c8607cbc63dbff14db13079b6b824c342ec03661696c77f08f8f9
+  data.tar.gz: 291394e38307334eaedd49106b5c6c057331d972ccf4fa2619ce68904ca89a86
 SHA512:
-  metadata.gz: 854594f865e691b539e5d487278afab1bd0e26d8b25462b19c458950e59acdae38b8bd9b4d27f48dcb2ac666e55e7666e8b22ee3ad4a6d97f3f19caee72d0387
-  data.tar.gz: 0af21c0ba3536d6f48bd7b35099aaff5599afc1a692245b2587ef74e03b2380b082bf177b9efecaaa6ba23492a695a8332abb7377825fda812953be1f47fb697
+  metadata.gz: 2f7e4971cc16db4f139ae122a65fe19842bfd1e999362bfc57294e4fa2b41a3adbd228824e9126b13a13fc2499643dec07ad195e1d6050618137a54f12b34a48
+  data.tar.gz: 713ff0444661494cb22469f5f3535de7b20f89229ec82b5db07398654b6cd2622267db18a0d1841517f796a351bbc1d29800d79b53469009454532dba855b61e

data/lib/git_fit/cli/purge_cli.rb

@@ -20,18 +20,18 @@ module GitFit
     desc 'activity RUN_ID', 'Delete activity by run_id (e.g. keep_9223370467120855807)'
     option :dry_run, type: :boolean, default: false, desc: 'Preview without deleting'
     option :checkpoint, type: :boolean, default: true, desc: 'Run WAL checkpoint after delete'
+    option :delete_raw, type: :boolean, default: false, desc: 'Also delete raw source file(s)'
+    option :delete_std, type: :boolean, default: false, desc: 'Also delete standardized JSON file'
 
     def activity(run_id)
       db = connect_db
 
       record = db[:activities].where(run_id: run_id).first
 
-      unless record
-        raise RecordNotFound, "Not found: #{run_id}"
-      end
+      raise RecordNotFound, "Not found: #{run_id}" unless record
 
       if options[:dry_run]
-        say_status :dry_run, "Would delete activity:", :yellow
+        say_status :dry_run, 'Would delete activity:', :yellow
         say "  run_id:          #{record[:run_id]}"
         say "  name:            #{record[:name]}"
         say "  source:          #{record[:source]}"
@@ -39,6 +39,8 @@ module GitFit
         say "  start_date:      #{record[:start_date]}"
         say "  distance:        #{record[:distance]}m" if record[:distance]
         say "  moving_time:     #{record[:moving_time]}s" if record[:moving_time]
+        list_raw_files(run_id) if options[:delete_raw]
+        list_std_file(run_id) if options[:delete_std]
         return
       end
 
@@ -47,6 +49,9 @@ module GitFit
 
       say_status :deleted, "Removed #{deleted} activity: #{run_id}", :green
 
+      delete_raw_files(run_id) if options[:delete_raw]
+      delete_std_file(run_id) if options[:delete_std]
+
       checkpoint_db(db) if options[:checkpoint]
     rescue RecordNotFound
       raise
@@ -61,5 +66,53 @@ module GitFit
       conn.migrate!
       conn.db
     end
+
+    def delete_raw_files(run_id)
+      source, natural_id = GitFit::Std::Resolver.decompose(run_id)
+      return unless source && natural_id
+
+      raw_base = File.join('data', 'raw', source, natural_id)
+      files = Dir.glob("#{raw_base}.*")
+      if files.any?
+        files.each { |f| File.delete(f) }
+      elsif File.directory?(raw_base)
+        FileUtils.rm_rf(raw_base)
+      end
+    end
+
+    def list_raw_files(run_id)
+      source, natural_id = GitFit::Std::Resolver.decompose(run_id)
+      return unless source && natural_id
+
+      raw_base = File.join('data', 'raw', source, natural_id)
+      files = Dir.glob("#{raw_base}.*")
+      if files.any?
+        files.each { |f| say "Would delete: #{f}" }
+      elsif File.directory?(raw_base)
+        say "Would delete: #{raw_base}/ (directory)"
+      else
+        say "No raw files found for #{run_id}"
+      end
+    end
+
+    def delete_std_file(run_id)
+      source, natural_id = GitFit::Std::Resolver.decompose(run_id)
+      return unless source && natural_id
+
+      std_path = File.join('data', 'std', source, "#{natural_id}.json")
+      File.delete(std_path) if File.exist?(std_path)
+    end
+
+    def list_std_file(run_id)
+      source, natural_id = GitFit::Std::Resolver.decompose(run_id)
+      return unless source && natural_id
+
+      std_path = File.join('data', 'std', source, "#{natural_id}.json")
+      if File.exist?(std_path)
+        say "Would delete: #{std_path}"
+      else
+        say "No std file found for #{run_id}"
+      end
+    end
   end
 end

data/lib/git_fit/export/calculator.rb

@@ -100,46 +100,41 @@ module GitFit
                    max_power_peak: 0.0, total_max_power: 0.0, max_power_count: 0 }
         end
 
-        rows.each do |r|
-          next unless r[:start_date_local] || r[:start_date]
+        rows.each { |row| accumulate_monthly_row(monthly, row) }
 
-          ym = (r[:start_date_local] || r[:start_date])[0..6]
-          d = r[:distance] || 0
-          t = r[:moving_time] || 0
-          hr = r[:average_heartrate]
-          e = r[:elevation_gain] || 0
-          l = r[:elevation_loss] || 0
-          s = r[:steps] || 0
+        format_monthly(monthly.sort)
+      end
 
-          monthly[ym][:count] += 1
-          monthly[ym][:distance_km] += d / 1000.0
-          monthly[ym][:moving_time_h] += t / 3600.0
-          monthly[ym][:total_elev] += e
-          monthly[ym][:total_loss] += l
-          monthly[ym][:total_steps] += s
-          if hr && hr > 0
-            monthly[ym][:total_hr] += hr
-            monthly[ym][:hr_count] += 1
-          end
-          cad = r[:average_cadence]
-          pow = r[:average_power]
-          if cad && cad > 0
-            monthly[ym][:total_cadence] += cad
-            monthly[ym][:cadence_count] += 1
-          end
-          if pow && pow > 0
-            monthly[ym][:total_power] += pow
-            monthly[ym][:power_count] += 1
-          end
-          max_pow = r[:max_power]
-          if max_pow && max_pow > 0
-            monthly[ym][:max_power_peak] = max_pow if max_pow > monthly[ym][:max_power_peak]
-            monthly[ym][:total_max_power] += max_pow
-            monthly[ym][:max_power_count] += 1
-          end
-        end
+      def accumulate_monthly_row(monthly, row)
+        return unless row[:start_date_local] || row[:start_date]
+
+        ym = (row[:start_date_local] || row[:start_date])[0..6]
+        acc = monthly[ym]
+        acc[:count] += 1
+        acc[:distance_km] += (row[:distance] || 0) / 1000.0
+        acc[:moving_time_h] += (row[:moving_time] || 0) / 3600.0
+        acc[:total_elev] += row[:elevation_gain] || 0
+        acc[:total_loss] += row[:elevation_loss] || 0
+        acc[:total_steps] += row[:steps] || 0
+        add_if_positive(acc, :total_hr, :hr_count, row[:average_heartrate])
+        add_if_positive(acc, :total_cadence, :cadence_count, row[:average_cadence])
+        add_if_positive(acc, :total_power, :power_count, row[:average_power])
+        max_pow = row[:max_power]
+        return unless max_pow && max_pow > 0
+        acc[:max_power_peak] = max_pow if max_pow > acc[:max_power_peak]
+        acc[:total_max_power] += max_pow
+        acc[:max_power_count] += 1
+      end
+
+      def add_if_positive(acc, sum_key, count_key, value)
+        return unless value && value > 0
+
+        acc[sum_key] += value
+        acc[count_key] += 1
+      end
 
-        monthly.sort.map do |ym, v|
+      def format_monthly(sorted)
+        sorted.map do |ym, v|
           pace = if v[:moving_time_h] > 0 && v[:distance_km] > 0
                    format_pace(v[:moving_time_h] * 3600 / v[:distance_km])
                  end

data/lib/git_fit/source/keep.rb

@@ -39,6 +39,15 @@ module GitFit
         nil
       end
 
+      def decode_step_data(step_data)
+        return nil unless step_data
+        raw = Base64.decode64(step_data)
+        decompressed = zlib_inflate(raw)
+        JSON.parse(decompressed)
+      rescue StandardError
+        nil
+      end
+
       def aes_decrypt(data)
         cipher = OpenSSL::Cipher.new('AES-128-CBC')
         cipher.decrypt

data/lib/git_fit/sync/keep.rb

@@ -14,6 +14,8 @@ module GitFit
       KEEP_TYPES = %w[running hiking cycling].freeze
       KEEP_RAW_EXT = 'json'
 
+      STEP_ENCODED_FIELDS = %w[stepPoints stepFrequencies fullStepPoints].freeze
+
       TYPE_MAP = {
         'outdoorWalking' => 'walk',
         'outdoorRunning' => 'run',
@@ -208,9 +210,16 @@ module GitFit
         raw = run_data.dup
         if raw['heartRate'].is_a?(Hash)
           raw['heartRate'] = raw['heartRate'].dup
-          raw['heartRate'].delete('heartRates')
+          raw['heartRate']['heartRates'] = nil if raw['heartRate'].key?('heartRates')
+        end
+        raw['geoPoints'] = nil if raw.key?('geoPoints')
+
+        decoded_steps = {}
+        STEP_ENCODED_FIELDS.each do |field|
+          next unless raw.key?(field)
+          decoded_steps[field] = Source::Keep.decode_step_data(raw[field])
+          raw[field] = nil
         end
-        raw.delete('geoPoints')
 
         write_source_archive({
           archiveVersion: 0,
@@ -219,7 +228,7 @@ module GitFit
           raw: raw,
           geoPoints: payload[:geo_points],
           heartRates: payload[:hr_data],
-        }, keep_id)
+        }.merge(decoded_steps), keep_id)
 
         wgs_points = Source::Keep.compute_wgs_points(payload, run_data)
         write_standardized_json(wgs_points, payload, run_data, keep_id)

data/lib/git_fit/sync/xoss.rb

@@ -73,7 +73,9 @@ module GitFit
             next if skip_type?(type)
             seen[act_id] = seen.fetch(act_id, 0) + 1
             if seen[act_id] > 3
-              raise SyncError, "XOSS: activity list returned #{seen[act_id]} duplicate records for id #{act_id} — server-side degradation.  Run: git fit sync --source xoss"
+              raise SyncError,
+                    "XOSS: activity list returned #{seen[act_id]} duplicate records for id #{act_id} " \
+                    '— server-side degradation.  Run: git fit sync --source xoss'
             end
             next if seen[act_id] > 1
             ids << { id: act_id, type: type, summary: act }

data/lib/git_fit/version.rb

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

metadata

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