ruby-macrodroid 0.9.6 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652f6174d50060ca2b7e3197c2bc79062ed6af498b1982ef8c73e27b0422ad85
-  data.tar.gz: 86096eb1c1fef612666065e0e3d48c619b4768d801723b6beaa273687d643fec
+  metadata.gz: 7c377e6586f261b43617f7daa117872cab4a642476c7923a6b353e2d3adfea8b
+  data.tar.gz: 73dc4c91553017f35fa6d37afcda647ff1e14fd732f6bb52c89266fde62c66f0
 SHA512:
-  metadata.gz: f9705342b8176dc48a5bfca362a17e340bfd56f67d2eafa3b20602fa493d02cbf5a9cbfe13b2dfb02565a74bb02bf01477de6884151a659fab4500c4b2cbfea4
-  data.tar.gz: 6e7bae11b8cf64ff3b0efd4f852f6bb8c2e419aa8d25693aeb894dde64c063c2dbcf9abe9bddf5dbe87cb630d8fa6e6c183d105b6b71fedee804918a79467489
+  metadata.gz: 1fc6439e1bb63fde2828ba2cc3593223b0fdf9ec22c6caf2e926456973663f85cb0f389d641503e41e82c1b660412781485b8ef8b280b55fe7e077ebdaa64cce
+  data.tar.gz: 2056084f2c420f6f7a3328c92f6ebad1caf150a0a34ea353f1ce2fce5c22c237841ce02dbea3a805eb73baad69a4beb57050570a593a63052559a498fb22c416

data/lib/ruby-macrodroid.rb

@@ -110,16 +110,19 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
-  attr_accessor :deviceid, :remote_url
+  attr_accessor :deviceid, :remote_url, :picture_path
   
   # note: The deviceid can only be found from an existing Webhook trigger, 
   #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, deviceid: nil, remote_url: nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, remote_url: nil, 
+                 picture_path: '/storage/emulated/0/Pictures', debug: false)
 
     @deviceid, @remote_url, @debug = deviceid, remote_url, debug    
+    @picture_path = picture_path
     
     @geofences = {}
+    @macros = []
     
     if obj then
       
@@ -143,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)
@@ -227,6 +203,10 @@ class MacroDroid
   def export(filepath)
     FileX.write filepath, to_json
   end
+  
+  def import(s)
+    import_txt(s)
+  end
 
   def to_json()
 
@@ -334,7 +314,8 @@ class MacroDroid
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                    remote_url: @remote_url, debug: @debug )
+                    remote_url: @remote_url, picture_path: @picture_path, 
+                    parent: self, debug: @debug )
       m.import_h(macro)
       m
 
@@ -353,14 +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, debug: @debug).import_xml(node)
+                remote_url: @remote_url, picture_path: @picture_path, 
+                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)
     
@@ -380,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, 
-                debug: @debug).import_xml(node)
+                picture_path: @picture_path, parent: self, debug: @debug)\
+                .import_xml(node)
       
     end
   end

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,
@@ -284,11 +284,64 @@ end
 #
 class TakePictureAction < CameraAction
 
-  def initialize(h={})
+  def initialize(obj=nil)
+
+    
+    h = if obj.is_a? Hash then
+
+      macro = obj[:macro]    
+      obj.delete :macro
+      obj
+
+      
+    elsif obj.is_a? Array
+      
+      e, macro = obj
+      
+      #puts 'e: ' + e.xml.inspect
+
+      a = e.xpath('item/*')
+      
+      if a.any? then
+        
+        h2 = a.map {|node| [node.name.to_sym, node.text.to_s.strip]}.to_h
+        
+        desc = ''
+        
+        if h2[:description] then
+
+          desc = h2[:description]
+          h2.delete :description
+          #puts 'desc: ' + desc.inspect
+          
+          if desc.length > 1 then
+            
+            flash = case desc
+            when /Flash On/i
+              1
+            when /Flash Auto/i
+              2
+            else
+              0
+            end
+            
 
+          end          
+          
+        end
+        
+        {
+          use_front_camera: (desc =~ /Front Facing/ ? true : false),
+          flash_option: flash
+        }.merge(h2)          
+        
+      
+      end
+    end
+    
     options = {
-      new_path: '/storage/sdcard1/DCIM/Camera',
-      path: '/storage/sdcard1/DCIM/Camera',
+      new_path: macro.picture_path,
+      path: macro.picture_path,
       show_icon: true,
       use_front_camera: true,
       flash_option: 0
@@ -304,7 +357,22 @@ class TakePictureAction < CameraAction
   end
 
   def to_s(colour: false, indent: 0)
-    'Take Picture'
+    
+    flash = case @h[:flash_option]
+    when 0
+      ''
+    when 1
+      'Flash On'
+    when 2
+      'Flash Auto'
+    end
+    
+    @s = 'Take Picture'# + @h.inspect
+    a = [@h[:use_front_camera] ? 'Front Facing' : 'Rear Facing']
+    a << flash if flash.length > 0
+    @s += "\n" + a.join(', ')
+    super()
+    
   end  
 
 end
@@ -401,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: []
@@ -424,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
@@ -446,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
         
@@ -466,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)    
@@ -489,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
 
@@ -537,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
 
 
@@ -709,6 +761,9 @@ class SetHotspotAction < ConnectivityAction
   
   def initialize(h={})
 
+    # to-do: check when *disable hotspot*, is the 
+    #        *enable wifi* option selected?
+    
     options = {
       device_name: "", state: 0, turn_wifi_on: true, use_legacy_mechanism: false, mechanism: 0
 
@@ -719,8 +774,15 @@ class SetHotspotAction < ConnectivityAction
   end
   
   def to_s(colour: false, indent: 0)
-    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
-    action + ' HotSpot'
+    
+    @s =  "%s HotSpot" % [@h[:state] == 0 ? 'Enable' : 'Disable']
+    
+    if @h[:state] == 1 then
+      @s += "\n" + (@h[:turn_wifi_on] ? 'Enable WiFi' : 'Don\'t Enable Wifi')
+    end
+    
+    super()
+    
   end
 end
 
@@ -1644,6 +1706,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
@@ -1810,7 +1917,7 @@ class PauseAction < Action
     options = {
       delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
     }
-    super(h)
+    super(options.merge h)
     
   end