ruby-macrodroid 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bd85e05b55cb8139d501f96e7f0692a052d4544dcd518b73e4e1168ffcb0dd
-  data.tar.gz: 92d7670d08882e34f16085ca22da3a5affc8aa84c3eb89b3f6ec2800c4172501
+  metadata.gz: f79a66c628c78bab4c858805ac6486083331723153022cb23030485701b16eea
+  data.tar.gz: d2bf06bef9e246852f4ec40a31f267ce2f94b66293318fb82ea864a4d5c15e0e
 SHA512:
-  metadata.gz: 7361a05b044e4d759728a91d86952f6273a8bfbfc72ff1ac9965f97cd858dd8ad3902cb4cb72f4e0557a291627a631a75d7f4ef0a04481969b8ac91bcd3eb48e
-  data.tar.gz: b7ef1815fe2b3e4ff42de13e34c8a663e58a55681aba9e38533c5175ab9a9b197755205175abfe2a013331150bb2f19d4949e41de4f9e3874ea6a4a3981172e2
+  metadata.gz: 00ab9a577c80b81d017ebbb35d3e8a746d1d78ddde05473dd87be5c6a5365a3d7ed83e3501cf0402e3b2919be7dff1fe59f1e12c2f309649b69e3fd99e19824d
+  data.tar.gz: fa4786c3f3bc343b6e242f5c8abfb6a438edae01df19b623b3d7b27fb610bc4c56f323071ea76890700b6493ede5df714a55f9b2ef619f1c37104832a59d75f8

data/lib/ruby-macrodroid.rb

@@ -110,14 +110,16 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
-  attr_accessor :deviceid, :remote_url
+  attr_accessor :deviceid, :remote_url, :picture_path
   
   # note: The deviceid can only be found from an existing Webhook trigger, 
   #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, deviceid: nil, remote_url: nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, remote_url: nil, 
+                 picture_path: '/storage/emulated/0/Pictures', debug: false)
 
     @deviceid, @remote_url, @debug = deviceid, remote_url, debug    
+    @picture_path = picture_path
     
     @geofences = {}
     
@@ -334,7 +336,8 @@ class MacroDroid
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                    remote_url: @remote_url, debug: @debug )
+                    remote_url: @remote_url, picture_path: @picture_path, 
+                    debug: @debug )
       m.import_h(macro)
       m
 
@@ -356,7 +359,8 @@ class MacroDroid
     @macros = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
       Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
-                remote_url: @remote_url, debug: @debug).import_xml(node)
+                remote_url: @remote_url, picture_path: @picture_path, 
+                debug: @debug).import_xml(node)
       
     end
 
@@ -380,7 +384,7 @@ class MacroDroid
     @macros = doc.root.xpath('macro').map do |node|
       puts 'node: ' + node.inspect if @debug    
       Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                debug: @debug).import_xml(node)
+                picture_path: @picture_path, debug: @debug).import_xml(node)
       
     end
   end

data/lib/ruby-macrodroid/actions.rb

@@ -33,7 +33,9 @@
 
 
 class Action < MacroObject
+  using ColouredText
   using Params
+  include ObjectX
   
   attr_reader :constraints  
 
@@ -141,25 +143,39 @@ end
 
 # Category: Applications
 #
+
+
 class OpenWebPageAction < ApplicationAction
+  using ColouredText
 
   def initialize(obj={}, macro=nil)
-    
-   # puts 'obj: ' + obj[0].xml.inspect
+
+    $debug = true    
+    puts ('obj: ' + obj.inspect).debug if $debug
     
     h = if obj.is_a? Hash then
     
-      obj
+      obj.merge({macro: macro})
       
     elsif obj.is_a? Array
       
-      puts 'obj: ' + obj.inspect if $debug
+      puts ('obj: ' + obj.inspect).debug if $debug
       e, macro = obj
       
       a = e.xpath('item/*')
 
       h2 = if a.any? then
-        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      
+        a.map do |node|
+          
+          if node.name == 'description' and node.text.to_s =~ /: / then
+            node.text.to_s.split(/: +/,2).map(&:strip)
+          else
+            [node.name.to_sym, node.text.to_s.strip]
+          end
+          
+        end.to_h
+        
       else
         txt = e.text('item/description')
         {url: (txt || e.text)}
@@ -169,7 +185,7 @@ class OpenWebPageAction < ApplicationAction
 
     end
 
-    puts 'h:' + h.inspect if $debug
+    puts ('h:' + h.inspect).debug if $debug
     
     #h[:url_to_open] = h[:url] if h[:url] and h[:url].length > 1
 
@@ -268,11 +284,64 @@ end
 #
 class TakePictureAction < CameraAction
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    
+    h = if obj.is_a? Hash then
+
+      macro = obj[:macro]    
+      obj.delete :macro
+      obj
+
+      
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      
+      puts 'e: ' + e.xml.inspect
+
+      a = e.xpath('item/*')
+      
+      if a.any? then
+        
+        h2 = a.map {|node| [node.name.to_sym, node.text.to_s.strip]}.to_h
+        
+        desc = ''
+        
+        if h2[:description] then
+
+          desc = h2[:description]
+          h2.delete :description
+          puts 'desc: ' + desc.inspect
+          
+          if desc.length > 1 then
+            
+            flash = case desc
+            when /Flash On/i
+              1
+            when /Flash Auto/i
+              2
+            else
+              0
+            end
+            
+
+          end          
+          
+        end
+        
+        {
+          use_front_camera: (desc =~ /Front Facing/ ? true : false),
+          flash_option: flash
+        }.merge(h2)          
+        
+      
+      end
+    end
+    
     options = {
-      new_path: '/storage/sdcard1/DCIM/Camera',
-      path: '/storage/sdcard1/DCIM/Camera',
+      new_path: macro.picture_path,
+      path: macro.picture_path,
       show_icon: true,
       use_front_camera: true,
       flash_option: 0
@@ -288,7 +357,22 @@ class TakePictureAction < CameraAction
   end
 
   def to_s(colour: false, indent: 0)
-    'Take Picture'
+    
+    flash = case @h[:flash_option]
+    when 0
+      ''
+    when 1
+      'Flash On'
+    when 2
+      'Flash Auto'
+    end
+    
+    @s = 'Take Picture'# + @h.inspect
+    a = [@h[:use_front_camera] ? 'Front Facing' : 'Rear Facing']
+    a << flash if flash.length > 0
+    @s += "\n" + a.join(', ')
+    super()
+    
   end  
 
 end
@@ -393,6 +477,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect if $debug
     
     if obj.is_a? Hash then
       
@@ -402,18 +487,23 @@ class IfConditionAction < Action
       super(h2)      
       
     elsif obj.is_a? Array
+      
       e, macro = obj
-      super() 
-      raw_txt = e.text('item/description') || e.text.to_s
+      super()
+      puts 'e.xml: ' + e.xml if $debug
+      puts 'e.text: ' + e.text.to_s.strip if $debug
+      raw_txt = e.text.to_s.strip[/^if [^$]+/i] || e.text('item/description')
       puts 'raw_txt: ' + raw_txt.inspect if $debug
       
-      clause = raw_txt[/^if (.*)/i,1]
+      clause = raw_txt[/^If (.*)/i,1]
+      puts 'clause: ' + clause.inspect if $debug
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      puts 'conditions: ' + conditions.inspect if $debug
       
       cp = ConstraintsNlp.new      
       
       @constraints = conditions.map do |c|
-        puts 'c: ' + c.inspect 
+        puts 'c: ' + c.inspect  if $debug
         r = cp.find_constraint c
         puts 'found constraint ' + r.inspect if $debug
         
@@ -421,7 +511,24 @@ class IfConditionAction < Action
         
       end         
       puts '@constraints: ' + @constraints.inspect if $debug
-      {}
+      
+      # find any nested actions
+      item = e.element('item')
+      
+      if item then
+        
+        ap = ActionsNlp.new
+        obj2 = action_to_object(ap, item, item, macro)      
+        puts 'obj2: ' + obj2.inspect if $debug
+        #macro.add obj2
+        
+      end
+      
+      h = {
+        constraint_list: @constraints.map(&:to_h)
+      }
+      super(h)        {}
+      
     else
       # get the constraints
 
@@ -450,21 +557,47 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end  
+  end 
+  
 end
 
 class ElseAction < Action
   
-  def initialize(h={})
+  def initialize(obj=[])
 
     options = {
-      constraint_list: ''
+      constraint_list: []
     }
+    
+    if obj.is_a? Hash then
+      
+      h = obj
 
-    super(options.merge h)
+      super(options.merge h)      
+      
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      
+      # find any nested actions
+      item = e.element('item')
+      
+      if item then
+        
+        ap = ActionsNlp.new
+        obj2 = action_to_object(ap, item, item, macro)      
+        puts 'obj2: ' + obj2.inspect if $debug
+        #macro.add obj2
+        
+      end
+      
+      super(options)
+    end
+    
     
 
-  end  
+
+  end    
   
   def to_s(colour: false, indent: 0)
     'Else'
@@ -644,6 +777,9 @@ class SetHotspotAction < ConnectivityAction
   
   def initialize(h={})
 
+    # to-do: check when *disable hotspot*, is the 
+    #        *enable wifi* option selected?
+    
     options = {
       device_name: "", state: 0, turn_wifi_on: true, use_legacy_mechanism: false, mechanism: 0
 
@@ -654,8 +790,15 @@ class SetHotspotAction < ConnectivityAction
   end
   
   def to_s(colour: false, indent: 0)
-    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
-    action + ' HotSpot'
+    
+    @s =  "%s HotSpot" % [@h[:state] == 0 ? 'Enable' : 'Disable']
+    
+    if @h[:state] == 1 then
+      @s += "\n" + (@h[:turn_wifi_on] ? 'Enable WiFi' : 'Don\'t Enable Wifi')
+    end
+    
+    super()
+    
   end
 end
 
@@ -1606,6 +1749,7 @@ end
 # MacroDroid Specific
 #
 class SetVariableAction < Action
+  using ColouredText
   
   def initialize(obj=nil)
     
@@ -1614,7 +1758,14 @@ class SetVariableAction < Action
     elsif obj.is_a? Array
       e, macro = obj
       node = e.element('item/*')
-      macro.set_var node.name, node.value.to_s
+      #puts ("node.name: %s node.value: %s" % [node.name, node.value]).debug
+      r = macro.set_var node.name, node.value.to_s
+      puts ('r: ' + r.inspect).debug if $debug
+      r
+      if r[:type] == 2 then
+        { variable: {name: r[:name], type: r[:type]}, new_string_value: r[:string_value]
+          }
+      end
     end    
     
     options = {
@@ -2334,8 +2485,31 @@ end
 # Category: Screen
 #
 class ScreenOnAction < ScreenAction
+  using ColouredText
 
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    debug = false
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+=begin      
+      puts 'obj: ' + obj.inspect if debug
+      e, macro = obj
+      puts ('e: ' + e.xml.inspect).debug if debug
+      a = e.xpath('item/*')
+
+      txt = e.text.to_s
+      puts ('txt: ' + txt.inspect).debug if debug
+      state = txt[/Screen (On|Off)/i,1]
+      
+      {screen_off: state.downcase == 'off'}
+=end      
+      {}
+    end    
 
     options = {
       pie_lock_screen: false,
@@ -2412,7 +2586,7 @@ class KeepAwakeAction < ScreenAction
       h2 = if txt then
       
         raw_duration = (txt || e.text).to_s
-        puts 'raw_duration: ' + raw_duration.inspect 
+        puts 'raw_duration: ' + raw_duration.inspect  if $debug
         duration = raw_duration[/Screen On - ([^$]+)/i]
         {duration: duration}
         
@@ -2424,7 +2598,7 @@ class KeepAwakeAction < ScreenAction
 
     end
     
-    puts ('h: ' + h.inspect).debug #if $debug
+    puts ('h: ' + h.inspect).debug if $debug
     
     if h[:duration] then
             

data/lib/ruby-macrodroid/base.rb

@@ -7,7 +7,104 @@
 #  MacroObject
 #  
 
+module ObjectX
+  
+  
+  def action_to_object(ap, e, item, macro)
+    
+    debug = false
+    
+    puts 'inside action_to_object: item.xml: ' + item.xml if debug
+        
+    if item.element('description') then
+      
+      item.xpath('description').map do |description|
+        
+        inner_lines = description.text.to_s.strip.lines
+        puts 'inner_lines: ' + inner_lines.inspect if debug
+        
+        action = if e.text.to_s.strip.empty? then
+          inner_lines.shift.strip
+        else
+          e.text.strip
+        end
+        
+        puts 'action: ' + action.inspect if debug
+        
+        r = ap.find_action action          
+        puts 'r: ' + r.inspect if debug
+        
+        if r[1].any? then
+          
+          macro.add r[0].new(r[1])
+          
+        else
+          
+          puts 'description: ' + description.xml.inspect if debug
+          #o = r[0].new([description, self]) if r
+          index = macro.actions.length
+          macro.add Action.new        
+          o = object_create(r[0],[description, macro]) if r
+          macro.actions[index] = o
+          puts 'after o' if debug
+          o
+          
+        end
+      end
+      
+    else
+      
+      action = e.text.strip
+      puts 'action: ' + action.inspect if $debug
+      r = ap.find_action action
+
+      a = e.xpath('item/*')
+
+      h = if a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      else
+        {}
+      end
+      puts 'h: ' + h.inspect if $debug
+
+      #r = ap.find_action action          
+      #r[0].new(h.merge(macro: self)) if r
+      o = object_create(r[0], h.merge(macro: macro)) if r
+      macro.add o
+      o
+      
+    end
+      
+  
+  end
 
+  def object_create(klass, *args)
+
+    begin
+      klass.new(*args)
+    rescue
+      raise MacroError, klass.to_s + ': ' + ($!).to_s
+    end
+  end
+  
+  def varify(label, value='')
+                        
+    type = VAR_TYPES[value.class.to_s.to_sym]
+
+    h = {
+      boolean_value: false,
+      decimal_value: 0.0,
+      int_value: 0,
+      name: label,
+      string_value: '',
+      type: type[0]
+    }
+    h[type[1]] = value
+    h
+    
+  end
+  
+end
 
 class MacroObject
   using ColouredText
@@ -97,11 +194,11 @@ class MacroObject
   private
   
   def hashify(h)
-    
+    puts 'h: ' + h.inspect
     h2 = h.inject({}) do |r,x|
-      puts 'x: ' + x.inspect if $debug
+      puts 'x: ' + x.inspect #if $debug
       key, value = x
-      puts 'key: ' + key.inspect if $debug
+      puts 'key: ' + key.inspect #if $debug
       new_key = key.to_s.gsub(/\w_\w/){|x| x[0] + x[-1].upcase}
       new_key = new_key.prepend 'm_' unless @list.include? new_key
       new_key = 'm_SIGUID' if new_key == 'm_siguid'

data/lib/ruby-macrodroid/constraints.rb

@@ -794,6 +794,24 @@ class MacroDroidVariableConstraint < Constraint
 
   def initialize(h={})
 
+    if h[:loperand] then
+      h[:variable] = {}
+      h[:variable][:name] = h[:loperand]
+      h[:variable][:type] = 2
+      
+      if h[:roperand] =~ /true|false/i then
+        
+        val = h[:roperand].downcase == 'true'
+        h[:boolean_value] = val
+        h[:variable][:type] = 0
+        h[:variable][:boolean_value] = val
+        h[:string_value] = h[:roperand].capitalize
+      else
+        h[:string_value] = h[:roperand]
+      end
+
+    end
+        
     options = {
       
       :enable_regex=>false, 
@@ -825,11 +843,24 @@ class MacroDroidVariableConstraint < Constraint
 
   def to_s(colour: false, indent: 0)
     
-      a = [:int_greater_than, :int_less_than, :int_not_equal, 
-                :string_equal].zip(['>','<','!=', '='])
-      operator = a.find {|label,_| @h[label]}.last
+    a = [:int_greater_than, :int_less_than, :int_not_equal, 
+              :string_equal].zip(['>','<','!=', '='])
+    operator = a.find {|label,_| @h[label]}.last
+    
+    var = @h[:variable]
+    
+    type = case var[:type]
+    when 0 # boolean
+      :boolean_value
+    when 1 # integer
+      :int_value
+    when 2 # string
+      :string_value
+    when 3 # decimal
+      :decimal_Value
+    end  
     
-    @s = "%s %s %s" % [@h[:variable][:name], operator, @h[:int_value]]
+    @s = "%s %s %s" % [@h[:variable][:name], operator, @h[type]]
     super()
   end
 
@@ -888,7 +919,7 @@ class TriggerThatInvokedConstraint < Constraint
   
   def initialize(h={})
 
-    puts ('h: ' + h.inspect).green
+    puts ('h: ' + h.inspect).green if $debug
     @trigger = h[:macro].triggers.find {|x| x.siguid == h[:si_guid_that_invoked] }
     
     options = {

data/lib/ruby-macrodroid/macro.rb

@@ -21,8 +21,11 @@ VAR_TYPES = {
   Float: [3, :decimal_value]
 }
 
+
+
 class TriggersNlp
   include AppRoutes
+  using ColouredText
 
   def initialize(macro=nil)
 
@@ -32,7 +35,46 @@ class TriggersNlp
 
   end
 
-  def triggers(params) 
+  def triggers(params)
+    
+    # -- Battery/Power ---------------------------------------------
+    
+    get /^Power Connected: (Wired \([^\)]+\))/i do |s|
+      
+      h = {
+        power_connected_options: [true, true, true],
+        has_set_usb_option: true,
+        power_connected: true
+      }
+        
+      a = ['Wired (Fast Charge)', 'Wireless', 'Wired (Slow Charge)']
+
+      puts ('s: ' + s.inspect).debug
+      
+      options = s.downcase.split(/ \+ /)
+      puts ('options: ' + options.inspect).debug
+      
+      h[:power_connected_options] = a.map {|x| options.include? x.downcase }
+      
+      [ExternalPowerTrigger, h]
+    end
+    
+    get /^Power Connected: Any/i do |s|
+      
+      h = {
+        power_connected_options: [true, true, true],
+        has_set_usb_option: true,
+        power_connected: true
+      }
+      
+      [ExternalPowerTrigger, h]
+    end   
+    
+    # -- Device Events ----------------------------------------------------
+  
+    get /^Screen[ _](On|Off)/i do |state|            
+      [ScreenOnOffTrigger, {screen_on: state.downcase == 'on'}]
+    end      
     
     # e.g. at 7:30pm daily
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
@@ -133,13 +175,25 @@ class ActionsNlp
   def initialize(macro=nil)
 
     super()
+
     params = {macro: macro}
     actions(params)
 
   end
 
   def actions(params) 
-
+    
+    # -- Connectivity ------------------------------------------------------
+    
+    get /^(Enable|Disable) HotSpot/i do |state|
+      enable, state = if state.downcase == 'enable' then
+        [true, 0]
+      else
+        [false, 1]
+      end
+      [SetHotspotAction, {turn_wifi_on: enable, state: state }]
+    end   
+    
     # e.g. message popup: hello world!
     get /^message popup: (.*)/i do |msg|
       [ToastAction, {msg: msg}]
@@ -196,6 +250,10 @@ class ActionsNlp
       [VibrateAction, {pattern: pattern}]
     end     
     
+    get /^Vibrate$/i do |pattern|
+      [VibrateAction, {pattern: 'short buzz'}]
+    end       
+    
     # e.g. Display Notification: Hi there: This is the body of the message
     get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
       [NotificationAction, {subject: subject, text: text}]
@@ -250,13 +308,13 @@ class ActionsNlp
     
     #
     get /^WebHook \(Url\)/i do
-      [OpenWebPageAction, params]
+      [OpenWebPageAction, {}]
     end
     
     # e.g. webhook entered_kitchen
     #
     get /^webhook$/i do
-      [OpenWebPageAction, params]
+      [OpenWebPageAction, {}, params[:macro]]
     end
     
     # -- Location ---------------------------------------------------------
@@ -266,7 +324,7 @@ class ActionsNlp
     end    
     
     get /^Share Location$/i do
-      [ShareLocationAction, params]
+      [ShareLocationAction, {}]
     end    
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -290,7 +348,7 @@ class ActionsNlp
     end
     
     get /Keep Device Awake$/i do
-      [KeepAwakeAction, params]
+      [KeepAwakeAction, {}]
     end    
     
     #a: Disable Keep Awake
@@ -305,6 +363,10 @@ class ActionsNlp
       [IfConditionAction, {}]
     end
     
+    get /else/i do
+      [ElseAction, {}]
+    end    
+    
     get /End If/i do
       [EndIfAction, {}]
     end          
@@ -314,6 +376,12 @@ class ActionsNlp
     get /^Set Variable$/i do
       [SetVariableAction, {}]
     end        
+    
+    # -- Screen ------------------------------------------------
+    #
+    get /^Screen (On|Off)$/i do |state|
+      [ScreenOnAction, {screen_off: state.downcase == 'off'}]
+    end       
 
   end
 
@@ -347,6 +415,20 @@ class ConstraintsNlp
     
     # 
     
+    # -- MacroDroid specific -----------------------------------------------------------------------
+    
+    get /^(\w+) (=) (\[?\w+\]?)/i do |loperand, operator, roperand|
+      
+      h = {
+        loperand: loperand, 
+        operator: operator, 
+        roperand: roperand
+      }
+      
+      [MacroDroidVariableConstraint, h]
+      
+    end
+    
     # -- Sensors -----------------------------------
     #
     get /^Light Sensor (Less|Greater) than (50.0)lx/i do |operator, val|
@@ -386,16 +468,17 @@ end
 class Macro
   using ColouredText
   using Params
+  include ObjectX
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
       :guid, :deviceid
-  attr_accessor :title, :description, :remote_url
+  attr_accessor :title, :description, :remote_url, :picture_path
 
-  def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, 
-                 debug: false)
+  def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, \
+                 picture_path: nil, debug: false)
 
     @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    @remote_url = remote_url
+    @remote_url, @picture_path = remote_url, picture_path
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -405,6 +488,8 @@ class Macro
   end
   
   def add(obj)
+    puts 'inside add; ' + obj.inspect if @debug
+    puts '@actions: ' + @actions.inspect if @debug
 
     if obj.kind_of? Trigger then
       
@@ -663,68 +748,25 @@ class Macro
       
       ap = ActionsNlp.new self    
       
-      @actions = node.xpath('action').flat_map do |e|
+      node.xpath('action').each do |e|
         
         puts 'action e: ' + e.xml.inspect if @debug
         puts 'e.text ' + e.text if @debug
         
         item = e.element('item')
+        
         if item then
           
-          if item.element('description') then
-            
-            item.xpath('description').map do |description|
-              
-              inner_lines = description.text.to_s.strip.lines
-              puts 'inner_lines: ' + inner_lines.inspect if @debug
-              
-              action = if e.text.to_s.strip.empty? then
-                inner_lines.shift.strip
-              else
-                e.text.strip
-              end
-              
-              puts 'action: ' + action.inspect if @debug
-              
-              r = ap.find_action action          
-              puts 'r: ' + r.inspect if @debug
-              puts 'description: ' + description.xml.inspect if @debug
-              #o = r[0].new([description, self]) if r
-              o = object_create(r[0],[description, self]) if r
-              puts 'after o' if @debug
-              o
-              
-            end
-            
-          else
-            
-            action = e.text.strip
-            puts 'action: ' + action.inspect if @debug
-            r = ap.find_action action
-
-            a = e.xpath('item/*')
-
-            h = if a.any? then
-              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
-            else
-              {}
-            end
-            puts 'h: ' + h.inspect if @debug
-
-            #r = ap.find_action action          
-            #r[0].new(h.merge(macro: self)) if r
-            object_create(r[0], h.merge(macro: self)) if r
-            
-          end
+          action_to_object(ap, e, item, self)
           
         else
           
           action = e.text.strip
           r = ap.find_action action          
           #r[0].new(r[1]) if r
-          object_create(r[0],r[1]) if r
+          self.add object_create(r[0],*r[1..-1]) if r
           
-        end
+        end  
 
       end      
                                
@@ -798,7 +840,10 @@ class Macro
     if not @local_variables.has_key? label.to_sym then
       @local_variables.merge!({label.to_sym => value}) 
     end
-
+    
+    if @debug then
+      puts ("before varify; label: %s value: %s" % [label, value]).debug
+    end
     varify(label, value)
   end
 
@@ -1012,31 +1057,7 @@ EOF
     
   end
   
-  def object_create(klass, *args)
 
-    begin
-      klass.new(*args)
-    rescue
-      raise MacroError, klass.to_s + ': ' + ($!).to_s
-    end
-  end
-  
-  def varify(label, value='')
-                        
 
-    type = VAR_TYPES[value.class.to_s.to_sym]
-
-    h = {
-      boolean_value: false,
-      decimal_value: 0.0,
-      int_value: 0,
-      name: label,
-      string_value: '',
-      type: type[0]
-    }
-    h[type[1]] = value
-    h
-    
-  end
 
 end

data/lib/ruby-macrodroid/triggers.rb

@@ -244,7 +244,7 @@ class ExternalPowerTrigger < Trigger
     
     return 'Power Disconnected' unless @h[:power_connected]
     
-    status = 'Power Connectd'
+    status = 'Power Connected'
     options = if @h[:power_connected_options].all? then
       'Any'
     else
@@ -1199,6 +1199,11 @@ class ScreenOnOffTrigger < DeviceEventsTrigger
 
   end
   
+  def match?(detail={}, model=nil)
+    #@h[:screen_on] == detail[:screen_on]
+    true
+  end  
+  
   def to_s(colour: false)
     'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw