pili 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23353fd81b87b9123d66b1ae43ff0bcab17a1394
-  data.tar.gz: 26c4b2efa6956cf2807c7980e41d109aca547a89
+  metadata.gz: 53ab7ac8e79f10070380910236ebe229c6d83813
+  data.tar.gz: 6f992c146547afb3f7f79ab5ee371969efad4fed
 SHA512:
-  metadata.gz: 821ade8cbfb8aa4b98238d67d7dec341dded6825a6a522a46bb59032e93d64b7f07466eee0480477211fbfda1672daf50127d7c45114df5afe9bbfb3d40c703e
-  data.tar.gz: afb135beccd5561a2919d0da9887fffa9b7fe6eae1278d181f65ca55f97438c6ac1322a9c534411a265193b282a71b6fd3197892c197466d170dab6a75bf5ccf
+  metadata.gz: dccbd1b051bfcbe11ba12b27eef7c293c069f7c3c25e8e11deb38f326c644b5470dfce255e8b67a2dfd731a8f3c926260d9f7b54f57b56146360d1f1b0c8bc94
+  data.tar.gz: 1fa536931e109076f5a9cc6f20ccb34dc3a24b60b0ce1bd461b326983712296deb6af30d627977f4391ca7b1278ff9a010807c5dc077a6735c4836f82ce63977

data/README.md

@@ -76,9 +76,9 @@ SECRETE_KEY = 'Qiniu_SecretKey'
 HUB_NAME    = 'Pili_Hub_Name' # The Hub must be exists before use
 
 # Change API host as necessary
-# pili.qiniuapi.com as deafult
+# pili.qiniuapi.com as default
 # pili-lte.qiniuapi.com is the latest RC version
-Pili::Config.init api_host: 'pili-lte.qiniuapi.com'
+# Pili::Config.init api_host: 'pili.qiniuapi.com' # default
 ```
 
 
@@ -122,11 +122,12 @@ end
 #      "rtmp"=>"eksg7h.publish.z1.pili.qiniup.com"
 #    },
 #    "live"=>{
-#      "http"=>"eksg7h.live1-http.z1.pili.qiniucdn.com",
+#      "hdl"=>"eksg7h.live1-hdl.z1.pili.qiniucdn.com",
+#      "hls"=>"eksg7h.live1-hls.z1.pili.qiniucdn.com",
 #      "rtmp"=>"eksg7h.live1-rtmp.z1.pili.qiniucdn.com"
 #    },
 #    "playback"=>{
-#      "http"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
+#      "hls"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
 #    }
 #  },
 #  @created_at="2015-08-22T14:27:01.62Z",
@@ -158,11 +159,12 @@ end
 #      "rtmp"=>"eksg7h.publish.z1.pili.qiniup.com"
 #    },
 #    "live"=>{
-#      "http"=>"eksg7h.live1-http.z1.pili.qiniucdn.com",
+#      "hdl"=>"eksg7h.live1-hdl.z1.pili.qiniucdn.com",
+#      "hls"=>"eksg7h.live1-hls.z1.pili.qiniucdn.com",
 #      "rtmp"=>"eksg7h.live1-rtmp.z1.pili.qiniucdn.com"
 #    },
 #    "playback"=>{
-#      "http"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
+#      "hls"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
 #    }
 #  },
 #  @created_at="2015-08-22T14:27:01.62Z",
@@ -175,10 +177,11 @@ end
 
 ```ruby
 begin
+  status = nil # optional, can be "connected"
   marker = nil # optional
   limit  = nil # optional
   title  = nil # optional
-  streams = hub.list_streams(marker: marker, limit: limit, title: title)
+  streams = hub.list_streams(status: status, marker: marker, limit: limit, title: title)
   puts "Hub list_streams() =>\n#{streams.inspect}\n\n"
 rescue Exception => e
   puts "Hub list_streams() failed. Caught exception:\n#{e.http_body}\n\n"
@@ -257,11 +260,12 @@ end
 #      "rtmp"=>"eksg7h.publish.z1.pili.qiniup.com"
 #    },
 #    "live"=>{
-#      "http"=>"eksg7h.live1-http.z1.pili.qiniucdn.com",
+#      "hdl"=>"eksg7h.live1-hdl.z1.pili.qiniucdn.com",
+#      "hls"=>"eksg7h.live1-hls.z1.pili.qiniucdn.com",
 #      "rtmp"=>"eksg7h.live1-rtmp.z1.pili.qiniucdn.com"
 #    },
 #    "playback"=>{
-#      "http"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
+#      "hls"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
 #    }
 #  },
 #  @created_at="2015-08-22T14:27:01.62Z",
@@ -292,11 +296,12 @@ end
 #      "rtmp"=>"eksg7h.publish.z1.pili.qiniup.com"
 #    },
 #    "live"=>{
-#      "http"=>"eksg7h.live1-http.z1.pili.qiniucdn.com",
+#      "hdl"=>"eksg7h.live1-hdl.z1.pili.qiniucdn.com",
+#      "hls"=>"eksg7h.live1-hls.z1.pili.qiniucdn.com",
 #      "rtmp"=>"eksg7h.live1-rtmp.z1.pili.qiniucdn.com"
 #    },
 #    "playback"=>{
-#      "http"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
+#      "hls"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
 #    }
 #  },
 #  @created_at="2015-08-22T14:27:01.62Z",
@@ -328,11 +333,12 @@ end
 #      "rtmp"=>"eksg7h.publish.z1.pili.qiniup.com"
 #    },
 #    "live"=>{
-#      "http"=>"eksg7h.live1-http.z1.pili.qiniucdn.com",
+#      "hdl"=>"eksg7h.live1-hdl.z1.pili.qiniucdn.com",
+#      "hls"=>"eksg7h.live1-hls.z1.pili.qiniucdn.com",
 #      "rtmp"=>"eksg7h.live1-rtmp.z1.pili.qiniucdn.com"
 #    },
 #    "playback"=>{
-#      "http"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
+#      "hls"=>"eksg7h.playback1.z1.pili.qiniucdn.com"
 #    }
 #  },
 #  @created_at="2015-08-22T14:27:01.62Z",
@@ -352,6 +358,7 @@ rescue Exception => e
 end
 
 #{
+#  "startFrom"=>"2015-09-10T05:58:10.289+08:00",
 #  "addr"=>"222.73.202.226:2572",
 #  "status"=>"connected",
 #  "bytesPerSecond"=>16870.200000000001,
@@ -393,7 +400,7 @@ urls = stream.hls_live_urls()
 puts "Stream hls_live_urls() =>\n#{urls.inspect}\n\n"
 
 # {
-#   "ORIGIN"=>"http://eksg7h.live1-http.z1.pili.qiniucdn.com/hub1/55d886b5e3ba571322003121.m3u8"
+#   "ORIGIN"=>"http://eksg7h.live1-hls.z1.pili.qiniucdn.com/hub1/55d886b5e3ba571322003121.m3u8"
 # }
 ```
 
@@ -405,7 +412,7 @@ urls = stream.http_flv_live_urls()
 puts "Stream http_flv_live_urls() =>\n#{urls.inspect}\n\n"
 
 # {
-#   "ORIGIN"=>"http://eksg7h.live1-http.z1.pili.qiniucdn.com/hub1/55d886b5e3ba571322003121.flv"
+#   "ORIGIN"=>"http://eksg7h.live1-hdl.z1.pili.qiniucdn.com/hub1/55d886b5e3ba571322003121.flv"
 # }
 ```
 
@@ -443,8 +450,8 @@ end
 ### Generate HLS playback URLs
 
 ```ruby
-start_time = 1440196065 # required, integer, in second, unix timestamp
-end_time   = 1440196105 # required, integer, in second, unix timestamp
+start_time = 1440196065 # optional, integer, in second, unix timestamp
+end_time   = 1440196105 # optional, integer, in second, unix timestamp
 urls = stream.hls_playback_urls(start_time, end_time)
 puts "Stream hls_playback_urls() =>\n#{urls.inspect}\n\n"
 # {
@@ -475,9 +482,9 @@ end
 # }
 ```
 
-While invoking `saveAs()` and `snapshot()`, you can get processing state via Qiniu FOP Service using `persistentId`.  
-API: `curl -D GET http://api.qiniu.com/status/get/prefop?id={PersistentId}`  
-Doc reference: <http://developer.qiniu.com/docs/v6/api/overview/fop/persistent-fop.html#pfop-status>  
+While invoking `saveAs()` and `snapshot()`, you can get processing state via Qiniu FOP Service using `persistentId`.
+API: `curl -D GET http://api.qiniu.com/status/get/prefop?id={PersistentId}`
+Doc reference: <http://developer.qiniu.com/docs/v6/api/overview/fop/persistent-fop.html#pfop-status>
 
 
 ### Snapshot Stream

data/example/example.rb

@@ -8,9 +8,9 @@ SECRETE_KEY = 'Qiniu_SecretKey'
 HUB_NAME = 'Pili_Hub_Name' # The Hub must be exists before use
 
 # Change API host as necessary
-# pili.qiniuapi.com as deafult
+# pili.qiniuapi.com as default
 # pili-lte.qiniuapi.com is the latest RC version
-Pili::Config.init api_host: 'pili-lte.qiniuapi.com'
+# Pili::Config.init api_host: 'pili.qiniuapi.com' # default
 
 
 # Instantiate an Pili hub
@@ -47,10 +47,11 @@ end
 
 # List streams
 begin
+  status = nil # optional, can be "connected"
   marker = nil # optional
   limit  = nil # optional
   title  = nil # optional
-  streams = hub.list_streams(marker: marker, limit: limit, title: title)
+  streams = hub.list_streams(status: status, marker: marker, limit: limit, title: title)
   puts "Hub list_streams() =>\n#{streams.inspect}\n\n"
 rescue Exception => e
   puts "Hub list_streams() failed. Caught exception:\n#{e.http_body}\n\n"
@@ -136,8 +137,8 @@ end
 
 
 # Generate HLS playback URLs
-start_time = 1440196065    # required, integer, in second, unix timestamp
-end_time   = 1440196105    # required, integer, in second, unix timestamp
+start_time = 1440196065    # optional, integer, in second, unix timestamp
+end_time   = 1440196105    # optional, integer, in second, unix timestamp
 urls = stream.hls_playback_urls(start_time, end_time)
 puts "Stream hls_playback_urls() =>\n#{urls.inspect}\n\n"
 

data/lib/pili/api.rb

@@ -31,13 +31,15 @@ module Pili
       def list_streams(credentials, hub_name, options = {})
         url = "/streams?hub=#{hub_name}"
 
+        url += "&status=#{options[:status]}" if options[:status] == "connected"
         url += "&marker=#{options[:marker]}" unless Utils.blank?(options[:marker])
         url += "&limit=#{options[:limit]}"   if options[:limit].is_a?(Fixnum)
         url += "&title=#{options[:title]}"   unless Utils.blank?(options[:title])
 
         streams = []
 
-        RPC.get(credentials, url)["items"].each do |item|
+        items = RPC.get(credentials, url)["items"]
+        items && items.each do |item|
           streams << Stream.new(credentials, item)
         end
 

data/lib/pili/stream.rb

@@ -79,12 +79,12 @@ module Pili
 
 
     def http_flv_live_urls
-      live_http_host = @hosts["live"]["http"]
+      live_hdl_host = @hosts["live"]["hdl"]
 
-      urls = { Config.origin => "http://#{live_http_host}/#{@hub}/#{@title}.flv" }
+      urls = { Config.origin => "http://#{live_hdl_host}/#{@hub}/#{@title}.flv" }
 
       @profiles.each do |profile|
-        urls[profile] = "http://#{live_http_host}/#{@hub}/#{@title}@#{profile}.flv"
+        urls[profile] = "http://#{live_hdl_host}/#{@hub}/#{@title}@#{profile}.flv"
       end
 
       urls
@@ -92,25 +92,25 @@ module Pili
 
 
     def hls_live_urls
-      live_http_host = @hosts["live"]["http"]
+      live_hls_host = @hosts["live"]["hls"]
 
-      urls = { Config.origin => "http://#{live_http_host}/#{@hub}/#{@title}.m3u8" }
+      urls = { Config.origin => "http://#{live_hls_host}/#{@hub}/#{@title}.m3u8" }
 
       @profiles.each do |profile|
-        urls[profile] = "http://#{live_http_host}/#{@hub}/#{@title}@#{profile}.m3u8"
+        urls[profile] = "http://#{live_hls_host}/#{@hub}/#{@title}@#{profile}.m3u8"
       end
 
       urls
     end
 
 
-    def hls_playback_urls(start_second, end_second)
-      playback_http_host = @hosts["playback"]["http"]
+    def hls_playback_urls(start_second = -1, end_second = -1)
+      playback_hls_host = @hosts["playback"]["hls"]
 
-      urls = { Config.origin => "http://#{playback_http_host}/#{@hub}/#{@title}.m3u8?start=#{start_second}&end=#{end_second}" }
+      urls = { Config.origin => "http://#{playback_hls_host}/#{@hub}/#{@title}.m3u8?start=#{start_second}&end=#{end_second}" }
 
       @profiles.each do |profile|
-        urls[profile] = "http://#{playback_http_host}/#{@hub}/#{@title}@#{profile}.m3u8?start=#{start_second}&end=#{end_second}"
+        urls[profile] = "http://#{playback_hls_host}/#{@hub}/#{@title}@#{profile}.m3u8?start=#{start_second}&end=#{end_second}"
       end
 
       urls

data/lib/pili/version.rb

@@ -1,3 +1,3 @@
 module Pili
-  VERSION = "1.5.0"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pili
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Miclle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler