ruby-macrodroid 0.9.5 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7aa07338b6ffd2e4edcad4e7a2b63dee60f71632cb5a29a7f54de51570136f9
-  data.tar.gz: 55009e156bce03bdfb487a46cb0085f3c7f0b5375949b602e3e76ce216148e15
+  metadata.gz: cfb8dbf1cb2f5796722de69e98afcb6d7058ba6faf743740a989589fd3d72fc5
+  data.tar.gz: 4b6ff72308bae85939e3eadf7776a3b56d2b8084103633dbb7754f496fb7c037
 SHA512:
-  metadata.gz: 710ed235030b9553dcd3ca9f7c79efc6a7608f46ad59e4c14b38a5a2725b81f2145e5bc13cbc7d1385718754115a1de1976896030185b497833b916897d1e57f
-  data.tar.gz: de58a516f728dc63dc0660eac45b137a03a1f447554e8e34a8ed61e06e0a578abc1dd1567ff83592677d416534efa5923649dce8af20c19ad991f21006447e77
+  metadata.gz: 722fc170955c3ee925821859e87c3380b5769db34081c8318ee043218e2bb36ae43e104d6c701238ef887405c30c8d05ab3cba32a040e6430392bc60dd6dbce1
+  data.tar.gz: 2343b75872d051e055d3dd6955dcf03c7c236ef5f77e1b43b5618515b8f0170728878336fe8a2aed5eac51ddce9361c751f3d9170418ee289d2e5522b18ff472

data/lib/ruby-macrodroid.rb

@@ -110,16 +110,19 @@ 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 = {}
+    @macros = []
     
     if obj then
       
@@ -143,34 +146,7 @@ class MacroDroid
         
         if s =~ /m(?:acro)?:\s/ then
           
-          puts 'before RowX.new' if @debug
-
-          s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
-              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
-              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
-          
-          a = s2.split(/(?=^macro:)/)
-          
-          raw_geofences = a.shift if a.first =~ /^geofence/
-          raw_macros = a.join
-          #raw_macros, raw_geofences .reverse
-          
-          puts 'raw_macros: ' + raw_macros.inspect if @debug
-          
-          if raw_geofences then
-            
-            geoxml = RowX.new(raw_geofences).to_xml
-            
-            geodoc = Rexle.new(geoxml)  
-            geofences = geodoc.root.xpath('item/geofence')        
-            @geofences = fetch_geofences(geofences) if geofences.any?          
-            
-          end
-          
-          xml = RowX.new(raw_macros, allow_lonely_keyfield: true).to_xml
-          puts 'xml: ' + xml if @debug
-          import_rowxml(xml)
+          import_txt(s)
           
         elsif s =~ /^# / 
           xml = pc_to_xml(s)
@@ -227,6 +203,10 @@ class MacroDroid
   def export(filepath)
     FileX.write filepath, to_json
   end
+  
+  def import(s)
+    import_txt(s)
+  end
 
   def to_json()
 
@@ -334,7 +314,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, 
+                    parent: self, debug: @debug )
       m.import_h(macro)
       m
 
@@ -353,14 +334,50 @@ class MacroDroid
     puts 'import_rowxml: @geofences: ' + @geofences.inspect if @debug
     geofences = @geofences
     
-    @macros = doc.root.xpath('item').map do |node|
+    a = 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, 
+                parent: self, debug: @debug).import_xml(node)
       
     end
+    
+    @macros.concat a
 
-  end  
+  end
+
+  def import_txt(s)
+    
+    puts 'before RowX.new' if @debug
+
+    s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
+        .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
+        .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+        .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+    
+    a = s2.split(/(?=^macro:)/)
+    
+    raw_geofences = a.shift if a.first =~ /^geofence/
+    raw_macros = a.join
+    #raw_macros, raw_geofences .reverse
+    
+    puts 'raw_macros: ' + raw_macros.inspect if @debug
+    
+    if raw_geofences then
+      
+      geoxml = RowX.new(raw_geofences).to_xml
+      
+      geodoc = Rexle.new(geoxml)  
+      geofences = geodoc.root.xpath('item/geofence')        
+      @geofences = fetch_geofences(geofences) if geofences.any?          
+      
+    end
+    
+    xml = RowX.new(raw_macros, allow_lonely_keyfield: true).to_xml
+    puts 'xml: ' + xml if @debug
+    import_rowxml(xml)
+    
+  end
   
   def import_xml(raws)
     
@@ -380,7 +397,8 @@ 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, parent: self, debug: @debug)\
+                .import_xml(node)
       
     end
   end

data/lib/ruby-macrodroid/actions.rb

@@ -143,19 +143,23 @@ end
 
 # Category: Applications
 #
+
+
 class OpenWebPageAction < ApplicationAction
+  using ColouredText
 
   def initialize(obj={}, macro=nil)
-    
-   # puts 'obj: ' + obj[0].xml.inspect
+
+    $debug = false    
+    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/*')
@@ -181,14 +185,14 @@ 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
 
     options = {
-      variable_to_save_response: {:string_value=>"", :name=>"coords", 
-      decimal_value: 0.0, isLocal: true, m_boolean_value: false, 
-      excludeFromLog: false, int_value: 0, type: 2},
+      #variable_to_save_response: {:string_value=>"", :name=>"coords", 
+      #decimal_value: 0.0, isLocal: true, m_boolean_value: false, 
+      #excludeFromLog: false, int_value: 0, type: 2},
       url_to_open: '',
       http_get: true,
       disable_url_encode: false,
@@ -280,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
@@ -300,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
@@ -397,10 +469,14 @@ end
 
 # Conditions/Loops
 #
-class IfConditionAction < Action
 
+class IfAction < Action
+  using ColouredText
+  
   def initialize(obj=nil)
-
+    
+    $debug = false
+    
     options = {
       a: true,
       constraint_list: []
@@ -420,10 +496,10 @@ class IfConditionAction < Action
       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')
+      raw_txt = e.text.to_s.strip[/^#{@label}[^$]+/i] || e.text('item/description')
       puts 'raw_txt: ' + raw_txt.inspect if $debug
       
-      clause = raw_txt[/^If (.*)/i,1]
+      clause = raw_txt[/^#{@label}(.*)/i,1]
       puts 'clause: ' + clause.inspect if $debug
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
       puts 'conditions: ' + conditions.inspect if $debug
@@ -442,6 +518,7 @@ class IfConditionAction < Action
       
       # find any nested actions
       item = e.element('item')
+      #puts  ('item: ' + item.xml.inspect).debug if $debug
       
       if item then
         
@@ -451,26 +528,24 @@ class IfConditionAction < Action
         #macro.add obj2
         
       end
-  
-      {}
+      
+      h = {
+        constraint_list: @constraints.map(&:to_h)
+      }
+      super(h)        {}
+      
     else
       # get the constraints
 
     end
     
-
-    
-
-    
-    @label = 'If '
-
   end
-
+  
   def to_s(colour: false, indent: 0)
     
     h = @h.clone    
     #h.delete :macro
-    @s = 'If '
+    @s = @label
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
         {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
@@ -481,22 +556,58 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end 
+  end   
+      
+end
+
+class IfConditionAction < IfAction
+
+  def initialize(obj=nil)
+
+    @label = 'If '
+    super(obj)
+    
+  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'
@@ -504,41 +615,15 @@ class ElseAction < Action
   
 end
 
-class ElseIfConditionAction < Action
+class ElseIfConditionAction < IfAction
   
-  def initialize(h={})
-
-    options = {
-      constraint_list: ''
-    }
-
-    super(options.merge h)
-    @label = 'Else If '
+  def initialize(obj=nil)
 
-  end  
-  
-  def to_s(colour: false, indent: 0)
-    
-    h = @h.clone    
-    h.delete :macro
-    @s = 'Else If '
-    operator = @h[:is_or_condition] ? 'OR' : 'AND'
-    constraints = @constraints.map \
-        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
+    @label = 'Else If '    
+    super(obj)
     
-    out = []
-    out << "; %s" % @h[:comment] if @h[:comment]
-    s = @s.lines.map {|x| ('  ' * indent) + x}.join
-    out << s + constraints
-    out.join("\n")
-    
-  end    
-  
-  def to_summary(colour: false)
-    'foo'
   end
-    
-
+  
 end
 
 
@@ -676,6 +761,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
 
@@ -686,8 +774,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
 
@@ -1611,6 +1706,49 @@ class ConfirmNextAction < Action
   
 end
 
+class DisableMacroAction < Action
+  
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      
+      # find the macro guid for the given name
+      name = e.text('item/description').to_s
+      found = macro.parent.macros.find {|macro| macro.title =~ /#{name}/ }
+      
+      if found then     
+        {macro_name: found.title, GUID: found.guid}
+      else
+        {macro_name: name}
+      end
+
+    end      
+    
+    # state: 0 = enable, 1 = disable, 2 = toggle
+    
+    options = {macro_name: "Change brightness", state: 1, GUID: nil}
+    super(options.merge h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    state = %w(Enable Disable Toggle)[@h[:state]]
+    @s = state + ' macro'# + @h.inspect
+    @s += "\n" + @h[:macro_name]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+end
+
 # MacroDroid Specific
 #
 class ExportMacrosAction < Action
@@ -1777,7 +1915,7 @@ class PauseAction < Action
     options = {
       delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
     }
-    super(h)
+    super(options.merge h)
     
   end  
   
@@ -2374,8 +2512,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,

data/lib/ruby-macrodroid/base.rb

@@ -9,9 +9,10 @@
 
 module ObjectX
   
+  
   def action_to_object(ap, e, item, macro)
     
-    debug = $debug
+    debug = false
     
     puts 'inside action_to_object: item.xml: ' + item.xml if debug
         
@@ -32,15 +33,25 @@ module ObjectX
         
         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
-        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
         
+        nested = description.element('item/description')
+        
+        if r[1].any? and not nested 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
@@ -185,11 +196,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

@@ -798,7 +798,18 @@ class MacroDroidVariableConstraint < Constraint
       h[:variable] = {}
       h[:variable][:name] = h[:loperand]
       h[:variable][:type] = 2
-      h[:string_value] = h[:roperand]
+      
+      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 = {

data/lib/ruby-macrodroid/macro.rb

@@ -25,6 +25,7 @@ VAR_TYPES = {
 
 class TriggersNlp
   include AppRoutes
+  using ColouredText
 
   def initialize(macro=nil)
 
@@ -34,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|
@@ -135,15 +175,49 @@ class ActionsNlp
   def initialize(macro=nil)
 
     super()
+
     params = {macro: macro}
     actions(params)
 
   end
 
-  def actions(params) 
-
+  def actions(params)
+    
+    # -- Conditions/Loops ---------------------------------------------
+    #
+    
+    get /else if (.*)/i do
+      [ElseIfConditionAction, {}]
+    end        
+    
+    #e.g a: if Airplane mode enabled
+    #
+    get /if (.*)/i do
+      [IfConditionAction, {}]
+    end    
+    
+    get /else/i do
+      [ElseAction, {}]
+    end    
+    
+    get /End If/i do
+      [EndIfAction, {}]
+    end          
+    
+    
+    # -- 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|
+    get /^(?:message popup|popup message): (.*)/i do |msg|
       [ToastAction, {msg: msg}]
     end
 
@@ -256,13 +330,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 ---------------------------------------------------------
@@ -272,7 +346,7 @@ class ActionsNlp
     end    
     
     get /^Share Location$/i do
-      [ShareLocationAction, params]
+      [ShareLocationAction, {}]
     end    
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -295,32 +369,39 @@ class ActionsNlp
       [KeepAwakeAction, h]
     end
     
-    get /Keep Device Awake$/i do
-      [KeepAwakeAction, params]
+    get /(?:Keep Device|stay) Awake$/i do
+      [KeepAwakeAction, {}]
     end    
     
     #a: Disable Keep Awake
     #
-    get /Disable Keep Awake/i do
+    get /Disable Keep Awake|stay awake off/i do
       [KeepAwakeAction, {enabled: false, screen_option: 0}]
     end    
 
-    #e.g a: if Airplane mode enabled
-    #
-    get /if (.*)/i do
-      [IfConditionAction, {}]
-    end
-    
-    get /End If/i do
-      [EndIfAction, {}]
-    end          
     
     # -- MacroDroid Specific ------------------------------------------------
     #
+    
+    get /^((?:En|Dis)able) Macro$/i do |rawstate|
+      state = %w(enable disable toggle).index(rawstate.downcase)
+      [DisableMacroAction, {state: state}]
+    end        
+    
     get /^Set Variable$/i do
       [SetVariableAction, {}]
     end        
 
+    get /^wait (\d+) seconds$/i do |seconds|
+      [PauseAction, {delay_in_seconds: seconds.to_i}]
+    end        
+    
+    # -- Screen ------------------------------------------------
+    #
+    get /^Screen (On|Off)$/i do |state|
+      [ScreenOnAction, {screen_off: state.downcase == 'off'}]
+    end       
+
   end
 
   alias find_action run_route
@@ -355,7 +436,7 @@ class ConstraintsNlp
     
     # -- MacroDroid specific -----------------------------------------------------------------------
     
-    get /^(\w+) (=) (\[?\w+\]?)/i do |loperand, operator, roperand|
+    get /^(\w+) (=) (.*)/i do |loperand, operator, roperand|
       
       h = {
         loperand: loperand, 
@@ -409,19 +490,20 @@ class Macro
   include ObjectX
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
-      :guid, :deviceid
-  attr_accessor :title, :description, :remote_url
+      :guid, :deviceid, :parent
+  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, parent: nil, debug: false)
 
     @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    @remote_url = remote_url
+    @remote_url, @picture_path, @parent = remote_url, picture_path, parent
     
     puts 'inside Macro#initialize' if @debug    
           
     @local_variables, @triggers, @actions, @constraints = {}, [], [], []
     @h = {}
+    @guid = generate_guid()
     
   end
   
@@ -463,7 +545,7 @@ class Macro
       m_description: '',
       m_name: title(),
       m_excludeLog: false,
-      m_GUID: guid(),
+      m_GUID: @guid,
       m_isOrCondition: false,
       m_enabled: true,
       m_descriptionOpen: false,
@@ -482,6 +564,7 @@ class Macro
       puts 'h:' + h.inspect
     end
     
+    @guid = h[:guid]
     @category = h[:category]
     @title = h[:name]
     @description = h[:description]
@@ -702,7 +785,7 @@ class Macro
           action = e.text.strip
           r = ap.find_action action          
           #r[0].new(r[1]) if r
-          self.add object_create(r[0],r[1]) if r
+          self.add object_create(r[0],*r[1..-1]) if r
           
         end  
 
@@ -970,8 +1053,8 @@ EOF
 
   private
   
-  def guid()
-    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
+  def generate_guid()
+    ('-' + rand(1..9).to_s + 18.times.map { rand 9 }.join).to_i
   end
 
   def object(h={})

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.5
+  version: 0.9.10
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw