ruby-macrodroid 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c63b70d5cc34184d15c46395e1add89a6c8999163d4fb1e9362aa80a568dba4
-  data.tar.gz: 797fab9bff840db398067dc5b99ac53bb3d3129668573728c31aa0883a28d792
+  metadata.gz: d2421b1c983ef4223a4e461f70a37be3fa3d2200141ada22a535813b8b9ea94d
+  data.tar.gz: cf6a20994ba0a24ca544a1b8bfb75ffab22b6022be1a1f71e4e73b3a344b39e7
 SHA512:
-  metadata.gz: 2bbf5ca42c6fe1be4eeeda1ba597bc4be3f0944e7a871785b629d5344268bd65d3c560fcf65de0e5b0a619c075a31f6f61eea1d8eefbd29d066777f9fb414584
-  data.tar.gz: 139c4462602b86d49d87d9b2e73873354550b67c8bc435bfed41d6fe6434419d4cbdfef375efdc659978e012bbb8bb9d685a08d1d75f63ae0a403a6796295da7
+  metadata.gz: b88c007520adab8bf80f1c0723d803ac2561092c450aee86f2d0e8e26a322646f15dc5df5d9419d1524f8339f0e85a332b603c65124bdb1eebf66b741ca7b1aa
+  data.tar.gz: 9ab6f2170600df9813114f9513b1e490496db70a82d432c2e3a3bad2768a67dfe27d7bb0ce84a38c80e28bf4e3a26ed4f8e92f788b1a2bc4c23884fc816a3571

data/lib/ruby-macrodroid/actions.rb

@@ -1667,9 +1667,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={})
     
@@ -1693,7 +1702,7 @@ end
 
 # MacroDroid Specific
 #
-class ConfirmNextAction < Action
+class ConfirmNextAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1717,7 +1726,7 @@ class ConfirmNextAction < Action
   
 end
 
-class DisableMacroAction < Action
+class DisableMacroAction < MacroDroidAction
   
   def initialize(obj=nil)
     
@@ -1764,7 +1773,7 @@ end
 
 # MacroDroid Specific
 #
-class ExportMacrosAction < Action
+class ExportMacrosAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1786,9 +1795,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)
@@ -1878,7 +1939,7 @@ end
 
 # MacroDroid Specific
 #
-class TextManipulationAction < Action
+class TextManipulationAction < MacroDroidAction
   
   def initialize(h={})
     
@@ -1921,7 +1982,7 @@ end
 
 
 
-class PauseAction < Action
+class PauseAction < MacroDroidAction
   
   def initialize(h={})
     

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -221,6 +221,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, {}]

data/lib/ruby-macrodroid/base.rb

@@ -133,7 +133,8 @@ class MacroObject
   end
 
   def to_h()
-
+    
+    @h.delete :macro
     hashify(@h)
 
   end

data/lib/ruby-macrodroid/macro.rb

@@ -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

@@ -1416,6 +1416,10 @@ class ActivityRecognitionTrigger < SensorsTrigger
 
   end
   
+  def match?(detail={})
+    @h[:selected_index] == detail[:selected_index]
+  end
+  
   def to_s(colour: false)
     
     activity = @activity[@h[:selected_index]]
@@ -1540,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
@@ -1771,6 +1788,21 @@ 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)
     

data/lib/ruby-macrodroid/triggersnlp.rb

@@ -185,7 +185,27 @@ class TriggersNlp
     
     get /^Swipe Screen$/i do       
       [SwipeTrigger, {}]
-    end     
+    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.13
+  version: 0.9.14
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw