rairtame 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92a8765ee301bec0af608a68824428112c1ac4e
-  data.tar.gz: 1140a3d68939f7035bb90de4a4033099d0dd51ca
+  metadata.gz: 9c0b4924eaef60d4bfca86a321c3012f5cf1a869
+  data.tar.gz: d60ff3d8e1add80c089c6844953b86847674f976
 SHA512:
-  metadata.gz: 08a6bf82444dd5377d57ed06da9785c4b5bce3a93fa149ba00635d412c410583a2623cd05a4c3c025b40222f639fcd53eefe281b00184b540f60314ed7d0be9f
-  data.tar.gz: 30eae0ee452baafdf042d404cb5d4fe40a809e33a7959185af5d02eb18bd5453d26fc337c16a7695b9c568c9d69f9e1f614cb350d05288a55d5915b7f4b6ffc9
+  metadata.gz: 45492f65d282fb1a0cb6b6d427990987c01a67673f60d1bc22458356e00bbe7981e2cb06561b8afc2f838c7689e586dfd7de47e3e2689702031589b90e37328a
+  data.tar.gz: ac7e7fb49617cb545bbe1627ea0ce7d0c5111fa74bf91436d58b6cffe68dd2d92f7fdec34403d13486749880389846336d6687114f4b0bd3f96fdda1eecdfe4f

data/README.md

@@ -1,5 +1,7 @@
 # Rairtame
 
+[![Gem Version](https://badge.fury.io/rb/rairtame.svg)](http://badge.fury.io/rb/rairtame)
+
 Rairtame is a library and CLI utility to interact with the `airtame-streamer` JSON-RPC API.
 
 It allows to easily control the `airtame-streamer` daemon, which is in charge of capturing and streaming video to an [AIRTAME dongle](http://airtame.com).

data/bin/rairtame

@@ -93,17 +93,24 @@ module Rairtame
         :method => :buffer=
       },
       :fluent => {
-        :short => 'Enable or disable fluent video',
-        :long => 'Enables or disables the fluent video streaming feature',
+        :short => 'Enable or disable fluent video playback',
+        :long => 'Enables or disables the fluent video playback (jitterbuffer)',
         :arg => 'on/off',
         :allowed => ['on', 'off'],
-        :method => :video_jitterbuffer=      
+        :method => :video_jitterbuffer=
       },
-      :state => {
-        :short => 'Show streamer\'s state',
-        :long => 'Prints streamer\'s state in a pretty way',
+      :reliable => {
+        :short => 'Enable or disable reliability',
+        :long => 'Enables or disables the reliable transport option',
+        :arg => 'on/off',
+        :allowed => ['on', 'off'],
+        :method => :reliable_transport=
+      },
+      :status => {
+        :short => 'Show streamer\'s status',
+        :long => 'Prints streamer\'s status in a pretty way',
         :arg => nil,
-        :method => :pretty_state
+        :method => :pretty_status
       }
     }
 
@@ -113,14 +120,14 @@ module Rairtame
       def setup
         program_desc <<EOF
 A Ruby interface to the airtame-streamer JSON-RPC API, which allows
-to stream to an AIRTAME dongle. 
+to stream to an AIRTAME dongle.
 EOF
 
         switch [:v, :verbose]
         switch [:c, :color], :default_value => true
         flag [:streamer_host], :default_value => 'localhost'
         flag [:config_file]
-        
+
         pre do |global_options, command, options, args|
           @client = Rairtame::Client.new(global_options)
           String.disable_colorization = !global_options[:color]

data/lib/rairtame/client.rb

@@ -82,13 +82,52 @@ module Rairtame
       rpc_call(:closeStreamer)
     end
 
-    def state
+    def status
       rpc_call(:getState)
     end
-
-    def pretty_state
-      rpc_call(:getState)
+    alias :state :status
+
+    def pretty_status
+      puts
+      puts "AIRTAME status:"
+      puts "---------------"
+      state = rpc_call(:getState)['result']
+      if state['state'] == 'not initialized'
+        puts "Not initialized"
+      elsif state['current_mode']
+        mode_str = case state['current_mode']
+                   when 0 then "video"
+                   when 1 then "work"
+                   when 2 then "present"
+                   when 3 then "manual"
+                   else "unknown"
+                   end
+        fluent = state['remote_settings']['video_jb_flags'] == '1' ? "yes" : "no"
+        reliable = state['reliable_transport'] == '1' ? "yes" : "no"
+        puts "Mode: #{mode_str}"
+        puts "FPS: #{state['video_fps']}"
+        puts "Reliability: #{reliable}"
+        puts "Fluent playback: #{fluent}"
+        puts "Clients:"
+        puts "  -- No clients connected" if state['clients'].empty?
+        state['clients'].each do |client|
+          c = client['channel']
+          str = "#{c['IP']}: "
+          str << "Sent #{(c['bytes_sent'] / 1024.0 / 1024.0).round(2)} MB. "
+          str << "Recv: #{(c['bytes_received'] / 1024.0).round(2)} KB. "
+          str << "Packet loss: #{c['packet_loss'].to_f.round(2)}. "
+          str << "Avg latency: #{c['avg_latency']}"
+          puts "  -- #{str}"
+        end
+        state
+      else
+        puts "Unkown response"
+      end
+      puts
+      puts "(run with -v to see the raw response)"
+      state
     end
+    alias :pretty_state :pretty_status
 
     def framerate=(v)
       rpc_call(:setStreamerSettings, 'framerate', v.to_s)
@@ -118,20 +157,12 @@ module Rairtame
 
     def video=(v)
       # TODO: Read av flags first and keep the audio
-      value = case v
-              when "on" then "1"
-              when "off" then "0"
-              end
-      rpc_call(:setStreamerSettings, 'av_flags', value)
+      rpc_call(:setStreamerSettings, 'av_flags', on_off_to_1_0(v))
     end
 
     # fluent video
     def video_jitterbuffer=(v)
-      value = case v
-              when "on" then "1"
-              when "off" then "0"
-              end
-      rpc_call(:setStreamerSettings, 'video_jb_flags', value)
+      rpc_call(:setStreamerSettings, 'video_jb_flags', on_off_to_1_0(v))
     end
 
     # unused
@@ -146,12 +177,28 @@ module Rairtame
     end
 
     def reliable_transport=(v)
-      warn "Not implemented"
-      nil
+      rpc_call(:setStreamerSettings, 'reliable_transport',
+               on_off_to_true_false(v))
     end
 
     private
 
+    def on_off_to_1_0(value)
+      case value
+      when "off" then "0"
+      when "on" then "1"
+      else value
+      end
+    end
+
+    def on_off_to_true_false(value)
+      case value
+      when "off" then "false"
+      when "on" then "true"
+      else value
+      end
+    end
+
     def log_command(method, params)
       return unless @verbose
       puts "Sending command: [#{method} | #{params}]"
@@ -160,7 +207,7 @@ module Rairtame
     def log_response(r)
       # log anyway
       return unless @verbose
-      is_error = JsonRpcClient.is_error?(r)
+      is_error = Jsonrpctcp::Client.is_error?(r)
       if is_error then warn "Received error:"
       else puts "Received response:" end
       pp r

data/lib/rairtame/version.rb

@@ -15,5 +15,5 @@
 # along with Rairtame.  If not, see <http://www.gnu.org/licenses/>
 
 module Rairtame
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rairtame
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hector Sanjuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler