postrunner 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 800922f3ea3d5ff42ba5e706be3e2bff5dbed0ad
-  data.tar.gz: 20e85ae14a306f2c662defabaa3c18b19d6bcec6
+  metadata.gz: d8de6ac38768c84e90eb47ddb49429d7a74160b1
+  data.tar.gz: 7816eba71ed5b6f90eef7d7ae15080c19d548624
 SHA512:
-  metadata.gz: 3e4983e623b4c575937d1b9d419b7f874532affe4ebd8e1e849f58027fa59459365b38804396c794f88649949cc78ed43fa0019ef164c4f8a0f8ef6c3409e19d
-  data.tar.gz: 3b35e7874e9418bc1d3cd39b1d8574ad169f69ca17b5375dee6423287697b475955126d29503e72242e0a04cfc893daf2195f45649e6c82594acf40548b06551
+  metadata.gz: 3302269a229d363cfc75bbea304879f06c37e8c2e6c1706ebece3ce6b662b02a026315df59e7494de230c5c3cab3fb81b925bd0ef89f4b81b1280805b422b138
+  data.tar.gz: e8179a0afb54a171ba200480cf498523688acffa9f3568b8a2ae1e272a5bdc4c863449c6c43b201dafe6223afeb64f64ca3520799e93317f4aec8114cdcb64f2

data/lib/postrunner/Activity.rb

@@ -95,6 +95,7 @@ module PostRunner
       'challenge' => 'Challenge',
       'indoor_skiing' => 'Indoor Skiing',
       'cardio_training' => 'Cardio Training',
+      'virtual_activity' => 'Virtual Activity',
       'all' => 'All'
     }
 
@@ -379,7 +380,7 @@ module PostRunner
     end
 
     def activity_sub_type
-      ActivitySubTypes[@sub_sport] || 'Undefined'
+      ActivitySubTypes[@sub_sport] || 'Undefined "#{@sub_sport}"'
     end
 
     def distance(timestamp, unit_system)

data/lib/postrunner/ActivitySummary.rb

@@ -87,6 +87,7 @@ module PostRunner
                             { :metric => 'km', :statute => 'mi'}) ])
       end
       t.row([ 'Time:', secsToHMS(session.total_timer_time) ])
+      t.row([ 'Elapsed Time:', secsToHMS(session.total_elapsed_time) ])
       t.row([ 'Avg. Speed:',
               local_value(session, 'avg_speed', '%.1f %s',
                           { :metric => 'km/h', :statute => 'mph' }) ])
@@ -145,6 +146,14 @@ module PostRunner
         t.row([ 'Aerobic Training Effect:', session.total_training_effect ])
       end
 
+      if (p_epoc = peak_epoc) > 0.0
+        t.row([ 'Peak EPOC:', "%.0f ml/kg" % p_epoc ])
+      end
+
+      if (trimp = trimp_exp) > 0.0
+        t.row([ 'TRIMP:', trimp.round ])
+      end
+
       rec_info = @fit_activity.recovery_info
       t.row([ 'Ignored Recovery Time:',
               rec_info ? secsToDHMS(rec_info * 60) : '-' ])
@@ -361,6 +370,89 @@ module PostRunner
       end
     end
 
+    def trimp_exp
+      # According to Bannister/Morton
+      # TRIMPexp = sum(D x HRr x 0.64e^y)
+      # Where
+      #
+      # D is the duration in minutes at a particular Heart Rate
+      # HRr is the Heart Rate as a fraction of Heart Rate Reserve
+      # y is the HRr multiplied by 1.92 for men and 1.67 for women.
+      return 0.0 unless (user_data = @fit_activity.user_data.first)
+
+      user_profile = @fit_activity.user_profiles.first
+      hr_zones = @fit_activity.heart_rate_zones.first
+      session = @fit_activity.sessions[0]
+
+      unless (user_profile && (rest_hr = user_profile.resting_heart_rate)) ||
+             (hr_zones && (rest_hr = hr_zones.resting_heart_rate))
+        # We must have a valid resting heart rate to compute TRIMP.
+        return 0.0
+      end
+      unless (user_data && (max_hr = user_data.max_hr)) ||
+             (hr_zones && (max_hr = hr_zones.max_heart_rate))
+        # We must have a valid maximum heart rate to compute TRIMP.
+        return 0.0
+      end
+      unless (session && session.avg_heart_rate &&
+              avg_hr = session.avg_heart_rate)
+        return 0.0
+      end
+
+      sex_factor = user_data.gender == 'male' ? 1.92 : 1.67
+
+      # Instead of using the average heart rate for the whole activity we
+      # apply the equation for each heart rate sample and accumulate them.
+      sum = 0.0
+      prev_timestamp = nil
+      @activity.fit_activity.records.each do |r|
+        # We need a valid timestmap and a valid previous timestamp. If they
+        # are more than 10 seconds appart we discard the values as there was
+        # likely a pause in the activity.
+        if prev_timestamp && r.timestamp && r.heart_rate &&
+           r.timestamp - prev_timestamp <= 10
+          # Compute the heart rate as fraction of the heart rate reserve
+          hr_r = (r.heart_rate - rest_hr).to_f / (max_hr - rest_hr)
+
+          duration_min = (r.timestamp - prev_timestamp) / 60.0
+          #sum += duration_min * hr_r * 0.64 * Math.exp(sex_factor * hr_r)
+          sum += duration_min * hr_r * 0.64 * Math.exp(sex_factor * hr_r)
+        end
+
+        prev_timestamp = r.timestamp
+      end
+
+      sum
+
+      # Alternatively here is an avarage HR based implementation
+      # hr_r = (session.avg_heart_rate - rest_hr).to_f / (max_hr - rest_hr)
+      # duration_min = session.total_elapsed_time / 60.0
+      # duration_min * hr_r * 0.64 * Math.exp(sex_factor * hr_r)
+    end
+
+    def peak_epoc
+      # Peak EPOC value according to figure 2 in the following white paper by
+      # FristBeat:
+      # https://www.firstbeat.com/wp-content/uploads/2015/10/white_paper_training_effect.pdf
+      unless @fit_activity.physiological_metrics &&
+             (pm = @fit_activity.physiological_metrics.last) &&
+             (te = pm.aerobic_training_effect)
+        return 0.0
+      end
+      unless (user_data = @fit_activity.user_data.first) &&
+             (ac = user_data.activity_class)
+        return 0.0
+      end
+
+      # The following formula was taken from
+      # http://www.movescount.com/apps/app10020404-EPOC_from_TE
+      # It apparently approximates the graph in figure 2 in the FirstBeat
+      # paper.
+      epoc = -11.0 + te * (20.0 + te * (-47.0/4.0 + te * (3.0 - te / 4.0)))
+      (-102.0 + te * (759.0 / 4.0 + te * (-2867.0 / 24.0 +
+        te * (139.0 / 4.0 - 73.0 / 24.0 * te))) - epoc) / 10.0 * ac + epoc
+    end
+
   end
 
 end

data/lib/postrunner/ChartView.rb

@@ -290,10 +290,10 @@ EOT
         last_value = nil
         last_timestamp = nil
         @activity.fit_activity.records.each do |r|
-          if last_timestamp && (r.timestamp - last_timestamp) > 5.0
+          if last_timestamp && (r.timestamp - last_timestamp) > 10.0
             # We have a gap in the values that is longer than 5 seconds. We'll
             # finish the line and start a new one later.
-            data_set << [ (r.timestamp - start_time + 1).to_i * 1000, nil ]
+            data_set << [ (last_timestamp - start_time + 1).to_i * 1000, nil ]
           end
           if (value = r.get_as(chart[:id], chart[:unit] || ''))
             if chart[:id] == 'pace'
@@ -310,7 +310,7 @@ EOT
               min_value = value if (min_value.nil? || min_value > value)
             end
           end
-          unless last_value.nil? && value.nil?
+          if value
             data_set << [ (r.timestamp - start_time).to_i * 1000, value ]
           end
           last_value = value
@@ -337,7 +337,7 @@ EOT
                  #{chart[:colors] ? "color: \"#{chart[:colors]}\"," : ''}
                  lines: { show: true#{chart[:id] == 'pace' ? '' :
                                       ', fill: true'} } } ],
-             { xaxis: { mode: "time" },
+             { xaxis: { mode: "time", min: 0.0 },
                grid: { markings: lap_marks, hoverable: true }
 EOT
       if chart[:id] == 'pace'
@@ -417,7 +417,7 @@ EOT
              "            fillColor: \"#{chart[:colors][index][0]}\", " +
              "            fill: true, radius: 2 } }"
            end.join(', ')
-      s << "], { xaxis: { mode: \"time\" }, " +
+      s << "], { xaxis: { mode: \"time\", min: 0.0 }, " +
            (chart[:id] == 'gct_balance' ? gct_balance_yaxis(data_sets) : '') +
            "     grid: { markings: lap_marks, hoverable: true } });\n"
       s << lap_mark_labels(chart_id, start_time)

data/lib/postrunner/DeviceList.rb

@@ -3,7 +3,7 @@
 #
 # = DeviceList.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/postrunner/EPO_Downloader.rb

@@ -12,6 +12,7 @@
 
 require 'uri'
 require 'net/http'
+require 'net/https'
 
 module PostRunner
 
@@ -20,7 +21,7 @@ module PostRunner
   # devices pick up this file under GARMIN/GARMIN/REMOTESW/EPO.BIN.
   class EPO_Downloader
 
-    @@URI = URI('http://omt.garmin.com/Rce/ProtobufApi/EphemerisService/GetEphemerisData')
+    @@URI = URI('https://omt.garmin.com/Rce/ProtobufApi/EphemerisService/GetEphemerisData')
     # This is the payload of the POST request. It was taken from
     # http://www.kluenter.de/garmin-ephemeris-files-and-linux/. It may contain
     # a product ID or serial number.
@@ -33,7 +34,8 @@ module PostRunner
 
     # Create an EPO_Downloader object.
     def initialize
-      @http = Net::HTTP.new(@@URI.host, @@URI.port)
+      @https = Net::HTTP.new(@@URI.host, @@URI.port)
+      @https.use_ssl = true
       @request = Net::HTTP::Post.new(@@URI.path, initheader = @@HEADER)
       @request.body = @@POST_DATA
     end
@@ -57,7 +59,7 @@ module PostRunner
 
     def get_epo_from_server
       begin
-        res = @http.request(@request)
+        res = @https.request(@request)
       rescue => e
         Log.error "Extended Prediction Orbit (EPO) data download error: " +
                   e.message

data/lib/postrunner/FFS_Activity.rb

@@ -93,6 +93,7 @@ module PostRunner
       'challenge' => 'Challenge',
       'indoor_skiing' => 'Indoor Skiing',
       'cardio_training' => 'Cardio Training',
+      'virtual_activity' => 'Virtual Activity',
       'all' => 'All'
     }
 

data/lib/postrunner/FFS_Device.rb

@@ -3,7 +3,7 @@
 #
 # = FFS_Device.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2015, 2016 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2015, 2016, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -23,7 +23,7 @@ module PostRunner
   # dashes. All objects are transparently stored in the PEROBS::Store.
   class FFS_Device < PEROBS::Object
 
-    attr_persist :activities, :monitorings, :short_uid, :long_uid
+    attr_persist :activities, :monitorings, :metrics, :short_uid, :long_uid
 
     # Create a new FFS_Device object.
     # @param p [PEROBS::Handle] p
@@ -41,6 +41,7 @@ module PostRunner
     def restore
       attr_init(:activities) { @store.new(PEROBS::Array) }
       attr_init(:monitorings) { @store.new(PEROBS::Array) }
+      attr_init(:metrics) { @store.new(PEROBS::Array) }
     end
 
     # Add a new FIT file for this device.
@@ -61,6 +62,11 @@ module PostRunner
         entities = @monitorings
         type = 'monitoring'
         new_entity_class = FFS_Monitoring
+      elsif fit_entity.is_a?(Fit4Ruby::Metrics)
+        entity = metrics_by_file_name(File.basename(fit_file_name))
+        entities = @metrics
+        type = 'metrics'
+        new_entity_class = FFS_Metrics
       else
         Log.fatal "Unsupported FIT entity #{fit_entity.class}"
       end
@@ -130,6 +136,13 @@ module PostRunner
       @monitorings.find { |a| a.fit_file_name == file_name }
     end
 
+    # Return the metrics with the given file name.
+    # @param file_name [String] Base name of the fit file.
+    # @return [FFS_Activity] Corresponding FFS_Metrics or nil.
+    def metrics_by_file_name(file_name)
+      @metrics.find { |a| a.fit_file_name == file_name }
+    end
+
     # Return all monitorings that overlap with the time interval given by
     # from_time and to_time.
     # @param from_time [Time] start time of the interval

data/lib/postrunner/FitFileStore.rb

@@ -3,7 +3,7 @@
 #
 # = FitFileStore.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015, 2016 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -80,20 +80,15 @@ module PostRunner
     # @return [FFS_Activity or FFS_Monitoring] Corresponding entry in the
     #         FitFileStore or nil if file could not be added.
     def add_fit_file(fit_file_name, fit_entity = nil, overwrite = false)
-      md5sum = FitFileStore.calc_md5_sum(fit_file_name)
-      if @store['fit_file_md5sums'].include?(md5sum)
-        # The FIT file is already stored in the DB.
-        return nil unless overwrite
-      end
-
-      # If we the file hasn't been read yet, read it in as a
+      # If the file hasn't been read yet, read it in as a
       # Fit4Ruby::Activity or Fit4Ruby::Monitoring entity.
       unless fit_entity
         return nil unless (fit_entity = read_fit_file(fit_file_name))
       end
 
       unless [ Fit4Ruby::Activity,
-               Fit4Ruby::Monitoring_B ].include?(fit_entity.class)
+               Fit4Ruby::Monitoring_B,
+               Fit4Ruby::Metrics ].include?(fit_entity.class)
         Log.fatal "Unsupported FIT file type #{fit_entity.class}"
       end
 
@@ -451,7 +446,8 @@ module PostRunner
 
     def extract_fit_file_id(fit_entity)
       unless (fid = fit_entity.file_id)
-        Log.fatal 'FIT file has no file_id section'
+        Log.error 'FIT file has no file_id section'
+        return nil
       end
 
       if fid.manufacturer == 'garmin' &&
@@ -470,10 +466,20 @@ module PostRunner
             }
           end
         end
-        Log.fatal "Fit entity has no device info for 0"
+        Log.error "Fit entity has no device info for 0"
+        return nil
       else
         # And for all properly developed devices we can just look at the
         # file_id section.
+        if fid.manufacturer.nil? ||
+           fid.manufacturer[0..'Undocumented value'.length - 1] ==
+           'Undocumented value'
+          Log.error "Cannot store FIT files for unknown manufacturer " +
+            fid.manufacturer
+          return nil
+        end
+        fid.serial_number ||= 0
+
         return {
           :manufacturer => fid.manufacturer,
           :product => fid.garmin_product || fid.product,

data/lib/postrunner/Main.rb

@@ -57,7 +57,9 @@ module PostRunner
         create_directory(@db_dir, 'PostRunner data')
         ensure_flat_file_db
         @db = PEROBS::Store.new(File.join(@db_dir, 'database'),
-                                { :engine => PEROBS::FlatFileDB })
+                                { :engine => PEROBS::FlatFileDB,
+                                  :progressmeter =>
+                                  PEROBS::ConsoleProgressMeter.new })
         # Create a hash to store configuration data in the store unless it
         # exists already.
         cfg = (@db['config'] ||= @db.new(PEROBS::Hash))
@@ -252,7 +254,7 @@ weekly [ <YYYY-MM-DD> ]
            week. If no date is given, yesterday's week will be used.
 
 
-<fit file> An absolute or relative name of a .FIT file.
+<fit file> An absolute or relative name of a .FIT or .fit file.
 
 <ref>      The index or a range of indexes to activities in the database.
            :1 is the newest imported activity
@@ -437,12 +439,12 @@ EOT
 
     def process_files(files_or_dirs, command)
       if files_or_dirs.empty?
-        Log.abort("You must provide at least one .FIT file name.")
+        Log.abort("You must provide at least one .FIT or .fit file name.")
       end
 
       files_or_dirs.each do |fod|
         if File.directory?(fod)
-          Dir.glob(File.join(fod, '*.FIT')).each do |file|
+          Dir.glob(File.join(fod, '*.FIT'), File::FNM_CASEFOLD).each do |file|
             process_file(file, command)
           end
         else
@@ -472,6 +474,12 @@ EOT
     # @return [TrueClass, FalseClass] true if file was successfully imported,
     #         false otherwise
     def import_fit_file(fit_file_name)
