ruby-macrodroid 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7aa07338b6ffd2e4edcad4e7a2b63dee60f71632cb5a29a7f54de51570136f9
-  data.tar.gz: 55009e156bce03bdfb487a46cb0085f3c7f0b5375949b602e3e76ce216148e15
+  metadata.gz: 652f6174d50060ca2b7e3197c2bc79062ed6af498b1982ef8c73e27b0422ad85
+  data.tar.gz: 86096eb1c1fef612666065e0e3d48c619b4768d801723b6beaa273687d643fec
 SHA512:
-  metadata.gz: 710ed235030b9553dcd3ca9f7c79efc6a7608f46ad59e4c14b38a5a2725b81f2145e5bc13cbc7d1385718754115a1de1976896030185b497833b916897d1e57f
-  data.tar.gz: de58a516f728dc63dc0660eac45b137a03a1f447554e8e34a8ed61e06e0a578abc1dd1567ff83592677d416534efa5923649dce8af20c19ad991f21006447e77
+  metadata.gz: f9705342b8176dc48a5bfca362a17e340bfd56f67d2eafa3b20602fa493d02cbf5a9cbfe13b2dfb02565a74bb02bf01477de6884151a659fab4500c4b2cbfea4
+  data.tar.gz: 6e7bae11b8cf64ff3b0efd4f852f6bb8c2e419aa8d25693aeb894dde64c063c2dbcf9abe9bddf5dbe87cb630d8fa6e6c183d105b6b71fedee804918a79467489

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 = 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/*')
@@ -181,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
 
@@ -451,8 +455,12 @@ class IfConditionAction < Action
         #macro.add obj2
         
       end
-  
-      {}
+      
+      h = {
+        constraint_list: @constraints.map(&:to_h)
+      }
+      super(h)        {}
+      
     else
       # get the constraints
 
@@ -487,16 +495,41 @@ 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'
@@ -2374,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,

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,23 @@ 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
         
+        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
@@ -185,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

@@ -798,7 +798,10 @@ class MacroDroidVariableConstraint < Constraint
       h[:variable] = {}
       h[:variable][:name] = h[:loperand]
       h[:variable][:type] = 2
-      h[:string_value] = h[:roperand]
+      
+      val = h[:roperand] =~ /true|false/ ? h[:roperand].capitalize \
+          : h[:roperand]
+      h[:string_value] = val
     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,8 +35,40 @@ 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    
     # e.g. at 7:30pm daily
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
       [TimerTrigger, {time: time, 
@@ -135,6 +168,7 @@ class ActionsNlp
   def initialize(macro=nil)
 
     super()
+
     params = {macro: macro}
     actions(params)
 
@@ -256,13 +290,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 +306,7 @@ class ActionsNlp
     end    
     
     get /^Share Location$/i do
-      [ShareLocationAction, params]
+      [ShareLocationAction, {}]
     end    
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -296,7 +330,7 @@ class ActionsNlp
     end
     
     get /Keep Device Awake$/i do
-      [KeepAwakeAction, params]
+      [KeepAwakeAction, {}]
     end    
     
     #a: Disable Keep Awake
@@ -311,6 +345,10 @@ class ActionsNlp
       [IfConditionAction, {}]
     end
     
+    get /else/i do
+      [ElseAction, {}]
+    end    
+    
     get /End If/i do
       [EndIfAction, {}]
     end          
@@ -320,6 +358,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
 
@@ -702,7 +746,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  
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 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-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw