remotedroid 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd9a9a0c4d6d86dcf23408d9345c0a57bef2b6a516b8effcce7dc4b2b8bb0d3
-  data.tar.gz: e752e40ee31bf64505e84dc7c2e49a45f61185d3e2573dfb1f4b73526c8a5cb5
+  metadata.gz: 99592d4ac1baaef0d04b87d8bb9dd6cfcbdfc5572dacc39c6fabbd5a960f85f3
+  data.tar.gz: a5fbd36d797423dd183dccbb2351736ac58f706acf3b88932ae737d43e55a8e9
 SHA512:
-  metadata.gz: '090b89b8e66c0b6368015741e4db9b9344f6714c96f393efaa40a0a019f467fd04b078a716ae2a9ca2af6e687ea328eccbf67e1d87eee0a278281b34d72e0394'
-  data.tar.gz: ed2ca4e908800cb5f88c34d5352cde163168959d994bf82c66a3f90b0e5bc187ccc6b73c9afcf24cd6fbe00fb52a668c3b2d5b29a09410f7ac7eb9614c401a79
+  metadata.gz: 893732ed1fb124c982bdcd6b55d4d2f54acd9a32256d707cde13a13d86fb9547a9b126ab6200b98ed211ae739cf42e95136c5fe444fbd435646607b6e8fda9a7
+  data.tar.gz: a651dd655ab1dcb59549d7abd5d32a948f4fbf04ec134f9c35ff104ff7f9def9308a8f8acf9751e7cefa27e7ca4517af7e310a5603de6ab6a196271a1ca54b5c

data/lib/remotedroid.rb

@@ -305,72 +305,131 @@ m: In Vehicle
 t:
   Activity - In Vehicle
     Confidence >= 50%
-a: webhook    
+a:
+  webhook
+    identifier: activity
+    index: 0
 
 m: On Bicycle
 t:
   Activity - On Bicycle
     Confidence >= 50%
-a: webhook
-
+a:
+  webhook
+    identifier: activity
+    index: 1
+    
 m: Running
 t:
   Activity - Running
     Confidence >= 50%
-a: webhook    
+a:
+  webhook
+    identifier: activity
+    index: 2
 
 m: Walking
 t:
   Activity - Walking
     Confidence >= 50%
-a: webhook
+a:
+  webhook
+    identifier: activity
+    index: 3
 
 m: Still
 t:
   Activity - Still
     Confidence >= 83%
-a: webhook
-
+a:
+  webhook
+    identifier: activity
+    index: 4
+    
 m: Swipe top left across
 t:
   Swipe Screen
     Top Left - Across
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 0
 
 m: Swipe top left diagonal
 t:
   Swipe Screen
     Top Left - Diagonal
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 1
 
 m: Swipe top left down
 t:
   Swipe Screen
     Top Left - Down
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 2
 
 m: Swipe top right across
 t:
   Swipe Screen
     Top Right - Across
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 0    
+    
 
 m: Swipe top right diagonal
 t:
   Swipe Screen
     Top Right - Diagonal
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 1
 
 m: Swipe top right down
 t:
   Swipe Screen
     Top Right - Down
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 2
 
+m: flip from up to down
+t: Flip Device Face Up -> Face Down
+a:
+  webhook
+    identifier: flip_device
+    facedown: true
 
+m: flip from down to up
+t: Flip Device Face Down -> Face Up
+a:
+  webhook
+    identifier: flip_device
+    facedown: false    
 EOF
+s="
+    
+
 
 
+   
+
+"
+
 module RemoteDroid
   
   class Server
@@ -423,8 +482,20 @@ module RemoteDroid
         
         context, json = msg.split(/:\s+/,2)
         category, action = context.split('/',2)
-        @remote.control.method(action.to_sym)\
+        
+        if action == 'force_macro_run' then
+          
+          self.notice 'macrodroid2: fmr'
+          a = @remote.run_macro(JSON.parse(json, symbolize_names: true))
+
+          a.each do |msg|
+            self.notice 'macrodroid/action: ' + msg
+          end
+
+        else
+          @remote.control.method(action.to_sym)\
             .call(JSON.parse(json, symbolize_names: true))
+        end
         
       end
       

data/lib/remotedroid/client.rb

@@ -3,8 +3,9 @@ module RemoteDroid
   class Client
     using ColouredText
     
-    def initialize(host='127.0.0.1')
-      @drb = OneDrb::Client.new host: host, port: '5777'    
+    def initialize(hostx='127.0.0.1', host: hostx, port: '5777', sps_host: 'sps.home', sps_port: '59000')
+      @drb = OneDrb::Client.new host: host, port: port    
+      @sps = SPSPub.new host: sps_host, port: sps_port
     end
     
     def control
@@ -32,6 +33,11 @@ module RemoteDroid
       
     end
     
+    def run_macro(name)
+      a = @drb.run_macro name
+      a.each {|msg| @sps.notice 'macrodroid/action: ' + msg }
+    end
+    
     def update(key, val)
       @drb.update key.to_sym, val
     end
@@ -40,6 +46,10 @@ module RemoteDroid
       @drb.store
     end
     
+    def syslog()
+      @drb.syslog
+    end
+    
     # -- helpful methods -----------------
     
     def battery()

data/lib/remotedroid/controller.rb

@@ -2,7 +2,7 @@ module RemoteDroid
   
   class Controller
     
-    attr_reader :model, :control
+    attr_reader :model, :control, :syslog
     attr_accessor :title, :macros, :store
 
     def initialize(mcs, model=MODEL, deviceid: nil, debug: false)
@@ -25,18 +25,25 @@ module RemoteDroid
       names = @macros.map {|x| x.triggers.first.type}.uniq
       #@control.enable names.first.to_s.gsub('_',' ')
       puts 'Enabling ' + names.join(',')
-      
+=begin      
       Thread.new do
         names.each do |title|
           @control.enable title.to_s.gsub('_',' ')
           sleep 0.8
         end
       end
-
+=end
     end
     
-    def export(s)
-      @macros = MacroDroid.new(s).macros
+    def delete_all()
+      @macros = []
+    end
+    
+    def export(s, replace: false)
+      
+      macros = MacroDroid.new(s).macros
+      replace ? @macros = macros : @macros << macros
+      
     end
     
     def invoke(name, options={})      
@@ -105,8 +112,17 @@ module RemoteDroid
       @model.request s
     end
     
+    def run_macro(macro_name: '')
+      
+      found = @macros.find do |macro|
+        macro.title.downcase == macro_name.downcase
+      end
+      
+      found.run if found
+      
+    end
     
-    def trigger(name, detail={time: Time.now})
+    def trigger(name, detail={})
       
       macros = @macros.select do |macro|
         
@@ -117,12 +133,14 @@ module RemoteDroid
         #
         valid_trigger = macro.match?(name, detail, @model.op)
         
-        puts 'valid_trigger: ' + valid_trigger.inspect if @debug
+        #puts 'valid_trigger: ' + valid_trigger.inspect if @debug
         
-        if valid_trigger then
-          @syslog << [Time.now, :trigger, name] 
-          @syslog << [Time.now, :macro, macro.title]
-        end
+        #if valid_trigger then
+        #  @syslog << [Time.now, :trigger, name] 
+        #  @syslog << [Time.now, :macro, macro.title]
+        #end
+        
+        @syslog << [Time.now, name, detail]
                      
         valid_trigger
         
@@ -143,7 +161,9 @@ module RemoteDroid
         val.keys.first.to_sym
       end
       
-      @store[key] = val      
+      @syslog << [id, val]      
+      @store[key] = val   
+      
     end
         
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onedrb