postrunner 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6969d2ea60df958cfefb28c10893203969f1fb6264aadf0117d34578e4928fd3
-  data.tar.gz: 4257fe33a6fa2566e5c9696084b86f59fa1dab4384baa3aca95fbad45d806554
+  metadata.gz: cf4ed8f4ab3233878268dd0a70537460e57321e5cd15cf6254d9753b4ef5b1c0
+  data.tar.gz: 50873923abbc887b282b335145bfd996f34223f5431a1f4965ef64af03dde953
 SHA512:
-  metadata.gz: df229d964f1b540486051aaef3e55f1985a48740158178b7b4eb601c2ef81f122921623dc9f9578f2660f9f8842f7c5ee6520575a02a1ca0d039d73d61c9be02
-  data.tar.gz: 5f830bd7093a4033eef67a2e0fb500260c7d4099add0871b88ad81175aecf858b9c3beba3f39efa1b0db6bd2218bc0fb576a2382afcdc37929d788a2beb22a56
+  metadata.gz: f8e46f9b6c0f5c33652d11cf2f6b1625857ec9c44d1a076b1f8c837a21ada490b610a0e776287e3bc58eb29c7a9e73551caab7fa6e0d9988b947962d5e3022dc
+  data.tar.gz: d6777bb23494f92fdf7c193964da13149720179af515775ee1724602c4d9ed6369b01d1d83f1b3530eaed3ad6a309d39da8a8e312c9a62f2de329285f5763108

data/lib/postrunner/ActivitiesDB.rb

@@ -35,8 +35,15 @@ module PostRunner
 
       create_directories
       begin
-        if File.exists?(@archive_file)
-          @activities = YAML.load_file(@archive_file)
+        if File.exist?(@archive_file)
+          if RUBY_VERSION >= '3.1.0'
+            # Since Ruby 3.1.0 YAML does not load unknown classes unless
+            # explicitely listed.
+            @activities = YAML.load_file(
+              @archive_file, permitted_classes: [ PostRunner::Activity, Time ])
+          else
+            @activities = YAML.load_file(@archive_file)
+          end
         else
           @activities = []
         end
@@ -84,6 +91,20 @@ module PostRunner
       end
     end
 
+    def backup_archive
+      begin
+        if File.exist?(@archive_file)
+          backup_file = @archive_file + '.bak'
+          if File.exist?(backup_file)
+            File.delete(backup_file)
+          end
+          File.rename(@archive_file, backup_file)
+        end
+      rescue IOError
+        Log.error "Cannot backup #{@archive_file}: #{$!}"
+      end
+    end
+
     # Add a new FIT file to the database.
     # @param fit_file_name [String] Name of the FIT file.
     # @param fit_activity [Activity] Activity to add
@@ -97,7 +118,7 @@ module PostRunner
         return false
       end
 
-      if File.exists?(File.join(@fit_dir, base_fit_file_name))
+      if File.exist?(File.join(@fit_dir, base_fit_file_name))
         Log.debug "Activity #{fit_file_name} has been deleted before"
         return false
       end
@@ -325,11 +346,11 @@ module PostRunner
       # found in '../../misc'.
       misc_dir = File.realpath(File.join(File.dirname(__FILE__),
                                          '..', '..', 'misc'))
-      unless Dir.exists?(misc_dir)
+      unless Dir.exist?(misc_dir)
         Log.fatal "Cannot find 'misc' directory under '#{misc_dir}': #{$!}"
       end
       src_dir = File.join(misc_dir, dir)
-      unless Dir.exists?(src_dir)
+      unless Dir.exist?(src_dir)
         Log.fatal "Cannot find '#{src_dir}': #{$!}"
       end
       dst_dir = @cfg[:html_dir]
@@ -345,4 +366,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/Activity.rb

@@ -271,7 +271,7 @@ module PostRunner
     end
 
     def show
-      generate_html_view #unless File.exists?(@html_file)
+      generate_html_view #unless File.exist?(@html_file)
 
       @db.show_in_browser(@html_file)
     end
@@ -485,4 +485,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/ActivityListView.rb

@@ -56,7 +56,11 @@ module PostRunner
         "index#{page_index == 0 ? '' : "-#{page_index}"}.html"
       @view = View.new("PostRunner Activities", views, pages)
 
-      @view.doc.head { @view.doc.style(style) }
+      @view.doc.head {
+        @view.doc.style(style)
+        @view.doc.meta({ 'name' => 'viewport',
+                         'content' => 'width=device-width, initial-scale=1.0' })
+      }
       body(@view.doc)
 
       output_file = File.join(@ffs.store['config']['html_dir'],
@@ -125,7 +129,7 @@ EOT
     def local_value(value, from_unit, format, units)
       to_unit = units[@unit_system]
       return '-' unless value
-      value *= conversion_factor(from_unit, to_unit)
+      value = conversion_offset(from_unit, to_unit) + value * conversion_factor(from_unit, to_unit)
       "#{format % [value, to_unit]}"
     end
 

data/lib/postrunner/ActivitySummary.rb

@@ -116,7 +116,7 @@ module PostRunner
       if @activity.sport == 'cycling'
         t.row([ 'Avg. Cadence:',
                 session.avg_cadence ?
-                "#{(2 * session.avg_cadence).round} rpm" : '-' ])
+                "#{(session.avg_cadence).round} rpm" : '-' ])
       end
       t.row([ 'Total Ascent:',
               local_value(session, 'total_ascent', '%.0f %s',

data/lib/postrunner/ActivityView.rb

@@ -60,12 +60,10 @@ module PostRunner
                          'type' => 'text/javascript', 'src' => js })
           end
           doc.style(style)
+          doc.meta({ 'name' => 'viewport',
+                     'content' => 'width=device-width, initial-scale=1.0' })
         }
       }
-      #doc.meta({ 'name' => 'viewport',
-      #           'content' => 'width=device-width, ' +
-      #                        'initial-scale=1.0, maximum-scale=1.0, ' +
-      #                        'user-scalable=0' })
 
       body {
         doc.body {

data/lib/postrunner/BackedUpFile.rb

@@ -32,7 +32,7 @@ module PostRunner
        bak_file = filename + '.bak'
 
        # Delete the backup file if it exists.
-       if File.exists?(bak_file)
+       if File.exist?(bak_file)
          begin
            File.delete(bak_file)
          rescue SystemCallError
@@ -41,7 +41,7 @@ module PostRunner
        end
 
        # Rename the old file to <filename>.bak
-       if File.exists?(filename)
+       if File.exist?(filename)
          begin
            File.rename(filename, bak_file)
          rescue SystemCallError
@@ -53,4 +53,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/ChartView.rb

@@ -193,7 +193,7 @@ module PostRunner
           :id => 'temperature',
           :label => 'Temperature',
           :short_label => 'Temp.',
-          :unit => 'C',
+          :unit => select_unit('C'),
           :graph => :line_graph,
           :colors => '#444444',
           :show => true
@@ -224,7 +224,7 @@ module PostRunner
         { 'min/km' => 'min/mi', 'km/h' => 'mph',
           'mm' => 'in', 'cm' => 'in', 'm' => 'ft',
           'bpm' => 'bpm', 'rpm' => 'rpm', 'spm' => 'spm', '%' => '%',
-          'ms' => 'ms' }[metric_unit]
+          'ms' => 'ms', 'C' => 'F' }[metric_unit]
       else
         Log.fatal "Unknown unit system #{@unit_system}"
       end
@@ -330,8 +330,8 @@ EOT
         last_value = nil
         last_timestamp = nil
         @activity.fit_activity.records.each do |r|
-          if last_timestamp && (r.timestamp - last_timestamp) > 10.0
-            # We have a gap in the values that is longer than 5 seconds. We'll
+          if last_timestamp && (r.timestamp - last_timestamp) > 20.0
+            # We have a gap in the values that is longer than 10 seconds. We'll
             # finish the line and start a new one later.
             data_set << [ (last_timestamp - start_time + 1).to_i * 1000, nil ]
           end

data/lib/postrunner/DailyMonitoringView.rb

@@ -50,12 +50,10 @@ module PostRunner
                          'type' => 'text/javascript', 'src' => js })
           end
           doc.style(style)
+          doc.meta({ 'name' => 'viewport',
+                     'content' => 'width=device-width, initial-scale=1.0' })
         }
       }
-      #doc.meta({ 'name' => 'viewport',
-      #           'content' => 'width=device-width, ' +
-      #                        'initial-scale=1.0, maximum-scale=1.0, ' +
-      #                        'user-scalable=0' })
 
       body {
         doc.body {

data/lib/postrunner/DirUtils.rb

@@ -17,7 +17,7 @@ module PostRunner
   module DirUtils
 
     def create_directory(dir, name)
-      return if Dir.exists?(dir)
+      return if Dir.exist?(dir)
 
       Log.info "Creating #{name} directory #{dir}"
       begin
@@ -30,4 +30,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/FFS_Activity.rb

@@ -43,61 +43,6 @@ module PostRunner
                              :column_alignment => :left })
     }
 
-    ActivityTypes = {
-      'generic' => 'Generic',
-      'running' => 'Running',
-      'cycling' => 'Cycling',
-      'transition' => 'Transition',
-      'fitness_equipment' => 'Fitness Equipment',
-      'swimming' => 'Swimming',
-      'basketball' => 'Basketball',
-      'soccer' => 'Soccer',
-      'tennis' => 'Tennis',
-      'american_football' => 'American Football',
-      'walking' => 'Walking',
-      'cross_country_skiing' => 'Cross Country Skiing',
-      'alpine_skiing' => 'Alpine Skiing',
-      'snowboarding' => 'Snowboarding',
-      'rowing' => 'Rowing',
-      'mountaineering' => 'Mountaneering',
-      'hiking' => 'Hiking',
-      'multisport' => 'Multisport',
-      'paddling' => 'Paddling',
-      'commuting' => 'Commuting',
-      'all' => 'All'
-    }
-    ActivitySubTypes = {
-      'generic' => 'Generic',
-      'treadmill' => 'Treadmill',
-      'street' => 'Street',
-      'trail' => 'Trail',
-      'track' => 'Track',
-      'spin' => 'Spin',
-      'indoor_cycling' => 'Indoor Cycling',
-      'road' => 'Road',
-      'mountain' => 'Mountain',
-      'downhill' => 'Downhill',
-      'recumbent' => 'Recumbent',
-      'cyclocross' => 'Cyclocross',
-      'hand_cycling' => 'Hand Cycling',
-      'track_cycling' => 'Track Cycling',
-      'indoor_rowing' => 'Indoor Rowing',
-      'elliptical' => 'Elliptical',
-      'stair_climbing' => 'Stair Climbing',
-      'lap_swimming' => 'Lap Swimming',
-      'open_water' => 'Open Water',
-      'flexibility_training' => 'Flexibility Training',
-      'strength_training' => 'Strength Training',
-      'warm_up' => 'Warm up',
-      'match' => 'Match',
-      'exercise' => 'Excersize',
-      'challenge' => 'Challenge',
-      'indoor_skiing' => 'Indoor Skiing',
-      'cardio_training' => 'Cardio Training',
-      'virtual_activity' => 'Virtual Activity',
-      'all' => 'All'
-    }
-
     attr_persist :device, :fit_file_name, :norecord, :name, :note, :sport,
       :sub_sport, :timestamp, :total_distance, :total_timer_time, :avg_speed
     attr_reader :fit_activity
@@ -185,7 +130,7 @@ module PostRunner
     def show
       html_file = html_file_name
 
-      generate_html_report #unless File.exists?(html_file)
+      generate_html_report #unless File.exist?(html_file)
 
       @store['file_store'].show_in_browser(html_file)
     end
@@ -211,17 +156,17 @@ module PostRunner
         self.note = value
       when 'type'
         load_fit_file
-        unless ActivityTypes.values.include?(value)
+        unless Activity::ActivityTypes.values.include?(value)
           Log.fatal "Unknown activity type '#{value}'. Must be one of " +
-                    ActivityTypes.values.join(', ')
+                    Activity::ActivityTypes.values.join(', ')
         end
-        self.sport = ActivityTypes.invert[value]
+        self.sport = Activity::ActivityTypes.invert[value]
       when 'subtype'
-        unless ActivitySubTypes.values.include?(value)
+        unless Activity::ActivitySubTypes.values.include?(value)
           Log.fatal "Unknown activity subtype '#{value}'. Must be one of " +
-                    ActivitySubTypes.values.join(', ')
+                    Activity::ActivitySubTypes.values.join(', ')
         end
-        self.sub_sport = ActivitySubTypes.invert[value]
+        self.sub_sport = Activity::ActivitySubTypes.invert[value]
       when 'norecord'
         unless %w( true false).include?(value)
           Log.fatal "norecord must either be 'true' or 'false'"
@@ -250,11 +195,11 @@ module PostRunner
     end
 
     def activity_type
-      ActivityTypes[@sport] || 'Undefined'
+      Activity::ActivityTypes[@sport] || 'Undefined'
     end
 
     def activity_sub_type
-      ActivitySubTypes[@sub_sport] || "Undefined #{@sub_sport}"
+      Activity::ActivitySubTypes[@sub_sport] || "Undefined #{@sub_sport}"
     end
 
     def distance(timestamp, unit_system)
@@ -296,4 +241,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/FFS_Device.rb

@@ -88,7 +88,7 @@ module PostRunner
         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))
-        if File.exists?(fq_fit_file_name) && !overwrite
+        if File.exist?(fq_fit_file_name) && !overwrite
           Log.debug "FIT file #{fq_fit_file_name} has already been imported " +
                     "and deleted"
           return nil
@@ -159,4 +159,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/Main.rb

@@ -34,6 +34,8 @@ module PostRunner
     def initialize
       @filter = nil
       @name = nil
+      @sport = nil
+      @sub_sport = nil
       @force = false
       @attribute = nil
       @value = nil
@@ -151,6 +153,22 @@ EOT
                 'Name the activity to the specified name') do |n|
           @name = n
         end
+        opts.on('--sport sport', String,
+                'Set the activity to the specified sport') do |value|
+          unless Activity::ActivityTypes.values.include?(value)
+            Log.fatal "Unknown activity type '#{value}'. Must be one of " +
+                      Activity::ActivityTypes.values.join(', ')
+          end
+          @sport = Activity::ActivityTypes.invert[value]
+        end
+        opts.on('--sub_sport sub_sport', String,
+                'Set the activity to the specified sub_sport') do |value|
+          unless Activity::ActivitySubTypes.values.include?(value)
+            Log.fatal "Unknown activity sub type '#{value}'. Must be one of " +
+                      Activity::ActivitySubTypes.values.join(', ')
+          end
+          @sub_sport = Activity::ActivitySubTypes.invert[value]
+        end
 
         opts.separator ""
         opts.separator "General options:"
@@ -281,11 +299,11 @@ EOT
         # found in '../../misc'.
         misc_dir = File.realpath(File.join(File.dirname(__FILE__),
                                            '..', '..', 'misc'))
-        unless Dir.exists?(misc_dir)
+        unless Dir.exist?(misc_dir)
           Log.abort "Cannot find 'misc' directory under '#{misc_dir}': #{$!}"
         end
         src_dir = File.join(misc_dir, dir)
-        unless Dir.exists?(src_dir)
+        unless Dir.exist?(src_dir)
           Log.abort "Cannot find '#{src_dir}': #{$!}"
         end
         dst_dir = @db['config']['html_dir']
@@ -354,7 +372,7 @@ EOT
           unless process_files(args, :import)
             retval = 1
           end
-          if args.length == 1 && Dir.exists?(args[0])
+          if args.length == 1 && Dir.exist?(args[0])
             # If only one directory was specified as argument we store the
             # directory for future use.
             @db['config']['import_dir'] = args[0]
@@ -507,6 +525,14 @@ EOT
 
       begin
         fit_entity = Fit4Ruby.read(fit_file_name)
+        if fit_entity.is_a?(Fit4Ruby::Activity)
+          if @sport
+            fit_entity.sport = @sport
+          end
+          if @sub_sport
+            fit_entity.sub_sport = @sub_sport
+          end
+        end
       rescue Fit4Ruby::Error
         Log.error $!
         return false
@@ -584,7 +610,7 @@ EOT
       create_directory(epo_dir, 'GPS Data Cache')
       epo_file = File.join(epo_dir, 'EPO.BIN')
 
-      if !File.exists?(epo_file) ||
+      if !File.exist?(epo_file) ||
          (File.mtime(epo_file) < Time.now - (6 * 60 * 60))
         # The EPO file only changes every 6 hours. No need to download it more
         # frequently if it already exists.
@@ -595,7 +621,7 @@ EOT
             return
           end
           remotesw_dir = File.join(remotesw_dir, '..', 'REMOTESW')
-          unless Dir.exists?(remotesw_dir)
+          unless Dir.exist?(remotesw_dir)
             Log.error "Cannot find '#{remotesw_dir}'. Please connect and " +
                       "mount your Garmin device."
             return
@@ -639,17 +665,20 @@ EOT
     # data. This method transfers the data from the old storage to the new
     # FitFileStore based database.
     def import_legacy_archive
+      cfg = RuntimeConfig.new(@db_dir)
+      activities_db = ActivitiesDB.new(@db_dir, cfg)
+      activities = activities_db.activities
+      return if activities.empty?
+
       old_fit_dir = File.join(@db_dir, 'old_fit_dir')
       create_directory(old_fit_dir, 'Old Fit')
 
-      cfg = RuntimeConfig.new(@db_dir)
-      activities = ActivitiesDB.new(@db_dir, cfg).activities
       # Ensure that activities are sorted from earliest to last to properly
       # recognize the personal records during import.
       activities.sort! { |a1, a2| a1.timestamp <=> a2.timestamp }
       activities.each do |activity|
         file_name = File.join(@db_dir, 'fit', activity.fit_file)
-        next unless File.exists?(file_name)
+        next unless File.exist?(file_name)
 
         Log.info "Converting #{activity.fit_file} to new DB format"
         @db.transaction do
@@ -664,6 +693,7 @@ EOT
           FileUtils.move(file_name, File.join(old_fit_dir, activity.fit_file))
         end
       end
+      activities_db.backup_archive
     end
 
     def ensure_flat_file_db
@@ -696,4 +726,3 @@ EOT
   end
 
 end
-

data/lib/postrunner/RuntimeConfig.rb

@@ -60,7 +60,7 @@ module PostRunner
 
     # Ensure that the requested directory exists.
     def create_directory(dir, name)
-      return if Dir.exists?(dir)
+      return if Dir.exist?(dir)
 
       Log.info "Creating #{name} directory #{dir}"
       begin
@@ -94,4 +94,3 @@ module PostRunner
   end
 
 end
-

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/postrunner.gemspec

@@ -28,8 +28,8 @@ operating systems as well.}
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>=2.4'
 
-  spec.add_dependency 'fit4ruby', '~> 3.10.0'
-  spec.add_dependency 'perobs', '~> 4.4.0'
+  spec.add_dependency 'fit4ruby', '~> 3.11.0'
+  spec.add_dependency 'perobs', '~> 4.5.0'
   spec.add_dependency 'nokogiri'
 
   spec.add_development_dependency 'bundler'

data/spec/View_spec.rb

@@ -31,7 +31,7 @@ module PostRunner
     def delete_files
       @view_names.each do |vn|
         page_files(vn).each do |pf|
-          File.delete(pf) if File.exists?(pf)
+          File.delete(pf) if File.exist?(pf)
         end
       end
     end
@@ -52,7 +52,7 @@ module PostRunner
           pages.current_page = file
           PostRunner::View.new("Test File: #{file}", views, pages).body.
             write(file)
-          expect(File.exists?(file)).to be true
+          expect(File.exist?(file)).to be true
         end
       end
     end

data/spec/spec_helper.rb

@@ -33,7 +33,7 @@ def tmp_dir_name(caller_file)
   begin
     dir_name = File.join(Dir.tmpdir,
                          "#{File.basename(caller_file)}.#{rand(2**32)}")
-  end while File.exists?(dir_name)
+  end while File.exist?(dir_name)
 
   dir_name
 end
@@ -190,4 +190,3 @@ def tables_to_arrays(str)
 
   arrays
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Schlaeger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: perobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +325,7 @@ homepage: https://github.com/scrapper/postrunner
 licenses:
 - GNU GPL version 2
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -340,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: Application to manage and analyze Garmin FIT files.
 test_files: