ruby-macrodroid 0.9.12 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f551fa79f564fe3e791b75d0bd3b5dabafd8c90b47980c5c77ab344d8b5612db
-  data.tar.gz: 2f5b9fe15f59cf9abfd628c7050d40229104ac1137780be6d7a9723214dbff73
+  metadata.gz: d2a2688ed5b9d38f47749aa2f3e2d08002d7250d2690189f6034dec81b5d2ee5
+  data.tar.gz: 95d917dc64a5322caeacd5abd64f2b1cb9013e34908536860424f9cc47de6d1f
 SHA512:
-  metadata.gz: fecd36b6b6da15005cfde4259886dfde7f37538d3217026958174b53a8eab4bf4af3f8903f3504f6291fdb5bce2435292d65f41904a47640486a97e1dc72be9c
-  data.tar.gz: 59b920327286062d098054a4225c36c0b4ab054ae98bac8c8100f5beb55cc45ee87c8f8d51cc10506a12b172fcaed6024ba4d4384233b5215062b2d127fd5e38
+  metadata.gz: '0765669d573b157239bdb0ecfde3f34f1717160976e38e870fa1d20b105af0e5919370812e16e81232cb627bf32b2b833a732cf8ec4647ab2445e9aba0767014'
+  data.tar.gz: e1317255ded299969e64fef30d7f67b8706c1163202b032e190969f275b23524fa5ad81a1481eefc3c786153cd00a04d409a414316d3022674ae6e9fa5b7514a

data/lib/ruby-macrodroid/actions.rb

@@ -32,6 +32,30 @@
 #  
 
 
+APPS = {
+  'AutoBoy' => 'com.happyconz.blackbox',
+  'Amazon Alexa' => 'com.amazon.dee.app',
+  'Brave' => 'com.brave.browser',
+  'Camera' => 'com.google.android.camera',
+  'Cast to TV' => 'cast.video.screenmirroring.casttotv',
+  'File Manager' => 'com.alphainventor.filemanager',
+  'Firefox' => 'org.mozilla.firefox',
+  'Google Chrome' => 'com.google.android.chrome',
+  'Chrome' => 'com.google.android.chrome',
+  'Google Home' => 'com.google.android.apps.chromecast.app',  
+  'Google Play Music' => 'com.google.android.music',
+  'MacroDroid' => 'com.arlosoft.macrodroid',
+  'QuickEdit Text Editor Pro' => 'com.rhmsoft.edit.pro',
+  'QR & Barcode Reader' => 'com.teacapps.barcodescanner',
+  'Settings' => 'com.google.android.settings',
+  'tinyCam PRO' => 'com.alexvas.dvr.pro',
+  'Tor Browser' => 'org.torproject.torbrowser',
+  'VLC' => 'org.videolan.vlc',
+  'WiFi FTP Server' => 'com.medhaapps.wififtpserver',
+  'YouTube' => 'com.google.android.youtube'
+}
+
+
 class Action < MacroObject
   using ColouredText
   using Params
@@ -76,19 +100,28 @@ class LaunchActivityAction < ApplicationAction
 
   def initialize(h={})
 
+    # option 0 is by application name, 1 is launch by package name
+    #
     options = {
       application_name: 'Chrome',
       package_to_launch: 'com.android.chrome',
       exclude_from_recents: false,
-      start_new: false
+      start_new: false,
+      option: 0,
+      launch_by_package_name: ''
     }
 
     super(options.merge h)
+    
+    @list = %w(option launchByPackageName)
 
   end
   
   def to_s(colour: false, indent: 0)
-    'Launch ' + @h[:application_name]
+    option = @h[:option] == 0 ? @h[:application_name] : \
+        @h[:launch_by_package_name]
+    @s = 'Launch ' + option
+    super()
   end
 
 end
@@ -150,17 +183,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/*')
 
@@ -181,7 +214,7 @@ class OpenWebPageAction < ApplicationAction
         {url: (txt || e.text)}
       end      
       
-      h2.merge(macro: macro)
+      h2.merge(macro: macro).merge(h3)
 
     end
 
@@ -219,6 +252,7 @@ class OpenWebPageAction < ApplicationAction
           h[:macro].title.downcase.gsub(/ +/,'-')            
       
     end        
+    puts 'url: ' + url.inspect if $debug
     
     if h2 then
       
@@ -242,7 +276,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
 
@@ -378,6 +413,61 @@ class TakePictureAction < CameraAction
 end
 
 
+class TakeScreenshotAction < CameraAction
+
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj      
+      
+      a = [
+        'Save to device', 
+        'Send via email', 
+        'Share via intent'
+      ]
+      
+      s = e.text('item/description').to_s
+      index = a.map(&:downcase).index s.downcase
+    
+      {option: index}
+      
+    end 
+    
+    options = {
+      option: 0, 
+      use_smtp_email: false, 
+      mechanism_option: 0, 
+      save_to_jpeg: false
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Take Screenshot' #+ @h.inspect
+    
+    options = [
+      'Save to device', 
+      'Send via email', 
+      'Share via intent'
+    ]
+    
+    option = options[@h[:option]]
+    
+    @s += "\n" + option
+    super()
+    
+  end
+
+  alias to_summary to_s
+end
+
+
 # Conditions/Loops
 #
 class IfConfirmedThenAction < Action
@@ -888,8 +978,17 @@ end
 #
 class SayTimeAction < DateTimeAction
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj      
+      {:'12_hour' => e.text('item/description').to_s[/^\d+/] == '12'}
+      
+    end 
+    
     options = {
       :'12_hour' => true
     }
@@ -910,7 +1009,9 @@ class SayTimeAction < DateTimeAction
   end
   
   def to_s(colour: false, indent: 0)
-    'Say Current Time'
+    @s = 'Say Current Time'
+    @s += "\n%s hour clock" % (@h[:'12_hour'] ? '12' : '24')
+    super()
   end  
 
 end
@@ -950,8 +1051,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: ''
     }
@@ -1031,14 +1139,60 @@ 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 = h[:ui_interaction_configuration]
+
+      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] = 0
+        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) 
+    
+    @list = %w(uiInteractionConfiguration action xyPoint textContent  clickOption type longClick)
 
   end
 
@@ -1078,7 +1232,8 @@ class UIInteractionAction < DeviceAction
       "Gesture [%s]" % detail
     end
     
-    'UI Interaction' + "\n  " + s #+ ' ' + @h.inspect
+    @s = 'UI Interaction' + "\n" + s #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1098,7 +1253,10 @@ class VoiceSearchAction < DeviceAction
   end
 
   def to_s(colour: false, indent: 0)
-    'VoiceSearchAction ' + @h.inspect
+    
+    @s = 'Voice Search' # + @h.inspect
+    super()
+    
   end
 
   alias to_summary to_s
@@ -1656,9 +1814,18 @@ class ClearLogAction < LoggingAction
 end
 
 
+class MacroDroidAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'macrodroid'
+  end
+  
+end
+
 # MacroDroid Specific
 #
-class CancelActiveMacroAction < Action
+class CancelActiveMacroAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1682,7 +1849,7 @@ end
 
 # MacroDroid Specific
 #
-class ConfirmNextAction < Action
+class ConfirmNextAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1706,7 +1873,7 @@ class ConfirmNextAction < Action
   
 end
 
-class DisableMacroAction < Action
+class DisableMacroAction < MacroDroidAction
   
   def initialize(obj=nil)
     
@@ -1753,7 +1920,7 @@ end
 
 # MacroDroid Specific
 #
-class ExportMacrosAction < Action
+class ExportMacrosAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1775,9 +1942,61 @@ class ExportMacrosAction < Action
 end
 
 
+
+class ForceMacroRunAction < MacroDroidAction
+      
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      e, macro, h2 = obj
+      
+      # find the macro guid for the given name
+      name = e.text('item/description').to_s
+      found = macro.parent.macros.find {|macro| macro.title =~ /#{name}/ }
+      
+      h3 = if found then     
+        {macro_name: found.title, GUID: found.guid}
+      else
+        {macro_name: name}
+      end
+      
+      h3.merge h2
+
+    end      
+    
+    options = {
+      guid: nil, ignore_constraints: true, 
+      macro_name: "", use_off_status: false, 
+      user_prompt_title: "Run Macro"      
+    }
+    super(options.merge h)
+    
+  end  
+  
+  def invoke()
+    super(macro_name: @h[:macro_name])
+  end
+  
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Macro Run'# + @h.inspect
+    @s += "\n" + @h[:macro_name]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
-class SetVariableAction < Action
+class SetVariableAction < MacroDroidAction
   using ColouredText
   
   def initialize(obj=nil)
@@ -1867,7 +2086,7 @@ end
 
 # MacroDroid Specific
 #
-class TextManipulationAction < Action
+class TextManipulationAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1910,7 +2129,7 @@ end
 
 
 
-class PauseAction < Action
+class PauseAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1950,6 +2169,62 @@ end
 
 # Category: Media
 #
+
+
+# note: to find a package id from an App name, try searching for the name on 
+#       the Google Play Store and the id will be returned in the URL once the 
+#       correct app has been clicked. e.g.
+#       https://play.google.com/store/apps/details?id=com.google.android.music
+#
+class ControlMediaAction < MediaAction
+
+  def initialize(obj=nil)
+
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj      
+      s = e.text('item/description').to_s
+      app = s[/Simulate Media Button \(([^\)]+)/,1]
+      
+      if app then        
+        
+        {
+          application_name: app,  package_name: APPS[app], 
+          simulate_media_button: true
+        }
+        
+      else
+        {}
+      end
+    end 
+    
+    options = {
+      application_name: "Google Play Music", option: "Play/Pause", 
+      package_name: "com.google.android.music", 
+      send_media_player_commands: false, 
+      simulate_media_button: true,
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Media ' + @h[:option] #+ @h.inspect
+    
+    if @h[:simulate_media_button] then
+      @s +=  "\nSimulate Media Button (%s)" % @h[:application_name]
+    end
+    
+    super()
+  end
+
+  alias to_summary to_s
+end
+
 class RecordMicrophoneAction < MediaAction
 
   def initialize(h={})

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -86,10 +86,15 @@ class ActionsNlp
     
     get /^take_picture/i do
       [TakePictureAction, {}]
-    end           
+    end
+    
+    get /^Take Screenshot/i do
+      [TakeScreenshotAction, {}]
+    end               
     
     # -- DEVICE ACTIONS ------------------------------------------------------
     
+    #
     get /^Speak text \(([^\)]+)\)/i do |text|
       [SpeakTextAction, {text: text}]
     end           
@@ -100,7 +105,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}]
@@ -109,6 +118,11 @@ class ActionsNlp
     get /^Vibrate$/i do |pattern|
       [VibrateAction, {pattern: 'short buzz'}]
     end       
+
+    get /^Voice Search$/i do
+      [VoiceSearchAction, {}]
+    end           
+    
     
     # e.g. Display Notification: Hi there: This is the body of the message
     get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
@@ -123,6 +137,10 @@ class ActionsNlp
       [SetWifiAction, {state: state}]
       
     end    
+        
+    get /^Fill Clipboard$/i do            
+      [ClipboardAction, {}]
+    end           
     
     # e.g. Play: Altair
     get /^Play: (.*)$/i do |name|
@@ -132,12 +150,24 @@ class ActionsNlp
     end     
     
     # e.g. Launch Settings
-    get /^Launch (.*)$/i do |application|
+    get /^Launch (.*)$/i do |s|
 
-      h = {
-        application_name: application,
-        package_to_launch: 'com.android.' + application.downcase
-      }
+      h = {}
+      
+      if s[0] == '[' then
+        
+        h[:launch_by_package_name] = s
+        h[:option] = 1
+        
+      else
+        application = s
+        h[:application_name] = application
+        h[:package_to_launch] = APPS[application] || 'com.android.' + 
+            application.downcase.split().join('.')
+        h[:option] = 0
+        
+      end
+      
       [LaunchActivityAction, h]
       
     end
@@ -155,6 +185,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|
@@ -221,6 +264,14 @@ class ActionsNlp
       state = %w(enable disable toggle).index(rawstate.downcase)
       [DisableMacroAction, {state: state}]
     end        
+
+    get /^Macro Run$/i do
+      [ForceMacroRunAction, {}]
+    end
+    
+    get /^Run Macro$/i do
+      [ForceMacroRunAction, {}]
+    end    
     
     get /^Set Variable$/i do
       [SetVariableAction, {}]
@@ -230,6 +281,14 @@ class ActionsNlp
       [PauseAction, {delay_in_seconds: seconds.to_i}]
     end        
     
+    ## -- Media -----------------------------------------
+    #
+    # options: Play/Pause, Previous, Next, Play, Pause, Stop
+    #
+    get /^Media ([^$]+)$/i do |option|
+      [ControlMediaAction, {option: option}]
+    end            
+    
     # -- Screen ------------------------------------------------
     #
     get /^Screen (On|Off)$/i do |state|

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,8 @@ 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
           
@@ -132,7 +133,8 @@ class MacroObject
   end
 
   def to_h()
-
+    
+    @h.delete :macro
     hashify(@h)
 
   end
@@ -193,6 +195,7 @@ class MacroObject
     
   end
   
+  
   private
   
   def hashify(h)
@@ -204,6 +207,7 @@ class MacroObject
       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'
+      new_key = 'm_SSIDList' if new_key == 'm_ssidList'
       new_val = value.is_a?(Hash) ? hashify(value) : value
       r.merge(new_key => new_val)
     end

data/lib/ruby-macrodroid/macro.rb

@@ -268,7 +268,7 @@ class Macro
               r = tp.find_trigger trigger          
               puts 'r: ' + r.inspect if @debug
               #o = r[0].new([description, self]) if r
-              o = object_create(r[0], [description, self]) if r                            
+              o = object_create(r[0], [description, self, r[1]]) if r                            
               puts 'after o' if @debug
               o
               
@@ -356,7 +356,7 @@ class Macro
     
   end
   
-  def match?(triggerx, detail={time: $env[:time]}, model=nil )
+  def match?(triggerx, detail={}, model=nil )
                 
     if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
       

data/lib/ruby-macrodroid/triggers.rb

@@ -61,6 +61,7 @@ class Trigger < MacroObject
         {|x| 'c: ' + x.to_summary(colour: colour, indent: 1)}.join(" %s " % operator)
     
     @constraints.any? ? @s + "\n" + constraints : @s
+    super()
     
   end  
 
@@ -85,7 +86,7 @@ end
 #       ["Any Network"] 
 #       ["some Wifi SSID"] - 1 or more SSID can be supplied
 
-class WifiConnectionTrigger < Trigger
+class WifiConnectionTrigger2 < Trigger
 
   def initialize(h={})
 
@@ -216,7 +217,7 @@ class PowerButtonToggleTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'PowerButtonToggleTrigger ' + @h.inspect
+    "Power Button Toggle (%s)" % @h[:num_toggles] #+ @h.inspect
   end
 
   alias to_summary to_s
@@ -457,7 +458,7 @@ class WebHookTrigger < Trigger
     
     url = "https://trigger.macrodroid.com/%s/%s" % \
         [@deviceid, @h[:identifier]]
-    @s = 'WebHook (Url)' + "\n  " + url
+    @s = 'WebHook (Url)' + "\n" + url
     super()
 
   end
@@ -469,8 +470,15 @@ end
 #
 class WifiConnectionTrigger < Trigger
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      {ssid_list: [e.text('item/description').to_s], wifi_state: 2}
+    end 
+    
     options = {
       ssid_list: [],
       wifi_state: 0
@@ -482,10 +490,15 @@ class WifiConnectionTrigger < Trigger
 
   def to_s(colour: false)
     access_point = @h[:ssid_list].first
-    'Connected to network ' + access_point
+    @s = 'Connected to network'
+    @s += "\n" + access_point
+    super()
   end
 
-  alias to_summary to_s
+  def to_summary()
+    access_point = @h[:ssid_list].first
+    'Connected to network' + access_point    
+  end
 end
 
 # Category: Connectivity
@@ -1010,7 +1023,7 @@ class MusicPlayingTrigger < DeviceEventsTrigger
   def to_s(colour: false)
     
     event = @h[:option] == 0 ? 'Started' : 'Stopped'
-    @s = 'Music/Sound Playing' + "\n  %s" % event #+ @h.inspect
+    @s = 'Music/Sound Playing' + "\n%s" % event #+ @h.inspect
     super()
     
   end
@@ -1026,8 +1039,15 @@ end
 #
 class NFCTrigger < DeviceEventsTrigger
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      {tag_name: e.text('item/description').to_s}
+    end 
+    
     options = {
     }
 
@@ -1367,8 +1387,24 @@ end
 #
 class ActivityRecognitionTrigger < SensorsTrigger
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    #puts 'obj: ' + obj.inspect
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      e, macro, h2 = obj
+      #puts 'h2: ' + h2.inspect
+      #puts 'e: ' + e.xml
+      s = e.text('item/description').to_s            
+      #puts 's: ' + s.inspect
+      {confidence_level: s[/\d+%$/].to_i}.merge h2
+    end 
+    
     options = {
       confidence_level: 50,
       selected_index: 1
@@ -1380,9 +1416,18 @@ class ActivityRecognitionTrigger < SensorsTrigger
 
   end
   
+  def match?(detail={})
+    @h[:selected_index] == detail[:selected_index]
+  end
+  
   def to_s(colour: false)
+    
     activity = @activity[@h[:selected_index]]
-    'Activity - ' + activity
+    @s = 'Activity - ' + activity #+ @h.inspect
+    @s += "\nConfidence >= %s%%" % @h[:confidence_level]
+    
+    super()
+    
   end
   
   def to_summary(colour: false)
@@ -1499,6 +1544,19 @@ class FlipDeviceTrigger < SensorsTrigger
 
   end  
   
+  def match?(detail={})
+    
+    fd = detail[:face_down]
+    
+    b = if fd.is_a? String then
+      fd.downcase == 'true'
+    else
+      fd
+    end
+    
+    @h[:face_down] == b
+  end
+  
   def to_pc()
     @h[:face_down] ? 'flip_device_down?' : 'flip_device_up?'
   end
@@ -1577,7 +1635,7 @@ class ShortcutTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'ShortcutTrigger ' + @h.inspect
+    'Shortcut Launched' #+ @h.inspect
   end
 
   alias to_summary to_s
@@ -1633,8 +1691,15 @@ end
 #
 class MediaButtonPressedTrigger < Trigger
 
-  def initialize(h={})
+  def initialize(obj=nil)
 
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      {option: e.text('item/description').to_s}
+    end 
+    
     options = {
       option: 'Single Press',
       cancel_press: false
@@ -1645,7 +1710,50 @@ class MediaButtonPressedTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'MediaButtonPressedTrigger ' + @h.inspect
+    
+    @s = 'Media Button Pressed ' #+ @h.inspect
+    @s += "\n" + @h[:option]
+    super()
+    
+  end
+
+  alias to_summary to_s
+end
+
+class MediaButtonV2Trigger < Trigger
+   
+  def initialize(obj=nil)
+    
+    @a = %w(Play Play/Pause Pause Stop Previous Next Headset Hook)        
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      s = e.text('item/description').to_s
+      a = s.split(/, /)
+      {options_enabled_array: @a.map {|x| a.include? x } }
+    end 
+
+
+    
+    options = {
+      options_enabled_array: [true, false, false, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    
+    
+    options = @a.zip(@h[:options_enabled_array]).select(&:last).map(&:first)
+    
+    @s = 'Media Button V2 ' #+ @h.inspect
+    @s += "\n" + options.join(', ')
+    super()
+    
   end
 
   alias to_summary to_s
@@ -1655,8 +1763,22 @@ end
 #
 class SwipeTrigger < Trigger
 
-  def initialize(h={})
-
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      s = e.text('item/description').to_s
+      start, motion = s.split(/ - /,2)
+      
+      {
+        swipe_start_area: ['Top Left', 'Top Right'].index(start),
+        swipe_motion: %w(Across Diagonal Down).index(motion)
+      }
+    end 
+    
     options = {
       swipe_start_area: 0,
       swipe_motion: 0,
@@ -1666,9 +1788,29 @@ class SwipeTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def match?(detail={}, model=nil)
+    
+    puts 'detail : ' + detail.inspect
+        
+    return false if detail.empty?
+   
+    detail[:swipe_start_area] = detail[:start]
+    detail[:swipe_motion] = detail[:motion]
+    return unless detail[:swipe_start_area] and detail[:swipe_motion]
+    
+    @h[:swipe_start_area] == detail[:swipe_start_area].to_i and \
+       @h[:swipe_motion] == detail[:swipe_motion].to_i
+
+  end  
 
   def to_s(colour: false)
-    'SwipeTrigger ' + @h.inspect
+    
+    direction = [['Top Left', 'Top Right'][@h[:swipe_start_area]], 
+        %w(Across Diagonal Down)[@h[:swipe_motion]]].join(' - ')
+    @s = 'Swipe Screen'# + @h.inspect
+    @s += "\n" + direction
+    super()
   end
 
   alias to_summary to_s

data/lib/ruby-macrodroid/triggersnlp.rb

@@ -19,6 +19,10 @@ class TriggersNlp
     
     # -- Battery/Power ---------------------------------------------
     
+    get /Power Button Toggle \((\d)\)/i do |num|
+      [PowerButtonToggleTrigger, {num_toggles: num.to_i}]
+    end    
+    
     get /^Power Connected: (Wired \([^\)]+\))/i do |s|
       
       h = {
@@ -50,7 +54,26 @@ class TriggersNlp
       [ExternalPowerTrigger, h]
     end   
     
+    # -- Connectivity ----------------------------------------------------
+    #
+    
+    # Wifi State Change
+    
+    get /^Connected to network (.*)$/i do |network|            
+      [WifiConnectionTrigger, {ssid_list: [network], wifi_state: 2 }]
+    end         
+    
+    get /^Connected to network$/i do            
+      [WifiConnectionTrigger, {}]
+    end       
+    
+  
+    
     # -- Device Events ----------------------------------------------------
+    
+    get /^NFC Tag$/i do |state|            
+      [NFCTrigger, {}]
+    end         
   
     get /^Screen[ _](On|Off)/i do |state|            
       [ScreenOnOffTrigger, {screen_on: state.downcase == 'on'}]
@@ -132,11 +155,59 @@ class TriggersNlp
       [WebHookTrigger, params]
     end          
 
-    #  MacroDroid specific ---------------------------------------------------------------
+    #-- MacroDroid specific ---------------------------------------------------------------
 
     get /^EmptyTrigger$/i do       
       [EmptyTrigger, params]
-    end          
+    end
+    
+    #-- Sensors ---------------------------------------------------------------
+
+    get /^Activity - (.*)$/i do |s|
+      
+      a = ['In Vehicle', 'On Bicycle', 'Running', 'Walking', 'Still']
+      r = a.find {|x| x.downcase == s.downcase}
+      h = r ? {selected_index: a.index(r)} : {}
+      [ActivityRecognitionTrigger , h]
+    end    
+    
+    # -- User Input ---------------------------------------------------------------
+
+    get /^Media Button Pressed$/i do       
+      [MediaButtonPressedTrigger, {}]
+    end              
+    
+    get /^Media Button V2$/i do       
+      [MediaButtonV2Trigger, {}]
+    end
+    
+    get /^Shortcut Launched$/i do       
+      [ShortcutTrigger, {}]
+    end                  
+    
+    get /^Swipe Screen$/i do       
+      [SwipeTrigger, {}]
+    end
+    
+    get /^Swipe (top left) (across|diagonal|down)$/i do |start, motion|
+                  
+      swipe_motion = case motion.downcase.to_sym
+      when :across
+        0
+      when :diagonal
+        1
+      when :down
+        2
+      end
+      
+      h = {
+        swipe_start_area: (start.downcase == 'top left' ? 0 : 1),
+        swipe_motion: swipe_motion
+      }
+      
+      [SwipeTrigger, h]
+      
+    end
     
   end
 

metadata

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