ruby-macrodroid 0.9.8 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79a66c628c78bab4c858805ac6486083331723153022cb23030485701b16eea
-  data.tar.gz: d2bf06bef9e246852f4ec40a31f267ce2f94b66293318fb82ea864a4d5c15e0e
+  metadata.gz: 0c63b70d5cc34184d15c46395e1add89a6c8999163d4fb1e9362aa80a568dba4
+  data.tar.gz: 797fab9bff840db398067dc5b99ac53bb3d3129668573728c31aa0883a28d792
 SHA512:
-  metadata.gz: 00ab9a577c80b81d017ebbb35d3e8a746d1d78ddde05473dd87be5c6a5365a3d7ed83e3501cf0402e3b2919be7dff1fe59f1e12c2f309649b69e3fd99e19824d
-  data.tar.gz: fa4786c3f3bc343b6e242f5c8abfb6a438edae01df19b623b3d7b27fb610bc4c56f323071ea76890700b6493ede5df714a55f9b2ef619f1c37104832a59d75f8
+  metadata.gz: 2bbf5ca42c6fe1be4eeeda1ba597bc4be3f0944e7a871785b629d5344268bd65d3c560fcf65de0e5b0a619c075a31f6f61eea1d8eefbd29d066777f9fb414584
+  data.tar.gz: 139c4462602b86d49d87d9b2e73873354550b67c8bc435bfed41d6fe6434419d4cbdfef375efdc659978e012bbb8bb9d685a08d1d75f63ae0a403a6796295da7

data/lib/ruby-macrodroid.rb

@@ -122,6 +122,7 @@ class MacroDroid
     @picture_path = picture_path
     
     @geofences = {}
+    @macros = []
     
     if obj then
       
@@ -145,34 +146,7 @@ class MacroDroid
         
         if s =~ /m(?:acro)?:\s/ then
           
-          puts 'before RowX.new' if @debug
-
-          s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
-              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
-              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
-          
-          a = s2.split(/(?=^macro:)/)
-          
-          raw_geofences = a.shift if a.first =~ /^geofence/
-          raw_macros = a.join
-          #raw_macros, raw_geofences .reverse
-          
-          puts 'raw_macros: ' + raw_macros.inspect if @debug
-          
-          if raw_geofences then
-            
-            geoxml = RowX.new(raw_geofences).to_xml
-            
-            geodoc = Rexle.new(geoxml)  
-            geofences = geodoc.root.xpath('item/geofence')        
-            @geofences = fetch_geofences(geofences) if geofences.any?          
-            
-          end
-          
-          xml = RowX.new(raw_macros, allow_lonely_keyfield: true).to_xml
-          puts 'xml: ' + xml if @debug
-          import_rowxml(xml)
+          import_txt(s)
           
         elsif s =~ /^# / 
           xml = pc_to_xml(s)
@@ -229,6 +203,10 @@ class MacroDroid
   def export(filepath)
     FileX.write filepath, to_json
   end
+  
+  def import(s)
+    import_txt(s)
+  end
 
   def to_json()
 
@@ -337,7 +315,7 @@ class MacroDroid
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
                     remote_url: @remote_url, picture_path: @picture_path, 
-                    debug: @debug )
+                    parent: self, debug: @debug )
       m.import_h(macro)
       m
 
@@ -356,15 +334,50 @@ class MacroDroid
     puts 'import_rowxml: @geofences: ' + @geofences.inspect if @debug
     geofences = @geofences
     
-    @macros = doc.root.xpath('item').map do |node|
+    a = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
       Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
                 remote_url: @remote_url, picture_path: @picture_path, 
-                debug: @debug).import_xml(node)
+                parent: self, debug: @debug).import_xml(node)
       
     end
+    
+    @macros.concat a
 
-  end  
+  end
+
+  def import_txt(s)
+    
+    puts 'before RowX.new' if @debug
+
+    s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
+        .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
+        .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+        .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+    
+    a = s2.split(/(?=^macro:)/)
+    
+    raw_geofences = a.shift if a.first =~ /^geofence/
+    raw_macros = a.join
+    #raw_macros, raw_geofences .reverse
+    
+    puts 'raw_macros: ' + raw_macros.inspect if @debug
+    
+    if raw_geofences then
+      
+      geoxml = RowX.new(raw_geofences).to_xml
+      
+      geodoc = Rexle.new(geoxml)  
+      geofences = geodoc.root.xpath('item/geofence')        
+      @geofences = fetch_geofences(geofences) if geofences.any?          
+      
+    end
+    
+    xml = RowX.new(raw_macros, allow_lonely_keyfield: true).to_xml
+    puts 'xml: ' + xml if @debug
+    import_rowxml(xml)
+    
+  end
   
   def import_xml(raws)
     
@@ -384,7 +397,8 @@ class MacroDroid
     @macros = doc.root.xpath('macro').map do |node|
       puts 'node: ' + node.inspect if @debug    
       Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                picture_path: @picture_path, debug: @debug).import_xml(node)
+                picture_path: @picture_path, parent: self, debug: @debug)\
+                .import_xml(node)
       
     end
   end
@@ -589,4 +603,7 @@ require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'
 require 'ruby-macrodroid/actions'
 require 'ruby-macrodroid/constraints'
+require 'ruby-macrodroid/triggersnlp'
+require 'ruby-macrodroid/actionsnlp'
+require 'ruby-macrodroid/constraintsnlp'  
 require 'ruby-macrodroid/macro'

data/lib/ruby-macrodroid/actions.rb

@@ -150,7 +150,7 @@ class OpenWebPageAction < ApplicationAction
 
   def initialize(obj={}, macro=nil)
 
-    $debug = true    
+    $debug = false    
     puts ('obj: ' + obj.inspect).debug if $debug
     
     h = if obj.is_a? Hash then
@@ -190,9 +190,9 @@ class OpenWebPageAction < ApplicationAction
     #h[:url_to_open] = h[:url] if h[:url] and h[:url].length > 1
 
     options = {
-      variable_to_save_response: {:string_value=>"", :name=>"coords", 
-      decimal_value: 0.0, isLocal: true, m_boolean_value: false, 
-      excludeFromLog: false, int_value: 0, type: 2},
+      #variable_to_save_response: {:string_value=>"", :name=>"coords", 
+      #decimal_value: 0.0, isLocal: true, m_boolean_value: false, 
+      #excludeFromLog: false, int_value: 0, type: 2},
       url_to_open: '',
       http_get: true,
       disable_url_encode: false,
@@ -298,7 +298,7 @@ class TakePictureAction < CameraAction
       
       e, macro = obj
       
-      puts 'e: ' + e.xml.inspect
+      #puts 'e: ' + e.xml.inspect
 
       a = e.xpath('item/*')
       
@@ -312,7 +312,7 @@ class TakePictureAction < CameraAction
 
           desc = h2[:description]
           h2.delete :description
-          puts 'desc: ' + desc.inspect
+          #puts 'desc: ' + desc.inspect
           
           if desc.length > 1 then
             
@@ -469,10 +469,14 @@ end
 
 # Conditions/Loops
 #
-class IfConditionAction < Action
 
+class IfAction < Action
+  using ColouredText
+  
   def initialize(obj=nil)
-
+    
+    $debug = false
+    
     options = {
       a: true,
       constraint_list: []
@@ -492,10 +496,10 @@ class IfConditionAction < Action
       super()
       puts 'e.xml: ' + e.xml if $debug
       puts 'e.text: ' + e.text.to_s.strip if $debug
-      raw_txt = e.text.to_s.strip[/^if [^$]+/i] || e.text('item/description')
+      raw_txt = e.text.to_s.strip[/^#{@label}[^$]+/i] || e.text('item/description')
       puts 'raw_txt: ' + raw_txt.inspect if $debug
       
-      clause = raw_txt[/^If (.*)/i,1]
+      clause = raw_txt[/^#{@label}(.*)/i,1]
       puts 'clause: ' + clause.inspect if $debug
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
       puts 'conditions: ' + conditions.inspect if $debug
@@ -514,6 +518,7 @@ class IfConditionAction < Action
       
       # find any nested actions
       item = e.element('item')
+      #puts  ('item: ' + item.xml.inspect).debug if $debug
       
       if item then
         
@@ -534,19 +539,13 @@ class IfConditionAction < Action
 
     end
     
-
-    
-
-    
-    @label = 'If '
-
   end
-
+  
   def to_s(colour: false, indent: 0)
     
     h = @h.clone    
     #h.delete :macro
-    @s = 'If '
+    @s = @label
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
         {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
@@ -557,7 +556,18 @@ class IfConditionAction < Action
     out << s + constraints
     out.join("\n")
     
-  end 
+  end   
+      
+end
+
+class IfConditionAction < IfAction
+
+  def initialize(obj=nil)
+
+    @label = 'If '
+    super(obj)
+    
+  end
   
 end
 
@@ -605,41 +615,15 @@ class ElseAction < Action
   
 end
 
-class ElseIfConditionAction < Action
+class ElseIfConditionAction < IfAction
   
-  def initialize(h={})
-
-    options = {
-      constraint_list: ''
-    }
-
-    super(options.merge h)
-    @label = 'Else If '
+  def initialize(obj=nil)
 
-  end  
-  
-  def to_s(colour: false, indent: 0)
-    
-    h = @h.clone    
-    h.delete :macro
-    @s = 'Else If '
-    operator = @h[:is_or_condition] ? 'OR' : 'AND'
-    constraints = @constraints.map \
-        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
-    
-    out = []
-    out << "; %s" % @h[:comment] if @h[:comment]
-    s = @s.lines.map {|x| ('  ' * indent) + x}.join
-    out << s + constraints
-    out.join("\n")
+    @label = 'Else If '    
+    super(obj)
     
-  end    
-  
-  def to_summary(colour: false)
-    'foo'
   end
-    
-
+  
 end
 
 
@@ -904,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
     }
@@ -926,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
@@ -1722,6 +1717,51 @@ class ConfirmNextAction < Action
   
 end
 
+class DisableMacroAction < Action
+  
+  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      
+    
+    # state: 0 = enable, 1 = disable, 2 = toggle
+    
+    options = {macro_name: "Change brightness", state: 1, GUID: nil}
+    super(options.merge h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    state = %w(Enable Disable Toggle)[@h[:state]]
+    @s = state + ' macro'# + @h.inspect
+    @s += "\n" + @h[:macro_name]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+end
+
 # MacroDroid Specific
 #
 class ExportMacrosAction < Action
@@ -1888,7 +1928,7 @@ class PauseAction < Action
     options = {
       delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
     }
-    super(h)
+    super(options.merge h)
     
   end  
   

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -0,0 +1,244 @@
+#!/usr/bin/env ruby
+
+# file: actionsnlp.rb
+
+
+class ActionsNlp
+  include AppRoutes
+
+  def initialize(macro=nil)
+
+    super()
+
+    params = {macro: macro}
+    actions(params)
+
+  end
+
+  def actions(params)
+    
+    # -- Conditions/Loops ---------------------------------------------
+    #
+    
+    get /else if (.*)/i do
+      [ElseIfConditionAction, {}]
+    end        
+    
+    #e.g a: if Airplane mode enabled
+    #
+    get /if (.*)/i do
+      [IfConditionAction, {}]
+    end    
+    
+    get /else/i do
+      [ElseAction, {}]
+    end    
+    
+    get /End If/i do
+      [EndIfAction, {}]
+    end          
+    
+    
+    # -- Connectivity ------------------------------------------------------
+    
+    get /^(Enable|Disable) HotSpot/i do |state|
+      enable, state = if state.downcase == 'enable' then
+        [true, 0]
+      else
+        [false, 1]
+      end
+      [SetHotspotAction, {turn_wifi_on: enable, state: state }]
+    end   
+    
+    # e.g. message popup: hello world!
+    get /^(?:message popup|popup message): (.*)/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
+
+    # e.g. Popup Message 'hello world!'
+    get /^Popup[ _]Message ['"]([^'"]+)/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
+    
+    # e.g. Popup Message\n  hello world!
+    get /^Popup Message\n\s+(.*)/im do |msg|
+      [ToastAction, {msg: msg}]
+    end    
+            
+    # e.g. Popup Message
+    get /^Popup Message$/i do
+      [ToastAction, {}]
+    end    
+    
+    # e.g. say current time
+    get /^say current[ _]time/i do
+      [SayTimeAction, {}]
+    end    
+    
+    get /^Torch :?(.*)/i do |onoffstate|
+      state = %w(on off toggle).index onoffstate.downcase
+      [CameraFlashLightAction, {state: state}]
+    end    
+    
+    get /^Take Picture/i do
+      [TakePictureAction, {}]
+    end
+    
+    get /^take_picture/i do
+      [TakePictureAction, {}]
+    end           
+    
+    # -- DEVICE ACTIONS ------------------------------------------------------
+    
+    get /^Speak text \(([^\)]+)\)/i do |text|
+      [SpeakTextAction, {text: text}]
+    end           
+    
+    get /^Speak text ['"]([^'"]+)/i do |text|
+      [SpeakTextAction, {text: text}]
+    end         
+    
+    get /^Speak text$/i do |text|
+      [SpeakTextAction, {}]
+    end     
+    
+    get /^Vibrate \(([^\)]+)/i do |pattern|
+      [VibrateAction, {pattern: pattern}]
+    end     
+    
+    get /^Vibrate$/i do |pattern|
+      [VibrateAction, {pattern: 'short buzz'}]
+    end       
+    
+    # e.g. Display Notification: Hi there: This is the body of the message
+    get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
+      [NotificationAction, {subject: subject, text: text}]
+    end           
+    
+    
+    # e.g. Enable Wifi
+    get /^(Enable|Disable) Wifi$/i do |raw_state|
+      
+      state = raw_state.downcase.to_sym == :enable ? 0 : 1
+      [SetWifiAction, {state: state}]
+      
+    end    
+    
+    # e.g. Play: Altair
+    get /^Play: (.*)$/i do |name|
+
+      [PlaySoundAction, {file_path: name}]
+      
+    end     
+    
+    # e.g. Launch Settings
+    get /^Launch (.*)$/i do |application|
+
+      h = {
+        application_name: application,
+        package_to_launch: 'com.android.' + application.downcase
+      }
+      [LaunchActivityAction, h]
+      
+    end
+    
+    # e.g. HTTP GET http://someurl.com/something
+    get /^HTTP GET ([^$]+)$/i do |url|
+
+      [OpenWebPageAction, url_to_open: url]
+      
+    end
+        
+    get /^HTTP GET$/i do
+
+      [OpenWebPageAction, {}]
+      
+    end    
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /(?:webhook|HTTP GET) ([^$]+)$/i do |s|
+      key = s =~ /^http/ ? :url_to_open : :identifier      
+      [OpenWebPageAction, {key => s}]
+    end
+    
+    #
+    get /^WebHook \(Url\)/i do
+      [OpenWebPageAction, {}]
+    end
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /^webhook$/i do
+      [OpenWebPageAction, {}, params[:macro]]
+    end
+    
+    # -- Location ---------------------------------------------------------
+    
+    get /^Force Location Update$/i do
+      [ForceLocationUpdateAction, params]
+    end    
+    
+    get /^Share Location$/i do
+      [ShareLocationAction, {}]
+    end    
+    
+    #a: Keep Device Awake Screen On Until Disabled
+    #
+    get /Keep Device Awake Screen On Until Disabled/i do
+      [KeepAwakeAction, {enabled: true, permanent: true, screen_option: 0}]
+    end
+    
+    
+    #a: Keep Device Awake Screen On 1h 1m 1s
+    #
+    get /Keep Device Awake Screen On ([^$]+)/i do |duration|
+      
+      a = duration.split.map(&:to_i)
+      secs = Subunit.new(units={minutes:60, hours:60, seconds: 60}, a).to_i
+      
+      h = {
+        permanent: true, screen_option: 0, seconds_to_stay_awake_for: secs
+      }
+      [KeepAwakeAction, h]
+    end
+    
+    get /(?:Keep Device|stay) Awake$/i do
+      [KeepAwakeAction, {}]
+    end    
+    
+    #a: Disable Keep Awake
+    #
+    get /Disable Keep Awake|stay awake off/i do
+      [KeepAwakeAction, {enabled: false, screen_option: 0}]
+    end    
+
+    
+    # -- MacroDroid Specific ------------------------------------------------
+    #
+    
+    get /^((?:En|Dis)able) Macro$/i do |rawstate|
+      state = %w(enable disable toggle).index(rawstate.downcase)
+      [DisableMacroAction, {state: state}]
+    end        
+    
+    get /^Set Variable$/i do
+      [SetVariableAction, {}]
+    end        
+
+    get /^wait (\d+) seconds$/i do |seconds|
+      [PauseAction, {delay_in_seconds: seconds.to_i}]
+    end        
+    
+    # -- Screen ------------------------------------------------
+    #
+    get /^Screen (On|Off)$/i do |state|
+      [ScreenOnAction, {screen_off: state.downcase == 'off'}]
+    end       
+
+  end
+
+  alias find_action run_route
+
+
+end