ruby-macrodroid 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3784001df302ddb9f8389ea019f860925803b96913f4531839df140f48634857
-  data.tar.gz: 686838c12129f1cd329d72745f37a7cb81ed91d98cdea059a5b59938d6d8b9e3
+  metadata.gz: f79a66c628c78bab4c858805ac6486083331723153022cb23030485701b16eea
+  data.tar.gz: d2bf06bef9e246852f4ec40a31f267ce2f94b66293318fb82ea864a4d5c15e0e
 SHA512:
-  metadata.gz: 948ceb9a759bf97fd4e4786fe35f95aee1a76d971ced0553c3984a885bae87155a18747a77c27d2daf7e928847cd503e19820e648956b0a93a62ef056a5992a9
-  data.tar.gz: d9ae51714a522375bd2aa92410f4a9412d83903d29ca33892cdd55a61dfab08faf7d02da292bdda2506715ca6948cdd308e0be4a03eb16b8010f5b56dd291ce0
+  metadata.gz: 00ab9a577c80b81d017ebbb35d3e8a746d1d78ddde05473dd87be5c6a5365a3d7ed83e3501cf0402e3b2919be7dff1fe59f1e12c2f309649b69e3fd99e19824d
+  data.tar.gz: fa4786c3f3bc343b6e242f5c8abfb6a438edae01df19b623b3d7b27fb610bc4c56f323071ea76890700b6493ede5df714a55f9b2ef619f1c37104832a59d75f8

data/lib/ruby-macrodroid.rb

@@ -110,14 +110,16 @@ 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 = {}
     
@@ -334,7 +336,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, 
+                    debug: @debug )
       m.import_h(macro)
       m
 
@@ -356,7 +359,8 @@ class MacroDroid
     @macros = 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, 
+                debug: @debug).import_xml(node)
       
     end
 
@@ -380,7 +384,7 @@ 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, debug: @debug).import_xml(node)
       
     end
   end

data/lib/ruby-macrodroid/actions.rb

@@ -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

data/lib/ruby-macrodroid/macro.rb

@@ -68,7 +68,14 @@ class TriggersNlp
       }
       
       [ExternalPowerTrigger, h]
-    end    
+    end   
+    
+    # -- Device Events ----------------------------------------------------
+  
+    get /^Screen[ _](On|Off)/i do |state|            
+      [ScreenOnOffTrigger, {screen_on: state.downcase == 'on'}]
+    end      
+    
     # e.g. at 7:30pm daily
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
       [TimerTrigger, {time: time, 
@@ -465,13 +472,13 @@ class Macro
 
   attr_reader :local_variables, :triggers, :actions, :constraints, 
       :guid, :deviceid
-  attr_accessor :title, :description, :remote_url
+  attr_accessor :title, :description, :remote_url, :picture_path
 
-  def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, 
-                 debug: false)
+  def initialize(name=nil, geofences: nil, deviceid: nil, remote_url: nil, \
+                 picture_path: nil, debug: false)
 
     @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    @remote_url = remote_url
+    @remote_url, @picture_path = remote_url, picture_path
     
     puts 'inside Macro#initialize' if @debug    
           

data/lib/ruby-macrodroid/triggers.rb

@@ -1199,6 +1199,11 @@ class ScreenOnOffTrigger < DeviceEventsTrigger
 
   end
   
+  def match?(detail={}, model=nil)
+    #@h[:screen_on] == detail[:screen_on]
+    true
+  end  
+  
   def to_s(colour: false)
     'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
   end

metadata

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