ruby-macrodroid 0.8.2 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b183aef5c9ca96ad7f0c3abbb5e3439dd6af1a9bb14b9da75ffb99edb9944554
-  data.tar.gz: 237916d146bd126816dfa8f8ffe420ffc8a75fa383d6b5893b4e85bf4702d948
+  metadata.gz: 24d851b05dbc6ecfd52b146846a6bbe935a06d30bfdf523c0550bd18c701b93b
+  data.tar.gz: 97171c71818bc1d0ce3ed70dc790f3464170e18f8ff62b5b3ff47b66f40c49d0
 SHA512:
-  metadata.gz: ab40874c447fe623c393c3e9a4eab63a44ec71b6431cfd295cd95cf11412ad4c0c9f2238fc4e1038d0f256734dd29217e91a790fc927f1e2db1517eae8753bed
-  data.tar.gz: 056c5e9f07eb9f148276392ad881f1658addd43a7022102f6614326bb224a8b2824048647bd223c5f2a649e702b35573856a09a773dfa2b329245a660710fcd8
+  metadata.gz: a9187782e93e70a758e50a07c49812d5bb915dab37bb108d174157a76d76cc2b625b766665ad5ac3f47c7d12d3ac8082b291966aa36c114d4d573ddf38e567b3
+  data.tar.gz: 7514ffbe6a9b4c063fe278c685ce0a860b4d28a1945d4819faa65b081395b701b5dab657a3d7764b87689f230c74d7c14051e563ad4360937ade7f78466ac3a3

data/lib/ruby-macrodroid.rb

@@ -154,6 +154,16 @@ class ActionsNlp
       [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, {}]
@@ -243,16 +253,17 @@ class ActionsNlp
       [KeepAwakeAction, {enabled: false, screen_option: 0}]
     end    
 
+    #a: Disable Keep Awake
+    #
+    get /if (.*)/i do
+      [IfConditionAction, {}]
+    end      
 
   end
 
   alias find_action run_route
 
-  def to_s(colour: false)
-    'ActionsNlp ' + @h.inspect
-  end
 
-  alias to_summary to_s
 end
 
 class ConstraintsNlp
@@ -333,6 +344,7 @@ module Params
 end
 
 
+
 class Macro
   using ColouredText
   using Params
@@ -379,6 +391,7 @@ class Macro
       local_variables: @local_variables,
       m_trigger_list: @triggers.map(&:to_h),
       m_action_list: @actions.map(&:to_h),
+      m_category: @category,
       m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
       m_name: title(),
@@ -402,11 +415,30 @@ class Macro
       puts 'h:' + h.inspect
     end
     
+    @category = h[:category]
     @title = h[:name]
     @description = h[:description]
     
     # fetch the local variables
-    @local_variables = h['local_variables']
+    if h[:local_variables].any? and h[:local_variables].first.any? then
+      
+      @local_variables = h[:local_variables].map do |var|
+              
+        val = case var[:type]
+        when 0 # boolean
+          var[:boolean_value]
+        when 1 # integer
+          var[:int_value]
+        when 2 # string
+          var[:string_value]
+        when 3 # decimal
+          var[:decimal_Value]
+        end
+        
+        [var[:name], val]
+        
+      end.to_h
+    end
     
     # fetch the triggers
     @triggers = h[:trigger_list].map do |trigger|
@@ -419,17 +451,17 @@ class Macro
     @actions = h[:action_list].map do |action|
       object(action.to_snake_case)
     end
-
+    puts 'before fetch constraints' if @debug
     # fetch the constraints                               
     @constraints = h[:constraint_list].map do |constraint|
       object(constraint.to_snake_case)
     end                               
-    
+    puts 'after fetch constraints' if @debug    
     @h = h
 
     %i(local_variables m_trigger_list m_action_list m_constraint_list)\
       .each {|x| @h[x] = [] }
-
+    puts 'after @h set' if @debug    
     @h
 
   end
@@ -446,6 +478,7 @@ class Macro
       # level 2
       
       @title = node.attributes[:name]
+      @category = node.attributes[:category]
       @description = node.attributes[:description]
       
       
@@ -513,20 +546,42 @@ class Macro
       @actions = node.xpath('action').map do |e|
         
         puts 'action e: ' + e.xml.inspect if @debug
-        r = ap.find_action e.text
+        puts 'e.text ' + e.text if @debug
+        
+        inner_lines = e.xpath('item/description/text()')        
+        
+        action = if e.text.to_s.strip.empty? then
+          inner_lines.shift
+        else
+          e.text.strip
+        end
+        
+        r = ap.find_action action
         puts 'found action ' + r.inspect if @debug
         
         if r then
           
-          a = e.xpath('item/*')
+          loose = inner_lines.shift
+          
+          raw_attributes = if loose then
           
-          h = if a.any? then
-            a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+            puts 'do something ' + loose.to_s if @debug
+            loose.to_s
+            
           else
-            {}
+            
+            a = e.xpath('item/*')
+            
+            h = if a.any? then
+              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+            else
+              {}
+            end
+            
+            r[1].merge(h)
+            
           end
-          
-          r[0].new(r[1].merge(h))
+          r[0].new(raw_attributes)
         end
         
       end      
@@ -634,7 +689,7 @@ EOF
         
       end
       
-      if s =~ /^If/i then
+      if s =~ /^(?:If|DO \/ WHILE)/i then
         
         if indent < 1 then
           
@@ -655,13 +710,32 @@ EOF
       r
       
     end.join("\n")
+
+    a = []
+    a << '# ' + @category + "\n" if @category
+    a <<  (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
+
+    
+    if @description and @description.length >= 1 then
+      a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  ")
+    end    
+    
+    if @local_variables.length >= 1 then
+      
+      vars = @local_variables.map do |k,v|
+        label = colour ? 'v'.bg_magenta : 'v'
+        label += ': '
+        label + "%s: %s" % [k,v]
+      end
+      
+      a << vars.join("\n")
+    end
     
-    a = [
-      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
-      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
-                     + ": %s" % x}.join("\n"),
-      actions
-    ]
+    a << @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
+                     + ": %s" % x}.join("\n")
+    a << actions
+
     
     if @constraints.any? then
       a << @constraints.map do |x|
@@ -669,10 +743,9 @@ EOF
       end.join("\n") 
     end
     
-    if @description and @description.length >= 1 then
-      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
-               + @description.gsub(/\n/,"\n  "))
-    end
+
+    
+
     
     a.join("\n") + "\n"
     
@@ -735,7 +808,7 @@ EOF
       h2 = h.merge( macro: self)
       puts 'h2: ' + h2.inspect      
       r = klass.new h2 
-
+      puts 'r:' + r.inspect
       r
       
     end
@@ -745,8 +818,6 @@ EOF
 end
 
 
-
-
 class MacroDroidError < Exception
 end
 
@@ -775,6 +846,7 @@ class MacroDroid
       if s[0] == '{' then
         
         import_json(s) 
+        puts 'after import_json' if @debug
         
       elsif  s[0] == '<'
         
@@ -867,7 +939,7 @@ class MacroDroid
   end
 
   alias to_json export_json
-
+  
 
   def to_h()
 

data/lib/ruby-macrodroid/actions.rb

@@ -53,14 +53,14 @@ class Action < MacroObject
     "%s/%s: %s" % [@group, @type, s]
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
 
     h = @h.clone    
     h.delete :macro
     @s ||= "#<%s %s>" % [self.class, h.inspect]
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
-        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)
     
     @s + constraints
     
@@ -69,43 +69,6 @@ class Action < MacroObject
 end
 
 
-class LocationAction < Action
-  
-  def initialize(h={})
-    super(h)
-    @group = 'location'
-  end
-  
-end
-
-# Category: Location
-#
-class ShareLocationAction < LocationAction
-
-  def initialize(h={})
-    
-    super()
-
-    options = {
-      email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", 
-                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
-                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
-      sim_id: 0,
-      output_channel: 5,
-      old_variable_format: true
-    }
-
-    super(options.merge h)
-
-  end
-
-  def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
 
 
 class ApplicationAction < Action
@@ -134,7 +97,7 @@ class LaunchActivityAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Launch ' + @h[:application_name]
   end
 
@@ -155,7 +118,7 @@ class KillBackgroundAppAction < ApplicationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'KillBackgroundAppAction ' + @h.inspect
   end
 
@@ -176,7 +139,7 @@ class LaunchShortcutAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
     super()
   end
@@ -205,7 +168,7 @@ class OpenWebPageAction < ApplicationAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     "HTTP GET\n  url: " + @h[:url_to_open]
   end
 
@@ -236,7 +199,7 @@ class UploadPhotoAction < CameraAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'UploadPhotoAction ' + @h.inspect
   end
 
@@ -266,13 +229,16 @@ class TakePictureAction < CameraAction
     'take_photo :' + camera.to_s
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Take Picture'
   end  
 
 end
 
-class IfConditionAction < Action
+
+# Conditions/Loops
+#
+class IfConfirmedThenAction < Action
   
   def initialize(h={})
     
@@ -286,11 +252,97 @@ class IfConditionAction < Action
 
     super(h2)
     
+    @label = 'If Confirmed Then '
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    @s = "If Confirmed Then " #+ @constraints.map(&:to_s).join(" %s " % operator)
+    super(colour: colour)
+    
+  end
+end
+
+# Conditions/Loops
+#
+class LoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'DO / WHILE '
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'DO / WHILE '
+    super()
+    
+  end
+end
+
+# Conditions/Loops
+#
+class EndLoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'End Loop '
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    'End Loop '
+    
+  end
+end
+
+# Conditions/Loops
+#
+class IfConditionAction < Action
+  
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    else
+      # get the constraints
+
+    end
+    
+    options = {
+      a: true,
+      constraint_list: ''
+    }
+    
+    macro = h[:macro]
+    h2 = options.merge(filter(options,h).merge(macro: macro))
+
+    super(h2)
+    
     @label = 'If '
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
     super(colour: colour)
@@ -311,13 +363,13 @@ class ElseAction < Action
 
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Else'
   end
   
 end
 
-class ElseIfConditionAction < IfConditionAction
+class ElseIfConditionAction < Action
   
   def initialize(h={})
 
@@ -326,9 +378,14 @@ class ElseIfConditionAction < IfConditionAction
     }
 
     super(options.merge h)
-    @label = 'ElseIf '
+    @label = 'Else If '
 
   end  
+  
+  def to_s(colour: false, indent: 0)
+    @s = 'Else If '
+    super()
+  end
     
 
 end
@@ -346,7 +403,7 @@ class EndIfAction < Action
 
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'End If'
   end
   
@@ -376,7 +433,7 @@ class SetAirplaneModeAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     state = ['On', 'Off', 'Toggle'][@h[:state]]
     @s = 'Airplane Mode ' + state + "\n"
@@ -402,7 +459,7 @@ class SetWifiAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     action = @h[:state] == 0 ? 'Enable' : 'Disable'
     action + ' Wifi'
   end
@@ -424,7 +481,7 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetBluetoothAction ' + @h.inspect
   end
 
@@ -446,7 +503,7 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetBluetoothAction ' + @h.inspect
   end
 
@@ -466,7 +523,7 @@ class SetHotspotAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
     action + ' HotSpot'
   end
@@ -498,7 +555,7 @@ class SendIntentAction < ConnectivityAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Send Intent ' + "\n  " + @h[:action]
   end
 
@@ -538,7 +595,7 @@ class SetAlarmClockAction < DateTimeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetAlarmClockAction ' + @h.inspect
   end
 
@@ -560,7 +617,7 @@ class StopWatchAction < DateTimeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'StopWatchAction ' + @h.inspect
   end
 
@@ -591,7 +648,7 @@ class SayTimeAction < DateTimeAction
     'say current_time()'
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Say Current Time'
   end  
 
@@ -621,7 +678,7 @@ class AndroidShortcutsAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AndroidShortcutsAction ' + @h.inspect
   end
 
@@ -642,8 +699,8 @@ class ClipboardAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
-    'ClipboardAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    'Fill Clipboard' + "\n  " + @h[:clipboard_text] #+ @h.inspect
   end
 
   alias to_summary to_s
@@ -662,7 +719,7 @@ class PressBackAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'PressBackAction ' + @h.inspect
   end
 
@@ -690,7 +747,7 @@ class SpeakTextAction < DeviceAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     "Speak Text (%s)" % @h[:text_to_say]
   end
 
@@ -711,8 +768,43 @@ class UIInteractionAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
-    'UIInteractionAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+
+    ui = @h[:ui_interaction_configuration]
+    
+    option = -> do
+      detail = case ui[:click_option]
+      when 0 # 'Current focus'
+        'Current focus'
+      when 1 # 'Text content'
+        ui[:text_content]
+      when 2 # 'X, Y location'
+        "%s" % ui[:xy_point].values.join(',')
+      when 3 # 'Identify in app'
+        "id:%s" % ui[:view_id]
+      end      
+    end
+    
+    s = case @h[:action]
+    when 0 # 'Click'      
+      'Click' + " [%s]" % option.call
+    when 1 # 'Long Click'
+      'Long Click' + " [%s]" % option.call
+    when 2 # 'Copy'
+      'Copy'
+    when 3 # 'Cut'
+      'Cut'
+    when 4 # 'Paste'
+      "Paste [%s]" % (ui[:use_clipboard] ? 'Clipboard text' : ui[:text])
+    when 5 # 'Clear selection'
+      'Clear selection'
+    when 6 # 'Gesture'
+      detail = "%d ms: %d,%d -> %d,%d" % [ui[:duration_ms], ui[:start_x], 
+          ui[:start_y], ui[:end_x], ui[:end_y]]
+      "Gesture [%s]" % detail
+    end
+    
+    'UI Interaction' + "\n  " + s #+ ' ' + @h.inspect
   end
 
   alias to_summary to_s
@@ -731,7 +823,7 @@ class VoiceSearchAction < DeviceAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'VoiceSearchAction ' + @h.inspect
   end
 
@@ -762,7 +854,7 @@ class ExpandCollapseStatusBarAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ExpandCollapseStatusBarAction ' + @h.inspect
   end
 
@@ -782,7 +874,7 @@ class LaunchHomeScreenAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'LaunchHomeScreenAction ' + @h.inspect
   end
 
@@ -793,6 +885,11 @@ end
 #
 class CameraFlashLightAction < DeviceSettingsAction
 
+  # options
+  #  0  Toch On
+  #  1  Torch Off
+  #  2  Torch Toggle
+  #
   def initialize(h={})
 
     options = {
@@ -808,7 +905,7 @@ class CameraFlashLightAction < DeviceSettingsAction
     ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     ['Torch On', 'Torch Off', 'Torch Toggle'][@h[:state]]    
   end  
 
@@ -828,7 +925,7 @@ class VibrateAction < DeviceSettingsAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     pattern = [
       'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
@@ -855,7 +952,7 @@ class SetAutoRotateAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetAutoRotateAction ' + @h.inspect
   end
 
@@ -875,7 +972,7 @@ class DayDreamAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'DayDreamAction ' + @h.inspect
   end
 
@@ -895,7 +992,7 @@ class SetKeyboardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetKeyboardAction ' + @h.inspect
   end
 
@@ -916,7 +1013,7 @@ class SetKeyguardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetKeyguardAction ' + @h.inspect
   end
 
@@ -937,7 +1034,7 @@ class CarModeAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'CarModeAction ' + @h.inspect
   end
 
@@ -959,7 +1056,7 @@ class ChangeKeyboardAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ChangeKeyboardAction ' + @h.inspect
   end
 
@@ -985,7 +1082,7 @@ class SetWallpaperAction < DeviceSettingsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetWallpaperAction ' + @h.inspect
   end
 
@@ -1001,6 +1098,40 @@ class FileAction < Action
   
 end
 
+
+
+# Category: Files
+#
+class FileOperationV21Action < FileAction
+
+  def initialize(h={})
+
+    options = {
+      :app_name=>"", :class_name=>"", :package_name=>"", :file_path=>"", 
+      :file_extensions=>["jpg", "jpeg", "png", "raw", "bmp", "tif", "tiff", 
+                         "gif"], :file_option=>2, :from_name=>"Sent", 
+      :from_uri_string=>"", :option=>2
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    
+    operation = ['Copy', 'Move', 'Delete', 'Create Folder']
+    file = ['All Files', 'All Media Files', 'Images', 'Audio', 'Videos', 'Specify File Pattern', 'Folder']
+    
+    detail = @h[:from_name]
+    detail += ' to: ' + @h[:to_name] if @h[:option] == 1
+    @s = "%s %s" % [operation[@h[:option]], file[@h[:file_option]]]  \
+        + "\n  " + detail #+ @h.inspect        
+    super()
+  end
+
+  alias to_summary to_s
+end
+
 # Category: Files
 #
 class OpenFileAction < FileAction
@@ -1018,7 +1149,7 @@ class OpenFileAction < FileAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'OpenFileAction ' + @h.inspect
   end
 
@@ -1026,6 +1157,30 @@ class OpenFileAction < FileAction
 end
 
 
+# Category: Files
+#
+class WriteToFileAction < FileAction
+
+  def initialize(h={})
+
+    options = {
+      app_name: '',
+      class_name: '',
+      package_name: '',
+      file_path: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false, indent: 0)
+    'Write To File' + "\n  " + @h[:filename] #+ @h.inspect
+  end
+
+  alias to_summary to_s
+end
+
 class LocationAction < Action
   
   def initialize(h={})
@@ -1048,22 +1203,37 @@ class ForceLocationUpdateAction < LocationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ForceLocationUpdateAction ' + @h.inspect
   end
 
   alias to_summary to_s
 end
 
+# Category: Location
+#
+class LocationAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'location'
+  end
+  
+end
+
 # Category: Location
 #
 class ShareLocationAction < LocationAction
 
   def initialize(h={})
+    
+    super()
 
     options = {
       email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable: {:m_stringValue=>"", :m_name=>"", 
+                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
+                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
       sim_id: 0,
       output_channel: 5,
       old_variable_format: true
@@ -1073,13 +1243,15 @@ class ShareLocationAction < LocationAction
 
   end
 
-  def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    @s = 'Share Location' + "\n  GPS" # + @h.inspect
+    super()
   end
 
   alias to_summary to_s
 end
 
+
 # Category: Location
 #
 class SetLocationUpdateRateAction < LocationAction
@@ -1095,7 +1267,7 @@ class SetLocationUpdateRateAction < LocationAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetLocationUpdateRateAction ' + @h.inspect
   end
 
@@ -1138,7 +1310,7 @@ class AddCalendarEntryAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AddCalendarEntryAction ' + @h.inspect
   end
 
@@ -1160,7 +1332,7 @@ class LogAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'LogAction ' + @h.inspect
   end
 
@@ -1181,13 +1353,39 @@ class ClearLogAction < LoggingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearLogAction ' + @h.inspect
   end
 
   alias to_summary to_s
 end
 
+# MacroDroid Specific
+#
+class ConfirmNextAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      :message=>"Do you want to fill the clipboard? ", :title=>"Fill clipboard? ", :negative_text=>"NO", :positive_text=>"YES", :class_type=>"ConfirmNextAction"
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    @s = 'Confirm Next'  + "\n  %s: %s" % [@h[:title], @h[:message]]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
 class ExportMacrosAction < Action
@@ -1201,7 +1399,7 @@ class ExportMacrosAction < Action
     
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     'Export macros'
     
@@ -1211,6 +1409,114 @@ class ExportMacrosAction < Action
   
 end
 
+
+# MacroDroid Specific
+#
+class SetVariableAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      :user_prompt=>true, 
+      :user_prompt_message=>"Please enter a word to see it reversed", 
+      :user_prompt_show_cancel=>true, 
+      :user_prompt_stop_after_cancel=>true, 
+      :user_prompt_title=>"Word reverse",
+      :name => 'word'
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    input = if @h[:user_prompt] then
+      '[User Prompt]'
+    elsif @h[:expression]
+      @h[:expression]
+    elsif @h[:int_value_increment]
+      '(+1)'      
+    elsif @h[:int_value_decrement]
+      '(-1)'
+    elsif @h[:int_random]
+      "Random %d -> %d" % [@h[:int_random_min], @h[:int_random_max]]
+    else
+
+=begin      
+        sym = case @h[:variable][:type]
+        when 0 # boolean
+          :new_boolean_value
+        when 1 # integer
+          :new_int_value
+        when 2 # string
+          :new_string_value
+        when 3 # decimal
+          :new_double_value
+        end
+        
+        @h[sym].to_s
+=end        
+        a = %i(new_boolean_value new_int_value new_string_value new_double_value)
+        @h[a[@h[:variable][:type]]].to_s
+
+    end
+    
+    @s = 'Set Variable' + ("\n  %s: " % @h[:variable][:name]) + input #+ @h.inspect
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
+
+
+# MacroDroid Specific
+#
+class TextManipulationAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    
+    #tm = @h[:text_manipulation][:type]
+
+    #s = case tm[:type].to_sym
+    s = case 3 # @h[:text_manipulation][:option].to_i
+    when 0 # :SubstringManipulation
+      "Substring(%s, %s)" % [@h[:text], tm[:params].join(', ')]
+    when 1 # :ReplaceAllManipulation
+      "Replace all(%s, %s, %s)" % [@h[:text], *tm[:params]]      
+    when 2 # :ExtractTextManipulation
+      "Extract text(%s, %s)" % [@h[:text], tm[:params].join(', ')]      
+    when 3 # :UpperCaseManipulation
+      "Upper case(%s)" % [@h[:text]]
+      #'foo'
+    when 4 # :LowerCaseManipulation
+      "Lower case(%s)" % [@h[:text]]      
+    when 5 # :TrimWhitespaceManipulation
+      "Trim whitespace(%s)" % [@h[:text]]      
+    end
+
+    'Text Manipulation' + "\n  " + s.inspect #+ ' ' + @h.inspect        
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
+
+
+
 class PauseAction < Action
   
   def initialize(h={})
@@ -1222,7 +1528,7 @@ class PauseAction < Action
     
   end  
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     su = Subunit.new(units={minutes:60, hours:60}, 
                      seconds: @h[:delay_in_seconds])
@@ -1266,7 +1572,7 @@ class RecordMicrophoneAction < MediaAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'RecordMicrophoneAction ' + @h.inspect
   end
 
@@ -1288,7 +1594,7 @@ class PlaySoundAction < MediaAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Play: ' + @h[:file_path]
   end
 
@@ -1324,8 +1630,10 @@ class SendEmailAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
-    'SendEmailAction ' + @h.inspect
+  def to_s(colour: false, indent: 0)
+    recipient = @h[:email_address]
+    @s = 'Send EmailAction' + "\n  To: " + recipient #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1350,7 +1658,7 @@ class SendSMSAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SendSMSAction ' + @h.inspect
   end
 
@@ -1373,7 +1681,7 @@ class UDPCommandAction < MessagingAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'UDPCommandAction ' + @h.inspect
   end
 
@@ -1412,7 +1720,7 @@ class ClearNotificationsAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearNotificationsAction ' + @h.inspect
   end
 
@@ -1444,7 +1752,7 @@ class MessageDialogAction < NotificationsAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'Display Dialog' + "\n  Battery at: [battery]"
   end
 
@@ -1464,7 +1772,7 @@ class AllowLEDNotificationLightAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'AllowLEDNotificationLightAction ' + @h.inspect
   end
 
@@ -1485,7 +1793,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1506,7 +1814,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1527,7 +1835,7 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetNotificationSoundAction ' + @h.inspect
   end
 
@@ -1561,7 +1869,7 @@ class NotificationAction < NotificationsAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     "Display Notification\n  " + \
         "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
   end
@@ -1572,7 +1880,13 @@ end
 #
 class ToastAction < NotificationsAction
 
-  def initialize(h={})
+  def initialize(obj)
+    
+    h = if obj.is_a? Hash then
+      obj
+    else
+      {msg: obj}
+    end
 
     if h[:msg] then
       h[:message_text] = h[:msg]
@@ -1602,8 +1916,8 @@ class ToastAction < NotificationsAction
     "popup_message '%s'" % @h[:message_text]
   end
   
-  def to_s(colour: false)
-    "Popup Message\n  %s" % @h[:message_text]
+  def to_s(colour: false, indent: 0)
+    @s = "Popup Message\n  %s" % @h[:message_text]
   end
 
 end
@@ -1632,7 +1946,7 @@ class AnswerCallAction < PhoneAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     @s = 'Answer Call' + "\n  "
     super()
   end
@@ -1654,7 +1968,7 @@ class ClearCallLogAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ClearCallLogAction ' + @h.inspect
   end
 
@@ -1674,7 +1988,7 @@ class OpenCallLogAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'OpenCallLogAction ' + @h.inspect
   end
 
@@ -1694,7 +2008,7 @@ class RejectCallAction < PhoneAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     @s = 'Call Reject' + "\n  "
     super()
   end
@@ -1716,7 +2030,7 @@ class MakeCallAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'MakeCallAction ' + @h.inspect
   end
 
@@ -1738,7 +2052,7 @@ class SetRingtoneAction < PhoneAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetRingtoneAction ' + @h.inspect
   end
 
@@ -1770,7 +2084,7 @@ class SetBrightnessAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetBrightnessAction ' + @h.inspect
   end
 
@@ -1791,7 +2105,7 @@ class ForceScreenRotationAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'ForceScreenRotationAction ' + @h.inspect
   end
 
@@ -1815,7 +2129,7 @@ class ScreenOnAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     state = @h[:screen_off] ? 'Off' : 'On'
     state += ' ' + 'No Lock (root only)' if @h[:screen_off_no_lock]
@@ -1843,7 +2157,7 @@ class DimScreenAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'DimScreenAction ' + @h.inspect
   end
 
@@ -1871,7 +2185,7 @@ class KeepAwakeAction < ScreenAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
     
@@ -1912,7 +2226,7 @@ class SetScreenTimeoutAction < ScreenAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SetScreenTimeoutAction ' + @h.inspect
   end
 
@@ -1943,7 +2257,7 @@ class SilentModeVibrateOffAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SilentModeVibrateOffAction ' + @h.inspect
   end
 
@@ -1965,7 +2279,7 @@ class SetVibrateAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     
     a = [
       'Silent (Vibrate On)',
@@ -2002,7 +2316,7 @@ class VolumeIncrementDecrementAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'VolumeIncrementDecrementAction ' + @h.inspect
   end
 
@@ -2024,7 +2338,7 @@ class SpeakerPhoneAction < VolumeAction
 
   end
 
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     'SpeakerPhoneAction ' + @h.inspect
   end
 
@@ -2049,7 +2363,7 @@ class SetVolumeAction < VolumeAction
 
   end
   
-  def to_s(colour: false)
+  def to_s(colour: false, indent: 0)
     volume = @h[:stream_index_array].zip(@h[:stream_volume_array]).to_h[true]
     'Volume Change ' + "Notification = %s%%" % volume    
   end