+      md5sum = FitFileStore.calc_md5_sum(fit_file_name)
+      if @ffs.store['fit_file_md5sums'].include?(md5sum)
+        # The FIT file is already stored in the DB.
+        return nil unless @force
+      end
+
       begin
         fit_entity = Fit4Ruby.read(fit_file_name)
       rescue Fit4Ruby::Error

data/lib/postrunner/UserProfileView.rb

@@ -24,14 +24,14 @@ module PostRunner
     end
 
     def to_html(doc)
-      return nil if @fit_activity.user_profiles.empty?
+      return nil if @fit_activity.user_data.empty?
 
       ViewFrame.new('user_profile', 'User Profile', 600, profile,
                     true).to_html(doc)
     end
 
     def to_s
-      return '' if @fit_activity.user_profiles.empty?
+      return '' if @fit_activity.user_data.empty?
       profile.to_s
     end
 
@@ -39,31 +39,44 @@ module PostRunner
 
     def profile
       t = FlexiTable.new
-      profile = @fit_activity.user_profiles.first
-      if profile.height
+
+      user_data = @fit_activity.user_data.first
+      user_profile = @fit_activity.user_profiles.first
+      hr_zones = @fit_activity.heart_rate_zones.first
+
+      if user_data.height
         unit = { :metric => 'm', :statute => 'ft' }[@unit_system]
-        height = profile.get_as('height', unit)
+        height = user_data.get_as('height', unit)
         t.cell('Height:', { :width => '40%' })
         t.cell("#{'%.2f' % height} #{unit}", { :width => '60%' })
         t.new_row
       end
-      if profile.weight
+      if user_data.weight
         unit = { :metric => 'kg', :statute => 'lbs' }[@unit_system]
-        weight = profile.get_as('weight', unit)
+        weight = user_data.get_as('weight', unit)
         t.row([ 'Weight:', "#{'%.1f' % weight} #{unit}" ])
       end
-      t.row([ 'Gender:', profile.gender ]) if profile.gender
-      t.row([ 'Age:', "#{profile.age} years" ]) if profile.age
-      t.row([ 'Max. Heart Rate:', "#{profile.max_hr} bpm" ]) if profile.max_hr
-      if (lthr = profile.running_lactate_threshold_heart_rate)
+      t.row([ 'Gender:', user_data.gender ]) if user_data.gender
+      t.row([ 'Age:', "#{user_data.age} years" ]) if user_data.age
+      if (user_profile && (rest_hr = user_profile.resting_heart_rate)) ||
+         (hr_zones && (rest_hr = hr_zones.resting_heart_rate))
+        t.row([ 'Resting Heart Rate:', "#{rest_hr} bpm" ])
+      end
+      if (max_hr = user_data.max_hr) ||
+         (max_hr = hr_zones.max_heart_rate)
+        t.row([ 'Max. Heart Rate:', "#{max_hr} bpm" ])
+      end
+      if (lthr = user_data.running_lactate_threshold_heart_rate)
         t.row([ 'Running LTHR:', "#{lthr} bpm" ])
       end
-      if profile.activity_class
-        t.row([ 'Activity Class:', profile.activity_class ])
+      if (activity_class = user_data.activity_class)
+        t.row([ 'Activity Class:', activity_class ])
+      end
+      if (metmax = user_data.metmax)
+        t.row([ 'METmax:', "#{metmax} MET" ])
       end
-      if profile.metmax
-        t.row([ 'METmax:', "#{profile.metmax} MET" ])
-        t.row([ 'VO2max:', "#{'%.1f' % (profile.metmax * 3.5)} ml/kg/min" ])
+      if (vo2max = @fit_activity.vo2max)
+        t.row([ 'VO2max:', "#{'%.1f' % vo2max} ml/kg/min" ])
       end
       t
     end

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 end

data/postrunner.gemspec

@@ -28,8 +28,8 @@ operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.0'
 
-  spec.add_dependency 'fit4ruby', '~> 2.0.0'
-  spec.add_dependency 'perobs', '~> 4.0.0'
+  spec.add_dependency 'fit4ruby', '~> 3.2.0'
+  spec.add_dependency 'perobs', '~> 4.1.0'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement