postrunner 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30fc3ab83ce783076286638ede5faf67d2b5adbf
-  data.tar.gz: 465e09b0a7dac4cfdbcb129886f50afae1802680
+SHA256:
+  metadata.gz: bb8a80028ee50a8f543d589b44fd41523208483a1743d29ec86e37525ff84a13
+  data.tar.gz: 9834c6dc556e9e118fca144a8edd33e9cecc51eb9bc4487d43218973f5dae719
 SHA512:
-  metadata.gz: aa31ebe5811736bbcba8324d54a0dbb0bd4b19435544471236aac7563ad623002e5c4c2f7cec6e0095da7dfabbb6bdd25f10637cf88905a30d7dc35be6a2f459
-  data.tar.gz: 801afc538448f0615c3d2095559f6fb945dd14cabeb3d55d3c1faa8c323d49e38522edca58ca6b44572cb79c332ae78bb8c4dbf1c22e224e4d3bf32996e8079e
+  metadata.gz: 8544b0aca1e86a9ca4e90aa437684a9fc56ac925cefe115ac9453816d1373242fcf6aa94d86ea779ea947ebb982b318141c45df43197d77a78b2375aeb5f6724
+  data.tar.gz: d5354f1f321685cb7181c75cee537d36695bddb0cecea175cd703de678af9055db10e089740f6719f1c6097e3fc2a2713951ae396b558b3ffc39a5bbfbe9f722

data/README.md

@@ -1,15 +1,15 @@
 # PostRunner
 
 PostRunner is an application to manage FIT files such as those
-produced by Garmin products like the Forerunner 620 (FR620) and Fenix
-3 or Fenix 3HR. It allows you to import the files from the device and
-analyze the data. In addition to the common features like plotting pace,
-heart rates, elevation and other captured values it also provides a
-heart rate variability (HRV) analysis. It can also update satellite
-orbit prediction (EPO) data on the device to speed-up GPS fix times.
-It is an offline alternative to Garmin Connect. The software has been
-developed and tested on Linux but should work on other operating
-systems as well.
+produced by Garmin products like the Forerunner 620 (FR620), 
+Forerunner 25 (FR25), Fenix 3, Fenix 3HR and Fenix 5. It allows you to
+import the files from the device and analyze the data. In addition to
+the common features like plotting pace, heart rates, elevation and
+other captured values it also provides a heart rate variability (HRV)
+analysis. It can also update satellite orbit prediction (EPO) data on
+the device to speed-up GPS fix times.  It is an offline alternative to
+Garmin Connect. The software has been developed and tested on Linux
+but should work on other operating systems as well.
 
 ## Installation
 
@@ -99,7 +99,7 @@ command while you have your device mounted via USB.
 $ postrunner update-gps
 ```
 
-This was tested on the FR620 and will probably also work on the FR220.
+This was tested on the FR620 and FR25 and will probably also work on the FR220.
 Other devices may work, but you use this at your own risk. This
 feature will download a file called EPO.BIN and copy it to
 GARMIN/REMOTESW/EPO.BIN.

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/ActivityListView.rb

@@ -26,7 +26,7 @@ module PostRunner
 
     def initialize(ffs)
       @ffs = ffs
-      @unit_system = @ffs.store['config']['unit_system']
+      @unit_system = @ffs.store['config']['unit_system'].to_sym
       @page_size = 20
       @page_no = -1
       @last_page = (@ffs.activities.length - 1) / @page_size

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' }) ])
@@ -115,15 +116,15 @@ module PostRunner
                 local_value(session, 'avg_vertical_oscillation', '%.1f %s',
                             { :metric => 'cm', :statute => 'in' }) ])
         t.row([ 'Vertical Ratio:',
-                session.vertical_ratio ?
-                "#{session.vertical_ratio}%" : '-' ])
+                session.avg_vertical_ratio ?
+                "#{session.avg_vertical_ratio}%" : '-' ])
         t.row([ 'Avg. Ground Contact Time:',
                 session.avg_stance_time ?
                 "#{session.avg_stance_time.round} ms" : '-' ])
-        t.row([ 'Avg. Ground Contact Time Balance:',
-                session.avg_gct_balance ?
-                "#{session.avg_gct_balance}% L / " +
-                "#{100.0 - session.avg_gct_balance}% R" : ';' ])
+        t.row([ 'Avg. Stance Time Balance:',
+                session.avg_stance_time_balance ?
+                "#{session.avg_stance_time_balance}% L / " +
+                "#{100.0 - session.avg_stance_time_balance}% R" : ';' ])
       end
       if @activity.sport == 'cycling'
         t.row([ 'Avg. Cadence:',
@@ -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) : '-' ])
@@ -307,7 +316,7 @@ module PostRunner
           if zone.type == 18
             total_time = 0.0
             if zone.time_in_hr_zone
-              zone.time_in_hr_zone.each { |tiz| total_time += tiz }
+              zone.time_in_hr_zone.each { |tiz| total_time += tiz if tiz }
             end
             break if total_time <= 0.0
             if zone.heart_rate_zones
@@ -345,12 +354,22 @@ module PostRunner
     def local_value(fdr, field, format, units)
       unit = units[@unit_system]
       value = fdr.get_as(field, unit)
+      if value.nil? && field == 'avg_speed'
+        # New fit files used 'enhanced_avg_speed' instead of the older
+        # 'avg_speed'.
+        value = fdr.get_as('enhanced_avg_speed', unit)
+      end
       return '-' unless value
       "#{format % [value, unit]}"
     end
 
     def pace(fdr, field, show_unit = true)
       speed = fdr.get(field)
+      if speed.nil? && field == 'avg_speed'
+        # New fit files used 'enhanced_avg_speed' instead of the older
+        # 'avg_speed'.
+        speed = fdr.get('enhanced_avg_speed')
+      end
       case @unit_system
       when :metric
         "#{speedToPace(speed)}#{show_unit ? ' min/km' : ''}"
@@ -361,6 +380,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

@@ -73,6 +73,14 @@ module PostRunner
           :colors => '#900000',
           :show => false
         },
+        {
+          :id => 'respiration_rate',
+          :label => 'Respiration Rate',
+          :unit => 'brpm',
+          :graph => :line_graph,
+          :colors => '#9cd6ef',
+          :show => true
+        },
         {
           :id => 'performance_condition',
           :label => 'Performance Condition',
@@ -290,12 +298,23 @@ 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
+          value = r.get_as(chart[:id], chart[:unit] || '')
+          if value.nil? && chart[:id] == 'speed'
+            # If speed field doesn't exist the value might be in the
+            # enhanced_speed field.
+            value = r.get_as('enhanced_speed', chart[:unit] || '')
+          end
+          if value.nil? && chart[:id] == 'altitude'
+            # If altitude field doesn't exist the value might be in the
+            # enhanced_elevation field.
+            value = r.get_as('enhanced_elevation', chart[:unit] || '')
           end
-          if (value = r.get_as(chart[:id], chart[:unit] || ''))
+          if value
             if chart[:id] == 'pace'
               # Slow speeds lead to very large pace values that make the graph
               # hard to read. We cap the pace at 20.0 min/km to keep it
@@ -310,7 +329,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 +356,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 +436,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'
     }
 
@@ -177,7 +178,7 @@ module PostRunner
 
     def events
       load_fit_file
-      puts EventList.new(self, @store['config']['unit_system']).to_s
+      puts EventList.new(self, @store['config']['unit_system'].to_sym).to_s
     end
 
     def show
@@ -190,12 +191,12 @@ module PostRunner
 
     def sources
       load_fit_file
-      puts DataSources.new(self, @store['config']['unit_system']).to_s
+      puts DataSources.new(self, @store['config']['unit_system'].to_sym).to_s
     end
 
     def summary
       load_fit_file
-      puts ActivitySummary.new(self, @store['config']['unit_system'],
+      puts ActivitySummary.new(self, @store['config']['unit_system'].to_sym,
                                { :name => @name,
                                  :type => activity_type,
                                  :sub_type => activity_sub_type }).to_s
@@ -244,7 +245,7 @@ module PostRunner
 
     def generate_html_report
       load_fit_file
-      ActivityView.new(self, @store['config']['unit_system'])
+      ActivityView.new(self, @store['config']['unit_system'].to_sym)
     end
 
     def activity_type
@@ -252,7 +253,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/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, 2020 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
@@ -77,7 +83,8 @@ module PostRunner
           return nil
         end
       else
-        # Don't add the entity if has deleted before and overwrite isn't true.
+        # Don't add the entity if it has deleted before and overwrite isn't
+        # true.
         path = @store['file_store'].fit_file_dir(File.basename(fit_file_name),
                                                  long_uid, type)
         fq_fit_file_name = File.join(path, File.basename(fit_file_name))
@@ -130,6 +137,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
@@ -44,7 +44,7 @@ module PostRunner
     # Setup non-persistent variables.
     def restore
       @data_dir = @store['config']['data_dir']
-      # Ensure that we have an Array in the store to hold all known devices.
+      # Ensure that we have a Hash in the store to hold all known devices.
       @store['devices'] = @store.new(PEROBS::Hash) unless @store['devices']
 
       @devices_dir = File.join(@data_dir, 'devices')
@@ -69,8 +69,58 @@ module PostRunner
     end
 
     # Version upgrade logic.
-    def handle_version_update
-      # Nothing here so far.
+    def handle_version_update(from_version, to_version)
+      if from_version <= Gem::Version.new('0.12.0')
+        # PostRunner up until version 0.12.0 was using a long_uid with
+        # manufacturer name and product name. This was a bad idea since unknown
+        # devices were resolved to their numerical ID. In case the unknown ID
+        # was later added to the dictionary in fit4ruby version update, it
+        # resolved to its name and the device was recognized as a new device.
+        # Versions after 0.12.0 only use the numerical versions for the device
+        # long_uid and directory names.
+        uid_remap = {}
+        @store['devices'].each do |uid, device|
+          old_uid = uid
+
+          if (first_activity = device.activities.first)
+            first_activity.load_fit_file
+            if  (fit_activity = first_activity.fit_activity)
+              if (device_info = fit_activity.device_infos.first)
+                new_uid = "#{device_info.numeric_manufacturer}-" +
+                  "#{device_info.numeric_product}-#{device_info.serial_number}"
+
+                uid_remap[old_uid] = new_uid
+                puts first_activity.fit_file_name
+              end
+            end
+          end
+        end
+
+        @store.transaction do
+          pwd = Dir.pwd
+          base_dir_name = @store['config']['devices_dir']
+          Dir.chdir(base_dir_name)
+
+          uid_remap.each do |old_uid, new_uid|
+            if Dir.exist?(old_uid) && !Dir.exist?(new_uid) &&
+                !File.symlink?(old_uid)
+              # Rename the directory from the old (string) scheme to the
+              # new numeric scheme.
+              FileUtils.mv(old_uid, new_uid)
+              # Create a symbolic link with that points the old name to
+              # the new name.
+              File.symlink(new_uid, old_uid)
+            end
+
+            # Now update the long_uid in the FFS_Device object
+            @store['devices'][new_uid] = device = @store['devices'][old_uid]
+            device.long_uid = new_uid
+            @store['devices'].delete(old_uid)
+          end
+
+          Dir.chdir(pwd)
+        end
+      end
     end
 
     # Add a file to the store.
@@ -80,27 +130,23 @@ 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
 
       # Generate a String that uniquely identifies the device that generated
       # the FIT file.
       id = extract_fit_file_id(fit_entity)
-      long_uid = "#{id[:manufacturer]}-#{id[:product]}-#{id[:serial_number]}"
+      long_uid = "#{id[:numeric_manufacturer]}-" +
+        "#{id[:numeric_product]}-#{id[:serial_number]}"
 
       # Make sure the device that created the FIT file is properly registered.
       device = register_device(long_uid)
@@ -192,6 +238,7 @@ module PostRunner
       @store['records'].generate_html_reports
       generate_html_index_pages
     end
+
     # Determine the right directory for the given FIT file. The resulting path
     # looks something like /home/user/.postrunner/devices/garmin-fenix3-1234/
     # activity/5A.
@@ -451,7 +498,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' &&
@@ -466,17 +514,31 @@ module PostRunner
             return {
               :manufacturer => di.manufacturer,
               :product => di.garmin_product || di.product,
+              :numeric_manufacturer => di.numeric_manufacturer,
+              :numeric_product => di.numeric_product,
               :serial_number => di.serial_number
             }
           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,
+          :numeric_manufacturer => di.numeric_manufacturer,
+          :numeric_product => di.numeric_product,
           :serial_number => fid.serial_number
         }
       end
@@ -496,7 +558,8 @@ module PostRunner
           @store.new(FFS_Device, short_uid, long_uid)
 
         # Create the directory to store the FIT files of this device.
-        create_directory(File.join(@devices_dir, long_uid), long_uid)
+        create_directory(File.join(@devices_dir, long_uid),
+                         long_uid)
       end
 
       @store['devices'][long_uid]

data/lib/postrunner/Main.rb

@@ -57,11 +57,13 @@ 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))
-        cfg['unit_system'] ||= :metric
+        cfg['unit_system'] ||= 'metric'
         cfg['version'] ||= VERSION
         # First day of the week. 0 means Sunday, 1 Monday and so on.
         cfg['week_start_day'] ||= 1
@@ -105,7 +107,7 @@ module PostRunner
 
         opts.separator <<"EOT"
 
-Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger
+Copyright (c) 2014, 2015, 2016, 2017, 2018, 2019, 2020 by Chris Schlaeger
 
 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 published by the
@@ -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
@@ -528,8 +536,8 @@ EOT
         Log.error("You must specify 'metric' or 'statute' as unit system.")
       end
 
-      if @db['config']['unit_system'].to_s != args[0]
-        @db['config']['unit_system'] = args[0].to_sym
+      if @db['config']['unit_system'] != args[0]
+        @db['config']['unit_system'] = args[0]
         @ffs.change_unit_system
       end
     end
@@ -589,10 +597,17 @@ EOT
 
     def handle_version_update
       if @db['config']['version'] != VERSION
-        Log.warn "PostRunner version upgrade detected."
-        @ffs.handle_version_update
+        puts "Work needed"
+        from_version = Gem::Version.new(@db['config']['version'])
+        to_version = Gem::Version.new(VERSION)
+
+        Log.warn "PostRunner version upgrade from #{from_version} to " +
+          "#{to_version} started."
+        @ffs.handle_version_update(from_version, to_version)
+
         @db['config']['version'] = VERSION
-        Log.info "Version upgrade completed."
+        Log.warn "PostRunner version upgrade from #{from_version} to " +
+          "#{to_version} completed."
       end
     end
 

data/lib/postrunner/RecordListPageView.rb

@@ -33,7 +33,7 @@ module PostRunner
     # @param page_count [Fixnum] Number of total pages
     # @param page_index [Fixnum] Index of the page
     def initialize(ffs, records, page_count, page_index)
-      #@unit_system = ffs.store['config']['unit_system']
+      #@unit_system = ffs.store['config']['unit_system'].to_sym
       @records = records
 
       views = ffs.views

data/lib/postrunner/UserProfileView.rb

@@ -18,20 +18,22 @@ module PostRunner
 
   class UserProfileView
 
+    include Fit4Ruby::Converters
+
     def initialize(fit_activity, unit_system)
       @fit_activity = fit_activity
       @unit_system = unit_system
     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 +41,54 @@ 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 && 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 && user_data.weight) ||
+          (user_profile && user_profile.weight)
         unit = { :metric => 'kg', :statute => 'lbs' }[@unit_system]
-        weight = profile.get_as('weight', unit)
+        weight = (user_profile && user_profile.get_as('weight', unit)) ||
+                 (user_data && 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([ 'Running LTHR:', "#{lthr} bpm" ])
+      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 user_profile && (date = user_profile.time_last_lthr_update)
+        t.row([ 'Last Lactate Threshold Update:', date ])
+      end
+      if user_data && (lthr = user_data.running_lactate_threshold_heart_rate)
+        t.row([ 'Running LT Heart Rate:', "#{lthr} bpm" ])
+      end
+      if user_profile && (speed = user_profile.functional_threshold_speed)
+        unit = { :metric => 'min/km', :statute => 'min/mile' }[@unit_system]
+        t.row([ 'Running LT Pace:', "#{speedToPace(speed)} #{unit}" ])
       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 profile.metmax
-        t.row([ 'METmax:', "#{profile.metmax} MET" ])
-        t.row([ 'VO2max:', "#{'%.1f' % (profile.metmax * 3.5)} ml/kg/min" ])
+      # It's unlikely that anybody ever cares about the METmax value.
+      #if (metmax = user_data.metmax)
+      #  t.row([ 'METmax:', "#{metmax} MET" ])
+      #end
+      if (vo2max = @fit_activity.vo2max)
+        t.row([ 'VO2max:', "#{'%.1f' % vo2max} ml/kg/min" ])
       end
       t
     end

data/lib/postrunner/version.rb

@@ -3,7 +3,7 @@
 #
 # = version.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014, 2015, 2016, 2017 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2017, 2020 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
@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/postrunner.gemspec

@@ -11,14 +11,14 @@ GEM_SPEC = Gem::Specification.new do |spec|
   spec.summary       = %q{Application to manage and analyze Garmin FIT files.}
   spec.description   = %q{PostRunner is an application to manage FIT files
 such as those produced by Garmin products like the Forerunner 620 (FR620),
-Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to import the files from
-the device and analyze the data. In addition to the common features like
-plotting pace, heart rates, elevation and other captured values it also
-provides a heart rate variability (HRV) and sleep analysis. It can also update
-satellite orbit prediction (EPO) data on the device to speed-up GPS fix times.
-It is an offline alternative to Garmin Connect. The software has been
-developed and tested on Linux but should work on other operating systems as
-well.}
+Forerunner 25 (FR25), Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to
+import the files from the device and analyze the data. In addition to the
+common features like plotting pace, heart rates, elevation and other captured
+values it also provides a heart rate variability (HRV) and sleep analysis. It
+can also update satellite orbit prediction (EPO) data on the device to
+speed-up GPS fix times.  It is an offline alternative to Garmin Connect. The
+software has been developed and tested on Linux but should work on other
+operating systems as well.}
   spec.homepage      = 'https://github.com/scrapper/postrunner'
   spec.license       = "GNU GPL version 2"
 
@@ -26,14 +26,14 @@ well.}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>=2.0'
+  spec.required_ruby_version = '>=2.4'
 
-  spec.add_dependency 'fit4ruby', '~> 1.6.1'
-  spec.add_dependency 'perobs', '~> 4.0.0'
+  spec.add_dependency 'fit4ruby', '~> 3.6.0'
+  spec.add_dependency 'perobs', '~> 4.2.0'
   spec.add_dependency 'nokogiri', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 0.9.6'
-  spec.add_development_dependency 'rspec', '~> 3.4.1'
-  spec.add_development_dependency 'yard', '~> 0.8.7'
+  spec.add_development_dependency 'rspec', '~> 3.6.0'
+  spec.add_development_dependency 'yard', '~> 0.9.20'
 end

data/spec/FitFileStore_spec.rb

@@ -3,7 +3,7 @@
 #
 # = PostRunner_spec.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, 2020 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
@@ -51,7 +51,7 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(1)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
     expect(@ffs.activities.length).to eq(1)
     expect(@ffs.ref_by_activity(@activities[0])).to eq(1)
   end
@@ -60,7 +60,7 @@ describe PostRunner::FitFileStore do
     expect(@ffs.add_fit_file(@fit_file_names[0])).to be_nil
 
     expect(@ffs.devices.length).to eq(1)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
     expect(@ffs.activities.length).to eq(1)
   end
 
@@ -69,8 +69,8 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(2)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
-    expect(@ffs.devices.include?('garmin-fenix3-123456791')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456791')).to be true
     expect(@ffs.activities.length).to eq(2)
     expect(@ffs.ref_by_activity(@activities[1])).to eq(1)
   end
@@ -80,8 +80,8 @@ describe PostRunner::FitFileStore do
     expect(@activities[-1]).not_to be_nil
 
     expect(@ffs.devices.length).to eq(2)
-    expect(@ffs.devices.include?('garmin-fenix3-123456790')).to be true
-    expect(@ffs.devices.include?('garmin-fenix3-123456791')).to be true
+    expect(@ffs.devices.include?('1-2050-123456790')).to be true
+    expect(@ffs.devices.include?('1-2050-123456791')).to be true
     expect(@ffs.activities.length).to eq(3)
     expect(@ffs.ref_by_activity(@activities[2])).to eq(1)
   end

data/spec/spec_helper.rb

@@ -56,7 +56,7 @@ def create_fit_file_store
   store['config'] = store.new(PEROBS::Hash)
   store['config']['data_dir'] = @work_dir
   store['config']['html_dir'] = @html_dir
-  store['config']['unit_system'] = :metric
+  store['config']['unit_system'] = 'metric'
   @ffs = store['file_store'] = store.new(PostRunner::FitFileStore)
   @records = store['records'] = store.new(PostRunner::PersonalRecords)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -86,39 +86,39 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.20
 description: |-
   PostRunner is an application to manage FIT files
   such as those produced by Garmin products like the Forerunner 620 (FR620),
-  Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to import the files from
-  the device and analyze the data. In addition to the common features like
-  plotting pace, heart rates, elevation and other captured values it also
-  provides a heart rate variability (HRV) and sleep analysis. It can also update
-  satellite orbit prediction (EPO) data on the device to speed-up GPS fix times.
-  It is an offline alternative to Garmin Connect. The software has been
-  developed and tested on Linux but should work on other operating systems as
-  well.
+  Forerunner 25 (FR25), Fenix 3, Fenix 3HR, Fenix 5 (S and X). It allows you to
+  import the files from the device and analyze the data. In addition to the
+  common features like plotting pace, heart rates, elevation and other captured
+  values it also provides a heart rate variability (HRV) and sleep analysis. It
+  can also update satellite orbit prediction (EPO) data on the device to
+  speed-up GPS fix times.  It is an offline alternative to Garmin Connect. The
+  software has been developed and tested on Linux but should work on other
+  operating systems as well.
 email:
 - cs@taskjuggler.org
 executables:
@@ -334,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Application to manage and analyze Garmin FIT files.