git-fit 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f07075fbc309422c6d22333b450da57b2027720bc5600ac4fe8f186bd0a02e
-  data.tar.gz: d4402443354e15c63139a209f8ab8dac1b8a14b4b06de2bcf591c305d077d946
+  metadata.gz: fb01a16a1c3ffd8bc69b1c7941dcbd5d08e472d4e726ffac27f4147ed268a5de
+  data.tar.gz: e32f30371d9e2c9e9879e78e749fb649372c8a0cd644dbdb70042139e60dabd6
 SHA512:
-  metadata.gz: 3bed1beb9ac7ac48482acda16ebf7cc24aa79a75d4b66a94b291ae9ec30434de2a2f5d8aa535cb4cfc4f0685fe10f27be8c753e9f71c8159d18376efa612858a
-  data.tar.gz: 29503c3c03b0373dea84e6335a8abb8be0be846e46e6a77453132b692dfe85b70dd6ff8d12c69319caa4421ab7e9b55029fe89bad444a7788530da071ce24303
+  metadata.gz: 854594f865e691b539e5d487278afab1bd0e26d8b25462b19c458950e59acdae38b8bd9b4d27f48dcb2ac666e55e7666e8b22ee3ad4a6d97f3f19caee72d0387
+  data.tar.gz: 0af21c0ba3536d6f48bd7b35099aaff5599afc1a692245b2587ef74e03b2380b082bf177b9efecaaa6ba23492a695a8332abb7377825fda812953be1f47fb697

data/lib/git-fit.rb

@@ -87,6 +87,7 @@ require_relative 'git_fit/export'
 require_relative 'git_fit/db/cli'
 require_relative 'git_fit/install/actions'
 require_relative 'git_fit/cli/install_cli'
+require_relative 'git_fit/cli/purge_cli'
 require_relative 'git_fit/cli/gh_cli'
 require_relative 'git_fit/cli/export'
 require_relative 'git_fit/cli/import_cli'

data/lib/git_fit/cli/purge_cli.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module GitFit
+  class PurgeCLI < Thor
+    include Cli::Checkpointable
+
+    class RecordNotFound < StandardError; end
+    class PurgeFailed < StandardError; end
+
+    def self.exit_on_failure?
+      false
+    end
+
+    no_commands do
+      def git_fit_config
+        @git_fit_config ||= GitFit::Config.new(options[:config])
+      end
+    end
+
+    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'
+
+    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
+
+      if options[:dry_run]
+        say_status :dry_run, "Would delete activity:", :yellow
+        say "  run_id:          #{record[:run_id]}"
+        say "  name:            #{record[:name]}"
+        say "  source:          #{record[:source]}"
+        say "  sport_category:  #{record[:sport_category]}"
+        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]
+        return
+      end
+
+      db[:dedup_group_members].where(run_id: run_id).delete
+      deleted = db[:activities].where(run_id: run_id).delete
+
+      say_status :deleted, "Removed #{deleted} activity: #{run_id}", :green
+
+      checkpoint_db(db) if options[:checkpoint]
+    rescue RecordNotFound
+      raise
+    rescue StandardError => e
+      raise PurgeFailed, "Purge failed: #{e.message}"
+    end
+
+    private
+
+    def connect_db
+      conn = GitFit::DB::Connection.new(git_fit_config.db_path)
+      conn.migrate!
+      conn.db
+    end
+  end
+end

data/lib/git_fit/cli.rb

@@ -120,6 +120,9 @@ module GitFit
     desc 'strava SUBCOMMAND', 'Strava web operations'
     subcommand 'strava', StravaCLI
 
+    desc 'purge SUBCOMMAND', 'Purge activities from database'
+    subcommand 'purge', PurgeCLI
+
     desc 'install SUBCOMMAND', 'Install project assets (actions)'
     subcommand 'install', InstallCLI
 

data/lib/git_fit/parser/tbulu.rb

@@ -69,12 +69,13 @@ module GitFit
         return [[], points] if times.empty?
 
         sport = classify_sport(ti['tracktype'], header)
+        distance = ti['totaldistance'].to_f
         attrs = build_activity_attrs({
           run_id: build_run_id('2bulu', SecureRandom.hex(8)),
           name: ti['title'],
-          distance: total_distance(points),
-          moving_time: moving_time_from_points(points),
-          elapsed_time: elapsed_time_from_points(points),
+          distance: distance.positive? ? distance : total_distance(points),
+          moving_time: header_moving_time(ti) || moving_time_from_points(points),
+          elapsed_time: header_elapsed_time(ti) || elapsed_time_from_points(points),
           sport_category: sport,
           sport_type: ti['tracktype'],
           start_date: times.min,
@@ -104,6 +105,18 @@ module GitFit
         attrs[:total_down] = track_info['totaldown']
       end
 
+      def header_elapsed_time(track_info)
+        return nil unless track_info['starttime'] && track_info['endtime']
+        v = (track_info['endtime'] - track_info['starttime']) / 1000.0
+        v.positive? ? v.round : nil
+      end
+
+      def header_moving_time(track_info)
+        return nil unless track_info['totaltime'] && track_info['pausetime']
+        v = (track_info['totaltime'] - track_info['pausetime']) / 1000.0
+        v.positive? ? v.round : nil
+      end
+
       def extract_2tk_header(content)
         pos = content.index('{')
         return {} unless pos

data/lib/git_fit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Lax
@@ -262,6 +262,7 @@ files:
 - lib/git_fit/cli/gh_cli.rb
 - lib/git_fit/cli/import_cli.rb
 - lib/git_fit/cli/install_cli.rb
+- lib/git_fit/cli/purge_cli.rb
 - lib/git_fit/cli/strava.rb
 - lib/git_fit/cli/sync.rb
 - lib/git_fit/config.rb