lightwaverf 0.6.5 → 0.6.6

data/lib/lightwaverf.rb

@@ -793,6 +793,11 @@ class LightWaveRF
           # populate the dates
           event['date'] = start_dt
           # handle device entries without explicit on/off state
+
+          # has a PROBLEM with a calendar event set to turn lights to 50% say - automatically adds an off!
+          # fix this with something like
+          #   if self.get_state event['state'] ! starts with F
+
           if event['type'] == 'device' and ( event['state'].nil? or ( event['state'] != 'on' and event['state'] != 'off' ))
             debug and ( p 'Duplicating event without explicit on/off state...' )
             # if not state was given, assume we meant 'on'
@@ -1013,6 +1018,17 @@ class LightWaveRF
     content.to_s
   end
 
+  def self.get_json file
+    json = { }
+    content = self.get_contents file
+    begin
+      json = JSON.parse content
+    rescue
+      STDERR.puts 'cannot parse ' + file.to_s
+    end
+    json
+  end
+
   def build_web_page debug = nil
 
     rooms = self.class.get_rooms self.get_config
@@ -1085,9 +1101,8 @@ class LightWaveRF
   def summarise days = 7, debug = nil
     days = days.to_i
     data = [ ]
-      file = self.get_summary_file.gsub 'summary', 'daily'
-      json = self.class.get_contents file
-      daily = JSON.parse json
+    file = self.get_summary_file.gsub 'summary', 'daily'
+    daily = self.class.get_json file
     start_date = 0
     d = nil
     File.open( self.get_log_file, 'r' ).each_line do | line |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities