ruby-macrodroid 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f551fa79f564fe3e791b75d0bd3b5dabafd8c90b47980c5c77ab344d8b5612db
-  data.tar.gz: 2f5b9fe15f59cf9abfd628c7050d40229104ac1137780be6d7a9723214dbff73
+  metadata.gz: 0c63b70d5cc34184d15c46395e1add89a6c8999163d4fb1e9362aa80a568dba4
+  data.tar.gz: 797fab9bff840db398067dc5b99ac53bb3d3129668573728c31aa0883a28d792
 SHA512:
-  metadata.gz: fecd36b6b6da15005cfde4259886dfde7f37538d3217026958174b53a8eab4bf4af3f8903f3504f6291fdb5bce2435292d65f41904a47640486a97e1dc72be9c
-  data.tar.gz: 59b920327286062d098054a4225c36c0b4ab054ae98bac8c8100f5beb55cc45ee87c8f8d51cc10506a12b172fcaed6024ba4d4384233b5215062b2d127fd5e38
+  metadata.gz: 2bbf5ca42c6fe1be4eeeda1ba597bc4be3f0944e7a871785b629d5344268bd65d3c560fcf65de0e5b0a619c075a31f6f61eea1d8eefbd29d066777f9fb414584
+  data.tar.gz: 139c4462602b86d49d87d9b2e73873354550b67c8bc435bfed41d6fe6434419d4cbdfef375efdc659978e012bbb8bb9d685a08d1d75f63ae0a403a6796295da7

data/lib/ruby-macrodroid/actions.rb

@@ -888,8 +888,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 +919,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

data/lib/ruby-macrodroid/base.rb

@@ -35,6 +35,7 @@ module ObjectX
         puts 'r: ' + r.inspect if debug
         
         nested = description.element('item/description')
+        puts 'nested: ' + nested.inspect if debug
         
         if r[1].any? and not nested then
           
@@ -204,6 +205,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
               

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
@@ -1381,8 +1417,13 @@ class ActivityRecognitionTrigger < SensorsTrigger
   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)
@@ -1577,7 +1618,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 +1674,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 +1693,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 +1746,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,
@@ -1668,7 +1773,12 @@ class SwipeTrigger < Trigger
   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,24 @@ 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 +153,39 @@ 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     
     
   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.13
 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-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw