lightwaverf 0.12.1 → 0.13.1

data/bin/lightwaverf

@@ -20,6 +20,8 @@ case ARGV[0]
     puts obj.learnmood ARGV[1], ARGV[2], ARGV[3]
   when 'energy'
     puts obj.energy ARGV[1], ARGV[2], ARGV[3]
+  when 'schedule'
+    puts obj.schedule ARGV[1]
   when 'update_timers'
     puts obj.update_timers ARGV[1], ARGV[2], ARGV[3]
   when 'timer'

data/lib/lightwaverf.rb

@@ -5,6 +5,7 @@
 # Cope with events that start and end in the same run?
 # Add info about states to timer log
 
+# require 'tzinfo'
 require 'yaml'
 require 'socket'
 require 'net/http'
@@ -143,14 +144,8 @@ class LightWaveRF
     end
 
     if config['calendar']
-      crontab << '# ' + executable + ' cache timed events 2 hours back 6 hours ahead'
-      crontab << '56 * * * * ' + executable + ' update_timers 120 360 > /tmp/lightwaverf_update_timers.out 2>&1'
-      crontab << '# ' + executable + ' update_timers on reboot (works for me on raspbian)'
-      crontab << '@reboot ' + executable + ' update_timers 120 360 > /tmp/lightwaverf_update_timers.out 2>&1'
-      crontab << '# ' + executable + ' timer every 10 mins off peak'
-      crontab << '*/10 0-6,9-16,23 * * * ' + executable + ' timer 10 > /tmp/lightwaverf_timer.out 2>&1'
-      crontab << '# ' + executable + ' timer every 2 minutes peak'
-      crontab << '*/2 7,8,17-22 * * * ' + executable + ' timer 2 > /tmp/lightwaverf_timer.out 2>&1'
+      crontab << '# ' + executable + ' update schedule ONLY ONCE A DAY'
+      crontab << '56 0 * * * ' + executable + ' schedule true > /tmp/lightwaverf_schedule.out 2>&1'
     end
 
     config['room'].each do | room |
@@ -169,6 +164,99 @@ class LightWaveRF
     'Saved config file ' + file
   end
 
+  def schedule debug = false
+    id = 'lwrf_cron'
+    executable = `which lightwaverf`.chomp
+    if (executable == "")
+      puts 'did not get executable from `which lightwaverf` - do we have ' + File.expand_path(__FILE__) + '../bin/lightwaverf ???'
+      # executable = File.expand_path(__FILE__) + '/../bin/lightwaverf'
+      executable = '/usr/local/bin/lightwaverf'
+    end
+    if (!executable)
+      puts 'still no, bah, aborting'
+      return
+    end
+    crontab = `crontab -l`.split( /\n/ ) || [ ]
+    crontab = crontab.reject do | line |
+      line =~ Regexp.new( id )
+    end
+    crontab << '# ' + id + ' new crontab added by `' + executable + ' cron`'
+
+    body = self.calendar_body(debug)
+
+    cals = RiCal.parse_string(body)
+
+    cals.first.events.each do | e |
+      event = self.tokenise_event e, debug
+      event = self.get_modifiers event, debug
+      event.delete 'command'
+      event.delete 'modifier_start'
+      event.delete 'time_modifier'
+
+        endDate = nil
+
+        match = /UNTIL=(\d+)/.match(event['rrule'].to_s)
+        if match
+          endDate = DateTime.parse(match[1].to_s)
+        end
+     
+        match = /FREQ=(\w+);COUNT=(\d+)/.match(event['rrule'])
+        # FREQ=DAILY;COUNT=8 - need to check for weekly, monthly etc
+        if match
+          endDate = event['date'] + match[2].to_i
+        end
+  
+        if !event['rrule']
+          endDate = event['date']
+        end
+
+        if endDate
+          if endDate < Date.today
+            next
+          end
+        end
+
+        if event['type'] == 'device' and event['state'] != 'on' and event['state'] != 'off'
+          event['room'] = 'sequence' if event['room'].nil?
+          crontab << self.cron_entry(event, executable)
+          end_event = event.dup # duplicate event for start and end
+          end_event['date'] = event['end']
+          end_event['state'] = 'off'
+          crontab << self.cron_entry(end_event, executable)
+        else
+          event['room'] = 'sequence' if event['room'].nil?
+          crontab << self.cron_entry(event, executable, true)
+        end
+     
+
+    end
+    File.open( '/tmp/cron.tab', 'w' ) do | handle |
+      handle.write crontab.join( "\n" ) + "\n"
+    end
+    puts `crontab /tmp/cron.tab`
+  end
+
+  def cron_entry event, executable, extra_debug = false
+    id = 'lwrf_cron ' + event['rrule'].to_s + (extra_debug ? ' ' + event.inspect : '')
+    event['state'] = 'on' if event['state'].nil?
+    cmd = event['room'].to_s + ' ' + event['device'].to_s + ' ' + event['state'].to_s
+    out_file = '/tmp/' + cmd + '.out'
+    out_file.gsub! /\s/, '-'
+    return self.cron_entry_times(event) + ' ' + executable + ' ' + cmd + ' > ' + out_file + ' 2>&1 # ' + id
+  end
+
+  def cron_entry_times event
+    return event['date'].strftime('%M %H * * *') if event['rrule'] == 'FREQ=DAILY'
+    match = /BYDAY=([\w,]+)/.match(event['rrule'])
+    return event['date'].strftime('%M %H * * ') + self.rrule_days_of_week(match[1]) if match
+    return event['date'].strftime('%M %H %d %m *') if event['date']
+    return '# 0 12 * * *';
+  end
+
+  def rrule_days_of_week days
+    return days.gsub('SU', '0').gsub('MO', '1').gsub('TU', '2').gsub('WE', '3').gsub('TH', '4').gsub('FR', '5').gsub('SA', '6')
+  end
+
   def get_config_file
     @config_file || File.expand_path('~') + '/lightwaverf-config.yml'
   end
@@ -798,7 +886,6 @@ class LightWaveRF
         # handle optional state
         if event['command'].length > 2
           first_char = event['command'][2].to_s[0,1]
-          debug and ( p 'First char is: ' + first_char )
           # if the third word does not start with a modifier flag, assume it's a state
           if /\w/.match first_char
             event['state'] = event['command'][2].to_s
@@ -829,19 +916,20 @@ class LightWaveRF
           debug and ( p 'Found unless modifier: ' + modifier[1..-1] )
           event['unless_modifiers'].push modifier[1..-1]
         elsif modifier[0,1] == '+'
-          debug and ( p 'Found positive time modifier: ' + modifier[1..-1] )
           event['time_modifier'] = modifier[1..-1].to_i
         elsif modifier[0,1] == '-'
-          debug and ( p 'Found negative time modifier: ' + modifier[1..-1] )
           event['time_modifier'] = modifier[1..-1].to_i * -1
         end
       end
     end
     event['time_modifier'] += self.class.variance( event['summary'] ).to_i
     if event['time_modifier'] != 0
-      debug and ( p 'Adjusting timings by: ' + event['time_modifier'].to_s )
+      debug and (p 'Adjusting timings by: ' + event['time_modifier'].to_s + ' ' + event.inspect)
       event['date'] = (( event['date'].to_time ) + event['time_modifier'] * 60 ).to_datetime
-      event['end'] = (( event['end'].to_time ) + event['time_modifier'] * 60 ).to_datetime
+      if event['end']
+        event['end'] = (( event['end'].to_time ) + event['time_modifier'] * 60 ).to_datetime
+      end
+      debug and (p 'dates now ' + event['date'].to_s + ' ' + event['end'].to_s)
     end
     event
   end
@@ -853,29 +941,43 @@ class LightWaveRF
     event['annotate'] = !( /do not annotate/.match event['summary'] )
     event['date'] = e.dtstart
     event['end'] = e.dtend
+    if e.rrule.length > 0
+      event['rrule'] = e.rrule.first
+      # event['rrules'] = event['rrule'].split(';')
+    end
     event = set_event_type event, debug
   end
 
-  def update_timers past = 60, future = 1440, debug = false
-    p '-- Updating timers...'
-
-    query_start = Time.new - self.class.to_seconds( past )
-    query_end = Time.new + self.class.to_seconds( future )
-
+  def calendar_body debug = false
     url = self.get_calendar_url debug
     debug and ( p url )
     response = self.request url, debug
     if response.code != '200'
       debug and ( p "Response code is: " + response.code)
-      return self.log_timer_event 'update', nil, nil, nil, false
     end
+    return response.body
+  end
+
+  def update_timers past = 60, future = 1440, debug = false
+    p '-- Updating timers...'
+
+    query_start = Time.new - self.class.to_seconds( past )
+    query_end = Time.new + self.class.to_seconds( future )
 
-    cals = RiCal.parse_string( response.body )
+    body = self.calendar_body(debug)
+
+    cals = RiCal.parse_string(body)
 
     timers = { 'events' => [ ], 'states' => [ ] }
 
     cals.first.events.each do | e |
-      occurs = e.occurrences( :overlapping => [ query_start, query_end ] )
+      begin
+        occurs = e.occurrences(:overlapping => [query_start, query_end])
+      rescue StandardError => err
+        p err.to_s
+        p e.to_s
+        occurs = []
+      end
       next if occurs.length == 0
       occurs.each do | occurrence |
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -50,17 +50,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: ! "    Interact with lightwaverf wifi-link from code or the command line.\n
   \   Control your lights, heating, sockets, sprinkler etc.\n    Also use ical calendar,
   for timers, log energy usage, and build a website.\n"