ruby-macrodroid 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11509c0f7448ef65211af5a07e3191f4292eecfe6c8aa19d79a520b4aaf04f21
-  data.tar.gz: '08960e2e07bf7c467233be373ae1ae8978302122cba7ab6dfca3c5e28cfe7c46'
+  metadata.gz: cfb8dbf1cb2f5796722de69e98afcb6d7058ba6faf743740a989589fd3d72fc5
+  data.tar.gz: 4b6ff72308bae85939e3eadf7776a3b56d2b8084103633dbb7754f496fb7c037
 SHA512:
-  metadata.gz: 0dd2c7ef1a69f05eb9eb235aac3a8805522f68731c2f980fd730eb0b34ee15066d23ead4f74c3dbd762fc3bfb31d852bdfb5f637d362a4a4cbe0b4e5de17c338
-  data.tar.gz: 2483d3e4901eb5a839ab3c716674f0fbf0fe925bb94bfa99a71ec5803aab0472235be98dd5773bbb5fd57ee7c8c1c77d242d5e7fbcf5f5bb4dfd09580a24f96a
+  metadata.gz: 722fc170955c3ee925821859e87c3380b5769db34081c8318ee043218e2bb36ae43e104d6c701238ef887405c30c8d05ab3cba32a040e6430392bc60dd6dbce1
+  data.tar.gz: 2343b75872d051e055d3dd6955dcf03c7c236ef5f77e1b43b5618515b8f0170728878336fe8a2aed5eac51ddce9361c751f3d9170418ee289d2e5522b18ff472

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-�
-0Ch��b֏��j�X��.��g$�}�PU"O��P]�tSE}�E�a�|'?�]1�
+��-��TCc������(�M
+n+F��
+vkG  EE ��A��m��<��dB$%����7j}i]�<ڴ��s��&
΃|\n���e����W�"�T6A���ҎC� �'H�oq}���Pԅ˭�S�)�D�J��[�ٳFa#��PE�hby^�1׋b����wO"��Qʢ�g�ha����������`*��6/��G�}�Y�Z�u���wu��+�g</4�>$�D����.��XU���`q-

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

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
 
 
@@ -1722,6 +1706,49 @@ 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 = 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}/ }
+      
+      if found then     
+        {macro_name: found.title, GUID: found.guid}
+      else
+        {macro_name: name}
+      end
+
+    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

data/lib/ruby-macrodroid/base.rb

@@ -34,7 +34,9 @@ module ObjectX
         r = ap.find_action action          
         puts 'r: ' + r.inspect if debug
         
-        if r[1].any? then
+        nested = description.element('item/description')
+        
+        if r[1].any? and not nested then
           
           macro.add r[0].new(r[1])
           
@@ -194,11 +196,11 @@ class MacroObject
   private
   
   def hashify(h)
-    puts 'h: ' + h.inspect
+    #puts 'h: ' + h.inspect
     h2 = h.inject({}) do |r,x|
-      puts 'x: ' + x.inspect #if $debug
+      #puts 'x: ' + x.inspect #if $debug
       key, value = x
-      puts 'key: ' + key.inspect #if $debug
+      #puts 'key: ' + key.inspect #if $debug
       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'

data/lib/ruby-macrodroid/macro.rb

@@ -181,7 +181,29 @@ class ActionsNlp
 
   end
 
-  def actions(params) 
+  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 ------------------------------------------------------
     
@@ -195,7 +217,7 @@ class ActionsNlp
     end   
     
     # e.g. message popup: hello world!
-    get /^message popup: (.*)/i do |msg|
+    get /^(?:message popup|popup message): (.*)/i do |msg|
       [ToastAction, {msg: msg}]
     end
 
@@ -357,22 +379,15 @@ class ActionsNlp
       [KeepAwakeAction, {enabled: false, screen_option: 0}]
     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          
     
     # -- 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        
@@ -421,7 +436,7 @@ class ConstraintsNlp
     
     # -- MacroDroid specific -----------------------------------------------------------------------
     
-    get /^(\w+) (=) (\[?\w+\]?)/i do |loperand, operator, roperand|
+    get /^(\w+) (=) (.*)/i do |loperand, operator, roperand|
       
       h = {
         loperand: loperand, 
@@ -475,19 +490,20 @@ class Macro
   include ObjectX
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
-      :guid, :deviceid
+      :guid, :deviceid, :parent
   attr_accessor :title, :description, :remote_url, :picture_path
 
   def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, \
-                 picture_path: nil, debug: false)
+                 picture_path: nil, parent: nil, debug: false)
 
     @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    @remote_url, @picture_path = remote_url, picture_path
+    @remote_url, @picture_path, @parent = remote_url, picture_path, parent
     
     puts 'inside Macro#initialize' if @debug    
           
     @local_variables, @triggers, @actions, @constraints = {}, [], [], []
     @h = {}
+    @guid = generate_guid()
     
   end
   
@@ -529,7 +545,7 @@ class Macro
       m_description: '',
       m_name: title(),
       m_excludeLog: false,
-      m_GUID: guid(),
+      m_GUID: @guid,
       m_isOrCondition: false,
       m_enabled: true,
       m_descriptionOpen: false,
@@ -548,6 +564,7 @@ class Macro
       puts 'h:' + h.inspect
     end
     
+    @guid = h[:guid]
     @category = h[:category]
     @title = h[:name]
     @description = h[:description]
@@ -1036,8 +1053,8 @@ EOF
 
   private
   
-  def guid()
-    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
+  def generate_guid()
+    ('-' + rand(1..9).to_s + 18.times.map { rand 9 }.join).to_i
   end
 
   def object(h={})

metadata

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