lightwaverf 0.6.0 → 0.6.1

data/app/views/_graphs.ejs

@@ -42,8 +42,6 @@
     energy_data.addRows( raw_data.map( function ( e ) {
       if ( e[0] !== start_date ) e[0] += start_date;
       e[0] = new Date( 1000 * e[0] ); // as it is now a timestamp
-      // var d = '' + e[0];
-      // e[0] = new Date( '20' + d[0] + d[1] + '-' + d[2] + d[3] + '-' + d[4] + d[5] + ' ' + d[6] + d[7] + ':' + d[8] + d[9] );
       e[1] = e[1] * 10;
       e[2] = e[2] || '';
       e[3] = e[3] || '';
@@ -66,6 +64,7 @@
     gauge.draw( gauge_data, gauge_options );
   } );
   $( function ( ) {
+    var key = 'foo';
     $('dt a').click( function ( ) {
       $(this).parent( ).next('dd').slideDown( );
       return false;
@@ -75,6 +74,10 @@
       var status = $a.data( 'status' ) == 'on' ? 'off' : 'on';
       $.ajax( {
         url: $a.attr('href') + '?status=' + status,
+        data: {
+          status: status,
+          key: key,
+        },
         type: 'PUT',
         success: function( js ) {
           $a.data( 'status', status );

data/lib/lightwaverf.rb

@@ -538,19 +538,33 @@ class LightWaveRF
     match = /W=(\d+),(\d+),(\d+),(\d+)/.match data
     debug and ( p match )
     if match
-      data = { 'message' => { 'usage' => match[1].to_i, 'max' => match[2].to_i, 'today' => match[3].to_i }}
+      data = {
+        'message' => {
+          'usage' => match[1].to_i,
+          'max' => match[2].to_i,
+          'today' => match[3].to_i
+        }
+      }
       data['timestamp'] = Time.now.to_s
       if note
         data['message']['annotation'] = { 'title' => title.to_s, 'text' => note.to_s }
       end
       debug and ( p data )
       begin
-      	File.open( self.get_log_file, 'a' ) do | f |
+        File.open( self.get_log_file, 'a' ) do | f |
           f.write( data.to_json + "\n" )
-      	end
-      	data['message']
+        end
+        file = self.get_summary_file.gsub 'summary', 'daily'
+        json = self.class.get_contents file
+        begin
+          data['message']['history'] = JSON.parse json
+        rescue => e
+          data['message']['error'] = 'error parsing ' + file + '; ' + e.to_s
+          data['message']['history_json'] = json
+        end
+        data['message']
       rescue
-	puts 'error writing to log'
+        puts 'error writing to log'
       end
     end
   end
@@ -592,9 +606,15 @@ class LightWaveRF
     query_start = now - self.class.to_seconds( past )
     query_end = now + self.class.to_seconds( future )
 
-    url = LightWaveRF.new.get_config['calendar']
-    # url += '?ctz=' + Time.new.zone
-    url += '?ctz=UTC'
+    # url = LightWaveRF.new.get_config['calendar']
+    url = self.get_config['calendar']
+
+    url += '?ctz=' + Time.new.zone
+    # url += '?ctz=UTC'
+    if Time.new.zone != 'UTC'
+      p 'time zone is ' + Time.new.zone + ' so look out...'
+    end
+
     url += '&singleevents=true'
     url += '&start-min=' + query_start.strftime( '%FT%T%:z' ).sub('+', '%2B')
     url += '&start-max=' + query_end.strftime( '%FT%T%:z' ).sub('+', '%2B')
@@ -625,20 +645,20 @@ class LightWaveRF
 
       # refresh the list of entries for the caching period
       doc.elements.each 'feed/entry' do | e |
-        debug and ( p "-------------------")
-        debug and ( p "Processing entry...")
+        debug and ( p '-------------------' )
+        debug and ( p 'Processing entry...' )
         event = Hash.new
 
         # tokenise the title
-        debug and ( p "Event title is: " + e.elements['title'].text )
+        debug and ( p 'Event title is: ' + e.elements['title'].text )
         command = e.elements['title'].text.split
         command_length = command.length
-        debug and ( p "Number of words is: " + command_length.to_s )
+        debug and ( p 'Number of words is: ' + command_length.to_s )
         if command and command.length >= 1
           first_word = command[0].to_s
           # determine the type of the entry
           if first_word[0,1] == '#'
-            debug and ( p "Type is: state" )
+            debug and ( p 'Type is: state' )
             event['type'] = 'state' # temporary type, will be overridden later
             event['room'] = nil
             event['device'] = nil
@@ -647,21 +667,21 @@ class LightWaveRF
           else
             case first_word
             when 'mood'
-              debug and ( p "Type is: mood" )
+              debug and ( p 'Type is: mood' )
               event['type'] = 'mood'
               event['room'] = command[1].to_s
               event['device'] = nil
               event['state'] = command[2].to_s
               modifier_start = 3
             when 'sequence'
-              debug and ( p "Type is: sequence" )
+              debug and ( p 'Type is: sequence' )
               event['type'] = 'sequence'
               event['room'] = nil
               event['device'] = nil
               event['state'] = command[1].to_s
               modifier_start = 2
             else
-              debug and ( p "Type is: device" )
+              debug and ( p 'Type is: device' )
               event['type'] = 'device'
               event['room'] = command[0].to_s
               event['device'] = command[1].to_s
@@ -669,18 +689,19 @@ class LightWaveRF
               if command_length > 2
                 third_word = command[2].to_s
                 first_char = third_word[0,1]
-                debug and ( p "First char is: " + first_char )
+                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 first_char != '@' and first_char != '!' and first_char != '+' and first_char != '-'
-                  debug and ( p "State has been given.")
+                # if first_char != '@' and first_char != '!' and first_char != '+' and first_char != '-'
+                if /\w/.match first_char
+                  debug and ( p 'State has been given.')
                   event['state'] = command[2].to_s
                   modifier_start = 3
                 else
-                  debug and ( p "State has not been given." )
+                  debug and ( p 'State has not been given.' )
                   modifier_start = 2
                 end
               else
-                debug and ( p "State has not been given." )
+                debug and ( p 'State has not been given.' )
                 event['state'] = nil
                 modifier_start = 2
               end
@@ -690,24 +711,24 @@ class LightWaveRF
           # get modifiers if they exist
           time_modifier = 0
           if command_length > modifier_start
-            debug and ( p "May have modifiers..." )
+            debug and ( p 'May have modifiers...' )
             when_modifiers = [ ]
             unless_modifiers = [ ]
             modifier_count = command_length - modifier_start
-            debug and ( p "Count of modifiers is " + modifier_count.to_s )
+            debug and ( p 'Count of modifiers is ' + modifier_count.to_s )
             for i in modifier_start..(command_length-1)
               modifier = command[i]
               if modifier[0,1] == '@'
-                debug and ( p "Found when modifier: " + modifier[1..-1] )
+                debug and ( p 'Found when modifier: ' + modifier[1..-1] )
                 when_modifiers.push modifier[1..-1]
               elsif modifier[0,1] == '!'
-                debug and ( p "Found unless modifier: " + modifier[1..-1] )
+                debug and ( p 'Found unless modifier: ' + modifier[1..-1] )
                 unless_modifiers.push modifier[1..-1]
               elsif modifier[0,1] == '+'
-                debug and ( p "Found positive time modifier: " + modifier[1..-1] )
+                debug and ( p 'Found positive time modifier: ' + modifier[1..-1] )
                 time_modifier = modifier[1..-1].to_i
               elsif modifier[0,1] == '-'
-                debug and ( p "Found negative time modifier: " + modifier[1..-1] )
+                debug and ( p 'Found negative time modifier: ' + modifier[1..-1] )
                 time_modifier = modifier[1..-1].to_i * -1
               end
             end
@@ -718,7 +739,7 @@ class LightWaveRF
 
           # parse the date string
           event_time = /When: ([\w ]+) (\d\d:\d\d) to ([\w ]+)?(\d\d:\d\d)&nbsp;\n(.*)<br>(.*)/.match e.elements['summary'].text
-          debug and ( p "Event times are: " + event_time.to_s )
+          debug and ( p 'Event times are: ' + event_time.to_s )
           start_date = event_time[1].to_s
           start_time = event_time[2].to_s
           end_date = event_time[3].to_s
@@ -729,6 +750,7 @@ class LightWaveRF
           end
 
           time_modifier += self.class.variance e.elements['title'].text
+          event['annotate'] = ! ( /do not annotate/.match e.elements['title'].text )
 
           debug and ( p 'Start date: ' + start_date )
           debug and ( p 'Start time: ' + start_time )
@@ -884,7 +906,7 @@ class LightWaveRF
 
         # if has modifiers, check modifiers against states
         unless event['when_modifiers'].nil?
-          debug and ( p 'Event has when modifiers. Checking they are all met...')
+          debug and ( p 'Event has when modifiers. Checking they are all met...' )
 
           # determine which states apply at the time of the event
           applicable_states = [ ]
@@ -893,12 +915,12 @@ class LightWaveRF
               applicable_states.push state['name']
             end
           end
-          debug and ( p 'Applicable states are: ' + applicable_states.to_s)
+          debug and ( p 'Applicable states are: ' + applicable_states.to_s )
 
           # check that each when modifier exists in appliable states
           event['when_modifiers'].each do | modifier |
             unless applicable_states.include? modifier
-              debug and ( p 'Event when modifier not met: ' + modifier)
+              debug and ( p 'Event when modifier not met: ' + modifier )
               run_now = false
               break
             end
@@ -907,7 +929,7 @@ class LightWaveRF
           # check that each unless modifier does not exist in appliable states
           event['unless_modifiers'].each do | modifier |
             if applicable_states.include? modifier
-              debug and ( p 'Event unless modifier not met: ' + modifier)
+              debug and ( p 'Event unless modifier not met: ' + modifier )
               run_now = false
               break
             end
@@ -927,32 +949,32 @@ class LightWaveRF
 
     triggered = [ ]
 
+    annotate = false
     run_list.each do | event |
       # execute based on type
       case event['type']
       when 'mood'
         p 'Executing mood. Room: ' + event['room'] + ', Mood: ' + event['state']
         result = self.mood event['room'], event['state'], debug
-        sleep 1
-        triggered << [ event['room'], event['device'], event['state'] ]
       when 'sequence'
         p 'Executing sequence. Sequence: ' + event['state']
         result = self.sequence event['state'], debug
-        sleep 1
-        triggered << [ event['room'], event['device'], event['state'] ]
       else
         p 'Executing device. Room: ' + event['room'] + ', Device: ' + event['device'] + ', State: ' + event['state']
         result = self.send event['room'], event['device'], event['state'], debug
-        sleep 1
-        triggered << [ event['room'], event['device'], event['state'] ]
       end
-        self.log_timer_event event['type'], event['room'], event['device'], event['state'], result
+      sleep 1
+      triggered << [ event['room'], event['device'], event['state'] ]
+      if event['annotate']
+        annotate = true
+      end
+      self.log_timer_event event['type'], event['room'], event['device'], event['state'], result
     end
 
     # update energy log
     title = nil
     text = nil
-    if triggered.length > 0
+    if annotate
       debug and ( p triggered.length.to_s + ' events so annotating energy log too...' )
       title = 'timer'
       text = triggered.map { | e | e.join ' ' }.join ', '
@@ -981,9 +1003,9 @@ class LightWaveRF
       debug and ( puts name + ' is ' + room.to_s )
       list += '<dt><a>' + name + '</a></dt><dd><ul>'
       room['device'].each do | device |
-	      # link ideally relative to avoid cross domain issues
-	      link = '/room/' + room['name'].to_s + '/' + device.first.to_s
-      	list += '<li><a class="ajax off" href="' + link + '">' + room['name'].to_s + ' ' + device.first.to_s + '</a></li>'
+        # link ideally relative to avoid cross domain issues
+        link = '/room/' + room['name'].to_s + '/' + device.first.to_s
+        list += '<li><a class="ajax off" href="' + link + '">' + room['name'].to_s + ' ' + device.first.to_s + '</a></li>'
       end
       list += '</ul></dd>'
     end
@@ -1004,39 +1026,39 @@ class LightWaveRF
       <html>
         <head>
           <title>#{title}</title>
-	        <style type="text/css">
-	          body { font-family: arial, verdana, sans-serif; }
-	          div#energy_chart { width: 800px; height: 600px; }
-	          div#gauge_div { width: 100px; height: 100px; }
-	          dd { display: none; }
-	          .off, .on:hover { padding-right: 18px; background: url(lightning_delete.png) no-repeat top right; }
-	          .on, .off:hover { padding-right: 18px; background: url(lightning_add.png) no-repeat top right; }
-	        </style>
-	      </head>
+          <style type="text/css">
+            body { font-family: arial, verdana, sans-serif; }
+            div#energy_chart { width: 800px; height: 600px; }
+            div#gauge_div { width: 100px; height: 100px; }
+            dd { display: none; }
+            .off, .on:hover { padding-right: 18px; background: url(lightning_delete.png) no-repeat top right; }
+            .on, .off:hover { padding-right: 18px; background: url(lightning_add.png) no-repeat top right; }
+          </style>
+        </head>
         <body>
           <div class="container">
             <div class="row">
               <div class="col">
-	              <h1>#{title}</h1>
-	              <p class="intro">#{intro}</p>
+                <h1>#{title}</h1>
+                <p class="intro">#{intro}</p>
                 <div id="energy_chart">
                   Not seeing an energy chart here?
                   Maybe not working in your device yet, sorry.
                   This uses google chart api which may generate FLASH :-(
                   Try in a web browser.
                 </div>
-		            <h2>Rooms and devices</h2>
-		            <p>@todo make these links to control the devices...</p>
-	              <p class="help">#{help}</p>
-	              #{js}
-	            </div>
+                <h2>Rooms and devices</h2>
+                <p>@todo make these links to control the devices...</p>
+                <p class="help">#{help}</p>
+                #{js}
+              </div>
               <div class="col">
                 <div class="col" id="gauge_div"></div>
-	            </div>
-	          </div>
-	        </div>
-	        <p>By <a href="http://www.clarkeology.com/blog/">Paul Clarke</a>, a work in progress.</p>
-	      </body>
+              </div>
+            </div>
+          </div>
+          <p>By <a href="http://www.clarkeology.com/blog/">Paul Clarke</a>, a work in progress.</p>
+        </body>
       </html>
     end
   end
@@ -1045,35 +1067,38 @@ class LightWaveRF
   def summarise days = 7, debug = nil
     days = days.to_i
     data = [ ]
-    daily = { }
+      file = self.get_summary_file.gsub 'summary', 'daily'
+      json = self.class.get_contents file
+      daily = JSON.parse json
     start_date = 0
     d = nil
     File.open( self.get_log_file, 'r' ).each_line do | line |
-      line = JSON.parse( line )
+      line = JSON.parse line
       if line and line['timestamp']
-	      new_line = []
-	      d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
-	      ts = Time.parse( line['timestamp'] ).strftime '%s'
-	      ts = ts.to_i
-	      if start_date > 0
-	        ts = ts - start_date
-	      else
-	        start_date = ts
-	      end
-	      new_line << ts
-	      new_line << line['message']['usage'].to_i / 10
-	      if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
-	        new_line << line['message']['annotation']['title']
-	        new_line << line['message']['annotation']['text']
-	      end
-	      data << new_line
-	      if ( ! daily[d] or line['message']['today'] > daily[d]['today'] )
+        new_line = []
+        d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
+        ts = Time.parse( line['timestamp'] ).strftime '%s'
+        ts = ts.to_i
+        if start_date > 0
+          ts = ts - start_date
+        else
+          start_date = ts
+        end
+        new_line << ts
+        new_line << line['message']['usage'].to_i / 10
+        if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
+          new_line << line['message']['annotation']['title']
+          new_line << line['message']['annotation']['text']
+        end
+        data << new_line
+        if (( ! daily[d] ) or ( line['message']['today'] > daily[d]['today'] ))
           daily[d] = line['message']
-	      end
+          daily[d].delete 'usage'
+        end
       end
     end
     debug and ( puts 'got ' + data.length.to_s + ' lines in the log' )
-    data = data.last( 60 * 24 * days )
+    data = data.last 60 * 24 * days
     debug and ( puts 'now got ' + data.length.to_s + ' lines in the log ( 60 * 24 * ' + days.to_s + ' = ' + ( 60 * 24 * days ).to_s + ' )' )
     if data and data[0]
       debug and ( puts 'data[0] is ' + data[0].to_s )
@@ -1085,12 +1110,13 @@ class LightWaveRF
     File.open( summary_file, 'w' ) do |file|
       file.write data.to_s
     end
-    # @todo fix the daily stats, every night it reverts to the minimum value...
+    # @todo fix the daily stats, every night it reverts to the minimum value because the timezones are different
+    # so 1am on the wifi-link looks midnight on the server
     File.open( summary_file.gsub( 'summary', 'daily' ), 'w' ) do | file |
-      file.write daily.to_s
+      file.write daily.to_json.to_s
     end
     File.open( summary_file.gsub( 'summary', 'daily.' + d ), 'w' ) do | file |
-      file.write daily.select { |key| key == daily.keys.last }.to_s
+      file.write daily.select { |key| key == daily.keys.last }.to_json.to_s
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities