ruby-macrodroid 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e8014bb2ccd71ffd2da90197a1dd1a89c7e8e6bbbfc7ed88e9cfbff07925a1
-  data.tar.gz: f2d4910bb6893249e33eb7c4326ea733188ecef67ec94f808cd25ef6c97760d0
+  metadata.gz: 652f6174d50060ca2b7e3197c2bc79062ed6af498b1982ef8c73e27b0422ad85
+  data.tar.gz: 86096eb1c1fef612666065e0e3d48c619b4768d801723b6beaa273687d643fec
 SHA512:
-  metadata.gz: 06015fe764a0450838ad49b6dbebba46afc32ec49673dbf4e1bce9b07e04aaea1850153cf2c0b1d56e740dd2cbcf4653f92878ee99680d7c3f2eaacf1fffb69e
-  data.tar.gz: df0c2950bcae690d137b294825c95579f8530fea24cabfe371809efff64343d4e9ffd71b5f2378c7938bc214dfc0e409892947ad03a86ef4438816fafa11000a
+  metadata.gz: f9705342b8176dc48a5bfca362a17e340bfd56f67d2eafa3b20602fa493d02cbf5a9cbfe13b2dfb02565a74bb02bf01477de6884151a659fab4500c4b2cbfea4
+  data.tar.gz: 6e7bae11b8cf64ff3b0efd4f852f6bb8c2e419aa8d25693aeb894dde64c063c2dbcf9abe9bddf5dbe87cb630d8fa6e6c183d105b6b71fedee804918a79467489

data/lib/ruby-macrodroid.rb

@@ -38,6 +38,8 @@ require 'rxfhelper'
 require 'chronic_cron'
 
 
+# PASTE_START
+
 MODEL =<<EOF
 device
   connectivity
@@ -73,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
@@ -144,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:)/)
           
@@ -165,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)
           
@@ -240,7 +243,7 @@ class MacroDroid
       },
       macro_list:  @macros.map(&:to_h)
     }
-    @h.merge(h).to_camel_case
+    @h.merge(h).to_camelcase
 
   end
   
@@ -576,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  
 
@@ -141,22 +143,39 @@ end
 
 # Category: Applications
 #
+
+
 class OpenWebPageAction < ApplicationAction
+  using ColouredText
 
   def initialize(obj={}, macro=nil)
+
+    $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)}
@@ -166,41 +185,54 @@ 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
+    #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? and (h[:url_to_open].nil? or 
-                                      h[:url_to_open].empty?) 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(/ +/,'-')            
       
-    elsif h2 and h[:macro].remote_url and h[:identifier]
+    end        
+    
+    if h2 then
       
-      url = "%s/%s" % [h[:macro].remote_url.sub(/\/$/,''), h[:identifier]]
       h2.delete :identifier
-      url += '?' + \
-            URI.escape(h2.map {|key,value| "%s=%s" % [key, value]}.join('&'))      
-      h[:url_to_open] = url
+      h2.delete :url
       
-    end        
+      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
@@ -377,6 +409,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
+    puts 'obj: ' + obj.inspect if $debug
     
     if obj.is_a? Hash then
       
@@ -386,18 +419,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
         
@@ -405,7 +443,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
 
@@ -434,21 +489,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'
@@ -1050,7 +1131,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
     }
@@ -1338,7 +1429,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
@@ -1359,26 +1450,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
 
@@ -1572,8 +1671,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, 
@@ -1581,9 +1696,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  
   
@@ -2280,8 +2407,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,
@@ -2337,8 +2487,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,