ruby-macrodroid 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee2f540a744e2a309b3e4306a3f75c9ac3f437ebb9907d6f98cc39ea9b873fb
-  data.tar.gz: 1f8f909bcd280c7fabe301d8cbb3c8535d56901bb7986224cc0d046cccb3b61b
+  metadata.gz: e9789db9405136e821003060f52912072c11665303ab25a714c93d5dac058d8f
+  data.tar.gz: 7878f4f2c52b3450e2485e5b993cfe275269e88e125da647f89ddf73610c504e
 SHA512:
-  metadata.gz: 045fb9a42206777def57c23a89ec1aaccb2dac969b44f2b0fc388885e14a7ce8c1a6f093451237dcbfe8e2287cc3395033506853da6dca94706e368704df66ae
-  data.tar.gz: fc65220be3fd9e7265b6bfcdf194735c831e02fcb3b6c8e158d6e24cde83cbbbcfbb1547cd4932a0a96ba79f552d9134690dc1e91fdd0405751a6d6c41e382f9
+  metadata.gz: 6a2f574bc7692cba9cf2cc31228c5c4e6cd4aa78de0bb3a73c5e73c1458fd6cdc0798ac31aebd9e1833738ce700819257a02242c13ed2c5bc91f4e977d171e27
+  data.tar.gz: ce58d73abe7f2583bd50a7c6fa0fda42c9aa2a0cf14b9fc370c066dad69fcb8263332f685da3f14aee447180fbfcd9cd5a25a59b81853748114e58e420c6f74c

data/lib/ruby-macrodroid/actions.rb

@@ -174,17 +174,17 @@ class OpenWebPageAction < ApplicationAction
 
   def initialize(obj={}, macro=nil)
 
-    $debug = false    
+    $debug = true    
     puts ('obj: ' + obj.inspect).debug if $debug
     
     h = if obj.is_a? Hash then
     
-      obj.merge({macro: macro})
+      obj.merge({macro: macro}) #unless obj and obj[:macro]
       
     elsif obj.is_a? Array
       
       puts ('obj: ' + obj.inspect).debug if $debug
-      e, macro = obj
+      e, macro, h3 = obj
       
       a = e.xpath('item/*')
 
@@ -205,7 +205,7 @@ class OpenWebPageAction < ApplicationAction
         {url: (txt || e.text)}
       end      
       
-      h2.merge(macro: macro)
+      h2.merge(macro: macro).merge(h3)
 
     end
 
@@ -243,6 +243,7 @@ class OpenWebPageAction < ApplicationAction
           h[:macro].title.downcase.gsub(/ +/,'-')            
       
     end        
+    puts 'url: ' + url.inspect if $debug
     
     if h2 then
       
@@ -266,7 +267,8 @@ class OpenWebPageAction < ApplicationAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = "HTTP GET\nurl: " + @h[:url_to_open]
+    s = @h[:http_get] ? '' : 'Open Website / '
+    @s = s + "HTTP GET\nurl: " + @h[:url_to_open]
     super()
   end
 
@@ -985,8 +987,15 @@ end
 #
 class ClipboardAction < DeviceAction
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      {clipboard_text: e.text('item/description').to_s}
+    end    
+    
     options = {
       clipboard_text: ''
     }
@@ -1066,14 +1075,57 @@ end
 #
 class UIInteractionAction < DeviceAction
 
-  def initialize(h={})
+  def initialize(obj=nil)
+
+    if obj.is_a? Hash then
+      h = obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      s = e.text('item/description').to_s
+      
+      r = s.match(/^(Click|Long Click) \[([^\]]+)/)
+
+      # [Current focus] # Current focus
+      # [0,0] # x,y location
+      # [274,186] # Identify in app
+      # [fooo] # Text content
+
+      h = {
+        ui_interaction_configuration: {}, :xy_point=>{:x=>0, :y=>0}, 
+        :type=>"Click"
+      }
+      h2 = {}
+
+      if r then
+
+        h[:action] = 0
 
+        click, detail = r.captures
+        h2[:long_click] = false if click.downcase.to_sym == :click
+
+        if detail == 'Current focus' then          
+          h2[:click_option] = 1
+        elsif detail =~ /\d+,\d+/
+          # to-do   
+        else
+          # text content
+          h2[:click_option] = 1
+          h2[:text_content] = detail
+        end
+        
+        h[:ui_interaction_configuration] = h2
+      end
+
+    end   
+    
     options = {
       ui_interaction_configuration: {:type=>"Copy"},
       action: 2
     }
 
-    super(options.merge h)
+
+    super(options.merge h) 
 
   end
 
@@ -1113,7 +1165,7 @@ class UIInteractionAction < DeviceAction
       "Gesture [%s]" % detail
     end
     
-    'UI Interaction' + "\n  " + s #+ ' ' + @h.inspect
+    'UI Interaction' + "\n  " + s + ' ' + @h.inspect
   end
 
   alias to_summary to_s

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -90,6 +90,7 @@ class ActionsNlp
     
     # -- DEVICE ACTIONS ------------------------------------------------------
     
+    #
     get /^Speak text \(([^\)]+)\)/i do |text|
       [SpeakTextAction, {text: text}]
     end           
@@ -100,7 +101,11 @@ class ActionsNlp
     
     get /^Speak text$/i do |text|
       [SpeakTextAction, {}]
-    end     
+    end  
+    
+    get /^UI Interaction$/i do
+      [UIInteractionAction, {}]
+    end  
     
     get /^Vibrate \(([^\)]+)/i do |pattern|
       [VibrateAction, {pattern: pattern}]
@@ -123,6 +128,10 @@ class ActionsNlp
       [SetWifiAction, {state: state}]
       
     end    
+        
+    get /^Fill Clipboard$/i do            
+      [ClipboardAction, {}]
+    end           
     
     # e.g. Play: Altair
     get /^Play: (.*)$/i do |name|
@@ -157,6 +166,19 @@ class ActionsNlp
       
     end    
     
+    
+    get /^Open Website \/ HTTP GET$/i do
+
+      [OpenWebPageAction, {http_get: false}]
+      
+    end
+    
+    get /^(?:open|goto) ((?:https?:\/\/|\[lv=)[^$]+)$/i do |url|
+
+      [OpenWebPageAction, url_to_open: url, http_get: false]
+      
+    end
+    
     # e.g. webhook entered_kitchen
     #
     get /(?:webhook|HTTP GET) ([^$]+)$/i do |s|

data/lib/ruby-macrodroid/base.rb

@@ -12,7 +12,7 @@ module ObjectX
   
   def action_to_object(ap, e, item, macro)
     
-    debug = false
+    debug = true
     
     puts 'inside action_to_object: item.xml: ' + item.xml if debug
         
@@ -34,7 +34,7 @@ module ObjectX
         r = ap.find_action action          
         puts 'r: ' + r.inspect if debug
         
-        nested = description.element('item/description')
+        nested = description.element('item/*')
         puts 'nested: ' + nested.inspect if debug
         
         if r[1].any? and not nested then

data/lib/ruby-macrodroid/triggersnlp.rb

@@ -67,6 +67,8 @@ class TriggersNlp
       [WifiConnectionTrigger, {}]
     end       
     
+  
+    
     # -- Device Events ----------------------------------------------------
     
     get /^NFC Tag$/i do |state|            

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw