remotedroid 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93065c866dfef9501613644d3f1ec4f18fd7ba5459c62645eb97bbdfb6069b89
-  data.tar.gz: 8ae132d997c1c7072383eb6878e757bbcc7deeb1241d783d261a2d4885bd0c42
+  metadata.gz: 4599f668ded4ccead69bcab55ac94e081027b1054b4053ee2cb2f142303a7b01
+  data.tar.gz: cdbcb98bab0dd3df0d8252892ce5c44c7ed26332803a89292357b04f2f26a9e4
 SHA512:
-  metadata.gz: 548cc195f2f8525be869c8429dbb1ede8c9da42ba3ff489b347b204f2bdcb630e09b5d012b4c496ff49bcd2ec6d94bccfc968ff9d4cfbe4d057186bc6209d991
-  data.tar.gz: 5b5eff2de32dfe89a2110558bce22e1a11ddf4cc6ed9d69e903b6c087575e5a9e48e20fbea39a95eade2d69e67b6d49db7ae68874e947aa93ae4a8896852cbf6
+  metadata.gz: 636856536a64d87445c01d3e2b320ccf0fbfed713a6ba4384a19947b182f33bee281a6ae1e191237ed5f74e0995c6460f21108cb4a578b6ea406ecab0921b0c9
+  data.tar.gz: a650ca4d116ccba5251cd1e9f489587d8ebd5f33c7e8c106a8e59c0817187511d26d2d01aac92d88b27ee0efb07b9cad9eb4a6d7da0abace184f174550a3762e

data/lib/remotedroid.rb

@@ -58,6 +58,7 @@ require 'ruby-macrodroid'
 #
 # ## Screen
 #
+# * Keep Device Awake
 # * Screen On
 #
 
@@ -165,6 +166,16 @@ t: webhook
 a:
   Take Picture
     Rear Facing
+a: wait 2 seconds
+a: webhook
+
+m: stay awake
+t: webhook
+a: stay awake
+
+m: stay awake off
+t: webhook
+a: stay awake off
 
 m: Share location
 t: 
@@ -549,6 +560,8 @@ module RemoteDroid
         @control.http_exec :'query-setting-global', {qvar: id}
       elsif secure.include? id
         @control.http_exec :'query-setting-secure', {qvar: id}        
+      elsif id.downcase.to_sym == :'take-picture'
+        @control.http_exec id
       else
         @control.http_exec :query, {qvar: id}
       end
@@ -559,7 +572,7 @@ module RemoteDroid
       
       begin
         sleep 1
-      end until @store[id] or Time.now > t + 5
+      end until @store[id] or Time.now > t + 10
       
       return {warning: 'HTTP response timeout'} if Time.now > t+5
       
@@ -603,11 +616,16 @@ module RemoteDroid
     alias trigger_fired trigger
     
     def update(id, val)
-      key  = id == :location ? id : val.keys.first.to_sym
+      
+      key  = if %i(location take-picture).include? id
+        id
+      else
+        val.keys.first.to_sym
+      end
+      
       @store[key] = val      
     end
         
-
   end
 
   class Service
@@ -747,9 +765,17 @@ module RemoteDroid
     end
     
     alias say speak_text
+    
+    def stay_awake(options={})
+      http_exec 'stay-awake', options
+    end
 
+    def stay_awake_off(options={})
+      http_exec 'stay-awake-off', options
+    end
+    
     def take_picture(options={})
-      http_exec :'take-picture', options
+      http_exec 'take-picture', options
     end
     
     alias take_photo take_picture
@@ -817,6 +843,9 @@ module RemoteDroid
       @callback.query(:location)[:coords]
     end
 
+    def take_picture()      
+      @callback.query(:'take-picture')
+    end
     
     private
     
@@ -921,16 +950,24 @@ module RemoteDroid
       screen :off
     end
     
+    def stay_awake()
+      control.stay_awake
+    end
+    
+    def stay_awake_off()
+      control.stay_awake_off
+    end
+    
     def take_picture(ftp_src: nil, fileout: '.')
       
-      screen.on
-      r = control.take_picture
+      #screen.on
+      r = query.take_picture
             
       if ftp_src then
         
         # the sleep statement will be replaced in the near future, 
         # but it's fine to demonstrate it works
-        sleep 8         
+        #sleep 8         
         
         credentials, dir = ftp_src.match(/(ftp:\/\/[^\/]+)\/([^$]+)/).captures
         ftp = MyMediaFTP.new(credentials)
@@ -942,9 +979,7 @@ module RemoteDroid
       
     end   
     
-    def take_photo()
-      control.take_photo
-    end
+    alias take_photo take_picture
     
     def torch()
       control.torch
@@ -1011,6 +1046,7 @@ module RemoteDroid
       super(topic: topic) do |msg|
         
         json, id = msg.split(/:\s+/,2).reverse
+        
         h = JSON.parse(json, symbolize_names: true)
         id ||= h.keys.first
         @remote.update id.to_sym, h

metadata

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