ruby-macrodroid 0.8.8 → 0.9.0

data/lib/ruby-macrodroid/actions.rb

@@ -42,29 +42,17 @@ class Action < MacroObject
     macro = h[:macro]
     h.delete :macro
     super(h)
-    
-    # fetch the constraints                               
+
     @constraints = @h[:constraint_list].map do |constraint|
       object(constraint.to_snake_case.merge(macro: macro))
-    end       
+    end
+    
   end
   
-  def invoke(s='')    
-    "%s/%s: %s" % [@group, @type, s]
+  def invoke(h={})    
+    "%s/%s: %s" % [@group, @type, h.to_json]
   end  
   
-  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| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)
-    
-    @s + constraints
-    
-  end  
   
 end
 
@@ -140,7 +128,7 @@ class LaunchShortcutAction < ApplicationAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
+    @s = "Launch Shortcut: " + @h[:app_name] + "\n" + @h[:name]
     super()
   end
   
@@ -148,28 +136,52 @@ class LaunchShortcutAction < ApplicationAction
 
 end
 
+class OpenWebPageActionError < Exception
+end
+
 # Category: Applications
 #
 class OpenWebPageAction < ApplicationAction
 
-  def initialize(h={})
+  def initialize(obj={})
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {url: (txt || e.text)}
+    end    
     
     h[:url_to_open] = h[:url] if h[:url]
 
     options = {
-      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable_to_save_response: {:m_stringValue=>"", :m_name=>"", 
+      m_decimalValue: 0.0, isLocal: true, m_booleanValue: false, 
+      excludeFromLog: false, m_intValue: 0, m_type: 2},
       url_to_open: '',
       http_get: true,
       disable_url_encode: false,
       block_next_action: false
     }
-
-    super(options.merge filter(options,h))
+    
+    if h[:macro].remote_url.nil? then
+      raise OpenWebPageActionError, 'remote_url not found'
+    end
+    
+    if (h[:identifier].nil? or h[:identifier].empty?) and 
+        (h[:url_to_open].nil? or h[:url_to_open].empty?) then
+      h[:url_to_open] = h[:macro].remote_url.sub(/\/$/,'') + '/' + 
+          h[:macro].title.downcase.gsub(/ +/,'-')
+    end
+    
+    super(options.merge h)
 
   end
   
   def to_s(colour: false, indent: 0)
-    "HTTP GET\n  url: " + @h[:url_to_open]
+    @s = "HTTP GET\nurl: " + @h[:url_to_open]
+    super()
   end
 
 end
@@ -284,10 +296,20 @@ class LoopAction < Action
 
   def to_s(colour: false, indent: 0)
     
+    h = @h.clone    
+    h.delete :macro
     @s = 'DO / WHILE '
-    super()
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end    
 end
 
 # Conditions/Loops
@@ -318,25 +340,49 @@ end
 # Conditions/Loops
 #
 class IfConditionAction < Action
-  
+
   def initialize(obj=nil)
+
+    options = {
+      a: true,
+      constraint_list: []
+    }  
     
-    h = if obj.is_a? Hash then
-      obj
+    if obj.is_a? Hash then
+      
+      h = obj
+      macro = h[:macro]
+      h2 = options.merge(filter(options,h).merge(macro: macro))
+      super(h2)      
+      
+    elsif obj.is_a? Rexle::Element
+      super() 
+      raw_txt = obj.text('item/description') || obj.text.to_s
+      puts 'raw_txt: ' + raw_txt.inspect if $debug
+      
+      clause = raw_txt[/^if (.*)/i,1]
+      conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      
+      cp = ConstraintsNlp.new      
+      
+      @constraints = conditions.map do |c|
+        puts 'c: ' + c.inspect 
+        r = cp.find_constraint c
+        puts 'found constraint ' + r.inspect if $debug
+        
+        r[0].new(r[1]) if r
+        
+      end         
+      puts '@constraints: ' + @constraints.inspect if $debug
+      {}
     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 '
 
@@ -344,10 +390,20 @@ class IfConditionAction < Action
 
   def to_s(colour: false, indent: 0)
     
-    @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
-    super(colour: colour)
+    h = @h.clone    
+    h.delete :macro
+    @s = 'If '
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end  
 end
 
 class ElseAction < Action
@@ -383,8 +439,24 @@ class ElseIfConditionAction < Action
   end  
   
   def to_s(colour: false, indent: 0)
+    
+    h = @h.clone    
+    h.delete :macro
     @s = 'Else If '
-    super()
+    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")
+    
+  end    
+  
+  def to_summary(colour: false)
+    'foo'
   end
     
 
@@ -393,10 +465,17 @@ end
 
 class EndIfAction < Action
   
-  def initialize(h={})
-
+  def initialize(obj={})
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Rexle::Element    
+      {}
+    end
+    
+  
     options = {
-      constraint_list: ''
+      constraint_list: []
     }
 
     super(options.merge h)
@@ -407,6 +486,8 @@ class EndIfAction < Action
     'End If'
   end
   
+  alias to_summary to_s
+  
 end
 
 class ConnectivityAction < Action
@@ -436,7 +517,7 @@ class SetAirplaneModeAction < ConnectivityAction
   def to_s(colour: false, indent: 0)
     
     state = ['On', 'Off', 'Toggle'][@h[:state]]
-    @s = 'Airplane Mode ' + state + "\n"
+    @s = 'Airplane Mode ' + state
     super(colour: colour)
     
   end
@@ -618,7 +699,10 @@ class StopWatchAction < DateTimeAction
   end
 
   def to_s(colour: false, indent: 0)
-    'StopWatchAction ' + @h.inspect
+    option = ['Start', 'Pause','Reset','Reset and Restart'][@h[:option]]
+    name = @h[:stopwatch_name]
+    @s = "StopWatch (%s)" % option + "\n" + name #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1125,7 +1209,7 @@ class FileOperationV21Action < FileAction
     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        
+        + "\n" + detail #+ @h.inspect        
     super()
   end
 
@@ -1244,7 +1328,7 @@ class ShareLocationAction < LocationAction
   end
 
   def to_s(colour: false, indent: 0)
-    @s = 'Share Location' + "\n  GPS" # + @h.inspect
+    @s = 'Share Location' + "\nGPS" # + @h.inspect
     super()
   end
 
@@ -1360,6 +1444,31 @@ class ClearLogAction < LoggingAction
   alias to_summary to_s
 end
 
+
+# MacroDroid Specific
+#
+class CancelActiveMacroAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    @s = 'Cancel Macro Actions' + "\n  " + @h[:macro_name] #+ ' ' + @h.inspect
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
 class ConfirmNextAction < Action
@@ -1377,7 +1486,7 @@ class ConfirmNextAction < Action
   
   def to_s(colour: false, indent: 0)
     
-    @s = 'Confirm Next'  + "\n  %s: %s" % [@h[:title], @h[:message]]
+    @s = 'Confirm Next'  + "\n%s: %s" % [@h[:title], @h[:message]]
     super()
     
   end
@@ -1461,7 +1570,7 @@ class SetVariableAction < Action
 
     end
     
-    @s = 'Set Variable' + ("\n  %s: " % @h[:variable][:name]) + input #+ @h.inspect
+    @s = 'Set Variable' + ("\n%s: " % @h[:variable][:name]) + input #+ @h.inspect
     super()
     
   end
@@ -1632,7 +1741,7 @@ class SendEmailAction < MessagingAction
 
   def to_s(colour: false, indent: 0)
     recipient = @h[:email_address]
-    @s = 'Send EmailAction' + "\n  To: " + recipient #+ ' ' + @h.inspect
+    @s = 'Send EmailAction' + "\nTo: " + recipient #+ ' ' + @h.inspect
     super()
   end
 
@@ -1707,7 +1816,7 @@ class ClearNotificationsAction < NotificationsAction
     options = {
       package_name_list: [],
       match_text: '',
-      application_name_list: [],
+      application_name_list: [],                  
       clear_persistent: false,
       excludes: false,
       match_option: 0,
@@ -1870,8 +1979,9 @@ class NotificationAction < NotificationsAction
   end
   
   def to_s(colour: false, indent: 0)
-    "Display Notification\n  " + \
+    @s = "Display Notification\n" + \
         "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+    super()
   end
 
 end
@@ -1884,8 +1994,10 @@ class ToastAction < NotificationsAction
     
     h = if obj.is_a? Hash then
       obj
-    else
-      {msg: obj}
+    elsif obj.is_a? Array
+      e, macro = obj
+      txt = e.text('item/description')
+      {msg: (txt || e.text)}
     end
 
     if h[:msg] then
@@ -1909,7 +2021,7 @@ class ToastAction < NotificationsAction
   end
   
   def invoke()
-    super(@h[:message_text])
+    super(msg: @h[:message_text])
   end
   
   def to_pc()
@@ -1917,7 +2029,8 @@ class ToastAction < NotificationsAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = "Popup Message\n  %s" % @h[:message_text]
+    @s = "Popup Message\n%s" % @h[:message_text]
+    super()
   end
 
 end
@@ -1947,7 +2060,7 @@ class AnswerCallAction < PhoneAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = 'Answer Call' + "\n  "
+    @s = 'Answer Call'
     super()
   end
 end
@@ -2009,7 +2122,7 @@ class RejectCallAction < PhoneAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = 'Call Reject' + "\n  "
+    @s = 'Call Reject'
     super()
   end
 
@@ -2085,7 +2198,9 @@ class SetBrightnessAction < ScreenAction
   end
 
   def to_s(colour: false, indent: 0)
-    'SetBrightnessAction ' + @h.inspect
+    val = @h[:brightness_percent] > 100 ? 'Auto' : @h[:brightness_percent].to_s + '%'
+    @s = 'Brightness' + "\n  " + val #@h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -2135,7 +2250,8 @@ class ScreenOnAction < ScreenAction
     state += ' ' + 'No Lock (root only)' if @h[:screen_off_no_lock]
     #state += ' ' + '(Alternative)' if @h[:screen_on_alternative]
     
-    'Screen ' + state
+    @s = 'Screen ' + state
+    super()
     
   end
 
@@ -2290,7 +2406,7 @@ class SetVibrateAction < VolumeAction
     ]
     
     status = a[@h[:option_int]]
-    @s = 'Vibrate Enable/Disable ' + "\n    " + status + "\n  "
+    @s = 'Vibrate Enable/Disable ' + "\n" + status
     super()
     
   end

data/lib/ruby-macrodroid/base.rb

@@ -54,16 +54,30 @@ class MacroObject
     @h[:siguid]
   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| 'c: ' + x.to_summary(colour: colour)}
+    
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment] and @h[:comment].length > 1
+    #s = @s.lines.map {|x| 'x' + x}.join
+    
+    lines = @s.lines
+    
+    if lines.length > 1 then        
+      s = lines[0] + lines[1..-1].map {|x| x.prepend ('  ' * (indent+1)) }.join
+    else
+      s = @s
+    end
     
-    @s + constraints
+    out << s
+    out += constraints
+    out.join("\n")
     
   end