ruby-macrodroid 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f4d8a484f60935d656a2ac7973ca917709201955fe55897ce27d2430cb8ec93
-  data.tar.gz: d886539a6623877a521969d869d8d4b5690191795ffa6710dc0df5149b123707
+  metadata.gz: b7aa07338b6ffd2e4edcad4e7a2b63dee60f71632cb5a29a7f54de51570136f9
+  data.tar.gz: 55009e156bce03bdfb487a46cb0085f3c7f0b5375949b602e3e76ce216148e15
 SHA512:
-  metadata.gz: 5d6251c0656a7ff30a252bc3ef38dcdd27da42ef278f34e07d4d03d07a2d11a7bab346e39330d76d17d69dd5f8d2d6091f89a81e691b1c47d7513013781e0524
-  data.tar.gz: bd12b85b6ef51759358f4c7e44e5671a1f69119d156ba25806eeb287e67da4f6cd50aca09940e6b4e5c0e3b9b96475be4dde49ce7f8a01694634e764e45fe343
+  metadata.gz: 710ed235030b9553dcd3ca9f7c79efc6a7608f46ad59e4c14b38a5a2725b81f2145e5bc13cbc7d1385718754115a1de1976896030185b497833b916897d1e57f
+  data.tar.gz: de58a516f728dc63dc0660eac45b137a03a1f447554e8e34a8ed61e06e0a578abc1dd1567ff83592677d416534efa5923649dce8af20c19ad991f21006447e77

data/lib/ruby-macrodroid.rb

@@ -38,281 +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(macro=nil)
-
-    super()
-    params = {macro: macro}
-    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 |s|
-      key = s =~ /^http/ ? :url_to_open : :identifier      
-      [OpenWebPageAction, {key => s}]
-    end
-    
-    #
-    get /^WebHook \(Url\)/i do
-      [OpenWebPageAction, params]
-    end
-    
-    # e.g. webhook entered_kitchen
-    #
-    get /^webhook$/i do
-      [OpenWebPageAction, params]
-    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
@@ -342,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
@@ -368,8 +101,6 @@ end
 
 
 
-
-
 class MacroDroidError < Exception
 end
 
@@ -415,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:)/)
           
@@ -436,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)
           
@@ -511,7 +243,7 @@ class MacroDroid
       },
       macro_list:  @macros.map(&:to_h)
     }
-    @h.merge(h).to_camel_case
+    @h.merge(h).to_camelcase
 
   end
   
@@ -847,6 +579,7 @@ class DroidSim
 
 end
 
+# PASTE_END
 
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'

data/lib/ruby-macrodroid/actions.rb

@@ -33,7 +33,9 @@
 
 
 class Action < MacroObject
+  using ColouredText
   using Params
+  include ObjectX
   
   attr_reader :constraints  
 
@@ -143,42 +145,98 @@ end
 #
 class OpenWebPageAction < ApplicationAction
 
-  def initialize(obj={})
+  def initialize(obj={}, macro=nil)
+    
+   # puts 'obj: ' + obj[0].xml.inspect
     
     h = if obj.is_a? Hash then
+    
       obj
+      
     elsif obj.is_a? Array
+      
+      puts 'obj: ' + obj.inspect if $debug
       e, macro = obj
-      txt = e.text('item/description')
-      {url: (txt || e.text)}
-    end    
+      
+      a = e.xpath('item/*')
+
+      h2 = if a.any? then
+      
+        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)}
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+
+    puts 'h:' + h.inspect if $debug
     
-    h[:url_to_open] = h[:url] if h[:url]
+    #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
     }
     
-    if h[:macro].remote_url.nil? then
+    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
     
-    if (h[:identifier].nil? or h[:identifier].empty?) and 
-        (h[:url_to_open].nil? or h[:url_to_open].empty?) then
+    url = if h[:url] and h[:url].length > 1 then
+    
+      h[:url]      
+
+    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(/ +/,'-')
+          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()
@@ -347,6 +405,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect if $debug
     
     if obj.is_a? Hash then
       
@@ -355,18 +414,24 @@ 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
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      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
         
@@ -374,6 +439,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 if $debug
+        #macro.add obj2
+        
+      end
+  
       {}
     else
       # get the constraints
@@ -391,7 +469,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 \
@@ -403,7 +481,8 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end  
+  end 
+  
 end
 
 class ElseAction < Action
@@ -471,6 +550,8 @@ class EndIfAction < Action
       obj
     elsif obj.is_a? Rexle::Element    
       {}
+    else
+      {}
     end
     
   
@@ -478,7 +559,7 @@ class EndIfAction < Action
       constraint_list: []
     }
 
-    super(options.merge h)
+    super()
 
   end  
   
@@ -723,9 +804,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()
@@ -814,10 +896,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,
@@ -831,8 +921,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
@@ -984,6 +1079,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]]
@@ -1000,7 +1098,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
     }
@@ -1288,7 +1396,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
@@ -1309,26 +1417,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
 
@@ -1522,8 +1638,24 @@ end
 # MacroDroid Specific
 #
 class SetVariableAction < Action
+  using ColouredText
   
-  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/*')
+      #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 = {
       :user_prompt=>true, 
@@ -1531,9 +1663,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  
   
@@ -2287,8 +2431,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  if $debug
+        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,