piliv2 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2643209525e556871da60fe435a569d00c23f03b
-  data.tar.gz: fb958350192aa3591012600b169dc293e0dcca7a
+  metadata.gz: e29f840b9bfc8601baef9f0eeb269f749f44bf9b
+  data.tar.gz: 11edb606403b266ab39019f8d333e5c9bfa930d1
 SHA512:
-  metadata.gz: dfe92138ee5ca7725c62ed93b322010bf01c5c96c3a17295e19d24fc529a14b77748bf0b4fc022b973631075e33fe6e4932ecacc0f69adc9c7c328d7630dea83
-  data.tar.gz: cbf120c03cc122ae563d24b4dc878639745450d5a4ed5f502163d91627cf864fddb37342ba639bebd5fb57c038ef322f8f56f9b7cb0479335d836ae32a923a7d
+  metadata.gz: 94f7c701a0cb574b2d6416de406c000101463dbaa30d84e173a1eba0342f6eb75c30c71d805e99f66ea81fcd9a2357671138bfc25a673effe7c756d6bc20e087
+  data.tar.gz: f2b9006641bd119ef7ece200293e9c64c1ef368e67590f86b42d4bd102ca635bb33e14da5e64548ea7d2e7611544105a2fbb9d656e0dd1ccb11cb82218d14479

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+### v2.1.0
+[#35](https://github.com/pili-engineering/pili-sdk-ruby/pull/35)
+- 增加批量查询直播信息接口
+- 回放保存增加更多的配置项
+- 增加保存截图接口
+- 增加更改流转码规格接口
+
 ### v2.0.3
 
 - 修复 README 错误和修改 `RPCError` 继承自 `RuntimeError`。[#33](https://github.com/pili-engineering/pili-sdk-ruby/pull/33)

data/README.md

@@ -3,22 +3,26 @@
 ## Features
 
 - URL
-	- [x] RTMP推流地址: rtmp_publish_url(domain, hub, stream_key, mac, expire_after_seconds)
-	- [x] RTMP直播地址: rtmp_play_url(domain, hub, stream_key)
-	- [x] HLS直播地址: hls_play_url(domain, hub, stream_key)
-	- [x] HDL直播地址: hdl_play_url(domain, hub, stream_key)
-	- [x] 截图直播地址: snapshot_play_url(domain, hub, stream_key)
+	- [x] RTMP推流地址: rtmp_publish_url(domain, hub, stream_title, mac, expire_after_seconds)
+	- [x] RTMP直播地址: rtmp_play_url(domain, hub, stream_title)
+	- [x] HLS直播地址: hls_play_url(domain, hub, stream_title)
+	- [x] HDL直播地址: hdl_play_url(domain, hub, stream_title)
+	- [x] 直播封面地址: snapshot_play_url(domain, hub, stream_title)
 - Hub
-	- [x] 创建流: hub.create(stream_key)
-	- [x] 获得流: hub.stream(stream_key)
+	- [x] 创建流: hub.create(stream_title)
+	- [x] 获得流: hub.stream(stream_title)
 	- [x] 列出流: hub.list(...)
 	- [x] 列出正在直播的流: hub.list_live(...)
+	- [x] 批量查询直播信息: hub.batch_query_live_status(stream_titles)
 - Stream
 	- [x] 流信息: stream.info()
-	- [x] 禁用流: stream.disable()
+	- [x] 无限期禁用流: stream.disable()
+	- [x] 禁用流: stream.disable_till(timestamp)
 	- [x] 启用流: stream.enable()
  	- [x] 查询直播状态: stream.live_status()
-	- [x] 保存直播回放: stream.save(...)
+	- [x] 保存直播回放: stream.saveas(...)
+	- [x] 保存直播截图: stream.snapshot(...)
+	- [x] 更改流的实时转码规格: stream.update_converts(profiles)
 	- [x] 查询直播历史: stream.history_activity(...)
 
 ## Contents
@@ -38,13 +42,17 @@
 		- [Get a Stream](#get-a-stream)
 		- [List Streams](#list-streams)
 		- [List live Streams](#list-live-streams)
+		- [Batch query live status](#batch-query-live-status)
 	- [Stream](#stream)
 		- [Get Stream info](#get-stream-info)
 		- [Disable a Stream](#disable-a-stream)
+		- [Disable a Stream with timestamp](#disable-a-stream-with-timestamp)
 		- [Enable a Stream](#enable-a-stream)
 		- [Get Stream live status](#get-stream-live-status)
-		- [Get Stream history activity](#get-stream-history-activity)
 		- [Save Stream live playback](#save-stream-live-playback)
+		- [Save Stream snapshot](#save-stream-snapshot)
+		- [Update converts](#update-converts)
+		- [Get Stream history activity](#get-stream-history-activity)
 
 ## Installation
 
@@ -82,41 +90,41 @@ hub = client.hub(hub_name)
 #### Generate RTMP publish URL
 
 ```ruby
-url = Pili.rtmp_publish_url("publish-rtmp.test.com", "PiliSDKTest", "streamkey", mac, 60)
+url = Pili.rtmp_publish_url("publish-rtmp.test.com", "PiliSDKTest", "streamtitle", mac, 60)
 puts(url)
-# rtmp://publish-rtmp.test.com/PiliSDKTest/streamkey?e=1463023142&token=7O7hf7Ld1RrC_fpZdFvU8aCgOPuhw2K4eapYOdII:-5IVlpFNNGJHwv-2qKwVIakC0ME=
+# rtmp://publish-rtmp.test.com/PiliSDKTest/streamtitle?e=1463023142&token=7O7hf7Ld1RrC_fpZdFvU8aCgOPuhw2K4eapYOdII:-5IVlpFNNGJHwv-2qKwVIakC0ME=
 ```
 
 #### Generate RTMP play URL
 
 ```ruby
-url = Pili.rtmp_play_url("live-rtmp.test.com", "PiliSDKTest", "streamkey")
+url = Pili.rtmp_play_url("live-rtmp.test.com", "PiliSDKTest", "streamtitle")
 puts(url)
-# rtmp://live-rtmp.test.com/PiliSDKTest/streamkey
+# rtmp://live-rtmp.test.com/PiliSDKTest/streamtitle
 ```
 
 #### Generate HLS play URL
 
 ```ruby
-url = Pili.hls_play_url("live-hls.test.com", "PiliSDKTest", "streamkey")
+url = Pili.hls_play_url("live-hls.test.com", "PiliSDKTest", "streamtitle")
 puts(url)
-# http://live-hls.test.com/PiliSDKTest/streamkey.m3u8
+# http://live-hls.test.com/PiliSDKTest/streamtitle.m3u8
 ```
 
 #### Generate HDL play URL
 
 ```ruby
-url = Pili.hdl_play_url("live-hdl.test.com", "PiliSDKTest", "streamkey")
+url = Pili.hdl_play_url("live-hdl.test.com", "PiliSDKTest", "streamtitle")
 puts(url)
-# http://live-hdl.test.com/PiliSDKTest/streamkey.flv
+# http://live-hdl.test.com/PiliSDKTest/streamtitle.flv
 ```
 
 #### Generate Snapshot play URL
 
 ```ruby
-url = Pili.snapshot_play_url("live-snapshot.test.com", "PiliSDKTest", "streamkey")
+url = Pili.snapshot_play_url("live-snapshot.test.com", "PiliSDKTest", "streamtitle")
 puts(url)
-# http://live-snapshot.test.com/PiliSDKTest/streamkey.jpg
+# http://live-snapshot.test.com/PiliSDKTest/streamtitle.jpg
 ```
 
 ### Hub
@@ -132,33 +140,42 @@ hub = client.hub("PiliSDKTest")
 #### Create a new Stream
 
 ```ruby
-stream = hub.create("streamkey")
+stream = hub.create("streamtitle")
 puts(stream.info.to_json)
-# {"hub":"PiliSDKTest","key":"streamkey","disabled":false}
+# {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
 ```
 
 #### Get a Stream
 
 ```ruby
-stream = hub.stream("streamkey")
+stream = hub.stream("streamtitle")
 puts(stream.info.to_json)
-# {"hub":"PiliSDKTest","key":"streamkey","disabled":false}
+# {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
 ```
 
 #### List Streams
 
 ```ruby
-keys, marker = hub.list(:prefix=>"str", :limit=>10)
-puts keys.to_s, marker
-# [<keys...>], <marker>
+titles, marker = hub.list(:prefix=>"str", :limit=>10)
+puts titles.to_s, marker
+# [<titles...>], <marker>
 ```
 
 #### List live Streams
 
 ```ruby
-keys, marker = hub.list_live(:prefix=>"str", :limit=>10)
-puts keys.to_s, marker
-# [<keys...>], <marker>
+titles, marker = hub.list_live(:prefix=>"str", :limit=>10)
+puts titles.to_s, marker
+# [<titles...>], <marker>
+```
+
+#### Batch query live status
+
+```ruby
+live_statuses = hub.batch_query_live_status(["stream1", "stream2"])
+puts live_statuses
+# {"startAt"=>1488798455, "clientIP"=>"119.130.107.231:35018", "bps"=>921960, "fps"=>{"audio"=>44, "video"=>29, "data"=>0}, "key"=>"stream1"}
+# {"startAt"=>1488798287, "clientIP"=>"119.130.107.231:55924", "bps"=>867328, "fps"=>{"audio"=>42, "video"=>9, "data"=>0}, "key"=>"stream2"}
 ```
 
 ### Stream
@@ -166,37 +183,56 @@ puts keys.to_s, marker
 #### Get Stream info
 
 ```ruby
-stream = hub.stream(key)
+stream = hub.stream(title)
 puts(stream.info.to_json)
-# {"hub": "PiliSDKTest", "key": "streamkey", "disabled": false}
+# {"hub": "PiliSDKTest", "key": "streamtitle", "disabled": false}
 ```
 
 #### Disable a Stream
 
 ```ruby
-stream = hub.stream("streamkey")
+stream = hub.stream("streamtitle")
 puts("before disable: #{stream.info.to_json}")
 
 stream.disable()
 
-stream = hub.stream("streamkey")
+stream = hub.stream("streamtitle")
 puts("after disable: #{stream.info.to_json}")
-# before disable: {"hub":"PiliSDKTest","key":"streamkey","disabled":false}
-# after disable: {"hub":"PiliSDKTest","key":"streamkey","disabled":true}
+# before disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
+# after disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":true}
+```
+
+#### Disable a Stream with timestamp
+
+```ruby
+stream = hub.stream("streamtitle")
+puts("before disable: #{stream.info.to_json}")
+
+stream.disable_till(Time.now.to_i + 10)
+
+puts("after disable: #{stream.info.to_json}")
+
+sleep(10)
+
+puts("after 10 seconds: #{stream.info.to_json}")
+
+# before disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
+# after disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":true}
+# before 10 seconds: {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
 ```
 
 #### Enable a Stream
 
 ```ruby
-stream = hub.stream("streamkey")
+stream = hub.stream("streamtitle")
 puts("before enable: #{stream.info.to_json}")
 
 stream.enable()
 
-stream = hub.get("streamkey")
+stream = hub.get("streamtitle")
 puts("after enable: #{stream.info.to_json}")
-# before disable: {"hub":"PiliSDKTest","key":"streamkey","disabled":true}
-# after disable: {"hub":"PiliSDKTest","key":"streamkey","disabled":false}
+# before disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":true}
+# after disable: {"hub":"PiliSDKTest","key":"streamtitle","disabled":false}
 ```
 
 #### Get Stream live status
@@ -207,18 +243,36 @@ puts(status.to_json)
 # {"startAt":1463022236,"clientIP":"222.73.202.226","bps":248,"fps":{"audio":45,"vedio":28,"data":0}}
 ```
 
-#### Get Stream history activity 
+#### Save Stream live playback
 
 ```ruby
-activity = stream.history_activity()
-puts(activity.to_json)
-# [{"start":1463022236,"end":1463022518}]
+fname, persistentID = stream.saveas(:format => "mp4")
+puts(fname, persistentID)
+# recordings/z1.PiliSDKTest.streamtitle/1463156847_1463157463.mp4
+# z1.58bd753a8a3c0c3794a1d6ff
+```
+#### Save Stream snapshot
+```ruby
+fname = stream.snapshot()
+puts(fname)
+# stream-title-4532162526321415963.jpg
 ```
 
-#### Save Stream live playback
+#### Update converts
 
 ```ruby
-fname = stream.save()
-puts(fname)
-# recordings/z1.PiliSDKTest.streamkey/1463156847_1463157463.m3u8
+stream = hub.stream("streamtitle")
+puts stream.info.to_json
+stream.update_converts(["720p", "480p"])
+puts stream.info.to_json
+# {"hub":"PiliSDKTest","key":"streamtitle","disabled":false,"converts":[]}
+# {"hub":"PiliSDKTest","key":"streamtitle","disabled":false,"converts":["720p","480p"]}
 ```
+
+#### Get Stream history activity 
+
+```ruby
+activity = stream.history_activity()
+puts(activity.to_json)
+# [{"start":1463022236,"end":1463022518}]
+```

data/example/example.rb

@@ -10,7 +10,7 @@ if access_key == nil || secret_key == nil
 end
 
 srand
-stream_key_prefix = "ruby-sdkexample-#{rand 1000000000}"
+stream_title_prefix = "ruby-sdkexample-#{rand 1000000000}"
 
 puts "初始化 client."
 mac = Pili::Mac.new access_key, secret_key
@@ -18,50 +18,54 @@ client = Pili::Client.new mac
 hub = client.hub hub_name
 
 puts "获得不存在的流."
-key_a = stream_key_prefix + "-a"
+title_a = stream_title_prefix + "-a"
 begin
-  stream_a = hub.stream key_a
+  stream_a = hub.stream title_a
   stream_a.info
 rescue Pili::ResourceNotExist => e
   puts e
 end
 
 puts "创建流."
-stream_a = hub.create(key_a)
+stream_a = hub.create(title_a)
 puts stream_a.info
 
 puts "获得流."
-stream_a = hub.stream(key_a)
+stream_a = hub.stream(title_a)
 puts "to_json: #{stream_a.info.to_json}"
 
 puts "创建重复的流."
 begin
-  hub.create(key_a)
+  hub.create(title_a)
 rescue Pili::ResourceConflict => e
   puts e
 end
 
 puts "创建另一路流."
-key_b = stream_key_prefix + "-b"
-stream_b = hub.create(key_b)
+title_b = stream_title_prefix + "-b"
+stream_b = hub.create(title_b)
 puts stream_b.info
 
 puts "列出所有流."
 begin
-  keys, marker = hub.list(:prefix=>stream_key_prefix)
-  puts keys.to_s, marker
+  titles, marker = hub.list(:prefix=>stream_title_prefix)
+  puts titles.to_s, marker
 rescue Pili::ResourceNotExist => e
   puts e
 end
 
 puts "列出正在直播的流."
 begin
-  keys, marker = hub.list_live(:prefix=>stream_key_prefix)
-  puts keys.to_s, marker
+  titles, marker = hub.list_live(:prefix=>stream_title_prefix)
+  puts titles.to_s, marker
 rescue Pili::ResourceNotExist => e
   puts e
 end
 
+puts "批量查询直播信息."
+live_statuses = hub.batch_query_live_status([title_a, title_b])
+puts live_statuses
+
 puts "禁用流."
 stream_a.disable()
 puts stream_a.info
@@ -70,42 +74,70 @@ puts "启用流."
 stream_a.enable()
 puts stream_a.info
 
+puts "禁用流 10 秒"
+begin
+  puts("before disable: #{stream_a.info.to_json}")
+  stream_a.disable_till(Time.now.to_i + 10)
+  puts("after disable: #{stream_a.info.to_json}")
+  sleep(10)
+  puts("after 10 seconds: #{stream_a.info.to_json}")
+rescue Pili::ResourceNotExist => e
+  puts e
+end
+
 puts "查询直播状态."
 begin
   status = stream_a.live_status()
-  puts keys, marker
+  puts status
 rescue Pili::ResourceNotExist => e
   puts e
 end
 
+puts "更改流的实时转码规格"
+begin
+  puts stream_a.info.to_json
+  stream_a.update_converts(["720p", "480p"])
+  puts stream_a.info.to_json
+rescue => e
+  puts e
+end
+
 puts "查询推流历史."
 activity = stream_a.history_activity()
 puts activity
 
 puts "保存直播数据."
 begin
-  fname = stream_a.save()
-  puts fname
+  fname, persistentID = stream_a.saveas(:format => "mp4")
+  puts fname, persistentID
+rescue => e
+  puts e
+end
+
+puts "保存直播截图."
+begin
+  fname = stream_a.snapshot()
+  puts(fname)
 rescue => e
   puts e
 end
 
 puts "RTMP 推流地址."
-url = Pili.rtmp_publish_url("publish-rtmp.test.com", hub_name, key_a, mac, 3600)
+url = Pili.rtmp_publish_url("publish-rtmp.test.com", hub_name, title_a, mac, 3600)
 puts url
 
 puts "RTMP 直播放址."
-url = Pili.rtmp_play_url("live-rtmp.test.com", hub_name, key_a)
+url = Pili.rtmp_play_url("live-rtmp.test.com", hub_name, title_a)
 puts url
 
 puts "HLS 直播地址."
-url = Pili.hls_play_url("live-hls.test.com", hub_name, key_a)
+url = Pili.hls_play_url("live-hls.test.com", hub_name, title_a)
 puts url
 
 puts "HDL 直播地址."
-url = Pili.hdl_play_url("live-hdl.test.com", hub_name, key_a)
+url = Pili.hdl_play_url("live-hdl.test.com", hub_name, title_a)
 puts url
 
 puts "截图直播地址"
-url = Pili.snapshot_play_url("live-snapshot.test.com", hub_name, key_a)
+url = Pili.snapshot_play_url("live-snapshot.test.com", hub_name, title_a)
 puts url

data/lib/pili/client.rb

@@ -18,31 +18,31 @@ module Pili
   class << self
     # 生成 RTMP 推流地址.
     # +expire_after_seconds+ 表示 URL 在多久之后失效.
-    def rtmp_publish_url(domain, hub, stream_key, mac, expire_after_seconds)
+    def rtmp_publish_url(domain, hub, stream_title, mac, expire_after_seconds)
       expire = Time.new.to_i + expire_after_seconds
-      path = "/#{hub}/#{stream_key}?e=#{expire}"
+      path = "/#{hub}/#{stream_title}?e=#{expire}"
       token = mac.sign(path)
       "rtmp://#{domain}#{path}&token=#{token}"
     end
   
     # 生成 RTMP 直播地址.
-    def rtmp_play_url(domain, hub, stream_key)
-      "rtmp://#{domain}/#{hub}/#{stream_key}"
+    def rtmp_play_url(domain, hub, stream_title)
+      "rtmp://#{domain}/#{hub}/#{stream_title}"
     end
     
     # 生成 HLS 直播地址.
-    def hls_play_url(domain, hub, stream_key)
-      "http://#{domain}/#{hub}/#{stream_key}.m3u8"
+    def hls_play_url(domain, hub, stream_title)
+      "http://#{domain}/#{hub}/#{stream_title}.m3u8"
     end 
     
     # 生成 HDL 直播地址.
-    def hdl_play_url(domain, hub, stream_key)
-      "http://#{domain}/#{hub}/#{stream_key}.flv"
+    def hdl_play_url(domain, hub, stream_title)
+      "http://#{domain}/#{hub}/#{stream_title}.flv"
     end
     
     # 生成截图直播地址.
-    def snapshot_play_url(domain, hub, stream_key)
-      "http://#{domain}/#{hub}/#{stream_key}.jpg"
+    def snapshot_play_url(domain, hub, stream_title)
+      "http://#{domain}/#{hub}/#{stream_title}.jpg"
     end
   end
 end

data/lib/pili/hub.rb

@@ -14,14 +14,14 @@ module Pili
     # 创建一个流对象.
     # 使用一个合法 rtmp_publish_url 发起推流就会自动创建流对象.
     # 一般情况下不需要调用这个 API, 除非是想提前对这一个流做一些特殊配置.    
-    def create(stream_key)
-      @client.rpc.call_with_json("POST", "#{@base_url}/streams", {:key => stream_key})
-      Stream.new(@hub, stream_key, @client)
+    def create(stream_title)
+      @client.rpc.call_with_json("POST", "#{@base_url}/streams", {:key => stream_title})
+      Stream.new(@hub, stream_title, @client)
     end
 
     # 初始化一个流对象.
-    def stream(stream_key)
-      Stream.new(@hub, stream_key, @client)
+    def stream(stream_title)
+      Stream.new(@hub, stream_title, @client)
     end
 
     def plist(opt = {})
@@ -47,8 +47,8 @@ module Pili
     #
     #   marker = ""
     #   while true
-    #     keys, marker = hub.list(:marker=> marker)
-    #     # do something with keys.
+    #     titles, marker = hub.list(:marker=> marker)
+    #     # do something with titles.
     #     if marker == ""
     #       break
     #     end
@@ -70,8 +70,8 @@ module Pili
     #
     #   marker = ""
     #   while true
-    #     keys, marker = hub.list_live(:marker=> marker)
-    #     # do something with keys.
+    #     titles, marker = hub.list_live(:marker=> marker)
+    #     # do something with titles.
     #     if marker == ""
     #       break
     #     end
@@ -80,6 +80,34 @@ module Pili
       opt[:liveonly] = true
       plist(opt)
     end
+
+    # 批量查询直播实时信息
+    #
+    # 参数：
+    #
+    # stream_titles 字符串数组，其中元素是想要查询的流的标题。
+    #
+    # 返回：
+    #
+    #   {
+    #     "key" => <String>, # 流标题
+    #     "startAt" => <Integer>, # 直播开始的 Unix 时间戳, 0 表示当前没在直播.
+    #     "clientIp" => <String>, # 直播的客户端 IP.
+    #     "bps" => <Integer>, # 直播的码率、帧率信息.
+    #     "fps" => {
+    #       "audio" => <Integer>,
+    #       "video" => <Integer>,
+    #       "data" => <Integer>
+    #     }
+    #   }
+    #
+    # 注意：
+    #
+    # 查询的流不存在或不在直播不会出现在返回结果里。
+    def batch_query_live_status(stream_titles)
+      ret = @client.rpc.call_with_json("POST", "#{@base_url}/livestreams", {:items=>stream_titles})
+      ret["items"]
+    end
     
     def to_s
       "#<#{self.class} #{@hub}>"

data/lib/pili/stream.rb

@@ -4,15 +4,19 @@ require "base64"
 
 module Pili
   class StreamInfo
-    attr_reader :hub, :key
+    attr_reader :hub, :title
     
     # 表示禁用结束的时间, 0 表示不禁用, -1 表示永久禁用.
     attr_reader :disabled_till
+
+    # 流转码配置数组
+    attr_reader :converts
   
-    def initialize(hub, key, disabled_till)
+    def initialize(hub, title, disabled_till, converts)
       @hub = hub
-      @key = key
+      @title = title
       @disabled_till = disabled_till
+      @converts = converts
     end
     
     def disabled?
@@ -20,22 +24,22 @@ module Pili
     end
     
     def to_s
-      "#<#{self.class} #{@hub}/#{@key} disabled:#{disabled?}>"
+      "#<#{self.class} #{@hub}/#{@title} disabled:#{disabled?} converts:#{@converts}>"
     end
     
     def to_json
-      {:hub=>@hub, :key=>@key, :disabled=>disabled?}.to_json
+      {:hub=>@hub, :key=>@title, :disabled=>disabled?, :converts=>@converts}.to_json
     end
   end
 
   class Stream
-    attr_reader :hub, :key
+    attr_reader :hub, :title
     
-    def initialize(hub, key, client)
+    def initialize(hub, title, client)
       @hub = hub
-      @key = key
+      @title = title
       
-      ekey = Base64.urlsafe_encode64(key)
+      ekey = Base64.urlsafe_encode64(title)
       @base_url = "#{Config.api_base_url}/hubs/#{hub}/streams/#{ekey}"
       
       @client = client
@@ -44,12 +48,19 @@ module Pili
     # Info 获得流信息.
     def info
       ret = @client.rpc.call_with_json("GET", @base_url, nil)
-      StreamInfo.new @hub, @key, ret["disabledTill"]
+      StreamInfo.new @hub, @title, ret["disabledTill"], ret["converts"]
     end
     
-    # 禁用一个流.
+    # 无限期禁用一个流.
     def disable
-      @client.rpc.call_with_json("POST", "#{@base_url}/disabled", {:disabledTill=>-1})
+      disable_till(-1)
+    end
+
+    # 禁用一个流.
+    # 参数：
+    #     timestamp 解除禁用的时间戳
+    def disable_till(timestamp)
+      @client.rpc.call_with_json("POST", "#{@base_url}/disabled", {:disabledTill=>timestamp})
     end
     
     # 启用一个流.
@@ -77,13 +88,45 @@ module Pili
     
     # 保存直播回放.
     # 
-    # 参数: start, end 是 Unix 时间戳, 限定了保存的直播的时间范围, 0 值表示不限定, 系统会默认保存最近一次直播的内容.
-    # 
-    # 返回保存的文件名, 由系统生成.
-    def save(opt = {})
+    # 参数：
+    #     fname: 保存到存储空间的文件名，可选，不指定系统会随机生成
+    #     start: 整数，可选，Unix 时间戳，要保存的直播的起始时间，不指定或 0 值表示从第一次直播开始
+    #     end: 整数，可选，Unix 时间戳，要保存的直播的结束时间，不指定或 0 值表示当前时间
+    #     format: 保存的文件格式，可选，默认为m3u8，如果指定其他格式，则保存动作为异步模式
+    #     pipeline: 异步模式时，dora的私有队列，可选，不指定则使用公共队列
+    #     notify: 异步模式时，保存成功回调通知地址，可选，不指定则不通知
+    #     expireDays: 更改ts文件的过期时间，可选，默认为永久保存 -1表示不更改ts文件的生命周期，正值表示修改ts文件的生命周期为expireDays
+    #
+    # 返回：
+    #     fname: 字符串，表示保存后在存储空间里的文件名。
+    #     persistentID: 字符串，持久化异步处理任务ID，异步模式才会返回该字段，通常用不到该字段
+    def saveas(opt = {})
       ret = @client.rpc.call_with_json("POST", "#{@base_url}/saveas", opt)
+      [ret["fname"], ret["persistentID"]]
+    end
+
+    # 保存直播截图
+    #
+    # 参数：
+    #     fname 保存到存储空间的文件名，可选，不指定系统会随机生成。
+    #     time 整数，可选，Unix 时间戳，要保存截图的时间点，不指定则为当前时间。
+    #     format 保存的文件格式，可选，默认为jpg。
+    #
+    # 返回：
+    #     fname => <String> # 字符串，表示保存后在存储空间里的文件名。
+    def snapshot(opt = {})
+      ret = @client.rpc.call_with_json("POST", "#{@base_url}/snapshot", opt)
       ret["fname"]
     end
+
+    # 修改流转码配置
+    #
+    # 参数：
+    #     profiles 字符串数组，元素为转码的分辨率如：720p, 480p
+    #
+    def update_converts(profiles)
+      ret = @client.rpc.call_with_json("POST", "#{@base_url}/converts", :converts => profiles)
+    end
     
     # 查询直播历史.
     #
@@ -105,11 +148,11 @@ module Pili
     end
     
     def to_s
-      "#<#{self.class} #{@hub}/#{@key}>"
+      "#<#{self.class} #{@hub}/#{@title}>"
     end
     
     def to_json
-      {:hub=>@hub, :key=>@key}.to_json
+      {:hub=>@hub, :key=>@title}.to_json
     end
   end
 end

data/lib/pili/version.rb

@@ -1,3 +1,3 @@
 module Pili
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piliv2
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Pili Engineer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pili Streaming Cloud Server-Side Library For Ruby.