ruby-macrodroid 0.8.12 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ba502f49880d0b2036510866095ff532a03311c4b503099305b943ed5dd77f
-  data.tar.gz: c604614f382e0bdf812ca7426fc74cd5339e16b821e272b3d31c85663a5f34fe
+  metadata.gz: 341332647c11b1d70151aab4625ffefced825585c4814eed7d7aefaf7c96703e
+  data.tar.gz: ac8f26a27b1f9d394174f1d887e8af27a6c551dc55d4cffa89b8fb04f6b1927d
 SHA512:
-  metadata.gz: c36b8205504f1e76b467fe13e3e752213a0bff61e1312f507ce30ecc79904070e3004e5f82efb3e3dae9e0c22edfe5e5c7f19c421d87119ede851ab103f5d64e
-  data.tar.gz: ab08df04436246ea37ade91f8a3509749923c1e017fb33163b591cc72f78410f3a4dcf78715669217897032362ed0a17935d4eb8858133d766a2bb712465232e
+  metadata.gz: debe33514bbcd6cbc508c6d6a3d647cd37861bc61168743ed15cb1f1d7cf142cd883fb6059b2b7ad901659314f1dadee8f7610dbc03074f79fc3b95c8abc2f27
+  data.tar.gz: 50e36ff27c737d50b0686610398feae034f21a4cfab3a15b0c6367e278305a5bdc4ed6f699c0a220f0794dcf89cd3a2ec5ae0bdaf25f0d18aa49309206c03659

data/lib/ruby-macrodroid.rb

@@ -38,269 +38,14 @@ require 'rxfhelper'
 require 'chronic_cron'
 
 
+# PASTE_START
+
 MODEL =<<EOF
 device
   connectivity
     airplane_mode is disabled
 EOF
 
-class TriggersNlp
-  include AppRoutes
-
-  def initialize(macro=nil)
-
-    super()
-    params = {macro: macro}
-    triggers(params)
-
-  end
-
-  def triggers(params) 
-    
-    # e.g. at 7:30pm daily
-    get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
-      [TimerTrigger, {time: time, 
-                      days: %w(Mon Tue Wed Thu Fri Sat Sun).join(', ')}]
-    end       
-
-    get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
-      [TimerTrigger, {time: time, days: days}]
-    end
-
-    # time.is? 'at 18:30pm on Mon or Tue'
-    get /^time.is\? ['"](?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)['"]/i do |time, days|      
-      [TimerTrigger, {time: time, days: days.gsub(' or ',', ')}]
-    end     
-    
-    get /^shake[ _]device\??$/i do 
-      [ShakeDeviceTrigger, {}]
-    end
-    
-    get /^Flip Device (.*)$/i do |motion|
-       facedown = motion =~ /Face Up (?:->|to) Face Down/i
-      [FlipDeviceTrigger, {face_down: facedown }]
-    end
-    
-    get /^flip_device_down\?$/i do
-      [FlipDeviceTrigger, {face_down: true }]
-    end
-
-    get /^flip_device_up\?$/i do
-      [FlipDeviceTrigger, {face_down: false }]
-    end        
-    
-    get /^Failed Login Attempt$/i do
-      [FailedLoginTrigger, {}]
-    end
-    
-    get /^failed_login?$/i do
-      [FailedLoginTrigger, {}]
-    end         
-
-    get /^Geofence (Entry|Exit) \(([^\)]+)/i do |direction, name|
-      enter_area = direction.downcase.to_sym == :entry
-      [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end     
-    
-    get /^location (entered|exited) \(([^\)]+)/i do |direction, name|
-      enter_area = direction.downcase.to_sym == :entered
-      [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end
-    
-    # eg. Proximity Sensor (Near)
-    #
-    get /^Proximity Sensor \(([^\)]+)\)/i do |distance|
-      
-      [ProximityTrigger, {distance: distance}]
-    end    
-    
-    get /^WebHook \(Url\)/i do       
-      [WebHookTrigger, params]
-    end      
-
-    get /^WebHook/i do       
-      [WebHookTrigger, params]
-    end
-    
-    get /^wh/i do       
-      [WebHookTrigger, params]
-    end          
-    
-    
-  end
-
-  alias find_trigger run_route
-
-  def to_s(colour: false)
-    'TriggersNlp ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
-
-class ActionsNlp
-  include AppRoutes
-
-  def initialize()
-
-    super()
-    params = {}
-    actions(params)
-
-  end
-
-  def actions(params) 
-
-    # e.g. message popup: hello world!
-    get /^message popup: (.*)/i do |msg|
-      [ToastAction, {msg: msg}]
-    end
-
-    # e.g. Popup Message 'hello world!'
-    get /^Popup[ _]Message ['"]([^'"]+)/i do |msg|
-      [ToastAction, {msg: msg}]
-    end
-    
-    # e.g. Popup Message\n  hello world!
-    get /^Popup Message\n\s+(.*)/im do |msg|
-      [ToastAction, {msg: msg}]
-    end    
-            
-    # e.g. Popup Message
-    get /^Popup Message$/i do
-      [ToastAction, {}]
-    end    
-    
-    # e.g. say current time
-    get /^say current[ _]time/i do
-      [SayTimeAction, {}]
-    end    
-    
-    get /^Torch :?(.*)/i do |onoffstate|
-      state = %w(on off toggle).index onoffstate.downcase
-      [CameraFlashLightAction, {state: state}]
-    end    
-    
-    get /^Take Picture/i do
-      [TakePictureAction, {}]
-    end
-    
-    get /^take_picture/i do
-      [TakePictureAction, {}]
-    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}]
-    end           
-    
-    
-    # e.g. Enable Wifi
-    get /^(Enable|Disable) Wifi$/i do |raw_state|
-      
-      state = raw_state.downcase.to_sym == :enable ? 0 : 1
-      [SetWifiAction, {state: state}]
-      
-    end    
-    
-    # e.g. Play: Altair
-    get /^Play: (.*)$/i do |name|
-
-      [PlaySoundAction, {file_path: name}]
-      
-    end     
-    
-    # e.g. Launch Settings
-    get /^Launch (.*)$/i do |application|
-
-      h = {
-        application_name: application,
-        package_to_launch: 'com.android.' + application.downcase
-      }
-      [LaunchActivityAction, h]
-      
-    end
-    
-    # e.g. HTTP GET http://someurl.com/something
-    get /^HTTP GET ([^$]+)$/i do |url|
-
-      [OpenWebPageAction, url_to_open: url]
-      
-    end
-    
-    # e.g. webhook entered_kitchen
-    #
-    get /webhook|HTTP GET/i do
-      [OpenWebPageAction, {}]
-    end
-    
-    #a: Keep Device Awake Screen On Until Disabled
-    #
-    get /Keep Device Awake Screen On Until Disabled/i do
-      [KeepAwakeAction, {enabled: true, permanent: true, screen_option: 0}]
-    end
-    
-    
-    #a: Keep Device Awake Screen On 1h 1m 1s
-    #
-    get /Keep Device Awake Screen On ([^$]+)/i do |duration|
-      
-      a = duration.split.map(&:to_i)
-      secs = Subunit.new(units={minutes:60, hours:60, seconds: 60}, a).to_i
-      
-      h = {
-        permanent: true, screen_option: 0, seconds_to_stay_awake_for: secs
-      }
-      [KeepAwakeAction, h]
-    end
-    
-    #a: Disable Keep Awake
-    #
-    get /Disable Keep Awake/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          
-
-  end
-
-  alias find_action run_route
-
-
-end
-
-class ConstraintsNlp
-  include AppRoutes
-
-  def initialize()
-
-    super()
-    params = {}
-    constraints(params)
-
-  end
-
-  def constraints(params) 
-
-    get /^airplane mode (.*)/i do |state|
-      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/i) == 0}]
-    end
-
-  end
-
-  alias find_constraint run_route
-
-end
-
-
 module Params
 
   refine Hash do
@@ -330,16 +75,16 @@ module Params
     end
 
     # turns keys from snake_case to CamelCase
-    def to_camel_case(h=self)
+    def to_camelcase(h=self)
       
       h.inject({}) do |r,x|
                 
         key, value = x   
         
         val = if value.is_a?(Hash) then
-          to_camel_case(value)
+          to_camelcase(value)
         elsif value.is_a?(Array) and value.first.is_a? Hash
-          value.map {|row| to_camel_case(row)}
+          value.map {|row| to_camelcase(row)}
         else
           value          
         end
@@ -356,8 +101,6 @@ end
 
 
 
-
-
 class MacroDroidError < Exception
 end
 
@@ -367,14 +110,14 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
-  attr_accessor :deviceid
+  attr_accessor :deviceid, :remote_url
   
   # note: The deviceid can only be found from an existing Webhook trigger, 
   #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, deviceid: nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, remote_url: nil, debug: false)
 
-    @deviceid, @debug = deviceid, debug    
+    @deviceid, @remote_url, @debug = deviceid, remote_url, debug    
     
     @geofences = {}
     
@@ -403,8 +146,9 @@ class MacroDroid
           puts 'before RowX.new' if @debug
 
           s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^v:/,'variable:').gsub(/^t:/,'trigger:')\
-              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+              .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
+              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
           
           a = s2.split(/(?=^macro:)/)
           
@@ -424,7 +168,7 @@ class MacroDroid
             
           end
           
-          xml = RowX.new(raw_macros).to_xml
+          xml = RowX.new(raw_macros, allow_lonely_keyfield: true).to_xml
           puts 'xml: ' + xml if @debug
           import_rowxml(xml)
           
@@ -499,7 +243,7 @@ class MacroDroid
       },
       macro_list:  @macros.map(&:to_h)
     }
-    @h.merge(h).to_camel_case
+    @h.merge(h).to_camelcase
 
   end
   
@@ -590,7 +334,7 @@ class MacroDroid
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                    debug: @debug )
+                    remote_url: @remote_url, debug: @debug )
       m.import_h(macro)
       m
 
@@ -612,7 +356,7 @@ 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, 
-                debug: @debug).import_xml(node)
+                remote_url: @remote_url, debug: @debug).import_xml(node)
       
     end
 
@@ -835,65 +579,7 @@ class DroidSim
 
 end
 
-RD_MACROS =<<EOF
-m: Torch
-t: webhook
-a: Torch toggle
-EOF
-
-module RemoteDroid
-
-  class Service
-    def initialize(callback)
-      @callback = callback
-    end
-  end
-  
-  class Bluetooth
-    def enable()
-    end
-  end
-  
-  class Torch < Service
-        
-    def toggle()
-      @callback.call :torch      
-    end
-    
-  end
-
-  class Control        
-    
-    def initialize(deviceid: nil)
-      @deviceid = deviceid
-      @torch = Torch.new(self)
-    end
-    
-    def bluetooth()
-      @bluetooth
-    end
-    
-    def call(command)
-      url = "https://trigger.macrodroid.com/%s/%s" % [@deviceid, command]
-      puts 'url: ' + url.inspect
-      s = open(url).read      
-    end
-    
-    def torch()
-      @torch
-    end
-
-    def write(s)
-      
-      MacroDroid.new(RD_MACROS, deviceid: @deviceid).export s
-      
-    end
-    
-    alias export write
-    
-  end
-
-end
+# PASTE_END
 
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'

data/lib/ruby-macrodroid/actions.rb

@@ -34,6 +34,7 @@
 
 class Action < MacroObject
   using Params
+  include ObjectX
   
   attr_reader :constraints  
 
@@ -49,8 +50,8 @@ class Action < MacroObject
     
   end
   
-  def invoke(s='')    
-    "%s/%s: %s" % [@group, @type, s]
+  def invoke(h={})    
+    "%s/%s: %s" % [@group, @type, h.to_json]
   end  
   
   
@@ -136,26 +137,95 @@ class LaunchShortcutAction < ApplicationAction
 
 end
 
+class OpenWebPageActionError < Exception
+end
+
 # Category: Applications
 #
 class OpenWebPageAction < ApplicationAction
 
-  def initialize(h={})
+  def initialize(obj={}, macro=nil)
+    
+   # puts 'obj: ' + obj[0].xml.inspect
     
-    h[:url_to_open] = h[:url] if h[:url]
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      puts 'obj: ' + obj.inspect 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
+      else
+        txt = e.text('item/description')
+        {url: (txt || e.text)}
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+
+    puts 'h:' + h.inspect if $debug
+    
+    #h[:url_to_open] = h[:url] if h[:url] and h[:url].length > 1
 
     options = {
-      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_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,
       block_next_action: false
     }
+    
+    return super(options.merge h) if h[:url_to_open]
+    
+    if h[:macro].remote_url.nil? and (h[:url].nil? or h[:url].empty?) then
+      raise OpenWebPageActionError, 'remote_url not found'
+    end
+    
+    url = if h[:url] and h[:url].length > 1 then
+    
+      h[:url]      
 
-    super(options.merge filter(options,h))
+    elsif h2 and h[:macro].remote_url and h[:identifier]
+      
+      "%s/%s" % [h[:macro].remote_url.sub(/\/$/,''), h[:identifier]]
+      
+    elsif (h[:identifier].nil? or h[:identifier].empty?)         
+      
+      h[:url_to_open] = h[:macro].remote_url.sub(/\/$/,'') + '/' + 
+          h[:macro].title.downcase.gsub(/ +/,'-')            
+      
+    end        
+    
+    if h2 then
+      
+      h2.delete :identifier
+      h2.delete :url
+      
+      if h2.any? then
+        url += '?' + \
+            URI.escape(h2.map {|key,value| "%s=%s" % [key, value]}.join('&'))
+      end
+      
+    end
+    
+    h[:url_to_open] = url    
+    super(options.merge h)
 
   end
   
+  def invoke()
+    super(url: @h[:url_to_open])
+  end
+  
   def to_s(colour: false, indent: 0)
     @s = "HTTP GET\nurl: " + @h[:url_to_open]
     super()
@@ -324,6 +394,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect #if $debug
     
     if obj.is_a? Hash then
       
@@ -332,13 +403,19 @@ class IfConditionAction < Action
       h2 = options.merge(filter(options,h).merge(macro: macro))
       super(h2)      
       
-    elsif obj.is_a? Rexle::Element
-      super() 
-      raw_txt = obj.text('item/description') || obj.text.to_s
-      puts 'raw_txt: ' + raw_txt.inspect if $debug
+    elsif obj.is_a? Array
       
-      clause = raw_txt[/^if (.*)/i,1]
+      e, macro = obj
+      super()
+      puts 'e.xml: ' + e.xml
+      puts 'e.text: ' + e.text.to_s.strip
+      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]
+      puts 'clause: ' + clause.inspect
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      puts 'conditions: ' + conditions.inspect
       
       cp = ConstraintsNlp.new      
       
@@ -351,6 +428,19 @@ 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
+        #macro.add obj2
+        
+      end
+  
       {}
     else
       # get the constraints
@@ -368,7 +458,7 @@ class IfConditionAction < Action
   def to_s(colour: false, indent: 0)
     
     h = @h.clone    
-    h.delete :macro
+    #h.delete :macro
     @s = 'If '
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
@@ -380,7 +470,8 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end  
+  end 
+  
 end
 
 class ElseAction < Action
@@ -448,6 +539,8 @@ class EndIfAction < Action
       obj
     elsif obj.is_a? Rexle::Element    
       {}
+    else
+      {}
     end
     
   
@@ -455,7 +548,7 @@ class EndIfAction < Action
       constraint_list: []
     }
 
-    super(options.merge h)
+    super()
 
   end  
   
@@ -700,9 +793,10 @@ class SayTimeAction < DateTimeAction
   end
   
   def invoke()
-    time = ($env and $env[:time]) ? $env[:time] : Time.now
+    #time = ($env and $env[:time]) ? $env[:time] : Time.now
+    time = Time.now
     tformat = @h['12_hour'] ? "%-I:%M%P" : "%H:%M"
-    super(time.strftime(tformat))
+    super(txt: time.strftime(tformat))
   end
   
   def to_pc()
@@ -791,10 +885,18 @@ end
 #
 class SpeakTextAction < DeviceAction
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {text: (txt || e.text)}
+    end     
+  
     options = {
-      text_to_say: '',
+      text_to_say: h[:text] || '',
       queue: false,
       read_numbers_individually: false,
       specify_audio_stream: false,
@@ -808,8 +910,13 @@ class SpeakTextAction < DeviceAction
 
   end
   
+  def invoke()
+    super(text: @h[:text_to_say])
+  end  
+  
   def to_s(colour: false, indent: 0)
-    "Speak Text (%s)" % @h[:text_to_say]
+    @s = "Speak Text (%s)" % @h[:text_to_say]
+    super()
   end
 
 end
@@ -961,6 +1068,9 @@ class CameraFlashLightAction < DeviceSettingsAction
     super(options.merge h)
 
   end
+  def invoke()
+    super(state: @h[:state])
+  end
 
   def to_pc()
     ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]
@@ -977,7 +1087,17 @@ end
 class VibrateAction < DeviceSettingsAction
 
   def initialize(h={})
-
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]    
+    
+    if h[:pattern] then
+      h[:vibrate_pattern] = pattern.map(&:downcase).index h[:pattern]
+    end
+    
     options = {
       vibrate_pattern: 1
     }
@@ -1265,7 +1385,7 @@ class ForceLocationUpdateAction < LocationAction
   end
 
   def to_s(colour: false, indent: 0)
-    'ForceLocationUpdateAction ' + @h.inspect
+    'Force Location Update' #+ @h.inspect
   end
 
   alias to_summary to_s
@@ -1286,26 +1406,34 @@ end
 #
 class ShareLocationAction < LocationAction
 
-  def initialize(h={})
+  def initialize(obj=nil)
     
-    super()
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      {variable: macro.set_var(e.text('item/description').to_s)}
+
+    end      
+    
+    #super()
 
     options = {
       email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", 
-                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
-                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable: {:string_value=>"", :name=>"", 
+                 :decimal_value=>0.0, :is_local=>true, :boolean_value=>false, 
+                 :exclude_from_log=>false, :int_value=>0, :type=>2},
       sim_id: 0,
       output_channel: 5,
       old_variable_format: true
     }
-
+    #options[:variable].merge! h
     super(options.merge h)
 
   end
 
   def to_s(colour: false, indent: 0)
-    @s = 'Share Location' + "\nGPS" # + @h.inspect
+    @s = 'Share Location' + "\n" + @h[:variable][:name] # + @h.inspect
     super()
   end
 
@@ -1500,7 +1628,15 @@ end
 #
 class SetVariableAction < Action
   
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      node = e.element('item/*')
+      macro.set_var node.name, node.value.to_s
+    end    
     
     options = {
       :user_prompt=>true, 
@@ -1508,9 +1644,21 @@ class SetVariableAction < Action
       :user_prompt_show_cancel=>true, 
       :user_prompt_stop_after_cancel=>true, 
       :user_prompt_title=>"Word reverse",
-      :name => 'word'
+      :name => 'word',
+      :false_label=>"False", :int_expression=>false, :int_random=>false, 
+      :int_random_max=>0, :int_random_min=>0, :int_value_decrement=>false, 
+      :int_value_increment=>false, :new_boolean_value=>false, 
+      :new_double_value=>0.0, :new_int_value=>0, 
+      :new_string_value=>"[battery]", :true_label=>"True", 
+      :user_prompt=>false, :user_prompt_show_cancel=>true, 
+      :user_prompt_stop_after_cancel=>true, 
+      :variable=>{
+                  :exclude_from_log=>false, :is_local=>true, 
+                  :boolean_value=>false, :decimal_value=>0.0, 
+                  :int_value=>0, :name=>"foo", :string_value=>"52", :type=>2
+      }
     }
-    super(h)
+    super(options.merge h)
     
   end  
   
@@ -1971,11 +2119,10 @@ class ToastAction < NotificationsAction
     
     h = if obj.is_a? Hash then
       obj
-    elsif obj.is_a? Rexle::Element
-      txt = obj.text('item/description')
-      {msg: (txt || obj.text)}
-    else
-      {msg: obj}
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {msg: (txt || e.text)}
     end
 
     if h[:msg] then
@@ -1999,7 +2146,7 @@ class ToastAction < NotificationsAction
   end
   
   def invoke()
-    super(@h[:message_text])
+    super(msg: @h[:message_text])
   end
   
   def to_pc()
@@ -2265,8 +2412,46 @@ end
 #   disable keep awake    => enabled: false
 #
 class KeepAwakeAction < ScreenAction
+  using ColouredText
 
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      puts 'obj: ' + obj.inspect if $debug
+      e, macro = obj
+      
+      a = e.xpath('item/*')
+
+      txt = e.text('item/description')      
+      
+      h2 = if txt then
+      
+        raw_duration = (txt || e.text).to_s
+        puts 'raw_duration: ' + raw_duration.inspect 
+        duration = raw_duration[/Screen On - ([^$]+)/i]
+        {duration: duration}
+        
+      elsif a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+    
+    puts ('h: ' + h.inspect).debug #if $debug
+    
+    if h[:duration] then
+            
+      h[:seconds_to_stay_awake_for] =  Subunit.hms_to_seconds(h[:duration])
+      
+    end
 
     options = {
       enabled: true,